aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2019-03-05 23:14:37 +0800
committerGitHub <noreply@github.com>2019-03-05 23:14:37 +0800
commit1765864e40f548b805cdbdbe59ada3e0c445a52d (patch)
tree591d3a64167eac807776e91bbb069699c666e6f0
parent82713983e356bb96d15d3cf56ebead7702c126a9 (diff)
parent8e99a537ca979789edf00f7e47f78c06af12df3b (diff)
downloadtangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar.gz
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar.bz2
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar.lz
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar.xz
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.tar.zst
tangerine-wallet-browser-1765864e40f548b805cdbdbe59ada3e0c445a52d.zip
Merge pull request #6223 from MetaMask/fix-6221
Show popup if notification or activeMMtab is true
-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..189858a1d 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 && !currentlyActiveMetamaskTab) {
notificationManager.showPopup()
notificationIsOpen = true
}