diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-08-05 02:45:22 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-05 02:45:22 +0800 |
| commit | 89a4fef1e4043323c89bf8aea8600a16353c4d1b (patch) | |
| tree | 2305525899aa31dd80c3d6bfcfadb6de4cfda783 /ui | |
| parent | fa3df576bcf879904b303c4ed1015d27db64642d (diff) | |
| parent | c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59 (diff) | |
| download | tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar.gz tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar.bz2 tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar.lz tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar.xz tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.tar.zst tangerine-wallet-browser-89a4fef1e4043323c89bf8aea8600a16353c4d1b.zip | |
Merge branch 'master' into transactionControllerRefractor
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 d99291e46..8ff8bbbdd 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)) + }) + } } // |