@dynamic-labs/sdk-react-core 0.18.0-RC.23 → 0.18.0-RC.25

package/CHANGELOG.md

@@ -1,4 +1,29 @@
 
+## [0.18.0-RC.25](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.24...v0.18.0-RC.25) (2023-08-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* displayTermsOfService prop set to false breaks message verfication (#2790)
+
+### Bug Fixes
+
+* always call onBeforeConnectSuccess callback when wallet state ch… ([#2792](https://github.com/dynamic-labs/DynamicAuth/issues/2792)) ([ecc6a7b](https://github.com/dynamic-labs/DynamicAuth/commit/ecc6a7bf3cbee2720860294561ff8dea03d1936e)), closes [#2786](https://github.com/dynamic-labs/DynamicAuth/issues/2786)
+* displayTermsOfService prop set to false breaks message verfication ([#2790](https://github.com/dynamic-labs/DynamicAuth/issues/2790)) ([816e276](https://github.com/dynamic-labs/DynamicAuth/commit/816e276827ac6a89e6ab49afcca00705a07b2ad2)), closes [#2751](https://github.com/dynamic-labs/DynamicAuth/issues/2751)
+* ensure auto-redirect back to dapp after message signing ([#2783](https://github.com/dynamic-labs/DynamicAuth/issues/2783)) ([dba4664](https://github.com/dynamic-labs/DynamicAuth/commit/dba466473ecc2afd808cdae0fd9023d38676b01f))
+
+## [0.18.0-RC.24](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.23...v0.18.0-RC.24) (2023-08-01)
+
+
+### Features
+
+* **QNTM-156:** onBeforeConnectSuccessConfirmation on account change ([#2782](https://github.com/dynamic-labs/DynamicAuth/issues/2782)) ([eeabcd0](https://github.com/dynamic-labs/DynamicAuth/commit/eeabcd07889b7284680dc92a83bfa1b8321fa0f5))
+
+
+### Bug Fixes
+
+* **bridge:** reordering not mess connected wallets ([#2758](https://github.com/dynamic-labs/DynamicAuth/issues/2758)) ([2cdc240](https://github.com/dynamic-labs/DynamicAuth/commit/2cdc240b1f5b401880d776174646ebc9383506d2))
+
 ## [0.18.0-RC.23](https://github.com/dynamic-labs/DynamicAuth/compare/v0.18.0-RC.22...v0.18.0-RC.23) (2023-07-31)
 
 

package/package.cjs

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

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.18.0-RC.23";
+var version = "0.18.0-RC.25";
 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.18.0-RC.23",
+  "version": "0.18.0-RC.25",
   "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.0-RC.23",
-    "@dynamic-labs/multi-wallet": "0.18.0-RC.23",
-    "@dynamic-labs/rpc-providers": "0.18.0-RC.23",
-    "@dynamic-labs/types": "0.18.0-RC.23",
-    "@dynamic-labs/utils": "0.18.0-RC.23",
-    "@dynamic-labs/wallet-book": "0.18.0-RC.23",
-    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.23"
+    "@dynamic-labs/logger": "0.18.0-RC.25",
+    "@dynamic-labs/multi-wallet": "0.18.0-RC.25",
+    "@dynamic-labs/rpc-providers": "0.18.0-RC.25",
+    "@dynamic-labs/types": "0.18.0-RC.25",
+    "@dynamic-labs/utils": "0.18.0-RC.25",
+    "@dynamic-labs/wallet-book": "0.18.0-RC.25",
+    "@dynamic-labs/wallet-connector-core": "0.18.0-RC.25"
   },
   "devDependencies": {
     "semver": "7.3.8"

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

@@ -21,7 +21,6 @@ var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs'
 require('ethers');
 var useLocalStorage = require('../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 var useGlobalLoading = require('../../shared/utils/hooks/useGlobalLoading/useGlobalLoading.cjs');
-var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
 require('../../shared/consts/index.cjs');
 require('react-dom');
 require('react-focus-lock');
@@ -80,7 +79,6 @@ require('../../views/CollectUserDataView/fieldsConfig.cjs');
 require('../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 var FundingWidget = require('../../widgets/FundingWidget/FundingWidget.cjs');
 var DynamicBridgeWidgetContext = require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 var EmailVerificationContext = require('../EmailVerificationContext/EmailVerificationContext.cjs');
 var FundingContext = require('../FundingContext/FundingContext.cjs');
 var SendBalanceContext = require('../SendBalanceContext/SendBalanceContext.cjs');
@@ -101,7 +99,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
 const DynamicContextProvider = ({ children, theme, settings, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, 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, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
     let { walletConnectV1Bridge, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
     if (!environmentId) {
         throw new utils.MissingEnvironmentIdError();
@@ -199,10 +197,10 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         setShowAuthFlow,
         wallets,
     });
-    useEffectOnce.useEffectOnce(() => {
+    React.useEffect(() => {
         const missingChains = getMissingChains.getMissingChains(walletsByChain, connectedWalletsInfo);
         setWalletsToConnectByChain(missingChains);
-    });
+    }, [walletsByChain]);
     const [selectedWalletConnector, setSelectedWalletConnector] = React.useState(null);
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = React.useState(null);
@@ -428,7 +426,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
             decodedOnboardingOnlyToken: decodeJwt.decodeJwt(onboardingOnlyJwt),
             defaultNumberOfWalletsToShow,
             desktopUri,
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             eventsCallbacks,
             getConnectedWalletById,
@@ -542,7 +540,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         onboardingOnlyJwt,
         defaultNumberOfWalletsToShow,
         desktopUri,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         eventsCallbacks,
         getConnectedWalletById,

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

@@ -20,7 +20,7 @@ export interface DynamicContextProps {
         cssOverrides?: string | JSX.Element;
         debugError?: boolean;
         defaultNumberOfWalletsToShow?: number;
-        displayTermsOfService?: boolean;
+        displaySiweStatement?: boolean;
         enableVisitTrackingOnConnectOnly?: boolean;
         environmentId: string;
         localStorageSuffix?: string;

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

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { createContext, useState, useCallback, useEffect, useMemo } from 'react';
+import { createContext, useState, useEffect, useCallback, useMemo } from 'react';
 import { ICONIC_SPRITE_URL } from '@dynamic-labs/iconic';
 import { MissingEnvironmentIdError } from '@dynamic-labs/utils';
 import { useWalletBookCdn, getWalletBookCdnUrl, WalletBookContextProvider } from '@dynamic-labs/wallet-book';
@@ -17,7 +17,6 @@ import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js
 import 'ethers';
 import { useLocalStorage } from '../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import { useGlobalLoading } from '../../shared/utils/hooks/useGlobalLoading/useGlobalLoading.js';
-import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import '../../shared/consts/index.js';
 import 'react-dom';
 import 'react-focus-lock';
@@ -76,7 +75,6 @@ import '../../views/CollectUserDataView/fieldsConfig.js';
 import '../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import { FundingWidget } from '../../widgets/FundingWidget/FundingWidget.js';
 import { DynamicBridgeWidgetContextProvider } from '../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
-import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import { EmailVerificationContextProvider } from '../EmailVerificationContext/EmailVerificationContext.js';
 import { FundingContextProvider } from '../FundingContext/FundingContext.js';
 import { SendBalanceContextProvider } from '../SendBalanceContext/SendBalanceContext.js';
@@ -97,7 +95,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
 const DynamicContextProvider = ({ children, theme, settings, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displayTermsOfService = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
+    const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, walletsByChain, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', multiWallet: deprecatedMultiWallet, notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, } = settings;
     let { walletConnectV1Bridge, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
     if (!environmentId) {
         throw new MissingEnvironmentIdError();
@@ -195,10 +193,10 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         setShowAuthFlow,
         wallets,
     });
-    useEffectOnce(() => {
+    useEffect(() => {
         const missingChains = getMissingChains(walletsByChain, connectedWalletsInfo);
         setWalletsToConnectByChain(missingChains);
-    });
+    }, [walletsByChain]);
     const [selectedWalletConnector, setSelectedWalletConnector] = useState(null);
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = useState(null);
@@ -424,7 +422,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
             decodedOnboardingOnlyToken: decodeJwt(onboardingOnlyJwt),
             defaultNumberOfWalletsToShow,
             desktopUri,
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             eventsCallbacks,
             getConnectedWalletById,
@@ -538,7 +536,7 @@ const DynamicContextProvider = ({ children, theme, settings, }) => {
         onboardingOnlyJwt,
         defaultNumberOfWalletsToShow,
         desktopUri,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         eventsCallbacks,
         getConnectedWalletById,

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

@@ -47,7 +47,7 @@ export interface IDynamicContext {
     walletsToConnectByChain: ChainsToConnect[] | undefined;
     setWalletsToConnectByChain: Dispatch<SetStateAction<ChainsToConnect[] | undefined>>;
     desktopUri: string;
-    displayTermsOfService: boolean;
+    displaySiweStatement: boolean;
     environmentId: string;
     eventsCallbacks?: DynamicEventsCallbacks;
     getConnectedWalletById: (walletId: string) => Wallet | undefined;

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.cjs

@@ -46,12 +46,12 @@ require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 const SocialRedirectContext = React.createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.js

@@ -42,12 +42,12 @@ import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 const SocialRedirectContext = createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -80,7 +80,7 @@ export interface ProjectSettingsProps {
 export type WalletProvider = `${WalletProviderEnum}`;
 export interface VerifyWallet {
     captchaToken?: string;
-    chain: string;
+    chain: string | undefined;
     messageToSign: string;
     network: string | number | undefined;
     oauth?: OauthProviderRequest;
@@ -102,7 +102,7 @@ export type OnAuthSuccess = (params: {
 export type OnConnectSuccess = (params: {
     walletConnector: WalletConnector | null;
 }) => void;
-export type OnBeforeConnectSuccessConfirmation = (walletAddress: string) => Promise<boolean>;
+export type OnBeforeConnectSuccessConfirmation = (wallet: Partial<Wallet>) => Promise<boolean>;
 export type OnUserProfileUpdate = (user: UserProfile) => void;
 export type MultiWalletWidgetState = 'idle' | 'awaiting_account_switch' | 'awaiting_connection' | 'awaiting_signature' | 'detected_new_wallet';
 export type AccountSwitchState = 'idle' | 'linking_new_wallet' | 'switching_primary' | 'primary_not_connected';

package/src/lib/utils/functions/generateMessages/index.cjs

@@ -6,7 +6,7 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var multiWallet = require('@dynamic-labs/multi-wallet');
 var utils = require('@dynamic-labs/utils');
 
-const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displayTermsOfService, siweStatement) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displaySiweStatement, siweStatement) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (publicWalletAddress === undefined) {
         throw new utils.DynamicError('Unable to fetch the public address from the wallet');
     }
@@ -30,9 +30,9 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
         publicKey: publicWalletAddress,
         requestId: projectEnvironmentId,
         resources: walletConnector.providerResources,
-        statement: displayTermsOfService
+        statement: displaySiweStatement
             ? siweStatement.replace(/(\r\n|\n|\r)/gm, ' ').trim()
-            : '',
+            : undefined,
         uri: window.location.href,
     });
     const signedMessage = yield walletConnector.proveOwnership(messageToSign);

package/src/lib/utils/functions/generateMessages/index.d.ts

@@ -1,5 +1,5 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-export declare const generateMessages: (publicWalletAddress: string | undefined, walletConnector: WalletConnector, nonce: string, projectEnvironmentId: string, displayTermsOfService: boolean, siweStatement: string) => Promise<{
+export declare const generateMessages: (publicWalletAddress: string | undefined, walletConnector: WalletConnector, nonce: string, projectEnvironmentId: string, displaySiweStatement: boolean, siweStatement: string) => Promise<{
     messageToSign: string;
     signedMessage: string;
 }>;

package/src/lib/utils/functions/generateMessages/index.js

@@ -2,7 +2,7 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { generateMessageToSign } from '@dynamic-labs/multi-wallet';
 import { DynamicError } from '@dynamic-labs/utils';
 
-const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displayTermsOfService, siweStatement) => __awaiter(void 0, void 0, void 0, function* () {
+const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEnvironmentId, displaySiweStatement, siweStatement) => __awaiter(void 0, void 0, void 0, function* () {
     if (publicWalletAddress === undefined) {
         throw new DynamicError('Unable to fetch the public address from the wallet');
     }
@@ -26,9 +26,9 @@ const generateMessages = (publicWalletAddress, walletConnector, nonce, projectEn
         publicKey: publicWalletAddress,
         requestId: projectEnvironmentId,
         resources: walletConnector.providerResources,
-        statement: displayTermsOfService
+        statement: displaySiweStatement
             ? siweStatement.replace(/(\r\n|\n|\r)/gm, ' ').trim()
-            : '',
+            : undefined,
         uri: window.location.href,
     });
     const signedMessage = yield walletConnector.proveOwnership(messageToSign);

package/src/lib/utils/functions/getVerifyArgs/getVerifyArgs.cjs

@@ -6,7 +6,7 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var index = require('../generateMessages/index.cjs');
 
 // TODO - This function is doing too much we should split it up.
-const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     // WARNING - PLEASE READ!
     // DO NOT ADD ANY NEW ASYNC WORK WITH AWAIT!
     // Deep linking could break with too many blocking awaits
@@ -15,7 +15,7 @@ const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId,
     // instead of the actual wallet app.
     const chain = walletConnector.connectedChain;
     // generate message to sign and then initiate signing step to prove ownership
-    const { messageToSign, signedMessage } = yield index.generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displayTermsOfService, siweStatement);
+    const { messageToSign, signedMessage } = yield index.generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);
     const network = String(yield walletConnector.getNetwork());
     return {
         chain,

package/src/lib/utils/functions/getVerifyArgs/getVerifyArgs.d.ts

@@ -2,7 +2,7 @@ import { FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
 import { WalletConnector } from '../../../..';
 import { WalletProvider } from '../../../shared';
 type Props = {
-    displayTermsOfService: boolean;
+    displaySiweStatement: boolean;
     environmentId: string;
     fetchPublicAddressOpts?: FetchPublicAddressOpts;
     nonce: string;
@@ -12,8 +12,8 @@ type Props = {
     walletConnector: WalletConnector;
     walletProvider: WalletProvider;
 };
-export declare const getVerifyArgs: ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }: Props) => Promise<{
-    chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS";
+export declare const getVerifyArgs: ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }: Props) => Promise<{
+    chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS" | undefined;
     messageToSign: string;
     network: string;
     publicWalletAddress: string;

package/src/lib/utils/functions/getVerifyArgs/getVerifyArgs.js

@@ -2,7 +2,7 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { generateMessages } from '../generateMessages/index.js';
 
 // TODO - This function is doing too much we should split it up.
-const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
     // WARNING - PLEASE READ!
     // DO NOT ADD ANY NEW ASYNC WORK WITH AWAIT!
     // Deep linking could break with too many blocking awaits
@@ -11,7 +11,7 @@ const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId,
     // instead of the actual wallet app.
     const chain = walletConnector.connectedChain;
     // generate message to sign and then initiate signing step to prove ownership
-    const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displayTermsOfService, siweStatement);
+    const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);
     const network = String(yield walletConnector.getNetwork());
     return {
         chain,

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

@@ -32,11 +32,11 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -28,11 +28,11 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -29,11 +29,11 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -25,11 +25,11 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -23,10 +23,10 @@ require('../../../../shared/consts/index.cjs');
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -19,10 +19,10 @@ import '../../../../shared/consts/index.js';
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, } = useInternalDynamicContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

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

@@ -107,6 +107,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: currentWalletConnectorAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
+            if (!shouldProceedWithConnection) {
+                walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                unlinkConnectedWallet(walletId);
+                setShowAuthFlow(false);
+                return;
+            }
+        }
         if (!currentWalletConnectorAddress) {
             walletConnectorCore.logger.error('Could not refresh the wallet. The wallet address is not available');
             return;
@@ -127,7 +140,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             throw error;
         }
         if (onBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation(publicWalletAddress);
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: publicWalletAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
             if (!shouldProceedWithConnection) {
                 walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
                 setShowAuthFlow(false);

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

@@ -103,6 +103,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
+        if (onBeforeConnectSuccessConfirmation) {
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: currentWalletConnectorAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
+            if (!shouldProceedWithConnection) {
+                logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                unlinkConnectedWallet(walletId);
+                setShowAuthFlow(false);
+                return;
+            }
+        }
         if (!currentWalletConnectorAddress) {
             logger.error('Could not refresh the wallet. The wallet address is not available');
             return;
@@ -123,7 +136,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             throw error;
         }
         if (onBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation(publicWalletAddress);
+            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+                address: publicWalletAddress,
+                chain: walletConnector.connectedChain,
+                connector: walletConnector,
+            });
             if (!shouldProceedWithConnection) {
                 logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
                 setShowAuthFlow(false);

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

@@ -33,7 +33,7 @@ var AccountExistsContext = require('../../../context/AccountExistsContext/Accoun
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
@@ -49,7 +49,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             fetchPublicAddressOpts,
             nonce,

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

@@ -2,8 +2,8 @@ import { Dispatch, SetStateAction } from 'react';
 import { ProjectSettingsProps, VerifyProps, VerifyCallbackArgs } from '../../../shared/types';
 type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     consumeNonce: () => string | undefined;
-    displayTermsOfService: boolean;
+    displaySiweStatement: boolean;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
 };
-export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }: VerifyCallbackArgs) => Promise<void>;
+export declare const useVerifyWallet: ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }: VerifyCallbackArgs) => Promise<void>;
 export {};

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

@@ -29,7 +29,7 @@ import { useAccountExistsContext } from '../../../context/AccountExistsContext/A
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
@@ -45,7 +45,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         if (nonce === undefined)
             throw new DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs({
-            displayTermsOfService,
+            displaySiweStatement,
             environmentId,
             fetchPublicAddressOpts,
             nonce,

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -47,12 +47,12 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { setCaptchaToken } = CaptchaContext.useCaptchaContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -43,12 +43,12 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext();
+    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { setCaptchaToken } = useCaptchaContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,

package/src/lib/views/WalletUsedView/WalletUsedView.cjs

@@ -61,7 +61,7 @@ const WalletUsedView = () => {
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
-    const { environmentId, displayTermsOfService, authToken, setCallback, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, displaySiweStatement, authToken, setCallback, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext.useInternalDynamicContext();
     React.useEffect(() => {
         const _fetchPublicAddress = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             const address = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.fetchPublicAddress());
@@ -110,7 +110,7 @@ const WalletUsedView = () => {
             }
             const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
             const verifyArgs = yield getVerifyArgs.getVerifyArgs({
-                displayTermsOfService,
+                displaySiweStatement,
                 environmentId,
                 nonce,
                 publicWalletAddress,

package/src/lib/views/WalletUsedView/WalletUsedView.js

@@ -57,7 +57,7 @@ const WalletUsedView = () => {
     const { setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
     const { setView, goToInitialView } = useViewContext();
-    const { environmentId, displayTermsOfService, authToken, setCallback, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
+    const { environmentId, displaySiweStatement, authToken, setCallback, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
     useEffect(() => {
         const _fetchPublicAddress = () => __awaiter(void 0, void 0, void 0, function* () {
             const address = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.fetchPublicAddress());
@@ -106,7 +106,7 @@ const WalletUsedView = () => {
             }
             const walletProvider = getWalletProvider(walletConnector);
             const verifyArgs = yield getVerifyArgs({
-                displayTermsOfService,
+                displaySiweStatement,
                 environmentId,
                 nonce,
                 publicWalletAddress,

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.cjs

@@ -50,7 +50,7 @@ var DynamicBridgeUserProfile = require('./components/DynamicBridgeUserProfile/Dy
 var DynamicBridgeWidgetContext = require('./context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
 
 const DynamicBridgeWidget = ({ className, variant = 'modal', }) => {
-    const { showAuthFlow, setShowBridgeWidget, walletsByChain, setShowAuthFlow, getConnectedWalletById, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { showAuthFlow, setShowBridgeWidget, walletsByChain, setShowAuthFlow, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { widgetRef, inlineControlsRef } = DynamicBridgeWidgetContext.useDynamicBridgeWidgetContext();
     const closeOnOutsideClick = React.useCallback((e) => {
         var _a;
@@ -62,11 +62,11 @@ const DynamicBridgeWidget = ({ className, variant = 'modal', }) => {
         }
     }, [inlineControlsRef, variant, showAuthFlow, setShowBridgeWidget]);
     index.useOnClickOutside(widgetRef, closeOnOutsideClick);
-    return (jsxRuntime.jsx(IsBrowser.IsBrowser, { children: jsxRuntime.jsxs(ShadowDOM.ShadowDOM, Object.assign({ id: 'dynamic-bridge-widget', className: 'dynamic-widget__container' }, { children: [jsxRuntime.jsx(InlineWidget.InlineWidget, Object.assign({ ref: inlineControlsRef, className: className, dataTestId: 'BridgeWidgetNav' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }, index) => {
+    return (jsxRuntime.jsx(IsBrowser.IsBrowser, { children: jsxRuntime.jsxs(ShadowDOM.ShadowDOM, Object.assign({ id: 'dynamic-bridge-widget', className: 'dynamic-widget__container' }, { children: [jsxRuntime.jsx(InlineWidget.InlineWidget, Object.assign({ ref: inlineControlsRef, className: className, dataTestId: 'BridgeWidgetNav' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
                         const ChainIcon = getChainIcon.getChainIcon(chain);
-                        const wallet = getConnectedWalletById(`connect-wallet-${index}`);
-                        if (wallet) {
-                            return (jsxRuntime.jsx(InlineWidgetButton.InlineWidgetButton, Object.assign({ icon: jsxRuntime.jsx(ChainIcon, {}), onClick: () => setShowBridgeWidget(true) }, { children: shortenWalletAddress.shortenWalletAddress(wallet.address, 3, 3) }), chain));
+                        const connectedChainWallets = connectedWallets.filter(({ chain: connectedChain }) => connectedChain === chain);
+                        if (connectedChainWallets.length > 0) {
+                            return connectedChainWallets.map((wallet) => (jsxRuntime.jsx(InlineWidgetButton.InlineWidgetButton, Object.assign({ icon: jsxRuntime.jsx(ChainIcon, {}), onClick: () => setShowBridgeWidget(true) }, { children: shortenWalletAddress.shortenWalletAddress(wallet.address, 3, 3) }), wallet.id)));
                         }
                         return (jsxRuntime.jsx(InlineWidgetButton.InlineWidgetButton, Object.assign({ icon: jsxRuntime.jsx(ChainIcon, {}), onClick: () => setShowAuthFlow(true) }, { children: "Connect wallet" }), chain));
                     }) })), jsxRuntime.jsx(DynamicBridgeUserProfile.DynamicBridgeUserProfile, { variant: variant })] })) }));

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.js

@@ -46,7 +46,7 @@ import { DynamicBridgeUserProfile } from './components/DynamicBridgeUserProfile/
 import { useDynamicBridgeWidgetContext } from './context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
 
 const DynamicBridgeWidget = ({ className, variant = 'modal', }) => {
-    const { showAuthFlow, setShowBridgeWidget, walletsByChain, setShowAuthFlow, getConnectedWalletById, } = useInternalDynamicContext();
+    const { showAuthFlow, setShowBridgeWidget, walletsByChain, setShowAuthFlow, connectedWallets, } = useInternalDynamicContext();
     const { widgetRef, inlineControlsRef } = useDynamicBridgeWidgetContext();
     const closeOnOutsideClick = useCallback((e) => {
         var _a;
@@ -58,11 +58,11 @@ const DynamicBridgeWidget = ({ className, variant = 'modal', }) => {
         }
     }, [inlineControlsRef, variant, showAuthFlow, setShowBridgeWidget]);
     useOnClickOutside(widgetRef, closeOnOutsideClick);
-    return (jsx(IsBrowser, { children: jsxs(ShadowDOM, Object.assign({ id: 'dynamic-bridge-widget', className: 'dynamic-widget__container' }, { children: [jsx(InlineWidget, Object.assign({ ref: inlineControlsRef, className: className, dataTestId: 'BridgeWidgetNav' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }, index) => {
+    return (jsx(IsBrowser, { children: jsxs(ShadowDOM, Object.assign({ id: 'dynamic-bridge-widget', className: 'dynamic-widget__container' }, { children: [jsx(InlineWidget, Object.assign({ ref: inlineControlsRef, className: className, dataTestId: 'BridgeWidgetNav' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
                         const ChainIcon = getChainIcon(chain);
-                        const wallet = getConnectedWalletById(`connect-wallet-${index}`);
-                        if (wallet) {
-                            return (jsx(InlineWidgetButton, Object.assign({ icon: jsx(ChainIcon, {}), onClick: () => setShowBridgeWidget(true) }, { children: shortenWalletAddress(wallet.address, 3, 3) }), chain));
+                        const connectedChainWallets = connectedWallets.filter(({ chain: connectedChain }) => connectedChain === chain);
+                        if (connectedChainWallets.length > 0) {
+                            return connectedChainWallets.map((wallet) => (jsx(InlineWidgetButton, Object.assign({ icon: jsx(ChainIcon, {}), onClick: () => setShowBridgeWidget(true) }, { children: shortenWalletAddress(wallet.address, 3, 3) }), wallet.id)));
                         }
                         return (jsx(InlineWidgetButton, Object.assign({ icon: jsx(ChainIcon, {}), onClick: () => setShowAuthFlow(true) }, { children: "Connect wallet" }), chain));
                     }) })), jsx(DynamicBridgeUserProfile, { variant: variant })] })) }));

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/WalletsView.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var DynamicWidgetFooter = require('../../../DynamicWidget/components/DynamicWidgetFooter/DynamicWidgetFooter.cjs');
 require('react');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
@@ -44,20 +43,24 @@ require('formik');
 require('yup');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
+var Balance = require('../../../DynamicWidget/components/Balance/Balance.cjs');
+var DynamicWidgetFooter = require('../../../DynamicWidget/components/DynamicWidgetFooter/DynamicWidgetFooter.cjs');
 var DynamicBridgeWalletCard = require('../../components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.cjs');
 var DynamicBridgeWalletCardBody = require('../../components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.cjs');
-var Balance = require('../../../DynamicWidget/components/Balance/Balance.cjs');
 var DynamicBridgeWidgetEmptyCard = require('../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.cjs');
-var SecondaryWallets = require('./components/SecondaryWallets/SecondaryWallets.cjs');
 
 const WalletsView = () => {
-    const { unlinkConnectedWallet, walletsByChain, getConnectedWalletById } = useInternalDynamicContext.useInternalDynamicContext();
-    const firstWallet = getConnectedWalletById('connect-wallet-0');
-    const PrimaryWalletChainIcon = firstWallet && getChainIcon.getChainIcon(firstWallet.chain);
-    const primaryWalletChainInfo = firstWallet && walletConnectorCore.getChainInfo(firstWallet.chain);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", Object.assign({ className: 'dynamic-bridge-widget-wallets-view' }, { children: [firstWallet && PrimaryWalletChainIcon && (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, Object.assign({ networkIcon: jsxRuntime.jsx(PrimaryWalletChainIcon, {}), networkName: primaryWalletChainInfo === null || primaryWalletChainInfo === void 0 ? void 0 : primaryWalletChainInfo.displayName }, { children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletName: firstWallet.connector.name, walletAddress: firstWallet.address, walletBalance: 
-                            // eslint-disable-next-line react/jsx-wrap-multilines
-                            jsxRuntime.jsx(Balance.Balance, { address: firstWallet.address, connector: firstWallet.connector, network: firstWallet.chain }), onUnlinkClick: () => unlinkConnectedWallet(firstWallet.id) }) }))), !firstWallet && (jsxRuntime.jsx(DynamicBridgeWidgetEmptyCard.DynamicBridgeWidgetEmptyCard, { chain: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain[0].chain })), jsxRuntime.jsx(SecondaryWallets.MemoSecondaryWallets, {})] })), jsxRuntime.jsx(DynamicWidgetFooter.DynamicWidgetFooter, { children: jsxRuntime.jsx(LogoutButton.LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
+    const { unlinkConnectedWallet, walletsByChain, connectedWallets } = useInternalDynamicContext.useInternalDynamicContext();
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'dynamic-bridge-widget-wallets-view' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
+                    const chainWallets = connectedWallets.filter(({ chain: walletChain }) => chain === walletChain);
+                    // "Connect wallet" for empty chains
+                    if (!chainWallets.length)
+                        return jsxRuntime.jsx(DynamicBridgeWidgetEmptyCard.DynamicBridgeWidgetEmptyCard, { chain: chain });
+                    const WalletIcon = getChainIcon.getChainIcon(chain);
+                    const walletInfo = walletConnectorCore.getChainInfo(chain);
+                    // Wallets info for chains with connected wallets
+                    return chainWallets.map(({ connector, address, id }) => (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, Object.assign({ networkIcon: jsxRuntime.jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName }, { children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletName: connector.name, walletAddress: address, walletBalance: jsxRuntime.jsx(Balance.Balance, { address: address, connector: connector, network: chain }), onUnlinkClick: () => unlinkConnectedWallet(id) }) }), id)));
+                }) })), jsxRuntime.jsx(DynamicWidgetFooter.DynamicWidgetFooter, { children: jsxRuntime.jsx(LogoutButton.LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
 };
 
 exports.WalletsView = WalletsView;

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/WalletsView.js

@@ -1,6 +1,5 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { getChainInfo } from '@dynamic-labs/wallet-connector-core';
-import { DynamicWidgetFooter } from '../../../DynamicWidget/components/DynamicWidgetFooter/DynamicWidgetFooter.js';
 import 'react';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
@@ -40,20 +39,24 @@ import 'formik';
 import 'yup';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import { Balance } from '../../../DynamicWidget/components/Balance/Balance.js';
+import { DynamicWidgetFooter } from '../../../DynamicWidget/components/DynamicWidgetFooter/DynamicWidgetFooter.js';
 import { DynamicBridgeWalletCard } from '../../components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.js';
 import { DynamicBridgeWalletCardBody } from '../../components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.js';
-import { Balance } from '../../../DynamicWidget/components/Balance/Balance.js';
 import { DynamicBridgeWidgetEmptyCard } from '../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.js';
-import { MemoSecondaryWallets } from './components/SecondaryWallets/SecondaryWallets.js';
 
 const WalletsView = () => {
-    const { unlinkConnectedWallet, walletsByChain, getConnectedWalletById } = useInternalDynamicContext();
-    const firstWallet = getConnectedWalletById('connect-wallet-0');
-    const PrimaryWalletChainIcon = firstWallet && getChainIcon(firstWallet.chain);
-    const primaryWalletChainInfo = firstWallet && getChainInfo(firstWallet.chain);
-    return (jsxs(Fragment, { children: [jsxs("div", Object.assign({ className: 'dynamic-bridge-widget-wallets-view' }, { children: [firstWallet && PrimaryWalletChainIcon && (jsx(DynamicBridgeWalletCard, Object.assign({ networkIcon: jsx(PrimaryWalletChainIcon, {}), networkName: primaryWalletChainInfo === null || primaryWalletChainInfo === void 0 ? void 0 : primaryWalletChainInfo.displayName }, { children: jsx(DynamicBridgeWalletCardBody, { walletName: firstWallet.connector.name, walletAddress: firstWallet.address, walletBalance: 
-                            // eslint-disable-next-line react/jsx-wrap-multilines
-                            jsx(Balance, { address: firstWallet.address, connector: firstWallet.connector, network: firstWallet.chain }), onUnlinkClick: () => unlinkConnectedWallet(firstWallet.id) }) }))), !firstWallet && (jsx(DynamicBridgeWidgetEmptyCard, { chain: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain[0].chain })), jsx(MemoSecondaryWallets, {})] })), jsx(DynamicWidgetFooter, { children: jsx(LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
+    const { unlinkConnectedWallet, walletsByChain, connectedWallets } = useInternalDynamicContext();
+    return (jsxs(Fragment, { children: [jsx("div", Object.assign({ className: 'dynamic-bridge-widget-wallets-view' }, { children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
+                    const chainWallets = connectedWallets.filter(({ chain: walletChain }) => chain === walletChain);
+                    // "Connect wallet" for empty chains
+                    if (!chainWallets.length)
+                        return jsx(DynamicBridgeWidgetEmptyCard, { chain: chain });
+                    const WalletIcon = getChainIcon(chain);
+                    const walletInfo = getChainInfo(chain);
+                    // Wallets info for chains with connected wallets
+                    return chainWallets.map(({ connector, address, id }) => (jsx(DynamicBridgeWalletCard, Object.assign({ networkIcon: jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName }, { children: jsx(DynamicBridgeWalletCardBody, { walletName: connector.name, walletAddress: address, walletBalance: jsx(Balance, { address: address, connector: connector, network: chain }), onUnlinkClick: () => unlinkConnectedWallet(id) }) }), id)));
+                }) })), jsx(DynamicWidgetFooter, { children: jsx(LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
 };
 
 export { WalletsView, WalletsView as default };