diff options
author | Dan <danjm.com@gmail.com> | 2018-06-01 01:58:03 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-06-01 01:58:03 +0800 |
commit | 5091b03e4b2499697cda376a44405139827068cd (patch) | |
tree | da91af2a0ce21871c15611f768f09757ef2c8533 /ui/app/actions.js | |
parent | 6d8344d0d0af3734255a0e9e79d857d84b5fe2aa (diff) | |
parent | cc73d869fed79c63261821fb7ad8f1e5180ffca2 (diff) | |
download | tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.gz tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.zst tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.zip |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index fc2a838d4..ae6b9637d 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -512,17 +512,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) { @@ -1449,16 +1455,24 @@ function markAccountsFound () { function retryTransaction (txId) { log.debug(`background.retryTransaction`) + let newTxId + return (dispatch) => { - background.retryTransaction(txId, (err, newState) => { - if (err) { - return dispatch(actions.displayWarning(err.message)) - } - const { selectedAddressTxList } = newState - const { id: newTxId } = selectedAddressTxList[selectedAddressTxList.length - 1] - dispatch(actions.updateMetamaskState(newState)) - dispatch(actions.viewPendingTx(newTxId)) + return new Promise((resolve, reject) => { + background.retryTransaction(txId, (err, newState) => { + if (err) { + dispatch(actions.displayWarning(err.message)) + reject(err) + } + + const { selectedAddressTxList } = newState + const { id } = selectedAddressTxList[selectedAddressTxList.length - 1] + newTxId = id + resolve(newState) + }) }) + .then(newState => dispatch(actions.updateMetamaskState(newState))) + .then(() => newTxId) } } |