diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-02-28 02:36:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 02:36:48 +0800 |
| commit | 5edb3db96939de2dee31fa19cb8e715dc649bfd6 (patch) | |
| tree | 1509d7fd69ac6dee6fd466286cf85524ac7887f2 /ui/lib/tx-helper.js | |
| parent | ca5cf06ae9e3e417dd3488bb0d94cdeec74ca18c (diff) | |
| parent | ab01fef1c0ffddf09a20f90a910e5e068cf8c71e (diff) | |
| download | tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar.gz tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar.bz2 tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar.lz tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar.xz tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.tar.zst tangerine-wallet-browser-5edb3db96939de2dee31fa19cb8e715dc649bfd6.zip | |
Merge branch 'master' into i1144-moarrpc
Diffstat (limited to 'ui/lib/tx-helper.js')
| -rw-r--r-- | ui/lib/tx-helper.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js index 7f64f9fbe..2eefdff68 100644 --- a/ui/lib/tx-helper.js +++ b/ui/lib/tx-helper.js @@ -1,13 +1,17 @@ const valuesFor = require('../app/util').valuesFor -module.exports = function (unapprovedTxs, unapprovedMsgs, network) { +module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network) { log.debug('tx-helper called with params:') - log.debug({ unapprovedTxs, unapprovedMsgs, network }) + log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, network }) - var txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs) + const 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) + const msgValues = valuesFor(unapprovedMsgs) log.debug(`tx helper found ${msgValues.length} unsigned messages`) - var allValues = txValues.concat(msgValues) + let allValues = txValues.concat(msgValues) + const personalValues = valuesFor(personalMsgs) + log.debug(`tx helper found ${personalValues.length} unsigned personal messages`) + allValues = allValues.concat(personalValues) + return allValues.sort(tx => tx.time) } |