diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-08-04 12:02:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 12:02:01 +0800 |
| commit | 5a9257208c858d11b94659518ef2375384aeac46 (patch) | |
| tree | 6341d6693513ae731aa7092e4816d891e36cbc45 /ui | |
| parent | 17c9fd450f4c05ae39457abc8459d0353c07973b (diff) | |
| parent | c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59 (diff) | |
| download | tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar.gz tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar.bz2 tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar.lz tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar.xz tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.tar.zst tangerine-wallet-browser-5a9257208c858d11b94659518ef2375384aeac46.zip | |
Merge branch 'master' into NewUI
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 0a9d347aa..eafd04b4c 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -462,9 +462,12 @@ function cancelPersonalMsg (msgData) { } function cancelTx (txData) { - log.debug(`background.cancelTransaction`) - background.cancelTransaction(txData.id) - return actions.completedTx(txData.id) + return (dispatch) => { + log.debug(`background.cancelTransaction`) + background.cancelTransaction(txData.id, () => { + dispatch(actions.completedTx(txData.id)) + }) + } } // |