@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.20

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

@@ -4,6 +4,7 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { createContext, useState, useRef, useMemo, useEffect, useCallback } from 'react';
 import { I18nextProvider } from 'react-i18next';
 import { getIconicSpriteUrl } from '@dynamic-labs/iconic';
+import { Logger } from '@dynamic-labs/logger';
 import { MissingEnvironmentIdError } from '@dynamic-labs/utils';
 import { useWalletBookCdn, getWalletBookCdnUrl, WalletBookContextProvider } from '@dynamic-labs/wallet-book';
 import { logger as logger$1 } from '@dynamic-labs/wallet-connector-core';
@@ -13,7 +14,7 @@ import { decodeJwt } from '../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
 import { ViewContextProvider } from '../ViewContext/ViewContext.js';
-import { BRIDGE_ONBOARDING_COMPLETED, AUTH_TOKEN, AUTH_USER, AUTH_MODE, WALLET_PICKER_SEARCH_KEY } from '../../utils/constants/localStorage.js';
+import { BRIDGE_ONBOARDING_COMPLETED, AUTH_MODE, WALLET_PICKER_SEARCH_KEY, PHANTOM_SIGNATURE_STATE } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import { DEFAULT_NUMBER_OF_WALLETS_TO_SHOW } from '../../utils/constants/values.js';
 import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
@@ -25,6 +26,7 @@ import { ErrorContextProvider } from '../ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 import { getMinAuthToken } from '../../utils/functions/getMinAuthToken/getMinAuthToken.js';
+import { resolveNetworkValidationMode, initExpirationTime, getInitialView, getDeepLinkPreference } from './helpers/helpers.js';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
@@ -42,9 +44,10 @@ import { useFetchProjectSettings } from '../../utils/hooks/useFetchProjectSettin
 import { ThemeContextProvider } from '../ThemeContext/ThemeContext.js';
 import { useSetWalletConnectorVerifiedCredentials } from '../../utils/hooks/useSetWalletConnectorVerifiedCredentials/useSetWalletConnectorVerifiedCredentials.js';
 import '@dynamic-labs/types';
+import { LoadingContextProvider } from '../LoadingContext/LoadingContext.js';
 import 'yup';
 import '../MockContext/MockContext.js';
-import { FieldsStateProvider } from '../FieldsStateContext/FieldsStateContext.js';
+import '../../views/CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import { UserFieldEditorContextProvider } from '../UserFieldEditorContext/UserFieldEditorContext.js';
 import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
@@ -71,11 +74,11 @@ import '../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import { FieldsStateProvider } from '../FieldsStateContext/FieldsStateContext.js';
 import '../../views/WalletList/WalletList.js';
 import { SocialRedirectContextProvider } from '../SocialRedirectContext/SocialRedirectContext.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import { LoadingContextProvider } from '../LoadingContext/LoadingContext.js';
 import '../FooterAnimationContext/index.js';
 import '../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
@@ -102,11 +105,16 @@ import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/P
 import { FundingWidget } from '../../widgets/FundingWidget/FundingWidget.js';
 import { ConnectWithOtpProvider } from '../ConnectWithOtpContext/ConnectWithOtpProvider.js';
 import '../ConnectWithOtpContext/ConnectWithOtpContext.js';
+import { ErrorBoundary } from '../ErrorBoundary/ErrorBoundary.js';
+import { ErrorBoundaryExclude } from '../ErrorBoundary/ErrorBoundaryExclude.js';
+import '../ErrorBoundary/ErrorBoundaryBase.js';
 import { FundingContextProvider } from '../FundingContext/FundingContext.js';
 import { PhantomRedirectContextProvider } from '../PhantomRedirectContext/PhantomRedirectContext.js';
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
 import { UseNetworkValidation } from '../UseNetworkValidation/UseNetworkValidation.js';
-import { resolveNetworkValidationMode, initExpirationTime, getInitialView, getDeepLinkPreference } from './helpers/helpers.js';
+import { setUser } from '../../store/actions/userActions/userActions.js';
+import { initializeStore } from '../../store/store.js';
+import { useUser } from '../../store/hooks/useUser/useUser.js';
 import { useDisplayOrderState } from './hooks/useDisplayOrderState/useDisplayOrderState.js';
 import { useEmailLoginState } from './hooks/useEmailLoginState/useEmailLoginState.js';
 import { useHandleLogout } from './hooks/useHandleLogout/useHandleLogout.js';
