Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

1 files changed, 9 insertions, 11 deletions

diff --git a/ui/app/components/pages/unlock-page/unlock-page.component.js b/ui/app/components/pages/unlock-page/unlock-page.component.js
index b6384b32d..8bc3897da 100644
--- a/ui/app/components/pages/unlock-page/unlock-page.component.js
+++ b/ui/app/components/pages/unlock-page/unlock-page.component.js
@@ -34,14 +34,7 @@ class UnlockPage extends Component {
     }
   }
 
-  tryUnlockMetamask (password) {
-    const { tryUnlockMetamask, history } = this.props
-    tryUnlockMetamask(password)
-      .catch(({ message }) => this.setState({ error: message }))
-      .then(() => history.push(DEFAULT_ROUTE))
-  }
-
-  handleSubmit (event) {
+  async handleSubmit (event) {
     event.preventDefault()
     event.stopPropagation()
 
@@ -54,9 +47,14 @@ class UnlockPage extends Component {
 
     this.setState({ error: null })
 
-    tryUnlockMetamask(password)
-      .catch(({ message }) => this.setState({ error: message }))
-      .then(() => history.push(DEFAULT_ROUTE))
+    try {
+      await tryUnlockMetamask(password)
+    } catch ({ message }) {
+      this.setState({ error: message })
+      return
+    }
+
+    history.push(DEFAULT_ROUTE)
   }
 
   handleInputChange ({ target }) {