From d9039f5292074f093ecd37b818f3640b328c926e Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Mon, 18 Feb 2019 20:34:29 -0800
Subject: Bring Popup to front when ui is tiggered

---
 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 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
     }
-- 
cgit v1.2.3