@dynamic-labs/sdk-react-core 4.0.0-alpha.48 → 4.0.0-alpha.49

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

@@ -1,13 +1,14 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useMemo, useEffect } from 'react';
+import { useState, useMemo, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import bs58 from 'bs58';
 import { TransactionGasCannotBeSponsoredError } from '@dynamic-labs/utils';
+import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+import { isZeroDevConnector } from '@dynamic-labs/ethereum-aa';
 import '../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '../../context/ViewContext/ViewContext.js';
@@ -22,6 +23,7 @@ import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../store/state/nonce/nonce.js';
 import '../../config/ApiEndpoint.js';
 import '../../store/state/user/user.js';
 import '../../locale/locale.js';
@@ -29,7 +31,6 @@ import '../../store/state/projectSettings/projectSettings.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -49,7 +50,8 @@ import '../CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../store/state/walletConnectorOptions.js';
+import '../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../store/state/walletOptions/walletOptions.js';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import { Alert } from '../../components/Alert/Alert.js';
 import { Typography } from '../../components/Typography/Typography.js';
@@ -84,7 +86,7 @@ import { TransactionConfirmationPageLayout } from '../../components/TransactionC
 import '../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { simulateBlockaidSVMTransaction, simulateBlockaidEVMTransaction } from '../../data/api/transactions/blockaid.js';
+import { simulateBlockaidUserOperation, simulateBlockaidSVMTransaction, simulateBlockaidEVMTransaction } from '../../data/api/transactions/blockaid.js';
 import '../../../index.js';
 import '../../store/state/tokenBalances.js';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -101,7 +103,6 @@ var SimulationStatus;
     SimulationStatus["SUCCESS"] = "success";
 })(SimulationStatus || (SimulationStatus = {}));
 const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation, onClickBack, walletConnector, onClickClose, title, displayPoweredByDynamicFooter = false, copykey, hideModal, currentToken, isNativeToken, transactionValue, isModal, sendBalanceTransaction, }) => {
-    var _a;
     const { primaryWallet, environmentId } = useInternalDynamicContext();
     const [isGasSponsored, setIsGasSponsored] = useState(false);
     const update = useForceUpdate();
@@ -118,25 +119,58 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const [simulationState, setSimulationState] = useState({
         status: SimulationStatus.LOADING,
     });
-    useEffectOnce(() => {
-        const fetchSimulationResult = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            if (sendBalanceTransaction || hideModal) {
-                setSimulationState({
-                    status: SimulationStatus.SKIPPED,
-                });
-                return;
-            }
-            if (!chainId && (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL') {
-                setSimulationState({ status: SimulationStatus.FAILED });
-                return;
+    const fetchSimulationResult = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        if (simulationState.status !== SimulationStatus.LOADING) {
+            return;
+        }
+        if (sendBalanceTransaction || hideModal) {
+            setSimulationState({ status: SimulationStatus.SKIPPED });
+            return;
+        }
+        if (!primaryWallet || (!chainId && (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL')) {
+            logger.error('[TransactionConfirmationView] Simulation failed:', {
+                chain: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
+                chainId,
+                primaryWallet,
+            });
+            setSimulationState({ status: SimulationStatus.FAILED });
+            return;
+        }
+        try {
+            let result;
+            if (isZeroDevConnector(primaryWallet.connector)) {
+                const { connector } = primaryWallet;
+                const { userOperation } = yield connector.getCurrentUserOperation(transaction);
+                if (userOperation) {
+                    const formattedUserOperation = yield connector.formatUserOperation(userOperation);
+                    // Set the gas fee on the transaction, only for zero dev
+                    transaction.fee.gas = calculateGasUnits(userOperation);
+                    const entryPoint = yield ((_a = connector.getAccountAbstractionProvider()) === null || _a === void 0 ? void 0 : _a.account.entryPoint);
+                    if (!entryPoint) {
+                        logger.error('[TransactionConfirmationView] Simulation failed: No entry point address found');
+                        setSimulationState({ status: SimulationStatus.FAILED });
+                        return;
+                    }
+                    result = yield simulateBlockaidUserOperation({
+                        chainId: String(chainId),
+                        entryPoint,
+                        environmentId,
+                        userOperation: formattedUserOperation,
+                        value: ((_b = transaction.value) === null || _b === void 0 ? void 0 : _b.toString()) || '0',
+                    });
+                }
+                else {
+                    setSimulationState({ status: SimulationStatus.FAILED });
+                    return;
+                }
             }
-            try {
-                let result;
-                // SOLANA
+            else {
+                // Handle SOLANA
                 if (!chainId) {
-                    const encodedTransactions = (_a = transaction.multipleTransactions) === null || _a === void 0 ? void 0 : _a.map((tx) => bs58.encode(tx.serialize({ requireAllSignatures: false })));
+                    const encodedTransactions = (_c = transaction.multipleTransactions) === null || _c === void 0 ? void 0 : _c.map((tx) => bs58.encode(tx.serialize({ requireAllSignatures: false })));
                     if (!encodedTransactions) {
+                        logger.error('[TransactionConfirmationView] Simulation failed: No encoded transactions');
                         setSimulationState({ status: SimulationStatus.FAILED });
                         return;
                     }
@@ -148,39 +182,58 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                     });
                 }
                 else {
-                    // EVM
+                    // Handle EVM
                     result = yield simulateBlockaidEVMTransaction({
                         chainId: String(chainId),
                         data: transaction.data || '0x',
                         environmentId,
                         from: transaction.from,
                         to: transaction.to || '',
-                        value: ((_b = transaction.value) === null || _b === void 0 ? void 0 : _b.toString()) || '0',
+                        value: ((_d = transaction.value) === null || _d === void 0 ? void 0 : _d.toString()) || '0',
                     });
                 }
-                if (!result) {
-                    setSimulationState({ status: SimulationStatus.FAILED });
-                    return;
-                }
-                setSimulationState({ result, status: SimulationStatus.SUCCESS });
             }
-            catch (error) {
-                logger.debug('Simulation failed:', error);
+            if (!result && !isZeroDevConnector(primaryWallet.connector)) {
+                logger.warn('[TransactionConfirmationView] Simulation failed: No result');
                 setSimulationState({ status: SimulationStatus.FAILED });
+                return;
             }
-        });
+            setSimulationState(result
+                ? { result, status: SimulationStatus.SUCCESS }
+                : { status: SimulationStatus.FAILED });
+        }
+        catch (error) {
+            logger.error('[TransactionConfirmationView] Simulation failed:', error);
+            setSimulationState({ status: SimulationStatus.FAILED });
+        }
+    }), [
+        sendBalanceTransaction,
+        hideModal,
+        primaryWallet,
+        chainId,
+        environmentId,
+        transaction,
+        walletConnector,
+    ]);
+    useEffect(() => {
+        if (simulationState.status === SimulationStatus.SUCCESS ||
+            simulationState.status === SimulationStatus.SKIPPED) {
+            return;
+        }
         fetchSimulationResult();
-    });
+    }, [fetchSimulationResult, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, simulationState.status]);
     /**
      * Update transaction fee and trigger a react update
      * to reflect the new fee on the UI
      */
