From f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 28 Feb 2017 14:45:21 -0800
Subject: [PATCH] Use correct action to update and submit tx

---
 app/scripts/metamask-controller.js | 1 +
 ui/app/actions.js                  | 4 ++--
 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) {