From 0b0b5016b920f3b42de73093031e43bc067d2203 Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Thu, 1 Oct 2020 20:51:30 +0300
Subject: [PATCH] CAKE-101 | changed buttons position on confirm sending alert;
 added poppins font to confirm sending alert

---
 lib/src/screens/send/send_page.dart                     | 8 ++++----
 lib/src/screens/send/widgets/confirm_sending_alert.dart | 4 ++++
 lib/utils/show_pop_up.dart                              | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index 7a856cb43..dc9cc8f5c 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -556,9 +556,9 @@ class SendPage extends BasePage {
                         sendViewModel.pendingTransaction.amountFormatted,
                     fee: S.of(context).send_fee,
                     feeValue: sendViewModel.pendingTransaction.feeFormatted,
-                    leftButtonText: S.of(context).ok,
-                    rightButtonText: S.of(context).cancel,
-                    actionLeftButton: () {
+                    rightButtonText: S.of(context).ok,
+                    leftButtonText: S.of(context).cancel,
+                    actionRightButton: () {
                       Navigator.of(context).pop();
                       sendViewModel.commitTransaction();
                       showPopUp<void>(
@@ -655,7 +655,7 @@ class SendPage extends BasePage {
                             });
                           });
                     },
-                    actionRightButton: () => Navigator.of(context).pop());
+                    actionLeftButton: () => Navigator.of(context).pop());
               });
         });
       }
diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart
index 663de3a16..fa5a97148 100644
--- a/lib/src/screens/send/widgets/confirm_sending_alert.dart
+++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart
@@ -55,6 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
+                fontFamily: 'Poppins',
                 color: Theme.of(context).primaryTextTheme.title.color,
                 decoration: TextDecoration.none,
               ),
@@ -64,6 +65,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
+                fontFamily: 'Poppins',
                 color: Theme.of(context).primaryTextTheme.title.color,
                 decoration: TextDecoration.none,
               ),
@@ -79,6 +81,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
+                fontFamily: 'Poppins',
                 color: Theme.of(context).primaryTextTheme.title.color,
                 decoration: TextDecoration.none,
               ),
@@ -88,6 +91,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
               style: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
+                fontFamily: 'Poppins',
                 color: Theme.of(context).primaryTextTheme.title.color,
                 decoration: TextDecoration.none,
               ),
diff --git a/lib/utils/show_pop_up.dart b/lib/utils/show_pop_up.dart
index 280bcff3c..a97fb3762 100644
--- a/lib/utils/show_pop_up.dart
+++ b/lib/utils/show_pop_up.dart
@@ -14,8 +14,8 @@ Future<T> showPopUp<T>({
       context: context,
       builder: builder,
       barrierDismissible: barrierDismissible,
-      //barrierColor: barrierColor,
-      //useSafeArea: useSafeArea,
+      barrierColor: barrierColor,
+      useSafeArea: useSafeArea,
       useRootNavigator: useRootNavigator,
       routeSettings: routeSettings,
       child: child);