@dynamic-labs/sdk-react-core 4.17.0 → 4.18.1

package/src/lib/utils/constants/localStorage.cjs

@@ -18,7 +18,6 @@ const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settin
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const CAPTCHA_TOKEN = 'dynamic_captcha_token';
-const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
 /**
  * Used to identify the purpose of a signature after phantom redirects back to the app in mobile
  */
@@ -48,4 +47,3 @@ exports.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = SECURE_ENCLAVE_WALL
 exports.STORE_STORAGE_KEY = STORE_STORAGE_KEY;
 exports.WAGMI_LAST_SESSION_SETTINGS = WAGMI_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;
-exports.ZERODEV_AUTHORIZATION = ZERODEV_AUTHORIZATION;

package/src/lib/utils/constants/localStorage.d.ts

@@ -16,7 +16,6 @@ export declare const EMBEDDED_WALLET_SESSION_SETTINGS = "dynamic_embedded_wallet
 export declare const EMBEDDED_WALLET_SECURE_BANNER = "dynamic_embedded_secure_banner";
 export declare const PHONE_INPUT_DEFAULT_COUNTRY = "dynamic_phone_input_default_country";
 export declare const CAPTCHA_TOKEN = "dynamic_captcha_token";
-export declare const ZERODEV_AUTHORIZATION = "zerodev_authorization";
 export type PhantomSignatureState = {
     /**
      * Whether the user has agreed to transfer a wallet even if that means

package/src/lib/utils/constants/localStorage.js

@@ -14,7 +14,6 @@ const EMBEDDED_WALLET_SESSION_SETTINGS = 'dynamic_embedded_wallet_session_settin
 const EMBEDDED_WALLET_SECURE_BANNER = 'dynamic_embedded_secure_banner';
 const PHONE_INPUT_DEFAULT_COUNTRY = 'dynamic_phone_input_default_country';
 const CAPTCHA_TOKEN = 'dynamic_captcha_token';
-const ZERODEV_AUTHORIZATION = 'zerodev_authorization';
 /**
  * Used to identify the purpose of a signature after phantom redirects back to the app in mobile
  */
@@ -25,4 +24,4 @@ const SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS = {
     priority: ['secureStorage', 'localStorage'],
 };
 
-export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLET_NAME_SERVICE, DEVICE_FINGERPRINT, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY, ZERODEV_AUTHORIZATION };
+export { AUTH_EXPIRES_AT, AUTH_MIN_TOKEN, AUTH_TOKEN, BRIDGE_ONBOARDING_COMPLETED, CAPTCHA_TOKEN, CONNECTED_WALLET_NAME_SERVICE, DEVICE_FINGERPRINT, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER, EMBEDDED_WALLET_SESSION_SETTINGS, LAST_USED_WALLET, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, PHANTOM_SIGNATURE_STATE, PHONE_INPUT_DEFAULT_COUNTRY, SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS, STORE_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

package/src/lib/utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.cjs

@@ -0,0 +1,33 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * returns the id of the primary turnkey wallet
+ * if the primary wallet is a turnkey wallet, it returns the id of the primary wallet
+ * if the primary wallet is a zerodev wallet, it returns corresponding turnkey wallet id
+ */
+const getPrimaryTurnkeyWalletId = (primaryWalletId, verifiedCredentials) => {
+    const primaryWallet = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ id }) => id === primaryWalletId);
+    if (!primaryWallet) {
+        throw new Error('Primary wallet not found');
+    }
+    const walletName = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.walletName;
+    if (!walletName) {
+        throw new Error('Wallet name not found');
+    }
+    let turnkeyWalletId;
+    if (walletName.startsWith('zerodev')) {
+        turnkeyWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.signerRefId;
+    }
+    else if (walletName.startsWith('turnkey')) {
+        turnkeyWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+    }
+    if (!turnkeyWalletId) {
+        throw new Error(`Invalid wallet type: ${walletName}, expecting one of 'turnkey' or 'zerodev'`);
+    }
+    return turnkeyWalletId;
+};
+
+exports.getPrimaryTurnkeyWalletId = getPrimaryTurnkeyWalletId;

package/src/lib/utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.d.ts

@@ -0,0 +1,7 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+/**
+ * returns the id of the primary turnkey wallet
+ * if the primary wallet is a turnkey wallet, it returns the id of the primary wallet
+ * if the primary wallet is a zerodev wallet, it returns corresponding turnkey wallet id
+ */
+export declare const getPrimaryTurnkeyWalletId: (primaryWalletId: string, verifiedCredentials: JwtVerifiedCredential[]) => string;