-    const fetchTransactionFee = () => {
-        // solana fee doesnt need to be refreshed
-        if ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === 'SOL' && transaction.fee.gas !== undefined)
+    const fetchTransactionFee = useCallback(() => {
+        if (((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === ChainEnum.Sol &&
+            transaction.fee.gas !== undefined) ||
+            (primaryWallet && isZeroDevConnector(primaryWallet.connector))) {
             return;
+        }
         transaction.fetchFee().finally(update);
-    };
+    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain, transaction, update]);
     const { isLoading: isGasSponsoredLoading } = usePromise(() => {
         if (!isAccountAbstractionConnector(walletConnector)) {
             return false;
@@ -204,7 +257,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         }
     }, [transaction]);
     const { mutate: send, isLoading, error: transactionError, } = useMutation(mutation, {
-        onFailure: (error) => {
+        onFailure: useCallback((error) => {
             fetchTransactionFee();
             if (TransactionGasCannotBeSponsoredError.isInstance(error)) {
                 logger.debug(error);
@@ -215,8 +268,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             }
             logger.error(error);
             onError === null || onError === void 0 ? void 0 : onError(error);
-        },
-        onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
+        }, [fetchTransactionFee, onError, walletConnector]),
+        onSuccess: useCallback((tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx), [onSuccess]),
     });
     // Refresh transaction fee, Solana fees are static based on transaction data, dont need to refresh them
     useInterval(fetchTransactionFee, isLoading ? null : FEE_REFRESH_INTERVAL);
