From f8873d8b255c7c0643f58e56eba7f6d36ea51c02 Mon Sep 17 00:00:00 2001
From: alenmestrov <alenmestrov@gmail.com>
Date: Wed, 15 Jan 2025 11:03:00 +0100
Subject: [PATCH] fix: updated II login process so that it doesnt listen to MM
 (#1037)

---
 node-ui/src/hooks/useIcp.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/node-ui/src/hooks/useIcp.tsx b/node-ui/src/hooks/useIcp.tsx
index f7f5dc388..a4007151f 100644
--- a/node-ui/src/hooks/useIcp.tsx
+++ b/node-ui/src/hooks/useIcp.tsx
@@ -324,13 +324,17 @@ export function useIcp(): useIcpReturn {
       // Wait for II to say it's ready
       const readyPromise = new Promise<MessageEvent>((resolve, reject) => {
         const readyHandler = (e: MessageEvent) => {
-          window.removeEventListener('message', readyHandler);
-          if (e.origin !== iiUrl.origin || e.data.kind !== 'authorize-ready') {
-            win.close();
-            reject(new Error('Bad message from II window. Please try again.'));
-          } else {
-            resolve(e);
+          // Only process messages from II
+          if (e.origin !== iiUrl.origin) {
+            return; // Ignore messages from other origins
+          }
+
+          if (e.data?.kind !== 'authorize-ready') {
+            return; // Ignore messages with wrong kind
           }
+
+          window.removeEventListener('message', readyHandler);
+          resolve(e);
         };
         window.addEventListener('message', readyHandler);
       });