@dynamic-labs/sdk-react-core 0.18.0-RC.7 → 0.18.0-RC.9

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

@@ -10,9 +10,10 @@ import { SocialNetworkIconType } from '../../utils/functions/getSocialNetworkIco
 import { ConnectedWalletConnectorType } from '../../utils/hooks/useConnectWallet/useConnectWallet';
 import { Callback } from './useCustomerCallbacks';
 import { DisplayOrder, SetDisplayOrderPriority } from './hooks';
-type ChainsToConnect = {
+export type ChainsToConnect = {
     chain: Chain;
     numberOfWallets: number;
+    chainId?: number;
 };
 export interface IDynamicContext {
     accessDeniedMessagePrimary?: string;
@@ -21,15 +22,20 @@ export interface IDynamicContext {
     accountSwitchState: AccountSwitchState;
     appLogoUrl?: string;
     appName?: string;
+    isBridgeFlow: boolean;
     authMode: AuthModeType;
     authToken: string | undefined;
     authorizationViewDisplayOrder: DisplayOrder;
     awaitingSignatureState: AwaitingSignatureState;
+    bridgeChainToConnect: Chain | undefined;
+    setBridgeChainToConnect: Dispatch<SetStateAction<Chain | undefined>>;
     clearStatesOnBackClick: () => void;
     computeConnectedStateForWallets: () => Promise<void>;
     connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts) => Promise<string>;
     connectedWallet: Wallet | null;
     connectedWallets: Wallet[];
+    isUserConnected: boolean;
+    setConnectedUser: (value: boolean | ((val: boolean) => boolean)) => void;
     connectedWalletsInfo: ConnectedWalletConnectorType[] | [];
     consumeNonce: () => string | undefined;
     cssOverrides?: string | JSX.Element;
@@ -44,6 +50,7 @@ export interface IDynamicContext {
     displayTermsOfService: boolean;
     environmentId: string;
     eventsCallbacks?: DynamicEventsCallbacks;
+    getConnectedWalletById: (walletId: string) => Wallet | undefined;
     getNameService: (address?: string) => Promise<NameServiceData | undefined>;
     handleLogOut: () => Promise<void>;
     handleUnlinkWallet(walletId: string): Promise<void>;
@@ -88,7 +95,6 @@ export interface IDynamicContext {
     setSelectedWalletConnector: (connector: WalletConnector | null) => void;
     setSelectedWalletWithAction: (walletWithAction: WalletWithAction | null) => void;
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
-    setShowBridgeAuthFlow: Dispatch<SetStateAction<boolean>>;
     setShowDynamicUserProfile: Dispatch<SetStateAction<boolean>>;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     setShowWidgetStatePopup: Dispatch<SetStateAction<boolean>>;
@@ -99,7 +105,6 @@ export interface IDynamicContext {
     setShowBridgeWidget: Dispatch<SetStateAction<boolean>>;
     shadowDOMEnabled: boolean;
     showAuthFlow: boolean;
-    showBridgeAuthFlow: boolean;
     showDynamicUserProfile: boolean;
     /**
      * The boolean value representing the state of displaying the bridge widget
@@ -116,10 +121,12 @@ export interface IDynamicContext {
     theme?: ThemeData | ThemeSetting;
     toolkitEnabled?: boolean;
     user: UserProfile | undefined;
+    unlinkConnectedWallet: (walletId: string) => void;
     walletConnector: WalletConnector | null;
     walletUiUtils: WalletUiUtils;
     wallets: WalletOption[];
     walletsFilter?: (options: WalletOption[]) => WalletOption[];
+    removeConnectedWalletsInfo: () => void;
 }
 export interface DynamicContextProps {
     children: ReactNode;
@@ -165,11 +172,11 @@ export interface DynamicContextProps {
         socialMediaUrl?: string;
         termsOfServiceUrl?: string;
         toolkitEnabled?: boolean;
+        walletConnectV1Bridge?: string;
         walletConnectors?: WalletConnectorsMethod[];
         walletsFilter?: (options: WalletOption[]) => WalletOption[];
     };
     theme?: ThemeData | ThemeSetting;
 }
 export declare const DynamicContext: import("react").Context<IDynamicContext | undefined>;
-export declare const DynamicContextProvider: ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl, appName, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow, flowNetwork, initialAuthenticationMode, debugError, displayTermsOfService, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel, multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled, walletConnectors: walletConnectorsProp, }, children, theme, }: DynamicContextProps) => JSX.Element;
-export {};
+export declare const DynamicContextProvider: ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl, appName, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow, flowNetwork, initialAuthenticationMode, debugError, displayTermsOfService, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel, multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, }, children, theme, }: DynamicContextProps) => JSX.Element;

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

@@ -1,10 +1,10 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { createContext, useState, useCallback, useEffect, useMemo } from 'react';
+import { createContext, useState, useEffect, useCallback, useMemo } from 'react';
 import { useWalletBookCdn, getWalletBookCdnUrl, WalletBookContextProvider } from '@dynamic-labs/wallet-book';
 import { logger as logger$1 } from '@dynamic-labs/wallet-connector-core';
 import { ICONIC_SPRITE_URL } from '@dynamic-labs/iconic';
-import { AUTH_USER, AUTH_TOKEN, AUTH_MODE } from '../../utils/constants/localStorage.js';
+import { AUTH_TOKEN, AUTH_USER, AUTH_MODE, WALLET_PICKER_SEARCH_KEY } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import { DEFAULT_NUMBER_OF_WALLETS_TO_SHOW } from '../../utils/constants/values.js';
 import { decodeJwt } from '../../shared/utils/functions/decodeJwt/decodeJwt.js';
@@ -72,10 +72,11 @@ import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secondary
 import '../../widgets/DynamicBridgeWidget/components/DynamicBridgeWidgetNav/DynamicBridgeWidgetNav.js';
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
 import { usePrimaryWalletId } from '../../utils/hooks/usePrimaryWalletId/usePrimaryWalletId.js';
-import { MultiWalletStepSelectorModal } from '../../modals/MultiWalletStepSelectorModal/MultiWalletStepSelectorModal.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
 import { WalletContextProvider } from '../WalletContext/WalletContext.js';
-import { initExpirationTime } from './helpers.js';
+import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
+import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
+import { initExpirationTime, getInitialView } from './helpers.js';
 import { validateAuthUser } from './validators.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
 import { useCustomerAuthFlowCallbacks } from './useCustomerCallbacks/useCustomerAuthFlowCallbacks.js';
@@ -86,21 +87,18 @@ import { useSetShowAuthFlowWithInit } from './hooks/useSetShowAuthFlowWithInit/u
 
 const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
-const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, }, children, theme, }) => {
-    var _a, _b, _c, _d, _e;
+const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, }, children, theme, }) => {
+    var _a, _b, _c, _d, _e, _f, _g;
     logger.setLogLevel(logLevel);
     logger$1.setLogLevel(logLevel);
     ApiEndpoint.setBaseUrl((_a = process.env.DYNAMIC_API_BASE_URL) !== null && _a !== void 0 ? _a : apiBaseUrl);
     LocalStorage.setSuffix(localStorageSuffix);
     const isAuthenticated = Boolean(getAuthToken());
-    // HOTFIX - NEED TO BE REVISITED
-    // if there's user but not auth_token, remove user
-    if (!isAuthenticated) {
-        LocalStorage.removeFromLS(AUTH_USER);
-    }
+    const isBridgeFlow = Boolean(walletsByChain);
+    const [bridgeChainToConnect, setBridgeChainToConnect] = useState(undefined);
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = useState(undefined);
     const [showAuthFlow, setShowAuthFlow] = useState(false);
-    const [showBridgeAuthFlow, setShowBridgeAuthFlow] = useState(false);
+    const [isUserConnected, setConnectedUser, removeConnectedUser] = useLocalStorage('connected_user', false);
     const [walletsToConnectByChain, setWalletsToConnectByChain] = useState(walletsByChain);
     // Allows clients to control widget flow without need to click on AccountControl
     const [showDynamicUserProfile, setShowDynamicUserProfile] = useState(false);
@@ -140,12 +138,25 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         networkConfigurations: serverNetworkConfigurations,
         projectSettings,
         walletBook,
+        walletConnectV1Bridge,
         walletConnectorsProp,
         walletUiUtils,
     });
     const [authMode, setAuthMode] = useLocalStorage(AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId();
-    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, setConnectedWallet, setConnectedWallets, connectedWallets, connectWalletByAddressAndChain, } = useConnectWallet(wallets, authMode, environmentId, enableVisitTrackingOnConnectOnly, primaryWalletId, setPrimaryWalletId);
+    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, connectWalletByAddressAndChain, unlinkConnectedWallet, } = useConnectWallet({
+        authMode,
+        clearPrimaryWalletId,
+        enableVisitTrackingOnConnectOnly,
+        environmentId,
+        primaryWalletId,
+        setPrimaryWalletId,
+        wallets,
+    });
+    useEffect(() => {
+        const missingChains = getMissingChains(walletsByChain, connectedWalletsInfo);
+        setWalletsToConnectByChain(missingChains);
+    }, [connectedWalletsInfo, walletsByChain]);
     const [selectedWalletConnector, setSelectedWalletConnector] = useState(null);
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = useState(null);
@@ -178,8 +189,10 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         setShowAuthFlow,
         wallets,
     });
+    // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
+    const authToken = (_d = getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
     const { getNameService, removeConnectedNameService } = useNameService({
-        authToken: (_d = getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt,
+        authToken,
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallet,
     });
     const { clearAllWalletConnectSessions, clearOphanedWalletConnectSessions } = useClearWalletConnectSessions({
@@ -189,10 +202,11 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g;
+        var _h, _j;
         clearAllWalletConnectSessions();
         setWalletsToConnectByChain(walletsByChain);
         setShowBridgeWidget(false);
+        LocalStorage.removeFromLS(WALLET_PICKER_SEARCH_KEY);
         const jwt = getAuthToken();
         if (jwt && user) {
             // do not await this async call - just fire and forget
@@ -201,36 +215,51 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         for (const connector of walletConnectors) {
             yield connector.endSession();
         }
-        (_f = connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector) === null || _f === void 0 ? void 0 : _f.endSession();
+        (_h = connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector) === null || _h === void 0 ? void 0 : _h.endSession();
         setAuthMode(initialAuthenticationMode);
         setShowAuthFlow(false);
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
-        setConnectedWallet(null);
         handleRemoveLsNetworks();
         setOnboardingOnlyJwt(undefined);
         removeConnectedWalletsInfo();
-        setConnectedWallets([]);
+        removeConnectedUser();
         clearPrimaryWalletId();
         removeConnectedNameService();
-        (_g = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _g === void 0 ? void 0 : _g.call(eventsCallbacks, user);
+        (_j = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _j === void 0 ? void 0 : _j.call(eventsCallbacks, user);
     }), [
         clearAllWalletConnectSessions,
+        walletsByChain,
         user,
         connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector,
+        setAuthMode,
+        initialAuthenticationMode,
         setMultiWalletWidgetState,
         removeAuthTokenAndUser,
-        walletsByChain,
-        setConnectedWallet,
         handleRemoveLsNetworks,
         removeConnectedWalletsInfo,
-        setConnectedWallets,
+        removeConnectedUser,
         clearPrimaryWalletId,
         removeConnectedNameService,
         eventsCallbacks,
         environmentId,
         walletConnectors,
     ]);
+    let wcVersion;
+    if (projectSettings) {
+        wcVersion =
+            ((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.walletConnect) === null || _f === void 0 ? void 0 : _f.v2Enabled) && !walletConnectV1Bridge
+                ? 2
+                : 1;
+    }
+    useValidateSession({
+        authToken,
+        handleLogOut,
+        user,
+        walletConnectV1Bridge,
+        walletConnectors,
+        wcVersion,
+    });
     const handleUnlinkWallet = useHandleUnlinkWallet({
         environmentId,
         primaryWalletId,
@@ -257,7 +286,6 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
     const { walletsForChainsMap } = useFetchWalletsForChainsMap(newToWeb3WalletChainMap);
     const rpcProviders = useRpcProviders({
         networkConfigurations: serverNetworkConfigurations,
-        networkId: network,
     });
     useEffect(() => {
         initExpirationTime(handleLogOut);
@@ -284,13 +312,14 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         }
         setMultiWalletWidgetState('idle');
         if (authMode !== 'connect-only') {
-            setConnectedWallet(null);
             removeConnectedWalletsInfo();
-            setConnectedWallets([]);
         }
         if (!LocalStorage.getFromLS(AUTH_USER)) {
             LocalStorage.removeFromLS(AUTH_TOKEN);
         }
+        if (LocalStorage.getFromLS(WALLET_PICKER_SEARCH_KEY)) {
+            LocalStorage.removeFromLS(WALLET_PICKER_SEARCH_KEY);
+        }
         if (selectedWalletConnector &&
             (!primaryWallet ||
                 !isSameWalletName(primaryWallet.connector.name, selectedWalletConnector.name))) {
@@ -303,9 +332,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         selectedWalletConnector,
         primaryWallet,
         clearAllWalletConnectSessions,
-        setConnectedWallet,
         removeConnectedWalletsInfo,
-        setConnectedWallets,
     ]);
     const value = useMemo(() => {
         var _a, _b;
@@ -320,6 +347,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             authToken: getAuthToken(),
             authorizationViewDisplayOrder,
             awaitingSignatureState,
+            bridgeChainToConnect,
             clearStatesOnBackClick,
             computeConnectedStateForWallets,
             connectWallet,
@@ -338,12 +366,15 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             displayTermsOfService,
             environmentId,
             eventsCallbacks,
+            getConnectedWalletById,
             getNameService,
             handleLogOut,
             handleUnlinkWallet,
             isAuthenticated,
+            isBridgeFlow,
             isProjectSettingsLoading,
             isSingleWalletAccount,
+            isUserConnected,
             isVerifying,
             loadingNetwork,
             loginWithEmail,
@@ -361,6 +392,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             privacyPolicyUrl,
             projectSettings,
             qrcodeUri,
+            removeConnectedWalletsInfo,
             rpcProviders,
             sdkHasLoaded,
             secondaryWallets,
@@ -368,7 +400,9 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             selectedWalletWithAction,
             setAuthMode,
             setAuthorizationViewDisplayOrder,
+            setBridgeChainToConnect,
             setCallback,
+            setConnectedUser,
             setDesktopUri,
             setIsSingleWalletAccount,
             setIsVerifying,
@@ -383,7 +417,6 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setSelectedWalletConnector,
             setSelectedWalletWithAction,
             setShowAuthFlow: setShowAuthFlowWithInit,
-            setShowBridgeAuthFlow,
             setShowBridgeWidget,
             setShowDynamicUserProfile,
             setShowQrcodeModal,
@@ -392,7 +425,6 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setWalletsToConnectByChain,
             shadowDOMEnabled,
             showAuthFlow,
-            showBridgeAuthFlow,
             showBridgeWidget,
             showDynamicUserProfile,
             showQrcodeModal,
@@ -405,6 +437,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             termsOfServiceUrl,
             theme,
             toolkitEnabled,
+            unlinkConnectedWallet,
             user,
             walletConnector: (_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) !== null && _b !== void 0 ? _b : null,
             walletUiUtils,
@@ -423,6 +456,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         authMode,
         authorizationViewDisplayOrder,
         awaitingSignatureState,
+        bridgeChainToConnect,
         clearStatesOnBackClick,
         computeConnectedStateForWallets,
         connectWallet,
@@ -439,12 +473,15 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         displayTermsOfService,
         environmentId,
         eventsCallbacks,
+        getConnectedWalletById,
         getNameService,
         handleLogOut,
         handleUnlinkWallet,
         isAuthenticated,
+        isBridgeFlow,
         isProjectSettingsLoading,
         isSingleWalletAccount,
+        isUserConnected,
         isVerifying,
         loadingNetwork,
         loginWithEmail,
@@ -462,6 +499,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         privacyPolicyUrl,
         projectSettings,
         qrcodeUri,
+        removeConnectedWalletsInfo,
         rpcProviders,
         sdkHasLoaded,
         selectedWalletConnector,
@@ -469,6 +507,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         setAuthMode,
         setAuthorizationViewDisplayOrder,
         setCallback,
+        setConnectedUser,
         setLogInWithEmail,
         setMultiWalletWidgetState,
         setNetwork,
@@ -476,12 +515,10 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         setPrimaryWalletId,
         setSdkHasLoaded,
         setShowAuthFlowWithInit,
-        setShowBridgeAuthFlow,
         setShowQrcodeModal,
         setUser,
         shadowDOMEnabled,
         showAuthFlow,
-        showBridgeAuthFlow,
         showBridgeWidget,
         showDynamicUserProfile,
         showQrcodeModal,
@@ -494,6 +531,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         termsOfServiceUrl,
         theme,
         toolkitEnabled,
+        unlinkConnectedWallet,
         user,
         walletUiUtils,
         wallets,
@@ -543,7 +581,11 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsx(WalletBookContextProvider, Object.assign({ walletBook: walletBook }, { children: jsx(ThemeContextProvider, Object.assign({ customerTheme: parseTheme(theme, ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _e === void 0 ? void 0 : _e.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design }, { children: jsx(LoadingContextProvider, { children: jsx(ViewContextProvider, Object.assign({ initialView: loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list' }, { children: jsx(WalletContextProvider, Object.assign({ canSync: didConnectedStateLoad }, { children: jsx(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(ErrorContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(CaptchaContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsxs(WalletGroupContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), jsx(MultiWalletStepSelectorModal, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) })) })) }) })) })) })));
+    return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsx(WalletBookContextProvider, Object.assign({ walletBook: walletBook }, { children: jsx(ThemeContextProvider, Object.assign({ 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: jsx(ViewContextProvider, Object.assign({ initialView: getInitialView({
+                            isBridgeFlow,
+                            isUserConnected,
+                            loginWithEmail,
+                        }) }, { children: jsx(WalletContextProvider, Object.assign({ canSync: didConnectedStateLoad }, { children: jsx(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(ErrorContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(CaptchaContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsx(SendBalanceContextProvider, { children: jsxs(WalletGroupContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) }) })) })) }) })) })) })));
 };
 
 export { DynamicContext, DynamicContextProvider };

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

@@ -52,7 +52,20 @@ const initExpirationTime = (logout) => {
     // https://developer.mozilla.org/en-US/docs/Web/API/setTimeout#maximum_delay_value
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
+};
+const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+    if (loginWithEmail) {
+        return 'login-with-email-or-wallet';
+    }
+    if (isUserConnected) {
+        return 'wallet-list';
+    }
+    if (isBridgeFlow) {
+        return 'bridge-welcome';
+    }
+    return 'wallet-list';
 };
 
+exports.getInitialView = getInitialView;
 exports.initExpirationTime = initExpirationTime;
 exports.isAuthTokenExpired = isAuthTokenExpired;

package/src/lib/context/DynamicContext/helpers.d.ts

@@ -1,2 +1,8 @@
+import { ViewType } from '../ViewContext';
 export declare const isAuthTokenExpired: (token: string) => boolean;
 export declare const initExpirationTime: (logout: VoidFunction) => void;
+export declare const getInitialView: ({ loginWithEmail, isBridgeFlow, isUserConnected, }: {
+    loginWithEmail: boolean;
+    isBridgeFlow: boolean;
+    isUserConnected: boolean;
+}) => ViewType;

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

@@ -48,6 +48,18 @@ const initExpirationTime = (logout) => {
     // https://developer.mozilla.org/en-US/docs/Web/API/setTimeout#maximum_delay_value
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
+};
+const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+    if (loginWithEmail) {
+        return 'login-with-email-or-wallet';
+    }
+    if (isUserConnected) {
+        return 'wallet-list';
+    }
+    if (isBridgeFlow) {
+        return 'bridge-welcome';
+    }
+    return 'wallet-list';
 };
 
-export { initExpirationTime, isAuthTokenExpired };
+export { getInitialView, initExpirationTime, isAuthTokenExpired };

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

@@ -18,6 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/rpc-providers');
+require('../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../DynamicContext.cjs');
 require('../../ErrorContext/ErrorContext.cjs');
 require('../../AccessDeniedContext/AccessDeniedContext.cjs');
@@ -35,8 +36,6 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
-require('../../WalletGroupContext/WalletGroupContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('../../MockContext/MockContext.cjs');
 require('../../CaptchaContext/CaptchaContext.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');

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

@@ -14,6 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/rpc-providers';
+import '../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../DynamicContext.js';
 import '../../ErrorContext/ErrorContext.js';
 import '../../AccessDeniedContext/AccessDeniedContext.js';
@@ -31,8 +32,6 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
-import '../../WalletGroupContext/WalletGroupContext.js';
-import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '../../MockContext/MockContext.js';
 import '../../CaptchaContext/CaptchaContext.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';

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

@@ -11,7 +11,7 @@ const useDynamicContext = () => {
     if (context === undefined) {
         throw new Error('useDynamicContext must be used within a DynamicContextProvider');
     }
-    const { accountSwitchState, awaitingSignatureState, authMode, authToken, connectedWallets, connectedWalletsInfo, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, loadingNetwork, multiWalletWidgetState, network, networkConfigurations, primaryWallet, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setShowAuthFlow, setNetwork, showAuthFlow, showQrcodeModal, setMultiWalletWidgetState, setShowQrcodeModal, setPrimaryWallet, setShowDynamicUserProfile, setShowBridgeAuthFlow, user, walletConnector, wallets, shadowDOMEnabled, walletsToConnectByChain, walletsByChain, } = context;
+    const { accountSwitchState, awaitingSignatureState, authMode, authToken, isUserConnected, connectedWallets, connectedWalletsInfo, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, loadingNetwork, multiWalletWidgetState, network, networkConfigurations, primaryWallet, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setShowAuthFlow, setNetwork, showAuthFlow, showQrcodeModal, setMultiWalletWidgetState, setShowQrcodeModal, setPrimaryWallet, setShowDynamicUserProfile, user, walletConnector, wallets, shadowDOMEnabled, walletsToConnectByChain, walletsByChain, } = context;
     return {
         accountSwitchState,
         authMode,
@@ -23,6 +23,7 @@ const useDynamicContext = () => {
         handleLogOut,
         handleUnlinkWallet,
         isAuthenticated,
+        isUserConnected,
         loadingNetwork,
         multiWalletWidgetState,
         network,
@@ -36,7 +37,6 @@ const useDynamicContext = () => {
         setNetwork,
         setPrimaryWallet,
         setShowAuthFlow,
-        setShowBridgeAuthFlow,
         setShowDynamicUserProfile,
         setShowQrcodeModal,
         shadowDOMEnabled,

package/src/lib/context/DynamicContext/useDynamicContext.d.ts

@@ -1,3 +1,3 @@
 import { IDynamicContext } from './DynamicContext';
-export type UseDynamicContext = Pick<IDynamicContext, 'accountSwitchState' | 'authMode' | 'authToken' | 'awaitingSignatureState' | 'connectedWallets' | 'getNameService' | 'handleLogOut' | 'handleUnlinkWallet' | 'isAuthenticated' | 'loadingNetwork' | 'multiWalletWidgetState' | 'network' | 'networkConfigurations' | 'primaryWallet' | 'qrcodeUri' | 'rpcProviders' | 'secondaryWallets' | 'setMultiWalletWidgetState' | 'setNetwork' | 'setPrimaryWallet' | 'setShowAuthFlow' | 'setShowQrcodeModal' | 'shadowDOMEnabled' | 'sdkHasLoaded' | 'showAuthFlow' | 'showQrcodeModal' | 'setShowDynamicUserProfile' | 'user' | 'walletConnector' | 'wallets' | 'walletsToConnectByChain' | 'connectedWalletsInfo' | 'walletsByChain' | 'setShowBridgeAuthFlow'>;
+export type UseDynamicContext = Pick<IDynamicContext, 'accountSwitchState' | 'authMode' | 'authToken' | 'awaitingSignatureState' | 'connectedWallets' | 'getNameService' | 'handleLogOut' | 'handleUnlinkWallet' | 'isAuthenticated' | 'loadingNetwork' | 'multiWalletWidgetState' | 'network' | 'networkConfigurations' | 'primaryWallet' | 'qrcodeUri' | 'rpcProviders' | 'secondaryWallets' | 'setMultiWalletWidgetState' | 'setNetwork' | 'setPrimaryWallet' | 'setShowAuthFlow' | 'setShowQrcodeModal' | 'shadowDOMEnabled' | 'sdkHasLoaded' | 'showAuthFlow' | 'showQrcodeModal' | 'setShowDynamicUserProfile' | 'user' | 'walletConnector' | 'wallets' | 'walletsToConnectByChain' | 'connectedWalletsInfo' | 'walletsByChain' | 'isUserConnected'>;
 export declare const useDynamicContext: () => UseDynamicContext;

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

@@ -7,7 +7,7 @@ const useDynamicContext = () => {
     if (context === undefined) {
         throw new Error('useDynamicContext must be used within a DynamicContextProvider');
     }
-    const { accountSwitchState, awaitingSignatureState, authMode, authToken, connectedWallets, connectedWalletsInfo, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, loadingNetwork, multiWalletWidgetState, network, networkConfigurations, primaryWallet, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setShowAuthFlow, setNetwork, showAuthFlow, showQrcodeModal, setMultiWalletWidgetState, setShowQrcodeModal, setPrimaryWallet, setShowDynamicUserProfile, setShowBridgeAuthFlow, user, walletConnector, wallets, shadowDOMEnabled, walletsToConnectByChain, walletsByChain, } = context;
+    const { accountSwitchState, awaitingSignatureState, authMode, authToken, isUserConnected, connectedWallets, connectedWalletsInfo, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, loadingNetwork, multiWalletWidgetState, network, networkConfigurations, primaryWallet, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setShowAuthFlow, setNetwork, showAuthFlow, showQrcodeModal, setMultiWalletWidgetState, setShowQrcodeModal, setPrimaryWallet, setShowDynamicUserProfile, user, walletConnector, wallets, shadowDOMEnabled, walletsToConnectByChain, walletsByChain, } = context;
     return {
         accountSwitchState,
         authMode,
@@ -19,6 +19,7 @@ const useDynamicContext = () => {
         handleLogOut,
         handleUnlinkWallet,
         isAuthenticated,
+        isUserConnected,
         loadingNetwork,
         multiWalletWidgetState,
         network,
@@ -32,7 +33,6 @@ const useDynamicContext = () => {
         setNetwork,
         setPrimaryWallet,
         setShowAuthFlow,
-        setShowBridgeAuthFlow,
         setShowDynamicUserProfile,
         setShowQrcodeModal,
         shadowDOMEnabled,

package/src/lib/context/ErrorContext/ErrorContext.cjs

@@ -7,10 +7,16 @@ var React = require('react');
 var useInternalDynamicContext = require('../DynamicContext/useInternalDynamicContext.cjs');
 
 const errorMessageMap = {
+    '-32000': 'Message signature denied',
     '-32002': 'Please unlock your wallet extension and try again.',
     '-32602': 'Invalid parameters. Please try again.',
     '-32603': 'There was an internal error. Please try again.',
+    0: 'Message signature denied.',
     4001: 'Message signature denied.',
+    5001: 'Message signature denied.',
+    5002: 'Message signature denied.',
+    connection_rejected: 'Connection rejected. Please try again.',
+    metamask_timeout: 'Please change your wallet chain to Ethereum Main Network and try again',
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',

package/src/lib/context/ErrorContext/ErrorContext.js

@@ -3,10 +3,16 @@ import { createContext, useState, useCallback, useEffect, useMemo, useContext }
 import { useInternalDynamicContext } from '../DynamicContext/useInternalDynamicContext.js';
 
 const errorMessageMap = {
+    '-32000': 'Message signature denied',
     '-32002': 'Please unlock your wallet extension and try again.',
     '-32602': 'Invalid parameters. Please try again.',
     '-32603': 'There was an internal error. Please try again.',
+    0: 'Message signature denied.',
     4001: 'Message signature denied.',
+    5001: 'Message signature denied.',
+    5002: 'Message signature denied.',
+    connection_rejected: 'Connection rejected. Please try again.',
+    metamask_timeout: 'Please change your wallet chain to Ethereum Main Network and try again',
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',

package/src/lib/context/QrCodeContext/QrCodeContext.cjs

@@ -18,6 +18,7 @@ require('ethers');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/rpc-providers');
+require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../DynamicContext/DynamicContext.cjs');
 require('../ErrorContext/ErrorContext.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
@@ -34,8 +35,6 @@ require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
-require('../WalletGroupContext/WalletGroupContext.cjs');
-require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 var useDefaultQrCode = require('../../utils/hooks/useDefaultQrCode/useDefaultQrCode.cjs');
 require('../MockContext/MockContext.cjs');
 require('../CaptchaContext/CaptchaContext.cjs');

package/src/lib/context/QrCodeContext/QrCodeContext.js

@@ -14,6 +14,7 @@ import 'ethers';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/rpc-providers';
+import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../DynamicContext/DynamicContext.js';
 import '../ErrorContext/ErrorContext.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
@@ -30,8 +31,6 @@ import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
-import '../WalletGroupContext/WalletGroupContext.js';
-import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import { useDefaultQrCode } from '../../utils/hooks/useDefaultQrCode/useDefaultQrCode.js';
 import '../MockContext/MockContext.js';
 import '../CaptchaContext/CaptchaContext.js';