aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2019-02-19 12:34:29 +0800
committerChi Kei Chan <chikeichan@gmail.com>2019-02-19 12:34:29 +0800
commitd9039f5292074f093ecd37b818f3640b328c926e (patch)
treef7128939501fef0ceb6fb63cd92a7a1ab8fbe0c8 /app/scripts
parent89c43534082b920f68503eddc1dd3cc8f16aeb17 (diff)
downloadtangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar.gz
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar.bz2
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar.lz
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar.xz
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.tar.zst
tangerine-wallet-browser-d9039f5292074f093ecd37b818f3640b328c926e.zip
Bring Popup to front when ui is tiggered
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/background.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 8cc60be80..026823712 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -448,7 +448,7 @@ function setupController (initState, initLangCode) {
function triggerUi () {
extension.tabs.query({ active: true }, tabs => {
const currentlyActiveMetamaskTab = Boolean(tabs.find(tab => openMetamaskTabsIDs[tab.id]))
- if (!popupIsOpen && !currentlyActiveMetamaskTab && !notificationIsOpen) {
+ if ((!popupIsOpen || !notificationIsOpen) && !currentlyActiveMetamaskTab) {
notificationManager.showPopup()
notificationIsOpen = true
}