metamask - update preferences controller identities on keyring controller update

app/scripts/controllers/preferences.js

@@ -63,6 +63,13 @@ class PreferencesController {
     this.store.updateState({ currentLocale: key })
   }
 
+  /**
+   * Updates identities to only include specified addresses. Removes identities
+   * not included in addresses array
+   *
+   * @param {arrays} addresses An array of hex addresses
+   *
+   */
   setAddresses (addresses) {
     const oldIdentities = this.store.getState().identities
     const identities = addresses.reduce((ids, address, index) => {
@@ -73,6 +80,24 @@ class PreferencesController {
     this.store.updateState({ identities })
   }
 
+  /**
+   * Adds addresses to the identities object without removing identities
+   *
+   * @param {arrays} addresses An array of hex addresses
+   *
+   */
+  addAddresses (addresses) {
+    const identities = this.store.getState().identities
+    addresses.forEach((address) => {
+      // skip if already exists
+      if (identities[address]) return
+      // add missing identity
+      const identityCount = Object.keys(identities).length
+      identities[address] = { name: `Account ${identityCount + 1}`, address }
+    })
+    this.store.updateState({ identities })
+  }
+
   /**
    * Setter for the `selectedAddress` property
    *

app/scripts/metamask-controller.js

@@ -139,6 +139,8 @@ module.exports = class MetamaskController extends EventEmitter {
         const address = addresses[0]
         this.preferencesController.setSelectedAddress(address)
       }
+      // ensure preferences + identities controller know about all addresses
+      this.preferencesController.addAddresses(addresses)
       this.accountTracker.syncWithAddresses(addresses)
     })