Merge branch 'main' into CW-221-Change-synchronization-status-text

lib/di.dart

@@ -701,6 +701,7 @@ Future setup(
       ioniaAnyPayService: getIt.get<IoniaAnyPay>(), 
       amount: amount,
       ioniaMerchant: merchant,
+      sendViewModel: getIt.get<SendViewModel>()
     );
   });
 

lib/exchange/changenow/changenow_exchange_provider.dart

@@ -232,7 +232,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final fromAmount = double.parse(responseJSON['fromAmount'].toString());
       final toAmount =  double.parse(responseJSON['toAmount'].toString());
-      final rateId = responseJSON['rateId'] as String ?? '';
+      final rateId = responseJSON['rateId'] as String? ?? '';
 
       if (rateId.isNotEmpty) {
         _lastUsedRateId = rateId;

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

@@ -3,7 +3,6 @@ import 'package:cake_wallet/ionia/ionia_merchant.dart';
 import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/src/screens/ionia/widgets/confirm_modal.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/ionia_alert_model.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/text_icon_button.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
@@ -18,6 +17,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
 
 class IoniaBuyGiftCardDetailPage extends BasePage {
   IoniaBuyGiftCardDetailPage(this.ioniaPurchaseViewModel);
@@ -295,73 +295,35 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
     
     final amount = ioniaPurchaseViewModel.invoice!.totalAmount;
     final addresses = ioniaPurchaseViewModel.invoice!.outAddresses;
+    ioniaPurchaseViewModel.sendViewModel.outputs.first.setCryptoAmount(amount);
+    ioniaPurchaseViewModel.sendViewModel.outputs.first.address = addresses.first;
 
     await showPopUp<void>(
       context: context,
       builder: (_) {
-        return IoniaConfirmModal(
+        return ConfirmSendingAlert(
             alertTitle: S.of(context).confirm_sending,
-            alertContent: Container(
+            paymentId: S.of(context).payment_id,
-                height: 200,
+            paymentIdValue: ioniaPurchaseViewModel.invoice!.paymentId,
-                padding: EdgeInsets.all(15),
+            amount: S.of(context).send_amount,
-                child: Column(children: [
+            amountValue: '$amount ${ioniaPurchaseViewModel.invoice!.chain}',
-                  Row(children: [
+            fiatAmountValue:
-                    Text(S.of(context).payment_id,
+            '~ ${ioniaPurchaseViewModel.sendViewModel.outputs.first.fiatAmount} '
-                        textAlign: TextAlign.center,
+                '${ioniaPurchaseViewModel.sendViewModel.fiat.title}',
-                        style: TextStyle(
+            fee: S.of(context).send_fee,
-                            fontSize: 16,
+            feeValue:
-                            fontWeight: FontWeight.w400,
+            '${ioniaPurchaseViewModel.sendViewModel.outputs.first.estimatedFee} '
-                            color: PaletteDark.pigeonBlue,
+                '${ioniaPurchaseViewModel.invoice!.chain}',
-                            decoration: TextDecoration.none)),
+            feeFiatAmount:
-                    Text(ioniaPurchaseViewModel.invoice!.paymentId,
+            '${ioniaPurchaseViewModel.sendViewModel.outputs.first.estimatedFeeFiatAmount} '
-                        style: TextStyle(
+                '${ioniaPurchaseViewModel.sendViewModel.fiat.title}',
-                            fontSize: 16,
+            outputs: ioniaPurchaseViewModel.sendViewModel.outputs,
-                            fontWeight: FontWeight.w400,
-                            color: PaletteDark.pigeonBlue,
-                            decoration: TextDecoration.none))
-                  ], mainAxisAlignment: MainAxisAlignment.spaceBetween),
-                  SizedBox(height: 10),
-                  Row(children: [
-                    Text(S.of(context).amount,
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w400,
-                            color: PaletteDark.pigeonBlue,
-                            decoration: TextDecoration.none)),
-                    Text('$amount ${ioniaPurchaseViewModel.invoice!.chain}',
-                        style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w400,
-                            color: PaletteDark.pigeonBlue,
-                            decoration: TextDecoration.none))
-                  ], mainAxisAlignment: MainAxisAlignment.spaceBetween),
-                  SizedBox(height: 25),
-                  Row(children: [
-                    Text(S.of(context).recipient_address,
-                        style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w400,
-                            color: PaletteDark.pigeonBlue,
-                            decoration: TextDecoration.none))
-                  ], mainAxisAlignment: MainAxisAlignment.center),
-                  Expanded(
-                      child: ListView.builder(
-                          itemBuilder: (_, int index) {
-                            return Text(addresses[index],
-                                style: TextStyle(
-                                    fontSize: 14,
-                                    fontWeight: FontWeight.w400,
-                                    color: PaletteDark.pigeonBlue,
-                                    decoration: TextDecoration.none));
-                          },
-                          itemCount: addresses.length,
-                          physics: NeverScrollableScrollPhysics()))
-                ])),
             rightButtonText: S.of(context).ok,
             leftButtonText: S.of(context).cancel,
-            leftActionColor: Color(0xffFF6600),
+            alertLeftActionButtonTextColor: Colors.white,
-            rightActionColor: Theme.of(context).accentTextTheme!.bodyText1!.color!,
+            alertRightActionButtonTextColor: Colors.white,
+            alertLeftActionButtonColor: Palette.brightOrange,
+            alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color,
             actionRightButton: () async {
               Navigator.of(context).pop();
               await ioniaPurchaseViewModel.commitPaymentInvoice();

lib/src/screens/ionia/widgets/confirm_modal.dart

@@ -1,149 +0,0 @@
-import 'dart:ui';
-
-import 'package:cake_wallet/palette.dart';
-import 'package:flutter/material.dart';
-
-class IoniaConfirmModal extends StatelessWidget {
-  IoniaConfirmModal({
-    required this.alertTitle,
-    required this.alertContent,
-    required this.leftButtonText,
-    required this.rightButtonText,
-    required this.actionLeftButton,
-    required this.actionRightButton,
-    required this.leftActionColor,
-    required this.rightActionColor,
-    this.hideActions = false,
-  });
-
-  final String alertTitle;
-  final Widget alertContent;
-  final String leftButtonText;
-  final String rightButtonText;
-  final VoidCallback actionLeftButton;
-  final VoidCallback actionRightButton;
-  final Color leftActionColor;
-  final Color rightActionColor;
-  final bool hideActions;
-
-  Widget actionButtons(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.max,
-      children: <Widget>[
-        IoniaActionButton(
-          buttonText: leftButtonText,
-          action: actionLeftButton,
-          backgoundColor: leftActionColor,
-        ),
-        Container(
-          width: 1,
-          height: 52,
-          color: Theme.of(context).dividerColor,
-        ),
-        IoniaActionButton(
-          buttonText: rightButtonText,
-          action: actionRightButton,
-          backgoundColor: rightActionColor,
-        ),
-      ],
-    );
-  }
-
-  Widget title(BuildContext context) {
-    return Text(
-      alertTitle,
-      textAlign: TextAlign.center,
-      style: TextStyle(
-        fontSize: 20,
-        fontFamily: 'Lato',
-        fontWeight: FontWeight.w600,
-        color: Theme.of(context).primaryTextTheme!.headline6!.color!,
-        decoration: TextDecoration.none,
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      color: Colors.transparent,
-      child: BackdropFilter(
-        filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
-        child: Container(
-          decoration: BoxDecoration(color: PaletteDark.darkNightBlue.withOpacity(0.75)),
-          child: Center(
-            child: GestureDetector(
-              onTap: () => null,
-              child: ClipRRect(
-                borderRadius: BorderRadius.all(Radius.circular(30)),
-                child: Container(
-                  width: 327,
-                  color: Theme.of(context).accentTextTheme!.headline6!.decorationColor!,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Padding(
-                        padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
-                        child: title(context),
-                      ),
-                      Padding(
-                        padding: EdgeInsets.only(top: 16, bottom: 8),
-                        child: Container(
-                          height: 1,
-                          color: Theme.of(context).dividerColor,
-                        ),
-                      ),
-                      alertContent,
-                      actionButtons(context),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class IoniaActionButton extends StatelessWidget {
-  const IoniaActionButton({
-    required this.buttonText,
-    required this.action,
-    required this.backgoundColor,
-  });
-
-  final String buttonText;
-  final VoidCallback action;
-  final Color backgoundColor;
-
-  @override
-  Widget build(BuildContext context) {
-    return Flexible(
-        child: Container(
-      height: 52,
-      padding: EdgeInsets.only(left: 6, right: 6),
-      color: backgoundColor,
-      child: ButtonTheme(
-        minWidth: double.infinity,
-        child: TextButton(
-            onPressed: action,
-            // FIX-ME: ignored highlightColor and splashColor
-            //highlightColor: Colors.transparent,
-            //splashColor: Colors.transparent,
-            child: Text(
-              buttonText,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: 15,
-                fontFamily: 'Lato',
-                fontWeight: FontWeight.w600,
-                color: backgoundColor != null ? Colors.white : Theme.of(context).primaryTextTheme!.bodyText2!.backgroundColor!,
-                decoration: TextDecoration.none,
-              ),
-            )),
-      ),
-    ));
-  }
-}

lib/src/screens/send/widgets/confirm_sending_alert.dart

@@ -4,10 +4,13 @@ import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
+import 'package:flutter/scheduler.dart';
 
 class ConfirmSendingAlert extends BaseAlertDialog {
   ConfirmSendingAlert({
     required this.alertTitle,
+    this.paymentId,
+    this.paymentIdValue,
     required this.amount,
     required this.amountValue,
     required this.fiatAmountValue,
@@ -19,9 +22,15 @@ class ConfirmSendingAlert extends BaseAlertDialog {
     required this.rightButtonText,
     required this.actionLeftButton,
     required this.actionRightButton,
-    this.alertBarrierDismissible = true});
+    this.alertBarrierDismissible = true,
+    this.alertLeftActionButtonTextColor,
+    this.alertRightActionButtonTextColor,
+    this.alertLeftActionButtonColor,
+    this.alertRightActionButtonColor});
 
   final String alertTitle;
+  final String? paymentId;
+  final String? paymentIdValue;
   final String amount;
   final String amountValue;
   final String fiatAmountValue;
@@ -34,6 +43,10 @@ class ConfirmSendingAlert extends BaseAlertDialog {
   final VoidCallback actionLeftButton;
   final VoidCallback actionRightButton;
   final bool alertBarrierDismissible;
+  final Color? alertLeftActionButtonTextColor;
+  final Color? alertRightActionButtonTextColor;
+  final Color? alertLeftActionButtonColor;
+  final Color? alertRightActionButtonColor;
 
   @override
   String get titleText => alertTitle;
@@ -56,8 +69,22 @@ class ConfirmSendingAlert extends BaseAlertDialog {
   @override
   bool get barrierDismissible => alertBarrierDismissible;
 
+  @override
+  Color? get leftActionButtonTextColor => alertLeftActionButtonTextColor;
+
+  @override
+  Color? get rightActionButtonTextColor => alertRightActionButtonTextColor;
+
+  @override
+  Color? get leftActionButtonColor => alertLeftActionButtonColor;
+
+  @override
+  Color? get rightActionButtonColor => alertRightActionButtonColor;
+
   @override
   Widget content(BuildContext context) => ConfirmSendingAlertContent(
+      paymentId: paymentId,
+      paymentIdValue: paymentIdValue,
       amount: amount,
       amountValue: amountValue,
       fiatAmountValue: fiatAmountValue,
@@ -70,6 +97,8 @@ class ConfirmSendingAlert extends BaseAlertDialog {
 
 class ConfirmSendingAlertContent extends StatefulWidget {
   ConfirmSendingAlertContent({
+    this.paymentId,
+    this.paymentIdValue,
     required this.amount,
     required this.amountValue,
     required this.fiatAmountValue,
@@ -78,6 +107,8 @@ class ConfirmSendingAlertContent extends StatefulWidget {
     required this.feeFiatAmount,
     required this.outputs});
 
+  final String? paymentId;
+  final String? paymentIdValue;
   final String amount;
   final String amountValue;
   final String fiatAmountValue;
@@ -88,6 +119,8 @@ class ConfirmSendingAlertContent extends StatefulWidget {
 
   @override
   ConfirmSendingAlertContentState createState() => ConfirmSendingAlertContentState(
+    paymentId: paymentId,
+    paymentIdValue: paymentIdValue,
     amount: amount,
     amountValue: amountValue,
     fiatAmountValue: fiatAmountValue,
@@ -100,6 +133,8 @@ class ConfirmSendingAlertContent extends StatefulWidget {
 
 class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent> {
   ConfirmSendingAlertContentState({
+    this.paymentId,
+    this.paymentIdValue,
     required this.amount,
     required this.amountValue,
     required this.fiatAmountValue,
@@ -115,6 +150,8 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
         : S.current.recipient_address;
   }
 
+  final String? paymentId;
+  final String? paymentIdValue;
   final String amount;
   final String amountValue;
   final String fiatAmountValue;
@@ -129,6 +166,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
   double fromTop = 0;
   String recipientTitle;
   int itemCount;
+  bool showScrollbar = false;
 
   @override
   Widget build(BuildContext context) {
@@ -140,6 +178,12 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
       setState(() {});
     });
 
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      setState(() {
+        showScrollbar = controller.position.maxScrollExtent > 0;
+      });
+    });
+
     return Stack(
       alignment: Alignment.center,
       clipBehavior: Clip.none,
@@ -150,6 +194,44 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                 controller: controller,
                 child: Column(
                   children: <Widget>[
+                    if (paymentIdValue != null && paymentId != null)
+                      Padding(
+                        padding: EdgeInsets.only(bottom: 32),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.max,
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Text(
+                              paymentId!,
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.normal,
+                                fontFamily: 'Lato',
+                                color: Theme.of(context).primaryTextTheme!
+                                    .headline6!.color!,
+                                decoration: TextDecoration.none,
+                              ),
+                            ),
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              children: [
+                                Text(
+                                  paymentIdValue!,
+                                  style: TextStyle(
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w600,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context).primaryTextTheme!
+                                        .headline6!.color!,
+                                    decoration: TextDecoration.none,
+                                  ),
+                                ),
+                              ],
+                            )
+                          ],
+                        ),
+                      ),
                     Row(
                       mainAxisSize: MainAxisSize.max,
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -365,7 +447,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
                 )
             )
         ),
-        if (itemCount > 1) CakeScrollbar(
+        if (showScrollbar) CakeScrollbar(
               backgroundHeight: backgroundHeight,
               thumbHeight: thumbHeight,
               fromTop: fromTop,

lib/src/widgets/base_alert_dialog.dart

@@ -11,6 +11,10 @@ class BaseAlertDialog extends StatelessWidget {
   VoidCallback get actionLeft => () {};
   VoidCallback get actionRight => () {};
   bool get barrierDismissible => true;
+  Color? get leftActionButtonTextColor => null;
+  Color? get rightActionButtonTextColor => null;
+  Color? get leftActionButtonColor => null;
+  Color? get rightActionButtonColor => null;
 
   Widget title(BuildContext context) {
     return Text(
@@ -45,52 +49,64 @@ class BaseAlertDialog extends StatelessWidget {
       height: 52,
       child: Row(
       mainAxisSize: MainAxisSize.max,
-      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
       children: <Widget>[
-        Flexible(
+            Expanded(
-          child: Container(
+              child: TextButton(
-            width: double.infinity,
+                  onPressed: actionLeft,
-            color: Theme.of(context).accentTextTheme!.bodyText1!.decorationColor!,
+                  style: TextButton.styleFrom(
-            child: TextButton(
+                      backgroundColor: leftActionButtonColor ??
-                onPressed: actionLeft,
+                          Theme.of(context)
-                child: Text(
+                              .accentTextTheme!
-                  leftActionButtonText,
+                              .bodyText1!
-                  textAlign: TextAlign.center,
+                              .decorationColor!,
-                  style: TextStyle(
+                      shape: const RoundedRectangleBorder(
-                    fontSize: 15,
+                          borderRadius: BorderRadius.all(Radius.zero))),
-                    fontFamily: 'Lato',
+                  child: Text(
-                    fontWeight: FontWeight.w600,
+                    leftActionButtonText,
-                    color: Theme.of(context).primaryTextTheme!.bodyText1!.backgroundColor!,
+                    textAlign: TextAlign.center,
-                    decoration: TextDecoration.none,
+                    style: TextStyle(
-                  ),
+                      fontSize: 15,
-                )),
+                      fontFamily: 'Lato',
-          ),
+                      fontWeight: FontWeight.w600,
-        ),
+                      color: leftActionButtonTextColor ??
+                          Theme.of(context).primaryTextTheme!
+                              .bodyText1!.backgroundColor!,
+                      decoration: TextDecoration.none,
+                    ),
+                  )),
+            ),
         Container(
           width: 1,
           color: Theme.of(context).dividerColor,
         ),
-        Flexible(
+            Expanded(
-          child: Container(
+              child: TextButton(
-            width: double.infinity,
+                  onPressed: actionRight,
-            color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!,
+                  style: TextButton.styleFrom(
-            child: TextButton(
+                      backgroundColor: rightActionButtonColor ??
-                onPressed: actionRight,
+                          Theme.of(context).accentTextTheme!
-                child: Text(
+                              .bodyText2!.backgroundColor!,
-                  rightActionButtonText,
+                      shape: const RoundedRectangleBorder(
-                  textAlign: TextAlign.center,
+                          borderRadius: BorderRadius.all(Radius.zero))),
-                  style: TextStyle(
+                  child: Text(
-                    fontSize: 15,
+                    rightActionButtonText,
-                    fontFamily: 'Lato',
+                    textAlign: TextAlign.center,
-                    fontWeight: FontWeight.w600,
+                    style: TextStyle(
-                    color: Theme.of(context).primaryTextTheme!.bodyText2!.backgroundColor!,
+                      fontSize: 15,
-                    decoration: TextDecoration.none,
+                      fontFamily: 'Lato',
-                  ),
+                      fontWeight: FontWeight.w600,
-                )),
+                      color: rightActionButtonTextColor ??
-          ),
+                          Theme.of(context)
-        ),
+                              .primaryTextTheme!
-      ],
+                              .bodyText2!
-    ));
+                              .backgroundColor!,
+                      decoration: TextDecoration.none,
+                    ),
+                  )),
+            ),
+          ],
+        ));
   }
 
   @override

lib/view_model/ionia/ionia_purchase_merch_view_model.dart

@@ -7,6 +7,7 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
 import 'package:cake_wallet/ionia/ionia_merchant.dart';
 import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
+import 'package:cake_wallet/view_model/send/send_view_model.dart';
 
 part 'ionia_purchase_merch_view_model.g.dart';
 
@@ -17,6 +18,7 @@ abstract class IoniaMerchPurchaseViewModelBase with Store {
     required this.ioniaAnyPayService,
     required this.amount,
     required this.ioniaMerchant,
+    required this.sendViewModel,
   }) : tipAmount = 0.0,
         percentage = 0.0,
         invoiceCreationState = InitialExecutionState(),
@@ -40,6 +42,8 @@ abstract class IoniaMerchPurchaseViewModelBase with Store {
 
   final IoniaMerchant ioniaMerchant;
 
+  final SendViewModel sendViewModel;
+
   final IoniaAnyPay ioniaAnyPayService;
 
   IoniaAnyPayPaymentInfo? paymentInfo;

scripts/android/app_env.sh

@@ -15,13 +15,13 @@ APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=26
+MONERO_COM_BUILD_NUMBER=28
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=130
+CAKEWALLET_BUILD_NUMBER=132
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 

scripts/ios/app_env.sh

@@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=26
+MONERO_COM_BUILD_NUMBER=28
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=130
+CAKEWALLET_BUILD_NUMBER=132
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"