package/src/lib/utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.js

@@ -0,0 +1,29 @@
+'use client'
+/**
+ * returns the id of the primary turnkey wallet
+ * if the primary wallet is a turnkey wallet, it returns the id of the primary wallet
+ * if the primary wallet is a zerodev wallet, it returns corresponding turnkey wallet id
+ */
+const getPrimaryTurnkeyWalletId = (primaryWalletId, verifiedCredentials) => {
+    const primaryWallet = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ id }) => id === primaryWalletId);
+    if (!primaryWallet) {
+        throw new Error('Primary wallet not found');
+    }
+    const walletName = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.walletName;
+    if (!walletName) {
+        throw new Error('Wallet name not found');
+    }
+    let turnkeyWalletId;
+    if (walletName.startsWith('zerodev')) {
+        turnkeyWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.signerRefId;
+    }
+    else if (walletName.startsWith('turnkey')) {
+        turnkeyWalletId = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id;
+    }
+    if (!turnkeyWalletId) {
+        throw new Error(`Invalid wallet type: ${walletName}, expecting one of 'turnkey' or 'zerodev'`);
+    }
+    return turnkeyWalletId;
+};
+
+export { getPrimaryTurnkeyWalletId };

package/src/lib/utils/functions/getPrimaryTurnkeyWalletId/inedex.d.ts

@@ -0,0 +1 @@
+export * from './getPrimaryTurnkeyWalletId';

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.cjs

@@ -42,13 +42,13 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.js

