Merge branch 'dev' of github.com:cake-tech/cake_wallet_private into new-world

lib/di.dart

@@ -261,8 +261,8 @@ Future setup(
   getIt.registerFactory(
       () => SendPage(sendViewModel: getIt.get<SendViewModel>()));
 
-  // getIt.registerFactory(
+  getIt.registerFactory(
-  //         () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
+           () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
 
   getIt.registerFactory(() => WalletListViewModel(
       walletInfoSource, getIt.get<AppStore>(), getIt.get<KeyService>()));
@@ -309,10 +309,10 @@ Future setup(
   getIt
       .registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet));
 
-  getIt.registerFactoryParam<WalletSeedPage, VoidCallback, void>(
+  getIt.registerFactoryParam<WalletSeedPage, bool, void>(
-      (VoidCallback callback, _) => WalletSeedPage(
+      (bool isWalletCreated, _) => WalletSeedPage(
           getIt.get<WalletSeedViewModel>(),
-          onCloseCallback: callback));
+          isNewWalletCreated: isWalletCreated));
 
   getIt
       .registerFactory(() => WalletKeysViewModel(getIt.get<AppStore>().wallet));

lib/palette.dart

@@ -41,6 +41,8 @@ class Palette {
   static const Color shadowWhite = Color.fromRGBO(242, 245, 255, 1.0);
   static const Color niagara = Color.fromRGBO(152, 172, 201, 1.0);
   static const Color alizarinRed = Color.fromRGBO(233, 45, 45, 1.0);
+  static const Color moderateSlateBlue = Color.fromRGBO(129, 93, 251, 1.0);
+  static const Color brightOrange = Color.fromRGBO(255, 102, 0, 1.0);
 
   // FIXME: Rename.
   static const Color eee = Color.fromRGBO(236, 239, 245, 1.0);

lib/router.dart

@@ -227,7 +227,7 @@ class Router {
       case Routes.seed:
         return MaterialPageRoute<void>(
             builder: (_) => getIt.get<WalletSeedPage>(
-                param1: settings.arguments as VoidCallback));
+                param1: settings.arguments as bool));
 
       case Routes.restoreWalletFromSeed:
         final args = settings.arguments as List<dynamic>;

lib/src/screens/base_page.dart

@@ -73,6 +73,7 @@ abstract class BasePage extends StatelessWidget {
             style: TextStyle(
                 fontSize: 18.0,
                 fontWeight: FontWeight.bold,
+                fontFamily: 'Poppins',
                 color: titleColor ??
                        Theme.of(context).primaryTextTheme.title.color),
           );

lib/src/screens/contact/contact_list_page.dart

@@ -197,7 +197,7 @@ class ContactListPage extends BasePage {
     Image image;
     switch (currency) {
       case CryptoCurrency.xmr:
-        image = Image.asset('assets/images/monero.png', height: 24, width: 24);
+        image = Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
         break;
       case CryptoCurrency.ada:
         image = Image.asset('assets/images/ada.png', height: 24, width: 24);
@@ -252,10 +252,10 @@ class ContactListPage extends BasePage {
           return AlertWithTwoActions(
               alertTitle: S.of(context).address_remove_contact,
               alertContent: S.of(context).address_remove_content,
-              leftButtonText: S.of(context).remove,
+              rightButtonText: S.of(context).remove,
-              rightButtonText: S.of(context).cancel,
+              leftButtonText: S.of(context).cancel,
-              actionLeftButton: () => Navigator.of(context).pop(true),
+              actionRightButton: () => Navigator.of(context).pop(true),
-              actionRightButton: () => Navigator.of(context).pop(false));
+              actionLeftButton: () => Navigator.of(context).pop(false));
         });
   }
 
@@ -267,10 +267,10 @@ class ContactListPage extends BasePage {
           return AlertWithTwoActions(
               alertTitle: name,
               alertContent: address,
-              leftButtonText: S.of(context).copy,
+              rightButtonText: S.of(context).copy,
-              rightButtonText: S.of(context).cancel,
+              leftButtonText: S.of(context).cancel,
-              actionLeftButton: () => Navigator.of(context).pop(true),
+              actionRightButton: () => Navigator.of(context).pop(true),
-              actionRightButton: () => Navigator.of(context).pop(false));
+              actionLeftButton: () => Navigator.of(context).pop(false));
         });
   }
 }

lib/src/screens/contact/contact_page.dart

@@ -115,7 +115,7 @@ class ContactPage extends BasePage {
                     _addressController.text = '';
                   },
                   text: S.of(context).reset,
-                  color: Colors.red,
+                  color: Colors.orange,
                   textColor: Colors.white),
             ),
             SizedBox(width: 20),
@@ -130,7 +130,7 @@ class ContactPage extends BasePage {
                           await contactViewModel.save();
                         },
                         text: S.of(context).save,
-                        color: Palette.blueCraiola,
+                        color: Theme.of(context).accentTextTheme.body2.color,
                         textColor: Colors.white,
                         isDisabled: !contactViewModel.isReady)))
           ],

lib/src/screens/dashboard/dashboard_page.dart

