Merged 4.1.0

lib/core/backup.dart

@@ -205,8 +205,8 @@ class BackupService {
           _sharedPreferences.getString(PreferencesKey.currentFiatCurrencyKey),
       PreferencesKey.shouldSaveRecipientAddressKey: _sharedPreferences
           .getBool(PreferencesKey.shouldSaveRecipientAddressKey),
-      PreferencesKey.currentDarkTheme:
-          _sharedPreferences.getBool(PreferencesKey.currentDarkTheme),
+      PreferencesKey.isDarkThemeLegacy:
+          _sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy),
       PreferencesKey.currentPinLength:
           _sharedPreferences.getInt(PreferencesKey.currentPinLength),
       PreferencesKey.currentTransactionPriorityKey: _sharedPreferences
@@ -219,7 +219,7 @@ class BackupService {
           _sharedPreferences.getString(PreferencesKey.currentLanguageCode),
       PreferencesKey.displayActionListModeKey:
           _sharedPreferences.getInt(PreferencesKey.displayActionListModeKey),
-      'currentTheme': _sharedPreferences.getInt('current_theme')
+      PreferencesKey.currentTheme: _sharedPreferences.getInt(PreferencesKey.currentTheme)
       // FIX-ME: Unnamed constant.
     };
 

lib/core/seed_validator.dart

@@ -1,4 +1,4 @@
-import 'package:bip39/src/wordlists/english.dart' as bitcoin_english;
+import 'package:cake_wallet/bitcoin/bitcoin_mnemonic.dart' as bitcoin_electrum;
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/entities/mnemonic_item.dart';
 import 'package:cake_wallet/entities/wallet_type.dart';
@@ -64,7 +64,7 @@ class SeedValidator extends Validator<MnemonicItem> {
 
   static List<String> getBitcoinWordList(String language) {
     assert(language.toLowerCase() == LanguageList.english.toLowerCase());
-    return bitcoin_english.WORDLIST;
+    return bitcoin_electrum.englishWordlist;
   }
 
   @override

lib/core/wallet_base.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/entities/balance.dart';
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/core/pending_transaction.dart';
@@ -9,7 +10,7 @@ import 'package:cake_wallet/entities/sync_status.dart';
 import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/entities/wallet_type.dart';
 
-abstract class WalletBase<BalaceType> {
+abstract class WalletBase<BalaceType extends Balance> {
   WalletBase(this.walletInfo);
 
   static String idFor(String name, WalletType type) =>
@@ -52,4 +53,6 @@ abstract class WalletBase<BalaceType> {
   Future<void> save();
 
   Future<void> rescan({int height});
+
+  void close();
 }

lib/core/wallet_credentials.dart

@@ -1,7 +1,7 @@
 import 'package:cake_wallet/entities/wallet_info.dart';
 
 abstract class WalletCredentials {
-  WalletCredentials({this.name, this.password, this.height});
+  WalletCredentials({this.name, this.password, this.height, this.walletInfo});
 
   final String name;
   final int height;