@dynamic-labs/sdk-react-core 3.1.3 → 3.1.4

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+### [3.1.4](https://github.com/dynamic-labs/DynamicAuth/compare/v3.1.3...v3.1.4) (2024-09-30)
+
+
+### Bug Fixes
+
+* add popper context to send balance ([#7017](https://github.com/dynamic-labs/DynamicAuth/issues/7017)) ([bedcc5e](https://github.com/dynamic-labs/DynamicAuth/commit/bedcc5ec005267b7fa40a2020bc9fef6e2e09714))
+* add retry to useConnectWithOtp ([#7013](https://github.com/dynamic-labs/DynamicAuth/issues/7013)) ([4d3455a](https://github.com/dynamic-labs/DynamicAuth/commit/4d3455a5ead6585ec309ff32294f392154900d73))
+* don't re-fetch wallet address on network change ([#7023](https://github.com/dynamic-labs/DynamicAuth/issues/7023)) ([d23b716](https://github.com/dynamic-labs/DynamicAuth/commit/d23b71608af8b6b75b015efdfcb8bea34602dc6a))
+* fix sign message with solana wallet standard provider ([#7015](https://github.com/dynamic-labs/DynamicAuth/issues/7015)) ([b575622](https://github.com/dynamic-labs/DynamicAuth/commit/b575622d7ec8b3dc61049acb592b7c7fa458ec61))
+* persist isHardwareWalletEnabled on wallet connector ([#7025](https://github.com/dynamic-labs/DynamicAuth/issues/7025)) ([7ed7832](https://github.com/dynamic-labs/DynamicAuth/commit/7ed7832235ecafe8172a16528d428f7c03485064))
+* update wallet reference when user switches wallet in connect-only ([#7031](https://github.com/dynamic-labs/DynamicAuth/issues/7031)) ([031515f](https://github.com/dynamic-labs/DynamicAuth/commit/031515fc6c785facbbc95d2f65d58551559334e6))
+
 ### [3.1.3](https://github.com/dynamic-labs/DynamicAuth/compare/v3.1.2...v3.1.3) (2024-09-25)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

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

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.cjs

@@ -27,11 +27,21 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 
 const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email$1) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    const { verificationUUID } = yield email.createEmailVerification({
+    const createEmailVerificationResponse = yield email.createEmailVerification({
         email: email$1,
         environmentId,
     });
+    let { verificationUUID } = createEmailVerificationResponse;
     return {
+        retry: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            const retryEmailVerificationResponse = yield email.retryEmailVerification({
+                email: email$1,
+                environmentId,
+                verificationUUID,
+            });
+            // eslint-disable-next-line prefer-destructuring
+            verificationUUID = retryEmailVerificationResponse.verificationUUID;
+        }),
         type: 'email',
         verify: (oneTimePassword) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             let sessionPublicKey = undefined;

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { createEmailVerification, signInWithEmailVerification } from '../../../data/api/email/email.js';
+import { createEmailVerification, retryEmailVerification, signInWithEmailVerification } from '../../../data/api/email/email.js';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs/utils';
 import '../../../shared/logger.js';
@@ -23,11 +23,21 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 
 const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email) => __awaiter(void 0, void 0, void 0, function* () {
-    const { verificationUUID } = yield createEmailVerification({
+    const createEmailVerificationResponse = yield createEmailVerification({
         email,
         environmentId,
     });
+    let { verificationUUID } = createEmailVerificationResponse;
     return {
+        retry: () => __awaiter(void 0, void 0, void 0, function* () {
+            const retryEmailVerificationResponse = yield retryEmailVerification({
+                email,
+                environmentId,
+                verificationUUID,
+            });
+            // eslint-disable-next-line prefer-destructuring
+            verificationUUID = retryEmailVerificationResponse.verificationUUID;
+        }),
         type: 'email',
         verify: (oneTimePassword) => __awaiter(void 0, void 0, void 0, function* () {
             let sessionPublicKey = undefined;

package/src/lib/modals/SendBalanceModal/SendBalanceModal.cjs

@@ -79,7 +79,7 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
 require('../../context/FundingContext/FundingContext.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
-require('../../components/Popper/PopperContext/PopperContext.cjs');
+var PopperContext = require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
@@ -112,10 +112,10 @@ const SendBalanceModal = ({ initialRecipientAddress, initialValue, onReject, onS
     };
     return (jsxRuntime.jsx(Portal.Portal, { handleClose: closeModal, isShown: show, zIndex: index.authModalZIndex, withBackdrop: true, elementId: 'dynamic-send-balance', transitionEvents: {
             onUnmount: handleOnModalUnmount,
-        }, children: jsxRuntime.jsx(Modal.Modal, { children: jsxRuntime.jsx(ModalCard.ModalCard, { children: jsxRuntime.jsx(VerticalDrawerTransition.VerticalDrawerTransition, { isShown: true, children: jsxRuntime.jsx(SendBalanceView.SendBalanceView, { initialRecipientAddress: initialRecipientAddress, initialValue: initialValue, onError: (error) => (errorRef.current = error), onClickClose: closeModal, onDone: closeModal, displayPoweredByDynamicFooter: true, onSuccess: (receipt) => {
-                            errorRef.current = null;
-                            receiptRef.current = receipt;
-                        } }) }) }) }) }));
+        }, children: jsxRuntime.jsx(Modal.Modal, { children: jsxRuntime.jsx(ModalCard.ModalCard, { children: jsxRuntime.jsx(VerticalDrawerTransition.VerticalDrawerTransition, { isShown: true, children: jsxRuntime.jsx(PopperContext.PopperProvider, { children: jsxRuntime.jsx(SendBalanceView.SendBalanceView, { initialRecipientAddress: initialRecipientAddress, initialValue: initialValue, onError: (error) => (errorRef.current = error), onClickClose: closeModal, onDone: closeModal, displayPoweredByDynamicFooter: true, onSuccess: (receipt) => {
+                                errorRef.current = null;
+                                receiptRef.current = receipt;
+                            } }) }) }) }) }) }));
 };
 
 exports.SendBalanceModal = SendBalanceModal;

package/src/lib/modals/SendBalanceModal/SendBalanceModal.js

@@ -75,7 +75,7 @@ import '../../components/IsBrowser/IsBrowser.js';
 import '../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
 import '../../context/FundingContext/FundingContext.js';
 import '../../components/Popper/Popper/Popper.js';
-import '../../components/Popper/PopperContext/PopperContext.js';
+import { PopperProvider } from '../../components/Popper/PopperContext/PopperContext.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
@@ -108,10 +108,10 @@ const SendBalanceModal = ({ initialRecipientAddress, initialValue, onReject, onS
     };
     return (jsx(Portal, { handleClose: closeModal, isShown: show, zIndex: authModalZIndex, withBackdrop: true, elementId: 'dynamic-send-balance', transitionEvents: {
             onUnmount: handleOnModalUnmount,
-        }, children: jsx(Modal, { children: jsx(ModalCard, { children: jsx(VerticalDrawerTransition, { isShown: true, children: jsx(SendBalanceView, { initialRecipientAddress: initialRecipientAddress, initialValue: initialValue, onError: (error) => (errorRef.current = error), onClickClose: closeModal, onDone: closeModal, displayPoweredByDynamicFooter: true, onSuccess: (receipt) => {
-                            errorRef.current = null;
-                            receiptRef.current = receipt;
-                        } }) }) }) }) }));
+        }, children: jsx(Modal, { children: jsx(ModalCard, { children: jsx(VerticalDrawerTransition, { isShown: true, children: jsx(PopperProvider, { children: jsx(SendBalanceView, { initialRecipientAddress: initialRecipientAddress, initialValue: initialValue, onError: (error) => (errorRef.current = error), onClickClose: closeModal, onDone: closeModal, displayPoweredByDynamicFooter: true, onSuccess: (receipt) => {
+                                errorRef.current = null;
+                                receiptRef.current = receipt;
+                            } }) }) }) }) }) }));
 };
 
 export { SendBalanceModal };

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

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var walletConnectorOptions = require('../../../store/state/walletConnectorOptions.cjs');
+
+const getWalletConnectorForWallet = (wallet) => {
+    var _a, _b;
+    if (!wallet) {
+        return undefined;
+    }
+    const walletConnectorOptions$1 = walletConnectorOptions.getWalletConnectorOptions();
+    const { key: walletKey, chain } = wallet;
+    const walletConnector = (_a = walletConnectorOptions$1.find((wallet) => walletKey === wallet.key &&
+        wallet.walletConnector.connectedChain === chain)) === null || _a === void 0 ? void 0 : _a.walletConnector;
+    if (walletConnector) {
+        return walletConnector;
+    }
+    const fallbackConnector = (_b = walletConnectorOptions$1.find((wallet) => wallet.key === 'fallbackconnector')) === null || _b === void 0 ? void 0 : _b.walletConnector;
+    return fallbackConnector;
+};
+
+exports.getWalletConnectorForWallet = getWalletConnectorForWallet;

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

@@ -0,0 +1,20 @@
+'use client'
+import { getWalletConnectorOptions } from '../../../store/state/walletConnectorOptions.js';
+
+const getWalletConnectorForWallet = (wallet) => {
+    var _a, _b;
+    if (!wallet) {
+        return undefined;
+    }
+    const walletConnectorOptions = getWalletConnectorOptions();
+    const { key: walletKey, chain } = wallet;
+    const walletConnector = (_a = walletConnectorOptions.find((wallet) => walletKey === wallet.key &&
+        wallet.walletConnector.connectedChain === chain)) === null || _a === void 0 ? void 0 : _a.walletConnector;
+    if (walletConnector) {
+        return walletConnector;
+    }
+    const fallbackConnector = (_b = walletConnectorOptions.find((wallet) => wallet.key === 'fallbackconnector')) === null || _b === void 0 ? void 0 : _b.walletConnector;
+    return fallbackConnector;
+};
+
+export { getWalletConnectorForWallet };

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

@@ -30,6 +30,7 @@ var session = require('../../../data/api/session/session.cjs');
 require('../../../locale/locale.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var isConnectOnly = require('../authenticationHooks/helpers/isConnectOnly.cjs');
+var getWalletConnectorForWallet = require('../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.cjs');
 var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -136,10 +137,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
-        if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex].address =
-                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+        if (connectedWalletIndex < 0) {
+            return;
         }
+        clonedConnectedWalletsList[connectedWalletIndex] =
+            clonedConnectedWalletsList[connectedWalletIndex].connector.createWallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: getWalletConnectorForWallet.getWalletConnectorForWallet(clonedConnectedWalletsList[connectedWalletIndex]) }));
         setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage

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

@@ -26,6 +26,7 @@ import { createVisit } from '../../../data/api/session/session.js';
 import '../../../locale/locale.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { isConnectOnly } from '../authenticationHooks/helpers/isConnectOnly.js';
+import { getWalletConnectorForWallet } from '../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.js';
 import { updateUserWalletsFromConnectedWallets } from './updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -132,10 +133,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
-        if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex].address =
-                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+        if (connectedWalletIndex < 0) {
+            return;
         }
+        clonedConnectedWalletsList[connectedWalletIndex] =
+            clonedConnectedWalletsList[connectedWalletIndex].connector.createWallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: getWalletConnectorForWallet(clonedConnectedWalletsList[connectedWalletIndex]) }));
         setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage

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

@@ -19,6 +19,7 @@ require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
+var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -140,6 +141,14 @@ const useConnectedWalletsNetworkValidation = () => {
         setShowAuthFlow,
         setView,
     ]);
+    const uniqueConnectors = React.useMemo(() => {
+        const connectors = connectedWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([...connectors].filter((connector) => Boolean(connector)));
+        return Array.from(allWalletConnectors);
+    }, [connectedWallets]);
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueConnectors, 'chainChange', ({ chain }) => {
+        validateNetwork();
+    });
     React.useEffect(() => {
         /**
          * This check was added to prevent the "wrong network" modal from appearing

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useMemo, useEffect } from 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -15,6 +15,7 @@ import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
+import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -136,6 +137,14 @@ const useConnectedWalletsNetworkValidation = () => {
         setShowAuthFlow,
         setView,
     ]);
+    const uniqueConnectors = useMemo(() => {
+        const connectors = connectedWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([...connectors].filter((connector) => Boolean(connector)));
+        return Array.from(allWalletConnectors);
+    }, [connectedWallets]);
+    useWalletConnectorEvent(uniqueConnectors, 'chainChange', ({ chain }) => {
+        validateNetwork();
+    });
     useEffect(() => {
         /**
          * This check was added to prevent the "wrong network" modal from appearing

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

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/findWalletOptionFor.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
@@ -17,7 +18,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a;
+        var _a, _b;
         const wallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -29,6 +30,12 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // only checking for ledger hardware wallets since we only specify ledger as a hardware wallet
+        if (((_a = account.walletProperties) === null || _a === void 0 ? void 0 : _a.hardwareWallet) ===
+            sdkApiCore.HardwareWalletEnum.Ledger &&
+            walletConnectorCore.isHardwareWalletConnector(wallet.walletConnector)) {
+            wallet.walletConnector.isHardwareWalletEnabled = true;
+        }
         // this account is the owner of a smart wallet, and should not be surfaced
         if (smartWallet.isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
@@ -48,7 +55,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
+                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
             });
         }
         return null;

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

@@ -1,5 +1,6 @@
 'use client'
-import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { HardwareWalletEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
@@ -13,7 +14,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
-        var _a;
+        var _a, _b;
         const wallet = findWalletOptionFor(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -25,6 +26,12 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // only checking for ledger hardware wallets since we only specify ledger as a hardware wallet
+        if (((_a = account.walletProperties) === null || _a === void 0 ? void 0 : _a.hardwareWallet) ===
+            HardwareWalletEnum.Ledger &&
+            isHardwareWalletConnector(wallet.walletConnector)) {
+            wallet.walletConnector.isHardwareWalletEnabled = true;
+        }
         // this account is the owner of a smart wallet, and should not be surfaced
         if (isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
@@ -44,7 +51,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
+                key: (_b = account.walletName) !== null && _b !== void 0 ? _b : wallet.walletConnector.key,
             });
         }
         return null;

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

@@ -22,13 +22,6 @@ var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWall
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
-    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
-        logger.logger.debug('primary wallet chain change', { chain });
-        if (!primaryWallet) {
-            return;
-        }
-        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-    });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         logger.logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
             isPrimaryWallet,
@@ -149,13 +142,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
         }
     }));
-    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', (_, changedConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        logger.logger.debug('secondary wallet chain change');
-        // Get all wallets with this connector
-        const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
-        for (const wallet of affectedWallets)
-            refreshConnectedWallet(wallet.id, wallet.connector);
-    }));
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         if (authMode === 'connect-only') {

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

@@ -18,13 +18,6 @@ import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWa
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
-    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
-        logger.debug('primary wallet chain change', { chain });
-        if (!primaryWallet) {
-            return;
-        }
-        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-    });
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
             isPrimaryWallet,
@@ -145,13 +138,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
         }
     }));
-    useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', (_, changedConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        logger.debug('secondary wallet chain change');
-        // Get all wallets with this connector
-        const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
-        for (const wallet of affectedWallets)
-            refreshConnectedWallet(wallet.id, wallet.connector);
-    }));
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         if (authMode === 'connect-only') {