Fixes

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -70,7 +70,7 @@ class WalletTypeFormState extends State<WalletTypeForm> {
         : walletTypeLightImage;
 
     return Container(
-      padding: EdgeInsets.only(top: 24),
+      padding: EdgeInsets.only(top: 24, bottom: 24),
       child: ScrollableWithBottomSection(
         contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
         content: Column(
@@ -107,7 +107,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
         bottomSection: PrimaryButton(
           onPressed: () => onTypeSelected(),
           text: S.of(context).seed_language_next,
-          color: Colors.green,
+          color: Theme.of(context)
+              .accentTextTheme
+              .subtitle
+              .decorationColor,
           textColor: Colors.white,
           isDisabled: selected == null,
         ),

lib/src/screens/new_wallet/widgets/select_button.dart

@@ -16,7 +16,7 @@ class SelectButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final color = isSelected
-          ? Theme.of(context).accentTextTheme.subtitle.decorationColor
+          ? Colors.green
           : Theme.of(context).accentTextTheme.caption.color;
     final textColor = isSelected
           ? Theme.of(context).accentTextTheme.headline.decorationColor

lib/src/screens/restore/wallet_restore_from_seed_form.dart

@@ -1,3 +1,5 @@
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -7,12 +9,20 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 
 class WalletRestoreFromSeedForm extends StatefulWidget {
-  WalletRestoreFromSeedForm({Key key, this.blockHeightFocusNode,
-    this.onHeightOrDateEntered})
+  WalletRestoreFromSeedForm(
+      {Key key,
+      @required this.displayLanguageSelector,
+      @required this.displayBlockHeightSelector,
+      @required this.type,
+      this.blockHeightFocusNode,
+      this.onHeightOrDateEntered})
       : super(key: key);
 
+  final WalletType type;
+  final bool displayLanguageSelector;
+  final bool displayBlockHeightSelector;
   final FocusNode blockHeightFocusNode;
-  final Function (bool) onHeightOrDateEntered;
+  final Function(bool) onHeightOrDateEntered;
 
   @override
   WalletRestoreFromSeedFormState createState() =>
@@ -41,32 +51,35 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
     return Container(
         padding: EdgeInsets.only(left: 25, right: 25),
         child: Column(children: [
-          SeedWidget(key: seedWidgetStateKey, language: language),
-          GestureDetector(
-              onTap: () async {
-                final selected = await showPopUp<String>(
-                    context: context,
-                    builder: (BuildContext context) =>
-                        SeedLanguagePicker(selected: language));
+          SeedWidget(
+              key: seedWidgetStateKey, language: language, type: widget.type),
+          if (widget.displayLanguageSelector)
+            GestureDetector(
+                onTap: () async {
+                  final selected = await showPopUp<String>(
+                      context: context,
+                      builder: (BuildContext context) =>
+                          SeedLanguagePicker(selected: language));
 
-                if (selected == null || selected.isEmpty) {
-                  return;
-                }
+                  if (selected == null || selected.isEmpty) {
+                    return;
+                  }
 
-                _changeLanguage(selected);
-              },
-              child: Container(
-                  color: Colors.transparent,
-                  padding: EdgeInsets.only(top: 20.0),
-                  child: IgnorePointer(
-                      child: BaseTextFormField(
-                          controller: languageController,
-                          enableInteractiveSelection: false,
-                          readOnly: true)))),
-          BlockchainHeightWidget(
-              focusNode: widget.blockHeightFocusNode,
-              key: blockchainHeightKey,
-              onHeightOrDateEntered: widget.onHeightOrDateEntered)
+                  _changeLanguage(selected);
+                },
+                child: Container(
+                    color: Colors.transparent,
+                    padding: EdgeInsets.only(top: 20.0),
+                    child: IgnorePointer(
+                        child: BaseTextFormField(
+                            controller: languageController,
+                            enableInteractiveSelection: false,
+                            readOnly: true)))),
+          if (widget.displayBlockHeightSelector)
+            BlockchainHeightWidget(
+                focusNode: widget.blockHeightFocusNode,
+                key: blockchainHeightKey,
+                onHeightOrDateEntered: widget.onHeightOrDateEntered)
         ]));
   }
 

lib/src/screens/restore/wallet_restore_page.dart

@@ -25,16 +25,30 @@ class WalletRestorePage extends BasePage {
         _pages = [],
         _blockHeightFocusNode = FocusNode(),
         _controller = PageController(initialPage: 0) {
-    _pages.addAll([
-      WalletRestoreFromSeedForm(
-          key: walletRestoreFromSeedFormKey,
-          blockHeightFocusNode: _blockHeightFocusNode,
-          onHeightOrDateEntered: (value)
-          => walletRestoreViewModel.isButtonEnabled = value),
-      WalletRestoreFromKeysFrom(key: walletRestoreFromKeysFormKey,
-          onHeightOrDateEntered: (value)
-          => walletRestoreViewModel.isButtonEnabled = value)
-    ]);
+    walletRestoreViewModel.availableModes.forEach((mode) {
+      switch (mode) {
+        case WalletRestoreMode.seed:
+          _pages.add(WalletRestoreFromSeedForm(
+              displayBlockHeightSelector:
+                  walletRestoreViewModel.hasBlockchainHeightLanguageSelector,
+              displayLanguageSelector:
+                  walletRestoreViewModel.hasSeedLanguageSelector,
+              type: walletRestoreViewModel.type,
+              key: walletRestoreFromSeedFormKey,
+              blockHeightFocusNode: _blockHeightFocusNode,
+              onHeightOrDateEntered: (value) =>
+                  walletRestoreViewModel.isButtonEnabled = value));
+          break;
+        case WalletRestoreMode.keys:
+          _pages.add(WalletRestoreFromKeysFrom(
+              key: walletRestoreFromKeysFormKey,
+              onHeightOrDateEntered: (value) =>
+                  walletRestoreViewModel.isButtonEnabled = value));
+          break;
+        default:
+          break;
+      }
+    });
   }
 
   @override
@@ -76,20 +90,19 @@ class WalletRestorePage extends BasePage {
       }
     });
 
-    reaction((_) => walletRestoreViewModel.mode, (WalletRestoreMode mode)
-      {
-        walletRestoreViewModel.isButtonEnabled = false;
+    reaction((_) => walletRestoreViewModel.mode, (WalletRestoreMode mode) {
+      walletRestoreViewModel.isButtonEnabled = false;
 
-        walletRestoreFromSeedFormKey.currentState.blockchainHeightKey
-            .currentState.restoreHeightController.text = '';
-        walletRestoreFromSeedFormKey.currentState.blockchainHeightKey
-            .currentState.dateController.text = '';
+      walletRestoreFromSeedFormKey.currentState.blockchainHeightKey.currentState
+          .restoreHeightController.text = '';
+      walletRestoreFromSeedFormKey.currentState.blockchainHeightKey.currentState
+          .dateController.text = '';
 
-        walletRestoreFromKeysFormKey.currentState.blockchainHeightKey
-            .currentState.restoreHeightController.text = '';
-        walletRestoreFromKeysFormKey.currentState.blockchainHeightKey
-            .currentState.dateController.text = '';
-      });
+      walletRestoreFromKeysFormKey.currentState.blockchainHeightKey.currentState
+          .restoreHeightController.text = '';
+      walletRestoreFromKeysFormKey.currentState.blockchainHeightKey.currentState
+          .dateController.text = '';
+    });
 
     return Column(mainAxisAlignment: MainAxisAlignment.center, children: [
       Expanded(
@@ -100,40 +113,37 @@ class WalletRestorePage extends BasePage {
               },
               controller: _controller,
               itemCount: _pages.length,
-              itemBuilder: (_, index) => SingleChildScrollView(child:  _pages[index]))),
-      Padding(
-          padding: EdgeInsets.only(top: 10),
-          child: SmoothPageIndicator(
-            controller: _controller,
-            count: _pages.length,
-            effect: ColorTransitionEffect(
-                spacing: 6.0,
-                radius: 6.0,
-                dotWidth: 6.0,
-                dotHeight: 6.0,
-                dotColor: Theme.of(context).hintColor.withOpacity(0.5),
-                activeDotColor: Theme.of(context).hintColor),
-          )),
+              itemBuilder: (_, index) =>
+                  SingleChildScrollView(child: _pages[index]))),
+      if (_pages.length > 1)
+        Padding(
+            padding: EdgeInsets.only(top: 10),
+            child: SmoothPageIndicator(
+              controller: _controller,
+              count: _pages.length,
+              effect: ColorTransitionEffect(
+                  spacing: 6.0,
+                  radius: 6.0,
+                  dotWidth: 6.0,
+                  dotHeight: 6.0,
+                  dotColor: Theme.of(context).hintColor.withOpacity(0.5),
+                  activeDotColor: Theme.of(context).hintColor),
+            )),
       Padding(
           padding: EdgeInsets.only(top: 20, bottom: 40, left: 25, right: 25),
           child: Observer(
             builder: (context) {
               return LoadingPrimaryButton(
-                  onPressed: () =>
-                      walletRestoreViewModel.create(options: _credentials()),
-                  text: S.of(context).restore_recover,
-                  color: Theme
-                      .of(context)
-                      .accentTextTheme
-                      .subtitle
-                      .decorationColor,
-                  textColor: Theme
-                      .of(context)
-                      .accentTextTheme
-                      .headline
-                      .decorationColor,
-                  isLoading: walletRestoreViewModel.state is IsExecutingState,
-                  isDisabled: !walletRestoreViewModel.isButtonEnabled,);
+                onPressed: () =>
+                    walletRestoreViewModel.create(options: _credentials()),
+                text: S.of(context).restore_recover,
+                color:
+                    Theme.of(context).accentTextTheme.subtitle.decorationColor,
+                textColor:
+                    Theme.of(context).accentTextTheme.headline.decorationColor,
+                isLoading: walletRestoreViewModel.state is IsExecutingState,
+                isDisabled: !walletRestoreViewModel.isButtonEnabled,
+              );
             },
           ))
     ]);
