diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-06-13 04:27:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 04:27:04 +0800 |
| commit | 27220b7bcd5ea1ebdae3bc1b494d28d9c828918c (patch) | |
| tree | c9385fba3d742ca9cbfb9f3b4c6c9ef29c4f4a1b /ui/lib/tx-helper.js | |
| parent | 57d1a1f1860e50837104a10b7b9f86d398c795ec (diff) | |
| parent | 8af41f1b0539e70cf4c6e1f4a9f4b10ad13656fc (diff) | |
| download | tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar.gz tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar.bz2 tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar.lz tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar.xz tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.tar.zst tangerine-wallet-browser-27220b7bcd5ea1ebdae3bc1b494d28d9c828918c.zip | |
Merge branch 'master' into i#1203MainNetSwitch
Diffstat (limited to 'ui/lib/tx-helper.js')
| -rw-r--r-- | ui/lib/tx-helper.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js index 2eefdff68..ec19daf64 100644 --- a/ui/lib/tx-helper.js +++ b/ui/lib/tx-helper.js @@ -4,7 +4,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network) log.debug('tx-helper called with params:') log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, network }) - const txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs) + const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs) log.debug(`tx helper found ${txValues.length} unapproved txs`) const msgValues = valuesFor(unapprovedMsgs) log.debug(`tx helper found ${msgValues.length} unsigned messages`) @@ -13,5 +13,5 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network) log.debug(`tx helper found ${personalValues.length} unsigned personal messages`) allValues = allValues.concat(personalValues) - return allValues.sort(tx => tx.time) + return allValues.sort(txMeta => txMeta.time) } |