From 743189669b0e6a27f5c61b78e5443ac4c4d7e3a4 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Thu, 30 Apr 2020 16:16:47 +0300 Subject: [PATCH] CWA-204 | moved seed locales from seed language picker to new wallet page; disabled bitcoin currency button on new wallet type page --- lib/src/screens/new_wallet/new_wallet_page.dart | 11 +++++++++++ lib/src/screens/new_wallet/new_wallet_type_page.dart | 2 +- .../seed_language/widgets/seed_language_picker.dart | 11 ----------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index eeeb6ce5d..507fb610b 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -61,6 +61,17 @@ class _WalletNameFormState extends State { final walletCreationStore = Provider.of(context); final seedLanguageStore = Provider.of(context); + final List seedLocales = [ + S.current.seed_language_english, + S.current.seed_language_chinese, + S.current.seed_language_dutch, + S.current.seed_language_german, + S.current.seed_language_japanese, + S.current.seed_language_portuguese, + S.current.seed_language_russian, + S.current.seed_language_spanish + ]; + nameController.addListener(() { if (nameController.text.isNotEmpty) { walletCreationStore.setDisabledStatus(false); diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart index 7890beb26..4d662998d 100644 --- a/lib/src/screens/new_wallet/new_wallet_type_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart @@ -89,7 +89,7 @@ class WalletTypeFormState extends State { text: 'Bitcoin', color: bitcoinBackgroundColor, textColor: bitcoinTextColor, - onTap: () => onSelectBitcoinButton()), + onTap: () {}), ), Padding( padding: EdgeInsets.only(top: 20), diff --git a/lib/src/screens/seed_language/widgets/seed_language_picker.dart b/lib/src/screens/seed_language/widgets/seed_language_picker.dart index 56e6d56ae..2b478205e 100644 --- a/lib/src/screens/seed_language/widgets/seed_language_picker.dart +++ b/lib/src/screens/seed_language/widgets/seed_language_picker.dart @@ -6,17 +6,6 @@ import 'package:provider/provider.dart'; import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; import 'package:cake_wallet/generated/i18n.dart'; -List seedLocales = [ - S.current.seed_language_english, - S.current.seed_language_chinese, - S.current.seed_language_dutch, - S.current.seed_language_german, - S.current.seed_language_japanese, - S.current.seed_language_portuguese, - S.current.seed_language_russian, - S.current.seed_language_spanish -]; - List flagImages = [ Image.asset('assets/images/usa.png'), Image.asset('assets/images/china.png'),