Make account tracking much more reactive

2 files changed, 13 insertions, 12 deletions

diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index 13dea918f..b9959dc25 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -41,19 +41,24 @@ class AccountTracker extends EventEmitter {
   syncWithAddresses (addresses) {
     const accounts = this.store.getState().accounts
     const locals = Object.keys(accounts)
-    .map(account => accounts[account.address])
 
+    const toAdd = []
     addresses.forEach((upstream) => {
       if (!locals.includes(upstream)) {
-        this.addAccount(upstream)
+        toAdd.push(upstream)
       }
     })
 
+    const toRemove = []
     locals.forEach((local) => {
       if (!addresses.includes(local)) {
-        this.removeAccount(local)
+        toRemove.push(local)
       }
     })
+
+    toAdd.forEach(upstream => this.addAccount(upstream))
+    toRemove.forEach(local=> this.removeAccount(local))
+    this._updateAccounts()
   }
 
   addAccount (address) {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index eae4478b5..11a26df64 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -117,8 +117,10 @@ module.exports = class MetamaskController extends EventEmitter {
     })
 
     // If only one account exists, make sure it is selected.
-    this.keyringController.store.subscribe((state) => {
-      const addresses = Object.keys(state.walletNicknames || {})
+    this.keyringController.memStore.subscribe((state) => {
+      const addresses = state.keyrings.reduce((res, keyring) => {
+        return res.concat(keyring.accounts)
+      }, [])
       if (addresses.length === 1) {
         const address = addresses[0]
         this.preferencesController.setSelectedAddress(address)
@@ -314,7 +316,7 @@ module.exports = class MetamaskController extends EventEmitter {
       importAccountWithStrategy: this.importAccountWithStrategy.bind(this),
 
       // vault management
-      submitPassword: this.submitPassword.bind(this),
+      submitPassword: nodeify(keyringController.submitPassword, keyringController),
 
       // network management
       setProviderType: nodeify(networkController.setProviderType, networkController),
@@ -470,12 +472,6 @@ module.exports = class MetamaskController extends EventEmitter {
     this.preferencesController.setSelectedAddress(address)
   }
 
-  submitPassword (password, cb) {
-    return this.keyringController.submitPassword(password)
-    .then((newState) => { cb(null, newState) })
-    .catch((reason) => { cb(reason) })
-  }
-
   //
   // Opinionated Keyring Management
   //