aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
authorBruno <brunobar79@gmail.com>2018-06-06 09:37:45 +0800
committerBruno <brunobar79@gmail.com>2018-06-06 09:37:45 +0800
commit4371801083e63838b6000a6818b418e36c39f539 (patch)
treec2a9e3c68605ca4b5a8feaf0d2f0cb6677d78b15 /ui/app/actions.js
parentde9672726833e26ea96d198c0d9f1464015614f5 (diff)
parentc2e3194dbf4e2a3fd2bdffb3300ec0cd822dc78e (diff)
downloadtangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar.gz
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar.bz2
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar.lz
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar.xz
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.tar.zst
tangerine-wallet-browser-4371801083e63838b6000a6818b418e36c39f539.zip
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js26
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) {