@@ -118,15 +126,20 @@ import { useTieCallbacksToEvents } from './hooks/useTieCallbacksToEvents/useTieC
 import { useMultiWallet } from './hooks/useMultiWallet/useMultiWallet.js';
 import { useParentDynamicContextGuard } from './hooks/useParentDynamicContextGuard/useParentDynamicContextGuard.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
-import { validateAuthUser } from './validators/validators.js';
 
 const PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID = '2762a57b-faa4-41ce-9f16-abff9300e2c9';
-const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) => {
     var _a, _b, _c, _d, _e, _f, _g;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, coinbaseWalletPreference, enableConnectOnlyFallback = false, deepLinkPreference: deepLinkPreferenceProp = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, recommendedWallets, hideEmbeddedWalletTransactionUIs, handlers, } = settings;
+    LocalStorage.setSuffix(settings.localStorageSuffix);
+    /**
+     * initialize global store
+     */
+    initializeStore({
+        storageSuffix: settings.localStorageSuffix,
+    });
     /**
      * For backwards compatibility, we allow the client to pass in
      * `eventsCallbacks` instead of `events`. It should remove this
@@ -148,12 +161,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         logger.warn(`WARNING: DYNAMIC is using a test environment ID ${environmentId}. Please sign up on https://app.dynamic.xyz/ to get your production environment ID.`);
     }
     ApiEndpoint.setBaseUrl((_b = process.env.DYNAMIC_API_BASE_URL) !== null && _b !== void 0 ? _b : apiBaseUrl);
-    LocalStorage.setSuffix(localStorageSuffix);
     const i18nSDKInstance = Locale.setup(locale);
     const isAuthenticated = Boolean(getAuthToken());
     const isBridgeFlow = Boolean(bridgeChains);
     const deepLinkPreference = getDeepLinkPreference(deepLinkPreferenceProp, isBridgeFlow);
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = useState(undefined);
+    const [defaultTabIndex, setDefaultTabIndex] = useState(0);
     // state to track the full connectivity status of the individual's wallets.
     // Set to true once the predetermined number of wallets is connected.
     const [bridgeOnboardingCompleted, setBridgeOnboardingCompleted, removeBridgeOnboardingCompleted,] = useLocalStorage(BRIDGE_ONBOARDING_COMPLETED, false);
@@ -162,7 +175,13 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     // Alows clients to control the Bridget Widget flow without need to click on Bridge Widget
     const [showBridgeWidget, setShowBridgeWidget] = useState(false);
     const [isSingleWalletAccount, setIsSingleWalletAccount] = useState(false);
-    const [user, setUser, removeUser] = useLocalStorage(AUTH_USER, EMPTY_INITIAL_USER, validateAuthUser, [AUTH_TOKEN]);
+    const { user, userWithMissingFields } = useUser();
+    if (user) {
+        logger.setMetaData('user', user);
+    }
+    else {
+        logger.setMetaData('user', undefined);
+    }
     const { consumeNonce } = useFetchNonce(environmentId);
     const [qrcodeUri, setQrcodeUri] = useState('');
     const [desktopUri, setDesktopUri] = useState('');
@@ -202,6 +221,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     const { walletConnectorOptions } = useWalletConnectorOptions({
         appLogoUrl,
         appName,
+        coinbaseWalletPreference,
         deepLinkPreference,
         flowNetwork,
         mobileExperience,
@@ -214,7 +234,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         walletUiUtils,
     });
     const [authMode, setAuthMode] = useLocalStorage(AUTH_MODE, initialAuthenticationMode);
-    const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId();
+    const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId({
+        environmentId,
+        minAuthToken: getMinAuthToken(),
+    });
     // this is a state because it's set based on primaryWallet and bridgeChainsToConnect,
     // which are only available further down and have would have circular dependencies
     const [requiredWalletsConnected, setRequiredWalletsConnected] = useState(false);
@@ -247,7 +270,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
     const authToken = (_f = getAuthToken()) !== null && _f !== void 0 ? _f : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
-    useSetWalletConnectorFetchers(authToken, walletConnectorOptions, environmentId);
+    useSetWalletConnectorFetchers(walletConnectorOptions, environmentId);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors({
         authMode,
         authToken: getAuthToken() || onboardingOnlyJwt,
@@ -277,8 +300,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         walletBook,
     });
     const { getNameService, removeConnectedNameService } = useNameService({
-        authToken,
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallets[0],
+        user,
     });
     const { clearAllWalletConnectSessions } = useClearWalletConnectSessions({
         connectors: walletConnectors,
@@ -296,7 +319,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         removeConnectedNameService,
         removeConnectedWalletsInfo,
         removeLsSettings,
-        removeUser,
         resetLoginWithEmail,
         setAuthMode,
         setLegacyIsVerifying,
@@ -309,9 +331,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         walletConnectors,
     });
     const { setHasLoggedOut } = useValidateSession({
-        authToken,
         handleLogOut,
-        user,
     });
     // Ties all client callbacks to dynamic's events, such that
     // when our events are triggered, so are the client callbacks
@@ -324,12 +344,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         environmentId,
         primaryWalletId,
         secondaryWallets,
-        setUser,
         verifiedCredentials: (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [],
     });
     const { isLoading: loadingNetwork, network } = useWalletConnectorNetwork(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector);
     useWalletEventListeners({
         authMode,
+        disconnectWallet,
         handleLogOut,
         multiWallet,
         multiWalletWidgetState,
@@ -380,12 +400,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         if (authMode !== 'connect-only') {
             removeConnectedWalletsInfo();
         }
-        if (!LocalStorage.getFromLS(AUTH_USER)) {
-            LocalStorage.removeFromLS(AUTH_TOKEN);
-        }
         if (LocalStorage.getFromLS(WALLET_PICKER_SEARCH_KEY)) {
             LocalStorage.removeFromLS(WALLET_PICKER_SEARCH_KEY);
         }
+        LocalStorage.removeFromLS(PHANTOM_SIGNATURE_STATE);
         if (selectedWalletConnector &&
             (!primaryWallet ||
                 primaryWallet.connector.key !== selectedWalletConnector.key)) {
@@ -425,9 +443,9 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             customPrivacyPolicy,
             customTermsOfServices,
             debugError,
-            decodedAuthToken: decodeJwt(getAuthToken()),
             decodedOnboardingOnlyToken: decodeJwt(onboardingOnlyJwt),
             defaultNumberOfWalletsToShow,
+            defaultTabIndex,
             desktopUri,
             disconnectWallet,
             displaySiweStatement,
@@ -484,6 +502,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setAuthorizationViewDisplayOrder,
             setBridgeOnboardingCompleted,
             setCallback,
+            setDefaultTabIndex,
             setDesktopUri,
             setIsSingleWalletAccount,
             setLegacyIsVerifying,
@@ -519,6 +538,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             theme,
             toolkitEnabled,
             user,
+            userWithMissingFields,
             walletConnector: (_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) !== null && _b !== void 0 ? _b : null,
             walletConnectorOptions,
             walletUiUtils,
@@ -532,6 +552,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         handlers,
         appLogoUrl,
         appName,
+        defaultTabIndex,
         authMode,
         authorizationViewDisplayOrder,
         awaitingSignatureState,
@@ -565,6 +586,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         isSingleWalletAccount,
         legacyIsVerifying,
         user,
+        userWithMissingFields,
         linkedOrConnectedWallets,
         loadingNetwork,
         loginWithEmail,
@@ -608,7 +630,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         setSelectedWalletConnectorKey,
         setShowAuthFlow,
         setShowQrcodeModal,
-        setUser,
         shadowDOMEnabled,
         showAuthFlow,
         showBridgeWidget,
@@ -664,19 +685,22 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         if (user && multiWalletWidgetState !== 'idle' && !showDynamicUserProfile) {
             setShowDynamicUserProfile(true);
         }
-    }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile]);
     return (jsx(I18nextProvider, { i18n: i18nSDKInstance, children: jsx(DynamicContext.Provider, { value: value, children: jsx(WalletBookContextProvider, { walletBook: walletBook, children: jsx(ThemeContextProvider, { customerTheme: parseTheme(theme, ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _g === void 0 ? void 0 : _g.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsx(LoadingContextProvider, { children: jsxs(ViewContextProvider, { initialView: getInitialView({
                                 bridgeOnboardingCompleted,
                                 connectedWallets,
                                 isAuthenticated: isAuthenticated || Boolean(primaryWallet),
                                 isBridgeFlow,
                                 isMultiWalletEnabled: multiWallet,
-                            }), children: [networkValidationMode === 'always' && jsx(UseNetworkValidation, {}), jsx(CaptchaContextProvider, { children: jsx(AccountExistsContextProvider, { children: jsx(WalletContextProvider, { canSync: didConnectedStateLoad, children: jsx(PasskeyContextProvider, { children: jsx(VerificationProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsx(WalletGroupContextProvider, { children: jsx(UserFieldEditorContextProvider, { children: jsx(ConnectWithOtpProvider, { children: jsx(PhantomRedirectContextProvider, { children: jsxs(SocialRedirectContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(SyncEmbeddedWalletAuthFlow, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }));
+                            }), children: [networkValidationMode === 'always' && jsx(UseNetworkValidation, {}), jsx(CaptchaContextProvider, { children: jsx(AccountExistsContextProvider, { children: jsx(WalletContextProvider, { canSync: didConnectedStateLoad, children: jsx(PasskeyContextProvider, { children: jsx(VerificationProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsx(WalletGroupContextProvider, { children: jsx(UserFieldEditorContextProvider, { children: jsx(ConnectWithOtpProvider, { children: jsx(PhantomRedirectContextProvider, { children: jsxs(SocialRedirectContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(SyncEmbeddedWalletAuthFlow, {}), confirmationModal, jsx(ErrorBoundaryExclude, { children: children })] }) }) }) }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }));
 };
 /** The context provider you need to have access too all of Dynamic's hooks */
 const DynamicContextProvider = (props) => {
+    Logger.setEnvironmentId(props.settings.environmentId);
+    Logger.setEmitErrors(props.emitErrors);
     useParentDynamicContextGuard();
-    return (jsx(ErrorContextProvider, { children: jsx(UserWalletsProvider, { children: jsx(FieldsStateProvider, { children: jsx(InnerDynamicContextProvider, Object.assign({}, props)) }) }) }));
+    return (jsx(ErrorBoundary, { children: jsx(ErrorContextProvider, { children: jsx(UserWalletsProvider, { children: jsx(FieldsStateProvider, { children: jsx(InnerDynamicContextProvider, Object.assign({}, props)) }) }) }) }));
 };
 
 export { DynamicContext, DynamicContextProvider, InnerDynamicContextProvider, PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID };

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