@@ -229,48 +282,53 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const errorMessage = transactionError && transactionErrorMessage(transactionError);
     const { data: balance, isLoading: isBalanceLoading } = usePromise(() => transaction.getBalance());
     const hasInsufficientFunds = useMemo(() => {
-        if (!total || !balance)
+        if (total === undefined || balance === undefined)
             return false;
         return balance < total;
     }, [balance, total]);
     const missingFunds = useMemo(() => {
-        if (!total || !balance)
+        if (total === undefined || balance === undefined)
             return undefined;
         return total - balance;
     }, [total, balance]);
     const alert = useMemo(() => {
         if (errorMessage)
             return null;
+        // Check for gas sponsorship errors
         if (TransactionGasCannotBeSponsoredError.isInstance(transactionError)) {
             return (jsx(Alert, { icon: 'error', variant: 'error', copykey: 'dyn_send_transaction.error_message.gas_not_sponsored', children: t('dyn_send_transaction.error_message.gas_not_sponsored') }));
         }
-        if (simulationState.status === SimulationStatus.FAILED) {
-            return (jsxs(Alert, { icon: 'error', variant: 'warning', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.failed_simulation', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.failed_simulation.title', children: t('dyn_send_transaction.warning_message.failed_simulation.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.failed_simulation.description', children: t('dyn_send_transaction.warning_message.failed_simulation.description') })] }));
-        }
+        // Check for insufficient gas funds
         if (!isGasSponsoredLoading &&
             !isBalanceLoading &&
             missingFunds === undefined &&
             transaction.fee.gas &&
             !isGasSponsored) {
-            return (jsxs(Alert, { icon: 'error', variant: 'error', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds.title', children: t('dyn_send_transaction.warning_message.insufficient_gas_funds.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds.description', children: t('dyn_send_transaction.warning_message.insufficient_gas_funds.description', {
+            return (jsxs(Alert, { icon: 'error', variant: 'warning', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds.title', children: t('dyn_send_transaction.warning_message.insufficient_gas_funds.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.insufficient_gas_funds.description', children: t('dyn_send_transaction.warning_message.insufficient_gas_funds.description', {
                             amountLeft: transaction.format(transaction.fee.gas, {
                                 precision: 6,
                             }),
                             currencySymbol: currency,
                         }) })] }));
         }
+        // Check for insufficient funds
         const showInsufficientFundsWarningMessage = hasInsufficientFunds && missingFunds;
-        if (!showInsufficientFundsWarningMessage)
-            return;
-        const amountLeft = transaction.format(missingFunds, { precision: 5 });
-        return (jsxs(Alert, { icon: 'error', variant: 'warning', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.insufficient_funds', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.insufficient_funds.title', children: t('dyn_send_transaction.warning_message.insufficient_funds.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.insufficient_funds.description', children: t('dyn_send_transaction.warning_message.insufficient_funds.description', {
-                        amountLeft,
-                        currencySymbol: currency,
-                    }) })] }));
+        if (showInsufficientFundsWarningMessage) {
+            const amountLeft = transaction.format(missingFunds, { precision: 6 });
+            return (jsxs(Alert, { icon: 'error', variant: 'error', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.insufficient_funds', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.insufficient_funds.title', children: t('dyn_send_transaction.warning_message.insufficient_funds.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.insufficient_funds.description', children: t('dyn_send_transaction.warning_message.insufficient_funds.description', {
+                            amountLeft,
+                            currencySymbol: currency,
+                        }) })] }));
+        }
+        // Finally, check for simulation failure
+        if (simulationState.status === SimulationStatus.FAILED) {
+            return (jsxs(Alert, { icon: 'error', variant: 'warning', contentDataTestId: 'warning_content', copykey: 'dyn_send_transaction.warning_message.failed_simulation', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.warning_message.failed_simulation.title', as: 'div', children: t('dyn_send_transaction.warning_message.failed_simulation.title') }), jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.warning_message.failed_simulation.description', as: 'div', children: t('dyn_send_transaction.warning_message.failed_simulation.description') })] }));
+        }
+        return null;
     }, [
+        simulationState.status,
         errorMessage,
         transactionError,
-        simulationState,
         isGasSponsoredLoading,
         isBalanceLoading,
         missingFunds,
@@ -295,10 +353,68 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             }
         }
     }, [simulationState, chainId, transaction, sendBalanceTransaction]);
