From 973042bafac23e5e938ec0faee0e5861aa41abab Mon Sep 17 00:00:00 2001
From: Thomas Huang <thomas.b.huang@gmail.com>
Date: Thu, 28 Feb 2019 13:24:48 -0600
Subject: [PATCH] Show popup if notification or activeMMtab is true but not if
 popup is open

---
 app/scripts/background.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
     }