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

1 files changed, 5 insertions, 0 deletions

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 831bed0ec..0bf308990 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)
   }
 }