aboutsummaryrefslogtreecommitdiffstats
path: root/ui/lib
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-09-09 03:56:04 +0800
commit6f86c5f8ee6779eddfde1fbc32e356bbc80708f3 (patch)
tree3458a0b05c8e0664ae6d853b47a385225ea722d2 /ui/lib
parent5f8d3085d7603135849eb22ad22c70733c236c2d (diff)
downloadtangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.gz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.bz2
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.lz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.xz
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.tar.zst
tangerine-wallet-browser-6f86c5f8ee6779eddfde1fbc32e356bbc80708f3.zip
Add network checks for unconfirmed Txs
Diffstat (limited to 'ui/lib')
-rw-r--r--ui/lib/tx-helper.js4
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)