@dynamic-labs/sdk-react-core 4.16.0 → 4.18.0

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/hooks/authenticationHooks/helpers/showPendingConnectView.cjs

@@ -4,11 +4,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
-var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const specialCareWallets = ['bloctoevm', 'perawallet', 'metamaskstarknet'];
 const showPendingConnectView = (walletConnector, pushView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
+    const walletProvider = walletConnectorCore.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect
     // They have their own view with qrCode so we don't need to show the pending connect view
     if (walletProvider === 'walletConnect' || walletProvider === 'qrCode') {

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.d.ts

@@ -1,3 +1,3 @@
-import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { type WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ViewType } from '../../../../context/ViewContext';
 export declare const showPendingConnectView: (walletConnector: WalletConnector, pushView: (view: ViewType) => void) => Promise<void>;

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
+import { getWalletProvider } from '@dynamic-labs/wallet-connector-core';
 
 const specialCareWallets = ['bloctoevm', 'perawallet', 'metamaskstarknet'];
 const showPendingConnectView = (walletConnector, pushView) => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -28,7 +28,6 @@ var getWalletUniqueId = require('../../functions/getWalletUniqueId/getWalletUniq
 require('../../../store/state/user/user.cjs');
 var session = require('../../../data/api/session/session.cjs');
 require('../../../locale/locale.cjs');
-var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var isConnectOnly = require('../authenticationHooks/helpers/isConnectOnly.cjs');
 var getWalletConnectorForWallet = require('../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.cjs');
 var useDebounce = require('../useDebounce/useDebounce.cjs');
@@ -209,7 +208,7 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
                 environmentId,
                 publicWalletAddress: walletAddress,
                 walletName: walletConnector.key,
-                walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+                walletProvider: walletConnectorCore.getWalletProvider(walletConnector),
             });
         }
         // On connect and sign, we don't want to add this wallet to userWallets
@@ -234,7 +233,7 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         }
         else {
             applyConnectedWalletToStore({
-                provider: getWalletProvider.getWalletProvider(walletConnector),
+                provider: walletConnectorCore.getWalletProvider(walletConnector),
                 walletAddress: walletAddress,
                 walletChain,
                 walletConnectorKey: walletConnector.key,

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

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { CustomError, MissingPublicAddressError } from '@dynamic-labs/utils';
-import { getWalletConnectorByKey, logger, isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { getWalletConnectorByKey, logger, isHardwareWalletConnector, getWalletProvider } from '@dynamic-labs/wallet-connector-core';
 import { HardwareWalletEnum } from '@dynamic-labs/sdk-api-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
@@ -24,7 +24,6 @@ import { getWalletUniqueId } from '../../functions/getWalletUniqueId/getWalletUn
 import '../../../store/state/user/user.js';
 import { createVisit } from '../../../data/api/session/session.js';
 import '../../../locale/locale.js';
-import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { isConnectOnly } from '../authenticationHooks/helpers/isConnectOnly.js';
 import { getWalletConnectorForWallet } from '../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.js';
 import { useDebounce } from '../useDebounce/useDebounce.js';

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -34,7 +34,6 @@ require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
-var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('../../../store/state/nonce/nonce.cjs');
@@ -127,7 +126,7 @@ const useTransferWallet = () => {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         const { overrideSiweStatement, walletConnector } = props;
         const args = Object.assign(Object.assign({}, props), { displaySiweStatement,
-            environmentId, siweStatement: overrideSiweStatement, walletProvider: getWalletProvider.getWalletProvider(walletConnector) });
+            environmentId, siweStatement: overrideSiweStatement, walletProvider: walletConnectorCore.getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs.getVerifyArgs(args);
         const userProfile = yield wallets.transferWallet(environmentId, verifyArgs);
         if (!userProfile) {

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

@@ -2,12 +2,12 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
+import { getWalletProvider } from '@dynamic-labs/wallet-connector-core';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -30,7 +30,6 @@ import '../../../config/ApiEndpoint.js';
 import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import { transferWallet } from '../../../data/api/wallets/wallets.js';
-import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import '../../../store/state/nonce/nonce.js';

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

@@ -37,7 +37,6 @@ require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
-var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var connectedWalletsInfo = require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('../../../store/state/nonce/nonce.cjs');
@@ -273,7 +272,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
         }
     };
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, }) {
-        const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
+        const walletProvider = walletConnectorCore.getWalletProvider(walletConnector);
         dynamicEvents.dynamicEvents.emit('authInit', {
             address: publicWalletAddress,
             connectorName: walletConnector.name,

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { DynamicError, StorageService, EmbeddedWalletExistsError, WalletUsedError, MergeAccountsConfirmationError, ChainalysisError, GateBlockedError, SandboxMaximumThresholdReachedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
-import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { getWalletProvider, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/DynamicContext.js';
@@ -33,7 +33,6 @@ import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import { verifyWallet, linkWallet } from '../../../data/api/wallets/wallets.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
-import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { resetConnectedWalletsInfo } from '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import '../../../store/state/nonce/nonce.js';

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs

@@ -51,6 +51,7 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
         properties: account.walletProperties,
         shouldSetEoaConnector: primaryWalletId === owner.id || primaryWalletId === account.id,
         smartWalletAddress: account.address,
+        verifiedCredentials,
     });
 });
 

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js

@@ -47,6 +47,7 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
         properties: account.walletProperties,
         shouldSetEoaConnector: primaryWalletId === owner.id || primaryWalletId === account.id,
         smartWalletAddress: account.address,
+        verifiedCredentials,
     });
 });
 

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -103,19 +103,20 @@ const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, clas
     const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { view, pushView } = ViewContext.useViewContext();
     const { setVerificationUUID, setDisplayedDestination } = VerificationContext.useVerification();
