From e3678d2cf91e06d3ec0e32142e5c48ef80899f5f Mon Sep 17 00:00:00 2001
From: M <m@cakewallet.com>
Date: Mon, 28 Sep 2020 18:47:43 +0300
Subject: [PATCH] Fixes

---
 lib/core/contact_service.dart                 |  38 ---
 lib/di.dart                                   |  31 +-
 lib/entities/language.dart                    |  38 ---
 lib/entities/language_service.dart            |  26 ++
 lib/entities/node.dart                        |  36 ++-
 lib/entities/record.dart                      |   3 +-
 lib/main.dart                                 | 195 +++---------
 lib/router.dart                               |   9 +-
 lib/src/reactions/set_reactions.dart          |  98 ------
 lib/src/screens/base_page.dart                |  44 ++-
 .../screens/contact/contact_list_page.dart    |   8 +-
 .../dashboard/create_dashboard_page.dart      |  33 --
 lib/src/screens/dashboard/dashboard_page.dart |   2 +-
 .../dashboard/widgets/balance_page.dart       |  73 ++---
 .../exchange/widgets/exchange_card.dart       |  10 +-
 lib/src/screens/faq/faq_item.dart             |  61 ++++
 lib/src/screens/faq/faq_page.dart             | 140 +-------
 lib/src/screens/send/send_page.dart           | 299 +++++++++---------
 lib/src/screens/settings/change_language.dart |  96 +++---
 lib/src/widgets/alert_close_button.dart       |   2 +-
 lib/store/app_store.dart                      |   4 -
 lib/store/contact_list_store.dart             |  12 -
 lib/store/settings_store.dart                 |  24 +-
 lib/store/theme_changer_store.dart            |  13 -
 lib/theme_changer.dart                        |  16 -
 lib/utils/date_formatter.dart                 |   2 +-
 lib/utils/mobx.dart                           |   6 +-
 .../contact_list/contact_list_view_model.dart |  24 +-
 .../contact_list/contact_view_model.dart      |   9 +-
 lib/view_model/send/send_view_model.dart      |   8 +-
 .../settings/settings_view_model.dart         |  24 +-
 test/widget_test.dart                         |   2 +-
 32 files changed, 482 insertions(+), 904 deletions(-)
 delete mode 100644 lib/core/contact_service.dart
 delete mode 100644 lib/entities/language.dart
 create mode 100644 lib/entities/language_service.dart
 delete mode 100644 lib/src/reactions/set_reactions.dart
 delete mode 100644 lib/src/screens/dashboard/create_dashboard_page.dart
 create mode 100644 lib/src/screens/faq/faq_item.dart
 delete mode 100644 lib/store/contact_list_store.dart
 delete mode 100644 lib/store/theme_changer_store.dart
 delete mode 100644 lib/theme_changer.dart

diff --git a/lib/core/contact_service.dart b/lib/core/contact_service.dart
deleted file mode 100644
index 3f2a46203..000000000
--- a/lib/core/contact_service.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/store/contact_list_store.dart';
-import 'package:cake_wallet/entities/contact.dart';
-
-class ContactService {
-  ContactService(this.contactSource, this.contactListStore) {
-    _forceUpdateContactListStore();
-  }
-
-  final Box<Contact> contactSource;
-  final ContactListStore contactListStore;
-
-  Future add(Contact contact) async {
-    await contactSource.add(contact);
-    // contactListStore.contacts.add(contact);
-  }
-
-  Future update(Contact contact) async {
-    await contact.save();
-    final index = contactListStore.contacts.indexOf(contact) ?? -1;
-
-    if (index >= 0) {
-      _forceUpdateContactListStore();
-    } else {
-      // contactListStore.contacts.add(contact);
-    }
-  }
-
-  Future delete(Contact contact) async {
-    await contact.delete();
-    contactListStore.contacts.remove(contact);
-  }
-
-  void _forceUpdateContactListStore() {
-    contactListStore.contacts.clear();
-    // contactListStore.contacts.addAll(contactSource.values);
-  }
-}
diff --git a/lib/di.dart b/lib/di.dart
index d6ccde3cc..d133b6ed0 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -1,5 +1,4 @@
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
-import 'package:cake_wallet/core/contact_service.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
 import 'package:cake_wallet/entities/biometric_auth.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
@@ -8,22 +7,22 @@ import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/exchange/trade.dart';
 
-// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
 import 'package:cake_wallet/src/screens/contact/contact_list_page.dart';
 import 'package:cake_wallet/src/screens/contact/contact_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
+import 'package:cake_wallet/src/screens/faq/faq_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
 import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
 import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
 import 'package:cake_wallet/src/screens/send/send_template_page.dart';
+import 'package:cake_wallet/src/screens/settings/change_language.dart';
 import 'package:cake_wallet/src/screens/settings/settings.dart';
 import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
-import 'package:cake_wallet/store/contact_list_store.dart';
 import 'package:cake_wallet/store/node_list_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/core/auth_service.dart';
@@ -38,10 +37,7 @@ import 'package:cake_wallet/src/screens/receive/receive_page.dart';
 import 'package:cake_wallet/src/screens/send/send_page.dart';
 import 'package:cake_wallet/src/screens/subaddress/address_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
-import 'package:cake_wallet/store/theme_changer_store.dart';
 import 'package:cake_wallet/store/wallet_list_store.dart';
