From 1d80a4c452cc41b28e0a6a565b8fd48f0ff0252d Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Wed, 18 Apr 2018 16:10:42 -0700 Subject: [PATCH] Fix exception thrown when revealing seed words --- ui/app/actions.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ui/app/actions.js b/ui/app/actions.js index 73335db97..81d9c333b 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -345,10 +345,9 @@ function transitionBackward () { } } -function confirmSeedWords () { +function clearSeedWordCache () { + log.debug(`background.clearSeedWordCache`) return dispatch => { - dispatch(actions.showLoadingIndication()) - log.debug(`background.clearSeedWordCache`) return new Promise((resolve, reject) => { background.clearSeedWordCache((err, account) => { if (err) { @@ -361,9 +360,22 @@ function confirmSeedWords () { resolve(account) }) }) - .then(() => dispatch(setIsRevealingSeedWords(false))) - .then(() => dispatch(actions.hideLoadingIndication())) - .catch(() => dispatch(actions.hideLoadingIndication())) + } +} + +function confirmSeedWords () { + return async dispatch => { + dispatch(actions.showLoadingIndication()) + const account = await dispatch(clearSeedWordCache()) + return dispatch(setIsRevealingSeedWords(false)) + .then(() => { + dispatch(actions.hideLoadingIndication()) + return account + }) + .catch(() => { + dispatch(actions.hideLoadingIndication()) + return account + }) } }