UI fixes for ionia.

lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart

@@ -15,6 +15,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/standart_list_row.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/dark_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -334,8 +335,8 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                         PrimaryButton(
                           onPressed: () => Navigator.pop(context),
                           text: S.of(context).send_got_it,
-                          color: Color.fromRGBO(233, 242, 252, 1),
+                          color: Theme.of(context).accentTextTheme.caption.color,
-                          textColor: Theme.of(context).textTheme.display2.color,
+                          textColor: Theme.of(context).primaryTextTheme.title.color,
                         ),
                         SizedBox(height: 21),
                       ],
@@ -569,6 +570,40 @@ class TipButton extends StatelessWidget {
   final bool isSelected;
   final void Function() onTap;
 
+  bool isDark(BuildContext context) => Theme.of(context).brightness == Brightness.dark;
+
+  Color captionTextColor(BuildContext context) {
+    if (isDark(context)) {
+      return Theme.of(context).primaryTextTheme.title.color;
+    }
+
+    return isSelected
+      ? Theme.of(context).accentTextTheme.title.color
+      : Theme.of(context).primaryTextTheme.title.color;
+  }
+
+  Color subTitleTextColor(BuildContext context) {
+    if (isDark(context)) {
+      return Theme.of(context).primaryTextTheme.title.color;
+    }
+
+    return isSelected
+      ? Theme.of(context).accentTextTheme.title.color
+      : Theme.of(context).primaryTextTheme.overline.color;
+  }
+
+  Color backgroundColor(BuildContext context) {
+    if (isDark(context)) {
+      return isSelected
+        ? null
+        : Theme.of(context).accentTextTheme.display4.backgroundColor.withOpacity(0.01);
+    }
+
+    return isSelected
+        ? null
+        : Theme.of(context).accentTextTheme.display4.backgroundColor.withOpacity(0.1);
+  }
+
   @override
   Widget build(BuildContext context) {
     return InkWell(
@@ -580,17 +615,13 @@ class TipButton extends StatelessWidget {
           children: [
             Text(caption,
                 style: textSmallSemiBold(
-                    color: isSelected
+                    color: captionTextColor(context))),
-                        ? Theme.of(context).accentTextTheme.title.color
-                        : Theme.of(context).primaryTextTheme.title.color)),
             if (subTitle != null) ...[
               SizedBox(height: 4),
               Text(
                 subTitle,
                 style: textXxSmallSemiBold(
-                  color: isSelected
+                  color: subTitleTextColor(context),
-                      ? Theme.of(context).accentTextTheme.title.color
-                      : Theme.of(context).primaryTextTheme.overline.color,
                 ),
               ),
             ]
@@ -599,7 +630,7 @@ class TipButton extends StatelessWidget {
         padding: EdgeInsets.symmetric(horizontal: 18, vertical: 8),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(10),
-          color: Color.fromRGBO(242, 240, 250, 1),
+          color: backgroundColor(context),
           gradient: isSelected
               ? LinearGradient(
                   colors: [

lib/src/screens/ionia/cards/ionia_buy_gift_card.dart

@@ -124,13 +124,13 @@ class IoniaBuyGiftCardPage extends BasePage {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          S.of(context).min_amount(merchant.minimumCardPurchase.toString()),
+                          S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
                             color: Theme.of(context).primaryTextTheme.headline.color,
                           ),
                         ),
                         Text(
-                          S.of(context).max_amount(merchant.maximumCardPurchase.toString()),
+                          S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
                             color: Theme.of(context).primaryTextTheme.headline.color,
                           ),
@@ -171,7 +171,7 @@ class IoniaBuyGiftCardPage extends BasePage {
                     text: S.of(context).continue_text,
                     isDisabled: !ioniaBuyCardViewModel.isEnablePurchase,
                     color: Theme.of(context).accentTextTheme.body2.color,
-                    textColor: Theme.of(context).accentTextTheme.headline.decorationColor,
+                    textColor: Colors.white,
                   ),
                 );
               }),

lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart

@@ -107,7 +107,7 @@ class IoniaGiftCardDetailPage extends BasePage {
             buildIoniaTile(
               context,
               title: S.of(context).amount,
-              subTitle: viewModel.giftCard.remainingAmount.toString() ?? '0',
+              subTitle: viewModel.giftCard.remainingAmount.toStringAsFixed(2) ?? '0.00',
             )),
           Divider(height: 50),
           TextIconButton(
@@ -178,14 +178,9 @@ class IoniaGiftCardDetailPage extends BasePage {
                             child: Container(
                               constraints: BoxConstraints(
                                 maxHeight: MediaQuery.of(context).size.height * 0.5),
-                            child:  Expanded(
+                                child: SingleChildScrollView(
-                            child: ListView.builder(
+                                    child: Column(children: viewModel.giftCard.usageInstructions.map((instruction) {
-                              itemCount: viewModel.giftCard.usageInstructions.length,
+                                      return [
-                              itemBuilder: (_, int index) {
-                                  final instruction = viewModel.giftCard.usageInstructions[index];
-                                  return Expanded(
-                                    child: Column(
-                                      children: [
                                          Padding(
                                             padding: EdgeInsets.all(10),
                                             child: Text(
@@ -200,15 +195,16 @@ class IoniaGiftCardDetailPage extends BasePage {
                                               color: Theme.of(context).textTheme.display2.color,
                                             ),
                                           )
-                                      ]));
+                                      ];
-                                })))
+                                    }).expand((e) => e).toList())
-                        ),
+                              )
+                          )),
                         SizedBox(height: 35),
                         PrimaryButton(
                           onPressed: () => Navigator.pop(context),
                           text: S.of(context).send_got_it,
-                          color: Color.fromRGBO(233, 242, 252, 1),
+                          color: Theme.of(context).accentTextTheme.caption.color,
-                          textColor: Theme.of(context).textTheme.display2.color,
+                          textColor: Theme.of(context).primaryTextTheme.title.color,
                         ),
                         SizedBox(height: 21),
                       ],