From 498b30bddcfa16f587a9f62b74a5d9fceb04cb07 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 1 Nov 2016 11:51:51 -0700
Subject: [PATCH] Fix seed phrase restore

---
 app/scripts/keyring-controller.js    | 2 +-
 ui/app/actions.js                    | 1 -
 ui/app/keychains/hd/restore-vault.js | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index f6e71b005..2681b3d48 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -82,7 +82,7 @@ module.exports = class KeyringController extends EventEmitter {
       if (err) return cb(err)
       this.addNewKeyring('HD Key Tree', {
         mnemonic: seed,
-        n: 0,
+        n: 1,
       }, cb)
     })
   }
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 458145380..0586e07a3 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -195,7 +195,6 @@ function createNewVaultAndRestore (password, seed) {
     background.createNewVaultAndRestore(password, seed, (err, newState) => {
       dispatch(actions.hideLoadingIndication())
       if (err) return dispatch(actions.displayWarning(err.message))
-
       dispatch(this.updateMetamaskState(newState))
     })
   }
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 15690a159..3fa25a2eb 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -66,7 +66,7 @@ RestoreVaultScreen.prototype.render = function () {
         type: 'password',
         id: 'password-box-confirm',
         placeholder: 'Confirm Password',
-        onKeyPress: this.onMaybeCreate.bind(this),
+        onKeyPress: this.createOnEnter.bind(this),
         dataset: {
           persistentFormId: 'password-confirmation',
         },
@@ -110,9 +110,9 @@ RestoreVaultScreen.prototype.showInitializeMenu = function () {
   this.props.dispatch(actions.showInitializeMenu())
 }
 
-RestoreVaultScreen.prototype.onMaybeCreate = function (event) {
+RestoreVaultScreen.prototype.createOnEnter = function (event) {
   if (event.key === 'Enter') {
-    this.restoreVault()
+    this.createNewVaultAndRestore()
   }
 }