Close popup even if last tx is dismissed from main UI

1 files changed, 14 insertions, 8 deletions

diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 4c2aa91de..cf4e1c216 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -2,19 +2,15 @@ const extension = require('./extension')
 
 const notifications = {
   show: showNotification,
+  getPopup,
 }
 module.exports = notifications
 window.METAMASK_NOTIFIER = notifications
 
 function showNotification() {
-  extension.windows.getAll({}, (windows) => {
-
-    let popupWindow = windows.find((win) => {
-      return win.type === 'popup'
-    })
-
-    if (popupWindow) {
-      return extension.windows.update(popupWindow.id, { focused: true })
+  getPopup((popup) => {
+    if (popup) {
+      return extension.windows.update(popup.id, { focused: true })
     }
 
     extension.windows.create({
@@ -27,3 +23,13 @@ function showNotification() {
   })
 }
 
+function getPopup(cb) {
+  extension.windows.getAll({}, (windows) => {
+    let popup = windows.find((win) => {
+      return win.type === 'popup'
+    })
+
+    cb(popup)
+  })
+}
+