aboutsummaryrefslogtreecommitdiffstats
path: root/ui/lib
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-02-21 15:50:54 +0800
committerGitHub <noreply@github.com>2017-02-21 15:50:54 +0800
commit09c7b9d242f66db99c80f22fae00dfdb894e2adc (patch)
treeffa6e494f612a7adc2990c0a275152a92da5ef3c /ui/lib
parent838d19e17fb26daadd7f171cc6f0494ce29fe43d (diff)
parent2baedc56eafcc0e26fdaab1706953dc2d949570d (diff)
downloadtangerine-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/lib')
-rw-r--r--ui/lib/tx-helper.js5
1 files changed, 5 insertions, 0 deletions
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)
}