@dynamic-labs/sdk-react-core 0.18.0-RC.13 → 0.18.0-RC.15

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, useMemo } from 'react';
+import { createContext, useState, useCallback, useEffect, 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';
@@ -15,6 +15,7 @@ import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js
 import 'ethers';
 import { useLocalStorage } from '../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import { useGlobalLoading } from '../../shared/utils/hooks/useGlobalLoading/useGlobalLoading.js';
+import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import '../../shared/consts/index.js';
 import { useFetchProjectSettings } from '../../utils/hooks/useFetchProjectSettings/useFetchProjectSettings.js';
 import { useFetchNonce } from '../../utils/hooks/useFetchNonce/useFetchNonce.js';
@@ -32,6 +33,8 @@ import '../MockContext/MockContext.js';
 import { CaptchaContextProvider } from '../CaptchaContext/CaptchaContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import { ThemeContextProvider } from '../ThemeContext/ThemeContext.js';
+import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
+import { useEventListener } from '../../utils/hooks/useEventListener/useEventListener.js';
 import ApiEndpoint from '../../config/ApiEndpoint.js';
 import { useFetchNetworkConfigurations } from '../../utils/hooks/useFetchNetworkConfigurations/useFetchNetworkConfigurations.js';
 import { useMultiWalletWidgetState } from '../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.js';
@@ -74,8 +77,8 @@ import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceCon
 import { usePrimaryWalletId } from '../../utils/hooks/usePrimaryWalletId/usePrimaryWalletId.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
 import { WalletContextProvider } from '../WalletContext/WalletContext.js';
-import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
 import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
+import { useMultiWallet } from '../../utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js';
 import { initExpirationTime, getInitialView } from './helpers.js';
 import { validateAuthUser } from './validators.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
@@ -85,15 +88,19 @@ import { useDisplayOrderState } from './hooks/useDisplayOrderState/useDisplayOrd
 import { useNameService } from './hooks/useNameService/useNameService.js';
 import { useSetShowAuthFlowWithInit } from './hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.js';
 
+const PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID = '2762a57b-faa4-41ce-9f16-abff9300e2c9';
 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, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectV1Bridge, walletConnectors: walletConnectorsProp, socialProvidersFilter, }, children, theme, }) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!environmentId) {
         throw new MissingEnvironmentIdError();
     }
     logger.setLogLevel(logLevel);
     logger$1.setLogLevel(logLevel);
