Merge redesign part 3.

lib/view_model/contact_list/contact_list_view_model.dart

@@ -1,20 +1,34 @@
+import 'dart:async';
+
+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/src/domain/common/contact.dart';
+import 'package:cake_wallet/utils/mobx.dart';
 
 part 'contact_list_view_model.g.dart';
 
-class ContactListViewModel = ContactListViewModelBase with _$ContactListViewModel;
+class ContactListViewModel = ContactListViewModelBase
+    with _$ContactListViewModel;
 
 abstract class ContactListViewModelBase with Store {
-  ContactListViewModelBase(this.addressBookStore, this.contactService);
+  ContactListViewModelBase(
+      this.addressBookStore, this.contactService, this.contactSource) {
+    _subscription = bindBox(contactSource, addressBookStore.contacts);
+  }
 
   final ContactListStore addressBookStore;
   final ContactService contactService;
+  final Box<Contact> contactSource;
 
-  @computed
   ObservableList<Contact> get contacts => addressBookStore.contacts;
 
+  StreamSubscription<BoxEvent> _subscription;
+
+  void dispose() {
+    _subscription.cancel();
+  }
+
   Future<void> delete(Contact contact) async => contactService.delete(contact);
-}
+}

lib/view_model/contact_list/contact_view_model.dart

@@ -1,3 +1,4 @@
+import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/contact_service.dart';
@@ -10,7 +11,7 @@ part 'contact_view_model.g.dart';
 class ContactViewModel = ContactViewModelBase with _$ContactViewModel;
 
 abstract class ContactViewModelBase with Store {
-  ContactViewModelBase(this._contactService, this._wallet, {Contact contact})
+  ContactViewModelBase(this._contacts, this._wallet, {Contact contact})
       : state = InitialContactViewModelState(),
         currencies = CryptoCurrency.all,
         _contact = contact {
@@ -33,12 +34,14 @@ abstract class ContactViewModelBase with Store {
 
   @computed
   bool get isReady =>
-      (name?.isNotEmpty ?? false) && (currency?.toString()?.isNotEmpty ?? false)
-      && (address?.isNotEmpty ?? false);
+      (name?.isNotEmpty ?? false) &&
+      (currency?.toString()?.isNotEmpty ?? false) &&
+      (address?.isNotEmpty ?? false);
 
   final List<CryptoCurrency> currencies;
-  final ContactService _contactService;
+  // final ContactService _contactService;
   final WalletBase _wallet;
+  final Box<Contact> _contacts;
   final Contact _contact;
 
   @action
@@ -57,10 +60,13 @@ abstract class ContactViewModelBase with Store {
         _contact.name = name;
         _contact.address = address;
         _contact.updateCryptoCurrency(currency: currency);
-        await _contactService.update(_contact);
+        await _contacts.put(_contact.key, _contact);
+        // await _contactService.update(_contact);
       } else {
-        await _contactService
+        await _contacts
             .add(Contact(name: name, address: address, type: currency));
+        // await _contactService
+        //     .add(Contact(name: name, address: address, type: currency));
       }
 
       state = ContactSavingSuccessfully();

lib/view_model/node_list/node_list_view_model.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/utils/item_cell.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -14,13 +15,6 @@ part 'node_list_view_model.g.dart';
 
 class NodeListViewModel = NodeListViewModelBase with _$NodeListViewModel;
 
-class ItemCell<Item> {
-  ItemCell(this.value, {@required this.isSelected});
-
-  final Item value;
-  final bool isSelected;
-}
-
 abstract class NodeListViewModelBase with Store {
   NodeListViewModelBase(
       this._nodeListStore, this._nodeSource, this._wallet, this._settingsStore)
@@ -29,16 +23,16 @@ abstract class NodeListViewModelBase with Store {
     final values = _nodeListStore.nodes;
     nodes.clear();
     nodes.addAll(values.where((Node node) => node.type == _wallet.type).map(
-        (Node val) =>
-            ItemCell<Node>(val, isSelected: val.key == currentNode.key)));
+        (Node val) => ItemCell<Node>(val,
+            isSelected: val.key == currentNode.key, key: val.key)));
     connectDifferent(
         _nodeListStore.nodes,
         nodes,
-        (Node val) =>
-            ItemCell<Node>(val, isSelected: val.key == currentNode.key),
-        filter: (Node val) {
-          return val.type == _wallet.type;
-        });
+        (Node val) => ItemCell<Node>(val,
+            isSelected: val.key == currentNode.key, key: val.key),
+        filter: (Node val) => val.type == _wallet.type);
+    reaction((_) => _settingsStore.nodes[_wallet.type],
+        (Node _) => _updateCurrentNode());
   }
 
   ObservableList<ItemCell<Node>> nodes;
@@ -66,17 +60,18 @@ abstract class NodeListViewModelBase with Store {
         break;
     }
 
-    await _wallet.connectToNode(node: node);
+    await setAsCurrent(node);
   }
 
   Future<void> delete(Node node) async => _nodeSource.delete(node.key);
 
   Future<void> setAsCurrent(Node node) async {
-    await _wallet.connectToNode(node: node);
     await _settingsStore.setCurrentNode(node, _wallet.type);
     _updateCurrentNode();
+    await _wallet.connectToNode(node: node);
   }
 
+  @action
   void _updateCurrentNode() {
     final currentNode = _settingsStore.getCurrentNode(_wallet.type);
 
@@ -85,7 +80,8 @@ abstract class NodeListViewModelBase with Store {
       final isSelected = item.value.key == currentNode.key;
 
       if (item.isSelected != isSelected) {
-        nodes[i] = ItemCell<Node>(item.value, isSelected: isSelected);
+        nodes[i] = ItemCell<Node>(item.value,
+            isSelected: isSelected, key: item.keyIndex);
       }
     }
   }

lib/view_model/wallet_address_list/wallet_address_list_view_model.dart

@@ -67,7 +67,8 @@ abstract class WalletAddressListViewModelBase with Store {
   WalletType get type => _wallet.type;
 
   @computed
-  WalletAddressListItem get address => WalletAddressListItem(address: _wallet.address);
+  WalletAddressListItem get address =>
+      WalletAddressListItem(address: _wallet.address);
 
   @computed
   PaymentURI get uri {
@@ -100,15 +101,16 @@ abstract class WalletAddressListViewModelBase with Store {
     }
 
     if (wallet is BitcoinWallet) {
-      final bitcoinAddresses = wallet.addresses.map(
-          (addr) => WalletAddressListItem(name: addr.label, address: addr.address));
+      final bitcoinAddresses = wallet.addresses.map((addr) =>
+          WalletAddressListItem(name: addr.label, address: addr.address));
       addressList.addAll(bitcoinAddresses);
     }
 
     return addressList;
   }
 
-  set address(WalletAddressListItem address) => _wallet.address = address.address;
+  set address(WalletAddressListItem address) =>
+      _wallet.address = address.address;
 
   bool hasAccounts;