diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-01 07:23:03 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-03-01 07:23:03 +0800 |
| commit | 9bffe2d11a9bd177201591cd45034d93568c0014 (patch) | |
| tree | e258809ae1fb18eb9340d0cca737b701fb2807c8 /ui | |
| parent | 576cc9eb754258f3a534633af460ff657c8e112a (diff) | |
| parent | 513a9d72ef2f19f02f5cac3b1c66b01371c281c9 (diff) | |
| download | tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar.gz tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar.bz2 tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar.lz tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar.xz tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.tar.zst tangerine-wallet-browser-9bffe2d11a9bd177201591cd45034d93568c0014.zip | |
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 4 | ||||
| -rw-r--r-- | ui/app/conf-tx.js | 2 |
2 files changed, 3 insertions, 3 deletions
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) { |