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<WalletNameForm> {
     final walletCreationStore = Provider.of<WalletCreationStore>(context);
     final seedLanguageStore = Provider.of<SeedLanguageStore>(context);
 
+    final List<String> 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<WalletTypeForm> {
                 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<String> 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<Image> flagImages = [
   Image.asset('assets/images/usa.png'),
   Image.asset('assets/images/china.png'),