aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-tx.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-02-24 06:17:52 +0800
committerKevin Serrano <kevgagser@gmail.com>2017-02-24 06:17:52 +0800
commit30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5 (patch)
tree831a0441622eb017e64dc9a8c513c82b2a8f7c08 /ui/app/conf-tx.js
parent6b56d6ba9853ec978cd2d3d030882fa5ee3645cd (diff)
parent09c7b9d242f66db99c80f22fae00dfdb894e2adc (diff)
downloadtangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.gz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.bz2
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.lz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.xz
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.zst
tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.zip
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js5
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)
}
}