diff options
author | kumavis <aaron@kumavis.me> | 2017-04-01 04:32:47 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-04-01 04:32:47 +0800 |
commit | 60a48e713fb341c0eba893bd0c37e02315c8b320 (patch) | |
tree | 2bbec4765bacfa6a3c779c91a9caa87fd4c41227 /ui | |
parent | 49d8877fd78b8251b6856292ca71a55773a74b0e (diff) | |
download | tangerine-wallet-browser-60a48e713fb341c0eba893bd0c37e02315c8b320.tar.gz tangerine-wallet-browser-60a48e713fb341c0eba893bd0c37e02315c8b320.tar.zst tangerine-wallet-browser-60a48e713fb341c0eba893bd0c37e02315c8b320.zip |
ui - move popup auto-close after tx conf to ui entrypoint
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/reducers/app.js | 9 |
1 files changed, 4 insertions, 5 deletions
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: { |