@@ -104,9 +104,12 @@ class DashboardPage extends BasePage {
             )),
         Container(
           width: double.infinity,
-          padding: EdgeInsets.only(left: 44, right: 0, bottom: 24),
+          padding: EdgeInsets.only(
+              left: 45,
+              right: 45,
+              bottom: 24
+          ),
           child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: <Widget>[
               Flexible(
                 child: ActionButton(
@@ -120,7 +123,16 @@ class DashboardPage extends BasePage {
                 child: ActionButton(
                     image: exchangeImage,
                     title: S.of(context).exchange,
-                    route: Routes.exchange),
+                    route: Routes.exchange
+                ),
+              ),
+              Flexible(
+                child: ActionButton(
+                  image: receiveImage,
+                  title: S.of(context).receive,
+                  route: Routes.receive,
+                  alignment: Alignment.centerRight,
+                ),
               )
             ],
           ),

lib/src/screens/dashboard/wallet_menu.dart

@@ -49,7 +49,7 @@ class WalletMenu {
         Navigator.of(context).pushNamed(Routes.auth,
             arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) =>
                 isAuthenticatedSuccessfully
-                    ? Navigator.of(auth.context).popAndPushNamed(Routes.seed)
+                    ? Navigator.of(auth.context).popAndPushNamed(Routes.seed, arguments: false)
                     : null);
 
         break;
@@ -79,13 +79,13 @@ class WalletMenu {
           return AlertWithTwoActions(
               alertTitle: S.of(context).reconnection,
               alertContent: S.of(context).reconnect_alert_text,
-              leftButtonText: S.of(context).ok,
+              rightButtonText: S.of(context).ok,
-              rightButtonText: S.of(context).cancel,
+              leftButtonText: S.of(context).cancel,
-              actionLeftButton: () async {
+              actionRightButton: () async {
                 await reconnect?.call();
                 Navigator.of(context).pop();
               },
-              actionRightButton: () => Navigator.of(context).pop());
+              actionLeftButton: () => Navigator.of(context).pop());
         });
   }
 }

lib/src/screens/exchange/widgets/base_exchange_widget.dart

@@ -1,5 +1,4 @@
 import 'dart:ui';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
@@ -39,12 +38,14 @@ class BaseExchangeWidget extends StatefulWidget {
   final bool isTemplate;
 
   @override
-  BaseExchangeWidgetState createState() => BaseExchangeWidgetState(
+  BaseExchangeWidgetState createState() =>
+  BaseExchangeWidgetState(
     exchangeViewModel: exchangeViewModel,
     leading: leading,
     middle: middle,
     trailing: trailing,
-      isTemplate: isTemplate);
+    isTemplate: isTemplate
+  );
 }
 
 class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
@@ -90,8 +91,8 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
         ? exchangeViewModel.wallet.name
         : null;
 
-    WidgetsBinding.instance
+    WidgetsBinding.instance.addPostFrameCallback(
-        .addPostFrameCallback((_) => _setReactions(context, exchangeViewModel));
+            (_) => _setReactions(context, exchangeViewModel));
 
     return Form(
         key: _formKey,
@@ -103,25 +104,18 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                   gradient: LinearGradient(colors: [
                     Theme.of(context).primaryTextTheme.body1.color,
                     Theme.of(context).primaryTextTheme.body1.decorationColor,
-                  ], stops: [
+                  ],
-                    0.35,
+                  stops: [0.35, 1.0],
-                    1.0
+                  begin: Alignment.topLeft,
-                  ], begin: Alignment.topLeft, end: Alignment.bottomRight),
+                  end: Alignment.bottomRight),
                   edgeInsets: EdgeInsets.only(bottom: 32),
                   widget: Column(
                     children: <Widget>[
                       TopPanel(
                           edgeInsets: EdgeInsets.all(0),
-                          gradient: LinearGradient(
+                          gradient: LinearGradient(colors: [
-                              colors: [
+                            Theme.of(context).primaryTextTheme.subtitle.color,
-                                Theme.of(context)
+                            Theme.of(context).primaryTextTheme.subtitle.decorationColor,
-                                    .primaryTextTheme
-                                    .subtitle
-                                    .color,
-                                Theme.of(context)
-                                    .primaryTextTheme
-                                    .subtitle
-                                    .decorationColor,
                           ],
                           begin: Alignment.topLeft,
                           end: Alignment.bottomRight),
@@ -307,33 +301,19 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                                               context: context,
                                               builder: (dialogContext) {
                                                 return AlertWithTwoActions(
-                                                    alertTitle:
+                                                    alertTitle: S.of(context).template,
-                                                        S.of(context).template,
+                                                    alertContent: S.of(context).confirm_delete_template,
-                                                    alertContent: S
+                                                    rightButtonText: S.of(context).delete,
-                                                        .of(context)
+                                                    leftButtonText: S.of(context).cancel,
-                                                        .confirm_delete_template,
+                                                    actionRightButton: () {
-                                                    leftButtonText:
+                                                      Navigator.of(dialogContext).pop();
-                                                        S.of(context).delete,
+                                                      exchangeViewModel.exchangeTemplateStore.remove(template: template);
-                                                    rightButtonText:
+                                                      exchangeViewModel.exchangeTemplateStore.update();
-                                                        S.of(context).cancel,
-                                                    actionLeftButton: () {
-                                                      Navigator.of(
-                                                              dialogContext)
-                                                          .pop();
-                                                      exchangeViewModel
-                                                          .exchangeTemplateStore
-                                                          .remove(
-                                                              template:
-                                                                  template);
-                                                      exchangeViewModel
-                                                          .exchangeTemplateStore
-                                                          .update();
                                                     },
-                                                    actionRightButton: () =>
+                                                    actionLeftButton: () => Navigator.of(dialogContext).pop()
-                                                        Navigator.of(
+                                                );
-                                                                dialogContext)
+                                              }
-                                                            .pop());
+                                          );
-                                              });
                                         },
                                       );
                                     });
