aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2018-05-13 01:02:39 +0800
committerGitHub <noreply@github.com>2018-05-13 01:02:39 +0800
commit6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d (patch)
tree8df5a7134f0cd0cc1beeed287b182b00354c188a /ui/app/actions.js
parent76ab5c04fae20dc0fd2798ad8a336a0364032aff (diff)
parent0301b33a48fea3c345e2e49fa53693856770a254 (diff)
downloadtangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar.gz
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar.bz2
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar.lz
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar.xz
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.tar.zst
tangerine-wallet-browser-6bd1b21d3b8f74c44214f814c3fe1c8770ab9e2d.zip
Merge pull request #4190 from MetaMask/i3614-unlock
Add new unlock screen design
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index f060e40bd..9c4de9551 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -317,6 +317,7 @@ function tryUnlockMetamask (password) {
background.verifySeedPhrase(err => {
if (err) {
dispatch(actions.displayWarning(err.message))
+ return reject(err)
}
resolve()
@@ -330,6 +331,7 @@ function tryUnlockMetamask (password) {
.catch(err => {
dispatch(actions.unlockFailed(err.message))
dispatch(actions.hideLoadingIndication())
+ return Promise.reject(err)
})
}
}