-    if (simulationState.status === SimulationStatus.LOADING) {
-        return null;
-    }
-    return (jsx(TransactionConfirmationPageLayout, { total: total, currentToken: currentToken, transactionValue: transactionValue, isNativeToken: isNativeToken, onClickBack: onClickBack, onClickClose: onClickClose, copykey: copykey, title: title, hideModal: hideModal, isLoading: isLoading, onClickSend: () => send(), onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx), displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, disableSendButton: isBalanceLoading, error: errorMessage, alert: alert, walletConnector: walletConnector, transaction: transaction, isGasSponsored: isGasSponsored, isGasSponsoredLoading: isGasSponsoredLoading, walletKey: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key) || '', simulationResult: (_a = simulationState.result) !== null && _a !== void 0 ? _a : undefined, sendBalanceTransaction: sendBalanceTransaction }));
+    const layoutProps = useMemo(() => {
+        var _a;
+        return ({
+            alert,
+            copykey,
+            currentToken,
+            disableSendButton: isBalanceLoading,
+            displayPoweredByDynamicFooter,
+            error: errorMessage,
+            hideModal,
+            isGasSponsored,
+            isGasSponsoredLoading,
+            isLoading,
+            isNativeToken,
+            onClickBack,
+            onClickClose,
+            onClickSend: () => send(),
+            onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
+            sendBalanceTransaction,
+            simulationResult: (_a = simulationState.result) !== null && _a !== void 0 ? _a : undefined,
+            title,
+            total,
+            transaction,
+            transactionValue,
+            walletConnector,
+            walletKey: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key) || '',
+        });
+    }, [
+        total,
+        currentToken,
+        transactionValue,
+        isNativeToken,
+        onClickBack,
+        onClickClose,
+        copykey,
+        title,
+        hideModal,
+        isLoading,
+        send,
+        onSuccess,
+        displayPoweredByDynamicFooter,
+        isBalanceLoading,
+        errorMessage,
+        alert,
+        walletConnector,
+        transaction,
+        isGasSponsored,
+        isGasSponsoredLoading,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key,
+        simulationState.result,
+        sendBalanceTransaction,
+    ]);
+    return simulationState.status === SimulationStatus.LOADING ? null : (jsx(TransactionConfirmationPageLayout, Object.assign({}, layoutProps)));
+};
+const calculateGasUnits = (userOp) => {
+    // Sum all gas units
+    const totalGasUnits = BigInt(userOp.callGasLimit || 0) +
+        BigInt(userOp.verificationGasLimit || 0) +
+        BigInt(userOp.preVerificationGas || 0);
+    // Multiply by maxFeePerGas to get the total gas cost in wei
+    const gasCost = totalGasUnits * BigInt(userOp.maxFeePerGas || 0);
+    return gasCost;
 };
 
 export { FEE_REFRESH_INTERVAL, TransactionConfirmationView };

package/src/lib/views/UserFieldEditorView/UserFieldEditorView.cjs

@@ -26,6 +26,7 @@ require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../store/state/nonce/nonce.cjs');
 require('../../config/ApiEndpoint.cjs');
 require('../../store/state/user/user.cjs');
 require('../../locale/locale.cjs');
