fix cancel action

multiversx · Mar 28, 2024 · 2b1ac28 · 2b1ac28
1 parent ee65744
commit 2b1ac28
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-web-wallet-cross-window-provider",
-  "version": "0.0.28-alpha.9",
+  "version": "0.0.28-alpha.10",
   "description": "Signing provider for dApps: Cross Window",
   "main": "out/index.js",
   "types": "out/index.d.js",

diff --git a/src/CrossWindowProvider/CrossWindowProvider.ts b/src/CrossWindowProvider/CrossWindowProvider.ts
@@ -274,6 +274,13 @@ export class CrossWindowProvider {
   }
 
   cancelAction() {
+    const isWalletOpened = this.windowManager?.isWalletOpened(
+      CrossWindowProviderRequestEnums.cancelAction
+    );
+    if (!isWalletOpened) {
+      return;
+    }
+
     return this.windowManager?.postMessage({
       type: CrossWindowProviderRequestEnums.cancelAction,
       payload: undefined

diff --git a/src/WindowManager/WindowManager.ts b/src/WindowManager/WindowManager.ts
@@ -47,11 +47,15 @@ export class WindowManager {
     return this.initialized;
   }
 
-  async handshake(type: CrossWindowProviderRequestEnums): Promise<boolean> {
-    const isOpened =
+  public isWalletOpened(type?: CrossWindowProviderRequestEnums) {
+    return (
       type === CrossWindowProviderRequestEnums.cancelAction &&
-      Boolean(this.walletWindow);
+      Boolean(this.walletWindow)
+    );
+  }
 
+  async handshake(type: CrossWindowProviderRequestEnums): Promise<boolean> {
+    const isOpened = this.isWalletOpened(type);
     if (isOpened) {
       return true;
     }