From 60a48e713fb341c0eba893bd0c37e02315c8b320 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 31 Mar 2017 13:32:47 -0700
Subject: ui - move popup auto-close after tx conf to ui entrypoint

---
 ui/app/reducers/app.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'ui/app')

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: {
-- 
cgit