Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying

lib/src/screens/dashboard/dashboard_page.dart

@@ -150,7 +150,8 @@ class DashboardPage extends BasePage {
       return;
     }
 
-    pages.add(AddressPage(addressListViewModel: addressListViewModel));
+    pages.add(AddressPage(addressListViewModel: addressListViewModel,
+              walletViewModel: walletViewModel));
     pages.add(BalancePage(dashboardViewModel: walletViewModel));
     pages.add(TransactionsPage(dashboardViewModel: walletViewModel));
 
@@ -166,7 +167,7 @@ class DashboardPage extends BasePage {
             return AlertWithOneAction(
                 alertTitle: S.of(context).pre_seed_title,
                 alertContent:
-                    S.of(context).outdated_electrum_wallet_desceription,
+                    S.of(context).outdated_electrum_wallet_description,
                 buttonText: S.of(context).understand,
                 buttonAction: () => Navigator.of(context).pop());
           });

lib/src/screens/dashboard/widgets/address_page.dart

@@ -1,5 +1,11 @@
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_widget.dart';
@@ -7,17 +13,43 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:keyboard_actions/keyboard_actions.dart';
+import 'package:mobx/mobx.dart';
 
 class AddressPage extends StatelessWidget {
-  AddressPage({@required this.addressListViewModel})
+  AddressPage({@required this.addressListViewModel,
+                this.walletViewModel})
       : _cryptoAmountFocus = FocusNode();
 
   final WalletAddressListViewModel addressListViewModel;
+  final DashboardViewModel walletViewModel;
 
   final FocusNode _cryptoAmountFocus;
 
   @override
   Widget build(BuildContext context) {
+    autorun((_) async {
+      if (!walletViewModel.isOutdatedElectrumWallet
+        || !walletViewModel.settingsStore.shouldShowReceiveWarning) {
+        return;
+      }
+
+      await Future<void>.delayed(Duration(seconds: 1));
+      await showPopUp<void>(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertWithTwoActions(
+                alertTitle: S.of(context).pre_seed_title,
+                alertContent: S.of(context).outdated_electrum_wallet_receive_warning,
+                leftButtonText: S.of(context).understand,
+                actionLeftButton: () => Navigator.of(context).pop(),
+                rightButtonText: S.of(context).do_not_show_me,
+                actionRightButton: () {
+                  walletViewModel.settingsStore.setShouldShowReceiveWarning(false);
+                  Navigator.of(context).pop();
+                });
+          });
+    });
+
     return KeyboardActions(
         autoScroll: false,
         disableScroll: true,
@@ -42,7 +74,8 @@ class AddressPage extends StatelessWidget {
                   child: Observer(builder: (_) => QRWidget(
                       addressListViewModel: addressListViewModel,
                       amountTextFieldFocusNode: _cryptoAmountFocus,
-                      isAmountFieldShow: !addressListViewModel.hasAccounts))
+                      isAmountFieldShow: !addressListViewModel.hasAccounts,
+                      isBright: walletViewModel.settingsStore.currentTheme.type == ThemeType.bright))
               ),
               Observer(builder: (_) {
                 return addressListViewModel.hasAddressList

lib/src/screens/receive/receive_page.dart

@@ -1,6 +1,7 @@
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -124,7 +125,8 @@ class ReceivePage extends BasePage {
                 child: QRWidget(
                     addressListViewModel: addressListViewModel,
                     isAmountFieldShow: true,
-                    amountTextFieldFocusNode: _cryptoAmountFocus),
+                    amountTextFieldFocusNode: _cryptoAmountFocus,
+                    isBright: currentTheme.type == ThemeType.bright),
               ),
               Observer(
                   builder: (_) => ListView.separated(

lib/src/screens/receive/widgets/qr_widget.dart

@@ -13,7 +13,8 @@ class QRWidget extends StatelessWidget {
   QRWidget(
       {@required this.addressListViewModel,
       this.isAmountFieldShow = false,
-      this.amountTextFieldFocusNode})
+      this.amountTextFieldFocusNode,
+      this.isBright})
       : amountController = TextEditingController(),
         _formKey = GlobalKey<FormState>() {
     amountController.addListener(() => addressListViewModel.amount =
@@ -25,6 +26,7 @@ class QRWidget extends StatelessWidget {
   final TextEditingController amountController;
   final FocusNode amountTextFieldFocusNode;
   final GlobalKey<FormState> _formKey;
+  final bool isBright;
 
   @override
   Widget build(BuildContext context) {
@@ -55,7 +57,7 @@ class QRWidget extends StatelessWidget {
                             ),
                             child: QrImage(
                               data: addressListViewModel.uri.toString(),
-                              backgroundColor: Colors.transparent,
+                              backgroundColor: isBright ? Colors.black : Colors.transparent,
                               foregroundColor: Theme.of(context).accentTextTheme.
                               display3.backgroundColor,
                             ),