diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-08-04 12:01:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 12:01:13 +0800 |
| commit | c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59 (patch) | |
| tree | 7dfa4391e05630d04b1903b69f9ca2fff43715c7 /ui | |
| parent | fea03ad82ef7bdf2b903922ec8b4a50453974b71 (diff) | |
| parent | d526f68c8e7d613ad79ec9383d6709651e5af77e (diff) | |
| download | tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar.gz tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar.bz2 tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar.lz tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar.xz tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.tar.zst tangerine-wallet-browser-c4cb371ce8ddad10d575b4ddb6cb85fe4689ca59.zip | |
Merge pull request #1857 from MetaMask/hotFixCancleTx
fix cancelTransaction not receiving a callback
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)) + }) + } } // |