@@ -38,13 +38,13 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { findSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs

@@ -41,13 +41,13 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
 var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var primaryWalletId = require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-var primaryWalletId = require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js

@@ -37,13 +37,13 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
 import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { getPrimaryWalletId } from '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import { getPrimaryWalletId } from '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs

@@ -51,6 +51,7 @@ require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
 require('../../../functions/compareChains/compareChains.cjs');
 var findPrimaryEmbeddedChain = require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var getPrimaryTurnkeyWalletId = require('../../../functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../../useSmartWallets/useSmartWallets.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -283,7 +284,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new utils.DynamicError('User does not have a secure enclave wallet or a verified email', errors.INVALID_WALLET_DATA);
         }
-        const organizationId = (_r = (_q = (_p = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
+        if (!primaryWallet) {
+            throw new utils.DynamicError('No primary wallet found');
+        }
+        const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId.getPrimaryTurnkeyWalletId(primaryWallet.id, (user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) || []);
+        const organizationId = (_r = (_q = (_p = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -47,6 +47,7 @@ import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
 import '../../../functions/compareChains/compareChains.js';
 import { findPrimaryEmbeddedChain } from '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { getPrimaryTurnkeyWalletId } from '../../../functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../../useSmartWallets/useSmartWallets.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -279,7 +280,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new DynamicError('User does not have a secure enclave wallet or a verified email', INVALID_WALLET_DATA);
         }
-        const organizationId = (_r = (_q = (_p = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
+        if (!primaryWallet) {
+            throw new DynamicError('No primary wallet found');
+        }
+        const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+        const organizationId = (_r = (_q = (_p = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),

package/src/lib/utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs

@@ -24,11 +24,12 @@ require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
+var primaryWalletId = require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 var user = require('../../../store/state/user/user.cjs');
 var embeddedWallets = require('../../../data/api/embeddedWallets/embeddedWallets.cjs');
 require('../../../locale/locale.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+var getPrimaryTurnkeyWalletId = require('../../functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.cjs');
 
 const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     const { user: user$1 } = user.useUser();
@@ -74,11 +75,17 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
             prevSessionKeySignature = yield utils$1.p256Sign(decodedSessionKeys.privateKeyJwk, user$1.sessionId);
         }
         let resp;
+        const primaryWalletId$1 = primaryWalletId.getPrimaryWalletId();
+        if (!primaryWalletId$1) {
+            throw new Error('Primary wallet ID not found');
+        }
+        const turnkeyWalletId = getPrimaryTurnkeyWalletId.getPrimaryTurnkeyWalletId(primaryWalletId$1, user$1.verifiedCredentials);
         try {
             resp = yield embeddedWallets.registerSessionKey({
                 environmentId,
                 prevSessionKeySignature,
                 publicKey,
+                walletId: turnkeyWalletId,
             });
         }
         catch (error) {

package/src/lib/utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js

@@ -20,11 +20,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
+import { getPrimaryWalletId } from '../../../store/state/primaryWalletId/primaryWalletId.js';
 import { useUser } from '../../../store/state/user/user.js';
 import { registerSessionKey } from '../../../data/api/embeddedWallets/embeddedWallets.js';
 import '../../../locale/locale.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import { getPrimaryTurnkeyWalletId } from '../../functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.js';
 
 const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     const { user } = useUser();
@@ -70,11 +71,17 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
             prevSessionKeySignature = yield p256Sign(decodedSessionKeys.privateKeyJwk, user.sessionId);
         }
         let resp;
+        const primaryWalletId = getPrimaryWalletId();
+        if (!primaryWalletId) {
+            throw new Error('Primary wallet ID not found');
+        }
+        const turnkeyWalletId = getPrimaryTurnkeyWalletId(primaryWalletId, user.verifiedCredentials);
         try {
             resp = yield registerSessionKey({
                 environmentId,
                 prevSessionKeySignature,
                 publicKey,
+                walletId: turnkeyWalletId,
             });
         }
         catch (error) {

package/src/lib/utils/hooks/useTransferWallet/useTransferWallet.cjs

@@ -40,12 +40,12 @@ require('../../../store/state/nonce/nonce.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');

package/src/lib/utils/hooks/useTransferWallet/useTransferWallet.js

@@ -36,12 +36,12 @@ import '../../../store/state/nonce/nonce.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';

package/src/lib/views/EmbeddedDeleteView/EmbeddedDeleteView.cjs

@@ -44,6 +44,7 @@ require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
 require('../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var getPrimaryTurnkeyWalletId = require('../../utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -131,8 +132,10 @@ const EmbeddedDeleteView = () => {
         }
         setIsLoading(true);
         try {
+            const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId.getPrimaryTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
             const deleteEmbeddedWalletsRawPayload = yield embeddedWallets.getDeleteEmbeddedWalletsRequest({
                 environmentId,
+                walletId: primaryTurnkeyWalletId,
             });
             const connector = isSmartWallet(primaryWallet)
                 ? (_a = getEOAWallet(primaryWallet)) === null || _a === void 0 ? void 0 : _a.connector

package/src/lib/views/EmbeddedDeleteView/EmbeddedDeleteView.js

@@ -40,6 +40,7 @@ import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
 import '../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { getPrimaryTurnkeyWalletId } from '../../utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -127,8 +128,10 @@ const EmbeddedDeleteView = () => {
         }
         setIsLoading(true);
         try {
+            const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
             const deleteEmbeddedWalletsRawPayload = yield getDeleteEmbeddedWalletsRequest({
                 environmentId,
+                walletId: primaryTurnkeyWalletId,
             });
             const connector = isSmartWallet(primaryWallet)
                 ? (_a = getEOAWallet(primaryWallet)) === null || _a === void 0 ? void 0 : _a.connector

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -34,6 +34,7 @@ require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+var errors = require('../../../utils/constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
@@ -51,6 +52,7 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../utils/functions/compareChains/compareChains.cjs');
 require('../../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var getPrimaryTurnkeyWalletId = require('../../../utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -125,7 +127,11 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     const { getEOAWallet, isSmartWallet } = useSmartWallets.useSmartWallets();
     const [acknowledgement1, setAcknowledgement1] = React.useState(false);
     const iframeContainerRef = React.useRef(null);
-    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    if (!primaryWallet) {
+        throw new utils.DynamicError('No primary wallet found', errors.INVALID_WALLET_DATA);
+    }
+    const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId.getPrimaryTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
     // eslint-disable-next-line arrow-body-style

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -30,6 +30,7 @@ import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { INVALID_WALLET_DATA } from '../../../utils/constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
@@ -47,6 +48,7 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../utils/functions/compareChains/compareChains.js';
 import '../../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { getPrimaryTurnkeyWalletId } from '../../../utils/functions/getPrimaryTurnkeyWalletId/getPrimaryTurnkeyWalletId.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -121,7 +123,11 @@ const EmbeddedRevealView = ({ exportPrivateKey, isPromptForExport = false, }) =>
     const { getEOAWallet, isSmartWallet } = useSmartWallets();
     const [acknowledgement1, setAcknowledgement1] = useState(false);
     const iframeContainerRef = useRef(null);
-    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    if (!primaryWallet) {
+        throw new DynamicError('No primary wallet found', INVALID_WALLET_DATA);
+    }
+    const primaryTurnkeyWalletId = getPrimaryTurnkeyWalletId(primaryWallet.id, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === primaryTurnkeyWalletId)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const wallet = (_c = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _c !== void 0 ? _c : primaryWallet;
     // eslint-disable-next-line arrow-body-style

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs

@@ -54,7 +54,7 @@ const handleExportInitCheck = ({ user, wallet, }) => {
     }
     const connector = wallet.connector;
     connector.setEmail(user.email);
-    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const turnkeyHDWalletId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const privateKeyId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyPrivateKeyId;
     const organizationId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeySubOrganizationId;

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js

@@ -50,7 +50,7 @@ const handleExportInitCheck = ({ user, wallet, }) => {
     }
     const connector = wallet.connector;
     connector.setEmail(user.email);
-    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const turnkeyHDWalletId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const privateKeyId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyPrivateKeyId;
     const organizationId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeySubOrganizationId;

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs

@@ -81,7 +81,7 @@ const passkeyRecoveryBundleValidation = (_c) => _tslib.__awaiter(void 0, [_c], v
     if (!user) {
         throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
     }
-    const organizationId = (_f = (_e = (_d = user.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _e === void 0 ? void 0 : _e.walletProperties) === null || _f === void 0 ? void 0 : _f.turnkeySubOrganizationId;
+    const organizationId = (_f = (_e = (_d = user.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _e === void 0 ? void 0 : _e.walletProperties) === null || _f === void 0 ? void 0 : _f.turnkeySubOrganizationId;
     const turnkeyRecoveryHandler = (_g = wallet.connector) === null || _g === void 0 ? void 0 : _g.getAuthenticatorHandler();
     yield turnkeyRecoveryHandler.verifyRecoveryCode(bundleInput, organizationId);
     const sessionSettings = {
@@ -147,7 +147,7 @@ const recoverTurnkeyWallet = (_m) => _tslib.__awaiter(void 0, [_m], void 0, func
     }
     const connector = wallet.connector;
     connector.setEmail(user.email);
-    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
     if (!turnkeySubOrganizationId) {
         throw new utils.DynamicError('The authentication token is invalid - turnkeySubOrganizationId is missing');
     }
@@ -225,7 +225,7 @@ const restoreEmbeddedWalletSession = (_r) => _tslib.__awaiter(void 0, [_r], void
         throw new utils.DynamicError('Could not open embedded wallet connection communication');
     }
     turnkeyRecoveryHandler.recoveryUserId = sessionSettings.userId;
-    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
+    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
     yield turnkeyRecoveryHandler.verifyRecoveryCode(sessionSettings.emailCode, organizationId);
     return true;
 });
@@ -240,7 +240,7 @@ const addEmailRecovery = (_w) => _tslib.__awaiter(void 0, [_w], void 0, function
         !walletConnectorCore.isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
         throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
-    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = user$1.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _y === void 0 ? void 0 : _y.walletProperties;
+    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = user$1.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _y === void 0 ? void 0 : _y.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {
         throw new utils.DynamicError('The authentication token is invalid - turnkeySubOrganizationId or turnkeyUserID is missing');
     }

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.js

@@ -77,7 +77,7 @@ const passkeyRecoveryBundleValidation = (_c) => __awaiter(void 0, [_c], void 0,
     if (!user) {
         throw new DynamicError(USER_NOT_LOGGED_IN);
     }
-    const organizationId = (_f = (_e = (_d = user.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _e === void 0 ? void 0 : _e.walletProperties) === null || _f === void 0 ? void 0 : _f.turnkeySubOrganizationId;
+    const organizationId = (_f = (_e = (_d = user.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _e === void 0 ? void 0 : _e.walletProperties) === null || _f === void 0 ? void 0 : _f.turnkeySubOrganizationId;
     const turnkeyRecoveryHandler = (_g = wallet.connector) === null || _g === void 0 ? void 0 : _g.getAuthenticatorHandler();
     yield turnkeyRecoveryHandler.verifyRecoveryCode(bundleInput, organizationId);
     const sessionSettings = {
@@ -143,7 +143,7 @@ const recoverTurnkeyWallet = (_m) => __awaiter(void 0, [_m], void 0, function* (
     }
     const connector = wallet.connector;
     connector.setEmail(user.email);
-    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
     if (!turnkeySubOrganizationId) {
         throw new DynamicError('The authentication token is invalid - turnkeySubOrganizationId is missing');
     }
@@ -221,7 +221,7 @@ const restoreEmbeddedWalletSession = (_r) => __awaiter(void 0, [_r], void 0, fun
         throw new DynamicError('Could not open embedded wallet connection communication');
     }
     turnkeyRecoveryHandler.recoveryUserId = sessionSettings.userId;
-    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
+    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
     yield turnkeyRecoveryHandler.verifyRecoveryCode(sessionSettings.emailCode, organizationId);
     return true;
 });
@@ -236,7 +236,7 @@ const addEmailRecovery = (_w) => __awaiter(void 0, [_w], void 0, function* ({ us
         !isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
         throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
-    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = user.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _y === void 0 ? void 0 : _y.walletProperties;
+    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = user.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && id === wallet.id)) === null || _y === void 0 ? void 0 : _y.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {
         throw new DynamicError('The authentication token is invalid - turnkeySubOrganizationId or turnkeyUserID is missing');
     }

package/src/lib/views/TransactionConfirmationView/TransactionConfirmationView.cjs

@@ -120,6 +120,7 @@ var SimulationStatus;
 const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation, onClickBack, walletConnector, onClickClose, title, displayPoweredByDynamicFooter = false, copykey, hideModal, currentToken, isNativeToken, transactionValue, isModal, sendBalanceTransaction, }) => {
     const { primaryWallet, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const [isGasSponsored, setIsGasSponsored] = React.useState(false);
+    const [isGasSponsoredLoading, setIsGasSponsoredLoading] = React.useState(false);
     const update = useForceUpdate.useForceUpdate();
     const { t } = reactI18next.useTranslation();
     const { currency } = useFetchCurrency.useFetchCurrency(walletConnector);
@@ -135,13 +136,20 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         status: SimulationStatus.LOADING,
     });
     const [recipient, setRecipient] = React.useState(undefined);
+    const isFetchingSimulationRef = React.useRef(false);
     const fetchSimulationResult = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
         if (simulationState.status !== SimulationStatus.LOADING) {
             return;
         }
+        if (isFetchingSimulationRef.current) {
+            // Already fetching, prevent duplicate call
+            return;
+        }
+        isFetchingSimulationRef.current = true;
         if (sendBalanceTransaction || hideModal) {
             setSimulationState({ status: SimulationStatus.SKIPPED });
+            isFetchingSimulationRef.current = false;
             return;
         }
         if (!primaryWallet || (!chainId && (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL')) {
@@ -151,13 +159,16 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                 primaryWallet,
             });
             setSimulationState({ status: SimulationStatus.FAILED });
+            isFetchingSimulationRef.current = false;
             return;
         }
         try {
             let result;
             if (primaryWallet.connector.key === 'zerodev') {
                 const connector = primaryWallet.connector;
-                const { userOperation } = yield connector.getCurrentUserOperation(transaction);
+                const { userOperation, sponsored } = yield connector.getCurrentUserOperation(transaction);
+                setIsGasSponsored(sponsored);
+                setIsGasSponsoredLoading(false);
                 if (userOperation) {
                     const formattedUserOperation = yield connector.formatUserOperation(userOperation);
                     // Set the gas fee on the transaction, only for zero dev
@@ -224,6 +235,9 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             logger.logger.error('[TransactionConfirmationView] Simulation failed:', error);
             setSimulationState({ status: SimulationStatus.FAILED });
         }
+        finally {
+            isFetchingSimulationRef.current = false;
+        }
     }), [
         sendBalanceTransaction,
         hideModal,
@@ -232,6 +246,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         environmentId,
         transaction,
         walletConnector,
+        simulationState.status,
+        setSimulationState,
     ]);
     React.useEffect(() => {
         if (simulationState.status === SimulationStatus.SUCCESS ||
@@ -253,21 +269,6 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         }
         transaction.fetchFee().finally(update);
     }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain, transaction, update]);
-    const { isLoading: isGasSponsoredLoading } = usePromise.usePromise(() => {
-        if (!walletConnectorCore.isAccountAbstractionConnector(walletConnector)) {
-            return false;
-        }
-        return walletConnector.canSponsorTransactionGas(transaction);
-    }, {
-        initialData: false,
-        onReject: logger.logger.error,
-        onResolve: (isGasSponsored) => {
-            setIsGasSponsored(isGasSponsored);
-            if (!isGasSponsored && walletConnectorCore.isAccountAbstractionConnector(walletConnector)) {
-                walletConnector.disableGasSponsorshipOnce();
-            }
-        },
-    });
     React.useEffect(() => {
         var _a;
         // solana gas sponsorship check