@@ -33,7 +34,6 @@ require('../../store/state/projectSettings/projectSettings.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
@@ -49,7 +49,8 @@ require('../CollectUserDataView/useFields.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../store/state/walletConnectorOptions.cjs');
+require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 var PoweredByDynamic = require('../../components/PoweredByDynamic/PoweredByDynamic.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
@@ -91,6 +92,7 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
+require('@dynamic-labs/ethereum-aa');
 
 const UserFieldEditorView = ({ onClickClose, onSubmit, fields, submitText, subtitle, title, }) => {
     // Treat undefined props

package/src/lib/views/UserFieldEditorView/UserFieldEditorView.js

@@ -22,6 +22,7 @@ import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../store/state/nonce/nonce.js';
 import '../../config/ApiEndpoint.js';
 import '../../store/state/user/user.js';
 import '../../locale/locale.js';
@@ -29,7 +30,6 @@ import '../../store/state/projectSettings/projectSettings.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -45,7 +45,8 @@ import '../CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../store/state/walletConnectorOptions.js';
+import '../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import { PoweredByDynamic } from '../../components/PoweredByDynamic/PoweredByDynamic.js';
 import '../../context/FooterAnimationContext/index.js';
@@ -87,6 +88,7 @@ import '../../components/IsBrowser/IsBrowser.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
+import '@dynamic-labs/ethereum-aa';
 
 const UserFieldEditorView = ({ onClickClose, onSubmit, fields, submitText, subtitle, title, }) => {
     // Treat undefined props

package/src/lib/views/UserFieldEditorView/useAssignDefaultValues/useAssignDefaultValues.cjs

@@ -23,6 +23,7 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
@@ -30,7 +31,6 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../utils/functions/compareChains/compareChains.cjs');
@@ -46,7 +46,8 @@ require('../../CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../store/state/walletConnectorOptions.cjs');
+require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -76,6 +77,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../TransactionConfirmationView/TransactionConfirmationView.cjs');

package/src/lib/views/UserFieldEditorView/useAssignDefaultValues/useAssignDefaultValues.js

@@ -19,6 +19,7 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
@@ -26,7 +27,6 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../utils/functions/compareChains/compareChains.js';
@@ -42,7 +42,8 @@ import '../../CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../store/state/walletConnectorOptions.js';
+import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -72,6 +73,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
+import '@dynamic-labs/ethereum-aa';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../TransactionConfirmationView/TransactionConfirmationView.js';

package/src/lib/views/WalletCannotBeTransferredView/WalletCannotBeTransferredView.cjs

@@ -28,6 +28,7 @@ require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../store/state/nonce/nonce.cjs');
 require('../../config/ApiEndpoint.cjs');
 require('../../store/state/user/user.cjs');
 require('../../locale/locale.cjs');
@@ -35,7 +36,6 @@ require('../../store/state/projectSettings/projectSettings.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
@@ -52,7 +52,8 @@ require('../CollectUserDataView/useFields.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../store/state/walletConnectorOptions.cjs');
+require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../store/state/walletOptions/walletOptions.cjs');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
@@ -88,6 +89,7 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
+require('@dynamic-labs/ethereum-aa');
 
 const WalletCannotBeTransferredView = () => {
     const { goToInitialView } = ViewContext.useViewContext();

package/src/lib/views/WalletCannotBeTransferredView/WalletCannotBeTransferredView.js

@@ -24,6 +24,7 @@ import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../store/state/nonce/nonce.js';
 import '../../config/ApiEndpoint.js';
 import '../../store/state/user/user.js';
 import '../../locale/locale.js';
@@ -31,7 +32,6 @@ import '../../store/state/projectSettings/projectSettings.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -48,7 +48,8 @@ import '../CollectUserDataView/useFields.js';
 import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../store/state/walletConnectorOptions.js';
+import '../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../store/state/walletOptions/walletOptions.js';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
@@ -84,6 +85,7 @@ import '../../components/IsBrowser/IsBrowser.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'qrcode';
+import '@dynamic-labs/ethereum-aa';
 
 const WalletCannotBeTransferredView = () => {
     const { goToInitialView } = useViewContext();