diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-02-24 06:17:52 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-02-24 06:17:52 +0800 |
| commit | 30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5 (patch) | |
| tree | 831a0441622eb017e64dc9a8c513c82b2a8f7c08 /ui/lib/tx-helper.js | |
| parent | 6b56d6ba9853ec978cd2d3d030882fa5ee3645cd (diff) | |
| parent | 09c7b9d242f66db99c80f22fae00dfdb894e2adc (diff) | |
| download | tangerine-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/lib/tx-helper.js')
| -rw-r--r-- | ui/lib/tx-helper.js | 5 |
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) } |