diff options
| author | Dan J Miller <danjm.com@gmail.com> | 2019-02-20 08:29:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 08:29:02 +0800 |
| commit | 641f7c8f4b33ee7b71c90a9146fb8a9035fe097b (patch) | |
| tree | f49b32034290a24cff64dc458b41ef0b68db1ad0 | |
| parent | d4ea1a6645c2bd683549e1da6957fc1b1b38b4da (diff) | |
| parent | d9039f5292074f093ecd37b818f3640b328c926e (diff) | |
| download | tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar.gz tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar.bz2 tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar.lz tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar.xz tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.tar.zst tangerine-wallet-browser-641f7c8f4b33ee7b71c90a9146fb8a9035fe097b.zip | |
Merge pull request #6183 from chikeichan/5171
Bring Popup to front when ui is tiggered
| -rw-r--r-- | app/scripts/background.js | 2 |
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 } |