diff options
| author | Dan <danjm.com@gmail.com> | 2018-03-14 10:32:27 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-03-14 10:32:27 +0800 |
| commit | 798988597bd17aa73d7a20502905a453f1d51ba4 (patch) | |
| tree | 69f083adbe19ce4e5b8094f1004cb1fd3a3f75c9 /ui/app/actions.js | |
| parent | cc267d6c818c83b0384b569733d05efef384ac3e (diff) | |
| parent | 5fbfb0b67c9eb50b6cc503e78154ab237d2d9731 (diff) | |
| download | tangerine-wallet-browser-798988597bd17aa73d7a20502905a453f1d51ba4.tar.gz tangerine-wallet-browser-798988597bd17aa73d7a20502905a453f1d51ba4.tar.zst tangerine-wallet-browser-798988597bd17aa73d7a20502905a453f1d51ba4.zip | |
Merge branch 'master' into retry-tx-refractor
Diffstat (limited to 'ui/app/actions.js')
| -rw-r--r-- | ui/app/actions.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index d6f509590..bc7ee3d07 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -75,6 +75,8 @@ var actions = { resetAccount, showNewVaultSeed: showNewVaultSeed, showInfoPage: showInfoPage, + CLOSE_WELCOME_SCREEN: 'CLOSE_WELCOME_SCREEN', + closeWelcomeScreen, // seed recovery actions REVEAL_SEED_CONFIRMATION: 'REVEAL_SEED_CONFIRMATION', revealSeedConfirmation: revealSeedConfirmation, @@ -788,7 +790,7 @@ function updateTransaction (txData) { function updateAndApproveTx (txData) { log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData)) return (dispatch) => { - log.debug(`actions calling background.updateAndApproveTx`) + log.debug(`actions calling background.updateAndApproveTx.`) background.updateAndApproveTransaction(txData, (err) => { dispatch(actions.hideLoadingIndication()) dispatch(actions.updateTransactionParams(txData.id, txData.txParams)) @@ -947,6 +949,12 @@ function showNewVaultSeed (seed) { } } +function closeWelcomeScreen () { + return { + type: actions.CLOSE_WELCOME_SCREEN, + } +} + function backToUnlockView () { return { type: actions.BACK_TO_UNLOCK_VIEW, |