@dynamic-labs/sdk-react-core 3.0.0-alpha.10 → 3.0.0-alpha.12

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

@@ -0,0 +1,10 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+
+const getPlatformForConnector = (connector) => utils.isMobile() || connector.isWalletConnect ? 'mobile' : 'browserExtension';
+
+exports.getPlatformForConnector = getPlatformForConnector;

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

@@ -0,0 +1,3 @@
+import { WalletSchema } from '@dynamic-labs/wallet-book';
+import { WalletConnector } from '../../../..';
+export declare const getPlatformForConnector: (connector: WalletConnector) => keyof NonNullable<WalletSchema['walletLimitations']>;

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

@@ -0,0 +1,6 @@
+'use client'
+import { isMobile } from '@dynamic-labs/utils';
+
+const getPlatformForConnector = (connector) => isMobile() || connector.isWalletConnect ? 'mobile' : 'browserExtension';
+
+export { getPlatformForConnector };

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

@@ -0,0 +1 @@
+export * from './getPlatformForConnector';

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

@@ -78,3 +78,4 @@ export * from './getExpiresAt';
 export * from './getSupportedCountriesForVerificationFromProjectSettings';
 export * from './getDefaultCountriesIfEmpty';
 export * from './logVerboseTroubleshootingMessage';
+export * from './getPlatformForConnector';

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.cjs

@@ -7,7 +7,7 @@ var filterConnectedWallets = require('../filterConnectedWallets/filterConnectedW
 var staticLinkedWalletFilter = require('../staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
 var filterWalletConnectWallets = require('../filterWalletConnectWallets/filterWalletConnectWallets.cjs');
 
-const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, walletBook, }) => {
     const walletList = filterWalletConnectWallets.filterWalletConnectWallets({
         userWallets,
         walletOptions,
@@ -18,7 +18,7 @@ const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
             walletOptions: walletList,
         });
     }
-    return staticLinkedWalletFilter.staticWalletFilter(userWallets, walletList);
+    return staticLinkedWalletFilter.staticWalletFilter(userWallets, walletList, walletBook);
 };
 
 exports.applyMultiWalletFilters = applyMultiWalletFilters;

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.d.ts

@@ -1,6 +1,8 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { AuthModeType, Wallet, WalletOption } from '../../../../../shared';
-export declare const applyMultiWalletFilters: ({ authMode, userWallets, walletOptions, }: {
+export declare const applyMultiWalletFilters: ({ authMode, userWallets, walletOptions, walletBook, }: {
     authMode: AuthModeType;
     userWallets: Wallet[];
     walletOptions: WalletOption[];
+    walletBook: WalletBookSchema;
 }) => WalletOption[];

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.js

@@ -3,7 +3,7 @@ import { filterConnectedWallets } from '../filterConnectedWallets/filterConnecte
 import { staticWalletFilter } from '../staticLinkedWalletFilter/staticLinkedWalletFilter.js';
 import { filterWalletConnectWallets } from '../filterWalletConnectWallets/filterWalletConnectWallets.js';
 
-const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, walletBook, }) => {
     const walletList = filterWalletConnectWallets({
         userWallets,
         walletOptions,
@@ -14,7 +14,7 @@ const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
             walletOptions: walletList,
         });
     }
-    return staticWalletFilter(userWallets, walletList);
+    return staticWalletFilter(userWallets, walletList, walletBook);
 };
 
 export { applyMultiWalletFilters };

package/src/lib/utils/functions/walletListBuilder/utils/staticLinkedWalletFilter/staticLinkedWalletFilter.cjs

@@ -3,22 +3,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-/**
- * These wallets do not fire events when switching accounts, so we should filter
- * them out of the wallet list if they are already linked to the user profile.
- */
-const staticListToFilter = [
-    'xverse',
-    'magiceden',
-    'magicedenbtc',
-    'magicedensol',
-];
+var walletBook = require('@dynamic-labs/wallet-book');
+var getPlatformForConnector = require('../../../getPlatformForConnector/getPlatformForConnector.cjs');
+
 /**
  * This function is a helper to filter out wallets that should not appear in the wallet list
  * if they are already linked to the user profile.
  */
