Merge branch 'main' into ag/fix/fe-751

FuelLabs · Oct 15, 2024 · 68a91c8 · 68a91c8
2 parents 54d7f94 + 46000eb
commit 68a91c8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.changeset/tricky-lemons-yell.md b/.changeset/tricky-lemons-yell.md
@@ -0,0 +1,5 @@
+---
+"@fuel-connectors/bako-safe": patch
+---
+
+fix(bako-safe): prevents events from remaining active
diff --git a/packages/bako-safe/src/BakoSafeConnector.ts b/packages/bako-safe/src/BakoSafeConnector.ts
@@ -23,6 +23,7 @@ import {
   APP_VERSION,
   HAS_WINDOW,
   HOST_URL,
+  IS_SAFARI,
   SESSION_ID,
   WINDOW,
 } from './constants';
@@ -47,7 +48,7 @@ export class BakoSafeConnector extends FuelConnector {
       description: APP_DESCRIPTION,
     },
   };
-  installed = true;
+  installed = !IS_SAFARI;
   connected = false;
   external = false;
 
@@ -163,12 +164,12 @@ export class BakoSafeConnector extends FuelConnector {
 
       //events controll
       // @ts-ignore
-      this.on(BakoSafeConnectorEvents.CLIENT_DISCONNECTED, () => {
+      this.once(BakoSafeConnectorEvents.CLIENT_DISCONNECTED, () => {
         this.dAppWindow?.close();
         reject(false);
       });
 
-      this.on(
+      this.once(
         //@ts-ignore
         BakoSafeConnectorEvents.AUTH_CONFIRMED,
         async ({ data }: { data: IResponseAuthConfirmed }) => {
@@ -203,42 +204,43 @@ export class BakoSafeConnector extends FuelConnector {
       this.checkWindow();
 
       //events controll
-
-      this.on(
+      this.once(
         //@ts-ignore
         BakoSafeConnectorEvents.CLIENT_DISCONNECTED,
         () => {
           this.dAppWindow?.close();
-          reject();
+          reject(new Error('Client disconnected'));
         },
       );
 
       // @ts-ignore
-      this.on(BakoSafeConnectorEvents.TX_TIMEOUT, () => {
+      this.once(BakoSafeConnectorEvents.TX_TIMEOUT, () => {
         this.dAppWindow?.close();
         reject(new Error('Transaction timeout'));
       });
 
       // @ts-ignore
-      this.on(BakoSafeConnectorEvents.CLIENT_CONNECTED, () => {
+      this.once(BakoSafeConnectorEvents.CLIENT_CONNECTED, () => {
         this.socket?.server.emit(BakoSafeConnectorEvents.TX_PENDING, {
           _transaction,
           _address,
         });
       });
 
-      this.on(
+      this.once(
         // @ts-ignore
         BakoSafeConnectorEvents.TX_CONFIRMED,
         ({ data }: { data: IResponseTxCofirmed }) => {
-          this.dAppWindow?.close();
           resolve(`0x${data.id}`);
         },
       );
     });
   }
 
   async ping() {
+    if (IS_SAFARI) {
+      return false;
+    }
     await this.setup();
     return this.setupReady ?? false;
   }

diff --git a/packages/bako-safe/src/constants.ts b/packages/bako-safe/src/constants.ts
@@ -16,6 +16,8 @@ export const SOCKET_URL = 'https://api.bako.global';
 export const HAS_WINDOW = typeof window !== 'undefined';
 // biome-ignore lint/suspicious/noExplicitAny: <explanation>
 export const WINDOW: any = HAS_WINDOW ? window : {};
-
+export const IS_SAFARI = /^((?!chrome|android).)*safari/i.test(
+  WINDOW.navigator?.userAgent ?? '',
+);
 //storage
 export const SESSION_ID = 'sessionId';