Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits

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)

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) => {

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) {