@dynamic-labs/sdk-react-core 0.18.100-viem.14 → 0.18.100-viem.16

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+### [0.18.100-viem.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.15...v0.18.100-viem.16) (2023-09-11)
+
+
+### Bug Fixes
+
+* catch error sending sdkSettings and log warning v18-viem ([#3277](https://github.com/dynamic-labs/DynamicAuth/issues/3277)) ([af86753](https://github.com/dynamic-labs/DynamicAuth/commit/af86753f4b73c0ec4ba981c9ffd47af21fac9d8d)), closes [#3274](https://github.com/dynamic-labs/DynamicAuth/issues/3274)
+* issue where unexpected token would occur when bundlers defined process.env ([#3283](https://github.com/dynamic-labs/DynamicAuth/issues/3283)) ([16110f9](https://github.com/dynamic-labs/DynamicAuth/commit/16110f90f02841104b053365b17343ed80a72018))
+* seprate ls checks for dynamiccontext and wagmi settings v18-viem ([#3279](https://github.com/dynamic-labs/DynamicAuth/issues/3279)) ([e31d85e](https://github.com/dynamic-labs/DynamicAuth/commit/e31d85e576d0fba31616d6aa408316c261f42373)), closes [#3275](https://github.com/dynamic-labs/DynamicAuth/issues/3275)
+
+### [0.18.100-viem.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.14...v0.18.100-viem.15) (2023-09-11)
+
+
+### Bug Fixes
+* sdkSettings should call once per session ([#3189](https://github.com/dynamic-labs/DynamicAuth/issues/3189)) ([#3265](https://github.com/dynamic-labs/DynamicAuth/issues/3265)) ([f46a692](https://github.com/dynamic-labs/DynamicAuth/commit/f46a6927684caf5962e5b60a9927030a5f7720e2))
+* wallet transition in the bridge ([#3268](https://github.com/dynamic-labs/DynamicAuth/issues/3268)) ([#3271](https://github.com/dynamic-labs/DynamicAuth/issues/3271)) ([95e6d5f](https://github.com/dynamic-labs/DynamicAuth/commit/95e6d5f6ff003ff428795bdd73e2d88da366ed56)), closes [#3243](https://github.com/dynamic-labs/DynamicAuth/issues/3243)
+
 ### [0.18.100-viem.14](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.100-viem.13...v0.18.100-viem.14) (2023-09-05)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.100-viem.14";
+var version = "0.18.100-viem.16";
 var dependencies = {
 	"react-focus-lock": "2.9.2",
 	"@dynamic-labs/iconic": "0.1.27",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.18.100-viem.14",
+  "version": "0.18.100-viem.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -15,13 +15,13 @@
     "yup": "0.32.11",
     "formik": "2.2.9",
     "qrcode": "1.5.1",
-    "@dynamic-labs/logger": "0.18.100-viem.14",
-    "@dynamic-labs/multi-wallet": "0.18.100-viem.14",
-    "@dynamic-labs/rpc-providers": "0.18.100-viem.14",
-    "@dynamic-labs/types": "0.18.100-viem.14",
-    "@dynamic-labs/utils": "0.18.100-viem.14",
-    "@dynamic-labs/wallet-book": "0.18.100-viem.14",
-    "@dynamic-labs/wallet-connector-core": "0.18.100-viem.14",
+    "@dynamic-labs/logger": "0.18.100-viem.16",
+    "@dynamic-labs/multi-wallet": "0.18.100-viem.16",
+    "@dynamic-labs/rpc-providers": "0.18.100-viem.16",
+    "@dynamic-labs/types": "0.18.100-viem.16",
+    "@dynamic-labs/utils": "0.18.100-viem.16",
+    "@dynamic-labs/wallet-book": "0.18.100-viem.16",
+    "@dynamic-labs/wallet-connector-core": "0.18.100-viem.16",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -11,12 +11,16 @@ require('react');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
+var localStorage$1 = require('../../utils/constants/localStorage.cjs');
 require('../../utils/constants/colors.cjs');
-require('../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
+const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt.decodeJwt(token);
     if (!decoded) {
@@ -66,7 +70,42 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
     }
     return 'wallet-list';
 };
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(localStorage$1.WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
+    const timestamp = new Date().getTime();
+    localStorage.LocalStorage.setToLS(lsKey, timestamp.toString());
+};
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(localStorage$1.WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = localStorage.LocalStorage.getFromLS(lsKey);
+    // should set new time
+    if (!lastSentTime) {
+        return true;
+    }
+    const lastSentTimestamp = parseInt(lastSentTime);
+    const currentTime = new Date().getTime();
+    if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
+        // Reset session-related data here
+        clearTimeout(timer);
+        localStorage.LocalStorage.removeFromLS(lsKey);
+        return true;
+    }
+    return false;
+};
 
 exports.getInitialView = getInitialView;
 exports.initExpirationTime = initExpirationTime;
 exports.isAuthTokenExpired = isAuthTokenExpired;
+exports.isDynamicContextSessionSettingExpired = isDynamicContextSessionSettingExpired;
+exports.isWagmiSessionSettingExpired = isWagmiSessionSettingExpired;
+exports.sdkSettingsTimeout = sdkSettingsTimeout;
+exports.setDynamicContextSessionSettings = setDynamicContextSessionSettings;
+exports.setWagmiSessionSettings = setWagmiSessionSettings;

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

@@ -1,5 +1,6 @@
 import { Wallet } from '../../shared';
 import { ViewType } from '../ViewContext';
+export declare const sdkSettingsTimeout: number;
 export declare const isAuthTokenExpired: (token: string) => boolean;
 export declare const initExpirationTime: (logout: VoidFunction) => void;
 export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBridgeFlow, isFullyConnected, isMultiWalletEnabled, }: {
@@ -9,3 +10,7 @@ export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBrid
     isFullyConnected: boolean;
     isMultiWalletEnabled: boolean;
 }) => ViewType;
+export declare const setDynamicContextSessionSettings: () => void;
+export declare const setWagmiSessionSettings: () => void;
+export declare const isDynamicContextSessionSettingExpired: () => boolean;
+export declare const isWagmiSessionSettingExpired: () => boolean;

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

@@ -7,12 +7,16 @@ import 'react';
 import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
+import { DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, WAGMI_LAST_SESSION_SETTINGS } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
-import '../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
+const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt(token);
     if (!decoded) {
@@ -62,5 +66,35 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
     }
     return 'wallet-list';
 };
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
+    const timestamp = new Date().getTime();
+    LocalStorage.setToLS(lsKey, timestamp.toString());
+};
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = LocalStorage.getFromLS(lsKey);
+    // should set new time
+    if (!lastSentTime) {
+        return true;
+    }
+    const lastSentTimestamp = parseInt(lastSentTime);
+    const currentTime = new Date().getTime();
+    if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
+        // Reset session-related data here
+        clearTimeout(timer);
+        LocalStorage.removeFromLS(lsKey);
+        return true;
+    }
+    return false;
+};
 
-export { getInitialView, initExpirationTime, isAuthTokenExpired };
+export { getInitialView, initExpirationTime, isAuthTokenExpired, isDynamicContextSessionSettingExpired, isWagmiSessionSettingExpired, sdkSettingsTimeout, setDynamicContextSessionSettings, setWagmiSessionSettings };

package/src/lib/data/api.cjs

@@ -18,6 +18,7 @@ require('../utils/constants/colors.cjs');
 require('../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../shared/consts/index.cjs');
+var helpers = require('../context/DynamicContext/helpers.cjs');
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -401,19 +402,24 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, helpers.isDynamicContextSessionSettingExpired, helpers.setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, helpers.isWagmiSessionSettingExpired, helpers.setWagmiSessionSettings);
         }
     }
-    catch (e) {
-        logger.logger.error(e);
+    catch (error) {
+        logger.logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {

package/src/lib/data/api.js

@@ -14,6 +14,7 @@ import '../utils/constants/colors.js';
 import '../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../shared/consts/index.js';
+import { isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings, isWagmiSessionSettingExpired, setWagmiSessionSettings } from '../context/DynamicContext/helpers.js';
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -397,19 +398,24 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, isWagmiSessionSettingExpired, setWagmiSessionSettings);
         }
     }
-    catch (e) {
-        logger.error(e);
+    catch (error) {
+        logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => __awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0, void 0, function* () {
     try {

package/src/lib/utils/constants/localStorage.cjs

@@ -16,12 +16,15 @@ const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
 const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
 const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
+const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 
 exports.AUTH_MODE = AUTH_MODE;
 exports.AUTH_TOKEN = AUTH_TOKEN;
 exports.AUTH_USER = AUTH_USER;
 exports.CONNECTED_WALLETS_INFO = CONNECTED_WALLETS_INFO;
 exports.CONNECTED_WALLET_NAME_SERVICE = CONNECTED_WALLET_NAME_SERVICE;
+exports.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS;
 exports.IS_FULLY_CONNECTED = IS_FULLY_CONNECTED;
 exports.IS_MULTI_WALLET_ENABLED = IS_MULTI_WALLET_ENABLED;
 exports.LAST_USED_WALLET = LAST_USED_WALLET;
@@ -30,4 +33,5 @@ exports.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY = NEWTOWEB3_WALLET_EXTENSION_FLAG_KE
 exports.NONCE_STORAGE_KEY = NONCE_STORAGE_KEY;
 exports.PRIMARY_WALLET_ID = PRIMARY_WALLET_ID;
 exports.PROJECT_SETTINGS_STORAGE_KEY = PROJECT_SETTINGS_STORAGE_KEY;
+exports.WAGMI_LAST_SESSION_SETTINGS = WAGMI_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;

package/src/lib/utils/constants/localStorage.d.ts

@@ -13,3 +13,5 @@ export declare const AUTH_MODE = "dynamic_auth_mode";
 export declare const CONNECTED_WALLET_NAME_SERVICE = "dynamic_connected_wallet_ns";
 export declare const IS_FULLY_CONNECTED = "dynamic_fully_connected";
 export declare const IS_MULTI_WALLET_ENABLED = "dynamic_multi_wallet_enabled";
+export declare const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = "dynamic_context_session_settings";
+export declare const WAGMI_LAST_SESSION_SETTINGS = "dynamic_wagmi_session_settings";

package/src/lib/utils/constants/localStorage.js

@@ -12,5 +12,7 @@ const AUTH_MODE = 'dynamic_auth_mode';
 const CONNECTED_WALLET_NAME_SERVICE = 'dynamic_connected_wallet_ns';
 const IS_FULLY_CONNECTED = 'dynamic_fully_connected';
 const IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS = 'dynamic_context_session_settings';
+const WAGMI_LAST_SESSION_SETTINGS = 'dynamic_wagmi_session_settings';
 
-export { AUTH_MODE, AUTH_TOKEN, AUTH_USER, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, IS_FULLY_CONNECTED, IS_MULTI_WALLET_ENABLED, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, WALLET_PICKER_SEARCH_KEY };
+export { AUTH_MODE, AUTH_TOKEN, AUTH_USER, CONNECTED_WALLETS_INFO, CONNECTED_WALLET_NAME_SERVICE, DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, IS_FULLY_CONNECTED, IS_MULTI_WALLET_ENABLED, LAST_USED_WALLET, NETWORKS_STORAGE_KEY, NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, NONCE_STORAGE_KEY, PRIMARY_WALLET_ID, PROJECT_SETTINGS_STORAGE_KEY, WAGMI_LAST_SESSION_SETTINGS, WALLET_PICKER_SEARCH_KEY };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var utils = require('@dynamic-labs/utils');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -16,6 +15,7 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
@@ -32,7 +32,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -42,7 +42,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -72,24 +72,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                if (isBridgeFlow) {
-                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
-                        ((_a = utils.last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
-                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                    // it may happen when user switch network in connect flow on already connected wallet
-                    const isAlreadyConnected = connectedWallets.find((wallet) => walletConnectorCore.isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                    if (shouldUpdateWallets &&
-                        (!isAlreadyConnected || didConnectLastWallet)) {
-                        handleWalletsToConnect();
-                    }
-                    if (isAlreadyConnected && !didConnectLastWallet) {
-                        setView('bridge-next-wallet-connection');
-                    }
-                }
-                else {
-                    if (shouldUpdateWallets) {
-                        handleWalletsToConnect();
-                    }
+                if (shouldUpdateWallets) {
+                    handleWalletsToConnect();
                 }
                 if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
@@ -97,7 +81,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             setCallback('connectSuccess');
-            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
@@ -118,7 +102,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
             if (!userCancelled)
                 logger.logger.debug(err);
-            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
+            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
             goToInitialView();
             // Since auth failed, clear verification flag
             // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,6 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
-import { last } from '@dynamic-labs/utils';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -12,6 +11,7 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
@@ -28,7 +28,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -38,7 +38,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -68,24 +68,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                if (isBridgeFlow) {
-                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
-                        ((_a = last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
-                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                    // it may happen when user switch network in connect flow on already connected wallet
-                    const isAlreadyConnected = connectedWallets.find((wallet) => isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                    if (shouldUpdateWallets &&
-                        (!isAlreadyConnected || didConnectLastWallet)) {
-                        handleWalletsToConnect();
-                    }
-                    if (isAlreadyConnected && !didConnectLastWallet) {
-                        setView('bridge-next-wallet-connection');
-                    }
-                }
-                else {
-                    if (shouldUpdateWallets) {
-                        handleWalletsToConnect();
-                    }
+                if (shouldUpdateWallets) {
+                    handleWalletsToConnect();
                 }
                 if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
@@ -93,7 +77,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             setCallback('connectSuccess');
-            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
@@ -114,7 +98,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
             if (!userCancelled)
                 logger.debug(err);
-            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
+            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
             goToInitialView();
             // Since auth failed, clear verification flag
             // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid

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

@@ -6,7 +6,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
@@ -19,6 +19,20 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
+        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+            setShowAuthFlow(false);
+            return goToInitialView();
+        }
+        // Assuming based on the logic above that we have at least one more chain/wallet to connect
+        // If the current connected wallet is already connected to the bridge,
+        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
+        const walletChainsToConnect = walletsToConnectByChain
+            .filter((wallet) => wallet.numberOfWallets > 0)
+            .map((wallet) => wallet.chain.toString());
+        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
+            setView('bridge-next-wallet-connection');
+            return;
+        }
         const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
         if (firstWallet.numberOfWallets > 1) {
             const updatedWallets = [

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

@@ -2,7 +2,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
@@ -15,6 +15,20 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
+        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+            setShowAuthFlow(false);
+            return goToInitialView();
+        }
+        // Assuming based on the logic above that we have at least one more chain/wallet to connect
+        // If the current connected wallet is already connected to the bridge,
+        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
+        const walletChainsToConnect = walletsToConnectByChain
+            .filter((wallet) => wallet.numberOfWallets > 0)
+            .map((wallet) => wallet.chain.toString());
+        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
+            setView('bridge-next-wallet-connection');
+            return;
+        }
         const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
         if (firstWallet.numberOfWallets > 1) {
             const updatedWallets = [