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

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.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 '../../../functions/compareChains/compareChains.js';
@@ -43,7 +43,8 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import { UserFieldEditorContext } from '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.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';
@@ -73,6 +74,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 '../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.cjs

@@ -21,6 +21,7 @@ require('react');
 require('@dynamic-labs/wallet-book');
 require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
+require('../../../../store/state/nonce/nonce.cjs');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
 var isCookieEnabled = require('../../../functions/isCookieEnabled/isCookieEnabled.cjs');

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.js

@@ -17,6 +17,7 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
+import '../../../../store/state/nonce/nonce.js';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
 import { isCookieEnabled } from '../../../functions/isCookieEnabled/isCookieEnabled.js';

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

@@ -35,10 +35,10 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-var fetchNonce = require('../../functions/fetchNonce/fetchNonce.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
+require('../../../store/state/nonce/nonce.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
 var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
@@ -55,7 +55,7 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
-require('../../../store/state/walletConnectorOptions.cjs');
+require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -86,6 +86,7 @@ require('../../../context/LoadingContext/LoadingContext.cjs');
 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('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
@@ -114,13 +115,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
     const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const nonce = yield fetchNonce.fetchNonce();
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
             displaySiweStatement,
             environmentId,
             getAddressOpts,
             messageToSignOverride,
-            nonce,
             publicWalletAddress,
             signedMessageOverride,
             siweStatement: getSiweStatement.getSiweStatement({ appName, siweStatement }),

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

@@ -31,10 +31,10 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
-import { fetchNonce } from '../../functions/fetchNonce/fetchNonce.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import '../../../context/VerificationContext/VerificationContext.js';
+import '../../../store/state/nonce/nonce.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
 import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
@@ -51,7 +51,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import '../../../store/state/walletConnectorOptions.js';
+import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -82,6 +82,7 @@ import '../../../context/LoadingContext/LoadingContext.js';
 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 '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
@@ -110,13 +111,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
     const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => __awaiter(void 0, void 0, void 0, function* () {
-        const nonce = yield fetchNonce();
         const verifyArgs = yield getVerifyArgs({
             displaySiweStatement,
             environmentId,
             getAddressOpts,
             messageToSignOverride,
-            nonce,
             publicWalletAddress,
             signedMessageOverride,
             siweStatement: getSiweStatement({ appName, siweStatement }),

package/src/lib/utils/hooks/useViewSettings/useViewSettings.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('../../functions/compareChains/compareChains.cjs');
@@ -46,7 +46,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('../../../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('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');

package/src/lib/utils/hooks/useViewSettings/useViewSettings.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 '../../functions/compareChains/compareChains.js';
@@ -42,7 +42,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 '../../../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 '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';

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

@@ -28,11 +28,11 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
-require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -50,7 +50,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 isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.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('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');

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

@@ -24,11 +24,11 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
-import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
 import '../../../context/VerificationContext/VerificationContext.js';
@@ -46,7 +46,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 { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -77,6 +78,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 '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -14,6 +13,7 @@ var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var isWalletGroup = require('../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.cjs');
@@ -24,6 +24,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');
@@ -31,7 +32,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('../../functions/compareChains/compareChains.cjs');
@@ -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');
+var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
 var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
 require('react-i18next');
 require('../../../components/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('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
@@ -99,16 +101,15 @@ const embeddedWalletsKeys = [
 ];
 const useWalletOptions = () => {
     const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
-    const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
+    const walletGroups = walletOptions.useWalletGroups();
     const { setView } = ViewContext.useViewContext();
     const { navigateToWalletGroup } = WalletGroupContext.useWalletGroupContext();
     const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
     const getFilteredWalletOptions = React.useCallback((filter) => {
         const nonEmbeddedOptions = walletConnectorOptions.filter((option) => !embeddedWalletsKeys.includes(option.walletConnector.key));
         return filter(nonEmbeddedOptions).map((option) => {
-            const groupName = option.group && Boolean(Object.keys(walletBook$1).length)
-                ? walletBook.getWalletGroup(walletBook$1, option.group).name
-                : undefined;
+            var _a;
+            const groupName = option.group && ((_a = walletGroups[option.group]) === null || _a === void 0 ? void 0 : _a.name);
             return {
                 chain: option.walletConnector.connectedChain,
                 group: option.group,
@@ -119,11 +120,12 @@ const useWalletOptions = () => {
                 name: option.name,
             };
         });
-    }, [walletBook$1, walletConnectorOptions]);
+    }, [walletConnectorOptions, walletGroups]);
     const allWalletOptions = React.useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
     const selectWalletOption = (walletKey) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const group = groupWalletOptions.groupWalletOptions(walletBook$1, walletConnectorOptions);
-        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        const group = groupWalletOptions.groupWalletOptions(walletGroups, walletConnectorOptions);
+        const walletGroup = group.find((wallet) => wallet.key === walletKey);
+        const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((wallet) => wallet.key === walletKey);
         logger.logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
@@ -131,8 +133,8 @@ const useWalletOptions = () => {
         if (!walletOption) {
             throw new utils.DynamicError('Invalid wallet option key provided.');
         }
-        if (isWalletGroup.isWalletGroup(walletOption)) {
-            navigateToWalletGroup(walletOption);
+        if (walletGroup && isWalletGroup.isWalletGroup(walletGroup)) {
+            navigateToWalletGroup(walletGroup);
         }
         else if (walletConnectorCore.isHardwareWalletConnector(walletOption.walletConnector) &&
             walletOption.walletConnector.canConnectWithHardwareWallet()) {

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

@@ -2,7 +2,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { useWalletBookContext, getWalletGroup } from '@dynamic-labs/wallet-book';
 import { DynamicError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -10,6 +9,7 @@ import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { isWalletGroup } from '../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.js';
@@ -20,6 +20,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';
@@ -27,7 +28,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 '../../functions/compareChains/compareChains.js';
@@ -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 { useWalletGroups } from '../../../store/state/walletOptions/walletOptions.js';
 import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
 import 'react-i18next';
 import '../../../components/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 '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
@@ -95,16 +97,15 @@ const embeddedWalletsKeys = [
 ];
 const useWalletOptions = () => {
     const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext();
-    const { walletBook } = useWalletBookContext();
+    const walletGroups = useWalletGroups();
     const { setView } = useViewContext();
     const { navigateToWalletGroup } = useWalletGroupContext();
     const { handleWalletItemClick } = useWalletItemActions();
     const getFilteredWalletOptions = useCallback((filter) => {
         const nonEmbeddedOptions = walletConnectorOptions.filter((option) => !embeddedWalletsKeys.includes(option.walletConnector.key));
         return filter(nonEmbeddedOptions).map((option) => {
-            const groupName = option.group && Boolean(Object.keys(walletBook).length)
-                ? getWalletGroup(walletBook, option.group).name
-                : undefined;
+            var _a;
+            const groupName = option.group && ((_a = walletGroups[option.group]) === null || _a === void 0 ? void 0 : _a.name);
             return {
                 chain: option.walletConnector.connectedChain,
                 group: option.group,
@@ -115,11 +116,12 @@ const useWalletOptions = () => {
                 name: option.name,
             };
         });
-    }, [walletBook, walletConnectorOptions]);
+    }, [walletConnectorOptions, walletGroups]);
     const allWalletOptions = useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
     const selectWalletOption = (walletKey) => __awaiter(void 0, void 0, void 0, function* () {
-        const group = groupWalletOptions(walletBook, walletConnectorOptions);
-        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        const group = groupWalletOptions(walletGroups, walletConnectorOptions);
+        const walletGroup = group.find((wallet) => wallet.key === walletKey);
+        const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((wallet) => wallet.key === walletKey);
         logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
@@ -127,8 +129,8 @@ const useWalletOptions = () => {
         if (!walletOption) {
             throw new DynamicError('Invalid wallet option key provided.');
         }
-        if (isWalletGroup(walletOption)) {
-            navigateToWalletGroup(walletOption);
+        if (walletGroup && isWalletGroup(walletGroup)) {
+            navigateToWalletGroup(walletGroup);
         }
         else if (isHardwareWalletConnector(walletOption.walletConnector) &&
             walletOption.walletConnector.canConnectWithHardwareWallet()) {

package/src/lib/utils/hooks/useWalletUiUtils/useWalletUiUtils.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');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
 require('../../functions/compareChains/compareChains.cjs');
@@ -49,7 +49,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('../../../store/state/tokenBalances.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.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');
 var CreatePasswordModal = require('../../../modals/CreatePasswordModal/CreatePasswordModal.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');

package/src/lib/utils/hooks/useWalletUiUtils/useWalletUiUtils.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 { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
 import '../../functions/compareChains/compareChains.js';
@@ -45,7 +45,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 '../../../store/state/tokenBalances.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.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 { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

package/src/lib/views/AccessBlockedView/AccessBlockedView.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('../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');
@@ -86,6 +87,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 AccessBlockedView = () => {
     const [country, setCountry] = React.useState();

package/src/lib/views/AccessBlockedView/AccessBlockedView.js

@@ -23,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';
@@ -30,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';
@@ -47,7 +47,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';
@@ -82,6 +83,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 AccessBlockedView = () => {
     const [country, setCountry] = useState();