diff options
| author | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-07 10:55:34 +0800 |
|---|---|---|
| committer | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-07 10:55:34 +0800 |
| commit | 02c2106c3bb6900801cf5ffe4a1d9bd46183b089 (patch) | |
| tree | 23f6d76a57c7b58a385ee49e8a24e402ed474775 /ui/app | |
| parent | fd36d95c506db55afa33a251c6c187c194a55854 (diff) | |
| parent | 2ba5737728d2539fc3bc9015e440f37341219cdc (diff) | |
| download | tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar.gz tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar.bz2 tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar.lz tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar.xz tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.tar.zst tangerine-wallet-browser-02c2106c3bb6900801cf5ffe4a1d9bd46183b089.zip | |
Merge branch 'master' into feat/mm-ui-5
Diffstat (limited to 'ui/app')
| -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 d3d6c165e..13a767343 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -467,9 +467,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)) + }) + } } // |