-const staticWalletFilter = (linkedWallets, walletOptions) => walletOptions.filter((walletOption) => {
-    if (!staticListToFilter.includes(walletOption.key)) {
+const staticWalletFilter = (linkedWallets, walletOptions, walletBook$1) => walletOptions.filter((walletOption) => {
+    if (walletBook.isWalletEventSupported(walletBook.findWalletBookWallet(walletBook$1, walletOption.key), 'accountChanged', getPlatformForConnector.getPlatformForConnector(walletOption.walletConnector))) {
         return true;
     }
     if (linkedWallets.some((wallet) => wallet.connector.key === walletOption.key)) {

package/src/lib/utils/functions/walletListBuilder/utils/staticLinkedWalletFilter/staticLinkedWalletFilter.d.ts

@@ -1,6 +1,7 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { Wallet, WalletOption } from '../../../../../shared';
 /**
  * This function is a helper to filter out wallets that should not appear in the wallet list
  * if they are already linked to the user profile.
  */
-export declare const staticWalletFilter: (linkedWallets: Wallet[], walletOptions: WalletOption[]) => WalletOption[];
+export declare const staticWalletFilter: (linkedWallets: Wallet[], walletOptions: WalletOption[], walletBook: WalletBookSchema) => WalletOption[];

package/src/lib/utils/functions/walletListBuilder/utils/staticLinkedWalletFilter/staticLinkedWalletFilter.js

@@ -1,20 +1,13 @@
 'use client'
-/**
- * These wallets do not fire events when switching accounts, so we should filter
- * them out of the wallet list if they are already linked to the user profile.
- */
-const staticListToFilter = [
-    'xverse',
-    'magiceden',
-    'magicedenbtc',
-    'magicedensol',
-];
+import { isWalletEventSupported, findWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { getPlatformForConnector } from '../../../getPlatformForConnector/getPlatformForConnector.js';
+
 /**
  * This function is a helper to filter out wallets that should not appear in the wallet list
  * if they are already linked to the user profile.
  */
-const staticWalletFilter = (linkedWallets, walletOptions) => walletOptions.filter((walletOption) => {
-    if (!staticListToFilter.includes(walletOption.key)) {
+const staticWalletFilter = (linkedWallets, walletOptions, walletBook) => walletOptions.filter((walletOption) => {
+    if (isWalletEventSupported(findWalletBookWallet(walletBook, walletOption.key), 'accountChanged', getPlatformForConnector(walletOption.walletConnector))) {
         return true;
     }
     if (linkedWallets.some((wallet) => wallet.connector.key === walletOption.key)) {

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

@@ -66,6 +66,7 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         walletList = applyMultiWalletFilters.applyMultiWalletFilters({
             authMode,
             userWallets,
+            walletBook,
             walletOptions: walletList,
         });
     }

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

@@ -62,6 +62,7 @@ const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWallets
         walletList = applyMultiWalletFilters({
             authMode,
             userWallets,
+            walletBook,
             walletOptions: walletList,
         });
     }

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

@@ -80,7 +80,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useIsTurnkeyWallet = () => {
-    var _a;
+    var _a, _b;
     const { primaryWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
     const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     const getTurnkeyVerifiedCredential = () => {
@@ -119,9 +119,12 @@ const useIsTurnkeyWallet = () => {
         isUnclaimedTurnkeyTheSignerOfScw;
     const hasRecoveryEmail = isTurnkeyWallet &&
         Boolean(getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email));
+    const isSessionKeyCompatible = isTurnkeyWallet &&
+        Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isSessionKeyCompatible);
     return {
         hasRecoveryEmail,
         hasTurnkeyVerifiedCredentialAuthenticator,
+        isSessionKeyCompatible,
         isTurnkeyWallet,
         isTurnkeyWalletWithoutAuthenticator,
         turnkeyVerifiedCredential,

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

@@ -1,6 +1,7 @@
 export declare const useIsTurnkeyWallet: () => {
     hasRecoveryEmail: boolean;
     hasTurnkeyVerifiedCredentialAuthenticator: boolean;
+    isSessionKeyCompatible: boolean;
     isTurnkeyWallet: boolean;
     isTurnkeyWalletWithoutAuthenticator: boolean;
     turnkeyVerifiedCredential: import("@dynamic-labs/sdk-api-core").JwtVerifiedCredential | undefined;

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

@@ -76,7 +76,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useIsTurnkeyWallet = () => {
-    var _a;
+    var _a, _b;
     const { primaryWallet, user } = useInternalDynamicContext();
     const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     const getTurnkeyVerifiedCredential = () => {
@@ -115,9 +115,12 @@ const useIsTurnkeyWallet = () => {
         isUnclaimedTurnkeyTheSignerOfScw;
     const hasRecoveryEmail = isTurnkeyWallet &&
         Boolean(getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email));
+    const isSessionKeyCompatible = isTurnkeyWallet &&
+        Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isSessionKeyCompatible);
     return {
         hasRecoveryEmail,
         hasTurnkeyVerifiedCredentialAuthenticator,
+        isSessionKeyCompatible,
         isTurnkeyWallet,
         isTurnkeyWalletWithoutAuthenticator,
         turnkeyVerifiedCredential,

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

@@ -82,7 +82,7 @@ require('../../../views/TransactionConfirmationView/helpers/transactionErrorMess
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
@@ -125,7 +125,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode, walletBook, primaryWalletId, authMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('wallets', wallets);
     logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);

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

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { UserProfile } from '@dynamic-labs/types';
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { AuthModeType, MultiWalletWidgetState, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 type Props = {
@@ -14,6 +15,7 @@ type Props = {
     primaryWalletId: string | undefined;
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
+    walletBook: WalletBookSchema;
 };
 export interface UseWalletConnectors {
     didConnectedStateLoad: boolean;
@@ -24,5 +26,5 @@ export interface UseWalletConnectors {
     showQrcodeModal: boolean;
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }: Props) => UseWalletConnectors;
 export {};

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

@@ -78,7 +78,7 @@ import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessa
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!user) {
@@ -121,7 +121,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode, walletBook, primaryWalletId, authMode);
     const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     logVerboseTroubleshootingMessage('wallets', wallets);
     logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var walletBook = require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
-require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
@@ -73,6 +73,7 @@ require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secon
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+var getPlatformForConnector = require('../../functions/getPlatformForConnector/getPlatformForConnector.cjs');
 require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
@@ -85,14 +86,17 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
  * For the given wallet array, this returns an object mapping from each wallet's
  * identifier to whether its connector recognizes it as currently connected or not.
  */
-const getConnectedWalletsMap = (wallets) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getConnectedWalletsMap = (wallets, walletBook$1, primaryWalletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const newMap = {};
-    yield Promise.all(wallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(wallets
+        .filter((wallet) => wallet.id === primaryWalletId ||
+        walletBook.isWalletMethodSupported(walletBook.findWalletBookWallet(walletBook$1, wallet.key), 'getConnectedAccounts', getPlatformForConnector.getPlatformForConnector(wallet.connector)))
+        .map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         newMap[getWalletIdentifier.getWalletIdentifier(wallet)] = yield isWalletConnected.isWalletConnected(wallet);
     })));
     return newMap;
 });
-const useWalletsConnectionState = (wallets) => {
+const useWalletsConnectionState = (wallets, walletBook, primaryWalletId, authMode) => {
     const [connectedWalletsMap, setConnectedWalletsMap] = React.useState({});
     /**
      * Whether the connection map has been loaded off of the current wallet array.
@@ -109,7 +113,7 @@ const useWalletsConnectionState = (wallets) => {
     const incomingWalletSwitchAddress = React.useRef(undefined);
     const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         didConnectedStateLoad.current = false;
-        const newMap = yield getConnectedWalletsMap(wallets);
+        const newMap = yield getConnectedWalletsMap(wallets, walletBook, primaryWalletId);
         if (Object.values(newMap).length === 0) {
             setConnectedWalletsMap({});
             return;
@@ -125,7 +129,7 @@ const useWalletsConnectionState = (wallets) => {
                 return;
         }
         setConnectedWalletsMap(newMap);
-    }), [wallets]);
+    }), [primaryWalletId, walletBook, wallets]);
     /** A string that is unique for each possible value of the wallets prop */
     const walletsHash = wallets.map(getWalletIdentifier.getWalletIdentifier).join('-');
     const connectors = wallets.map(({ connector }) => connector);
@@ -142,6 +146,9 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', onAccountChange);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleEvent);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleEvent);
+    const computeConnectedStateKey = authMode === 'connect-and-sign'
+        ? `${primaryWalletId}-${walletsHash}`
+        : walletsHash;
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -150,7 +157,7 @@ const useWalletsConnectionState = (wallets) => {
      * wallets change.
      */
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [walletsHash]);
+    [computeConnectedStateKey]);
     /**
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.

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

@@ -1,9 +1,10 @@
 import { MutableRefObject } from 'react';
-import { Wallet } from '../../../shared';
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { AuthModeType, Wallet } from '../../../shared';
 type ConnectedWalletsMap = {
     [address: string]: boolean;
 };
-type WalletsConnectionStateHook = (wallets: Wallet[]) => {
+type WalletsConnectionStateHook = (wallets: Wallet[], walletBook: WalletBookSchema, primaryWalletId: string | undefined, authMode: AuthModeType) => {
     connectedWalletsMap: ConnectedWalletsMap;
     didConnectedStateLoad: MutableRefObject<boolean>;
 };

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

@@ -2,12 +2,12 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isWalletMethodSupported, findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
-import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
@@ -69,6 +69,7 @@ import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Second
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import { getPlatformForConnector } from '../../functions/getPlatformForConnector/getPlatformForConnector.js';
 import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
@@ -81,14 +82,17 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
  * For the given wallet array, this returns an object mapping from each wallet's
  * identifier to whether its connector recognizes it as currently connected or not.
  */
-const getConnectedWalletsMap = (wallets) => __awaiter(void 0, void 0, void 0, function* () {
+const getConnectedWalletsMap = (wallets, walletBook, primaryWalletId) => __awaiter(void 0, void 0, void 0, function* () {
     const newMap = {};
-    yield Promise.all(wallets.map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(wallets
+        .filter((wallet) => wallet.id === primaryWalletId ||
+        isWalletMethodSupported(findWalletBookWallet(walletBook, wallet.key), 'getConnectedAccounts', getPlatformForConnector(wallet.connector)))
+        .map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
         newMap[getWalletIdentifier(wallet)] = yield isWalletConnected(wallet);
     })));
     return newMap;
 });
-const useWalletsConnectionState = (wallets) => {
+const useWalletsConnectionState = (wallets, walletBook, primaryWalletId, authMode) => {
     const [connectedWalletsMap, setConnectedWalletsMap] = useState({});
     /**
      * Whether the connection map has been loaded off of the current wallet array.
@@ -105,7 +109,7 @@ const useWalletsConnectionState = (wallets) => {
     const incomingWalletSwitchAddress = useRef(undefined);
     const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         didConnectedStateLoad.current = false;
-        const newMap = yield getConnectedWalletsMap(wallets);
+        const newMap = yield getConnectedWalletsMap(wallets, walletBook, primaryWalletId);
         if (Object.values(newMap).length === 0) {
             setConnectedWalletsMap({});
             return;
@@ -121,7 +125,7 @@ const useWalletsConnectionState = (wallets) => {
                 return;
         }
         setConnectedWalletsMap(newMap);
-    }), [wallets]);
+    }), [primaryWalletId, walletBook, wallets]);
     /** A string that is unique for each possible value of the wallets prop */
     const walletsHash = wallets.map(getWalletIdentifier).join('-');
     const connectors = wallets.map(({ connector }) => connector);
@@ -138,6 +142,9 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent(connectors, 'accountChange', onAccountChange);
     useWalletConnectorEvent(connectors, 'disconnect', handleEvent);
     useWalletConnectorEvent(connectors, 'chainChange', handleEvent);
+    const computeConnectedStateKey = authMode === 'connect-and-sign'
+        ? `${primaryWalletId}-${walletsHash}`
+        : walletsHash;
     useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -146,7 +153,7 @@ const useWalletsConnectionState = (wallets) => {
      * wallets change.
      */
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [walletsHash]);
+    [computeConnectedStateKey]);
     /**
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.

package/src/lib/views/SelectHardwareWalletView/SelectHardwareWalletView.cjs

@@ -82,12 +82,8 @@ require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 var HardwareWalletToggle = require('../../components/HardwareWalletToggle/HardwareWalletToggle.cjs');
 
 const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
-    var _a;
     const { t } = reactI18next.useTranslation();
-    const chainName = (_a = walletConnectorCore.getChainInfo(wallet.walletConnector.connectedChain)) === null || _a === void 0 ? void 0 : _a.displayName;
-    return (jsxRuntime.jsx("div", { className: 'select-hardware-wallet-view', children: jsxRuntime.jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsxRuntime.jsx(Icon.Icon, { className: 'select-hardware-wallet-view__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: wallet.key }) }), jsxRuntime.jsx(Typography.Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), walletConnectorCore.isHardwareWalletConnector(wallet.walletConnector) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
-                                chainName,
-                            }) }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
+    return (jsxRuntime.jsx("div", { className: 'select-hardware-wallet-view', children: jsxRuntime.jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsxRuntime.jsx(Icon.Icon, { className: 'select-hardware-wallet-view__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: wallet.key }) }), jsxRuntime.jsx(Typography.Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), walletConnectorCore.isHardwareWalletConnector(wallet.walletConnector) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
 };
 
 exports.SelectHardwareWalletView = SelectHardwareWalletView;

package/src/lib/views/SelectHardwareWalletView/SelectHardwareWalletView.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
-import { getChainInfo, isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Alert/Alert.js';
 import 'react';
@@ -78,12 +78,8 @@ import '../../context/IpConfigurationContext/IpConfigurationContext.js';
 import { HardwareWalletToggle } from '../../components/HardwareWalletToggle/HardwareWalletToggle.js';
 
 const SelectHardwareWalletView = ({ wallet, onSelectWallet, }) => {
-    var _a;
     const { t } = useTranslation();
-    const chainName = (_a = getChainInfo(wallet.walletConnector.connectedChain)) === null || _a === void 0 ? void 0 : _a.displayName;
-    return (jsx("div", { className: 'select-hardware-wallet-view', children: jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsx(Icon, { className: 'select-hardware-wallet-view__icon', children: jsx(WalletIcon, { walletKey: wallet.key }) }), jsx(Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), isHardwareWalletConnector(wallet.walletConnector) && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
-                                chainName,
-                            }) }), jsx(Divider, {})] })), jsx(TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
+    return (jsx("div", { className: 'select-hardware-wallet-view', children: jsxs("div", { className: 'select-hardware-wallet-view__container', children: [jsx(Icon, { className: 'select-hardware-wallet-view__icon', children: jsx(WalletIcon, { walletKey: wallet.key }) }), jsx(Typography, { className: 'select-hardware-wallet-view__text', as: 'p', color: 'secondary', variant: 'body_normal', copykey: 'dyn_select_hardware_wallet.description', children: t('dyn_select_hardware_wallet.description') }), isHardwareWalletConnector(wallet.walletConnector) && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { connectors: [wallet.walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') }), jsx(Divider, {})] })), jsx(TypographyButton, { buttonVariant: 'primary', onClick: () => onSelectWallet === null || onSelectWallet === void 0 ? void 0 : onSelectWallet(wallet), copykey: 'dyn_select_hardware_wallet.button', dataTestId: 'select-hardware-wallet-connect-button', children: t('dyn_select_hardware_wallet.button') })] }) }));
 };
 
 export { SelectHardwareWalletView };

package/src/lib/views/WalletGroupView/WalletGroupView.cjs

@@ -82,7 +82,6 @@ require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
 const WalletGroupView = () => {
-    var _a, _b;
     const { selectedWalletGroup } = WalletGroupContext.useWalletGroupContext();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
@@ -94,11 +93,7 @@ const WalletGroupView = () => {
         .map(({ walletConnector }) => walletConnector)
         .filter(walletConnectorCore.isHardwareWalletConnector)
         .filter((connector) => connector.canConnectWithHardwareWallet());
-    const hardwareConnectedChain = (_a = hardwareWalletConnectors[0]) === null || _a === void 0 ? void 0 : _a.connectedChain;
-    const chainName = hardwareConnectedChain && ((_b = walletConnectorCore.getChainInfo(hardwareConnectedChain)) === null || _b === void 0 ? void 0 : _b.displayName);
-    return (jsxRuntime.jsx(WalletGroupViewLayout.WalletGroupViewLayout, { icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletBookData.key }), title: t('dyn_select_chain.description'), titleCopyKey: 'dyn_select_chain.description', children: jsxRuntime.jsxs("div", { className: 'wallet-group__list', children: [Boolean(hardwareWalletConnectors.length) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: hardwareWalletConnectors, copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
-                                chainName,
-                            }) }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx("div", { className: 'wallet-group-view-layout__list', children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet, onClick: () => handleWalletItemClick(wallet) }, `${wallet.key}_${index}`))) })] }) }));
+    return (jsxRuntime.jsx(WalletGroupViewLayout.WalletGroupViewLayout, { icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletBookData.key }), title: t('dyn_select_chain.description'), titleCopyKey: 'dyn_select_chain.description', children: jsxRuntime.jsxs("div", { className: 'wallet-group__list', children: [Boolean(hardwareWalletConnectors.length) && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: hardwareWalletConnectors, copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx("div", { className: 'wallet-group-view-layout__list', children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet, onClick: () => handleWalletItemClick(wallet) }, `${wallet.key}_${index}`))) })] }) }));
 };
 
 exports.WalletGroupView = WalletGroupView;

package/src/lib/views/WalletGroupView/WalletGroupView.js

@@ -2,7 +2,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
 import { useWalletBookContext, getWalletGroup, WalletIcon } from '@dynamic-labs/wallet-book';
-import { isHardwareWalletConnector, getChainInfo } from '@dynamic-labs/wallet-connector-core';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { useWalletGroupContext } from '../../context/WalletGroupContext/WalletGroupContext.js';
 import 'react';
 import '../../events/dynamicEvents.js';
@@ -78,7 +78,6 @@ import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
 const WalletGroupView = () => {
-    var _a, _b;
     const { selectedWalletGroup } = useWalletGroupContext();
     const { walletBook } = useWalletBookContext();
     const { handleWalletItemClick } = useWalletItemActions();
@@ -90,11 +89,7 @@ const WalletGroupView = () => {
         .map(({ walletConnector }) => walletConnector)
         .filter(isHardwareWalletConnector)
         .filter((connector) => connector.canConnectWithHardwareWallet());
-    const hardwareConnectedChain = (_a = hardwareWalletConnectors[0]) === null || _a === void 0 ? void 0 : _a.connectedChain;
-    const chainName = hardwareConnectedChain && ((_b = getChainInfo(hardwareConnectedChain)) === null || _b === void 0 ? void 0 : _b.displayName);
-    return (jsx(WalletGroupViewLayout, { icon: jsx(WalletIcon, { walletKey: walletBookData.key }), title: t('dyn_select_chain.description'), titleCopyKey: 'dyn_select_chain.description', children: jsxs("div", { className: 'wallet-group__list', children: [Boolean(hardwareWalletConnectors.length) && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { connectors: hardwareWalletConnectors, copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label', {
-                                chainName,
-                            }) }), jsx(Divider, {})] })), jsx("div", { className: 'wallet-group-view-layout__list', children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsx(WalletGroupItem, { wallet: wallet, onClick: () => handleWalletItemClick(wallet) }, `${wallet.key}_${index}`))) })] }) }));
+    return (jsx(WalletGroupViewLayout, { icon: jsx(WalletIcon, { walletKey: walletBookData.key }), title: t('dyn_select_chain.description'), titleCopyKey: 'dyn_select_chain.description', children: jsxs("div", { className: 'wallet-group__list', children: [Boolean(hardwareWalletConnectors.length) && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { connectors: hardwareWalletConnectors, copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') }), jsx(Divider, {})] })), jsx("div", { className: 'wallet-group-view-layout__list', children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsx(WalletGroupItem, { wallet: wallet, onClick: () => handleWalletItemClick(wallet) }, `${wallet.key}_${index}`))) })] }) }));
 };
 
 export { WalletGroupView };