@dynamic-labs/sdk-react-core 1.1.0-alpha.1 → 1.1.0-alpha.10

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

@@ -0,0 +1,16 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { getEmailProvider } from '../../../data/api.js';
+import { allSupportedProviders } from '../constants.js';
+
+const findEmailProvider = (environmentId, email) => __awaiter(void 0, void 0, void 0, function* () {
+    const { emailProvider } = yield getEmailProvider({
+        email,
+        environmentId,
+    });
+    if (!allSupportedProviders.includes(emailProvider)) {
+        throw new Error('Email provider is not supported');
+    }
+    return emailProvider;
+});
+
+export { findEmailProvider };

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

@@ -34,7 +34,6 @@ var AccountExistsContext = require('../AccountExistsContext/AccountExistsContext
 var api = require('../../data/api.cjs');
 var EmailVerificationContext = require('../EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
-var isSameWalletName = require('../../utils/functions/isSameWalletName/isSameWalletName.cjs');
 var useFetchNonce = require('../../utils/hooks/useFetchNonce/useFetchNonce.cjs');
 var useFetchProjectSettings = require('../../utils/hooks/useFetchProjectSettings/useFetchProjectSettings.cjs');
 var ThemeContext = require('../ThemeContext/ThemeContext.cjs');
@@ -72,10 +71,10 @@ var useMultiWalletWidgetState = require('../../utils/hooks/multiWallet/useMultiW
 var useMultiWallet = require('../../utils/hooks/multiWallet/useMultiWallet/useMultiWallet.cjs');
 var useClearWalletConnectSessions = require('../../utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.cjs');
 var useConnectWallet = require('../../utils/hooks/useConnectWallet/useConnectWallet.cjs');
-var useFetchNetworkConfigurations = require('../../utils/hooks/useFetchNetworkConfigurations/useFetchNetworkConfigurations.cjs');
 var useFetchWalletsForChainsMap = require('../../utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.cjs');
 var useHandleUnlinkWallet = require('../../utils/hooks/useHandleUnlinkWallet/useHandleUnlinkWallet.cjs');
 var usePrimaryWalletId = require('../../utils/hooks/usePrimaryWalletId/usePrimaryWalletId.cjs');
+var useProcessNetworkConfigurations = require('../../utils/hooks/useProcessNetworkConfigurations/useProcessNetworkConfigurations.cjs');
 var useRpcProviders = require('../../utils/hooks/useRpcProviders/useRpcProviders.cjs');
 var useWalletEventListeners = require('../../utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs');
 var DynamicBridgeWidgetContext = require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
@@ -87,13 +86,15 @@ require('../SocialRedirectContext/SocialRedirectContext.cjs');
 var QrCodeContext = require('../QrCodeContext/QrCodeContext.cjs');
 var WalletGroupContext = require('../WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('qrcode');
 var LoadingContext = require('../LoadingContext/LoadingContext.cjs');
+require('qrcode');
 require('@dynamic-labs/viem-utils');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../views/WalletList/WalletList.cjs');
 require('../../views/viewToComponentMap.cjs');
 var FundingWidget = require('../../widgets/FundingWidget/FundingWidget.cjs');
+var ConnectWithEmailOtpProvider = require('../ConnectWithEmailOtpContext/ConnectWithEmailOtpProvider.cjs');
+require('../ConnectWithEmailOtpContext/connectWithEmailOtpContext.cjs');
 var FundingContext = require('../FundingContext/FundingContext.cjs');
 var SendBalanceContext = require('../SendBalanceContext/SendBalanceContext.cjs');
 var UseNetworkValidation = require('../UseNetworkValidation/UseNetworkValidation.cjs');
@@ -105,10 +106,11 @@ var useDisplayOrderState = require('./hooks/useDisplayOrderState/useDisplayOrder
 var useEmailLoginState = require('./hooks/useEmailLoginState/useEmailLoginState.cjs');
 var useNameService = require('./hooks/useNameService/useNameService.cjs');
 var useSelectedWalletConnector = require('./hooks/useSelectedWalletConnector/useSelectedWalletConnector.cjs');
-var useSetShowAuthFlowWithInit = require('./hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.cjs');
+var useShowAuthFlow = require('./hooks/useShowAuthFlow/useShowAuthFlow.cjs');
 var useShowPasskeyCreateSuccess = require('./hooks/useShowPasskeyCreateSuccess/useShowPasskeyCreateSuccess.cjs');
 var useTieCallbacksToEvents = require('./hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.cjs');
 var useVerificationInProgress = require('./hooks/useVerificationInProgress/useVerificationInProgress.cjs');
+var useSetShowLinkNewWalletModal = require('./hooks/useSetShowLinkNewWalletModal/useSetShowLinkNewWalletModal.cjs');
 var useCustomerCallbacks = require('./useCustomerCallbacks/useCustomerCallbacks.cjs');
 var useCustomerAuthFlowCallbacks = require('./useCustomerCallbacks/useCustomerAuthFlowCallbacks.cjs');
 var validators = require('./validators.cjs');
@@ -118,7 +120,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale$1, }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableForcedNetworkValidation: enableForcedNetworkValidationProp = false, deepLinkPreference = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = true, walletConnectPreferredChains, walletConnectorExtensions, } = settings;
     let enableForcedNetworkValidation = enableForcedNetworkValidationProp;
     if (bridgeChains) {
@@ -127,7 +129,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     // Ties all client callbacks to dynamic's events, such that
     // when our events are triggered, so are the client callbacks
     useTieCallbacksToEvents.useTieCallbacksToEvents(eventsCallbacks);
-    let { walletConnectV1Bridge, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    let { appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    const { walletConnectV1Bridge } = settings;
     if (!environmentId) {
         throw new utils.MissingEnvironmentIdError();
     }
@@ -142,7 +145,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     const isAuthenticated = Boolean(getAuthToken.getAuthToken());
     const isBridgeFlow = Boolean(bridgeChains);
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = React.useState(undefined);
-    const [showAuthFlow, setShowAuthFlow] = React.useState(false);
     // state to track the full connectivity status of the individual's wallets.
     // Set to true once the predetermined number of wallets is connected.
     const [isFullyConnected, setIsFullyConnected, removeIsFullyConnected] = useLocalStorage.useLocalStorage(localStorage$1.IS_FULLY_CONNECTED, false);
@@ -162,15 +164,11 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         dynamicContextProps: { settings },
         environmentId,
     });
-    const { multiWallet, setMultiWallet } = useMultiWallet.useMultiWallet(toolkitEnabled || false, (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet);
-    // for demo proposes when running single wallet
-    // it should not use bridge even having walletConnectV1Bridge set on settings
-    // but v2 if enabled
-    if (toolkitEnabled &&
-        ((_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.walletConnect) === null || _d === void 0 ? void 0 : _d.v2Enabled) &&
-        !multiWallet) {
-        walletConnectV1Bridge = undefined;
-    }
+    const { multiWallet, setMultiWallet } = useMultiWallet.useMultiWallet({
+        isBridgeFlow,
+        multiWalletSettings: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet,
+        toolkitEnabled: toolkitEnabled || false,
+    });
     // ensures that when user comes back to site and primary wallet is out of sync, we don't show widget popup
     const [showWidgetStatePopup, setShowWidgetStatePopup] = React.useState(!multiWallet);
     // Used inside useVerifyOnAwaitingSignature. Is legacy and should be removed asap
@@ -178,10 +176,11 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     // Set to true when a customer starts any auth verification process and set to false when it ends
     const [isVerificationInProgress, setIsVerificationInProgress] = useVerificationInProgress.useVerificationInProgress();
     const walletBook$1 = walletBook.useWalletBookCdn();
-    const { configurations: serverNetworkConfigurations, handleRemoveLsNetworks, } = useFetchNetworkConfigurations.useFetchNetworkConfigurations({
+    const { configurations: serverNetworkConfigurations, handleRemoveLsNetworks, } = useProcessNetworkConfigurations.useProcessNetworkConfigurations({
         authToken: getAuthToken.getAuthToken(),
         environmentId,
         evmNetworks,
+        projectSettings,
     });
     const { imageUserInAccessList, imageUserNotInAccessList, displayName, appLogo, } = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general) || {};
     appLogoUrl = appLogo || appLogoUrl;
@@ -209,6 +208,14 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     });
     const [authMode, setAuthMode] = useLocalStorage.useLocalStorage(localStorage$1.AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId.usePrimaryWalletId();
+    const isUserAuthenticated = Boolean(authMode === 'connect-and-sign' ? user : isFullyConnected);
+    const isRenderingEmbeddedAuthFlow = React.useRef(false);
+    const [showAuthFlow, setShowAuthFlow] = useShowAuthFlow.useShowAuthFlow({
+        isAuthenticated: isUserAuthenticated,
+        isMultiWalletEnabled: multiWallet,
+        isRenderingEmbeddedAuthFlow,
+        walletConnectorOptions,
+    });
     const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, getConnectedWalletById, connectedWallets, disconnectWallet, refreshConnectedWallet, } = useConnectWallet.useConnectWallet({
         authMode,
         clearPrimaryWalletId,
@@ -240,12 +247,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         removeUser();
     }, [removeUser]);
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_e = getAuthToken.getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
+    const authToken = (_c = getAuthToken.getAuthToken()) !== null && _c !== void 0 ? _c : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors.useWalletConnectors({
         authMode,
         authToken: getAuthToken.getAuthToken() || onboardingOnlyJwt,
-        canHaveMultipleWalletsConnected: multiWallet || isBridgeFlow,
+        canHaveMultipleWalletsConnected: multiWallet,
         connectedWallets,
         multiWalletWidgetState,
         onboardingOnlyJwt,
@@ -267,13 +274,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         user,
         walletBook: walletBook$1,
     });
-    const isRenderingEmbeddedAuthFlow = React.useRef(false);
-    const setShowAuthFlowWithInit = useSetShowAuthFlowWithInit.useSetShowAuthFlowWithInit({
+    const setShowLinkNewWalletModal = useSetShowLinkNewWalletModal.useSetShowLinkNewWalletModal({
+        isAuthenticated: isUserAuthenticated,
         isMultiWalletEnabled: multiWallet,
-        isRenderingEmbeddedAuthFlow,
         setShowAuthFlow,
-        user,
-        walletConnectorOptions,
     });
     const { getNameService, removeConnectedNameService } = useNameService.useNameService({
         authToken,
@@ -286,7 +290,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _j, _k;
+        var _g, _h;
         setSdkHasLoaded(false);
         clearAllWalletConnectSessions();
         setBridgeChainsToConnect(bridgeChains);
@@ -312,7 +316,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setIsVerificationInProgress(false);
         setLegacyIsVerifying(false);
         setAuthMode(initialAuthenticationMode);
-        setShowAuthFlow(false);
+        setShowAuthFlow(false, {
+            emitCancelAuth: false,
+            ignoreIfIsEmbeddedWidget: false,
+            initializeWalletConnect: false,
+            performMultiWalletChecks: false,
+        });
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
         removeLsSettings();
@@ -323,12 +332,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         clearPrimaryWalletId();
         removeConnectedNameService();
         for (const connectedWallet of connectedWallets) {
-            (_j = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _j === void 0 ? void 0 : _j.call(eventsCallbacks, {
+            (_g = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _g === void 0 ? void 0 : _g.call(eventsCallbacks, {
                 wallet: connectedWallet,
                 walletConnector: connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector,
             });
         }
-        (_k = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _k === void 0 ? void 0 : _k.call(eventsCallbacks, user);
+        (_h = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _h === void 0 ? void 0 : _h.call(eventsCallbacks, user);
         dynamicEvents.dynamicEvents.emit('logout');
     }), [
         setSdkHasLoaded,
@@ -340,6 +349,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setIsVerificationInProgress,
         setAuthMode,
         initialAuthenticationMode,
+        setShowAuthFlow,
         setMultiWalletWidgetState,
         removeAuthTokenAndUser,
         removeLsSettings,
@@ -357,7 +367,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     let wcVersion;
     if (projectSettings) {
         wcVersion =
-            ((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.walletConnect) === null || _g === void 0 ? void 0 : _g.v2Enabled) && !walletConnectV1Bridge
+            ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.walletConnect) === null || _e === void 0 ? void 0 : _e.v2Enabled) && !walletConnectV1Bridge
                 ? 2
                 : 1;
     }
@@ -445,7 +455,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         }
         if (selectedWalletConnector &&
             (!primaryWallet ||
-                !isSameWalletName.isSameWalletName(primaryWallet.connector.name, selectedWalletConnector.name))) {
+                primaryWallet.connector.key !== selectedWalletConnector.key)) {
             yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.endSession());
         }
     }), [
@@ -496,7 +506,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             handleLogOut,
             handleUnlinkWallet: authMode === 'connect-only' ? disconnectWallet : handleUnlinkWallet,
             i18nSDKInstance,
-            internalSetShowAuthFlow: setShowAuthFlow,
             isAuthenticated,
             isBridgeFlow,
             isFullyConnected,
@@ -552,9 +561,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setSdkHasLoaded,
             setSelectedWalletConnectorKey,
             setSelectedWalletWithAction,
-            setShowAuthFlow: setShowAuthFlowWithInit,
+            setShowAuthFlow,
             setShowBridgeWidget,
             setShowDynamicUserProfile,
+            setShowLinkNewWalletModal,
             setShowPasskeyCreatedSuccess,
             setShowQrcodeModal,
             setShowWidgetStatePopup,
@@ -660,7 +670,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setPrimaryWalletId,
         setSdkHasLoaded,
         setSelectedWalletConnectorKey,
-        setShowAuthFlowWithInit,
+        setShowAuthFlow,
+        setShowLinkNewWalletModal,
         setShowPasskeyCreatedSuccess,
         setShowQrcodeModal,
         setUser,
@@ -721,13 +732,13 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsxRuntime.jsx(reactI18next.I18nextProvider, { i18n: i18nSDKInstance, children: jsxRuntime.jsx(DynamicContext.Provider, { value: value, children: jsxRuntime.jsx(walletBook.WalletBookContextProvider, { walletBook: walletBook$1, children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, { customerTheme: parseTheme.parseTheme(theme, ((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _h === void 0 ? void 0 : _h.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsxs(ViewContext.ViewContextProvider, { initialView: helpers.getInitialView({
+    return (jsxRuntime.jsx(reactI18next.I18nextProvider, { i18n: i18nSDKInstance, children: jsxRuntime.jsx(DynamicContext.Provider, { value: value, children: jsxRuntime.jsx(walletBook.WalletBookContextProvider, { walletBook: walletBook$1, children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, { customerTheme: parseTheme.parseTheme(theme, ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _f === void 0 ? void 0 : _f.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsxs(ViewContext.ViewContextProvider, { initialView: helpers.getInitialView({
                                     connectedWallets,
                                     isAuthenticated,
                                     isBridgeFlow,
                                     isFullyConnected,
                                     isMultiWalletEnabled: multiWallet,
-                                }), children: [enableForcedNetworkValidation && jsxRuntime.jsx(UseNetworkValidation.UseNetworkValidation, {}), jsxRuntime.jsx(CaptchaContext.CaptchaContextProvider, { children: jsxRuntime.jsx(AccountExistsContext.AccountExistsContextProvider, { children: jsxRuntime.jsx(WalletContext.WalletContextProvider, { canSync: didConnectedStateLoad, children: jsxRuntime.jsx(QrCodeContext.QrCodeContextProvider, { children: jsxRuntime.jsx(EmailVerificationContext.EmailVerificationContextProvider, { children: jsxRuntime.jsx(DynamicWidgetContext.DynamicWidgetContextProvider, { children: jsxRuntime.jsx(DynamicBridgeWidgetContext.DynamicBridgeWidgetContextProvider, { children: jsxRuntime.jsx(FundingContext.FundingContextProvider, { children: jsxRuntime.jsx(AccessDeniedContext.AccessDeniedContextProvider, { children: jsxRuntime.jsx(SendBalanceContext.SendBalanceContextProvider, { children: jsxRuntime.jsx(WalletGroupContext.WalletGroupContextProvider, { children: jsxRuntime.jsxs(UserFieldEditorContext.UserFieldEditorContextProvider, { children: [jsxRuntime.jsx(app.DynamicAuthFlow, {}), jsxRuntime.jsx(Toolkit.Toolkit, {}), jsxRuntime.jsx(FundingWidget.FundingWidget, {}), jsxRuntime.jsx(SyncPasskeyFlow.SyncPasskeyFlow, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }) }));
+                                }), children: [enableForcedNetworkValidation && jsxRuntime.jsx(UseNetworkValidation.UseNetworkValidation, {}), jsxRuntime.jsx(CaptchaContext.CaptchaContextProvider, { children: jsxRuntime.jsx(AccountExistsContext.AccountExistsContextProvider, { children: jsxRuntime.jsx(WalletContext.WalletContextProvider, { canSync: didConnectedStateLoad, children: jsxRuntime.jsx(QrCodeContext.QrCodeContextProvider, { children: jsxRuntime.jsx(EmailVerificationContext.EmailVerificationContextProvider, { children: jsxRuntime.jsx(DynamicWidgetContext.DynamicWidgetContextProvider, { children: jsxRuntime.jsx(DynamicBridgeWidgetContext.DynamicBridgeWidgetContextProvider, { children: jsxRuntime.jsx(FundingContext.FundingContextProvider, { children: jsxRuntime.jsx(AccessDeniedContext.AccessDeniedContextProvider, { children: jsxRuntime.jsx(SendBalanceContext.SendBalanceContextProvider, { children: jsxRuntime.jsx(WalletGroupContext.WalletGroupContextProvider, { children: jsxRuntime.jsx(UserFieldEditorContext.UserFieldEditorContextProvider, { children: jsxRuntime.jsxs(ConnectWithEmailOtpProvider.ConnectWithEmailOtpProvider, { children: [jsxRuntime.jsx(app.DynamicAuthFlow, {}), jsxRuntime.jsx(Toolkit.Toolkit, {}), jsxRuntime.jsx(FundingWidget.FundingWidget, {}), jsxRuntime.jsx(SyncPasskeyFlow.SyncPasskeyFlow, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }) }));
 };
 /** The context provider you need to have access too all of Dynamic's hooks */
 const DynamicContextProvider = (props) => (jsxRuntime.jsx(UserWalletsContext.UserWalletsProvider, { children: jsxRuntime.jsx(InnerDynamicContextProvider, Object.assign({}, props)) }));

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

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { createContext, useState, useEffect, useCallback, useRef, useMemo } from 'react';
+import { createContext, useState, useRef, useEffect, useCallback, useMemo } from 'react';
 import { I18nextProvider } from 'react-i18next';
 import { ICONIC_SPRITE_URL } from '@dynamic-labs/iconic';
 import { MissingEnvironmentIdError } from '@dynamic-labs/utils';
@@ -30,7 +30,6 @@ import { AccountExistsContextProvider } from '../AccountExistsContext/AccountExi
 import { revokeSession, sendDynamicProps } from '../../data/api.js';
 import { EmailVerificationContextProvider } from '../EmailVerificationContext/EmailVerificationContext.js';
 import 'react-dom';
-import { isSameWalletName } from '../../utils/functions/isSameWalletName/isSameWalletName.js';
 import { useFetchNonce } from '../../utils/hooks/useFetchNonce/useFetchNonce.js';
 import { useFetchProjectSettings } from '../../utils/hooks/useFetchProjectSettings/useFetchProjectSettings.js';
 import { ThemeContextProvider } from '../ThemeContext/ThemeContext.js';
@@ -68,10 +67,10 @@ import { useMultiWalletWidgetState } from '../../utils/hooks/multiWallet/useMult
 import { useMultiWallet } from '../../utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js';
 import { useClearWalletConnectSessions } from '../../utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.js';
 import { useConnectWallet } from '../../utils/hooks/useConnectWallet/useConnectWallet.js';
-import { useFetchNetworkConfigurations } from '../../utils/hooks/useFetchNetworkConfigurations/useFetchNetworkConfigurations.js';
 import { useFetchWalletsForChainsMap } from '../../utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.js';
 import { useHandleUnlinkWallet } from '../../utils/hooks/useHandleUnlinkWallet/useHandleUnlinkWallet.js';
 import { usePrimaryWalletId } from '../../utils/hooks/usePrimaryWalletId/usePrimaryWalletId.js';
+import { useProcessNetworkConfigurations } from '../../utils/hooks/useProcessNetworkConfigurations/useProcessNetworkConfigurations.js';
 import { useRpcProviders } from '../../utils/hooks/useRpcProviders/useRpcProviders.js';
 import { useWalletEventListeners } from '../../utils/hooks/useWalletEventListeners/useWalletEventListeners.js';
 import { DynamicBridgeWidgetContextProvider } from '../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
@@ -83,13 +82,15 @@ import '../SocialRedirectContext/SocialRedirectContext.js';
 import { QrCodeContextProvider } from '../QrCodeContext/QrCodeContext.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import 'qrcode';
 import { LoadingContextProvider } from '../LoadingContext/LoadingContext.js';
+import 'qrcode';
 import '@dynamic-labs/viem-utils';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../views/WalletList/WalletList.js';
 import '../../views/viewToComponentMap.js';
 import { FundingWidget } from '../../widgets/FundingWidget/FundingWidget.js';
+import { ConnectWithEmailOtpProvider } from '../ConnectWithEmailOtpContext/ConnectWithEmailOtpProvider.js';
+import '../ConnectWithEmailOtpContext/connectWithEmailOtpContext.js';
 import { FundingContextProvider } from '../FundingContext/FundingContext.js';
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
 import { UseNetworkValidation } from '../UseNetworkValidation/UseNetworkValidation.js';
@@ -101,10 +102,11 @@ import { useDisplayOrderState } from './hooks/useDisplayOrderState/useDisplayOrd
 import { useEmailLoginState } from './hooks/useEmailLoginState/useEmailLoginState.js';
 import { useNameService } from './hooks/useNameService/useNameService.js';
 import { useSelectedWalletConnector } from './hooks/useSelectedWalletConnector/useSelectedWalletConnector.js';
-import { useSetShowAuthFlowWithInit } from './hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.js';
+import { useShowAuthFlow } from './hooks/useShowAuthFlow/useShowAuthFlow.js';
 import { useShowPasskeyCreateSuccess } from './hooks/useShowPasskeyCreateSuccess/useShowPasskeyCreateSuccess.js';
 import { useTieCallbacksToEvents } from './hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.js';
 import { useVerificationInProgress } from './hooks/useVerificationInProgress/useVerificationInProgress.js';
+import { useSetShowLinkNewWalletModal } from './hooks/useSetShowLinkNewWalletModal/useSetShowLinkNewWalletModal.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
 import { useCustomerAuthFlowCallbacks } from './useCustomerCallbacks/useCustomerAuthFlowCallbacks.js';
 import { validateAuthUser } from './validators.js';
@@ -114,7 +116,7 @@ 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, _h;
+    var _a, _b, _c, _d, _e, _f;
     const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableForcedNetworkValidation: enableForcedNetworkValidationProp = false, deepLinkPreference = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = true, walletConnectPreferredChains, walletConnectorExtensions, } = settings;
     let enableForcedNetworkValidation = enableForcedNetworkValidationProp;
     if (bridgeChains) {
@@ -123,7 +125,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     // Ties all client callbacks to dynamic's events, such that
     // when our events are triggered, so are the client callbacks
     useTieCallbacksToEvents(eventsCallbacks);
-    let { walletConnectV1Bridge, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    let { appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    const { walletConnectV1Bridge } = settings;
     if (!environmentId) {
         throw new MissingEnvironmentIdError();
     }
@@ -138,7 +141,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     const isAuthenticated = Boolean(getAuthToken());
     const isBridgeFlow = Boolean(bridgeChains);
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = useState(undefined);
-    const [showAuthFlow, setShowAuthFlow] = useState(false);
     // state to track the full connectivity status of the individual's wallets.
     // Set to true once the predetermined number of wallets is connected.
     const [isFullyConnected, setIsFullyConnected, removeIsFullyConnected] = useLocalStorage(IS_FULLY_CONNECTED, false);
@@ -158,15 +160,11 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         dynamicContextProps: { settings },
         environmentId,
     });
-    const { multiWallet, setMultiWallet } = useMultiWallet(toolkitEnabled || false, (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet);
-    // for demo proposes when running single wallet
-    // it should not use bridge even having walletConnectV1Bridge set on settings
-    // but v2 if enabled
-    if (toolkitEnabled &&
-        ((_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.walletConnect) === null || _d === void 0 ? void 0 : _d.v2Enabled) &&
-        !multiWallet) {
-        walletConnectV1Bridge = undefined;
-    }
+    const { multiWallet, setMultiWallet } = useMultiWallet({
+        isBridgeFlow,
+        multiWalletSettings: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet,
+        toolkitEnabled: toolkitEnabled || false,
+    });
     // ensures that when user comes back to site and primary wallet is out of sync, we don't show widget popup
     const [showWidgetStatePopup, setShowWidgetStatePopup] = useState(!multiWallet);
     // Used inside useVerifyOnAwaitingSignature. Is legacy and should be removed asap
@@ -174,10 +172,11 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     // Set to true when a customer starts any auth verification process and set to false when it ends
     const [isVerificationInProgress, setIsVerificationInProgress] = useVerificationInProgress();
     const walletBook = useWalletBookCdn();
-    const { configurations: serverNetworkConfigurations, handleRemoveLsNetworks, } = useFetchNetworkConfigurations({
+    const { configurations: serverNetworkConfigurations, handleRemoveLsNetworks, } = useProcessNetworkConfigurations({
         authToken: getAuthToken(),
         environmentId,
         evmNetworks,
+        projectSettings,
     });
     const { imageUserInAccessList, imageUserNotInAccessList, displayName, appLogo, } = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general) || {};
     appLogoUrl = appLogo || appLogoUrl;
@@ -205,6 +204,14 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     });
     const [authMode, setAuthMode] = useLocalStorage(AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId();
+    const isUserAuthenticated = Boolean(authMode === 'connect-and-sign' ? user : isFullyConnected);
+    const isRenderingEmbeddedAuthFlow = useRef(false);
+    const [showAuthFlow, setShowAuthFlow] = useShowAuthFlow({
+        isAuthenticated: isUserAuthenticated,
+        isMultiWalletEnabled: multiWallet,
+        isRenderingEmbeddedAuthFlow,
+        walletConnectorOptions,
+    });
     const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, getConnectedWalletById, connectedWallets, disconnectWallet, refreshConnectedWallet, } = useConnectWallet({
         authMode,
         clearPrimaryWalletId,
@@ -236,12 +243,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         removeUser();
     }, [removeUser]);
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_e = getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
+    const authToken = (_c = getAuthToken()) !== null && _c !== void 0 ? _c : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors({
         authMode,
         authToken: getAuthToken() || onboardingOnlyJwt,
-        canHaveMultipleWalletsConnected: multiWallet || isBridgeFlow,
+        canHaveMultipleWalletsConnected: multiWallet,
         connectedWallets,
         multiWalletWidgetState,
         onboardingOnlyJwt,
@@ -263,13 +270,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         user,
         walletBook,
     });
-    const isRenderingEmbeddedAuthFlow = useRef(false);
-    const setShowAuthFlowWithInit = useSetShowAuthFlowWithInit({
+    const setShowLinkNewWalletModal = useSetShowLinkNewWalletModal({
+        isAuthenticated: isUserAuthenticated,
         isMultiWalletEnabled: multiWallet,
-        isRenderingEmbeddedAuthFlow,
         setShowAuthFlow,
-        user,
-        walletConnectorOptions,
     });
     const { getNameService, removeConnectedNameService } = useNameService({
         authToken,
@@ -282,7 +286,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _j, _k;
+        var _g, _h;
         setSdkHasLoaded(false);
         clearAllWalletConnectSessions();
         setBridgeChainsToConnect(bridgeChains);
@@ -308,7 +312,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setIsVerificationInProgress(false);
         setLegacyIsVerifying(false);
         setAuthMode(initialAuthenticationMode);
-        setShowAuthFlow(false);
+        setShowAuthFlow(false, {
+            emitCancelAuth: false,
+            ignoreIfIsEmbeddedWidget: false,
+            initializeWalletConnect: false,
+            performMultiWalletChecks: false,
+        });
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
         removeLsSettings();
@@ -319,12 +328,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         clearPrimaryWalletId();
         removeConnectedNameService();
         for (const connectedWallet of connectedWallets) {
-            (_j = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _j === void 0 ? void 0 : _j.call(eventsCallbacks, {
+            (_g = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _g === void 0 ? void 0 : _g.call(eventsCallbacks, {
                 wallet: connectedWallet,
                 walletConnector: connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector,
             });
         }
-        (_k = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _k === void 0 ? void 0 : _k.call(eventsCallbacks, user);
+        (_h = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _h === void 0 ? void 0 : _h.call(eventsCallbacks, user);
         dynamicEvents.emit('logout');
     }), [
         setSdkHasLoaded,
@@ -336,6 +345,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         setIsVerificationInProgress,
         setAuthMode,
         initialAuthenticationMode,
+        setShowAuthFlow,
         setMultiWalletWidgetState,
         removeAuthTokenAndUser,
         removeLsSettings,
@@ -353,7 +363,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     let wcVersion;
     if (projectSettings) {
         wcVersion =
-            ((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.walletConnect) === null || _g === void 0 ? void 0 : _g.v2Enabled) && !walletConnectV1Bridge
+            ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.walletConnect) === null || _e === void 0 ? void 0 : _e.v2Enabled) && !walletConnectV1Bridge
                 ? 2
                 : 1;
     }
@@ -441,7 +451,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         }
         if (selectedWalletConnector &&
             (!primaryWallet ||
-                !isSameWalletName(primaryWallet.connector.name, selectedWalletConnector.name))) {
+                primaryWallet.connector.key !== selectedWalletConnector.key)) {
             yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.endSession());
         }
     }), [
@@ -492,7 +502,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             handleLogOut,
             handleUnlinkWallet: authMode === 'connect-only' ? disconnectWallet : handleUnlinkWallet,
             i18nSDKInstance,
-            internalSetShowAuthFlow: setShowAuthFlow,
             isAuthenticated,
             isBridgeFlow,
             isFullyConnected,
@@ -548,9 +557,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setSdkHasLoaded,
             setSelectedWalletConnectorKey,
             setSelectedWalletWithAction,
-            setShowAuthFlow: setShowAuthFlowWithInit,
+            setShowAuthFlow,
             setShowBridgeWidget,
             setShowDynamicUserProfile,
+            setShowLinkNewWalletModal,
             setShowPasskeyCreatedSuccess,
             setShowQrcodeModal,
             setShowWidgetStatePopup,
@@ -656,7 +666,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         setPrimaryWalletId,
         setSdkHasLoaded,
         setSelectedWalletConnectorKey,
-        setShowAuthFlowWithInit,
+        setShowAuthFlow,
+        setShowLinkNewWalletModal,
         setShowPasskeyCreatedSuccess,
         setShowQrcodeModal,
         setUser,
@@ -717,13 +728,13 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsx(I18nextProvider, { i18n: i18nSDKInstance, children: jsx(DynamicContext.Provider, { value: value, children: jsx(WalletBookContextProvider, { walletBook: walletBook, children: jsx(ThemeContextProvider, { customerTheme: parseTheme(theme, ((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _h === void 0 ? void 0 : _h.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsx(LoadingContextProvider, { children: jsx(ErrorContextProvider, { children: jsxs(ViewContextProvider, { initialView: getInitialView({
+    return (jsx(I18nextProvider, { i18n: i18nSDKInstance, children: jsx(DynamicContext.Provider, { value: value, children: jsx(WalletBookContextProvider, { walletBook: walletBook, children: jsx(ThemeContextProvider, { customerTheme: parseTheme(theme, ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _f === void 0 ? void 0 : _f.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsx(LoadingContextProvider, { children: jsx(ErrorContextProvider, { children: jsxs(ViewContextProvider, { initialView: getInitialView({
                                     connectedWallets,
                                     isAuthenticated,
                                     isBridgeFlow,
                                     isFullyConnected,
                                     isMultiWalletEnabled: multiWallet,
-                                }), children: [enableForcedNetworkValidation && jsx(UseNetworkValidation, {}), jsx(CaptchaContextProvider, { children: jsx(AccountExistsContextProvider, { children: jsx(WalletContextProvider, { canSync: didConnectedStateLoad, children: jsx(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsx(WalletGroupContextProvider, { children: jsxs(UserFieldEditorContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(SyncPasskeyFlow, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }) }));
+                                }), children: [enableForcedNetworkValidation && jsx(UseNetworkValidation, {}), jsx(CaptchaContextProvider, { children: jsx(AccountExistsContextProvider, { children: jsx(WalletContextProvider, { canSync: didConnectedStateLoad, children: jsx(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsx(WalletGroupContextProvider, { children: jsx(UserFieldEditorContextProvider, { children: jsxs(ConnectWithEmailOtpProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(SyncPasskeyFlow, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) }) }) })] }) }) }) }) }) }) }));
 };
 /** The context provider you need to have access too all of Dynamic's hooks */
 const DynamicContextProvider = (props) => (jsx(UserWalletsProvider, { children: jsx(InnerDynamicContextProvider, Object.assign({}, props)) }));

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

@@ -2,7 +2,7 @@ export * from './useDisplayOrderState';
 export * from './useEmailLoginState';
 export * from './useNameService';
 export * from './useSelectedWalletConnector';
-export * from './useSetShowAuthFlowWithInit';
+export * from './useShowAuthFlow';
 export * from './useShowPasskeyCreateSuccess';
 export * from './useTieCallbacksToEvents';
 export * from './useVerificationInProgress';

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

@@ -11,7 +11,6 @@ require('react/jsx-runtime');
 require('../../../ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var isDisplayOrderPriorityForWeb3 = require('../../../../shared/utils/functions/isDisplayOrderPriorityForWeb3/isDisplayOrderPriorityForWeb3.cjs');
-var isDisplayOrderPriorityForWeb2 = require('../../../../shared/utils/functions/isDisplayOrderPriorityForWeb2/isDisplayOrderPriorityForWeb2.cjs');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
@@ -21,28 +20,29 @@ require('../../../../shared/consts/index.cjs');
 const web2DisplayOrder = ['email', 'wallet'];
 const web3DisplayOrder = ['wallet', 'email'];
 const useDisplayOrderState = (projectSettings) => {
-    const [displayOrder, setDisplayOrder] = React.useState(web3DisplayOrder);
-    const setDisplayOrderPriority = React.useCallback((priority) => {
-        if (priority === 'web3') {
-            setDisplayOrder(web3DisplayOrder);
-        }
-        else {
-            setDisplayOrder(web2DisplayOrder);
-        }
-    }, [setDisplayOrder]);
-    React.useEffect(() => {
+    const [selectedDisplayOrder, setSelectedDisplayOrder] = React.useState(null);
+    const defaultDisplayOrder = React.useMemo(() => {
         var _a;
         const displayOrderFromApi = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _a === void 0 ? void 0 : _a.displayOrder;
         if (!displayOrderFromApi)
-            return;
+            return web3DisplayOrder;
         if (isDisplayOrderPriorityForWeb3.isDisplayOrderPriorityForWeb3(displayOrderFromApi)) {
-            setDisplayOrder(web3DisplayOrder);
+            return web3DisplayOrder;
         }
-        else if (isDisplayOrderPriorityForWeb2.isDisplayOrderPriorityForWeb2(displayOrderFromApi)) {
-            setDisplayOrder(web2DisplayOrder);
+        if (web2DisplayOrder) {
+            return web2DisplayOrder;
         }
+        return web3DisplayOrder;
     }, [projectSettings]);
-    return [displayOrder, setDisplayOrderPriority];
+    const setDisplayOrderPriority = React.useCallback((priority) => {
+        if (priority === 'web3') {
+            setSelectedDisplayOrder(web3DisplayOrder);
+        }
+        else {
+            setSelectedDisplayOrder(web2DisplayOrder);
+        }
+    }, [setSelectedDisplayOrder]);
+    return [selectedDisplayOrder || defaultDisplayOrder, setDisplayOrderPriority];
 };
 
 exports.useDisplayOrderState = useDisplayOrderState;