From 919cb1710e8464493dc7150e3cf97b7a0d3b9cd2 Mon Sep 17 00:00:00 2001
From: jinoosss <112360739+jinoosss@users.noreply.github.com>
Date: Tue, 9 Apr 2024 21:18:26 +0900
Subject: [PATCH] fix: Fix injection and pop window collision (#474)

---
 .../src/inject/message/message-handler.ts                | 7 ++-----
 .../adena-extension/src/inject/message/methods/common.ts | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/adena-extension/src/inject/message/message-handler.ts b/packages/adena-extension/src/inject/message/message-handler.ts
index 77616efd..7f8f6a63 100644
--- a/packages/adena-extension/src/inject/message/message-handler.ts
+++ b/packages/adena-extension/src/inject/message/message-handler.ts
@@ -1,6 +1,6 @@
 import { HandlerMethod } from '.';
 import { InjectionMessage, InjectionMessageInstance } from './message';
-import { existsPopups } from './methods';
+import { existsPopups, removePopups } from './methods';
 import { InjectCore } from './methods/core';
 
 export class MessageHandler {
@@ -52,10 +52,7 @@ export class MessageHandler {
     }
     const isPopup = await existsPopups();
     if (isPopup) {
-      sendResponse(
-        InjectionMessageInstance.failure('UNRESOLVED_TRANSACTION_EXISTS', {}, message.key),
-      );
-      return true;
+      await removePopups();
     }
     switch (message.type) {
       case 'DO_CONTRACT':
diff --git a/packages/adena-extension/src/inject/message/methods/common.ts b/packages/adena-extension/src/inject/message/methods/common.ts
index 0d9c6096..92e5aaa6 100644
--- a/packages/adena-extension/src/inject/message/methods/common.ts
+++ b/packages/adena-extension/src/inject/message/methods/common.ts
@@ -60,6 +60,15 @@ export const existsPopups = async (): Promise<boolean> => {
   return windows.findIndex((window) => window.type === 'popup') > -1;
 };
 
+export const removePopups = async (): Promise<void> => {
+  const windows = await chrome.windows.getAll();
+  windows.forEach((window) => {
+    if (window.type === 'popup' && window.id) {
+      chrome.windows.remove(window.id);
+    }
+  });
+};
+
 export const checkEstablished = async (
   requestData: InjectionMessage,
   sendResponse: (response: any) => void,