-import 'package:cake_wallet/utils/mobx.dart';
-import 'package:cake_wallet/theme_changer.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
@@ -62,11 +58,9 @@ import 'package:cake_wallet/view_model/wallet_keys_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
-import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:cake_wallet/view_model/wallet_restoration_from_seed_vm.dart';
@@ -104,17 +98,13 @@ Future setup(
   getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
   getIt.registerSingleton(AuthenticationStore());
   getIt.registerSingleton<WalletListStore>(WalletListStore());
-  getIt.registerSingleton(ContactListStore());
   getIt.registerSingleton(NodeListStoreBase.instance);
   getIt.registerSingleton<SettingsStore>(settingsStore);
   getIt.registerSingleton<AppStore>(AppStore(
       authenticationStore: getIt.get<AuthenticationStore>(),
       walletList: getIt.get<WalletListStore>(),
       settingsStore: getIt.get<SettingsStore>(),
-      contactListStore: getIt.get<ContactListStore>(),
       nodeListStore: getIt.get<NodeListStore>()));
-  getIt.registerSingleton<ContactService>(
-      ContactService(contactSource, getIt.get<AppStore>().contactListStore));
   getIt.registerSingleton<TradesStore>(TradesStore(
       tradesSource: tradesSource, settingsStore: getIt.get<SettingsStore>()));
   getIt.registerSingleton<TradeFilterStore>(TradeFilterStore());
@@ -285,14 +275,10 @@ Future setup(
   getIt.registerFactory(() => WalletKeysPage(getIt.get<WalletKeysViewModel>()));
 
   getIt.registerFactoryParam<ContactViewModel, ContactRecord, void>(
-      (ContactRecord contact, _) => ContactViewModel(
-          contactSource, getIt.get<AppStore>().wallet,
-          contact: contact));
+      (ContactRecord contact, _) =>
+          ContactViewModel(contactSource, contact: contact));
 
-  getIt.registerFactory(() => ContactListViewModel(
-      getIt.get<AppStore>().contactListStore,
-      getIt.get<ContactService>(),
-      contactSource));
+  getIt.registerFactory(() => ContactListViewModel(contactSource));
 
   getIt.registerFactoryParam<ContactListPage, bool, void>(
       (bool isEditable, _) => ContactListPage(getIt.get<ContactListViewModel>(),
@@ -366,9 +352,8 @@ Future setup(
   getIt.registerFactory(() => RescanViewModel(getIt.get<AppStore>().wallet));
 
   getIt.registerFactory(() => RescanPage(getIt.get<RescanViewModel>()));
-}
 
-void setupThemeChangerStore(ThemeChanger themeChanger) {
-  getIt.registerSingleton<ThemeChangerStore>(
-      ThemeChangerStore(themeChanger: themeChanger));
+  getIt.registerFactory(() => FaqPage(getIt.get<SettingsStore>()));
+
+  getIt.registerFactory(() => LanguageListPage(getIt.get<SettingsStore>()));
 }
diff --git a/lib/entities/language.dart b/lib/entities/language.dart
deleted file mode 100644
index 16e1d1a6a..000000000
--- a/lib/entities/language.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:devicelocale/devicelocale.dart';
-import 'package:intl/intl.dart';
-
-const Map<String, String> languages = {
-  'en': 'English',
-  'de': 'Deutsch (German)',
-  'es': 'Español (Spanish)',
-  'hi': 'हिंदी (Hindi)',
-  'ja': '日本 (Japanese)',
-  'ko': '한국어 (Korean)',
-  'nl': 'Nederlands (Dutch)',
-  'pl': 'Polski (Polish)',
-  'pt': 'Português (Portuguese)',
-  'ru': 'Русский (Russian)',
-  'uk': 'Українська (Ukrainian)',
-  'zh': '中文 (Chinese)'
-};
-
-class Language with ChangeNotifier {
-  Language(this._currentLanguage);
-
-  String _currentLanguage;
-
-  String getCurrentLanguage() => _currentLanguage;
-
-  void setCurrentLanguage(String language) {
-    _currentLanguage = language;
-    notifyListeners();
-  }
-
-  static Future<String> localeDetection() async {
-    var locale = await Devicelocale.currentLocale;
-    locale = Intl.shortLocale(locale);
-
-    return languages.keys.contains(locale) ? locale : 'en';
-  }
-}
\ No newline at end of file
diff --git a/lib/entities/language_service.dart b/lib/entities/language_service.dart
new file mode 100644
index 000000000..4ea158353
--- /dev/null
+++ b/lib/entities/language_service.dart
@@ -0,0 +1,26 @@
+import 'package:devicelocale/devicelocale.dart';
+import 'package:intl/intl.dart';
+
+class LanguageService {
+  static const Map<String, String> list = {
+    'en': 'English',
+    'de': 'Deutsch (German)',
+    'es': 'Español (Spanish)',
+    'hi': 'हिंदी (Hindi)',
+    'ja': '日本 (Japanese)',
+    'ko': '한국어 (Korean)',
+    'nl': 'Nederlands (Dutch)',
+    'pl': 'Polski (Polish)',
+    'pt': 'Português (Portuguese)',
+    'ru': 'Русский (Russian)',
+    'uk': 'Українська (Ukrainian)',
+    'zh': '中文 (Chinese)'
+  };
+
+  static Future<String> localeDetection() async {
+    var locale = await Devicelocale.currentLocale;
+    locale = Intl.shortLocale(locale);
+
+    return list.keys.contains(locale) ? locale : 'en';
+  }
+}
diff --git a/lib/entities/node.dart b/lib/entities/node.dart
index f79b8b2e0..d96834dcb 100644
--- a/lib/entities/node.dart
+++ b/lib/entities/node.dart
@@ -61,24 +61,28 @@ class Node extends HiveObject with Keyable {
   }
 
   Future<bool> requestMoneroNode() async {
-    Map<String, dynamic> resBody;
+    try {
+      Map<String, dynamic> resBody;
 
-    if (login != null && password != null) {
-      final digestRequest = DigestRequest();
-      final response = await digestRequest.request(
-          uri: uri, login: login, password: password);
-      resBody = response.data as Map<String, dynamic>;
-    } else {
-      final url = Uri.http(uri, '/json_rpc');
-      final headers = {'Content-type': 'application/json'};
-      final body =
-          json.encode({'jsonrpc': '2.0', 'id': '0', 'method': 'get_info'});
-      final response =
-          await http.post(url.toString(), headers: headers, body: body);
-      resBody = json.decode(response.body) as Map<String, dynamic>;
+      if (login != null && password != null) {
+        final digestRequest = DigestRequest();
+        final response = await digestRequest.request(
+            uri: uri, login: login, password: password);
+        resBody = response.data as Map<String, dynamic>;
+      } else {
+        final url = Uri.http(uri, '/json_rpc');
+        final headers = {'Content-type': 'application/json'};
+        final body =
+            json.encode({'jsonrpc': '2.0', 'id': '0', 'method': 'get_info'});
+        final response =
+            await http.post(url.toString(), headers: headers, body: body);
+        resBody = json.decode(response.body) as Map<String, dynamic>;
+      }
+
+      return !(resBody['result']['offline'] as bool);
+    } catch (_) {
+      return false;
     }
-
-    return !(resBody['result']['offline'] as bool);
   }
 
   Future<bool> requestBitcoinElectrumServer() async {
diff --git a/lib/entities/record.dart b/lib/entities/record.dart
index 3c21441cc..1ca661684 100644
--- a/lib/entities/record.dart
+++ b/lib/entities/record.dart
@@ -5,6 +5,7 @@ import 'package:hive/hive.dart';
 
 abstract class Record<T extends HiveObject> with Keyable {
   Record(this._source, this.original) {
+    key = original.key;
     _listener?.cancel();
     _listener = _source.watch(key: original.key).listen((event) {
       if (!event.deleted) {
@@ -16,7 +17,7 @@ abstract class Record<T extends HiveObject> with Keyable {
     toBind(original);
   }
 
-  dynamic get key => original.key;
+  dynamic key;
 
   @override
   dynamic get keyIndex => key;
diff --git a/lib/main.dart b/lib/main.dart
index 66cca43a5..4a49b646a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,66 +1,30 @@
-import 'package:cake_wallet/entities/fs_migration.dart';
-import 'package:cake_wallet/entities/transaction_description.dart';
-import 'package:cake_wallet/entities/transaction_description.dart';
-import 'package:cake_wallet/reactions/bootstrap.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/store/authentication_store.dart';
-import 'package:cake_wallet/core/auth_service.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
-import 'package:cake_wallet/monero/monero_wallet_service.dart';
-import 'package:cake_wallet/core/wallet_creation_service.dart';
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/view_model/wallet_new_vm.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:get_it/get_it.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cw_monero/wallet.dart' as monero_wallet;
 import 'package:cake_wallet/router.dart';
-import 'theme_changer.dart';
-import 'themes.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/reactions/bootstrap.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/store/authentication_store.dart';
+import 'package:cake_wallet/entities/transaction_description.dart';
 import 'package:cake_wallet/entities/get_encryption_key.dart';
 import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/entities/wallet_info.dart';
-import 'package:cake_wallet/exchange/trade.dart';
-
-// import 'package:cake_wallet/monero/transaction_description.dart';
-import 'package:cake_wallet/src/reactions/set_reactions.dart';
-
-// import 'package:cake_wallet/src/stores/login/login_store.dart';
-// import 'package:cake_wallet/src/stores/balance/balance_store.dart';
-// import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-// import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
-// import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
-import 'package:cake_wallet/src/screens/root/root.dart';
-
-//import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-// import 'package:cake_wallet/src/stores/price/price_store.dart';
-// import 'package:cake_wallet/src/domain/services/user_service.dart';
-// import 'package:cake_wallet/src/domain/services/wallet_list_service.dart';
-import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/default_settings_migration.dart';
-import 'package:cake_wallet/entities/fiat_currency.dart';
-import 'package:cake_wallet/entities/transaction_priority.dart';
 import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/exchange/exchange_template.dart';
-
-// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-// import 'package:cake_wallet/src/domain/services/fiat_convertation_service.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/entities/language.dart';
-// import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart';
-
-bool isThemeChangerRegistered = false;
+import 'package:cake_wallet/src/screens/root/root.dart';
 
 final navigatorKey = GlobalKey<NavigatorState>();
 
@@ -94,41 +58,6 @@ void main() async {
   final templates = await Hive.openBox<Template>(Template.boxName);
   final exchangeTemplates =
       await Hive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);
-
-  // final sharedPreferences = await SharedPreferences.getInstance();
-  // final walletService = WalletService();
-  // final fiatConvertationService = FiatConvertationService();
-  // final walletListService = WalletListService(
-  //     secureStorage: secureStorage,
-  //     walletInfoSource: walletInfoSource,
-  //     walletService: walletService,
-  //     sharedPreferences: sharedPreferences);
-  // final userService = UserService(
-  //     sharedPreferences: sharedPreferences, secureStorage: secureStorage);
-  // final settingsStore = await SettingsStoreBase.load(
-  //     nodes: nodes,
-  //     sharedPreferences: sharedPreferences,
-  //     initialFiatCurrency: FiatCurrency.usd,
-  //     initialTransactionPriority: TransactionPriority.slow,
-  //     initialBalanceDisplayMode: BalanceDisplayMode.availableBalance);
-  // final priceStore = PriceStore();
-  // final walletStore =
-  //     WalletStore(walletService: walletService, settingsStore: settingsStore);
-  // final syncStore = SyncStore(walletService: walletService);
-  // final balanceStore = BalanceStore(
-  //     walletService: walletService,
-  //     settingsStore: settingsStore,
-  //     priceStore: priceStore);
-  // final loginStore = LoginStore(
-  //     sharedPreferences: sharedPreferences, walletsService: walletListService);
-  // final seedLanguageStore = SeedLanguageStore();
-  // final sendTemplateStore = SendTemplateStore(templateSource: templates);
-  // final exchangeTemplateStore =
-  //     ExchangeTemplateStore(templateSource: exchangeTemplates);
-
-  // final walletCreationService = WalletCreationService();
-  // final authService = AuthService();
-
   await initialSetup(
       sharedPreferences: await SharedPreferences.getInstance(),
       nodes: nodes,
@@ -139,15 +68,7 @@ void main() async {
       templates: templates,
       exchangeTemplates: exchangeTemplates,
       initialMigrationVersion: 4);
-//   setReactions(
-//       settingsStore: settingsStore,
-//       priceStore: priceStore,
-//       syncStore: syncStore,
-//       walletStore: walletStore,
-//       walletService: walletService,
-// //      authenticationStore: authenticationStore,
-//       loginStore: loginStore);
-  runApp(CakeWalletApp());
+  runApp(App());
 }
 
 Future<void> initialSetup(
@@ -178,63 +99,25 @@ Future<void> initialSetup(
   monero_wallet.onStartup();
 }
 
-class CakeWalletApp extends StatelessWidget {
-  CakeWalletApp() {
+class App extends StatelessWidget {
+  App() {
     SystemChrome.setPreferredOrientations(
         [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
   }
 
-
   @override
   Widget build(BuildContext context) {
-    //final settingsStore = Provider.of<SettingsStore>(context);
     final settingsStore = getIt.get<AppStore>().settingsStore;
 
-    return ChangeNotifierProvider<ThemeChanger>(
-        create: (_) => ThemeChanger(
-            settingsStore.isDarkTheme ? Themes.darkTheme : Themes.lightTheme),
-        child: ChangeNotifierProvider<Language>(
-            create: (_) => Language(settingsStore.languageCode),
-            child: MaterialAppWithTheme()));
-  }
-}
-
-class MaterialAppWithTheme extends StatelessWidget {
-  MaterialAppWithTheme();
-
-  @override
-  Widget build(BuildContext context) {
-    // final sharedPreferences = Provider.of<SharedPreferences>(context);
-    // final walletService = Provider.of<WalletService>(context);
-    // final walletListService = Provider.of<WalletListService>(context);
-    // final userService = Provider.of<UserService>(context);
-    // final settingsStore = Provider.of<SettingsStore>(context);
-    // final priceStore = Provider.of<PriceStore>(context);
-    // final walletStore = Provider.of<WalletStore>(context);
-    // final syncStore = Provider.of<SyncStore>(context);
-    // final balanceStore = Provider.of<BalanceStore>(context);
-    final theme = Provider.of<ThemeChanger>(context);
-    final currentLanguage = Provider.of<Language>(context);
-    // final contacts = Provider.of<Box<Contact>>(context);
-    // final nodes = Provider.of<Box<Node>>(context);
-    // final trades = Provider.of<Box<Trade>>(context);
-    // final transactionDescriptions =
-    //     Provider.of<Box<TransactionDescription>>(context);
-
-    if (!isThemeChangerRegistered) {
-      setupThemeChangerStore(theme);
-      isThemeChangerRegistered = true;
+    if (settingsStore.theme == null) {
+      settingsStore.isDarkTheme = false;
     }
 
-    /*final statusBarColor =
-        settingsStore.isDarkTheme ? Colors.black : Colors.white;*/
-    final _settingsStore = getIt.get<AppStore>().settingsStore;
-
     final statusBarColor = Colors.transparent;
     final statusBarBrightness =
-        _settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
+        settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
     final statusBarIconBrightness =
-        _settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
+        settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
     final authenticationStore = getIt.get<AuthenticationStore>();
     final initialRoute = authenticationStore.state == AuthenticationState.denied
         ? Routes.welcome
@@ -245,22 +128,24 @@ class MaterialAppWithTheme extends StatelessWidget {
         statusBarBrightness: statusBarBrightness,
         statusBarIconBrightness: statusBarIconBrightness));
 
-    return Root(
-        authenticationStore: authenticationStore,
-        child: MaterialApp(
-          navigatorKey: navigatorKey,
-          debugShowCheckedModeBanner: false,
-          theme: theme.getTheme(),
-          localizationsDelegates: [
-            S.delegate,
-            GlobalCupertinoLocalizations.delegate,
-            GlobalMaterialLocalizations.delegate,
-            GlobalWidgetsLocalizations.delegate,
-          ],
-          supportedLocales: S.delegate.supportedLocales,
-          locale: Locale(currentLanguage.getCurrentLanguage()),
-          onGenerateRoute: (settings) => Router.generateRoute(settings),
-          initialRoute: initialRoute,
-        ));
+    return Observer(builder: (BuildContext context) {
+      return Root(
+          authenticationStore: authenticationStore,
+          child: MaterialApp(
+            navigatorKey: navigatorKey,
+            debugShowCheckedModeBanner: false,
+            theme: settingsStore.theme,
+            localizationsDelegates: [
+              S.delegate,
+              GlobalCupertinoLocalizations.delegate,
+              GlobalMaterialLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
+            ],
+            supportedLocales: S.delegate.supportedLocales,
+            locale: Locale(settingsStore.languageCode),
+            onGenerateRoute: (settings) => Router.generateRoute(settings),
+            initialRoute: initialRoute,
+          ));
+    });
   }
 }
diff --git a/lib/router.dart b/lib/router.dart
index cc660d9a0..7407e9b11 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -252,8 +252,8 @@ class Router {
 
       case Routes.addressBookAddContact:
         return CupertinoPageRoute<void>(
-            builder: (_) =>
-                getIt.get<ContactPage>(param1: settings.arguments as ContactRecord));
+            builder: (_) => getIt.get<ContactPage>(
+                param1: settings.arguments as ContactRecord));
 
       case Routes.showKeys:
         return MaterialPageRoute<void>(
@@ -297,10 +297,11 @@ class Router {
         return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
 
       case Routes.faq:
-        return MaterialPageRoute<void>(builder: (_) => FaqPage());
+        return MaterialPageRoute<void>(builder: (_) => getIt.get<FaqPage>());
 
       case Routes.changeLanguage:
-        return MaterialPageRoute<void>(builder: (_) => ChangeLanguage());
+        return MaterialPageRoute<void>(
+            builder: (_) => getIt.get<LanguageListPage>());
 
       default:
         return MaterialPageRoute<void>(
diff --git a/lib/src/reactions/set_reactions.dart b/lib/src/reactions/set_reactions.dart
deleted file mode 100644
index 788f3bcb1..000000000
--- a/lib/src/reactions/set_reactions.dart
+++ /dev/null
@@ -1,98 +0,0 @@
-// import 'dart:async';
-// import 'package:flutter/foundation.dart';
-// import 'package:mobx/mobx.dart';
-// import 'package:cake_wallet/entities/node.dart';
-// import 'package:cake_wallet/entities/sync_status.dart';
-// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-// import 'package:cake_wallet/src/start_updating_price.dart';
-// import 'package:cake_wallet/src/stores/sync/sync_store.dart';
-// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-// import 'package:cake_wallet/src/stores/price/price_store.dart';
-// import 'package:cake_wallet/src/stores/authentication/authentication_store.dart';
-// import 'package:cake_wallet/src/stores/login/login_store.dart';
-//
-// Timer _reconnectionTimer;
-// ReactionDisposer _connectToNodeDisposer;
-// ReactionDisposer _onSyncStatusChangeDisposer;
-// ReactionDisposer _onCurrentWalletChangeDisposer;
-//
-// void setReactions(
-//     {@required SettingsStore settingsStore,
-//     @required PriceStore priceStore,
-//     @required SyncStore syncStore,
-//     @required WalletStore walletStore,
-//     @required WalletService walletService,
-// //    @required AuthenticationStore authenticationStore,
-//     @required LoginStore loginStore}) {
-//   connectToNode(settingsStore: settingsStore, walletStore: walletStore);
-//   onSyncStatusChange(
-//       syncStore: syncStore,
-//       walletStore: walletStore,
-//       settingsStore: settingsStore);
-//   onCurrentWalletChange(
-//       walletStore: walletStore,
-//       settingsStore: settingsStore,
-//       priceStore: priceStore);
-//   autorun((_) async {
-// //    if (authenticationStore.state == AuthenticationState.allowed) {
-// //      await loginStore.loadCurrentWallet();
-// //      authenticationStore.state = AuthenticationState.readyToLogin;
-// //    }
-//   });
-// }
-//
-// void connectToNode({SettingsStore settingsStore, WalletStore walletStore}) {
-//   _connectToNodeDisposer?.call();
-//
-//   _connectToNodeDisposer = reaction((_) => settingsStore.node,
-//       (Node node) async => await walletStore.connectToNode(node: node));
-// }
-//
-// void onCurrentWalletChange(
-//     {WalletStore walletStore,
-//     SettingsStore settingsStore,
-//     PriceStore priceStore}) {
-//   _onCurrentWalletChangeDisposer?.call();
-//
-//   reaction((_) => walletStore.name, (String _) {
-//     walletStore.connectToNode(node: settingsStore.node);
-//     startUpdatingPrice(settingsStore: settingsStore, priceStore: priceStore);
-//   });
-// }
-//
-// void onSyncStatusChange(
-//     {SyncStore syncStore,
-//     WalletStore walletStore,
-//     SettingsStore settingsStore}) {
-//   // _onSyncStatusChangeDisposer?.call();
-//
-//   // reaction((_) => syncStore.status, (SyncStatus status) async {
-//   //   if (status is ConnectedSyncStatus) {
-//   //     await walletStore.startSync();
-//   //   }
-//
-//   //   // Reconnect to the node if the app is not started sync after 30 seconds
-//   //   if (status is StartingSyncStatus) {
-//   //     startReconnectionObserver(syncStore: syncStore, walletStore: walletStore);
-//   //   }
-//   // });
-// }
-//
-// void startReconnectionObserver({SyncStore syncStore, WalletStore walletStore}) {
-//   if (_reconnectionTimer != null) {
-//     _reconnectionTimer.cancel();
-//   }
-//
-//   _reconnectionTimer = Timer.periodic(Duration(minutes: 1), (_) async {
-//     try {
-//       final isConnected = await walletStore.isConnected();
-//
-//       if (!isConnected) {
-//         await walletStore.reconnect();
-//       }
-//     } catch (e) {
-//       print(e);
-//     }
-//   });
-// }
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index bc6da2521..f8cfa5ae1 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -1,14 +1,22 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/widgets/nav_bar.dart';
-import 'package:provider/provider.dart';
-import 'package:cake_wallet/themes.dart';
-import 'package:cake_wallet/theme_changer.dart';
 import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/src/widgets/nav_bar.dart';
 
 enum AppBarStyle { regular, withShadow, transparent }
 
 abstract class BasePage extends StatelessWidget {
+  BasePage()
+      : _scaffoldKey = GlobalKey<ScaffoldState>(),
+        _closeButtonImage = Image.asset('assets/images/close_button.png'),
+        _closeButtonImageDarkTheme =
+            Image.asset('assets/images/close_button_dark_theme.png');
+  final GlobalKey<ScaffoldState> _scaffoldKey;
+  final Image _closeButtonImage;
+  final Image _closeButtonImageDarkTheme;
+
   String get title => null;
 
   bool get isModalBackButton => false;
@@ -29,11 +37,7 @@ abstract class BasePage extends StatelessWidget {
 
   Widget Function(BuildContext, Widget) get rootWrapper => null;
 
-  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
-
-  final _closeButtonImage = Image.asset('assets/images/close_button.png');
-  final _closeButtonImageDarkTheme =
-      Image.asset('assets/images/close_button_dark_theme.png');
+  bool get _isDarkTheme => getIt.get<SettingsStore>().isDarkTheme;
 
   void onOpenEndDrawer() => _scaffoldKey.currentState.openEndDrawer();
 
@@ -45,12 +49,9 @@ abstract class BasePage extends StatelessWidget {
     }
 
     final _backButton = Image.asset('assets/images/back_arrow.png',
-          color: titleColor ?? Theme.of(context).primaryTextTheme.title.color);
-
-    final _themeChanger = Provider.of<ThemeChanger>(context);
-    final _closeButton = _themeChanger.getTheme() == Themes.darkTheme
-    ? _closeButtonImageDarkTheme
-    : _closeButtonImage;
+        color: titleColor ?? Theme.of(context).primaryTextTheme.title.color);
+    final _closeButton =
+        _isDarkTheme ? _closeButtonImageDarkTheme : _closeButtonImage;
 
     return SizedBox(
       height: 37,
@@ -77,7 +78,7 @@ abstract class BasePage extends StatelessWidget {
                 fontWeight: FontWeight.bold,
                 fontFamily: 'Poppins',
                 color: titleColor ??
-                       Theme.of(context).primaryTextTheme.title.color),
+                    Theme.of(context).primaryTextTheme.title.color),
           );
   }
 
@@ -86,10 +87,8 @@ abstract class BasePage extends StatelessWidget {
   Widget floatingActionButton(BuildContext context) => null;
 
   ObstructingPreferredSizeWidget appBar(BuildContext context) {
-    final _themeChanger = Provider.of<ThemeChanger>(context);
-    final _isDarkTheme = _themeChanger.getTheme() == Themes.darkTheme;
-    final appBarColor = _isDarkTheme
-                        ? backgroundDarkColor : backgroundLightColor;
+    final appBarColor =
+        _isDarkTheme ? backgroundDarkColor : backgroundLightColor;
 
     switch (appBarStyle) {
       case AppBarStyle.regular:
@@ -131,9 +130,6 @@ abstract class BasePage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _themeChanger = Provider.of<ThemeChanger>(context);
-    final _isDarkTheme = _themeChanger.getTheme() == Themes.darkTheme;
-
     final root = Scaffold(
         key: _scaffoldKey,
         backgroundColor:
@@ -142,7 +138,7 @@ abstract class BasePage extends StatelessWidget {
         extendBodyBehindAppBar: extendBodyBehindAppBar,
         endDrawer: endDrawer,
         appBar: appBar(context),
-        body: body(context), //SafeArea(child: ),
+        body: body(context),
         floatingActionButton: floatingActionButton(context));
 
     return rootWrapper?.call(context, root) ?? root;
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index 37c37876f..5344c4736 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -164,10 +164,10 @@ class ContactListPage extends BasePage {
                                final isDelete =
                                    await showAlertDialog(context) ?? false;
 
-                               // if (isDelete) {
-                               //   await contactListViewModel
-                               //       .delete(contact);
-                               // }
+                               if (isDelete) {
+                                 await contactListViewModel
+                                     .delete(contact);
+                               }
                              },
                            ),
                          ],
diff --git a/lib/src/screens/dashboard/create_dashboard_page.dart b/lib/src/screens/dashboard/create_dashboard_page.dart
deleted file mode 100644
index a14c2498a..000000000
--- a/lib/src/screens/dashboard/create_dashboard_page.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hive/hive.dart';
-import 'package:provider/provider.dart';
-import 'package:cake_wallet/exchange/trade.dart';
-// import 'package:cake_wallet/monero/transaction_description.dart';
-// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
-// import 'package:cake_wallet/src/screens/dashboard/dashboard_page.dart';
-// import 'package:cake_wallet/src/stores/action_list/action_list_store.dart';
-// import 'package:cake_wallet/src/stores/action_list/trade_filter_store.dart';
-// import 'package:cake_wallet/src/stores/action_list/transaction_filter_store.dart';
-// import 'package:cake_wallet/src/stores/price/price_store.dart';
-// import 'package:cake_wallet/src/stores/settings/settings_store.dart';
-// import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
-
-// FIXME: Remove me.
-
-// Widget createDashboardPage(
-//         {@required WalletService walletService,
-//         @required PriceStore priceStore,
-//         @required Box<TransactionDescription> transactionDescriptions,
-//         @required SettingsStore settingsStore,
-//         @required Box<Trade> trades,
-//         @required WalletStore walletStore}) =>
-//     Provider(
-//         create: (_) => ActionListStore(
-//             walletService: walletService,
-//             settingsStore: settingsStore,
-//             priceStore: priceStore,
-//             tradesSource: trades,
-//             transactionFilterStore: TransactionFilterStore(),
-//             tradeFilterStore: TradeFilterStore(walletStore: walletStore),
-//             transactionDescriptions: transactionDescriptions),
-//         child: DashboardPage());
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index fecaec430..0d7347d24 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -105,7 +105,7 @@ class DashboardPage extends BasePage {
         Container(
           padding: EdgeInsets.only(left: 45, right: 45, bottom: 24),
           child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: <Widget>[
               ActionButton(
                   image: sendImage,
diff --git a/lib/src/screens/dashboard/widgets/balance_page.dart b/lib/src/screens/dashboard/widgets/balance_page.dart
index e6c0ccef7..4410fc3ff 100644
--- a/lib/src/screens/dashboard/widgets/balance_page.dart
+++ b/lib/src/screens/dashboard/widgets/balance_page.dart
@@ -11,44 +11,41 @@ class BalancePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       padding: EdgeInsets.all(24),
-      child: Center(
-        child: Container(
-          height: 160,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              Observer(builder: (_) {
-                return Text(
-                  dashboardViewModel.balanceViewModel.currency.toString(),
-                  style: TextStyle(
-                      fontSize: 40,
-                      fontWeight: FontWeight.bold,
-                      color: Theme.of(context).indicatorColor,
-                      height: 1),
-                );
-              }),
-              Observer(builder: (_) {
-                return Text(dashboardViewModel.balanceViewModel.cryptoBalance,
-                    style: TextStyle(
-                        fontSize: 54,
-                        fontWeight: FontWeight.bold,
-                        color: Colors.white,
-                        height: 1),
-                    textAlign: TextAlign.center);
-              }),
-              Observer(builder: (_) {
-                return Text(dashboardViewModel.balanceViewModel.fiatBalance,
-                    style: TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).indicatorColor,
-                        height: 1),
-                    textAlign: TextAlign.center);
-              }),
-            ],
-          ),
-        ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: <Widget>[
+          Observer(builder: (_) {
+            return Text(
+              dashboardViewModel.balanceViewModel.currency.toString(),
+              style: TextStyle(
+                  fontSize: 40,
+                  fontWeight: FontWeight.bold,
+                  color: Theme.of(context).indicatorColor,
+                  height: 1),
+            );
+          }),
+          SizedBox(height: 10),
+          Observer(builder: (_) {
+            return Text(dashboardViewModel.balanceViewModel.cryptoBalance,
+                style: TextStyle(
+                    fontSize: 54,
+                    fontWeight: FontWeight.bold,
+                    color: Colors.white,
+                    height: 1),
+                textAlign: TextAlign.center);
+          }),
+          SizedBox(height: 10),
+          Observer(builder: (_) {
+            return Text(dashboardViewModel.balanceViewModel.fiatBalance,
+                style: TextStyle(
+                    fontSize: 18,
+                    fontWeight: FontWeight.w500,
+                    color: Theme.of(context).indicatorColor,
+                    height: 1),
+                textAlign: TextAlign.center);
+          }),
+        ],
       ),
     );
   }
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 28c7980f8..cd2fa6527 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -146,11 +146,11 @@ class ExchangeCardState extends State<ExchangeCard> {
                   textAlign: TextAlign.left,
                   keyboardType: TextInputType.numberWithOptions(
                       signed: false, decimal: true),
-                  inputFormatters: [
-                    LengthLimitingTextInputFormatter(15),
-                    BlacklistingTextInputFormatter(
-                        RegExp('[\\-|\\ |\\,]'))
-                  ],
+                  // inputFormatters: [
+                  //   LengthLimitingTextInputFormatter(15),
+                  //   BlacklistingTextInputFormatter(
+                  //       RegExp('[\\-|\\ |\\,]'))
+                  // ],
                   hintText: '0.0000',
                   borderColor: widget.borderColor,
                   textStyle: TextStyle(
diff --git a/lib/src/screens/faq/faq_item.dart b/lib/src/screens/faq/faq_item.dart
new file mode 100644
index 000000000..5463b3f1c
--- /dev/null
+++ b/lib/src/screens/faq/faq_item.dart
@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
+
+class FAQItem extends StatefulWidget {
+  FAQItem(this.title, this.text);
+
+  final String title;
+  final String text;
+
+  @override
+  State<StatefulWidget> createState() => FAQItemState();
+}
+
+class FAQItemState extends State<FAQItem> {
+  bool isActive;
+
+  @override
+  void initState() {
+    isActive = false;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final addIcon =
+        Icon(Icons.add, color: Theme.of(context).primaryTextTheme.title.color);
+    final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
+    final icon = isActive ? removeIcon : addIcon;
+    final color = isActive
+        ? Palette.blueCraiola
+        : Theme.of(context).primaryTextTheme.title.color;
+
+    return ListTileTheme(
+      contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
+      child: ExpansionTile(
+        title: Text(widget.title,
+            style: TextStyle(
+                fontSize: 14, fontWeight: FontWeight.w500, color: color)),
+        trailing: icon,
+        onExpansionChanged: (value) => setState(() => isActive = value),
+        children: <Widget>[
+          Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
+            Expanded(
+                child: Container(
+              padding: EdgeInsets.only(
+                right: 24.0,
+              ),
+              child: Text(
+                widget.text,
+                style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).primaryTextTheme.title.color),
+              ),
+            ))
+          ])
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/screens/faq/faq_page.dart b/lib/src/screens/faq/faq_page.dart
index b68c95732..467431e18 100644
--- a/lib/src/screens/faq/faq_page.dart
+++ b/lib/src/screens/faq/faq_page.dart
@@ -1,46 +1,30 @@
 import 'dart:convert';
-import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/src/screens/faq/faq_item.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 
 class FaqPage extends BasePage {
+  FaqPage(this.settingsStore);
+
+  final SettingsStore settingsStore;
+
   @override
   String get title => S.current.faq;
 
-  @override
-  Widget body(BuildContext context) => FaqForm();
-}
-
-class FaqForm extends StatefulWidget {
-  @override
-  FaqFormState createState() => FaqFormState();
-}
-
-class FaqFormState extends State<FaqForm> {
-  List<Icon> icons;
-  List<Color> colors;
-  bool isLoaded = false;
+  String get path => 'assets/faq/faq_' + settingsStore.languageCode + '.json';
 
   @override
-  Widget build(BuildContext context) {
-    final addIcon = Icon(Icons.add, color: Theme.of(context).primaryTextTheme.title.color);
-    final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
-
+  Widget body(BuildContext context) {
     return Container(
       padding: EdgeInsets.only(top: 12, left: 24),
       child: FutureBuilder(
         builder: (context, snapshot) {
           final faqItems = jsonDecode(snapshot.data.toString()) as List;
 
-          if (snapshot.hasData) {
-            setIconsAndColors(context, faqItems.length, addIcon);
-          }
-
           return SingleChildScrollView(
             child: Column(
               children: <Widget>[
@@ -49,112 +33,20 @@ class FaqFormState extends State<FaqForm> {
                   shrinkWrap: true,
                   physics: NeverScrollableScrollPhysics(),
                   itemBuilder: (BuildContext context, int index) {
-                    final itemTitle = faqItems[index]["question"].toString();
-                    final itemChild = faqItems[index]["answer"].toString();
+                    final title = faqItems[index]["question"].toString();
+                    final text = faqItems[index]["answer"].toString();
 
-                    return ListTileTheme(
-                      contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
-                      child: ExpansionTile(
-                        title: Text(
-                          itemTitle,
-                          style: TextStyle(
-                              fontSize: 14,
-                              fontWeight: FontWeight.w500,
-                              color: colors[index]
-                          ),
-                        ),
-                        trailing: icons[index],
-                        onExpansionChanged: (value) {
-                          setState(() {
-                            if (value) {
-                              icons[index] = removeIcon;
-                              colors[index] = Palette.blueCraiola;
-                            } else {
-                              icons[index] = addIcon;
-                              colors[index] = Theme.of(context).primaryTextTheme.title.color;
-                            }
-                          });
-                        },
-                        children: <Widget>[
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            children: <Widget>[
-                              Expanded(
-                                  child: Container(
-                                    padding: EdgeInsets.only(
-                                        right: 24.0,
-                                    ),
-                                    child: Text(
-                                      itemChild,
-                                      style: TextStyle(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.normal,
-                                          color: Theme.of(context).primaryTextTheme.title.color
-                                      ),
-                                    ),
-                                  ))
-                            ],
-                          )
-                        ],
-                      ),
-                    );
+                    return FAQItem(title, text);
                   },
-                  separatorBuilder: (_, __) =>
-                      StandardListSeparator(),
-                  itemCount: faqItems == null ? 0 : faqItems.length,
+                  separatorBuilder: (_, __) => StandardListSeparator(),
+                  itemCount: faqItems?.length ?? 0,
                 )
               ],
             ),
           );
         },
-        future: rootBundle.loadString(getFaqPath(context)),
+        future: rootBundle.loadString(path),
       ),
     );
   }
-
-  void setIconsAndColors(BuildContext context, int index, Icon icon) {
-    if (isLoaded) {
-      return;
-    }
-
-    icons = List.generate(index, (int i) => icon);
-    colors = List.generate(index, (int i) => Theme.of(context).primaryTextTheme.title.color);
-
-    isLoaded = true;
-  }
-
-  String getFaqPath(BuildContext context) {
-    // FIXME: FIXME
-    // final settingsStore = Provider.of<SettingsStore>(context);
-    //
-    // switch (settingsStore.languageCode) {
-    //   case 'en':
-    //     return 'assets/faq/faq_en.json';
-    //   case 'uk':
-    //     return 'assets/faq/faq_uk.json';
-    //   case 'ru':
-    //     return 'assets/faq/faq_ru.json';
-    //   case 'es':
-    //     return 'assets/faq/faq_es.json';
-    //   case 'ja':
-    //     return 'assets/faq/faq_ja.json';
-    //   case 'ko':
-    //     return 'assets/faq/faq_ko.json';
-    //   case 'hi':
-    //     return 'assets/faq/faq_hi.json';
-    //   case 'de':
-    //     return 'assets/faq/faq_de.json';
-    //   case 'zh':
-    //     return 'assets/faq/faq_zh.json';
-    //   case 'pt':
-    //     return 'assets/faq/faq_pt.json';
-    //   case 'pl':
-    //     return 'assets/faq/faq_pl.json';
-    //   case 'nl':
-    //     return 'assets/faq/faq_nl.json';
-    //   default:
-    //     return 'assets/faq/faq_en.json';
-    // }
-    return '';
-  }
-}
\ No newline at end of file
+}
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index d62b14ead..1bc42ccca 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+
 // import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -20,6 +21,7 @@ import 'package:dotted_border/dotted_border.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
+
 // import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
@@ -70,8 +72,7 @@ class SendPage extends BasePage {
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.only(
                       bottomLeft: Radius.circular(24),
-                      bottomRight: Radius.circular(24)
-                  ),
+                      bottomRight: Radius.circular(24)),
                   gradient: LinearGradient(colors: [
                     Theme.of(context).primaryTextTheme.subhead.color,
                     Theme.of(context).primaryTextTheme.subhead.decorationColor,
@@ -106,10 +107,14 @@ class SendPage extends BasePage {
                               AddressTextFieldOption.qrCode,
                               AddressTextFieldOption.addressBook
                             ],
-                            buttonColor:
-                            Theme.of(context).primaryTextTheme.display1.color,
-                            borderColor:
-                            Theme.of(context).primaryTextTheme.headline.color,
+                            buttonColor: Theme.of(context)
+                                .primaryTextTheme
+                                .display1
+                                .color,
+                            borderColor: Theme.of(context)
+                                .primaryTextTheme
+                                .headline
+                                .color,
                             textStyle: TextStyle(
                                 fontSize: 14,
                                 fontWeight: FontWeight.w500,
@@ -123,83 +128,76 @@ class SendPage extends BasePage {
                                     .decorationColor),
                             validator: sendViewModel.addressValidator,
                           ),
-                          Observer(builder: (_) {
-                            return Padding(
-                                padding: const EdgeInsets.only(top: 20),
-                                child: BaseTextFormField(
-                                    controller: _cryptoAmountController,
-                                    keyboardType: TextInputType.numberWithOptions(
-                                        signed: false, decimal: true),
-                                    inputFormatters: [
-                                      BlacklistingTextInputFormatter(
-                                          RegExp('[\\-|\\ |\\,]'))
-                                    ],
-                                    prefixIcon: Padding(
-                                      padding: EdgeInsets.only(top: 9),
-                                      child:
-                                      Text(sendViewModel.currency.title + ':',
-                                          style: TextStyle(
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.w600,
-                                            color: Colors.white,
-                                          )),
-                                    ),
-                                    suffixIcon: Container(
-                                      height: 32,
-                                      width: 32,
-                                      margin: EdgeInsets.only(
-                                          left: 14, top: 4, bottom: 10),
-                                      decoration: BoxDecoration(
-                                          color: Theme.of(context)
-                                              .primaryTextTheme
-                                              .display1
-                                              .color,
-                                          borderRadius: BorderRadius.all(
-                                              Radius.circular(6))),
-                                      child: InkWell(
-                                        onTap: () =>
-                                            sendViewModel.setSendAll(),
-                                        child: Center(
-                                          child: Text(S.of(context).all,
-                                              textAlign: TextAlign.center,
-                                              style: TextStyle(
-                                                  fontSize: 12,
-                                                  fontWeight: FontWeight.bold,
-                                                  color: Theme.of(context)
-                                                      .primaryTextTheme
-                                                      .display1
-                                                      .decorationColor)),
-                                        ),
-                                      ),
-                                    ),
-                                    hintText: '0.0000',
-                                    borderColor: Theme.of(context)
-                                        .primaryTextTheme
-                                        .headline
-                                        .color,
-                                    textStyle: TextStyle(
-                                        fontSize: 14,
-                                        fontWeight: FontWeight.w500,
-                                        color: Colors.white),
-                                    placeholderTextStyle: TextStyle(
+                          Padding(
+                              padding: const EdgeInsets.only(top: 20),
+                              child: BaseTextFormField(
+                                  controller: _cryptoAmountController,
+                                  keyboardType: TextInputType.numberWithOptions(
+                                      signed: false, decimal: true),
+                                  prefixIcon: Padding(
+                                    padding: EdgeInsets.only(top: 9),
+                                    child:
+                                        Text(sendViewModel.currency.title + ':',
+                                            style: TextStyle(
+                                              fontSize: 16,
+                                              fontWeight: FontWeight.w600,
+                                              color: Colors.white,
+                                            )),
+                                  ),
+                                  suffixIcon: Container(
+                                    height: 32,
+                                    width: 32,
+                                    margin: EdgeInsets.only(
+                                        left: 14, top: 4, bottom: 10),
+                                    decoration: BoxDecoration(
                                         color: Theme.of(context)
                                             .primaryTextTheme
-                                            .headline
-                                            .decorationColor,
-                                        fontWeight: FontWeight.w500,
-                                        fontSize: 14),
-                                    validator: sendViewModel.amountValidator));
-                          }),
+                                            .display1
+                                            .color,
+                                        borderRadius: BorderRadius.all(
+                                            Radius.circular(6))),
+                                    child: InkWell(
+                                      onTap: () => sendViewModel.setSendAll(),
+                                      child: Center(
+                                        child: Text(S.of(context).all,
+                                            textAlign: TextAlign.center,
+                                            style: TextStyle(
+                                                fontSize: 12,
+                                                fontWeight: FontWeight.bold,
+                                                color: Theme.of(context)
+                                                    .primaryTextTheme
+                                                    .display1
+                                                    .decorationColor)),
+                                      ),
+                                    ),
+                                  ),
+                                  hintText: '0.0000',
+                                  borderColor: Theme.of(context)
+                                      .primaryTextTheme
+                                      .headline
+                                      .color,
+                                  textStyle: TextStyle(
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w500,
+                                      color: Colors.white),
+                                  placeholderTextStyle: TextStyle(
+                                      color: Theme.of(context)
+                                          .primaryTextTheme
+                                          .headline
+                                          .decorationColor,
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 14),
+                                  validator: sendViewModel.amountValidator)),
                           Observer(
                               builder: (_) => Padding(
-                                padding: EdgeInsets.only(top: 10),
-                                child: Row(
-                                  mainAxisSize: MainAxisSize.max,
-                                  mainAxisAlignment:
-                                  MainAxisAlignment.spaceBetween,
-                                  children: <Widget>[
-                                    Expanded(
-                                        child: Text(
+                                    padding: EdgeInsets.only(top: 10),
+                                    child: Row(
+                                      mainAxisSize: MainAxisSize.max,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: <Widget>[
+                                        Expanded(
+                                            child: Text(
                                           S.of(context).available_balance + ':',
                                           style: TextStyle(
                                               fontSize: 12,
@@ -209,29 +207,25 @@ class SendPage extends BasePage {
                                                   .headline
                                                   .decorationColor),
                                         )),
-                                    Text(
-                                      sendViewModel.balance,
-                                      style: TextStyle(
-                                          fontSize: 12,
-                                          fontWeight: FontWeight.w600,
-                                          color: Theme.of(context)
-                                              .primaryTextTheme
-                                              .headline
-                                              .decorationColor),
-                                    )
-                                  ],
-                                ),
-                              )),
+                                        Text(
+                                          sendViewModel.balance,
+                                          style: TextStyle(
+                                              fontSize: 12,
+                                              fontWeight: FontWeight.w600,
+                                              color: Theme.of(context)
+                                                  .primaryTextTheme
+                                                  .headline
+                                                  .decorationColor),
+                                        )
+                                      ],
+                                    ),
+                                  )),
                           Padding(
                               padding: const EdgeInsets.only(top: 20),
                               child: BaseTextFormField(
                                 controller: _fiatAmountController,
                                 keyboardType: TextInputType.numberWithOptions(
                                     signed: false, decimal: true),
-                                inputFormatters: [
-                                  BlacklistingTextInputFormatter(
-                                      RegExp('[\\-|\\ |\\,]'))
-                                ],
                                 prefixIcon: Padding(
                                   padding: EdgeInsets.only(top: 9),
                                   child: Text(sendViewModel.fiat.title + ':',
@@ -260,51 +254,51 @@ class SendPage extends BasePage {
                               )),
                           Observer(
                               builder: (_) => GestureDetector(
-                                onTap: () =>
-                                    _setTransactionPriority(context),
-                                child: Container(
-                                  padding: EdgeInsets.only(top: 24),
-                                  child: Row(
-                                    mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                    children: <Widget>[
-                                      Text(S.of(context).send_estimated_fee,
-                                          style: TextStyle(
-                                              fontSize: 12,
-                                              fontWeight: FontWeight.w500,
-                                              //color: Theme.of(context).primaryTextTheme.display2.color,
-                                              color: Colors.white)),
-                                      Container(
-                                        child: Row(
-                                          children: <Widget>[
-                                            Text(
-                                                sendViewModel.estimatedFee
-                                                    .toString() +
-                                                    ' ' +
-                                                    sendViewModel
-                                                        .currency.title,
-                                                style: TextStyle(
-                                                    fontSize: 12,
-                                                    fontWeight:
-                                                    FontWeight.w600,
-                                                    //color: Theme.of(context).primaryTextTheme.display2.color,
-                                                    color: Colors.white)),
-                                            Padding(
-                                              padding:
-                                              EdgeInsets.only(left: 5),
-                                              child: Icon(
-                                                Icons.arrow_forward_ios,
-                                                size: 12,
-                                                color: Colors.white,
-                                              ),
-                                            )
-                                          ],
-                                        ),
-                                      )
-                                    ],
-                                  ),
-                                ),
-                              ))
+                                    onTap: () =>
+                                        _setTransactionPriority(context),
+                                    child: Container(
+                                      padding: EdgeInsets.only(top: 24),
+                                      child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        children: <Widget>[
+                                          Text(S.of(context).send_estimated_fee,
+                                              style: TextStyle(
+                                                  fontSize: 12,
+                                                  fontWeight: FontWeight.w500,
+                                                  //color: Theme.of(context).primaryTextTheme.display2.color,
+                                                  color: Colors.white)),
+                                          Container(
+                                            child: Row(
+                                              children: <Widget>[
+                                                Text(
+                                                    sendViewModel.estimatedFee
+                                                            .toString() +
+                                                        ' ' +
+                                                        sendViewModel
+                                                            .currency.title,
+                                                    style: TextStyle(
+                                                        fontSize: 12,
+                                                        fontWeight:
+                                                            FontWeight.w600,
+                                                        //color: Theme.of(context).primaryTextTheme.display2.color,
+                                                        color: Colors.white)),
+                                                Padding(
+                                                  padding:
+                                                      EdgeInsets.only(left: 5),
+                                                  child: Icon(
+                                                    Icons.arrow_forward_ios,
+                                                    size: 12,
+                                                    color: Colors.white,
+                                                  ),
+                                                )
+                                              ],
+                                            ),
+                                          )
+                                        ],
+                                      ),
+                                    ),
+                                  ))
                         ],
                       ),
                     )
@@ -358,7 +352,7 @@ class SendPage extends BasePage {
                                 alignment: Alignment.center,
                                 decoration: BoxDecoration(
                                   borderRadius:
-                                  BorderRadius.all(Radius.circular(20)),
+                                      BorderRadius.all(Radius.circular(20)),
                                   color: Colors.transparent,
                                 ),
                                 child: Text(
@@ -427,13 +421,12 @@ class SendPage extends BasePage {
               )
             ],
           ),
-          bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+          bottomSectionPadding:
+              EdgeInsets.only(left: 24, right: 24, bottom: 24),
           bottomSection: Observer(builder: (_) {
             return LoadingPrimaryButton(
                 onPressed: () {
-                  if (_formKey.currentState.validate()) {
-
-                  }
+                  if (_formKey.currentState.validate()) {}
                 },
                 text: S.of(context).send,
                 color: Theme.of(context).accentTextTheme.body2.color,
@@ -441,10 +434,9 @@ class SendPage extends BasePage {
                 isLoading: sendViewModel.state is IsExecutingState ||
                     sendViewModel.state is TransactionCommitting,
                 isDisabled:
-                false // FIXME !(syncStore.status is SyncedSyncStatus),
-            );
-          })
-      ),
+                    false // FIXME !(syncStore.status is SyncedSyncStatus),
+                );
+          })),
     );
   }
 
@@ -514,7 +506,7 @@ class SendPage extends BasePage {
                     alertTitle: S.of(context).confirm_sending,
                     amount: S.of(context).send_amount,
                     amountValue:
-                    sendViewModel.pendingTransaction.amountFormatted,
+                        sendViewModel.pendingTransaction.amountFormatted,
                     fee: S.of(context).send_fee,
                     feeValue: sendViewModel.pendingTransaction.feeFormatted,
                     leftButtonText: S.of(context).ok,
@@ -565,7 +557,10 @@ class SendPage extends BasePage {
                                             onPressed: () =>
                                                 Navigator.of(context).pop(),
                                             text: S.of(context).send_got_it,
-                                            color: Theme.of(context).accentTextTheme.body2.color,
+                                            color: Theme.of(context)
+                                                .accentTextTheme
+                                                .body2
+                                                .color,
                                             textColor: Colors.white))
                                   ],
                                 );
diff --git a/lib/src/screens/settings/change_language.dart b/lib/src/screens/settings/change_language.dart
index 3b06aefa8..37801802a 100644
--- a/lib/src/screens/settings/change_language.dart
+++ b/lib/src/screens/settings/change_language.dart
@@ -1,67 +1,67 @@
 import 'package:cake_wallet/src/screens/settings/widgets/language_row.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:provider/provider.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/entities/language.dart';
+import 'package:cake_wallet/entities/language_service.dart';
+
 // import 'package:cake_wallet/src/stores/settings/settings_store.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 
-// FIXME: FIXME
+class LanguageListPage extends BasePage {
+  LanguageListPage(this.settingsStore);
+
+  final SettingsStore settingsStore;
 
-class ChangeLanguage extends BasePage {
   @override
   String get title => S.current.settings_change_language;
 
   @override
   Widget body(BuildContext context) {
-    // final settingsStore = Provider.of<SettingsStore>(context);
-    // final currentLanguage = Provider.of<Language>(context);
-    //
-    // return Container(
-    //     padding: EdgeInsets.only(top: 10.0),
-    //     child: SectionStandardList(
-    //       sectionCount: 1,
-    //       context: context,
-    //       itemCounter: (int sectionIndex) => languages.values.length,
-    //       itemBuilder: (_, sectionIndex, index) {
-    //         final item = languages.values.elementAt(index);
-    //         final code = languages.keys.elementAt(index);
-    //
-    //         final isCurrent = settingsStore.languageCode == null
-    //             ? false
-    //             : code == settingsStore.languageCode;
-    //
-    //         return LanguageRow(
-    //           title: item,
-    //           isSelected: isCurrent,
-    //           handler: (context) async {
-    //             if (!isCurrent) {
-    //               await showPopUp<void>(
-    //                   context: context,
-    //                   builder: (BuildContext context) {
-    //                     return AlertWithTwoActions(
-    //                         alertTitle: S.of(context).change_language,
-    //                         alertContent: S.of(context).change_language_to(item),
-    //                         rightButtonText: S.of(context).change,
-    //                         leftButtonText: S.of(context).cancel,
-    //                         actionRightButton: () {
-    //                           settingsStore.saveLanguageCode(
-    //                               languageCode: code);
-    //                           currentLanguage.setCurrentLanguage(code);
-    //                           Navigator.of(context).pop();
-    //                         },
-    //                         actionLeftButton: () => Navigator.of(context).pop()
-    //                     );
-    //                   });
-    //             }
-    //           },
-    //         );
-    //       },
-    //     )
-    // );
+    return Container(
+        padding: EdgeInsets.only(top: 10.0),
+        child: SectionStandardList(
+          sectionCount: 1,
+          context: context,
+          itemCounter: (int sectionIndex) => LanguageService.list.values.length,
+          itemBuilder: (_, sectionIndex, index) {
+            return Observer(builder: (BuildContext context) {
+              final item = LanguageService.list.values.elementAt(index);
+              final code = LanguageService.list.keys.elementAt(index);
+              final isCurrent = code == settingsStore.languageCode ?? false;
+
+              return LanguageRow(
+                title: item,
+                isSelected: isCurrent,
+                handler: (context) async {
+                  if (!isCurrent) {
+                    await showPopUp<void>(
+                        context: context,
+                        builder: (BuildContext context) {
+                          return AlertWithTwoActions(
+                              alertTitle: S.of(context).change_language,
+                              alertContent:
+                                  S.of(context).change_language_to(item),
+                              rightButtonText: S.of(context).change,
+                              leftButtonText: S.of(context).cancel,
+                              actionRightButton: () {
+                                settingsStore.languageCode = code;
+                                Navigator.of(context).pop();
+                              },
+                              actionLeftButton: () =>
+                                  Navigator.of(context).pop());
+                        });
+                  }
+                },
+              );
+            });
+          },
+        ));
 
     return null;
   }
diff --git a/lib/src/widgets/alert_close_button.dart b/lib/src/widgets/alert_close_button.dart
index 0f21be5df..9349eb5b7 100644
--- a/lib/src/widgets/alert_close_button.dart
+++ b/lib/src/widgets/alert_close_button.dart
@@ -8,7 +8,7 @@ class AlertCloseButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Positioned(
-        bottom: 24,
+        bottom: 60,
         child: GestureDetector(
           onTap: () => Navigator.of(context).pop(),
           child: Container(
diff --git a/lib/store/app_store.dart b/lib/store/app_store.dart
index 7b0cefe74..7421fa54e 100644
--- a/lib/store/app_store.dart
+++ b/lib/store/app_store.dart
@@ -4,7 +4,6 @@ import 'package:cake_wallet/store/wallet_list_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/store/node_list_store.dart';
-import 'package:cake_wallet/store/contact_list_store.dart';
 
 part 'app_store.g.dart';
 
@@ -15,7 +14,6 @@ abstract class AppStoreBase with Store {
       {this.authenticationStore,
       this.walletList,
       this.settingsStore,
-      this.contactListStore,
       this.nodeListStore});
 
   AuthenticationStore authenticationStore;
@@ -27,7 +25,5 @@ abstract class AppStoreBase with Store {
 
   SettingsStore settingsStore;
 
-  ContactListStore contactListStore;
-
   NodeListStore nodeListStore;
 }
diff --git a/lib/store/contact_list_store.dart b/lib/store/contact_list_store.dart
deleted file mode 100644
index 85194e0d6..000000000
--- a/lib/store/contact_list_store.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/entities/contact_record.dart';
-
-part 'contact_list_store.g.dart';
-
-class ContactListStore = ContactListStoreBase with _$ContactListStore;
-
-abstract class ContactListStoreBase with Store {
-  ContactListStoreBase() : contacts = ObservableList<ContactRecord>();
-
-  final ObservableList<ContactRecord> contacts;
-}
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index d4f6bf95a..399cae107 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -1,5 +1,7 @@
 import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/themes.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:package_info/package_info.dart';
@@ -7,7 +9,7 @@ import 'package:devicelocale/devicelocale.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/entities/language.dart';
+import 'package:cake_wallet/entities/language_service.dart';
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/node.dart';
@@ -29,7 +31,7 @@ abstract class SettingsStoreBase with Store {
       @required bool initialDarkTheme,
       @required int initialPinLength,
       @required String initialLanguageCode,
-      @required String initialCurrentLocale,
+      // @required String initialCurrentLocale,
       @required this.appVersion,
       @required Map<WalletType, Node> nodes,
       this.actionlistDisplayMode}) {
@@ -41,7 +43,6 @@ abstract class SettingsStoreBase with Store {
     isDarkTheme = initialDarkTheme;
     pinCodeLength = initialPinLength;
     languageCode = initialLanguageCode;
-    currentLocale = initialCurrentLocale;
     currentNode = nodes[WalletType.monero];
     this.nodes = ObservableMap<WalletType, Node>.of(nodes);
     _sharedPreferences = sharedPreferences;
@@ -59,6 +60,10 @@ abstract class SettingsStoreBase with Store {
 
     reaction((_) => currentNode,
         (Node node) => _saveCurrentNode(node, WalletType.monero));
+
+    reaction((_) => languageCode,
+            (String languageCode) => sharedPreferences.setString(
+                PreferencesKey.currentLanguageCode, languageCode));
   }
 
   static const defaultPinLength = 4;
@@ -91,9 +96,11 @@ abstract class SettingsStoreBase with Store {
   @observable
   Node currentNode;
 
-  String languageCode;
+  @computed
+  ThemeData get theme => isDarkTheme ? Themes.darkTheme : Themes.lightTheme;
 
-  String currentLocale;
+  @observable
+  String languageCode;
 
   String appVersion;
 
@@ -135,8 +142,7 @@ abstract class SettingsStoreBase with Store {
             defaultPinLength;
     final savedLanguageCode =
         sharedPreferences.getString(PreferencesKey.currentLanguageCode) ??
-            await Language.localeDetection();
-    final initialCurrentLocale = await Devicelocale.currentLocale;
+            await LanguageService.localeDetection();
     final nodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
     final bitcoinElectrumServerId = sharedPreferences
         .getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
@@ -159,8 +165,8 @@ abstract class SettingsStoreBase with Store {
         initialDarkTheme: savedDarkTheme,
         actionlistDisplayMode: actionListDisplayMode,
         initialPinLength: pinLength,
-        initialLanguageCode: savedLanguageCode,
-        initialCurrentLocale: initialCurrentLocale);
+        initialLanguageCode: savedLanguageCode
+    );
   }
 
   Future<void> _saveCurrentNode(Node node, WalletType walletType) async {
diff --git a/lib/store/theme_changer_store.dart b/lib/store/theme_changer_store.dart
deleted file mode 100644
index 8c2e366ca..000000000
--- a/lib/store/theme_changer_store.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:cake_wallet/theme_changer.dart';
-import 'package:mobx/mobx.dart';
-
-part 'theme_changer_store.g.dart';
-
-class ThemeChangerStore = ThemeChangerStoreBase with _$ThemeChangerStore;
-
-abstract class ThemeChangerStoreBase with Store {
-  ThemeChangerStoreBase({this.themeChanger});
-
-  @observable
-  ThemeChanger themeChanger;
-}
\ No newline at end of file
diff --git a/lib/theme_changer.dart b/lib/theme_changer.dart
deleted file mode 100644
index c26e0722c..000000000
--- a/lib/theme_changer.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ThemeChanger with ChangeNotifier {
-  
-  ThemeChanger(this._themeData);
-
-  ThemeData _themeData;
-
-  ThemeData getTheme() => _themeData;
-
-  void setTheme(ThemeData theme){
-    _themeData = theme;
-
-    notifyListeners();
-  }
-}
\ No newline at end of file
diff --git a/lib/utils/date_formatter.dart b/lib/utils/date_formatter.dart
index cd64ef910..9707a9a70 100644
--- a/lib/utils/date_formatter.dart
+++ b/lib/utils/date_formatter.dart
@@ -4,7 +4,7 @@ import 'package:cake_wallet/store/settings_store.dart';
 
 class DateFormatter {
   static String get currentLocalFormat {
-    final isUSA = getIt.get<SettingsStore>().currentLocale == 'en_US';
+    final isUSA = getIt.get<SettingsStore>().languageCode.toLowerCase() == 'en';
     final format = isUSA ? 'yyyy.MM.dd, HH:mm' : 'dd.MM.yyyy, HH:mm';
 
     return format;
diff --git a/lib/utils/mobx.dart b/lib/utils/mobx.dart
index b11922f8e..344e16b64 100644
--- a/lib/utils/mobx.dart
+++ b/lib/utils/mobx.dart
@@ -84,7 +84,8 @@ extension MobxBindable<T extends Keyable> on Box<T> {
         return;
       }
 
-      dest.acceptBoxChange(event, transformed: transform(event.value as T));
+      dest.acceptBoxChange(event,
+          transformed: event.deleted ? null : transform(event.value as T));
     });
   }
 }
@@ -111,7 +112,8 @@ extension HiveBindable<T extends Keyable> on ObservableList<T> {
         }
 
         final value = change.newValue as T;
-        controller.add(EntityChange(value, type));
+        controller.add(EntityChange(value, type,
+            key: type == ChangeType.delete ? change.index : value.keyIndex));
       });
     });
 
diff --git a/lib/view_model/contact_list/contact_list_view_model.dart b/lib/view_model/contact_list/contact_list_view_model.dart
index aa3a5e2c7..8a59a0589 100644
--- a/lib/view_model/contact_list/contact_list_view_model.dart
+++ b/lib/view_model/contact_list/contact_list_view_model.dart
@@ -1,9 +1,7 @@
 import 'dart:async';
-import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/core/contact_service.dart';
-import 'package:cake_wallet/store/contact_list_store.dart';
+import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/utils/mobx.dart';
 
@@ -13,24 +11,16 @@ class ContactListViewModel = ContactListViewModelBase
     with _$ContactListViewModel;
 
 abstract class ContactListViewModelBase with Store {
-  ContactListViewModelBase(
-      this.addressBookStore, this.contactService, this.contactSource) {
-    _subscription = contactSource.bindToListWithTransform(addressBookStore.contacts,
-        (Contact contact) => ContactRecord(contactSource, contact),
+  ContactListViewModelBase(this.contactSource)
+      : contacts = ObservableList<ContactRecord>() {
+    _subscription = contactSource.bindToListWithTransform(
+        contacts, (Contact contact) => ContactRecord(contactSource, contact),
         initialFire: true);
   }
 
-  final ContactListStore addressBookStore;
-  final ContactService contactService;
   final Box<Contact> contactSource;
-
-  ObservableList<ContactRecord>  get contacts => addressBookStore.contacts;
-
+  final ObservableList<ContactRecord> contacts;
   StreamSubscription<BoxEvent> _subscription;
 
-  void dispose() {
-    // _subscription.cancel();
-  }
-
-  Future<void> delete(Contact contact) async => contactService.delete(contact);
+  Future<void> delete(ContactRecord contact) async => contact.original.delete();
 }
diff --git a/lib/view_model/contact_list/contact_view_model.dart b/lib/view_model/contact_list/contact_view_model.dart
index cb48260b5..7e6312d1d 100644
--- a/lib/view_model/contact_list/contact_view_model.dart
+++ b/lib/view_model/contact_list/contact_view_model.dart
@@ -3,7 +3,6 @@ import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/core/contact_service.dart';
 import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/crypto_currency.dart';
 
@@ -12,13 +11,13 @@ part 'contact_view_model.g.dart';
 class ContactViewModel = ContactViewModelBase with _$ContactViewModel;
 
 abstract class ContactViewModelBase with Store {
-  ContactViewModelBase(this._contacts, this._wallet, {ContactRecord contact})
+  ContactViewModelBase(this._contacts,  {ContactRecord contact})
       : state = InitialExecutionState(),
         currencies = CryptoCurrency.all,
         _contact = contact {
     name = _contact?.name;
     address = _contact?.address;
-    currency = _contact?.type; //_wallet.currency;
+    currency = _contact?.type;
   }
 
   @observable
@@ -40,7 +39,6 @@ abstract class ContactViewModelBase with Store {
       (address?.isNotEmpty ?? false);
 
   final List<CryptoCurrency> currencies;
-  final WalletBase _wallet;
   final Box<Contact> _contacts;
   final ContactRecord _contact;
 
@@ -60,10 +58,7 @@ abstract class ContactViewModelBase with Store {
         _contact.address = address;
         _contact.type = currency;
         await _contact.save();
-        // await _contacts.put(_contact.key, _contact);
       } else {
-        // final contact = ContactRecordBase.create(_contacts, name, address, currency);
-        // await contact.save();
         await _contacts
             .add(Contact(name: name, address: address, type: currency));
       }
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index a664690de..19678cd03 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -70,15 +70,17 @@ abstract class SendViewModelBase with Store {
 
   @computed
   String get balance {
+    String balance = '0.0';
+
     if (_wallet is MoneroWallet) {
-      _wallet.balance.formattedUnlockedBalance;
+      balance = _wallet.balance.formattedUnlockedBalance as String ?? '';
     }
 
     if (_wallet is BitcoinWallet) {
-      _wallet.balance.confirmedFormatted;
+      balance = _wallet.balance.confirmedFormatted as String ?? '';
     }
 
-    return '0.0';
+    return balance;
   }
 
   @computed
diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart
index bac456e79..e0ce07738 100644
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@@ -1,27 +1,24 @@
-import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:cake_wallet/entities/biometric_auth.dart';
-import 'package:cake_wallet/entities/wallet_type.dart';
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/store/theme_changer_store.dart';
-import 'package:cake_wallet/themes.dart';
-import 'package:cake_wallet/view_model/settings/version_list_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mobx/mobx.dart';
+import 'package:package_info/package_info.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/entities/transaction_priority.dart';
 import 'package:cake_wallet/entities/action_list_display_mode.dart';
-import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cake_wallet/view_model/settings/version_list_item.dart';
 import 'package:cake_wallet/view_model/settings/link_list_item.dart';
 import 'package:cake_wallet/view_model/settings/picker_list_item.dart';
 import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
 import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
 import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
-import 'package:package_info/package_info.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 
 part 'settings_view_model.g.dart';
 
@@ -111,13 +108,8 @@ abstract class SettingsViewModelBase with Store {
         SwitcherListItem(
             title: S.current.settings_dark_mode,
             value: () => _settingsStore.isDarkTheme,
-            onValueChange: (_, bool value) {
-              _settingsStore.isDarkTheme = value;
-              getIt
-                  .get<ThemeChangerStore>()
-                  .themeChanger
-                  .setTheme(value ? Themes.darkTheme : Themes.lightTheme);
-            })
+            onValueChange: (_, bool value) =>
+                _settingsStore.isDarkTheme = value)
       ],
       [
         LinkListItem(
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 175df3eb4..2c7ba24a5 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -13,7 +13,7 @@ import 'package:cake_wallet/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(CakeWalletApp());
+    await tester.pumpWidget(App());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);