@dynamic-labs/sdk-react-core 0.18.13 → 0.18.15

package/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+### [0.18.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.14...v0.18.15) (2023-09-11)
+
+
+### Bug Fixes
+
+* sdkSettings should call once per session ([#3189](https://github.com/dynamic-labs/DynamicAuth/issues/3189)) ([#3264](https://github.com/dynamic-labs/DynamicAuth/issues/3264)) ([3f503bb](https://github.com/dynamic-labs/DynamicAuth/commit/3f503bbd43107a22c78d18d8e01e7ea26c83f36c))
+* wallet transition in the bridge ([#3268](https://github.com/dynamic-labs/DynamicAuth/issues/3268)) ([8568387](https://github.com/dynamic-labs/DynamicAuth/commit/8568387461da80c5342f53313ce1dda7647320fa)), closes [#3243](https://github.com/dynamic-labs/DynamicAuth/issues/3243)
+
+### [0.18.14](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.13...v0.18.14) (2023-09-05)
+
+
+### Features
+
+* add onSignedMessage callback ([#3213](https://github.com/dynamic-labs/DynamicAuth/issues/3213)) ([648defa](https://github.com/dynamic-labs/DynamicAuth/commit/648defa1c5f84805e5dcdbb98a30be2a47f53ed7))
+
+
+### Bug Fixes
+
+* prefer mainnet chain id when connecting with WCv2 ([#3219](https://github.com/dynamic-labs/DynamicAuth/issues/3219)) ([6ee8fb6](https://github.com/dynamic-labs/DynamicAuth/commit/6ee8fb6c0565e759837f45179de12c985ac0dd71))
+
 ### [0.18.13](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.12...v0.18.13) (2023-08-31)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.18.13";
+var version = "0.18.15";
 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.13";
+var version = "0.18.15";
 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.13",
+  "version": "0.18.15",
   "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.18.13",
-    "@dynamic-labs/multi-wallet": "0.18.13",
-    "@dynamic-labs/rpc-providers": "0.18.13",
-    "@dynamic-labs/types": "0.18.13",
-    "@dynamic-labs/utils": "0.18.13",
-    "@dynamic-labs/wallet-book": "0.18.13",
-    "@dynamic-labs/wallet-connector-core": "0.18.13",
+    "@dynamic-labs/logger": "0.18.15",
+    "@dynamic-labs/multi-wallet": "0.18.15",
+    "@dynamic-labs/rpc-providers": "0.18.15",
+    "@dynamic-labs/types": "0.18.15",
+    "@dynamic-labs/utils": "0.18.15",
+    "@dynamic-labs/wallet-book": "0.18.15",
+    "@dynamic-labs/wallet-connector-core": "0.18.15",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -11,12 +11,15 @@ 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('ethers');
 var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
+let sdkSettingsTimer;
+const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt.decodeJwt(token);
     if (!decoded) {
@@ -65,8 +68,32 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
         return 'bridge-welcome';
     }
     return 'wallet-list';
+};
+const setSDKSessionSettings = () => {
+    const timestamp = new Date().getTime();
+    localStorage.LocalStorage.setToLS(localStorage$1.SDK_LAST_SESSION_SETTINGS, timestamp.toString());
+    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+};
+const isSDKSessionSettingExpired = () => {
+    const lastSentTime = localStorage.LocalStorage.getFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+    // 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(sdkSettingsTimer);
+        localStorage.LocalStorage.removeFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+        return true;
+    }
+    return false;
 };
 
 exports.getInitialView = getInitialView;
 exports.initExpirationTime = initExpirationTime;
 exports.isAuthTokenExpired = isAuthTokenExpired;
+exports.isSDKSessionSettingExpired = isSDKSessionSettingExpired;
+exports.sdkSettingsTimeout = sdkSettingsTimeout;
+exports.setSDKSessionSettings = setSDKSessionSettings;

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,5 @@ export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBrid
     isFullyConnected: boolean;
     isMultiWalletEnabled: boolean;
 }) => ViewType;
+export declare const setSDKSessionSettings: () => void;
+export declare const isSDKSessionSettingExpired: () => boolean;

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

@@ -7,12 +7,15 @@ import 'react';
 import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
+import { SDK_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 'ethers';
 import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
+let sdkSettingsTimer;
+const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt(token);
     if (!decoded) {
@@ -61,6 +64,27 @@ const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isFull
         return 'bridge-welcome';
     }
     return 'wallet-list';
+};
+const setSDKSessionSettings = () => {
+    const timestamp = new Date().getTime();
+    LocalStorage.setToLS(SDK_LAST_SESSION_SETTINGS, timestamp.toString());
+    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+};
+const isSDKSessionSettingExpired = () => {
+    const lastSentTime = LocalStorage.getFromLS(SDK_LAST_SESSION_SETTINGS);
+    // 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(sdkSettingsTimer);
+        LocalStorage.removeFromLS(SDK_LAST_SESSION_SETTINGS);
+        return true;
+    }
+    return false;
 };
 
-export { getInitialView, initExpirationTime, isAuthTokenExpired };
+export { getInitialView, initExpirationTime, isAuthTokenExpired, isSDKSessionSettingExpired, sdkSettingsTimeout, setSDKSessionSettings };

package/src/lib/data/api.cjs

@@ -18,6 +18,7 @@ require('../utils/constants/colors.cjs');
 require('../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../shared/consts/index.cjs');
+var helpers = require('../context/DynamicContext/helpers.cjs');
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -400,6 +401,11 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
+        const isSettingsExpired = helpers.isSDKSessionSettingExpired();
+        // sent once. no need to send again
+        if (!isSettingsExpired) {
+            return;
+        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
         if (dynamicContextProps || dynamicWagmiSettings) {
             yield sdkApi().logDynamicSdkSettings({
@@ -410,6 +416,7 @@ const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(voi
                 },
             });
         }
+        helpers.setSDKSessionSettings();
     }
     catch (e) {
         logger.logger.error(e);

package/src/lib/data/api.js

@@ -14,6 +14,7 @@ import '../utils/constants/colors.js';
 import '../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../shared/consts/index.js';
+import { isSDKSessionSettingExpired, setSDKSessionSettings } from '../context/DynamicContext/helpers.js';
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -396,6 +397,11 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, void 0, void 0, function* () {
     try {
+        const isSettingsExpired = isSDKSessionSettingExpired();
+        // sent once. no need to send again
+        if (!isSettingsExpired) {
+            return;
+        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
         if (dynamicContextProps || dynamicWagmiSettings) {
             yield sdkApi().logDynamicSdkSettings({
@@ -406,6 +412,7 @@ const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, vo
                 },
             });
         }
+        setSDKSessionSettings();
     }
     catch (e) {
         logger.error(e);

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

@@ -142,6 +142,10 @@ export type DynamicRPCProviders = {
     solanaProviders: SolanaRpcProvider[] | undefined;
 };
 export type DynamicEventsCallbacks = {
+    onSignedMessage?: (params: {
+        messageToSign: string;
+        signedMessage: string;
+    }) => void;
     onAuthFlowClose?: () => void;
     onAuthFlowOpen?: () => void;
     onAuthSuccess?: OnAuthSuccess;

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

@@ -15,7 +15,8 @@ const CONNECTED_WALLETS_INFO = 'dynamic_connected_wallets';
 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 IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const SDK_LAST_SESSION_SETTINGS = 'dynamic_session_settings';
 
 exports.AUTH_MODE = AUTH_MODE;
 exports.AUTH_TOKEN = AUTH_TOKEN;
@@ -30,4 +31,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.SDK_LAST_SESSION_SETTINGS = SDK_LAST_SESSION_SETTINGS;
 exports.WALLET_PICKER_SEARCH_KEY = WALLET_PICKER_SEARCH_KEY;

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

@@ -13,3 +13,4 @@ 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 SDK_LAST_SESSION_SETTINGS = "dynamic_session_settings";

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

@@ -11,6 +11,7 @@ const CONNECTED_WALLETS_INFO = 'dynamic_connected_wallets';
 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 IS_MULTI_WALLET_ENABLED = 'dynamic_multi_wallet_enabled';
+const SDK_LAST_SESSION_SETTINGS = 'dynamic_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, 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, SDK_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 = [

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

@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -68,7 +68,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (Jwt === undefined)
             throw new utils.DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
-        return Jwt;
+        return { Jwt, verifyArgs };
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
@@ -143,13 +143,23 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         }
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
         try {
             setIsVerificationInProgress(true);
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const { Jwt, verifyArgs } = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new utils.DynamicError('Invalid token!');
+            try {
+                (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onSignedMessage) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
+                    messageToSign: verifyArgs.messageToSign,
+                    signedMessage: verifyArgs.signedMessage,
+                });
+            }
+            catch (_b) {
+                logger.logger.warn('Error calling onSignedMessage callback');
+            }
             const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);

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

@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -64,7 +64,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (Jwt === undefined)
             throw new DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
-        return Jwt;
+        return { Jwt, verifyArgs };
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
@@ -139,13 +139,23 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         }
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const walletProvider = getWalletProvider(walletConnector);
         try {
             setIsVerificationInProgress(true);
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const { Jwt, verifyArgs } = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new DynamicError('Invalid token!');
+            try {
+                (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onSignedMessage) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
+                    messageToSign: verifyArgs.messageToSign,
+                    signedMessage: verifyArgs.signedMessage,
+                });
+            }
+            catch (_b) {
+                logger.warn('Error calling onSignedMessage callback');
+            }
             const user = yield createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);