From 20aa135ad87231694ead2fe65a3124b719b8fc4d Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 3 Jan 2018 16:06:46 -0800
Subject: [PATCH 1/3] Add fix for infinite spinner for incorrect seed phrase.

---
 app/scripts/metamask-controller.js   | 13 +++++++++----
 ui/app/keychains/hd/restore-vault.js |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 23f2a1598..8d8c1d094 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -513,10 +513,15 @@ module.exports = class MetamaskController extends EventEmitter {
 
   async createNewVaultAndRestore (password, seed) {
     const release = await this.createVaultMutex.acquire()
-    const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
-    this.selectFirstIdentity(vault)
-    release()
-    return vault
+    try {
+      const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
+      this.selectFirstIdentity(vault)
+      release()
+      return vault
+    } catch (err) {
+      release()
+      throw err
+    }
   }
 
   selectFirstIdentity (vault) {
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 06e51d9b3..24b37a83d 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -149,4 +149,8 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
   this.warning = null
   this.props.dispatch(actions.displayWarning(this.warning))
   this.props.dispatch(actions.createNewVaultAndRestore(password, seed))
+  .catch((err) => {
+    log.error(err.message)
+  })
+
 }

From 4b63ec8f1daaba11e66322fbdfb045ba1ea5319d Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Wed, 3 Jan 2018 16:44:14 -0800
Subject: [PATCH 2/3] Test for failure of the async methods.

---
 test/unit/metamask-controller-test.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js
index fd420a70f..873b8d17d 100644
--- a/test/unit/metamask-controller-test.js
+++ b/test/unit/metamask-controller-test.js
@@ -39,17 +39,19 @@ describe('MetaMaskController', function () {
 
     beforeEach(function () {
       sinon.spy(metamaskController.keyringController, 'createNewVaultAndKeychain')
+      sinon.spy(metamaskController.keyringController, 'createNewVaultAndRestore')
     })
 
     afterEach(function () {
       metamaskController.keyringController.createNewVaultAndKeychain.restore()
+      metamaskController.keyringController.createNewVaultAndRestore.restore()
     })
 
     describe('#createNewVaultAndKeychain', function () {
       it('can only create new vault on keyringController once', async function () {
-
         const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity')
 
+
         const password = 'a-fake-password'
 
         const first = await metamaskController.createNewVaultAndKeychain(password)
@@ -60,6 +62,22 @@ describe('MetaMaskController', function () {
         selectStub.reset()
       })
     })
+
+    describe('#createNewVaultAndRestore', function () {
+      it('should be able to call newVaultAndRestore despite a mistake.', async function () {
+        // const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity')
+
+        const password = 'what-what-what'
+        const wrongSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadiu'
+        const rightSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+          const first = await metamaskController.createNewVaultAndRestore(password, wrongSeed)
+            .catch((e) => {
+              return
+            })
+          const second = await metamaskController.createNewVaultAndRestore(password, rightSeed)
+
+        assert(metamaskController.keyringController.createNewVaultAndRestore.calledTwice)
+      })
+    })
   })
 })
-

From 52bb711fa99611678d2a2e9b4098f9a6ece8adda Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 8 Jan 2018 11:26:35 -0800
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfcd0d1b9..49d92cd1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fix bug that prevented updating custom token details.
 - No longer mark long-pending transactions as failed, since we now have button to retry with higher gas.
 - Fix rounding error when specifying an ether amount that has too much precision.
+- Fix bug where incorrectly inputting seed phrase would prevent any future attempts from succeeding.
 
 ## 3.13.3 2017-12-14