diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:45:21 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:45:21 +0800 |
commit | f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f (patch) | |
tree | 606b69016939618b0ebafc4f41c2636f75b94881 | |
parent | 39c824f2f3047bdcdd1436dcc0d26dbec099de91 (diff) | |
download | tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar.gz tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar.bz2 tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar.lz tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar.xz tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.tar.zst tangerine-wallet-browser-f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f.zip |
Use correct action to update and submit tx
-rw-r--r-- | app/scripts/metamask-controller.js | 1 | ||||
-rw-r--r-- | ui/app/actions.js | 4 | ||||
-rw-r--r-- | ui/app/conf-tx.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index caaa44767..295d0e998 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -463,6 +463,7 @@ module.exports = class MetamaskController extends EventEmitter { } updateAndApproveTx(txMeta, cb) { + log.debug(`MetaMaskController - updateAndApproveTx: ${JSON.stringify(txMeta)}`) const txManager = this.txManager txManager.updateTx(txMeta) txManager.approveTransaction(txMeta.id, cb) diff --git a/ui/app/actions.js b/ui/app/actions.js index 8177696f1..7f972fb37 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -399,7 +399,7 @@ function signTx (txData) { } function sendTx (txData) { - log.info('actions: sendTx') + log.info(`actions - sendTx: ${JSON.stringify(txData.txParams)}`) return (dispatch) => { log.debug(`actions calling background.approveTransaction`) background.approveTransaction(txData.id, (err) => { @@ -413,7 +413,7 @@ function sendTx (txData) { } function updateAndApproveTx (txData) { - log.info('actions: updateAndApproveTx') + log.info('actions: updateAndApproveTx: ' + JSON.stringify(txData)) return (dispatch) => { log.debug(`actions calling background.updateAndApproveTx`) background.updateAndApproveTransaction(txData, (err) => { diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index ed633553b..7e93ea29f 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -175,7 +175,7 @@ ConfirmTxScreen.prototype.sendTransaction = function (txData, event) { event.stopPropagation() const state = this.state || {} const txMeta = state.txData - this.props.dispatch(actions.sendTx(txMeta || txData)) + this.props.dispatch(actions.updateAndApproveTx(txMeta || txData)) } ConfirmTxScreen.prototype.cancelTransaction = function (txData, event) { |