ui - move popup auto-close after tx conf to ui entrypoint

2 files changed, 9 insertions, 6 deletions

diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index f6dcb829b..ce18dc422 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -17,13 +17,17 @@ global.METAMASK_UI_TYPE = windowType
 closePopupIfOpen(windowType)
 
 // setup stream to background
-const extensionPort = extension.runtime.connect({ windowType })
+const extensionPort = extension.runtime.connect({ name: windowType })
 const connectionStream = new PortStream(extensionPort)
 
 // start ui
 const container = document.getElementById('app-content')
 startPopup({ container, connectionStream }, (err, store) => {
   if (err) return displayCriticalError(err)
+  store.subscribe(() => {
+    const state = store.getState()
+    if (state.appState.shouldClose) notificationManager.closePopup()
+  })
 })
 
 
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 46b27fe25..7ad1229e5 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -1,12 +1,10 @@
 const extend = require('xtend')
 const actions = require('../actions')
 const txHelper = require('../../lib/tx-helper')
-const NotificationManager = require('../../../app/scripts/lib/notification-manager')
-
-const notificationManager = new NotificationManager()
 
 module.exports = reduceApp
 
+
 function reduceApp (state, action) {
   log.debug('App Reducer got ' + action.type)
   // clone and defaults
@@ -36,6 +34,7 @@ function reduceApp (state, action) {
 
   // default state
   var appState = extend({
+    shouldClose: false,
     menuOpen: false,
     currentView: seedWords ? seedConfView : defaultView,
     accountDetail: {
@@ -331,9 +330,9 @@ function reduceApp (state, action) {
         })
       } else {
         log.debug('attempting to close popup')
-        notificationManager.closePopup()
-
         return extend(appState, {
+          // indicate notification should close
+          shouldClose: true,
           transForward: false,
           warning: null,
           currentView: {