2 files changed, 27 insertions, 8 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 57cdccbac..fb03ffeee 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -1,6 +1,7 @@
 const extend = require('xtend')
 const actions = require('../actions')
 const valuesFor = require('../util').valuesFor
+const txHelper = require('../../lib/tx-helper')
 
 module.exports = reduceApp
 
@@ -127,10 +128,7 @@ function reduceApp(state, action) {
 
   case actions.GO_HOME:
     return extend(appState, {
-      currentView: {
-        name: 'accountDetail',
-        context: appState.currentView.context,
-      },
+      currentView: {},
       accountDetail: {
         accountExport: 'none',
         privateKey: '',
@@ -185,9 +183,24 @@ function reduceApp(state, action) {
       warning: null,
     })
 
+  case actions.SHOW_CONF_MSG_PAGE:
+    return extend(appState, {
+      currentView: {
+        name: 'confTx',
+        context: 0,
+      },
+      transForward: true,
+      warning: null,
+    })
+
   case actions.COMPLETED_TX:
-    var unconfTxs = Object.keys(state.metamask.unconfTxs).filter(tx => tx !== tx.id)
-    if (unconfTxs && unconfTxs.length > 0) {
+    var unconfTxs = state.metamask.unconfTxs
+    var unconfMsgs = state.metamask.unconfMsgs
+
+    var unconfTxList = txHelper(unconfTxs, unconfMsgs)
+    .filter(tx => tx !== tx.id)
+
+    if (unconfTxList && unconfTxList.length > 0) {
       return extend(appState, {
         transForward: false,
         currentView: {
@@ -202,7 +215,7 @@ function reduceApp(state, action) {
         warning: null,
         currentView: {
           name: 'accountDetail',
-          context: appState.currentView.context,
+          context: state.metamask.selectedAddress,
         },
       })
     }
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 43bb3f761..2fe96c453 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -44,13 +44,19 @@ function reduceMetamask(state, action) {
   case actions.COMPLETED_TX:
     var stringId = String(action.id)
     var newState = extend(metamaskState, {
-      unconfTxs: {}
+      unconfTxs: {},
+      unconfMsgs: {},
     })
     for (var id in metamaskState.unconfTxs) {
       if (id !== stringId) {
         newState.unconfTxs[id] = metamaskState.unconfTxs[id]
       }
     }
+    for (var id in metamaskState.unconfMsgs) {
+      if (id !== stringId) {
+        newState.unconfMsgs[id] = metamaskState.unconfMsgs[id]
+      }
+    }
     return newState
 
   case actions.CLEAR_SEED_WORD_CACHE: