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

package/src/lib/components/TosAndPp/TosAndPp.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');
 var isConnectOnly = require('../../utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -47,7 +47,8 @@ require('../../views/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('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
@@ -78,6 +79,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('../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');

package/src/lib/components/TosAndPp/TosAndPp.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 { isConnectOnly } from '../../utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -43,7 +43,8 @@ import '../../views/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 '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
@@ -74,6 +75,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 '../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../views/TransactionConfirmationView/TransactionConfirmationView.js';

package/src/lib/components/TransactionCard/OldTransactionCard.cjs

@@ -29,6 +29,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');
@@ -36,7 +37,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('../../views/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('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
@@ -85,6 +86,7 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../store/state/sendBalances.cjs');
 var useNetworkConfigurationsFromProjectSettings = require('../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');

package/src/lib/components/TransactionCard/OldTransactionCard.js

@@ -25,6 +25,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';
@@ -32,7 +33,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 '../../views/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 '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
@@ -81,6 +82,7 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../store/state/sendBalances.js';
 import { useNetworkConfigurationsFromProjectSettings } from '../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.js';
+import '@dynamic-labs/ethereum-aa';
 import '../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../views/TransactionConfirmationView/TransactionConfirmationView.js';

package/src/lib/components/TransactionCard/TransactionCard.cjs

@@ -29,6 +29,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');
@@ -36,7 +37,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('../../views/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('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
 var Tooltip = require('../Tooltip/Tooltip.cjs');
@@ -84,6 +85,7 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../store/state/sendBalances.cjs');
 var useNetworkConfigurationsFromProjectSettings = require('../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.cjs');
+require('@dynamic-labs/ethereum-aa');
 require('../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
@@ -97,7 +99,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) => {
+const TransactionCard = ({ transaction, simulationResult, isGasSponsored, isAATransaction, }) => {
     var _a, _b, _c, _d, _e, _f;
     const { t } = reactI18next.useTranslation();
     const { primaryWallet, projectSettings, overrides } = useInternalDynamicContext.useInternalDynamicContext();
@@ -130,8 +132,12 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
             const transferOutTotal = ((_a = transfer.transferOut) === null || _a === void 0 ? void 0 : _a.reduce((sum, t) => sum + Number((t === null || t === void 0 ? void 0 : t.usdPrice) || 0), 0)) || 0;
             return acc + transferOutTotal;
         }, 0)) || 0;
+        if (blockaidOn && isAATransaction) {
+            return outgoingAssetsTotal;
+        }
         // for solana, the fee is included in the outgoing assets already
-        return (outgoingAssetsTotal + (nativeCurrencySymbol === 'SOL' ? 0 : feeInUsd || 0));
+        return (outgoingAssetsTotal +
+            (nativeCurrencySymbol === 'SOL' || isGasSponsored ? 0 : feeInUsd || 0));
     }, [simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.outAssets, nativeCurrencySymbol, feeInUsd]);
     const getTotalAmountInUsdDisplay = (totalAmountInUsd) => {
         if (!totalAmountInUsd)
@@ -195,7 +201,12 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
     const outAssetsWithoutFee = outAssets.filter((asset) => !((asset.asset.type === 'NATIVE' || asset.asset.type === 'SOL') &&
         asset.asset.chainName === 'Solana' &&
         Number(asset.amount) === Number(transaction.fee.gas) / Math.pow(10, 9)));
-    const allAssets = [...outAssetsWithoutFee, ...inAssets];
+    //for evm AA with blockaid ON, the outAssets includes the gas fee,
+    //so we need to remove it if the transaction doesnt have a tx.value (ETH spend)
+    const outAssetsWithoutFeeEvm = outAssetsWithoutFee.filter((asset) => !(asset.asset.type === 'NATIVE' &&
+        transaction.chain === 'EVM' &&
+        !transaction.value));
+    const allAssets = [...outAssetsWithoutFeeEvm, ...inAssets];
     const getGasFeeDisplay = () => {
         if (feeInUsd) {
             return getFeeInUsdDisplay(feeInUsd);
@@ -209,7 +220,8 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
     };
     return (jsxRuntime.jsxs("div", { className: 'transaction-card-container', children: [allAssets.length > 0 && (jsxRuntime.jsx("div", { className: 'transaction-card', children: jsxRuntime.jsx("div", { className: 'transaction-card__assets-container', children: allAssets.map((asset, index, array) => (jsxRuntime.jsx(React__default["default"].Fragment, { children: renderAssetTransfer(asset, index, array) }, `asset-${index}`))) }) })), jsxRuntime.jsx("div", { className: 'transaction-card', children: jsxRuntime.jsxs("div", { className: 'transaction-card__details', children: [(transaction.to || ((_d = simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.counterparties) === null || _d === void 0 ? void 0 : _d[0])) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'transaction-card__row', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.destination', children: t('dyn_send_transaction.confirmation.data.destination') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-destination', children: shortenWalletAddress.shortenWalletAddress((_e = transaction.to) !== null && _e !== void 0 ? _e : (_f = simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.counterparties) === null || _f === void 0 ? void 0 : _f[0], 4, 4) })] }), jsxRuntime.jsx("div", { className: 'transaction-card__divider' })] })), jsxRuntime.jsxs("div", { className: 'transaction-card__row', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.network', children: t('dyn_send_transaction.confirmation.data.network') }), jsxRuntime.jsxs("div", { className: 'transaction-card__network-info', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', children: (networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.name) || 'Ethereum' }), jsxRuntime.jsx("img", { src: networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.iconUrls[0], alt: (networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.name) || 'Network icon', width: 16, height: 16, className: 'transaction-card__network-icon' })] })] }), !isGasSponsored && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: 'transaction-card__divider' }), jsxRuntime.jsxs("div", { className: 'transaction-card__row', children: [jsxRuntime.jsxs("div", { className: 'transaction-card__label-with-tooltip', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.gas_estimate', children: t('dyn_send_transaction.confirmation.data.gas_estimate') }), jsxRuntime.jsx(Tooltip.Tooltip, { content: 'Network fees are paid to process your transaction', className: 'transaction-confirmation', children: jsxRuntime.jsx(Icon.Icon, { size: 'small', className: 'fee-tooltip', children: jsxRuntime.jsx(tooltip.ReactComponent, {}) }) })] }), jsxRuntime.jsx("div", { className: 'transaction-card__value', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-gas-fee', children: getGasFeeDisplay() }) })] })] })), blockaidOn &&
                             totalAmountInUsd !== undefined &&
-                            totalAmountInUsd > 0 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: 'transaction-card__divider' }), jsxRuntime.jsxs("div", { className: 'transaction-card__row', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'bold', copykey: 'dyn_send_transaction.confirmation.data.total', children: t('dyn_send_transaction.confirmation.data.total') }), jsxRuntime.jsx("div", { className: 'transaction-card__total-amount', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-total', children: getTotalAmountInUsdDisplay(totalAmountInUsd) }) })] })] }))] }) })] }));
+                            totalAmountInUsd > 0 &&
+                            !(isAATransaction && !isGasSponsored) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: 'transaction-card__divider' }), jsxRuntime.jsxs("div", { className: 'transaction-card__row', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'bold', copykey: 'dyn_send_transaction.confirmation.data.total', children: t('dyn_send_transaction.confirmation.data.total') }), jsxRuntime.jsx("div", { className: 'transaction-card__total-amount', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-total', children: getTotalAmountInUsdDisplay(totalAmountInUsd) }) })] })] }))] }) })] }));
 };
 
 exports.TransactionCard = TransactionCard;

package/src/lib/components/TransactionCard/TransactionCard.d.ts

@@ -5,6 +5,7 @@ type TransactionCardProps = {
     transaction: IUITransaction;
     simulationResult: SimulationResult | undefined;
     isGasSponsored: boolean;
+    isAATransaction: boolean;
 };
 export declare const TransactionCard: React.FC<TransactionCardProps>;
 export {};

package/src/lib/components/TransactionCard/TransactionCard.js

@@ -25,6 +25,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';
@@ -32,7 +33,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 '../../views/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 '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
 import { Tooltip } from '../Tooltip/Tooltip.js';
@@ -80,6 +81,7 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../store/state/sendBalances.js';
 import { useNetworkConfigurationsFromProjectSettings } from '../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.js';
+import '@dynamic-labs/ethereum-aa';
 import '../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../views/TransactionConfirmationView/TransactionConfirmationView.js';
@@ -89,7 +91,7 @@ import '../../store/state/tokenBalances.js';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
-const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) => {
+const TransactionCard = ({ transaction, simulationResult, isGasSponsored, isAATransaction, }) => {
     var _a, _b, _c, _d, _e, _f;
     const { t } = useTranslation();
     const { primaryWallet, projectSettings, overrides } = useInternalDynamicContext();
@@ -122,8 +124,12 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
             const transferOutTotal = ((_a = transfer.transferOut) === null || _a === void 0 ? void 0 : _a.reduce((sum, t) => sum + Number((t === null || t === void 0 ? void 0 : t.usdPrice) || 0), 0)) || 0;
             return acc + transferOutTotal;
         }, 0)) || 0;
+        if (blockaidOn && isAATransaction) {
+            return outgoingAssetsTotal;
+        }
         // for solana, the fee is included in the outgoing assets already
-        return (outgoingAssetsTotal + (nativeCurrencySymbol === 'SOL' ? 0 : feeInUsd || 0));
+        return (outgoingAssetsTotal +
+            (nativeCurrencySymbol === 'SOL' || isGasSponsored ? 0 : feeInUsd || 0));
     }, [simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.outAssets, nativeCurrencySymbol, feeInUsd]);
     const getTotalAmountInUsdDisplay = (totalAmountInUsd) => {
         if (!totalAmountInUsd)
@@ -187,7 +193,12 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
     const outAssetsWithoutFee = outAssets.filter((asset) => !((asset.asset.type === 'NATIVE' || asset.asset.type === 'SOL') &&
         asset.asset.chainName === 'Solana' &&
         Number(asset.amount) === Number(transaction.fee.gas) / Math.pow(10, 9)));
-    const allAssets = [...outAssetsWithoutFee, ...inAssets];
+    //for evm AA with blockaid ON, the outAssets includes the gas fee,
+    //so we need to remove it if the transaction doesnt have a tx.value (ETH spend)
+    const outAssetsWithoutFeeEvm = outAssetsWithoutFee.filter((asset) => !(asset.asset.type === 'NATIVE' &&
+        transaction.chain === 'EVM' &&
+        !transaction.value));
+    const allAssets = [...outAssetsWithoutFeeEvm, ...inAssets];
     const getGasFeeDisplay = () => {
         if (feeInUsd) {
             return getFeeInUsdDisplay(feeInUsd);
@@ -201,7 +212,8 @@ const TransactionCard = ({ transaction, simulationResult, isGasSponsored, }) =>
     };
     return (jsxs("div", { className: 'transaction-card-container', children: [allAssets.length > 0 && (jsx("div", { className: 'transaction-card', children: jsx("div", { className: 'transaction-card__assets-container', children: allAssets.map((asset, index, array) => (jsx(React__default.Fragment, { children: renderAssetTransfer(asset, index, array) }, `asset-${index}`))) }) })), jsx("div", { className: 'transaction-card', children: jsxs("div", { className: 'transaction-card__details', children: [(transaction.to || ((_d = simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.counterparties) === null || _d === void 0 ? void 0 : _d[0])) && (jsxs(Fragment, { children: [jsxs("div", { className: 'transaction-card__row', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.destination', children: t('dyn_send_transaction.confirmation.data.destination') }), jsx(Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-destination', children: shortenWalletAddress((_e = transaction.to) !== null && _e !== void 0 ? _e : (_f = simulationResult === null || simulationResult === void 0 ? void 0 : simulationResult.counterparties) === null || _f === void 0 ? void 0 : _f[0], 4, 4) })] }), jsx("div", { className: 'transaction-card__divider' })] })), jsxs("div", { className: 'transaction-card__row', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.network', children: t('dyn_send_transaction.confirmation.data.network') }), jsxs("div", { className: 'transaction-card__network-info', children: [jsx(Typography, { variant: 'body_normal', color: 'primary', children: (networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.name) || 'Ethereum' }), jsx("img", { src: networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.iconUrls[0], alt: (networkInfoEntry === null || networkInfoEntry === void 0 ? void 0 : networkInfoEntry.name) || 'Network icon', width: 16, height: 16, className: 'transaction-card__network-icon' })] })] }), !isGasSponsored && (jsxs(Fragment, { children: [jsx("div", { className: 'transaction-card__divider' }), jsxs("div", { className: 'transaction-card__row', children: [jsxs("div", { className: 'transaction-card__label-with-tooltip', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', copykey: 'dyn_send_transaction.confirmation.data.gas_estimate', children: t('dyn_send_transaction.confirmation.data.gas_estimate') }), jsx(Tooltip, { content: 'Network fees are paid to process your transaction', className: 'transaction-confirmation', children: jsx(Icon, { size: 'small', className: 'fee-tooltip', children: jsx(SvgTooltip, {}) }) })] }), jsx("div", { className: 'transaction-card__value', children: jsx(Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-gas-fee', children: getGasFeeDisplay() }) })] })] })), blockaidOn &&
                             totalAmountInUsd !== undefined &&
-                            totalAmountInUsd > 0 && (jsxs(Fragment, { children: [jsx("div", { className: 'transaction-card__divider' }), jsxs("div", { className: 'transaction-card__row', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'bold', copykey: 'dyn_send_transaction.confirmation.data.total', children: t('dyn_send_transaction.confirmation.data.total') }), jsx("div", { className: 'transaction-card__total-amount', children: jsx(Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-total', children: getTotalAmountInUsdDisplay(totalAmountInUsd) }) })] })] }))] }) })] }));
+                            totalAmountInUsd > 0 &&
+                            !(isAATransaction && !isGasSponsored) && (jsxs(Fragment, { children: [jsx("div", { className: 'transaction-card__divider' }), jsxs("div", { className: 'transaction-card__row', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'bold', copykey: 'dyn_send_transaction.confirmation.data.total', children: t('dyn_send_transaction.confirmation.data.total') }), jsx("div", { className: 'transaction-card__total-amount', children: jsx(Typography, { variant: 'body_normal', color: 'primary', "data-testid": 'transaction-estimated-total', children: getTotalAmountInUsdDisplay(totalAmountInUsd) }) })] })] }))] }) })] }));
 };
 
 export { TransactionCard };

package/src/lib/components/TransactionConfirmationPageLayout/TransactionConfirmationPageLayout.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var reactI18next = require('react-i18next');
+var ethereumAa = require('@dynamic-labs/ethereum-aa');
 require('react');
 require('../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -28,6 +29,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');
@@ -36,7 +38,6 @@ var fiatUtils = require('../../utils/functions/fiatUtils/fiatUtils.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');
@@ -54,7 +55,8 @@ require('../../views/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('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
 var AnimatePresence = require('../AnimatePresence/AnimatePresence.cjs');
@@ -126,7 +128,7 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const backButton = onClickBack && (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', onClick: onClickBack, "data-testid": 'back-button', children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }));
     const gasFiatValue = fiatUtils.getGasFiatValue(currentToken, transaction, nativePrice);
     const totalGasFiatValue = fiatUtils.getTotalFiatCost(currentToken, transaction, nativePrice, transactionValue);
-    return hideModal ? null : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: closeButton, leading: backButton, alignContent: 'bottom', children: jsxRuntime.jsx("div", { className: 'send-balance-page-layout__header-content', children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', copykey: 'dyn_send_transaction.data.confirmation_tx', children: t('dyn_send_transaction.data.confirmation_tx') }) }) }), jsxRuntime.jsx("div", { className: 'transaction-confirmation__banner', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.data.banner', children: t('dyn_send_transaction.data.banner') }) }), jsxRuntime.jsx(PasskeyCreatedSuccessBanner.PasskeyCreatedSuccessBanner, {}), jsxRuntime.jsxs("div", { className: 'transaction-confirmation__body', children: [jsxRuntime.jsxs("div", { className: 'transaction-confirmation__content', children: [!sendBalanceTransaction ? (jsxRuntime.jsx(TransactionCard.TransactionCard, { transaction: transaction, isGasSponsored: isGasSponsored, simulationResult: simulationResult })) : (jsxRuntime.jsx(OldTransactionCard.OldTransactionCard, { transaction: transaction, currentToken: currentToken, currencySymbol: currencySymbol, valueRounded: (_a = utils.getValueRounded(Boolean(isNativeToken), transaction)) === null || _a === void 0 ? void 0 : _a.toString(), transactionValue: transactionValue, isGasSponsored: isGasSponsored, gasFiatValue: gasFiatValue || '0', totalGasFiatValue: totalGasFiatValue || '0', currency: currency, total: total, t: t, walletKey: walletKey })), children && (jsxRuntime.jsx("div", { className: 'transaction-confirmation__rows', children: children }))] }), jsxRuntime.jsx(AnimatePresence.AnimatePresence, { animationComponent: jsxRuntime.jsx(VerticalDrawerTransition.VerticalDrawerTransition, {}), children: alert && (jsxRuntime.jsx("div", { className: 'transaction-confirmation__warning', children: alert })) }), jsxRuntime.jsxs("div", { className: 'transaction-confirmation__actions', children: [(onClickBack || onClickClose) && (jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'primary', buttonPadding: 'small', onClick: onClickBack || onClickClose, expanded: true, disabled: isLoading, copykey: 'dyn_send_transaction.confirmation.cancel_button', children: t('dyn_send_transaction.confirmation.cancel_button') })), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', onClick: handleSubmitWithChecks, expanded: true, loading: isLoading, disabled: disableSendButton, copykey: 'dyn_send_transaction.confirmation.send', startSlot: 
+    return hideModal ? null : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: closeButton, leading: backButton, alignContent: 'bottom', children: jsxRuntime.jsx("div", { className: 'send-balance-page-layout__header-content', children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', copykey: 'dyn_send_transaction.data.confirmation_tx', children: t('dyn_send_transaction.data.confirmation_tx') }) }) }), jsxRuntime.jsx("div", { className: 'transaction-confirmation__banner', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.data.banner', children: t('dyn_send_transaction.data.banner') }) }), jsxRuntime.jsx(PasskeyCreatedSuccessBanner.PasskeyCreatedSuccessBanner, {}), jsxRuntime.jsxs("div", { className: 'transaction-confirmation__body', children: [jsxRuntime.jsxs("div", { className: 'transaction-confirmation__content', children: [!sendBalanceTransaction ? (jsxRuntime.jsx(TransactionCard.TransactionCard, { transaction: transaction, isGasSponsored: isGasSponsored, isAATransaction: walletConnector ? ethereumAa.isZeroDevConnector(walletConnector) : false, simulationResult: simulationResult })) : (jsxRuntime.jsx(OldTransactionCard.OldTransactionCard, { transaction: transaction, currentToken: currentToken, currencySymbol: currencySymbol, valueRounded: (_a = utils.getValueRounded(Boolean(isNativeToken), transaction)) === null || _a === void 0 ? void 0 : _a.toString(), transactionValue: transactionValue, isGasSponsored: isGasSponsored, gasFiatValue: gasFiatValue || '0', totalGasFiatValue: totalGasFiatValue || '0', currency: currency, total: total, t: t, walletKey: walletKey })), children && (jsxRuntime.jsx("div", { className: 'transaction-confirmation__rows', children: children }))] }), jsxRuntime.jsx(AnimatePresence.AnimatePresence, { animationComponent: jsxRuntime.jsx(VerticalDrawerTransition.VerticalDrawerTransition, {}), children: alert && (jsxRuntime.jsx("div", { className: 'transaction-confirmation__warning', children: alert })) }), jsxRuntime.jsxs("div", { className: 'transaction-confirmation__actions', children: [(onClickBack || onClickClose) && (jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'primary', buttonPadding: 'small', onClick: onClickBack || onClickClose, expanded: true, disabled: isLoading, copykey: 'dyn_send_transaction.confirmation.cancel_button', children: t('dyn_send_transaction.confirmation.cancel_button') })), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', onClick: handleSubmitWithChecks, expanded: true, loading: isLoading, disabled: disableSendButton, copykey: 'dyn_send_transaction.confirmation.send', startSlot: 
                                 // eslint-disable-next-line react/jsx-wrap-multilines
                                 jsxRuntime.jsx(Icon.Icon, { size: 'small', color: 'text-secondary', children: jsxRuntime.jsx(send.ReactComponent, {}) }), dataTestId: 'transaction-confirmation-send', children: t('dyn_send_transaction.confirmation.send') })] }), displayPoweredByDynamicFooter && (jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, { classNameRoot: 'transaction-confirmation__footer' }))] })] }));
 };

package/src/lib/components/TransactionConfirmationPageLayout/TransactionConfirmationPageLayout.js

@@ -1,6 +1,7 @@
 'use client'
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
+import { isZeroDevConnector } from '@dynamic-labs/ethereum-aa';
 import 'react';
 import '../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -24,6 +25,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';
@@ -32,7 +34,6 @@ import { getGasFiatValue, getTotalFiatCost } from '../../utils/functions/fiatUti
 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';
@@ -50,7 +51,8 @@ import '../../views/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 '../Accordion/components/AccordionItem/AccordionItem.js';
 import '../Alert/Alert.js';
 import { AnimatePresence } from '../AnimatePresence/AnimatePresence.js';
@@ -122,7 +124,7 @@ const TransactionConfirmationPageLayout = ({ onClickClose, isLoading, onClickBac
     const backButton = onClickBack && (jsx(IconButton, { type: 'button', onClick: onClickBack, "data-testid": 'back-button', children: jsx(SvgArrowLeft, {}) }));
     const gasFiatValue = getGasFiatValue(currentToken, transaction, nativePrice);
     const totalGasFiatValue = getTotalFiatCost(currentToken, transaction, nativePrice, transactionValue);
-    return hideModal ? null : (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: closeButton, leading: backButton, alignContent: 'bottom', children: jsx("div", { className: 'send-balance-page-layout__header-content', children: jsx(Typography, { variant: 'title', color: 'primary', copykey: 'dyn_send_transaction.data.confirmation_tx', children: t('dyn_send_transaction.data.confirmation_tx') }) }) }), jsx("div", { className: 'transaction-confirmation__banner', children: jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.data.banner', children: t('dyn_send_transaction.data.banner') }) }), jsx(PasskeyCreatedSuccessBanner, {}), jsxs("div", { className: 'transaction-confirmation__body', children: [jsxs("div", { className: 'transaction-confirmation__content', children: [!sendBalanceTransaction ? (jsx(TransactionCard, { transaction: transaction, isGasSponsored: isGasSponsored, simulationResult: simulationResult })) : (jsx(OldTransactionCard, { transaction: transaction, currentToken: currentToken, currencySymbol: currencySymbol, valueRounded: (_a = getValueRounded(Boolean(isNativeToken), transaction)) === null || _a === void 0 ? void 0 : _a.toString(), transactionValue: transactionValue, isGasSponsored: isGasSponsored, gasFiatValue: gasFiatValue || '0', totalGasFiatValue: totalGasFiatValue || '0', currency: currency, total: total, t: t, walletKey: walletKey })), children && (jsx("div", { className: 'transaction-confirmation__rows', children: children }))] }), jsx(AnimatePresence, { animationComponent: jsx(VerticalDrawerTransition, {}), children: alert && (jsx("div", { className: 'transaction-confirmation__warning', children: alert })) }), jsxs("div", { className: 'transaction-confirmation__actions', children: [(onClickBack || onClickClose) && (jsx(TypographyButton, { buttonVariant: 'primary', buttonPadding: 'small', onClick: onClickBack || onClickClose, expanded: true, disabled: isLoading, copykey: 'dyn_send_transaction.confirmation.cancel_button', children: t('dyn_send_transaction.confirmation.cancel_button') })), jsx(TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', onClick: handleSubmitWithChecks, expanded: true, loading: isLoading, disabled: disableSendButton, copykey: 'dyn_send_transaction.confirmation.send', startSlot: 
+    return hideModal ? null : (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: closeButton, leading: backButton, alignContent: 'bottom', children: jsx("div", { className: 'send-balance-page-layout__header-content', children: jsx(Typography, { variant: 'title', color: 'primary', copykey: 'dyn_send_transaction.data.confirmation_tx', children: t('dyn_send_transaction.data.confirmation_tx') }) }) }), jsx("div", { className: 'transaction-confirmation__banner', children: jsx(Typography, { variant: 'body_normal', color: 'primary', copykey: 'dyn_send_transaction.data.banner', children: t('dyn_send_transaction.data.banner') }) }), jsx(PasskeyCreatedSuccessBanner, {}), jsxs("div", { className: 'transaction-confirmation__body', children: [jsxs("div", { className: 'transaction-confirmation__content', children: [!sendBalanceTransaction ? (jsx(TransactionCard, { transaction: transaction, isGasSponsored: isGasSponsored, isAATransaction: walletConnector ? isZeroDevConnector(walletConnector) : false, simulationResult: simulationResult })) : (jsx(OldTransactionCard, { transaction: transaction, currentToken: currentToken, currencySymbol: currencySymbol, valueRounded: (_a = getValueRounded(Boolean(isNativeToken), transaction)) === null || _a === void 0 ? void 0 : _a.toString(), transactionValue: transactionValue, isGasSponsored: isGasSponsored, gasFiatValue: gasFiatValue || '0', totalGasFiatValue: totalGasFiatValue || '0', currency: currency, total: total, t: t, walletKey: walletKey })), children && (jsx("div", { className: 'transaction-confirmation__rows', children: children }))] }), jsx(AnimatePresence, { animationComponent: jsx(VerticalDrawerTransition, {}), children: alert && (jsx("div", { className: 'transaction-confirmation__warning', children: alert })) }), jsxs("div", { className: 'transaction-confirmation__actions', children: [(onClickBack || onClickClose) && (jsx(TypographyButton, { buttonVariant: 'primary', buttonPadding: 'small', onClick: onClickBack || onClickClose, expanded: true, disabled: isLoading, copykey: 'dyn_send_transaction.confirmation.cancel_button', children: t('dyn_send_transaction.confirmation.cancel_button') })), jsx(TypographyButton, { buttonVariant: 'brand-primary', buttonPadding: 'small', onClick: handleSubmitWithChecks, expanded: true, loading: isLoading, disabled: disableSendButton, copykey: 'dyn_send_transaction.confirmation.send', startSlot: 
                                 // eslint-disable-next-line react/jsx-wrap-multilines
                                 jsx(Icon, { size: 'small', color: 'text-secondary', children: jsx(SvgSend, {}) }), dataTestId: 'transaction-confirmation-send', children: t('dyn_send_transaction.confirmation.send') })] }), displayPoweredByDynamicFooter && (jsx(PoweredByDynamic, { classNameRoot: 'transaction-confirmation__footer' }))] })] }));
 };

package/src/lib/components/TransactionStatusLayout/TransactionStatusLayout.cjs

@@ -35,6 +35,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');
@@ -43,7 +44,6 @@ var fiatUtils = require('../../utils/functions/fiatUtils/fiatUtils.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('../../utils/functions/compareChains/compareChains.cjs');
 require('../../context/WalletContext/WalletContext.cjs');
@@ -58,7 +58,8 @@ require('../../views/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 PoweredByDynamic = require('../PoweredByDynamic/PoweredByDynamic.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../ShadowDOM/ShadowDOM.cjs');
@@ -96,6 +97,7 @@ require('../IsBrowser/IsBrowser.cjs');
 require('../Popper/Popper/Popper.cjs');
 require('../Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
+require('@dynamic-labs/ethereum-aa');
 
 const TransactionStatusLayout = ({ destinationAddress, transactionValue, networkCurrency, onDone, displayPoweredByDynamicFooter = true, onClickClose, transaction, currentToken, isNativeToken, }) => {
     const { t } = reactI18next.useTranslation();

package/src/lib/components/TransactionStatusLayout/TransactionStatusLayout.js

@@ -31,6 +31,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';
@@ -39,7 +40,6 @@ import { getTotalFiatCost } from '../../utils/functions/fiatUtils/fiatUtils.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 '../../utils/functions/compareChains/compareChains.js';
 import '../../context/WalletContext/WalletContext.js';
@@ -54,7 +54,8 @@ import '../../views/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 { PoweredByDynamic } from '../PoweredByDynamic/PoweredByDynamic.js';
 import '../../context/FooterAnimationContext/index.js';
 import '../ShadowDOM/ShadowDOM.js';
@@ -92,6 +93,7 @@ import '../IsBrowser/IsBrowser.js';
 import '../Popper/Popper/Popper.js';
 import '../Popper/PopperContext/PopperContext.js';
 import 'qrcode';
+import '@dynamic-labs/ethereum-aa';
 
 const TransactionStatusLayout = ({ destinationAddress, transactionValue, networkCurrency, onDone, displayPoweredByDynamicFooter = true, onClickClose, transaction, currentToken, isNativeToken, }) => {
     const { t } = useTranslation();

package/src/lib/components/Transition/VerticalDrawerTransition/VerticalDrawerTransition.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');
@@ -48,7 +48,8 @@ require('../../../views/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 classNames = require('../../../utils/functions/classNames/classNames.cjs');
 require('../../Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -79,6 +80,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('../../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');

package/src/lib/components/Transition/VerticalDrawerTransition/VerticalDrawerTransition.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';
@@ -44,7 +44,8 @@ import '../../../views/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 { classNames } from '../../../utils/functions/classNames/classNames.js';
 import '../../Accordion/components/AccordionItem/AccordionItem.js';
@@ -75,6 +76,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 '../../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';

package/src/lib/components/UserAddress/UserAddress.cjs

@@ -27,6 +27,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');
@@ -34,7 +35,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');
@@ -51,7 +51,8 @@ require('../../views/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('../Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../Alert/Alert.cjs');
@@ -81,6 +82,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('../OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');