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

package/src/lib/context/ConnectWithOtpContext/ConnectWithOtpProvider.js

@@ -16,6 +16,7 @@ import '../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../store/state/loadingAndLifecycle.js';
 import '../../shared/consts/index.js';
+import '../../store/state/nonce/nonce.js';
 import { isProviderEnabled } from '../../utils/functions/isProviderEnabled/isProviderEnabled.js';
 import { isEmailValid } from '../../utils/functions/isEmailValid/isEmailValid.js';
 import '../../config/ApiEndpoint.js';
@@ -29,7 +30,6 @@ import '../ErrorContext/ErrorContext.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
 import '../AccountExistsContext/AccountExistsContext.js';
 import '../UserWalletsContext/UserWalletsContext.js';
-import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -46,7 +46,8 @@ import '../../views/CollectUserDataView/useFields.js';
 import '../FieldsStateContext/FieldsStateContext.js';
 import '../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';
@@ -76,6 +77,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../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/context/ConnectWithOtpContext/utils/createEmailHandler.cjs

@@ -7,22 +7,23 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var email = require('../../../data/api/email/email.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs/utils');
+var storeAuthTokenAndUser = require('../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
+require('../../../store/state/user/user.cjs');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../utils/constants/values.cjs');
+require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
+require('../../../utils/constants/colors.cjs');
+require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('../../../utils/constants/colors.cjs');
-require('../../../utils/constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-var storeAuthTokenAndUser = require('../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
-require('../../../store/state/user/user.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.js

@@ -3,22 +3,23 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { createEmailVerification, retryEmailVerification, signInWithEmailVerification } from '../../../data/api/email/email.js';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs/utils';
+import { storeAuthTokenAndUser } from '../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
+import '../../../store/state/user/user.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../utils/constants/values.js';
+import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
+import '../../../utils/constants/colors.js';
+import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '../../../utils/constants/colors.js';
-import '../../../utils/constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import { storeAuthTokenAndUser } from '../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
-import '../../../store/state/user/user.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.cjs

@@ -6,20 +6,21 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../utils/constants/values.cjs');
+require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
+require('../../../utils/constants/colors.cjs');
+require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('../../../utils/constants/colors.cjs');
-require('../../../utils/constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 var storeAuthTokenAndUser = require('../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 require('../../../store/state/user/user.cjs');

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.js

@@ -2,20 +2,21 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
+import '../../../config/ApiEndpoint.js';
+import '../../../utils/constants/values.js';
+import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
+import '../../../utils/constants/colors.js';
+import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '../../../utils/constants/colors.js';
-import '../../../utils/constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import { storeAuthTokenAndUser } from '../../../store/state/user/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 import '../../../store/state/user/user.js';

package/src/lib/context/ConnectWithOtpContext/utils/findEmailProvider.cjs

@@ -7,19 +7,20 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var email = require('../../../data/api/email/email.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs/utils');
+require('../../../utils/constants/colors.cjs');
+require('../../../utils/constants/values.cjs');
+require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
+require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('../../../utils/constants/colors.cjs');
-require('../../../utils/constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../store/state/user/user.cjs');
 require('../../../config/ApiEndpoint.cjs');

package/src/lib/context/ConnectWithOtpContext/utils/findEmailProvider.js

@@ -3,19 +3,20 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { getEmailProvider } from '../../../data/api/email/email.js';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs/utils';
+import '../../../utils/constants/colors.js';
+import '../../../utils/constants/values.js';
+import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
+import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '../../../utils/constants/colors.js';
-import '../../../utils/constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../store/state/user/user.js';
 import '../../../config/ApiEndpoint.js';

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -32,6 +32,7 @@ var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 var helpers = require('./helpers/helpers.cjs');
 require('react-international-phone');
+var nonce = require('../../store/state/nonce/nonce.cjs');
 var ApiEndpoint = require('../../config/ApiEndpoint.cjs');
 var user = require('../../store/state/user/user.cjs');
 var settings = require('../../data/api/settings/settings.cjs');
@@ -40,7 +41,6 @@ var projectSettings = require('../../store/state/projectSettings/projectSettings
 var AccessDeniedContext = require('../AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../UserWalletsContext/UserWalletsContext.cjs');
-var dynamicContextProps = require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var VerificationContext = require('../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
@@ -59,13 +59,16 @@ var UserFieldEditorContext = require('../UserFieldEditorContext/UserFieldEditorC
 require('@dynamic-labs/rpc-providers');
 var useValidateSession = require('../../utils/hooks/useValidateSession/useValidateSession.cjs');
 var useCreateWalletConnectorOptions = require('../../utils/hooks/useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.cjs');
+var useCreateWalletGroups = require('../../utils/hooks/useCreateWalletGroups/useCreateWalletGroups.cjs');
 var useWalletConnectors = require('../../utils/hooks/useWalletConnectors/useWalletConnectors.cjs');
 var useWalletUiUtils = require('../../utils/hooks/useWalletUiUtils/useWalletUiUtils.cjs');
 var useWalletConnectorNetwork = require('../../utils/hooks/useWalletConnectorNetwork/useWalletConnectorNetwork.cjs');
 var useSetWalletConnectorFetchers = require('../../utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.cjs');
 var useSendDynamicProps = require('../../utils/hooks/useSendDynamicProps/useSendDynamicProps.cjs');
 require('../../store/state/tokenBalances.cjs');
+var dynamicContextProps = require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var WalletGroupContext = require('../WalletGroupContext/WalletGroupContext.cjs');
+var walletOptions = require('../../store/state/walletOptions/walletOptions.cjs');
 var useResetCookieLocalStorage = require('../../utils/hooks/useResetCookieLocalStorage/useResetCookieLocalStorage.cjs');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useEndUserWarning = require('../../utils/hooks/useEndUserWarning/useEndUserWarning.cjs');
@@ -98,9 +101,9 @@ require('../../store/state/sendBalances.cjs');
 var useNetworkConfigurationsFromProjectSettings = require('../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.cjs');
 var SyncAuthFlow = require('../../components/SyncAuthFlow/SyncAuthFlow.cjs');
 var Toolkit = require('../../components/Toolkit/Toolkit.cjs');
+require('@dynamic-labs/ethereum-aa');
 var WalletConnectorEvents = require('../../components/WalletConnectorEvents/WalletConnectorEvents.cjs');
 var store = require('../../store/internalImplementation/store.cjs');
-var walletConnectorOptions = require('../../store/state/walletConnectorOptions.cjs');
 var getMissingChains = require('../../utils/functions/getMissingChains/getMissingChains.cjs');
 var parseTheme = require('../../utils/functions/parseTheme/parseTheme.cjs');
 var useMultiWalletWidgetState = require('../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.cjs');
@@ -130,6 +133,7 @@ var ReinitializeContextProvider = require('../ReinitializeContext/ReinitializeCo
 var SendBalanceContext = require('../SendBalanceContext/SendBalanceContext.cjs');
 var UseNetworkValidation = require('../UseNetworkValidation/UseNetworkValidation.cjs');
 var defaultDynamicSettings = require('../../store/state/dynamicContextProps/defaultDynamicSettings.cjs');
+var shouldFetchNonce = require('../../shared/utils/functions/shouldFetchNonce/shouldFetchNonce.cjs');
 var onReinitialize = require('./functions/onReinitialize/onReinitialize.cjs');
 var useDisplayOrderState = require('./hooks/useDisplayOrderState/useDisplayOrderState.cjs');
 var useEmailLoginState = require('./hooks/useEmailLoginState/useEmailLoginState.cjs');
@@ -269,7 +273,8 @@ const InnerDynamicContextProvider = (props) => {
         walletUiUtils,
     ]);
     useCreateWalletConnectorOptions.useCreateWalletConnectorOptions(connectorProps);
-    const walletConnectorOptions$1 = walletConnectorOptions.useWalletConnectorOptions();
+    const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
+    useCreateWalletGroups.useCreateWalletGroups({ walletConnectorOptions });
     const [authMode, setAuthMode] = React.useState(initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId.usePrimaryWalletId({
         environmentId,
@@ -297,14 +302,14 @@ const InnerDynamicContextProvider = (props) => {
         setPrimaryWalletId,
         setShowAuthFlow,
         user: user$1,
-        walletConnectorOptions: walletConnectorOptions$1,
+        walletConnectorOptions,
     });
     const bridgeChainsToConnect = React.useMemo(() => getMissingChains.getMissingChains(bridgeChains, connectedWalletsInfo), [bridgeChains, connectedWalletsInfo]);
-    const { selectedWalletConnector, setSelectedWalletConnectorKey } = useSelectedWalletConnector.useSelectedWalletConnector({ walletConnectorOptions: walletConnectorOptions$1 });
+    const { selectedWalletConnector, setSelectedWalletConnectorKey } = useSelectedWalletConnector.useSelectedWalletConnector({ walletConnectorOptions });
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = React.useState(null);
-    useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(user$1 !== null && user$1 !== void 0 ? user$1 : userWithMissingInfo, walletConnectorOptions$1);
-    useSetWalletConnectorFetchers.useSetWalletConnectorFetchers(walletConnectorOptions$1, environmentId, projectSettings$1);
+    useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(user$1 !== null && user$1 !== void 0 ? user$1 : userWithMissingInfo, walletConnectorOptions);
+    useSetWalletConnectorFetchers.useSetWalletConnectorFetchers(walletConnectorOptions, environmentId, projectSettings$1);
     const { primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors.useWalletConnectors({
         authMode,
         canHaveMultipleWalletsConnected: multiWallet,
@@ -314,13 +319,16 @@ const InnerDynamicContextProvider = (props) => {
         setMultiWalletWidgetState,
         setPrimaryWalletId,
         user: user$1 || userWithMissingInfo,
-        walletConnectorOptions: walletConnectorOptions$1,
+        walletConnectorOptions,
     });
     React.useEffect(() => {
         setRequiredWalletsConnected(!(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length) && Boolean(primaryWallet));
     }, [bridgeChainsToConnect, primaryWallet]);
     const walletConnectors = linkedOrConnectedWallets.map((wallet) => wallet.connector);
     projectSettings.useFetchProjectSettings();
+    nonce.useFetchNonce({
+        shouldFetch: shouldFetchNonce.shouldFetchNonce({ authMode }),
+    });
     const { getNameService, removeConnectedNameService } = useNameService.useNameService({
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallets[0],
         user: user$1,
@@ -369,6 +377,8 @@ const InnerDynamicContextProvider = (props) => {
         projectSettings: projectSettings$1,
         setPrimaryWalletId,
     });
+    // For some reason, calling useNonce in useGlobalLoading causes errors
+    const nonce$1 = nonce.useNonce();
     const sdkHasLoaded = useGlobalLoading.useGlobalLoading({
         appName,
         authMode,
@@ -377,6 +387,7 @@ const InnerDynamicContextProvider = (props) => {
         enableInstrumentation,
         environmentId,
         isLoadingUserFromCookie,
+        nonce: nonce$1,
         primaryWallet,
         primaryWalletId,
         projectSettings: projectSettings$1,
@@ -585,7 +596,7 @@ const InnerDynamicContextProvider = (props) => {
             toolkitEnabled,
             user: user$1,
             userWithMissingInfo,
-            walletConnectorOptions: walletConnectorOptions$1,
+            walletConnectorOptions,
             walletUiUtils,
             walletsFilter,
         });
@@ -692,7 +703,7 @@ const InnerDynamicContextProvider = (props) => {
         theme,
         toolkitEnabled,
         userWithMissingInfo,
-        walletConnectorOptions$1,
+        walletConnectorOptions,
         walletUiUtils,
         walletsFilter,
     ]);

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -28,6 +28,7 @@ import { ErrorContextProvider } from '../ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { resolveNetworkValidationMode, initExpirationTime, getInitialView, getDeepLinkPreference } from './helpers/helpers.js';
 import 'react-international-phone';
+import { useFetchNonce, useNonce } from '../../store/state/nonce/nonce.js';
 import ApiEndpoint from '../../config/ApiEndpoint.js';
 import { useUser } from '../../store/state/user/user.js';
 import { sendDynamicProps } from '../../data/api/settings/settings.js';
@@ -36,7 +37,6 @@ import { useProjectSettings, useFetchProjectSettings } from '../../store/state/p
 import { AccessDeniedContextProvider } from '../AccessDeniedContext/AccessDeniedContext.js';
 import { AccountExistsContextProvider } from '../AccountExistsContext/AccountExistsContext.js';
 import { UserWalletsProvider } from '../UserWalletsContext/UserWalletsContext.js';
-import { useSyncDynamicContextProps } from '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { VerificationProvider } from '../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -55,13 +55,16 @@ import { UserFieldEditorContextProvider } from '../UserFieldEditorContext/UserFi
 import '@dynamic-labs/rpc-providers';
 import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
 import { useCreateWalletConnectorOptions } from '../../utils/hooks/useCreateWalletConnectorOptions/useCreateWalletConnectorOptions.js';
+import { useCreateWalletGroups } from '../../utils/hooks/useCreateWalletGroups/useCreateWalletGroups.js';
 import { useWalletConnectors } from '../../utils/hooks/useWalletConnectors/useWalletConnectors.js';
 import { useWalletUiUtils } from '../../utils/hooks/useWalletUiUtils/useWalletUiUtils.js';
 import { useWalletConnectorNetwork } from '../../utils/hooks/useWalletConnectorNetwork/useWalletConnectorNetwork.js';
 import { useSetWalletConnectorFetchers } from '../../utils/hooks/useSetWalletConnectorFetchers/useSetWalletConnectorFetchers.js';
 import { useSendDynamicProps } from '../../utils/hooks/useSendDynamicProps/useSendDynamicProps.js';
 import '../../store/state/tokenBalances.js';
+import { useSyncDynamicContextProps } from '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
+import { useWalletConnectorOptions } from '../../store/state/walletOptions/walletOptions.js';
 import { useResetCookieLocalStorage } from '../../utils/hooks/useResetCookieLocalStorage/useResetCookieLocalStorage.js';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useEndUserWarning } from '../../utils/hooks/useEndUserWarning/useEndUserWarning.js';
@@ -94,9 +97,9 @@ import '../../store/state/sendBalances.js';
 import { useNetworkConfigurationsFromProjectSettings } from '../../utils/hooks/useNetworkConfigurationsFromProjectSettings/useNetworkConfigurationsFromProjectSettings.js';
 import { SyncAuthFlow } from '../../components/SyncAuthFlow/SyncAuthFlow.js';
 import { Toolkit } from '../../components/Toolkit/Toolkit.js';
+import '@dynamic-labs/ethereum-aa';
 import { WalletConnectorEvents } from '../../components/WalletConnectorEvents/WalletConnectorEvents.js';
 import { initializeStore } from '../../store/internalImplementation/store.js';
-import { useWalletConnectorOptions } from '../../store/state/walletConnectorOptions.js';
 import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
 import { parseTheme } from '../../utils/functions/parseTheme/parseTheme.js';
 import { useMultiWalletWidgetState } from '../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.js';
@@ -126,6 +129,7 @@ import { ReinitializeContextProvider } from '../ReinitializeContext/Reinitialize
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
 import { UseNetworkValidation } from '../UseNetworkValidation/UseNetworkValidation.js';
 import { defaultDynamicSettings } from '../../store/state/dynamicContextProps/defaultDynamicSettings.js';
+import { shouldFetchNonce } from '../../shared/utils/functions/shouldFetchNonce/shouldFetchNonce.js';
 import { onReinitialize } from './functions/onReinitialize/onReinitialize.js';
 import { useDisplayOrderState } from './hooks/useDisplayOrderState/useDisplayOrderState.js';
 import { useEmailLoginState } from './hooks/useEmailLoginState/useEmailLoginState.js';
@@ -266,6 +270,7 @@ const InnerDynamicContextProvider = (props) => {
     ]);
     useCreateWalletConnectorOptions(connectorProps);
     const walletConnectorOptions = useWalletConnectorOptions();
+    useCreateWalletGroups({ walletConnectorOptions });
     const [authMode, setAuthMode] = useState(initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId({
         environmentId,
@@ -317,6 +322,9 @@ const InnerDynamicContextProvider = (props) => {
     }, [bridgeChainsToConnect, primaryWallet]);
     const walletConnectors = linkedOrConnectedWallets.map((wallet) => wallet.connector);
     useFetchProjectSettings();
+    useFetchNonce({
+        shouldFetch: shouldFetchNonce({ authMode }),
+    });
     const { getNameService, removeConnectedNameService } = useNameService({
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallets[0],
         user,
@@ -365,6 +373,8 @@ const InnerDynamicContextProvider = (props) => {
         projectSettings,
         setPrimaryWalletId,
     });
+    // For some reason, calling useNonce in useGlobalLoading causes errors
+    const nonce = useNonce();
     const sdkHasLoaded = useGlobalLoading({
         appName,
         authMode,
@@ -373,6 +383,7 @@ const InnerDynamicContextProvider = (props) => {
         enableInstrumentation,
         environmentId,
         isLoadingUserFromCookie,
+        nonce,
         primaryWallet,
         primaryWalletId,
         projectSettings,

package/src/lib/context/DynamicContext/hooks/useEmailLoginState/useEmailLoginState.cjs

@@ -19,6 +19,7 @@ require('../../../ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
+require('../../../../store/state/nonce/nonce.cjs');
 var isEmailProviderEnabled = require('../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../store/state/user/user.cjs');

package/src/lib/context/DynamicContext/hooks/useEmailLoginState/useEmailLoginState.js

@@ -15,6 +15,7 @@ import '../../../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
+import '../../../../store/state/nonce/nonce.js';
 import { isEmailProviderEnabled } from '../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../store/state/user/user.js';

package/src/lib/context/DynamicContext/hooks/useHandleLogout/useHandleLogout.cjs

@@ -7,20 +7,21 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
+require('../../../../config/ApiEndpoint.cjs');
+var values = require('../../../../utils/constants/values.cjs');
+require('@dynamic-labs/multi-wallet');
+var localStorage = require('../../../../utils/constants/localStorage.cjs');
 require('../../../../shared/logger.cjs');
+require('../../../../utils/constants/colors.cjs');
+require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-var localStorage = require('../../../../utils/constants/localStorage.cjs');
-require('../../../../utils/constants/colors.cjs');
-var values = require('../../../../utils/constants/values.cjs');
 require('../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../shared/consts/index.cjs');
-require('../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
+require('../../../../store/state/nonce/nonce.cjs');
 require('../../../../store/state/projectSettings/projectSettings.cjs');
 var user = require('../../../../store/state/user/user.cjs');
 var session = require('../../../../data/api/session/session.cjs');
@@ -33,7 +34,6 @@ require('../../../ErrorContext/ErrorContext.cjs');
 require('../../../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../AccountExistsContext/AccountExistsContext.cjs');
 require('../../../UserWalletsContext/UserWalletsContext.cjs');
-require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
@@ -49,7 +49,8 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../FieldsStateContext/FieldsStateContext.cjs');
 require('../../../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');
@@ -79,6 +80,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../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/context/DynamicContext/hooks/useHandleLogout/useHandleLogout.js

@@ -3,20 +3,21 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useRef, useCallback, useEffect } from 'react';
 import { StorageService } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
+import '../../../../config/ApiEndpoint.js';
+import { DYNAMIC_AUTH_COOKIE_NAME } from '../../../../utils/constants/values.js';
+import '@dynamic-labs/multi-wallet';
+import { AUTH_TOKEN, AUTH_MIN_TOKEN, WALLET_PICKER_SEARCH_KEY, PHANTOM_SIGNATURE_STATE, AUTH_EXPIRES_AT } from '../../../../utils/constants/localStorage.js';
 import '../../../../shared/logger.js';
+import '../../../../utils/constants/colors.js';
+import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import { AUTH_TOKEN, AUTH_MIN_TOKEN, WALLET_PICKER_SEARCH_KEY, PHANTOM_SIGNATURE_STATE, AUTH_EXPIRES_AT } from '../../../../utils/constants/localStorage.js';
-import '../../../../utils/constants/colors.js';
-import { DYNAMIC_AUTH_COOKIE_NAME } from '../../../../utils/constants/values.js';
 import '../../../../store/state/loadingAndLifecycle.js';
 import '../../../../shared/consts/index.js';
-import '../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
 import { setUser } from '../../../../store/state/user/user.js';
 import { revokeSession } from '../../../../data/api/session/session.js';
@@ -29,7 +30,6 @@ import '../../../ErrorContext/ErrorContext.js';
 import '../../../AccessDeniedContext/AccessDeniedContext.js';
 import '../../../AccountExistsContext/AccountExistsContext.js';
 import '../../../UserWalletsContext/UserWalletsContext.js';
-import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';
@@ -45,7 +45,8 @@ import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../FieldsStateContext/FieldsStateContext.js';
 import '../../../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';
@@ -75,6 +76,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../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/context/DynamicContext/hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.cjs

@@ -24,6 +24,7 @@ require('../../../CaptchaContext/CaptchaContext.cjs');
 require('../../../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('../../../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../AccountExistsContext/AccountExistsContext.cjs');
 require('../../../UserWalletsContext/UserWalletsContext.cjs');
-require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
@@ -47,7 +47,8 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../FieldsStateContext/FieldsStateContext.cjs');
 require('../../../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');
@@ -77,6 +78,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../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');