+    if (environmentId === PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID) {
+        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((_a = process.env.DYNAMIC_API_BASE_URL) !== null && _a !== void 0 ? _a : apiBaseUrl);
     LocalStorage.setSuffix(localStorageSuffix);
     const isAuthenticated = Boolean(getAuthToken());
@@ -115,7 +122,18 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
     const [multiWalletWidgetState, setMultiWalletWidgetState, { awaiting_account_switch: [accountSwitchState], awaiting_signature: [awaitingSignatureState], },] = useMultiWalletWidgetState();
     const [isVerifying, setIsVerifying] = useState(false);
     const { projectSettings, isLoading: isProjectSettingsLoading } = useFetchProjectSettings({ authToken: getAuthToken(), environmentId });
-    const multiWallet = (_c = deprecatedMultiWallet !== null && deprecatedMultiWallet !== void 0 ? deprecatedMultiWallet : (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet) !== null && _c !== void 0 ? _c : false;
+    const { multiWallet, setMultiWallet } = useMultiWallet({
+        deprecatedMultiWallet,
+        multiWalletSettings: (_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;
+    }
     // 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);
     const walletBook = useWalletBookCdn();
@@ -147,19 +165,23 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
     });
     const [authMode, setAuthMode] = useLocalStorage(AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId();
-    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, connectWalletByAddressAndChain, unlinkConnectedWallet, } = useConnectWallet({
+    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, connectWalletByAddressAndChain, unlinkConnectedWallet, updateConnectedWalletById, } = useConnectWallet({
         authMode,
         clearPrimaryWalletId,
         enableVisitTrackingOnConnectOnly,
         environmentId,
+        onUnlink: (walletId, connectedWalletsInfo) => {
+            const missingChains = getMissingChains(walletsByChain, connectedWalletsInfo);
+            setWalletsToConnectByChain(missingChains);
+        },
         primaryWalletId,
         setPrimaryWalletId,
         wallets,
     });
-    useEffect(() => {
+    useEffectOnce(() => {
         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);
@@ -193,7 +215,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         wallets,
     });
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_d = getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
+    const authToken = (_e = getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
     const { getNameService, removeConnectedNameService } = useNameService({
         authToken,
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallet,
@@ -205,7 +227,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _j, _k;
         clearAllWalletConnectSessions();
         setWalletsToConnectByChain(walletsByChain);
         setShowBridgeWidget(false);
@@ -218,7 +240,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         for (const connector of walletConnectors) {
             yield connector.endSession();
         }
-        yield ((_h = connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector) === null || _h === void 0 ? void 0 : _h.endSession());
+        yield ((_j = connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector) === null || _j === void 0 ? void 0 : _j.endSession());
         setAuthMode(initialAuthenticationMode);
         setShowAuthFlow(false);
         setMultiWalletWidgetState('idle');
@@ -229,7 +251,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         removeConnectedUser();
         clearPrimaryWalletId();
         removeConnectedNameService();
-        (_j = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _j === void 0 ? void 0 : _j.call(eventsCallbacks, user);
+        (_k = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _k === void 0 ? void 0 : _k.call(eventsCallbacks, user);
     }), [
         clearAllWalletConnectSessions,
         walletsByChain,
@@ -248,10 +270,11 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         environmentId,
         walletConnectors,
     ]);
+    useEventListener('logOut', handleLogOut);
     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
+            ((_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
                 ? 2
                 : 1;
     }
@@ -303,6 +326,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             onLinkSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLinkSuccess,
             onUserProfileUpdate: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUserProfileUpdate,
         },
+        connectedWallets,
         handleLogOut,
         isAuthenticated,
         primaryWallet,
@@ -356,10 +380,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             computeConnectedStateForWallets,
             connectWallet,
             connectedWallet,
-            connectedWallets: primaryWallet
-                ? [primaryWallet, ...secondaryWallets]
-                : [],
-            connectedWalletsInfo,
+            connectedWallets,
             consumeNonce,
             cssOverrides,
             customPrivacyPolicy,
@@ -384,6 +405,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             isSingleWalletAccount,
             isUserConnected,
             isVerifying,
+            linkedWallets: primaryWallet ? [primaryWallet, ...secondaryWallets] : [],
             loadingNetwork,
             loginWithEmail,
             multiWallet,
@@ -415,6 +437,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setIsSingleWalletAccount,
             setIsVerifying,
             setLogInWithEmail,
+            setMultiWallet,
             setMultiWalletWidgetState,
             setNetwork,
             setOnboardingOnlyJwt,
@@ -447,6 +470,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             theme,
             toolkitEnabled,
             unlinkConnectedWallet,
+            updateConnectedWalletById,
             user,
             walletConnector: (_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) !== null && _b !== void 0 ? _b : null,
             walletUiUtils,
@@ -456,7 +480,6 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             walletsToConnectByChain,
         });
     }, [
-        socialProvidersFilter,
         accessDeniedButton,
         accessDeniedMessagePrimary,
         accessDeniedMessageSecondary,
@@ -471,13 +494,11 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         computeConnectedStateForWallets,
         connectWallet,
         connectedWallet,
-        customPrivacyPolicy,
-        customTermsOfServices,
-        primaryWallet,
-        secondaryWallets,
-        connectedWalletsInfo,
+        connectedWallets,
         consumeNonce,
         cssOverrides,
+        customPrivacyPolicy,
+        customTermsOfServices,
         debugError,
         onboardingOnlyJwt,
         defaultNumberOfWalletsToShow,
@@ -488,6 +509,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         getConnectedWalletById,
         getNameService,
         handleLogOut,
+        unlinkConnectedWallet,
         handleUnlinkWallet,
         isAuthenticated,
         isBridgeFlow,
@@ -495,6 +517,8 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         isSingleWalletAccount,
         isUserConnected,
         isVerifying,
+        primaryWallet,
+        secondaryWallets,
         loadingNetwork,
         loginWithEmail,
         multiWallet,
@@ -521,6 +545,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         setCallback,
         setConnectedUser,
         setLogInWithEmail,
+        setMultiWallet,
         setMultiWalletWidgetState,
         setNetwork,
         setPrimaryWallet,
@@ -540,16 +565,17 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         socialMediaIconUrl,
         socialMediaLinkText,
         socialMediaUrl,
+        socialProvidersFilter,
         termsOfServiceUrl,
         theme,
         toolkitEnabled,
-        unlinkConnectedWallet,
         user,
         walletUiUtils,
         wallets,
         walletsByChain,
         walletsFilter,
         walletsToConnectByChain,
+        updateConnectedWalletById,
     ]);
     useEffect(() => {
         const addPrefetch = (attr) => {
@@ -593,11 +619,12 @@ 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, ((_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({
+    return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsx(WalletBookContextProvider, Object.assign({ walletBook: walletBook }, { children: jsx(ThemeContextProvider, Object.assign({ 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(ViewContextProvider, Object.assign({ initialView: getInitialView({
+                            connectedWallets,
                             isBridgeFlow,
                             isUserConnected,
                             loginWithEmail,
                         }) }, { children: jsx(WalletContextProvider, Object.assign({ canSync: didConnectedStateLoad, connectWalletByAddressAndChain: connectWalletByAddressAndChain }, { 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 };
+export { DynamicContext, DynamicContextProvider, PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID };

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

@@ -12,8 +12,9 @@ require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
-var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
+require('../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
+var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
 const isAuthTokenExpired = (token) => {
@@ -32,7 +33,7 @@ const isAuthTokenExpired = (token) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt.decodeJwt(localStorage.LocalStorage.getAuthTokenValue());
+    const decodedJwt = decodeJwt.decodeJwt(getAuthToken.getAuthToken());
     if (!decodedJwt)
         return clearTimeout(logoutTimer);
     const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
@@ -53,14 +54,14 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }) => {
     if (loginWithEmail) {
         return 'login-with-email-or-wallet';
     }
     if (isUserConnected) {
         return 'wallet-list';
     }
-    if (isBridgeFlow) {
+    if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
     return 'wallet-list';

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

@@ -1,7 +1,9 @@
+import { Wallet } from '../../shared';
 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, }: {
+export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }: {
+    connectedWallets: Wallet[];
     loginWithEmail: boolean;
     isBridgeFlow: boolean;
     isUserConnected: boolean;

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

@@ -8,8 +8,9 @@ import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
-import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
+import '../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
+import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
 const isAuthTokenExpired = (token) => {
@@ -28,7 +29,7 @@ const isAuthTokenExpired = (token) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt(LocalStorage.getAuthTokenValue());
+    const decodedJwt = decodeJwt(getAuthToken());
     if (!decodedJwt)
         return clearTimeout(logoutTimer);
     const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
@@ -49,14 +50,14 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }) => {
     if (loginWithEmail) {
         return 'login-with-email-or-wallet';
     }
     if (isUserConnected) {
         return 'wallet-list';
     }
-    if (isBridgeFlow) {
+    if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
     return 'wallet-list';

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

@@ -12,4 +12,5 @@ export type UseCustomerCallbacksArgs = {
     isAuthenticated: boolean;
     primaryWallet: Wallet | null;
     user: UserProfile | undefined;
+    connectedWallets: Wallet[];
 };

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

@@ -19,7 +19,7 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 var isConnectOnly = require('../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }) => {
     const [callbackQueue, setCallbackQueue] = React.useState([]);
     const isConnectOnlyAndCallbackIsConnectSuccess = React.useCallback((next) => isConnectOnly.isConnectOnly(user, authMode) && next === 'connectSuccess', [authMode, user]);
     React.useEffect(() => {

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

@@ -1,4 +1,4 @@
-import { Callback, UseCustomerCallbacksArgs } from './types';
-export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }: UseCustomerCallbacksArgs) => {
+import type { Callback, UseCustomerCallbacksArgs } from './types';
+export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }: UseCustomerCallbacksArgs) => {
     setCallback: (callback: Callback) => void;
 };

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

@@ -15,7 +15,7 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import { isConnectOnly } from '../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }) => {
     const [callbackQueue, setCallbackQueue] = useState([]);
     const isConnectOnlyAndCallbackIsConnectSuccess = useCallback((next) => isConnectOnly(user, authMode) && next === 'connectSuccess', [authMode, user]);
     useEffect(() => {

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

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

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' | 'isUserConnected' | 'loginWithEmail' | 'setLogInWithEmail'>;
+export type UseDynamicContext = Pick<IDynamicContext, 'accountSwitchState' | 'authMode' | 'authToken' | 'awaitingSignatureState' | 'connectedWallets' | 'getNameService' | 'handleLogOut' | 'handleUnlinkWallet' | 'isAuthenticated' | 'isUserConnected' | 'linkedWallets' | 'loadingNetwork' | 'loginWithEmail' | 'multiWalletWidgetState' | 'network' | 'networkConfigurations' | 'primaryWallet' | 'qrcodeUri' | 'rpcProviders' | 'sdkHasLoaded' | 'secondaryWallets' | 'setLogInWithEmail' | 'setMultiWalletWidgetState' | 'setNetwork' | 'setPrimaryWallet' | 'setShowAuthFlow' | 'setShowDynamicUserProfile' | 'setShowQrcodeModal' | 'shadowDOMEnabled' | 'showAuthFlow' | 'showQrcodeModal' | 'user' | 'walletConnector' | 'wallets' | 'walletsByChain' | 'walletsToConnectByChain'>;
 export declare const useDynamicContext: () => UseDynamicContext;

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

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

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/NewToWeb3WalletItem/NewToWeb3WalletItem.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var WalletListItem = require('../../../../../views/WalletList/WalletListItem/WalletListItem.cjs');
 
-const NewToWeb3WalletItem = ({ children, style, wallet, }) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, connectedWallets: [], usingMultiWallet: false, tile: children
+const NewToWeb3WalletItem = ({ children, style, wallet, }) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: false, tile: children
         ? ({ onClick }) => (jsxRuntime.jsx("button", Object.assign({ className: 'new-to-web3--button', style: style, onClick: onClick }, { children: children })))
         : undefined }));
 

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/NewToWeb3WalletItem/NewToWeb3WalletItem.js

@@ -1,7 +1,7 @@
 import { jsx } from 'react/jsx-runtime';
 import { WalletListItem } from '../../../../../views/WalletList/WalletListItem/WalletListItem.js';
 
-const NewToWeb3WalletItem = ({ children, style, wallet, }) => (jsx(WalletListItem, { wallet: wallet, connectedWallets: [], usingMultiWallet: false, tile: children
+const NewToWeb3WalletItem = ({ children, style, wallet, }) => (jsx(WalletListItem, { wallet: wallet, usingMultiWallet: false, tile: children
         ? ({ onClick }) => (jsx("button", Object.assign({ className: 'new-to-web3--button', style: style, onClick: onClick }, { children: children })))
         : undefined }));
 

package/src/lib/shared/types/index.d.ts

@@ -10,6 +10,7 @@ export type Wallet = {
     connected: boolean;
     connector: WalletConnector;
     id: string;
+    network?: string | number;
 };
 export type WalletAction = 'select' | 'unlink';
 export type WalletWithAction = {

package/src/lib/shared/utils/classes/storage/localStorage.cjs

@@ -6,46 +6,50 @@ var localStorage = require('../../../../utils/constants/localStorage.cjs');
 require('../../../../utils/constants/colors.cjs');
 var logger = require('../../../logger.cjs');
 
+const connectedKeys = {
+    [localStorage.AUTH_TOKEN]: [localStorage.AUTH_USER],
+    [localStorage.AUTH_USER]: [localStorage.AUTH_TOKEN],
+};
 class LocalStorage {
     static getDynamicLSKey(key) {
         return `${key}${LocalStorage.getSuffix()}`;
     }
+    static validateRequest(key, fromAuxiliarAuthFunctions) {
+        if (key === localStorage.AUTH_TOKEN && !fromAuxiliarAuthFunctions) {
+            throw new Error('You cannot access AUTH_TOKEN through localStorage. Use getAuthToken/ storeAuthToken helper functions instead');
+        }
+    }
     static setSuffix(localStorageSuffix) {
         if (!LocalStorage.__suffix__) {
             const suffix = (localStorageSuffix && `_${localStorageSuffix}`) || '';
             LocalStorage.__suffix__ = suffix;
         }
     }
-    // Will be refactored on INC-155
-    static getAuthTokenValue() {
+    /**
+     *
+     * @param key
+     * @param getAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static getFromLS(key, getAuth = false) {
         if (typeof window === 'undefined') {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(localStorage.AUTH_TOKEN));
-        try {
-            if (value) {
-                return JSON.parse(value);
-            }
-        }
-        catch (e) {
-            logger.logger.debug(e);
-            // Return auth token string for backwards compatibility
-            return value || undefined;
-        }
-        return undefined;
-    }
-    static getFromLS(key) {
-        if (typeof window === 'undefined') {
+        LocalStorage.validateRequest(key, getAuth);
+        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
+        if (!value) {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
         try {
-            if (value) {
-                return JSON.parse(value);
-            }
+            return JSON.parse(value);
         }
-        catch (e) {
-            logger.logger.error(e);
+        catch (error) {
+            logger.logger.debug(`Error while parsing ${key} from local storage`, { value });
+            // keep it in case handleLogOut is not yet loaded when calling this method
+            [key]
+                .concat(connectedKeys[key] || [])
+                .forEach((_key) => LocalStorage.removeFromLS(_key));
+            window.dispatchEvent(new Event('logOut'));
         }
         return undefined;
     }
@@ -55,10 +59,18 @@ class LocalStorage {
         }
         return window.localStorage.removeItem(LocalStorage.getDynamicLSKey(key));
     }
-    static setToLS(key, value) {
+    /**
+     *
+     * @param key
+     * @param value
+     * @param storeAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static setToLS(key, value, storeAuth = false) {
         if (typeof window === 'undefined') {
             return;
         }
+        LocalStorage.validateRequest(key, storeAuth);
         window.localStorage.setItem(LocalStorage.getDynamicLSKey(key), JSON.stringify(value));
     }
     static getKeys() {

package/src/lib/shared/utils/classes/storage/localStorage.d.ts

@@ -2,11 +2,24 @@ export declare class LocalStorage {
     private static __suffix__;
     static getSuffix: () => string;
     private static getDynamicLSKey;
+    private static validateRequest;
     static setSuffix(localStorageSuffix?: string): void;
-    static getAuthTokenValue(): string | undefined;
-    static getFromLS<T = any>(key: string): T | undefined;
+    /**
+     *
+     * @param key
+     * @param getAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static getFromLS<T = any>(key: string, getAuth?: boolean): T | undefined;
     static removeFromLS(key: string): void;
-    static setToLS<T = any>(key: string, value: T): void;
+    /**
+     *
+     * @param key
+     * @param value
+     * @param storeAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static setToLS<T = any>(key: string, value: T, storeAuth?: boolean): void;
     static getKeys(): string[];
 }
 export default LocalStorage;