Merge branch 'master' into FixLogoLeak

4 files changed, 11 insertions, 5 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index cc956fed3..ebb15cd05 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -235,7 +235,7 @@ AccountDetailScreen.prototype.subview = function () {
 AccountDetailScreen.prototype.transactionList = function () {
   const { transactions, unconfTxs, unconfMsgs, address, network, shapeShiftTxList } = this.props
 
-  var txsToRender = transactions
+  var txsToRender = transactions.concat(unconfTxs)
   // only transactions that are from the current address
   .filter(tx => tx.txParams.from === address)
   // only transactions that are on the current network
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 6e12accc7..c20900c1e 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -11,6 +11,7 @@ module.exports = connect(mapStateToProps)(AccountsScreen)
 
 function mapStateToProps (state) {
   const pendingTxs = valuesFor(state.metamask.unconfTxs)
+  .filter(tx => tx.txParams.metamaskNetworkId === state.metamask.network)
   const pendingMsgs = valuesFor(state.metamask.unconfMsgs)
   const pending = pendingTxs.concat(pendingMsgs)
 
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 22d29383f..99b4bc9f1 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -21,6 +21,7 @@ function mapStateToProps (state) {
     unconfMsgs: state.metamask.unconfMsgs,
     index: state.appState.currentView.context,
     warning: state.appState.warning,
+    network: state.metamask.network,
   }
 }
 
@@ -32,9 +33,10 @@ function ConfirmTxScreen () {
 ConfirmTxScreen.prototype.render = function () {
   var state = this.props
 
+  var network = state.network
   var unconfTxs = state.unconfTxs
   var unconfMsgs = state.unconfMsgs
-  var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+  var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
   var index = state.index !== undefined ? state.index : 0
   var txData = unconfTxList[index] || unconfTxList[0] || {}
   var isNotification = isPopupOrNotification() === 'notification'
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index bad11113a..a6cd9ca1b 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -258,8 +258,9 @@ function reduceApp (state, action) {
     case actions.COMPLETED_TX:
       var unconfTxs = state.metamask.unconfTxs
       var unconfMsgs = state.metamask.unconfMsgs
+      var network = state.metamask.network
 
-      var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+      var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
     .filter(tx => tx !== tx.id)
 
       if (unconfTxList && unconfTxList.length > 0) {
@@ -523,14 +524,16 @@ function reduceApp (state, action) {
 function hasPendingTxs (state) {
   var unconfTxs = state.metamask.unconfTxs
   var unconfMsgs = state.metamask.unconfMsgs
-  var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+  var network = state.metamask.network
+  var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
   return unconfTxList.length > 0
 }
 
 function indexForPending (state, txId) {
   var unconfTxs = state.metamask.unconfTxs
   var unconfMsgs = state.metamask.unconfMsgs
-  var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+  var network = state.metamask.network
+  var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
   let idx
   unconfTxList.forEach((tx, i) => {
     if (tx.id === txId) {