Merge pull request #1143 from MetaMask/FixTxApprovalUiMode

Fix UI Dev Mode for Tx Approval

2 files changed, 10 insertions, 0 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index a27219576..646dbb602 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -47,6 +47,8 @@ ConfirmTxScreen.prototype.render = function () {
   var txData = unconfTxList[index] || {}
   var txParams = txData.params || {}
   var isNotification = isPopupOrNotification() === 'notification'
+
+  log.info(`rendering a combined ${unconfTxList.length} unconf msg & txs`)
   if (unconfTxList.length === 0) return null
 
   return (
@@ -120,11 +122,14 @@ function currentTxView (opts) {
   const { txData } = opts
   const { txParams, msgParams } = txData
 
+  log.info('rendering current tx view')
   if (txParams) {
     // This is a pending transaction
+    log.debug('txParams detected, rendering pending tx')
     return h(PendingTx, opts)
   } else if (msgParams) {
     // This is a pending message to sign
+    log.debug('msgParams detected, rendering pending msg')
     return h(PendingMsg, opts)
   }
 }
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index fa7a94cdc..7f64f9fbe 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -1,8 +1,13 @@
 const valuesFor = require('../app/util').valuesFor
 
 module.exports = function (unapprovedTxs, unapprovedMsgs, network) {
+  log.debug('tx-helper called with params:')
+  log.debug({ unapprovedTxs, unapprovedMsgs, network })
+
   var txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+  log.debug(`tx helper found ${txValues.length} unapproved txs`)
   var msgValues = valuesFor(unapprovedMsgs)
+  log.debug(`tx helper found ${msgValues.length} unsigned messages`)
   var allValues = txValues.concat(msgValues)
   return allValues.sort(tx => tx.time)
 }