diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-09-09 06:43:51 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-09-09 06:43:51 +0800 |
| commit | 4a7eab5b1aee8b122d06903bc032849d1c35a3a9 (patch) | |
| tree | 3911014fabd11677573538727edbb95068457338 /ui/lib | |
| parent | 6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf (diff) | |
| parent | fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5 (diff) | |
| download | tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.gz tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.bz2 tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.lz tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.xz tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.tar.zst tangerine-wallet-browser-4a7eab5b1aee8b122d06903bc032849d1c35a3a9.zip | |
Merge branch 'master' into FixLogoLeak
Diffstat (limited to 'ui/lib')
| -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 8f15cd3cc..c984bc9af 100644 --- a/ui/lib/tx-helper.js +++ b/ui/lib/tx-helper.js @@ -1,7 +1,7 @@ const valuesFor = require('../app/util').valuesFor -module.exports = function (unconfTxs, unconfMsgs) { - var txValues = valuesFor(unconfTxs) +module.exports = function (unconfTxs, unconfMsgs, network) { + var txValues = network ? valuesFor(unconfTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unconfTxs) var msgValues = valuesFor(unconfMsgs) var allValues = txValues.concat(msgValues) return allValues.sort(tx => tx.time) |