diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-06-02 07:03:56 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-02 07:03:56 +0800 |
commit | 4be8e780cd64014d07c036c29faa77f947437c4a (patch) | |
tree | 37c76b1bbad225adc70f45a8fd17e8718e2b6453 /ui/app/actions.js | |
parent | dc5477be3cc62dff912a9447c702edab66200f02 (diff) | |
parent | b1b90a6bb979cbda8b865e680dba621201d9f801 (diff) | |
download | tangerine-wallet-browser-4be8e780cd64014d07c036c29faa77f947437c4a.tar.gz tangerine-wallet-browser-4be8e780cd64014d07c036c29faa77f947437c4a.tar.zst tangerine-wallet-browser-4be8e780cd64014d07c036c29faa77f947437c4a.zip |
Merge pull request #4449 from MetaMask/Version-4.7.1
Version 4.7.1
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 649f740e9..a9372d6f3 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) { |