Select first account when restoring seed

Fixes #2348

1 files changed, 17 insertions, 3 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 2a45e413b..8a51fdd8d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -337,7 +337,7 @@ module.exports = class MetamaskController extends EventEmitter {
       // KeyringController
       setLocked: nodeify(keyringController.setLocked, keyringController),
       createNewVaultAndKeychain: this.createNewVaultAndKeychain.bind(this),
-      createNewVaultAndRestore: nodeify(keyringController.createNewVaultAndRestore, keyringController),
+      createNewVaultAndRestore: this.createNewVaultAndRestore.bind(this),
       addNewKeyring: nodeify(keyringController.addNewKeyring, keyringController),
       saveAccountLabel: nodeify(keyringController.saveAccountLabel, keyringController),
       exportAccount: nodeify(keyringController.exportAccount, keyringController),
@@ -461,14 +461,28 @@ module.exports = class MetamaskController extends EventEmitter {
   createNewVaultAndKeychain (password, cb) {
     this.keyringController.createNewVaultAndKeychain(password)
     .then((vault) => {
-      const { identities } = vault
-      const address = Object.keys(identities)[0]
+      this.selectFirstIdentity(vault)
       this.preferencesController.setSelectedAddress(address)
       cb(null, vault)
     })
     .catch(reason => cb(reason))
   }
 
+  createNewVaultAndRestore (password, seed, cb) {
+    this.keyringController.createNewVaultAndRestore(password, seed)
+    .then((vault) => {
+      this.selectFirstIdentity(vault)
+      cb(null, vault)
+    })
+    .catch(reason => cb(reason))
+  }
+
+  selectFirstIdentity (vault) {
+    const { identities } = vault
+    const address = Object.keys(identities)[0]
+    this.preferencesController.setSelectedAddress(address)
+  }
+
   submitPassword (password, cb) {
     return this.keyringController.submitPassword(password)
     .then((newState) => { cb(null, newState) })