@@ -394,17 +374,16 @@ class BaseExchangeWidgetState extends State<BaseExchangeWidget> {
                       exchangeViewModel.createTrade();
                     }
                   },
-                          color: Palette.blueCraiola,
+                  color: Theme.of(context).accentTextTheme.body2.color,
                   textColor: Colors.white,
-                          isLoading:
+                  isLoading: exchangeViewModel.tradeState is TradeIsCreating,
-                              exchangeViewModel.tradeState is TradeIsCreating,
                 )),
           ]),
         ));
   }
 
-  void applyTemplate(
+  void applyTemplate(ExchangeViewModel exchangeViewModel,
-      ExchangeViewModel exchangeViewModel, ExchangeTemplate template) {
+      ExchangeTemplate template) {
     exchangeViewModel.changeDepositCurrency(
         currency: CryptoCurrency.fromString(template.depositCurrency));
     exchangeViewModel.changeReceiveCurrency(

lib/src/screens/exchange_trade/exchange_confirm_page.dart

@@ -7,7 +7,6 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/domain/exchange/trade.dart';
-import 'package:cake_wallet/palette.dart';
 
 class ExchangeConfirmPage extends BasePage {
   ExchangeConfirmPage({@required this.tradesStore}) : trade = tradesStore.trade;
@@ -115,7 +114,7 @@ class ExchangeConfirmPage extends BasePage {
               onPressed: () => Navigator.of(context)
                   .pushReplacementNamed(Routes.exchangeTrade),
               text: S.of(context).saved_the_trade_id,
-              color: Palette.blueCraiola,
+              color: Theme.of(context).accentTextTheme.body2.color,
               textColor: Colors.white)
         ],
       ),

lib/src/screens/exchange_trade/exchange_trade_page.dart

@@ -220,7 +220,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
         bottomSection: PrimaryButton(
           onPressed: () {},
           text: S.of(context).confirm,
-          color: Palette.blueCraiola,
+          color: Theme.of(context).accentTextTheme.body2.color,
           textColor: Colors.white
         )
         /*Observer(

lib/src/screens/monero_accounts/monero_account_list_page.dart

@@ -53,6 +53,7 @@ class MoneroAccountListPage extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 18,
                       fontWeight: FontWeight.bold,
+                      fontFamily: 'Poppins',
                       decoration: TextDecoration.none,
                       color: Colors.white
                   ),
@@ -123,7 +124,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                 .pushNamed(Routes.accountCreation),
                             child: Container(
                               height: 62,
-                              color: Theme.of(context).textTheme.subtitle.decorationColor,
+                              color: Theme.of(context).cardColor,
                               padding: EdgeInsets.only(left: 24, right: 24),
                               child: Center(
                                 child: Row(
@@ -140,6 +141,7 @@ class MoneroAccountListPage extends StatelessWidget {
                                         style: TextStyle(
                                           fontSize: 15,
                                           fontWeight: FontWeight.w600,
+                                          fontFamily: 'Poppins',
                                           color: Colors.white,
                                           decoration: TextDecoration.none,
                                         ),

lib/src/screens/monero_accounts/widgets/account_tile.dart

@@ -32,6 +32,7 @@ class AccountTile extends StatelessWidget {
           style: TextStyle(
             fontSize: 18,
             fontWeight: FontWeight.bold,
+            fontFamily: 'Poppins',
             color: textColor,
             decoration: TextDecoration.none,
           ),

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -1,4 +1,5 @@
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -53,7 +54,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
     _stateReaction ??=
         reaction((_) => _walletNewVM.state, (WalletCreationState state) {
       if (state is WalletCreatedSuccessfully) {
-        Navigator.of(context).popUntil((route) => route.isFirst);
+        Navigator.of(context).popAndPushNamed(Routes.seed, arguments: true);
       }
 
       if (state is WalletCreationFailure) {

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -38,7 +38,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
   static const aspectRatioImage = 1.22;
 
   final moneroIcon =
-      Image.asset('assets/images/monero.png', height: 24, width: 24);
+      Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
   final bitcoinIcon =
       Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
   final walletTypeImage = Image.asset('assets/images/wallet_type.png');

lib/src/screens/nodes/node_create_or_edit_page.dart

@@ -1,4 +1,3 @@
-import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -137,7 +136,7 @@ class NodeCreateOrEditPage extends BasePage {
                         child: PrimaryButton(
                             onPressed: () => nodeCreateOrEditViewModel.reset(),
                             text: S.of(context).reset,
-                            color: Colors.red,
+                            color: Colors.orange,
                             textColor: Colors.white),
                       )),
                       Flexible(
@@ -153,7 +152,7 @@ class NodeCreateOrEditPage extends BasePage {
                             Navigator.of(context).pop();
                           },
                           text: S.of(context).save,
-                          color: Palette.blueCraiola,
+                          color: Theme.of(context).accentTextTheme.body2.color,
                           textColor: Colors.white,
                           isDisabled: !nodeCreateOrEditViewModel.isReady,
                         ),

lib/src/screens/nodes/nodes_list_page.dart

@@ -36,13 +36,13 @@ class NodeListPage extends BasePage {
                         alertTitle: S.of(context).node_reset_settings_title,
                         alertContent:
                             S.of(context).nodes_list_reset_to_default_message,
-                        leftButtonText: S.of(context).reset,
+                        rightButtonText: S.of(context).reset,
-                        rightButtonText: S.of(context).cancel,
+                        leftButtonText: S.of(context).cancel,
-                        actionLeftButton: () async {
+                        actionRightButton: () async {
                           Navigator.of(context).pop();
                           await nodeListViewModel.reset();
                         },
-                        actionRightButton: () => Navigator.of(context).pop());
+                        actionLeftButton: () => Navigator.of(context).pop());
                   });
             },
             child: Text(
@@ -116,11 +116,11 @@ class NodeListPage extends BasePage {
                           return AlertWithTwoActions(
                               alertTitle: S.of(context).remove_node,
                               alertContent: S.of(context).remove_node_message,
-                              leftButtonText: S.of(context).remove,
+                              rightButtonText: S.of(context).remove,
-                              rightButtonText: S.of(context).cancel,
+                              leftButtonText: S.of(context).cancel,
-                              actionLeftButton: () =>
-                                  Navigator.pop(context, true),
                               actionRightButton: () =>
+                                  Navigator.pop(context, true),
+                              actionLeftButton: () =>
                                   Navigator.pop(context, false));
                         });
                   },

lib/src/screens/restore/restore_wallet_from_keys_page.dart

@@ -171,7 +171,19 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
               onHeightChange: (height) {
                 widget.walletRestorationFromKeysVM.height = height;
                 print(height);
-            })],
+            }),
+            Padding(
+              padding: EdgeInsets.only(left: 40, right: 40, top: 24),
+              child: Text(
+                S.of(context).restore_from_date_or_blockheight,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                    fontSize: 12,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).hintColor
+                ),
+              ),
+            )],
           ]),
         ),
         bottomSectionPadding: EdgeInsets.only(bottom: 24),
@@ -189,7 +201,7 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
               }
             },
             text: S.of(context).restore_recover,
-            color: Palette.blueCraiola,
+            color: Theme.of(context).accentTextTheme.body2.color,
             textColor: Colors.white,
             //isDisabled: walletRestorationStore.disabledState,
           );

lib/src/screens/restore/restore_wallet_from_seed_details.dart

@@ -1,4 +1,3 @@
-import 'package:cake_wallet/palette.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -101,13 +100,26 @@ class _RestoreFromSeedDetailsFormState
                 ))
               ],
             ),
-            if (widget.walletRestorationFromSeedVM.hasRestorationHeight)
+            if (widget.walletRestorationFromSeedVM.hasRestorationHeight) ... [
               BlockchainHeightWidget(
                   key: _blockchainHeightKey,
                   onHeightChange: (height) {
                     widget.walletRestorationFromSeedVM.height = height;
                     print(height);
                   }),
+              Padding(
+                padding: EdgeInsets.only(left: 40, right: 40, top: 24),
+                child: Text(
+                  S.of(context).restore_from_date_or_blockheight,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                      fontSize: 12,
+                      fontWeight: FontWeight.normal,
+                      color: Theme.of(context).hintColor
+                  ),
+                ),
+              )
+            ]
           ]),
         ),
         bottomSectionPadding: EdgeInsets.only(bottom: 24),
@@ -121,7 +133,7 @@ class _RestoreFromSeedDetailsFormState
             isLoading:
                 widget.walletRestorationFromSeedVM.state is WalletCreating,
             text: S.of(context).restore_recover,
-            color: Palette.blueCraiola,
+            color: Theme.of(context).accentTextTheme.body2.color,
             textColor: Colors.white,
             isDisabled: _nameController.text.isNotEmpty,
           );

lib/src/screens/restore/restore_wallet_from_seed_page.dart

@@ -6,7 +6,6 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/seed_widget.dart';
 import 'package:cake_wallet/src/domain/common/wallet_type.dart';
 import 'package:cake_wallet/core/seed_validator.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/core/mnemonic_length.dart';
 
 class RestoreWalletFromSeedPage extends BasePage {

lib/src/screens/seed/wallet_seed_page.dart

@@ -1,17 +1,18 @@
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:provider/provider.dart';
 import 'package:esys_flutter_share/esys_flutter_share.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/themes.dart';
-import 'package:cake_wallet/theme_changer.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 
 class WalletSeedPage extends BasePage {
-  WalletSeedPage(this.walletSeedViewModel, {this.onCloseCallback});
+  WalletSeedPage(this.walletSeedViewModel, {@required this.isNewWalletCreated});
 
   static final imageLight = Image.asset('assets/images/crypto_lock_light.png');
   static final imageDark = Image.asset('assets/images/crypto_lock.png');
@@ -19,36 +20,38 @@ class WalletSeedPage extends BasePage {
   @override
   String get title => S.current.seed_title;
 
-  final VoidCallback onCloseCallback;
+  final bool isNewWalletCreated;
   final WalletSeedViewModel walletSeedViewModel;
 
   @override
   void onClose(BuildContext context) =>
-      onCloseCallback != null ? onCloseCallback() : Navigator.of(context).pop();
+      isNewWalletCreated
+          ? Navigator.of(context).popUntil((route) => route.isFirst)
+          : Navigator.of(context).pop();
 
   @override
   Widget leading(BuildContext context) =>
-      onCloseCallback != null ? Offstage() : super.leading(context);
+      isNewWalletCreated ? Offstage() : super.leading(context);
 
   @override
   Widget trailing(BuildContext context) {
-    return onCloseCallback != null
+    return isNewWalletCreated
         ? GestureDetector(
             onTap: () => onClose(context),
             child: Container(
               width: 100,
-              height: 42,
+              height: 32,
               alignment: Alignment.center,
               margin: EdgeInsets.only(left: 10),
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.all(Radius.circular(16)),
-                  color: Theme.of(context).accentTextTheme.title.color),
+                  color: Theme.of(context).accentTextTheme.caption.color),
               child: Text(
                 S.of(context).seed_language_next,
                 style: TextStyle(
                     fontSize: 14,
                     fontWeight: FontWeight.w600,
-                    color: Colors.blue),
+                    color: Palette.blueCraiola),
               ),
             ),
           )
@@ -57,9 +60,7 @@ class WalletSeedPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final _themeChanger = Provider.of<ThemeChanger>(context);
+    final image = getIt.get<SettingsStore>().isDarkTheme ? imageDark : imageLight;
-    final image =
-        _themeChanger.getTheme() == Themes.darkTheme ? imageDark : imageLight;
 
     return Container(
         padding: EdgeInsets.all(24),
@@ -85,19 +86,20 @@ class WalletSeedPage extends BasePage {
                               walletSeedViewModel.name,
                               style: TextStyle(
                                   fontSize: 20,
-                                  fontWeight: FontWeight.bold,
+                                  fontWeight: FontWeight.w600,
                                   color: Theme.of(context)
                                       .primaryTextTheme
                                       .title
                                       .color),
                             ),
                             Padding(
-                              padding: EdgeInsets.only(top: 20),
+                              padding: EdgeInsets.only(top: 20, left: 16, right: 16),
                               child: Text(
                                 walletSeedViewModel.seed,
                                 textAlign: TextAlign.center,
                                 style: TextStyle(
                                     fontSize: 14,
+                                    fontWeight: FontWeight.normal,
                                     color: Theme.of(context)
                                         .primaryTextTheme
                                         .caption
@@ -108,6 +110,25 @@ class WalletSeedPage extends BasePage {
                         );
                       }),
                     ),
+                    Column(
+                      children: <Widget>[
+                        isNewWalletCreated
+                        ? Padding(
+                          padding: EdgeInsets.only(bottom: 52, left: 43, right: 43),
+                          child: Text(
+                            S.of(context).seed_reminder,
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.normal,
+                              color: Theme.of(context)
+                                  .primaryTextTheme
+                                  .overline
+                                  .color
+                            ),
+                          ),
+                        )
+                        : Offstage(),
                         Row(
                           mainAxisSize: MainAxisSize.max,
                           children: <Widget>[
@@ -141,12 +162,14 @@ class WalletSeedPage extends BasePage {
                                             );
                                           },
                                           text: S.of(context).copy,
-                                  color: Colors.blue,
+                                          color: Theme.of(context).accentTextTheme.body2.color,
                                           textColor: Colors.white)),
                                 ))
                           ],
                         )
                       ],
+                    )
+                  ],
                 ))
           ],
         ));

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

@@ -477,7 +477,7 @@ class BaseSendWidget extends StatelessWidget {
               }
             },
             text: S.of(context).send,
-                  color: Palette.blueCraiola,
+            color: Theme.of(context).accentTextTheme.body2.color,
             textColor: Colors.white,
             isLoading: sendViewModel.state is TransactionIsCreating ||
                 sendViewModel.state is TransactionCommitting,

lib/src/screens/settings/change_language.dart

@@ -43,15 +43,15 @@ class ChangeLanguage extends BasePage {
                         return AlertWithTwoActions(
                             alertTitle: S.of(context).change_language,
                             alertContent: S.of(context).change_language_to(item),
-                            leftButtonText: S.of(context).change,
+                            rightButtonText: S.of(context).change,
-                            rightButtonText: S.of(context).cancel,
+                            leftButtonText: S.of(context).cancel,
-                            actionLeftButton: () {
+                            actionRightButton: () {
                               settingsStore.saveLanguageCode(
                                   languageCode: code);
                               currentLanguage.setCurrentLanguage(code);
                               Navigator.of(context).pop();
                             },
-                            actionRightButton: () => Navigator.of(context).pop()
+                            actionLeftButton: () => Navigator.of(context).pop()
                         );
                       });
                 }

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -33,7 +33,7 @@ class WalletListBody extends StatefulWidget {
 
 class WalletListBodyState extends State<WalletListBody> {
   final moneroIcon =
-      Image.asset('assets/images/monero.png', height: 24, width: 24);
+      Image.asset('assets/images/monero_logo.png', height: 24, width: 24);
   final bitcoinIcon =
       Image.asset('assets/images/bitcoin.png', height: 24, width: 24);
   final scrollController = ScrollController();

lib/src/screens/wallet_list/wallet_menu.dart

@@ -122,7 +122,7 @@ class WalletMenu {
             return;
           }
           auth.close();
-          await Navigator.of(context).pushNamed(Routes.seed);
+          await Navigator.of(context).pushNamed(Routes.seed, arguments: false);
         });
         break;
       case 2:

lib/src/widgets/alert_with_one_action.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
-import 'package:cake_wallet/palette.dart';
 
 class AlertWithOneAction extends BaseAlertDialog {
   AlertWithOneAction({
@@ -32,7 +31,7 @@ class AlertWithOneAction extends BaseAlertDialog {
       width: 300,
       height: 52,
       padding: EdgeInsets.only(left: 12, right: 12),
-      color: Palette.blueCraiola,
+      color: Theme.of(context).accentTextTheme.body2.color,
       child: ButtonTheme(
         minWidth: double.infinity,
         child: FlatButton(

lib/src/widgets/base_alert_dialog.dart

@@ -47,7 +47,7 @@ class BaseAlertDialog extends StatelessWidget {
             child: Container(
               height: 52,
               padding: EdgeInsets.only(left: 6, right: 6),
-              color: Palette.blueCraiola,
+              color: Theme.of(context).accentTextTheme.body2.decorationColor,
               child: ButtonTheme(
                 minWidth: double.infinity,
                 child: FlatButton(
@@ -72,7 +72,7 @@ class BaseAlertDialog extends StatelessWidget {
             child: Container(
               height: 52,
               padding: EdgeInsets.only(left: 6, right: 6),
-              color: Palette.alizarinRed,
+              color: Theme.of(context).accentTextTheme.body2.color,
               child: ButtonTheme(
                 minWidth: double.infinity,
                 child: FlatButton(
@@ -92,7 +92,7 @@ class BaseAlertDialog extends StatelessWidget {
                     )),
               ),
             )
-        )
+        ),
       ],
     );
   }

lib/src/widgets/seed_widget.dart

@@ -398,7 +398,7 @@ class SeedWidgetState extends State<SeedWidget> {
                   child: PrimaryButton(
                     onPressed: clear,
                     text: S.of(context).clear,
-                    color: Colors.red,
+                    color: Colors.orange,
                     textColor: Colors.white,
                     isDisabled: items.isEmpty,
                   ),
@@ -413,7 +413,7 @@ class SeedWidgetState extends State<SeedWidget> {
                             onPressed: () => widget.onFinish != null
                                 ? widget.onFinish()
                                 : null,
-                            color: Palette.blueCraiola,
+                            color: Theme.of(context).accentTextTheme.body2.color,
                             textColor: Colors.white)
                         : PrimaryButton(
                             text: selectedItem != null
@@ -424,7 +424,7 @@ class SeedWidgetState extends State<SeedWidget> {
                                 : null,
                             onDisabledPressed: () => showErrorIfExist(),
                             isDisabled: !isCurrentMnemonicValid,
-                            color: Palette.blueCraiola,
+                            color: Theme.of(context).accentTextTheme.body2.color,
                             textColor: Colors.white),
                   ),
                 )

lib/src/widgets/template_tile.dart

@@ -128,7 +128,7 @@ class TemplateTileState extends State<TemplateTile> {
                   child: Container(
                     height: 40,
                     padding: EdgeInsets.only(left: 24, right: 10),
-                    color: Colors.red,
+                    color: Colors.orange,
                     child: content,
                   ),
                 ),

lib/themes.dart

@@ -48,15 +48,16 @@ class Themes {
       ),
       display3: TextStyle(
         color: Colors.white, // text color of current tile (receive page),
-        decorationColor: Palette.blueCraiola // background of current tile (receive page)
+        //decorationColor: Palette.blueCraiola // background of current tile (receive page)
+        decorationColor: Palette.moderateSlateBlue // background of current tile (receive page)
       ),
       display4: TextStyle(
         color: Palette.violetBlue, // text color of tiles (account list)
         decorationColor: Colors.white // background of tiles (account list)
       ),
       subtitle: TextStyle(
-        color: Colors.white, // text color of current tile (account list)
+        color: Palette.moderateSlateBlue, // text color of current tile (account list)
-        decorationColor: Palette.blueCraiola // background of current tile (account list)
+        decorationColor: Colors.white // background of current tile (account list)
       ),
       body1: TextStyle(
         color: Palette.moderatePurpleBlue, // scrollbar thumb
@@ -132,7 +133,8 @@ class Themes {
       subtitle: TextStyle(
         color: Palette.darkBlueCraiola, // QR code (exchange trade page)
         backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
-        decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
+        //decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
+        decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page)
       ),
       headline: TextStyle(
         color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
@@ -166,18 +168,13 @@ class Themes {
       body1: TextStyle(
         color: Palette.darkGray, // indicators (PIN code)
         decorationColor: Palette.darkGray // switch (PIN code)
-      )
       ),
-
+      body2: TextStyle(
-
+        color: Palette.moderateSlateBlue, // primary buttons, alert right buttons
-
+        decorationColor: Palette.brightOrange // alert left button
-    cardColor: Palette.blueAlice,
-    cardTheme: CardTheme(
-      color: Colors.white, // synced card start
       ),
-
+    ),
-
+    cardColor: Palette.moderateSlateBlue // bottom button (action list)
-
   );
 
 
@@ -344,19 +341,12 @@ class Themes {
       body1: TextStyle(
         color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
         decorationColor: PaletteDark.lightPurpleBlue // switch (PIN code)
-      )
       ),
-
+      body2: TextStyle(
-
+        color: Palette.blueCraiola, // primary buttons, alert right buttons
-
+        decorationColor: Palette.alizarinRed // alert left button
-    cardColor: PaletteDark.darkNightBlue,
-    cardTheme: CardTheme(
-      color: PaletteDark.moderateBlue, // synced card start
       ),
-
+    ),
-
+    cardColor: PaletteDark.darkNightBlue // bottom button (action list)
-
-
   );
-
 }

pubspec.lock

@@ -252,7 +252,7 @@ packages:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   csslib:
     dependency: transitive
     description:
@@ -503,7 +503,7 @@ packages:
       name: image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.14"
+    version: "2.1.12"
   intl:
     dependency: "direct main"
     description:
@@ -678,7 +678,7 @@ packages:
       name: petitparser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "2.4.0"
   platform:
     dependency: transitive
     description:
@@ -991,7 +991,7 @@ packages:
       name: xml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.2.0"
+    version: "3.6.1"
   yaml:
     dependency: "direct main"
     description:

res/values/strings_de.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Stellen Sie Ihre Brieftasche aus dem 12-Wort-Kombinationscode wieder her",
   "restore_bitcoin_description_from_keys" : "Stellen Sie Ihre Brieftasche aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her",
   "restore_bitcoin_title_from_keys" : "Aus WIF wiederherstellen",
+  "restore_from_date_or_blockheight" : "Bitte geben Sie das Datum ein, an dem Sie diese Brieftasche erstellt haben. Oder wenn Sie die Blockhöhe kennen, geben Sie sie stattdessen ein",
 
 
+  "seed_reminder" : "Bitte notieren Sie diese, falls Sie Ihr Telefon verlieren oder abwischen",
   "seed_title" : "Seed",
   "seed_share" : "Teilen Sie Seed",
   "copy" : "Kopieren",

res/values/strings_en.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Restore your wallet from 12 word combination code",
   "restore_bitcoin_description_from_keys" : "Restore your wallet from generated WIF string from your private keys",
   "restore_bitcoin_title_from_keys" : "Restore from WIF",
+  "restore_from_date_or_blockheight" : "Please enter the date you created this wallet. Or if you know the blockheight, please enter it instead",
 
 
+  "seed_reminder" : "Please write these down in case you lose or wipe your phone",
   "seed_title" : "Seed",
   "seed_share" : "Share seed",
   "copy" : "Copy",

res/values/strings_es.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Restaure su billetera a partir del código de combinación de 12 palabras",
   "restore_bitcoin_description_from_keys" : "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas",
   "restore_bitcoin_title_from_keys" : "Restaurar desde WIF",
+  "restore_from_date_or_blockheight" : "Ingrese la fecha en que creó esta billetera. O si conoce la altura del bloque, ingréselo en su lugar",
 
 
+  "seed_reminder" : "Anótelos en caso de que pierda o borre su teléfono",
   "seed_title" : "Semilla",
   "seed_share" : "Compartir semillas",
   "copy" : "Dupdo",

res/values/strings_hi.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "12 शब्द संयोजन कोड से अपने वॉलेट को पुनर्स्थापित करें",
   "restore_bitcoin_description_from_keys" : "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें",
   "restore_bitcoin_title_from_keys" : "WIF से पुनर्स्थापित करें",
+  "restore_from_date_or_blockheight" : "कृपया इस वॉलेट को बनाने की तिथि दर्ज करें। या यदि आप ब्लॉकचाइट जानते हैं, तो कृपया इसके बजाय इसे दर्ज करें",
 
 
+  "seed_reminder" : "यदि आप अपना फोन खो देते हैं या मिटा देते हैं तो कृपया इन्हें लिख लें",
   "seed_title" : "बीज",
   "seed_share" : "बीज साझा करें",
   "copy" : "प्रतिलिपि",

res/values/strings_ja.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "12ワードの組み合わせコードからウォレットを復元する",
   "restore_bitcoin_description_from_keys" : "秘密鍵から生成されたWIF文字列からウォレットを復元します",
   "restore_bitcoin_title_from_keys" : "WIFから復元",
+  "restore_from_date_or_blockheight" : "このウォレットを作成した日付を入力してください。 または、ブロックの高さがわかっている場合は、代わりに入力してください",
 
 
+  "seed_reminder" : "スマートフォンを紛失したりワイプした場合に備えて、これらを書き留めてください",
   "seed_title" : "シード",
   "seed_share" : "シードを共有する",
   "copy" : "コピー",

res/values/strings_ko.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "12 단어 조합 코드에서 지갑 복원",
   "restore_bitcoin_description_from_keys" : "개인 키에서 생성 된 WIF 문자열에서 지갑 복원",
   "restore_bitcoin_title_from_keys" : "WIF에서 복원",
+  "restore_from_date_or_blockheight" : "이 지갑을 만든 날짜를 입력하세요. 또는 블록 높이를 알고있는 경우 대신 입력하십시오.",
 
 
+  "seed_reminder" : "휴대 전화를 분실하거나 닦을 경우를 대비해 적어 두세요.",
   "seed_title" : "씨",
   "seed_share" : "시드 공유",
   "copy" : "부",

res/values/strings_nl.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Herstel uw portemonnee met een combinatiecode van 12 woorden",
   "restore_bitcoin_description_from_keys" : "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels",
   "restore_bitcoin_title_from_keys" : "Herstel van WIF",
+  "restore_from_date_or_blockheight" : "Voer de datum in waarop u deze portemonnee heeft gemaakt. Of als u de blokhoogte kent, voer deze dan in",
 
 
+  "seed_reminder" : "Schrijf deze op voor het geval u uw telefoon kwijtraakt of veegt",
   "seed_title" : "Zaad",
   "seed_share" : "Deel zaad",
   "copy" : "Kopiëren",

res/values/strings_pl.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Przywróć swój portfel z kodu złożonego z 12 słów",
   "restore_bitcoin_description_from_keys" : "Przywróć swój portfel z wygenerowanego ciągu WIF z kluczy prywatnych",
   "restore_bitcoin_title_from_keys" : "Przywróć z WIF",
+  "restore_from_date_or_blockheight" : "Wprowadź datę utworzenia tego portfela. Lub jeśli znasz wysokość bloku, wprowadź go zamiast tego",
 
 
+  "seed_reminder" : "Zapisz je na wypadek zgubienia lub wyczyszczenia telefonu",
   "seed_title" : "Ziarno",
   "seed_share" : "Udostępnij ziarno",
   "copy" : "Kopiuj",

res/values/strings_pt.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Restaure sua carteira a partir de um código de combinação de 12 palavras",
   "restore_bitcoin_description_from_keys" : "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas",
   "restore_bitcoin_title_from_keys" : "Restaurar de WIF",
+  "restore_from_date_or_blockheight" : "Por favor, insira a data em que você criou esta carteira. Ou se você souber a altura do bloco, insira-o",
 
 
+  "seed_reminder" : "Anote-os para o caso de perder ou limpar seu telefone",
   "seed_title" : "Semente",
   "seed_share" : "Compartilhar semente",
   "copy" : "Copiar",

res/values/strings_ru.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Вы можете восстановить кошелёк используя 12-ти значную мнемоническую фразу",
   "restore_bitcoin_description_from_keys" : "Вы можете восстановить кошелёк с помощью WIF",
   "restore_bitcoin_title_from_keys" : "Восстановить с помощью WIF",
+  "restore_from_date_or_blockheight" : "Пожалуйста, введите дату создания кошелька. Или, если вы знаете высоту блока, введите ее значение",
 
 
+  "seed_reminder" : "Пожалуйста, запишите мнемоническую фразу на случай потери или очистки телефона",
   "seed_title" : "Мнемоническая фраза",
   "seed_share" : "Поделиться мнемонической фразой",
   "copy" : "Скопировать",

res/values/strings_uk.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "Ви можете відновити гаманець використовуючи 12-ти слівну мнемонічну фразу",
   "restore_bitcoin_description_from_keys" : "Ви можете відновити гаманець за допомогою WIF",
   "restore_bitcoin_title_from_keys" : "Відновити за допомогою WIF",
+  "restore_from_date_or_blockheight" : "Будь ласка, введіть дату створення гаманця. Або, якщо ви знаєте висоту блоку, введіть її значення",
 
 
+  "seed_reminder" : "Будь ласка, запишіть мнемонічну фразу на випадок втрати або очищення телефону",
   "seed_title" : "Мнемонічна фраза",
   "seed_share" : "Поділитися мнемонічною фразою",
   "copy" : "Скопіювати",

res/values/strings_zh.arb

@@ -168,8 +168,10 @@
   "restore_bitcoin_description_from_seed" : "從12個單詞的組合碼恢復您的錢包",
   "restore_bitcoin_description_from_keys" : "從私鑰中生成的WIF字符串還原您的錢包",
   "restore_bitcoin_title_from_keys" : "從WIF還原",
+  "restore_from_date_or_blockheight" : "請輸入創建此錢包的日期。 或者，如果您知道塊高，請改為輸入",
 
 
+  "seed_reminder" : "請寫下這些，以防丟失或擦拭手機",
   "seed_title" : "种子",
   "seed_share" : "分享种子",
   "copy" : "复制",