Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into kumavis-patch-1

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index 8f15cd3cc..fa7a94cdc 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -1,8 +1,8 @@
 const valuesFor = require('../app/util').valuesFor
 
-module.exports = function (unconfTxs, unconfMsgs) {
-  var txValues = valuesFor(unconfTxs)
-  var msgValues = valuesFor(unconfMsgs)
+module.exports = function (unapprovedTxs, unapprovedMsgs, network) {
+  var txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+  var msgValues = valuesFor(unapprovedMsgs)
   var allValues = txValues.concat(msgValues)
   return allValues.sort(tx => tx.time)
 }