@dynamic-labs/sdk-react-core 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+### [2.2.4](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.3...v2.2.4) (2024-06-21)
+
+
+### Bug Fixes
+
+* always reconnect the wallet provider when calling getAddress ([#6097](https://github.com/dynamic-labs/DynamicAuth/issues/6097)) ([#6099](https://github.com/dynamic-labs/DynamicAuth/issues/6099)) ([428de7c](https://github.com/dynamic-labs/DynamicAuth/commit/428de7c67a61c2078566e2b967aef018282ad88a))
+* set latest blockhash on solana transactions if tx confirmation ui is disabled ([#6102](https://github.com/dynamic-labs/DynamicAuth/issues/6102)) ([#6109](https://github.com/dynamic-labs/DynamicAuth/issues/6109)) ([01a25ed](https://github.com/dynamic-labs/DynamicAuth/commit/01a25ed37498c8046022483fdeb2ce572bd2d5c6))
+* silently query unisat accounts ([#6101](https://github.com/dynamic-labs/DynamicAuth/issues/6101)) ([5402518](https://github.com/dynamic-labs/DynamicAuth/commit/5402518bb91c3ec02eee2f0bdd97d90a33d5d9f7))
+* trigger sign when linking an already linked unknown wallet ([#6111](https://github.com/dynamic-labs/DynamicAuth/issues/6111)) ([9602055](https://github.com/dynamic-labs/DynamicAuth/commit/9602055527b5430e7a98e8836b585ead240bf1d7))
+
 ### [2.2.3](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.2...v2.2.3) (2024-06-19)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.2.3";
+var version = "2.2.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "2.2.3";
+var version = "2.2.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.2.3",
-    "@dynamic-labs/logger": "2.2.3",
-    "@dynamic-labs/multi-wallet": "2.2.3",
-    "@dynamic-labs/rpc-provider-ethereum": "2.2.3",
-    "@dynamic-labs/rpc-provider-solana": "2.2.3",
-    "@dynamic-labs/rpc-providers": "2.2.3",
-    "@dynamic-labs/store": "2.2.3",
-    "@dynamic-labs/types": "2.2.3",
-    "@dynamic-labs/utils": "2.2.3",
-    "@dynamic-labs/viem-utils": "2.2.3",
-    "@dynamic-labs/wallet-book": "2.2.3",
-    "@dynamic-labs/wallet-connector-core": "2.2.3",
+    "@dynamic-labs/iconic": "2.2.4",
+    "@dynamic-labs/logger": "2.2.4",
+    "@dynamic-labs/multi-wallet": "2.2.4",
+    "@dynamic-labs/rpc-provider-ethereum": "2.2.4",
+    "@dynamic-labs/rpc-provider-solana": "2.2.4",
+    "@dynamic-labs/rpc-providers": "2.2.4",
+    "@dynamic-labs/store": "2.2.4",
+    "@dynamic-labs/types": "2.2.4",
+    "@dynamic-labs/utils": "2.2.4",
+    "@dynamic-labs/viem-utils": "2.2.4",
+    "@dynamic-labs/wallet-book": "2.2.4",
+    "@dynamic-labs/wallet-connector-core": "2.2.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/WalletContext/WalletContext.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
+require('../../../../_virtual/_tslib.cjs');
 require('../DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
@@ -18,7 +19,6 @@ require('../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../shared/consts/index.cjs');
 require('../../events/dynamicEvents.cjs');
-require('../../../../_virtual/_tslib.cjs');
 require('../CaptchaContext/CaptchaContext.cjs');
 require('../ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');

package/src/lib/context/WalletContext/WalletContext.js

@@ -1,6 +1,7 @@
 'use client'
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useState, useMemo } from 'react';
+import '../../../../_virtual/_tslib.js';
 import '../DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
@@ -14,7 +15,6 @@ import '../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
 import '../../events/dynamicEvents.js';
-import '../../../../_virtual/_tslib.js';
 import '../CaptchaContext/CaptchaContext.js';
 import '../ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';

package/src/lib/events/multiWallet.d.ts

@@ -2,4 +2,5 @@ export type MultiWalletInternalEvents = {
     triggerComputePrimaryWalletMultiWalletStateFromAccounts: (props: {
         accounts: string[];
     }) => void;
+    triggerConnectAndSign: () => void;
 };

package/src/lib/locale/en/translation.cjs

@@ -1600,12 +1600,12 @@ const translation = {
      * @default
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
-        using_hardware_wallet_toggle_label: 'Using Ledger with {{chainName}}',
+        using_hardware_wallet_toggle_label: 'Using Ledger',
       }
      */
     dyn_select_chain: {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
-        using_hardware_wallet_toggle_label: 'Using Ledger with {{chainName}}',
+        using_hardware_wallet_toggle_label: 'Using Ledger',
     },
     /**
      * @description copy keys for Select Wallet view

package/src/lib/locale/en/translation.d.ts

@@ -1596,7 +1596,7 @@ export declare const translation: {
      * @default
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
-        using_hardware_wallet_toggle_label: 'Using Ledger with {{chainName}}',
+        using_hardware_wallet_toggle_label: 'Using Ledger',
       }
      */
     dyn_select_chain: {

package/src/lib/locale/en/translation.js

@@ -1596,12 +1596,12 @@ const translation = {
      * @default
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
-        using_hardware_wallet_toggle_label: 'Using Ledger with {{chainName}}',
+        using_hardware_wallet_toggle_label: 'Using Ledger',
       }
      */
     dyn_select_chain: {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
-        using_hardware_wallet_toggle_label: 'Using Ledger with {{chainName}}',
+        using_hardware_wallet_toggle_label: 'Using Ledger',
     },
     /**
      * @description copy keys for Select Wallet view

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -3,6 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -17,8 +18,7 @@ require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
-require('../../../../events/dynamicEvents.cjs');
-require('../../../../../../_virtual/_tslib.cjs');
+var useDynamicEvents = require('../../events/useDynamicEvents/useDynamicEvents.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -32,6 +32,7 @@ require('viem');
 require('viem/chains');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
+require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -82,29 +83,54 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign.useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = React.useRef(false);
+    const runConnectAndSign = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     React.useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication.requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 exports.useVerifyOnAwaitingSignature = useVerifyOnAwaitingSignature;

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -1,5 +1,6 @@
 'use client'
-import { useEffect } from 'react';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { useRef, useCallback, useEffect } from 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../../shared/logger.js';
@@ -13,8 +14,7 @@ import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
-import '../../../../events/dynamicEvents.js';
-import '../../../../../../_virtual/_tslib.js';
+import { useInternalDynamicEvents } from '../../events/useDynamicEvents/useDynamicEvents.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -28,6 +28,7 @@ import 'viem';
 import 'viem/chains';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -78,29 +79,54 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = useRef(false);
+    const runConnectAndSign = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 export { useVerifyOnAwaitingSignature };

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

@@ -19,6 +19,15 @@ require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../locale/locale.cjs');
+var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
@@ -33,7 +42,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
+        logger.logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
+            isPrimaryWallet,
+            newAddress,
+        });
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
         // this means the user is linking a new account, so we need proof of ownership...
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
@@ -42,6 +56,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
             return;
         }
+        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.dynamicEvents.emit('triggerConnectAndSign');
+            return;
+        }
         // ...otherwise, the user is switching primary accounts betweeen the same wallet
         setSelectedWalletWithAction(null);
         setPrimaryWalletId(linkedSecondaryWallet.id);
@@ -55,6 +75,13 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         setPrimaryWalletId,
     ]);
     const calculatePrimaryWalletMultiWalletStateFromAccounts = React.useCallback(({ accounts }) => {
+        logger.logger.debug('calculatePrimaryWalletMultiWalletStateFromAccounts', {
+            accounts,
+            authMode,
+            multiWallet,
+            multiWalletWidgetState,
+            primaryWallet,
+        });
         // change the api here
         if (!primaryWallet)
             return;

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

@@ -15,6 +15,15 @@ import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../locale/locale.js';
+import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
@@ -29,7 +38,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
+        logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
+            isPrimaryWallet,
+            newAddress,
+        });
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
         // this means the user is linking a new account, so we need proof of ownership...
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
@@ -38,6 +52,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
             return;
         }
+        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.emit('triggerConnectAndSign');
+            return;
+        }
         // ...otherwise, the user is switching primary accounts betweeen the same wallet
         setSelectedWalletWithAction(null);
         setPrimaryWalletId(linkedSecondaryWallet.id);
@@ -51,6 +71,13 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         setPrimaryWalletId,
     ]);
     const calculatePrimaryWalletMultiWalletStateFromAccounts = useCallback(({ accounts }) => {
+        logger.debug('calculatePrimaryWalletMultiWalletStateFromAccounts', {
+            accounts,
+            authMode,
+            multiWallet,
+            multiWalletWidgetState,
+            primaryWallet,
+        });
         // change the api here
         if (!primaryWallet)
             return;

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

@@ -9,7 +9,7 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
-require('../../../shared/logger.cjs');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
@@ -31,6 +31,7 @@ require('react-international-phone');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('viem');
 require('viem/chains');
+var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -90,7 +91,11 @@ const useWalletItemActions = () => {
     const { onlyConnectUser } = useConnectAndSignSplitSteps.useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign.useConnectAndSign();
     const handleCustodialWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector);
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
+            twoStepAuthentication,
+        });
         if (twoStepAuthentication) {
             setSelectedWalletConnectorKey(walletConnector.key);
             yield onlyConnectUser({
@@ -105,6 +110,7 @@ const useWalletItemActions = () => {
     });
     const handleMobileWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        logger.logger.debug('handleMobileWalletClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         // We need to set to LS when about to verify phantom wallet on mobile
         // because the deeplink interrupts this code execution and then redirects back on a new tab.
@@ -124,10 +130,12 @@ const useWalletItemActions = () => {
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('handleUninstalledClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
@@ -149,8 +157,14 @@ const useWalletItemActions = () => {
         setError(undefined);
     });
     const handleAlreadyConnectedWallet = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('handleAlreadyConnectedWallet', walletConnector);
         const connectedAccounts = yield walletConnector.getConnectedAccounts();
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
+            activeAccountAlreadyLinked,
+            connectedAccounts,
+            linkedWallets,
+        });
         if (activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
         }
@@ -180,6 +194,11 @@ const useWalletItemActions = () => {
         const { walletConnector, isInstalledOnBrowser } = wallet;
         const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
             walletConnectorCore.isPhantomRedirectConnector(walletConnector);
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
+            mockedSDK,
+            shouldEndWalletConnectorSession,
+            wallet,
+        });
         if (mockedSDK)
             return;
         if (shouldEndWalletConnectorSession) {

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

@@ -5,7 +5,7 @@ import { isPhantomRedirectConnector } from '@dynamic-labs/wallet-connector-core'
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
-import '../../../shared/logger.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
@@ -27,6 +27,7 @@ import 'react-international-phone';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import 'viem';
 import 'viem/chains';
+import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -86,7 +87,11 @@ const useWalletItemActions = () => {
     const { onlyConnectUser } = useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign();
     const handleCustodialWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication(walletConnector);
+        logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
+            twoStepAuthentication,
+        });
         if (twoStepAuthentication) {
             setSelectedWalletConnectorKey(walletConnector.key);
             yield onlyConnectUser({
@@ -101,6 +106,7 @@ const useWalletItemActions = () => {
     });
     const handleMobileWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        logger.debug('handleMobileWalletClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         // We need to set to LS when about to verify phantom wallet on mobile
         // because the deeplink interrupts this code execution and then redirects back on a new tab.
@@ -120,10 +126,12 @@ const useWalletItemActions = () => {
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('handleUninstalledClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
@@ -145,8 +153,14 @@ const useWalletItemActions = () => {
         setError(undefined);
     });
     const handleAlreadyConnectedWallet = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('handleAlreadyConnectedWallet', walletConnector);
         const connectedAccounts = yield walletConnector.getConnectedAccounts();
         const activeAccountAlreadyLinked = linkedWallets.find((wallet) => { var _a; return wallet.address.toLowerCase() === ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase()); });
+        logVerboseTroubleshootingMessage('[handleAlreadyConnectedWallet]', {
+            activeAccountAlreadyLinked,
+            connectedAccounts,
+            linkedWallets,
+        });
         if (activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
         }
@@ -176,6 +190,11 @@ const useWalletItemActions = () => {
         const { walletConnector, isInstalledOnBrowser } = wallet;
         const shouldEndWalletConnectorSession = walletConnector.connectedChain === 'FLOW' ||
             isPhantomRedirectConnector(walletConnector);
+        logVerboseTroubleshootingMessage('[handleWalletItemClick]', {
+            mockedSDK,
+            shouldEndWalletConnectorSession,
+            wallet,
+        });
         if (mockedSDK)
             return;
         if (shouldEndWalletConnectorSession) {

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 'react';
 import '../../events/dynamicEvents.js';
 import '../../../../_virtual/_tslib.js';
@@ -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 };