@@ -145,8 +155,11 @@ class WalletRestorePage extends BasePage {
     if (walletRestoreViewModel.mode == WalletRestoreMode.seed) {
       credentials['seed'] = walletRestoreFromSeedFormKey
           .currentState.seedWidgetStateKey.currentState.text;
-      credentials['height'] = walletRestoreFromSeedFormKey
-          .currentState.blockchainHeightKey.currentState.height;
+
+      if (walletRestoreViewModel.hasBlockchainHeightLanguageSelector) {
+        credentials['height'] = walletRestoreFromSeedFormKey
+            .currentState.blockchainHeightKey.currentState.height;
+      }
     } else {
       credentials['address'] =
           walletRestoreFromKeysFormKey.currentState.addressController.text;

lib/src/widgets/seed_widget.dart

@@ -12,20 +12,21 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter/widgets.dart';
 
 class SeedWidget extends StatefulWidget {
-  SeedWidget({Key key, this.language}) : super(key: key);
+  SeedWidget({Key key, this.language, this.type}) : super(key: key);
 
   final String language;
+  final WalletType type;
 
   @override
-  SeedWidgetState createState() => SeedWidgetState(language);
+  SeedWidgetState createState() => SeedWidgetState(language, type);
 }
 
 class SeedWidgetState extends State<SeedWidget> {
-  SeedWidgetState(String language)
+  SeedWidgetState(String language, this.type)
       : controller = TextEditingController(),
         focusNode = FocusNode(),
         words = SeedValidator.getWordList(
-            type: WalletType.monero, language: language) {
+            type:type, language: language) {
     focusNode.addListener(() {
       setState(() {
         if (!focusNode.hasFocus && controller.text.isEmpty) {
@@ -41,6 +42,7 @@ class SeedWidgetState extends State<SeedWidget> {
 
   final TextEditingController controller;
   final FocusNode focusNode;
+  final WalletType type;
   List<String> words;
   bool _showPlaceholder;
 
@@ -55,7 +57,7 @@ class SeedWidgetState extends State<SeedWidget> {
   void changeSeedLanguage(String language) {
     setState(() {
       words = SeedValidator.getWordList(
-          type: WalletType.monero, language: language);
+          type: type, language: language);
     });
   }