aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorThomas Huang <thomas.b.huang@gmail.com>2019-03-01 03:24:48 +0800
committerThomas Huang <thomas.b.huang@gmail.com>2019-03-01 03:24:48 +0800
commit973042bafac23e5e938ec0faee0e5861aa41abab (patch)
tree5d3912eb01d5f703df6037095709430b3178fc4c /app
parentcb2698d20eae273d372d03e11fa765a91c330c17 (diff)
downloadtangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar.gz
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar.bz2
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar.lz
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar.xz
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.tar.zst
tangerine-wallet-browser-973042bafac23e5e938ec0faee0e5861aa41abab.zip
Show popup if notification or activeMMtab is true but not if popup is open
Diffstat (limited to 'app')
-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 026823712..3423aa984 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 || !notificationIsOpen) && !currentlyActiveMetamaskTab) {
+ if (!popupIsOpen || notificationIsOpen || currentlyActiveMetamaskTab) {
notificationManager.showPopup()
notificationIsOpen = true
}