@dynamic-labs/sdk-react-core 0.17.18 → 0.17.20

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+### [0.17.20](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.19...v0.17.20) (2023-07-03)
+
+
+### Bug Fixes
+
+* persist chain to WalletConnect session when changed in wallet ([#2556](https://github.com/dynamic-labs/DynamicAuth/issues/2556)) ([#2562](https://github.com/dynamic-labs/DynamicAuth/issues/2562)) ([0415e6d](https://github.com/dynamic-labs/DynamicAuth/commit/0415e6d055e860ab63ebf0d249ca9cdd71dfdb83))
+
+### [0.17.19](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.18...v0.17.19) (2023-07-02)
+
+
+### Bug Fixes
+
+* log out if there's any session sync issue ([#2548](https://github.com/dynamic-labs/DynamicAuth/issues/2548)) ([3f92bab](https://github.com/dynamic-labs/DynamicAuth/commit/3f92bab1b6b317f4a024a68d4d220921bad3437c))
+* WC2 sign-message on non-selected chain ([#2551](https://github.com/dynamic-labs/DynamicAuth/issues/2551)) ([c455e53](https://github.com/dynamic-labs/DynamicAuth/commit/c455e530c964b2865ffd29529546faddf2a57096)), closes [#2544](https://github.com/dynamic-labs/DynamicAuth/issues/2544) [#2552](https://github.com/dynamic-labs/DynamicAuth/issues/2552) [#2525](https://github.com/dynamic-labs/DynamicAuth/issues/2525) [#2500](https://github.com/dynamic-labs/DynamicAuth/issues/2500) [#2546](https://github.com/dynamic-labs/DynamicAuth/issues/2546)
+* **wcv2:** don't force required chain to eth in case is not enabled ([#2538](https://github.com/dynamic-labs/DynamicAuth/issues/2538)) ([933dc20](https://github.com/dynamic-labs/DynamicAuth/commit/933dc20b300f0740a438810b9e65d693aae61689))
+
 ### [0.17.18](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.17...v0.17.18) (2023-06-29)
 
 ### [0.17.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.17.16...v0.17.17) (2023-06-29)

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.17.18";
+var version = "0.17.20";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.17.18";
+var version = "0.17.20";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.23",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.17.18",
+  "version": "0.17.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,13 +16,13 @@
     "formik": "2.2.9",
     "qrcode": "1.5.1",
     "ethers": "5.7.2",
-    "@dynamic-labs/logger": "0.17.18",
-    "@dynamic-labs/multi-wallet": "0.17.18",
-    "@dynamic-labs/rpc-providers": "0.17.18",
-    "@dynamic-labs/types": "0.17.18",
-    "@dynamic-labs/utils": "0.17.18",
-    "@dynamic-labs/wallet-book": "0.17.18",
-    "@dynamic-labs/wallet-connector-core": "0.17.18"
+    "@dynamic-labs/logger": "0.17.20",
+    "@dynamic-labs/multi-wallet": "0.17.20",
+    "@dynamic-labs/rpc-providers": "0.17.20",
+    "@dynamic-labs/types": "0.17.20",
+    "@dynamic-labs/utils": "0.17.20",
+    "@dynamic-labs/wallet-book": "0.17.20",
+    "@dynamic-labs/wallet-connector-core": "0.17.20"
   },
   "devDependencies": {
     "semver": "7.3.8"

package/src/index.cjs

@@ -21,6 +21,7 @@ var getFromLS = require('./lib/shared/utils/functions/storage/getFromLS.cjs');
 var getDynamicLSKey = require('./lib/shared/utils/functions/storage/getDynamicLSKey.cjs');
 var removeFromLS = require('./lib/shared/utils/functions/storage/removeFromLS.cjs');
 var setToLS = require('./lib/shared/utils/functions/storage/setToLS.cjs');
+var getLSKeys = require('./lib/shared/utils/functions/storage/getLSKeys.cjs');
 var validateType = require('./lib/shared/utils/functions/validateType/validateType.cjs');
 var getChainIcon = require('./lib/shared/utils/functions/chain/getChainIcon.cjs');
 var getChainDisplayName = require('./lib/shared/utils/functions/chain/getChainDisplayName.cjs');
@@ -143,6 +144,7 @@ exports.getFromLS = getFromLS.getFromLS;
 exports.getDynamicLSKey = getDynamicLSKey.getDynamicLSKey;
 exports.removeFromLS = removeFromLS.removeFromLS;
 exports.setToLS = setToLS.setToLS;
+exports.getLSKeys = getLSKeys.getLSKeys;
 exports.validateType = validateType.validateType;
 exports.getChainIcon = getChainIcon.getChainIcon;
 exports.getChainDisplayName = getChainDisplayName.getChainDisplayName;

package/src/index.js

@@ -17,6 +17,7 @@ export { getFromLS } from './lib/shared/utils/functions/storage/getFromLS.js';
 export { getDynamicLSKey } from './lib/shared/utils/functions/storage/getDynamicLSKey.js';
 export { removeFromLS } from './lib/shared/utils/functions/storage/removeFromLS.js';
 export { setToLS } from './lib/shared/utils/functions/storage/setToLS.js';
+export { getLSKeys } from './lib/shared/utils/functions/storage/getLSKeys.js';
 export { validateType } from './lib/shared/utils/functions/validateType/validateType.js';
 export { getChainIcon } from './lib/shared/utils/functions/chain/getChainIcon.js';
 export { getChainDisplayName } from './lib/shared/utils/functions/chain/getChainDisplayName.js';

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

@@ -76,6 +76,7 @@ var FundingWidget = require('../../widgets/FundingWidget/FundingWidget.cjs');
 var DynamicBridgeWidgetContext = require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
 require('../../widgets/DynamicBridgeWidget/components/DynamicBridgeWidgetViews/DynamicBridgeWidgetViews.cjs');
 var SendBalanceContext = require('../SendBalanceContext/SendBalanceContext.cjs');
+var useValidateSession = require('../../utils/hooks/useValidateSession/useValidateSession.cjs');
 var helpers = require('./helpers.cjs');
 var validators = require('./validators.cjs');
 var useCustomerCallbacks = require('./useCustomerCallbacks/useCustomerCallbacks.cjs');
@@ -88,17 +89,12 @@ var useSetShowAuthFlowWithInit = require('./hooks/useSetShowAuthFlowWithInit/use
 const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
 const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', cssOverrides, defaultNumberOfWalletsToShow = values.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;
+    var _a, _b, _c, _d, _e, _f, _g;
     logger.logger.setLogLevel(logLevel);
     walletConnectorCore.logger.setLogLevel(logLevel);
     ApiEndpoint.setBaseUrl((_a = process.env.DYNAMIC_API_BASE_URL) !== null && _a !== void 0 ? _a : apiBaseUrl);
     LSSuffix.setSuffix(localStorageSuffix);
     const isAuthenticated = Boolean(getAuthToken.getAuthToken());
-    // HOTFIX - NEED TO BE REVISITED
-    // if there's user but not auth_token, remove user
-    if (!isAuthenticated) {
-        removeFromLS.removeFromLS(localStorage$1.AUTH_USER);
-    }
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = React.useState(undefined);
     const [showAuthFlow, setShowAuthFlow] = React.useState(false);
     // Allows clients to control widget flow without need to click on AccountControl
@@ -170,8 +166,10 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         setShowAuthFlow,
         wallets,
     });
+    // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
+    const authToken = (_d = getAuthToken.getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
     const { getNameService, removeConnectedNameService } = useNameService.useNameService({
-        authToken: (_d = getAuthToken.getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt,
+        authToken,
         currentWallet: primaryWallet !== null && primaryWallet !== void 0 ? primaryWallet : connectedWallet,
     });
     const walletForUserFacingContext = authMode === 'connect-and-sign' || user ? primaryWallet : connectedWallet;
@@ -182,7 +180,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g;
+        var _h, _j;
         clearAllWalletConnectSessions();
         localStorage.removeItem(localStorage$1.WALLET_PICKER_SEARCH_KEY);
         const jwt = getAuthToken.getAuthToken();
@@ -193,7 +191,7 @@ 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();
         setShowAuthFlow(false);
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
@@ -203,7 +201,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         removeConnectedInfo();
         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,
         user,
@@ -219,6 +217,21 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         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.useValidateSession({
+        authToken,
+        handleLogOut,
+        user,
+        walletConnectV1Bridge,
+        walletConnectors,
+        wcVersion,
+    });
     useSyncPrimaryWallet.useSyncPrimaryWallet({
         canSync: didConnectedStateLoad,
         computeConnectedStateForWallets,
@@ -519,7 +532,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsxRuntime.jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, Object.assign({ customerTheme: parseTheme.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: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ViewContext.ViewContextProvider, Object.assign({ initialView: loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list' }, { children: jsxRuntime.jsx(QrCodeContext.QrCodeContextProvider, { children: jsxRuntime.jsx(EmailVerificationContext.EmailVerificationContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsx(DynamicWidgetContext.DynamicWidgetContextProvider, { children: jsxRuntime.jsx(DynamicBridgeWidgetContext.DynamicBridgeWidgetContextProvider, { children: jsxRuntime.jsx(CaptchaContext.CaptchaContextProvider, { children: jsxRuntime.jsx(FundingContext.FundingContextProvider, { children: jsxRuntime.jsx(AccessDeniedContext.AccessDeniedContextProvider, { children: jsxRuntime.jsxs(SendBalanceContext.SendBalanceContextProvider, { children: [jsxRuntime.jsx(app.DynamicAuthFlow, {}), jsxRuntime.jsx(Toolkit.Toolkit, {}), jsxRuntime.jsx(FundingWidget.FundingWidget, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) })) }) })) })));
+    return (jsxRuntime.jsx(DynamicContext.Provider, Object.assign({ value: value }, { children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, Object.assign({ customerTheme: parseTheme.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: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ViewContext.ViewContextProvider, Object.assign({ initialView: loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list' }, { children: jsxRuntime.jsx(QrCodeContext.QrCodeContextProvider, { children: jsxRuntime.jsx(EmailVerificationContext.EmailVerificationContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsx(DynamicWidgetContext.DynamicWidgetContextProvider, { children: jsxRuntime.jsx(DynamicBridgeWidgetContext.DynamicBridgeWidgetContextProvider, { children: jsxRuntime.jsx(CaptchaContext.CaptchaContextProvider, { children: jsxRuntime.jsx(FundingContext.FundingContextProvider, { children: jsxRuntime.jsx(AccessDeniedContext.AccessDeniedContextProvider, { children: jsxRuntime.jsxs(SendBalanceContext.SendBalanceContextProvider, { children: [jsxRuntime.jsx(app.DynamicAuthFlow, {}), jsxRuntime.jsx(Toolkit.Toolkit, {}), jsxRuntime.jsx(FundingWidget.FundingWidget, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) })) }) })) })));
 };
 
 exports.DynamicContext = DynamicContext;

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

@@ -3,7 +3,7 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { createContext, useState, useCallback, useEffect, useMemo } from 'react';
 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, WALLET_PICKER_SEARCH_KEY } 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,6 +72,7 @@ import { FundingWidget } from '../../widgets/FundingWidget/FundingWidget.js';
 import { DynamicBridgeWidgetContextProvider } from '../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
 import '../../widgets/DynamicBridgeWidget/components/DynamicBridgeWidgetViews/DynamicBridgeWidgetViews.js';
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
+import { useValidateSession } from '../../utils/hooks/useValidateSession/useValidateSession.js';
 import { initExpirationTime } from './helpers.js';
 import { validateAuthUser } from './validators.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
@@ -84,17 +85,12 @@ 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', 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;
+    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);
     LSSuffix.setSuffix(localStorageSuffix);
     const isAuthenticated = Boolean(getAuthToken());
-    // HOTFIX - NEED TO BE REVISITED
-    // if there's user but not auth_token, remove user
-    if (!isAuthenticated) {
-        removeFromLS(AUTH_USER);
-    }
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = useState(undefined);
     const [showAuthFlow, setShowAuthFlow] = useState(false);
     // Allows clients to control widget flow without need to click on AccountControl
@@ -166,8 +162,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 walletForUserFacingContext = authMode === 'connect-and-sign' || user ? primaryWallet : connectedWallet;
@@ -178,7 +176,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g;
+        var _h, _j;
         clearAllWalletConnectSessions();
         localStorage.removeItem(WALLET_PICKER_SEARCH_KEY);
         const jwt = getAuthToken();
@@ -189,7 +187,7 @@ 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();
         setShowAuthFlow(false);
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
@@ -199,7 +197,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         removeConnectedInfo();
         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,
         user,
@@ -215,6 +213,21 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
         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,
+    });
     useSyncPrimaryWallet({
         canSync: didConnectedStateLoad,
         computeConnectedStateForWallets,
@@ -515,7 +528,7 @@ const DynamicContextProvider = ({ settings: { accessDeniedMessagePrimary, access
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { 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(QrCodeContextProvider, { children: jsx(EmailVerificationContextProvider, { children: jsx(ErrorContextProvider, { children: jsx(DynamicWidgetContextProvider, { children: jsx(DynamicBridgeWidgetContextProvider, { children: jsx(CaptchaContextProvider, { children: jsx(FundingContextProvider, { children: jsx(AccessDeniedContextProvider, { children: jsxs(SendBalanceContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) })) }) })) })));
+    return (jsx(DynamicContext.Provider, Object.assign({ value: value }, { 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: loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list' }, { 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: jsxs(SendBalanceContextProvider, { children: [jsx(DynamicAuthFlow, {}), jsx(Toolkit, {}), jsx(FundingWidget, {}), confirmationModal, children] }) }) }) }) }) }) }) }) }) })) }) })) })));
 };
 
 export { DynamicContext, DynamicContextProvider };

package/src/lib/shared/utils/functions/storage/getLSKeys.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getLSKeys = () => {
+    if (typeof window === 'undefined') {
+        return [];
+    }
+    return Object.keys(window.localStorage);
+};
+
+exports.getLSKeys = getLSKeys;

package/src/lib/shared/utils/functions/storage/getLSKeys.d.ts

@@ -0,0 +1 @@
+export declare const getLSKeys: () => string[];

package/src/lib/shared/utils/functions/storage/getLSKeys.js

@@ -0,0 +1,8 @@
+const getLSKeys = () => {
+    if (typeof window === 'undefined') {
+        return [];
+    }
+    return Object.keys(window.localStorage);
+};
+
+export { getLSKeys };

package/src/lib/shared/utils/functions/storage/index.d.ts

@@ -2,3 +2,4 @@ export { getFromLS } from './getFromLS';
 export { getDynamicLSKey } from './getDynamicLSKey';
 export { removeFromLS } from './removeFromLS';
 export { setToLS } from './setToLS';
+export { getLSKeys } from './getLSKeys';

package/src/lib/utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.cjs

@@ -4,6 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api');
+require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
+var getLSKeys = require('../../../shared/utils/functions/storage/getLSKeys.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = React.useCallback(() => {
@@ -12,7 +23,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
         if (connectors.length === 0)
             return;
         const names = new Set(connectors.map((connector) => walletConnectorCore.normalizeWalletName(connector.name)));
-        for (const key of Object.keys(localStorage)) {
+        for (const key of getLSKeys.getLSKeys()) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
@@ -22,8 +33,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
     const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        for (const key of Object.keys(localStorage)) {
-            if (key.startsWith('walletconnect')) {
+        for (const key of getLSKeys.getLSKeys()) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }

package/src/lib/utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.js

@@ -1,5 +1,16 @@
 import { useCallback } from 'react';
 import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api';
+import '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
+import { getLSKeys } from '../../../shared/utils/functions/storage/getLSKeys.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = useCallback(() => {
@@ -8,7 +19,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
         if (connectors.length === 0)
             return;
         const names = new Set(connectors.map((connector) => normalizeWalletName(connector.name)));
-        for (const key of Object.keys(localStorage)) {
+        for (const key of getLSKeys()) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
@@ -18,8 +29,10 @@ const useClearWalletConnectSessions = ({ connectors }) => {
     const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        for (const key of Object.keys(localStorage)) {
-            if (key.startsWith('walletconnect')) {
+        for (const key of getLSKeys()) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }

package/src/lib/utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs

@@ -30,9 +30,9 @@ const useCreateUserProfileByJWTCallback = () => {
             goToInitialView();
             return;
         }
+        index.storeAuthToken(jwt);
         const userProfile = createUserProfile.createUserProfile(decodedJWT);
         setUser(userProfile);
-        index.storeAuthToken(jwt);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     return { createUserProfileByJWT };

package/src/lib/utils/hooks/useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js

@@ -26,9 +26,9 @@ const useCreateUserProfileByJWTCallback = () => {
             goToInitialView();
             return;
         }
+        storeAuthToken(jwt);
         const userProfile = createUserProfile(decodedJWT);
         setUser(userProfile);
-        storeAuthToken(jwt);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
     return { createUserProfileByJWT };

package/src/lib/utils/hooks/useValidateSession/index.d.ts

@@ -0,0 +1 @@
+export { useValidateSession } from './useValidateSession';

package/src/lib/utils/hooks/useValidateSession/useValidateSession.cjs

@@ -0,0 +1,79 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
+var getLSKeys = require('../../../shared/utils/functions/storage/getLSKeys.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
+
+const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
+    const [hasLoggedOut, setHasLoggedOut] = React.useState(false);
+    if (hasLoggedOut) {
+        return;
+    }
+    const logout = (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        setHasLoggedOut(true);
+        logger.logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
+        yield handleLogOut();
+    });
+    const handleUserDataOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (authToken || !user) {
+            return;
+        }
+        yield logout('user data out of sync', {
+            authToken,
+            user,
+        });
+    });
+    const handleConnectorBridgeOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        let currentWalletConnectV1Bridge;
+        if (walletConnectors) {
+            for (const connector of walletConnectors) {
+                const session = yield connector.getSession();
+                const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
+                if (bridge) {
+                    currentWalletConnectV1Bridge = bridge;
+                    break;
+                }
+            }
+        }
+        if (!walletConnectV1Bridge ||
+            !currentWalletConnectV1Bridge ||
+            walletConnectV1Bridge === currentWalletConnectV1Bridge) {
+            return;
+        }
+        yield logout('connector bridge out of sync', {
+            newBridge: walletConnectV1Bridge,
+            oldBridge: currentWalletConnectV1Bridge,
+        });
+    });
+    const hasWCV1Data = getLSKeys.getLSKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    const hasWCV2Data = getLSKeys.getLSKeys().some((key) => key.startsWith('wc@2'));
+    const handleConnectorVersionOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!wcVersion ||
+            (wcVersion === 2 && !hasWCV1Data) ||
+            (wcVersion === 1 && !hasWCV2Data)) {
+            return;
+        }
+        yield logout('connector version out of sync', {
+            newVersion: wcVersion,
+            oldVersion: hasWCV1Data ? 1 : 2,
+        });
+    });
+    handleUserDataOutOfSync();
+    handleConnectorBridgeOutOfSync();
+    handleConnectorVersionOutOfSync();
+};
+
+exports.useValidateSession = useValidateSession;

package/src/lib/utils/hooks/useValidateSession/useValidateSession.d.ts

@@ -0,0 +1,12 @@
+import { UserProfile } from '../../../shared';
+import { WalletConnector } from '../../../..';
+type Props = {
+    handleLogOut: () => Promise<void>;
+    user: UserProfile | undefined;
+    authToken: string | undefined;
+    walletConnectV1Bridge: string | undefined;
+    walletConnectors: WalletConnector[] | undefined;
+    wcVersion: number | undefined;
+};
+export declare const useValidateSession: ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }: Props) => void;
+export {};

package/src/lib/utils/hooks/useValidateSession/useValidateSession.js

@@ -0,0 +1,75 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState } from 'react';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
+import { getLSKeys } from '../../../shared/utils/functions/storage/getLSKeys.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
+
+const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
+    const [hasLoggedOut, setHasLoggedOut] = useState(false);
+    if (hasLoggedOut) {
+        return;
+    }
+    const logout = (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
+        setHasLoggedOut(true);
+        logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
+        yield handleLogOut();
+    });
+    const handleUserDataOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (authToken || !user) {
+            return;
+        }
+        yield logout('user data out of sync', {
+            authToken,
+            user,
+        });
+    });
+    const handleConnectorBridgeOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        let currentWalletConnectV1Bridge;
+        if (walletConnectors) {
+            for (const connector of walletConnectors) {
+                const session = yield connector.getSession();
+                const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
+                if (bridge) {
+                    currentWalletConnectV1Bridge = bridge;
+                    break;
+                }
+            }
+        }
+        if (!walletConnectV1Bridge ||
+            !currentWalletConnectV1Bridge ||
+            walletConnectV1Bridge === currentWalletConnectV1Bridge) {
+            return;
+        }
+        yield logout('connector bridge out of sync', {
+            newBridge: walletConnectV1Bridge,
+            oldBridge: currentWalletConnectV1Bridge,
+        });
+    });
+    const hasWCV1Data = getLSKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    const hasWCV2Data = getLSKeys().some((key) => key.startsWith('wc@2'));
+    const handleConnectorVersionOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (!wcVersion ||
+            (wcVersion === 2 && !hasWCV1Data) ||
+            (wcVersion === 1 && !hasWCV2Data)) {
+            return;
+        }
+        yield logout('connector version out of sync', {
+            newVersion: wcVersion,
+            oldVersion: hasWCV1Data ? 1 : 2,
+        });
+    });
+    handleUserDataOutOfSync();
+    handleConnectorBridgeOutOfSync();
+    handleConnectorVersionOutOfSync();
+};
+
+export { useValidateSession };

package/src/lib/utils/hooks/useVerifyWallet/useVerifyWallet.cjs

@@ -130,13 +130,13 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const network = yield walletConnector.getNetwork();
+            const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
+                network,
+                walletConnector,
+            });
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new utils.DynamicError('Invalid token!');

package/src/lib/utils/hooks/useVerifyWallet/useVerifyWallet.js

@@ -126,13 +126,13 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const network = yield walletConnector.getNetwork();
+            const _isSupportedNetwork = isSupportedNetwork({
+                network,
+                walletConnector,
+            });
             const decodedJwt = decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new DynamicError('Invalid token!');