diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-03-24 04:46:09 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-03-24 04:46:09 +0800 |
commit | 6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730 (patch) | |
tree | 251258045f86bbf97ddef2da9537f5a51cc02795 /ui/app/actions.js | |
parent | e7a3330b980b150d4b7eae9c628e4ad2b0a1af34 (diff) | |
parent | b8500d384b3d68b92c246d11a5d008d9635002b4 (diff) | |
download | tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.gz tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.tar.zst tangerine-wallet-browser-6b100163e9a3c2ca614c91d0bbc7f5c4b1a7a730.zip |
Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin 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)) } |