diff options
author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-23 06:39:20 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 06:39:20 +0800 |
commit | 9545ef3ba80b7abeffacb7914bd4232f9a22a5e1 (patch) | |
tree | 840ee52c25480980f66d3e3ed4857457b3048f46 /ui/app/actions.js | |
parent | 5d149258427b25f34dca89e5dfaba57a4f1cb95b (diff) | |
parent | 5b81f7120b3c7c3c3a16246a9d5705fcab4f91b9 (diff) | |
download | tangerine-wallet-browser-9545ef3ba80b7abeffacb7914bd4232f9a22a5e1.tar.gz tangerine-wallet-browser-9545ef3ba80b7abeffacb7914bd4232f9a22a5e1.tar.zst tangerine-wallet-browser-9545ef3ba80b7abeffacb7914bd4232f9a22a5e1.zip |
Merge branch 'master' into i1193-errorstylefix
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 9d6676d01..d02b7dcaa 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -269,11 +269,12 @@ function requestRevealSeed (password) { dispatch(actions.showLoadingIndication()) log.debug(`background.submitPassword`) background.submitPassword(password, (err) => { - if (err) return dispatch(actions.displayWarning(err.message)) + if (err) { + return dispatch(actions.displayWarning(err.message)) + } log.debug(`background.placeSeedWords`) background.placeSeedWords((err) => { if (err) return dispatch(actions.displayWarning(err.message)) - dispatch(actions.hideLoadingIndication()) }) }) } @@ -296,10 +297,10 @@ function importNewAccount (strategy, args) { dispatch(actions.showLoadingIndication('This may take a while, be patient.')) log.debug(`background.importAccountWithStrategy`) background.importAccountWithStrategy(strategy, args, (err) => { - dispatch(actions.hideLoadingIndication()) if (err) return dispatch(actions.displayWarning(err.message)) log.debug(`background.getState`) background.getState((err, newState) => { + dispatch(actions.hideLoadingIndication()) if (err) { return dispatch(actions.displayWarning(err.message)) } |