diff options
author | Frankie <frankie.pangilinan@consensys.net> | 2016-08-26 07:06:54 +0800 |
---|---|---|
committer | Frankie <frankie.pangilinan@consensys.net> | 2016-08-26 07:06:54 +0800 |
commit | 547894ed391f2d258c46ff382d4b211d18d81a7b (patch) | |
tree | 9425bee50dae3f6d254462363b5f60b837cb2e27 /ui/app/reducers | |
parent | 250cf8cc23305e33f4fc26a1711996ebc54fd9ad (diff) | |
parent | 78f73038e789f4483f728a7cc9ea1c68b0b3d7fa (diff) | |
download | tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.gz tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.bz2 tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.lz tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.xz tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.zst tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.zip |
Merge branch 'master' into i#563forgotPassword
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index f982cc0c8..bad11113a 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 txHelper = require('../../lib/tx-helper') +const notification = require('../../../app/scripts/lib/notifications') module.exports = reduceApp @@ -271,6 +272,9 @@ function reduceApp (state, action) { warning: null, }) } else { + + notification.closePopup() + return extend(appState, { transForward: false, warning: null, @@ -536,4 +540,3 @@ function indexForPending (state, txId) { return idx } - |