@@ -6,18 +6,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
+require('../../../../utils/constants/values.cjs');
+require('@dynamic-labs/utils');
+require('../../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../utils/constants/colors.cjs');
-require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
-require('../../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var isEmailProviderEnabled = require('../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
 require('viem');

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

@@ -2,18 +2,18 @@
 import { useState, useMemo } from 'react';
 import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
+import '../../../../utils/constants/values.js';
+import '@dynamic-labs/utils';
+import '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
-import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
-import '../../../../../../_virtual/_tslib.js';
-import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { isEmailProviderEnabled } from '../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
 import 'viem';

package/src/lib/context/DynamicContext/hooks/useHandleLogout/types.d.ts

@@ -6,7 +6,6 @@ import { MultiWalletWidgetStateSetter } from '../../../../utils/hooks/multiWalle
 import { ChainsToConnect } from '../../types';
 import { SetShowAuthFlow } from '../useShowAuthFlow';
 export type UseHandleLogoutParams = {
-    removeUser: () => void;
     clearAllWalletConnectSessions: () => void;
     bridgeChains: ChainsToConnect[] | undefined;
     setShowDynamicUserProfile: Dispatch<SetStateAction<boolean>>;

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

@@ -19,14 +19,14 @@ require('../../../../utils/constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
-var session = require('../../../../data/api/session/session.cjs');
-require('../../../../locale/locale.cjs');
-var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/multi-wallet');
 var getMinAuthToken = require('../../../../utils/functions/getMinAuthToken/getMinAuthToken.cjs');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
+var session = require('../../../../data/api/session/session.cjs');
+require('../../../../locale/locale.cjs');
+var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 var useDynamicEvents = require('../../../../utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs');
 require('../../DynamicContext.cjs');
 require('../../../CaptchaContext/CaptchaContext.cjs');
@@ -39,13 +39,18 @@ require('react-dom');
 require('../../../WalletContext/WalletContext.cjs');
 require('../../../ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../MockContext/MockContext.cjs');
-require('react-i18next');
-require('../../../FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+var storeActions = require('../../../../store/actions/storeActions/storeActions.cjs');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
@@ -63,11 +68,11 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
+require('../../../FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../views/WalletList/WalletList.cjs');
 require('../../../SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../LoadingContext/LoadingContext.cjs');
 require('../../../FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../WalletGroupContext/WalletGroupContext.cjs');
@@ -77,6 +82,13 @@ require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
+const clearFromLocalStorage = [
+    localStorage$1.AUTH_TOKEN,
+    localStorage$1.AUTH_MIN_TOKEN,
+    localStorage$1.WALLET_PICKER_SEARCH_KEY,
+    localStorage$1.PHANTOM_SIGNATURE_STATE,
+    localStorage$1.AUTH_ONBOARDING_TOKEN,
+];
 const useHandleLogout = (params) => {
     const paramsRef = React.useRef(params);
     paramsRef.current = params;
@@ -86,15 +98,17 @@ const useHandleLogout = (params) => {
         p.setShowDynamicUserProfile(false);
         p.setShowBridgeWidget(false);
         p.resetLoginWithEmail();
-        localStorage.LocalStorage.removeFromLS(localStorage$1.WALLET_PICKER_SEARCH_KEY);
         const jwt = getMinAuthToken.getMinAuthToken();
         if (jwt && p.user) {
             // do not await this async call - just fire and forget
-            session.revokeSession({ environmentId: p.environmentId, sessionId: p.user.sessionId }, jwt);
+            session.revokeSession({
+                environmentId: p.environmentId,
+                sessionId: p.user.sessionId,
+            });
         }
         p.setLegacyIsVerifying(false);
-        localStorage.LocalStorage.removeFromLS(localStorage$1.AUTH_TOKEN);
-        localStorage.LocalStorage.removeFromLS(localStorage$1.AUTH_MIN_TOKEN);
+        for (const item of clearFromLocalStorage)
+            localStorage.LocalStorage.removeFromLS(item);
         p.setAuthMode(p.initialAuthenticationMode);
         p.setShowAuthFlow(false, {
             emitCancelAuth: false,
@@ -115,7 +129,7 @@ const useHandleLogout = (params) => {
         dynamicEvents.dynamicEvents.removeListener('embeddedWalletUpdatePasswordCompleted');
         dynamicEvents.dynamicEvents.removeListener('embeddedWalletUpdatePasswordFailed');
         dynamicEvents.dynamicEvents.emit('logout');
-        p.removeUser();
+        storeActions.clearStore();
         yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
         yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
     }), []);
@@ -124,4 +138,5 @@ const useHandleLogout = (params) => {
     return logout;
 };
 
+exports.clearFromLocalStorage = clearFromLocalStorage;
 exports.useHandleLogout = useHandleLogout;

package/src/lib/context/DynamicContext/hooks/useHandleLogout/useHandleLogout.d.ts

@@ -1,2 +1,3 @@
 import { UseHandleLogoutParams } from './types';
+export declare const clearFromLocalStorage: string[];
 export declare const useHandleLogout: (params: UseHandleLogoutParams) => () => Promise<void>;

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

@@ -9,20 +9,20 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import { WALLET_PICKER_SEARCH_KEY, AUTH_TOKEN, AUTH_MIN_TOKEN } from '../../../../utils/constants/localStorage.js';
+import { AUTH_TOKEN, AUTH_MIN_TOKEN, WALLET_PICKER_SEARCH_KEY, PHANTOM_SIGNATURE_STATE, AUTH_ONBOARDING_TOKEN } from '../../../../utils/constants/localStorage.js';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../config/ApiEndpoint.js';
-import { revokeSession } from '../../../../data/api/session/session.js';
-import '../../../../locale/locale.js';
-import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import '@dynamic-labs/multi-wallet';
 import { getMinAuthToken } from '../../../../utils/functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
+import { revokeSession } from '../../../../data/api/session/session.js';
+import '../../../../locale/locale.js';
+import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import { useInternalDynamicEvents } from '../../../../utils/hooks/events/useDynamicEvents/useDynamicEvents.js';
 import '../../DynamicContext.js';
 import '../../../CaptchaContext/CaptchaContext.js';
@@ -35,13 +35,18 @@ import 'react-dom';
 import '../../../WalletContext/WalletContext.js';
 import '../../../ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../MockContext/MockContext.js';
-import 'react-i18next';
-import '../../../FieldsStateContext/FieldsStateContext.js';
+import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import { clearStore } from '../../../../store/actions/storeActions/storeActions.js';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/IconButton/IconButton.js';
@@ -59,11 +64,11 @@ import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import '../../../FieldsStateContext/FieldsStateContext.js';
 import '../../../../views/WalletList/WalletList.js';
 import '../../../SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../LoadingContext/LoadingContext.js';
 import '../../../FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../WalletGroupContext/WalletGroupContext.js';
@@ -73,6 +78,13 @@ import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
+const clearFromLocalStorage = [
+    AUTH_TOKEN,
+    AUTH_MIN_TOKEN,
+    WALLET_PICKER_SEARCH_KEY,
+    PHANTOM_SIGNATURE_STATE,
+    AUTH_ONBOARDING_TOKEN,
+];
 const useHandleLogout = (params) => {
     const paramsRef = useRef(params);
     paramsRef.current = params;
@@ -82,15 +94,17 @@ const useHandleLogout = (params) => {
         p.setShowDynamicUserProfile(false);
         p.setShowBridgeWidget(false);
         p.resetLoginWithEmail();
-        LocalStorage.removeFromLS(WALLET_PICKER_SEARCH_KEY);
         const jwt = getMinAuthToken();
         if (jwt && p.user) {
             // do not await this async call - just fire and forget
-            revokeSession({ environmentId: p.environmentId, sessionId: p.user.sessionId }, jwt);
+            revokeSession({
+                environmentId: p.environmentId,
+                sessionId: p.user.sessionId,
+            });
         }
         p.setLegacyIsVerifying(false);
-        LocalStorage.removeFromLS(AUTH_TOKEN);
-        LocalStorage.removeFromLS(AUTH_MIN_TOKEN);
+        for (const item of clearFromLocalStorage)
+            LocalStorage.removeFromLS(item);
         p.setAuthMode(p.initialAuthenticationMode);
         p.setShowAuthFlow(false, {
             emitCancelAuth: false,
@@ -111,7 +125,7 @@ const useHandleLogout = (params) => {
         dynamicEvents.removeListener('embeddedWalletUpdatePasswordCompleted');
         dynamicEvents.removeListener('embeddedWalletUpdatePasswordFailed');
         dynamicEvents.emit('logout');
-        p.removeUser();
+        clearStore();
         yield Promise.all(p.walletConnectors.map((connector) => connector.endSession()));
         yield Promise.all(p.connectedWallets.map((connectedWallet) => connectedWallet.connector.endSession()));
     }), []);
@@ -120,4 +134,4 @@ const useHandleLogout = (params) => {
     return logout;
 };
 
-export { useHandleLogout };
+export { clearFromLocalStorage, useHandleLogout };

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var decodeJwt = require('../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -22,7 +21,7 @@ require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var getWalletVerifiedCredential = require('../../../../utils/functions/getWalletVerifiedCredential/getWalletVerifiedCredential.cjs');
 
-const useNameService = ({ currentWallet, authToken }) => {
+const useNameService = ({ currentWallet, user }) => {
     const [connectedNameService, setConnectedNameService, removeConnectedNameService,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLET_NAME_SERVICE, null);
     const lastFetchedNameServiceAddress = React.useRef();
     const lastFetchedNameServiceNetwork = React.useRef();
@@ -60,16 +59,16 @@ const useNameService = ({ currentWallet, authToken }) => {
         return undefined;
     }), [setConnectedNameService]);
     const getNameService = (address) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!currentWallet) {
             return;
         }
         const network = yield currentWallet.connector.getNetwork();
-        const verifiedCredentials = (_a = decodeJwt.decodeJwt(authToken)) === null || _a === void 0 ? void 0 : _a.verifiedCredentials;
+        const verifiedCredentials = user === null || user === void 0 ? void 0 : user.verifiedCredentials;
         //if there are verified credentials, check if there is a name service for the current wallet
         if (verifiedCredentials) {
             const verifiedCredential = getWalletVerifiedCredential.getWalletVerifiedCredential(currentWallet === null || currentWallet === void 0 ? void 0 : currentWallet.address, verifiedCredentials, currentWallet.chain);
-            if (verifiedCredential && ((_b = verifiedCredential.nameService) === null || _b === void 0 ? void 0 : _b.name)) {
+            if (verifiedCredential && ((_a = verifiedCredential.nameService) === null || _a === void 0 ? void 0 : _a.name)) {
                 return verifiedCredential.nameService;
             }
         }

package/src/lib/context/DynamicContext/hooks/useNameService/useNameService.d.ts

@@ -1,10 +1,11 @@
 import { NameServiceData } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../../shared';
+import { UserProfile } from '../../../../..';
 type Props = {
-    authToken: string | undefined;
+    user: UserProfile | undefined;
     currentWallet: Wallet | null;
 };
-export declare const useNameService: ({ currentWallet, authToken }: Props) => {
+export declare const useNameService: ({ currentWallet, user }: Props) => {
     getNameService: (address?: string) => Promise<NameServiceData | undefined>;
     removeConnectedNameService: () => void;
 };