diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-23 06:41:47 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 06:41:47 +0800 |
commit | 457611d8f8766bc756e154bbf4bce1efeb8a3097 (patch) | |
tree | 0554a50c61ce7f6649a38d6e768de35193633f07 /ui/app/actions.js | |
parent | de0d9af066d57f98580d53359a53271bf8760515 (diff) | |
parent | 5b81f7120b3c7c3c3a16246a9d5705fcab4f91b9 (diff) | |
download | tangerine-wallet-browser-457611d8f8766bc756e154bbf4bce1efeb8a3097.tar.gz tangerine-wallet-browser-457611d8f8766bc756e154bbf4bce1efeb8a3097.tar.zst tangerine-wallet-browser-457611d8f8766bc756e154bbf4bce1efeb8a3097.zip |
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
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)) } |