aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-03-23 06:37:33 +0800
committerGitHub <noreply@github.com>2017-03-23 06:37:33 +0800
commit72e979909c1bf7f252776628e4a882baa1a87fcb (patch)
tree57102fec8f5d8110dfe18f35835f3c60a10ddb7a /ui
parent1c7e04db4a2997ec6a62558d331b7e23190cebdc (diff)
parent33ba38df6e3d2e088442968261c740e892387411 (diff)
downloadtangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar.gz
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar.bz2
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar.lz
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar.xz
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.tar.zst
tangerine-wallet-browser-72e979909c1bf7f252776628e4a882baa1a87fcb.zip
Merge branch 'master' into i238-kovan
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js7
-rw-r--r--ui/app/reducers/app.js1
2 files changed, 5 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))
}
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 7ea1e1d7c..b9e3f7b16 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -426,6 +426,7 @@ function reduceApp (state, action) {
case actions.DISPLAY_WARNING:
return extend(appState, {
warning: action.value,
+ isLoading: false,
})
case actions.HIDE_WARNING: