diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-02-21 15:50:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-21 15:50:54 +0800 |
commit | 09c7b9d242f66db99c80f22fae00dfdb894e2adc (patch) | |
tree | ffa6e494f612a7adc2990c0a275152a92da5ef3c /ui/app | |
parent | 838d19e17fb26daadd7f171cc6f0494ce29fe43d (diff) | |
parent | 2baedc56eafcc0e26fdaab1706953dc2d949570d (diff) | |
download | tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar.gz tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar.bz2 tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar.lz tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar.xz tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.tar.zst tangerine-wallet-browser-09c7b9d242f66db99c80f22fae00dfdb894e2adc.zip |
Merge pull request #1143 from MetaMask/FixTxApprovalUiMode
Fix UI Dev Mode for Tx Approval
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/conf-tx.js | 5 |
1 files changed, 5 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) } } |