diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-02-01 03:40:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-01 03:40:33 +0800 |
commit | f16535619692dd7f1c24bcc07875d60804d50ee2 (patch) | |
tree | 969e2c3b688b4033110bac28520901c2493e04de /ui/app | |
parent | 1a32690a12e053a99396b2f2da1dc08eb03517f2 (diff) | |
parent | 94dd77d194de97b59c0a191a7439d96ff255bf41 (diff) | |
download | tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar.gz tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar.bz2 tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar.lz tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar.xz tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.tar.zst tangerine-wallet-browser-f16535619692dd7f1c24bcc07875d60804d50ee2.zip |
Merge pull request #3155 from brunobar79/feature/reset-account
Added reset account feature
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/actions.js | 16 | ||||
-rw-r--r-- | ui/app/config.js | 19 |
2 files changed, 35 insertions, 0 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 52ea899aa..90acdc821 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -47,12 +47,14 @@ var actions = { addNewAccount, NEW_ACCOUNT_SCREEN: 'NEW_ACCOUNT_SCREEN', navigateToNewAccountScreen, + resetAccount, showNewVaultSeed: showNewVaultSeed, showInfoPage: showInfoPage, // seed recovery actions REVEAL_SEED_CONFIRMATION: 'REVEAL_SEED_CONFIRMATION', revealSeedConfirmation: revealSeedConfirmation, requestRevealSeed: requestRevealSeed, + // unlock screen UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS', UNLOCK_FAILED: 'UNLOCK_FAILED', @@ -308,6 +310,20 @@ function requestRevealSeed (password) { } } +function resetAccount () { + return (dispatch) => { + background.resetAccount((err, account) => { + dispatch(actions.hideLoadingIndication()) + if (err) { + dispatch(actions.displayWarning(err.message)) + } + + log.info('Transaction history reset for ' + account) + dispatch(actions.showAccountsPage()) + }) + } +} + function addNewKeyring (type, opts) { return (dispatch) => { dispatch(actions.showLoadingIndication()) diff --git a/ui/app/config.js b/ui/app/config.js index 9cb2a0aad..9b9cac4bf 100644 --- a/ui/app/config.js +++ b/ui/app/config.js @@ -55,6 +55,7 @@ ConfigScreen.prototype.render = function () { h('.flex-space-around', { style: { padding: '20px', + overflow: 'auto', }, }, [ @@ -142,6 +143,24 @@ ConfigScreen.prototype.render = function () { }, 'Reveal Seed Words'), ]), + h('hr.horizontal-line'), + + h('div', { + style: { + marginTop: '20px', + }, + }, [ + h('button', { + style: { + alignSelf: 'center', + }, + onClick (event) { + event.preventDefault() + state.dispatch(actions.resetAccount()) + }, + }, 'Reset Account'), + ]), + ]), ]), ]) |