diff options
author | Dan <danjm.com@gmail.com> | 2018-06-03 17:16:45 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-06-03 17:16:45 +0800 |
commit | 8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7 (patch) | |
tree | 5ab993280fa87add44aad288f155a0ce3b7a0da7 /ui/app/actions.js | |
parent | 0f3480a97f2924de899e49a095ef24b9fa5506f1 (diff) | |
parent | 72dde75e58b2aaec22e41b2fe742bee7e9c35777 (diff) | |
download | tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.tar.gz tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.tar.zst tangerine-wallet-browser-8f0a3b83111a9ccf5d515cebbd33cabe9ab16ba7.zip |
Merge branch 'develop' into handle-import-account-failure-in-ui
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index ed3c147b8..07d7bd5d1 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -503,17 +503,23 @@ function requestRevealSeedWords (password) { } function resetAccount () { - return (dispatch) => { - background.resetAccount((err, account) => { - dispatch(actions.hideLoadingIndication()) - if (err) { - dispatch(actions.displayWarning(err.message)) - } + return dispatch => { + dispatch(actions.showLoadingIndication()) - log.info('Transaction history reset for ' + account) - dispatch(actions.showAccountsPage()) - }) - } + return new Promise((resolve, reject) => { + background.resetAccount((err, account) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + + log.info('Transaction history reset for ' + account) + dispatch(actions.showAccountsPage()) + resolve(account) + }) + }) + } } function addNewKeyring (type, opts) { |