add window.mbjs.callbackUrl back to execute to all wallets (#449)

Mintbase · Jan 8, 2024 · 774ffae · 774ffae
1 parent 889d9ac
commit 774ffae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/sdk/src/execute/execute.test.ts b/packages/sdk/src/execute/execute.test.ts
@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { execute } from './execute';
 import { MAX_GAS, ONE_YOCTO } from '../constants';

diff --git a/packages/sdk/src/execute/execute.ts b/packages/sdk/src/execute/execute.ts
@@ -24,15 +24,18 @@ export const execute = async (
 
   let callbackFinal = callbackUrl;
 
+  const shouldGetFromMbjs = callbackUrl?.length < 1 || callbackUrl === undefined && 
+   window?.['mbjs']?.callbackUrl && window?.['mbjs']?.callbackUrl.length > 0; 
+
   if (wallet?.id == 'mintbase-wallet') {
     if (callbackUrl?.length < 1 || callbackUrl === undefined) {
       let mbjsCallbackUrl = '';
 
       if (
-        window?.['mbjs']?.keys?.callbackUrl &&
-        window?.['mbjs']?.keys?.callbackUrl.length > 0
+        window?.['mbjs']?.callbackUrl &&
+        window?.['mbjs']?.callbackUrl.length > 0
       ) {
-        mbjsCallbackUrl = window?.['mbjs']?.keys?.callbackUrl;
+        mbjsCallbackUrl = window?.['mbjs']?.callbackUrl;
       }
 
       const globalCBUrl =
@@ -42,6 +45,10 @@ export const execute = async (
     }
   }
 
+  if (shouldGetFromMbjs) {
+    callbackFinal =  window?.['mbjs']?.callbackUrl;
+  } 
+
   const outcomes = await genericBatchExecute(
     flattenArgs(calls),
     wallet,