-    const { setErrorMessage } = ErrorContext.useErrorContext();
+    const { setError } = ErrorContext.useErrorContext();
     const [invalidEmail, setInvalidEmail] = React.useState(false);
     const { connectWithEmail } = useEmailProvider.useEmailProvider();
     const handleEmailSubmitError = React.useCallback((error) => {
-        if (error.message === 'Email is not valid') {
+        if (error.message === 'Email is not valid' ||
+            error.message === 'Invalid Email Address') {
             setInvalidEmail(true);
         }
         else {
-            setErrorMessage(error.message);
+            setError(error.message);
         }
         logger.logger.debug(error);
         onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
-    }, [setErrorMessage, onSubmitError]);
+    }, [setError, onSubmitError]);
     /** Handles the user submit event */
     const handleSubmit = React.useCallback((emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -99,19 +99,20 @@ const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, clas
     const { projectSettings } = useInternalDynamicContext();
     const { view, pushView } = useViewContext();
     const { setVerificationUUID, setDisplayedDestination } = useVerification();
-    const { setErrorMessage } = useErrorContext();
+    const { setError } = useErrorContext();
     const [invalidEmail, setInvalidEmail] = useState(false);
     const { connectWithEmail } = useEmailProvider();
     const handleEmailSubmitError = useCallback((error) => {
-        if (error.message === 'Email is not valid') {
+        if (error.message === 'Email is not valid' ||
+            error.message === 'Invalid Email Address') {
             setInvalidEmail(true);
         }
         else {
-            setErrorMessage(error.message);
+            setError(error.message);
         }
         logger.debug(error);
         onSubmitError === null || onSubmitError === void 0 ? void 0 : onSubmitError();
-    }, [setErrorMessage, onSubmitError]);
+    }, [setError, onSubmitError]);
     /** Handles the user submit event */
     const handleSubmit = useCallback((emailInput) => __awaiter(void 0, void 0, void 0, function* () {
         onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();

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

package/src/lib/views/TransactionConfirmationView/TransactionConfirmationView.js

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useMemo, useCallback, useEffect } from 'react';
+import { useState, useMemo, useRef, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import bs58 from 'bs58';
 import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
@@ -112,6 +112,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();
     const [isGasSponsored, setIsGasSponsored] = useState(false);
+    const [isGasSponsoredLoading, setIsGasSponsoredLoading] = useState(false);
     const update = useForceUpdate();
     const { t } = useTranslation();
     const { currency } = useFetchCurrency(walletConnector);
@@ -127,13 +128,20 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         status: SimulationStatus.LOADING,
     });
     const [recipient, setRecipient] = useState(undefined);
+    const isFetchingSimulationRef = useRef(false);
     const fetchSimulationResult = useCallback(() => __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')) {
@@ -143,13 +151,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
@@ -216,6 +227,9 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             logger.error('[TransactionConfirmationView] Simulation failed:', error);
             setSimulationState({ status: SimulationStatus.FAILED });
         }
+        finally {
+            isFetchingSimulationRef.current = false;
+        }
     }), [
         sendBalanceTransaction,
         hideModal,
@@ -224,6 +238,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         environmentId,
         transaction,
         walletConnector,
+        simulationState.status,
+        setSimulationState,
     ]);
     useEffect(() => {
         if (simulationState.status === SimulationStatus.SUCCESS ||
@@ -245,21 +261,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(() => {
-        if (!isAccountAbstractionConnector(walletConnector)) {
-            return false;
-        }
-        return walletConnector.canSponsorTransactionGas(transaction);
-    }, {
-        initialData: false,
-        onReject: logger.error,
-        onResolve: (isGasSponsored) => {
-            setIsGasSponsored(isGasSponsored);
-            if (!isGasSponsored && isAccountAbstractionConnector(walletConnector)) {
-                walletConnector.disableGasSponsorshipOnce();
-            }
-        },
-    });
     useEffect(() => {
         var _a;
         // solana gas sponsorship check

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

@@ -1,21 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var utils = require('@dynamic-labs/utils');
-
-const getWalletProvider = (connector) => {
-    if (connector.isEmbeddedWallet) {
-        return 'embeddedWallet';
-    }
-    if (connector.canConnectViaCustodialService) {
-        return 'custodialService';
-    }
-    if (connector.isInstalledOnBrowser()) {
-        return 'browserExtension';
-    }
-    return utils.isMobile() ? 'deepLink' : 'qrCode';
-};
-
-exports.getWalletProvider = getWalletProvider;

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

@@ -1,3 +0,0 @@
-import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { WalletProvider } from '../../../shared';
-export declare const getWalletProvider: (connector: WalletConnector) => WalletProvider;

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

@@ -1,17 +0,0 @@
-'use client'
-import { isMobile } from '@dynamic-labs/utils';
-
-const getWalletProvider = (connector) => {
-    if (connector.isEmbeddedWallet) {
-        return 'embeddedWallet';
-    }
-    if (connector.canConnectViaCustodialService) {
-        return 'custodialService';
-    }
-    if (connector.isInstalledOnBrowser()) {
-        return 'browserExtension';
-    }
-    return isMobile() ? 'deepLink' : 'qrCode';
-};
-
-export { getWalletProvider };

package/src/lib/utils/functions/getWalletProvider/index.d.ts

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