aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/actions.js7
-rw-r--r--ui/app/reducers/app.js1
2 files changed, 3 insertions, 5 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 13a9cf547..ac54158d0 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -215,7 +215,7 @@ function confirmSeedWords () {
dispatch(actions.showLoadingIndication())
log.debug(`background.clearSeedWordCache`)
background.clearSeedWordCache((err, account) => {
- dispatch(actions.hideLoadingIndication())
+ // dispatch(actions.hideLoadingIndication())
if (err) {
return dispatch(actions.displayWarning(err.message))
}
@@ -231,7 +231,7 @@ function createNewVaultAndRestore (password, seed) {
dispatch(actions.showLoadingIndication())
log.debug(`background.createNewVaultAndRestore`)
background.createNewVaultAndRestore(password, seed, (err) => {
- dispatch(actions.hideLoadingIndication())
+ // dispatch(actions.hideLoadingIndication())
if (err) return dispatch(actions.displayWarning(err.message))
dispatch(actions.showAccountsPage())
})
@@ -270,13 +270,11 @@ function requestRevealSeed (password) {
log.debug(`background.submitPassword`)
background.submitPassword(password, (err) => {
if (err) {
- dispatch(actions.hideLoadingIndication())
return dispatch(actions.displayWarning(err.message))
}
log.debug(`background.placeSeedWords`)
background.placeSeedWords((err) => {
if (err) return dispatch(actions.displayWarning(err.message))
- dispatch(actions.hideLoadingIndication())
})
})
}
@@ -299,7 +297,6 @@ 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) => {
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: