@dynamic-labs/sdk-react-core 2.2.7 → 2.2.9

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

@@ -65,6 +65,7 @@ require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
+var ListTile = require('../../../../components/ListTile/ListTile.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -75,7 +76,6 @@ require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSucces
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var Badge = require('../../../../components/Badge/Badge.cjs');
-var ListTile = require('../../../../components/ListTile/ListTile.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');

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

@@ -61,6 +61,7 @@ import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
+import { ListTile } from '../../../../components/ListTile/ListTile.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
@@ -71,7 +72,6 @@ import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccess
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { Badge } from '../../../../components/Badge/Badge.js';
-import { ListTile } from '../../../../components/ListTile/ListTile.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/IsBrowser/IsBrowser.js';
 import '../../../../components/Popper/Popper/Popper.js';

package/src/lib/views/WalletList/WalletListItem/WalletListItem.cjs

@@ -66,6 +66,7 @@ require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var Icon = require('../../../components/Icon/Icon.cjs');
+var ListTile = require('../../../components/ListTile/ListTile.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -76,7 +77,6 @@ require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBa
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var Badge = require('../../../components/Badge/Badge.cjs');
-var ListTile = require('../../../components/ListTile/ListTile.cjs');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');

package/src/lib/views/WalletList/WalletListItem/WalletListItem.js

@@ -62,6 +62,7 @@ import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { Icon } from '../../../components/Icon/Icon.js';
+import { ListTile } from '../../../components/ListTile/ListTile.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/IconButton/IconButton.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
@@ -72,7 +73,6 @@ import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBan
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { Badge } from '../../../components/Badge/Badge.js';
-import { ListTile } from '../../../components/ListTile/ListTile.js';
 import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/IsBrowser/IsBrowser.js';
 import '../../../components/Popper/Popper/Popper.js';

package/src/lib/views/WalletRedirectView/WalletRedirectView.cjs

@@ -62,10 +62,10 @@ require('../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
+var Typography = require('../../components/Typography/Typography.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
-var Typography = require('../../components/Typography/Typography.cjs');
 require('formik');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Input/Input.cjs');

package/src/lib/views/WalletRedirectView/WalletRedirectView.js

@@ -58,10 +58,10 @@ import '../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
+import { Typography } from '../../components/Typography/Typography.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
-import { Typography } from '../../components/Typography/Typography.js';
 import 'formik';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Input/Input.js';

package/src/lib/widgets/DynamicWidget/components/AccountControl/AccountControl.cjs

@@ -64,9 +64,9 @@ require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
+var Icon = require('../../../../components/Icon/Icon.cjs');
 var AuthProviderIcon = require('../../../../components/AuthProviderIcon/AuthProviderIcon.cjs');
 var DynamicWidgetContext = require('../../context/DynamicWidgetContext.cjs');
-var Icon = require('../../../../components/Icon/Icon.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');

package/src/lib/widgets/DynamicWidget/components/AccountControl/AccountControl.js

@@ -60,9 +60,9 @@ import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
+import { Icon } from '../../../../components/Icon/Icon.js';
 import { AuthProviderIcon } from '../../../../components/AuthProviderIcon/AuthProviderIcon.js';
 import { useWidgetContext } from '../../context/DynamicWidgetContext.js';
-import { Icon } from '../../../../components/Icon/Icon.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.cjs

@@ -108,7 +108,11 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const { primaryWallet, network, projectSettings, handleLogOut, user, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet.useIsTurnkeyWallet();
-    const { isLoading: isLoadingTokenBalances, tokenBalances } = useTokenBalances.useTokenBalances({ includeFiat: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.showFiat, includeNativeBalance: true });
+    const { isLoading: isLoadingTokenBalances, tokenBalances } = useTokenBalances.useTokenBalances({
+        chainName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+        includeFiat: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.showFiat,
+        includeNativeBalance: true,
+    });
     const filteredTokenBalances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
     const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService.useFetchNameService(address);

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.js

@@ -104,7 +104,11 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const { primaryWallet, network, projectSettings, handleLogOut, user, walletConnector, } = useInternalDynamicContext();
     const { setDynamicWidgetView } = useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet();
-    const { isLoading: isLoadingTokenBalances, tokenBalances } = useTokenBalances({ includeFiat: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.showFiat, includeNativeBalance: true });
+    const { isLoading: isLoadingTokenBalances, tokenBalances } = useTokenBalances({
+        chainName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+        includeFiat: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.showFiat,
+        includeNativeBalance: true,
+    });
     const filteredTokenBalances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
     const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService(address);

package/src/lib/widgets/DynamicWidget/prompts/DetectedNewWalletModal/DetectedNewWalletModal.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var reactI18next = require('react-i18next');
 var walletBook = require('@dynamic-labs/wallet-book');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('react');
@@ -16,7 +17,6 @@ require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
@@ -63,6 +63,7 @@ var PromptModal = require('../../components/PromptModal/PromptModal.cjs');
 var WidgetPortal = require('../../components/WidgetPortal/WidgetPortal.cjs');
 var useCloseMultiWalletPrompt = require('../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.cjs');
 var DefaultPromptModal = require('../DefaultPromptModal/DefaultPromptModal.cjs');
+var HardwareWalletToggle = require('../../../../components/HardwareWalletToggle/HardwareWalletToggle.cjs');
 var Divider = require('../../../../components/Divider/Divider.cjs');
 require('../../context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
@@ -87,17 +88,19 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const DetectedNewWalletContent = () => {
-    var _a;
     const { t } = reactI18next.useTranslation();
     const { setMultiWalletWidgetState, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const handleClick = () => {
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     };
-    return (jsxRuntime.jsxs(DefaultPromptModal.DefaultPromptLayout, { dataTestId: 'detected-new-wallet-modal', icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: (_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key }), title: t('dyn_detected_new_wallet.title'), children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content', children: t('dyn_detected_new_wallet.description', {
-                    walletName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.name,
-                }) }), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonClassName: 'detected-new-wallet-modal__confirm-button', expanded: true, onClick: handleClick, typographyProps: {
-                    variant: 'button_secondary',
-                }, children: t('dyn_detected_new_wallet.confirm_button') }), jsxRuntime.jsx(Divider.Divider, { fullWidth: true, text: 'Or' }), jsxRuntime.jsx(LogoutButton.LogoutButton, { isTextButton: false, buttonClassName: 'detected-new-wallet-modal__log-out-button' })] }));
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+    return (jsxRuntime.jsxs(DefaultPromptModal.DefaultPromptLayout, { dataTestId: 'detected-new-wallet-modal', icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key }), title: t('dyn_detected_new_wallet.title'), children: [jsxRuntime.jsxs("div", { className: 'detected-new-wallet-modal__top-section', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content', children: t('dyn_detected_new_wallet.description', {
+                            walletName: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.name,
+                        }) }), walletConnector &&
+                        walletConnectorCore.isHardwareWalletConnector(walletConnector) &&
+                        walletConnector.canConnectWithHardwareWallet() && (jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { connectors: [walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') })), jsxRuntime.jsx(TypographyButton.TypographyButton, { expanded: true, onClick: handleClick, typographyProps: {
+                            variant: 'button_secondary',
+                        }, children: t('dyn_detected_new_wallet.confirm_button') })] }), jsxRuntime.jsx(Divider.Divider, { fullWidth: true, text: 'Or' }), jsxRuntime.jsx(LogoutButton.LogoutButton, { isTextButton: false, buttonClassName: 'detected-new-wallet-modal__log-out-button' })] }));
 };
 const DetectedNewWalletWidgetPortal = () => (jsxRuntime.jsx(WidgetPortal.WidgetPortal, { onClose: useCloseMultiWalletPrompt.useCloseMultiWalletPrompt(), children: jsxRuntime.jsx(DetectedNewWalletContent, {}) }));
 const DetectedNewWalletModal = () => (jsxRuntime.jsx(PromptModal.PromptModal, { onClose: useCloseMultiWalletPrompt.useCloseMultiWalletPrompt(), children: jsxRuntime.jsx(DetectedNewWalletContent, {}) }));

package/src/lib/widgets/DynamicWidget/prompts/DetectedNewWalletModal/DetectedNewWalletModal.js

@@ -2,6 +2,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';
 import 'react';
@@ -12,7 +13,6 @@ import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import '../../../../context/ViewContext/ViewContext.js';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
@@ -59,6 +59,7 @@ import { PromptModal } from '../../components/PromptModal/PromptModal.js';
 import { WidgetPortal } from '../../components/WidgetPortal/WidgetPortal.js';
 import { useCloseMultiWalletPrompt } from '../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.js';
 import { DefaultPromptLayout } from '../DefaultPromptModal/DefaultPromptModal.js';
+import { HardwareWalletToggle } from '../../../../components/HardwareWalletToggle/HardwareWalletToggle.js';
 import { Divider } from '../../../../components/Divider/Divider.js';
 import '../../context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
@@ -83,17 +84,19 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 
 const DetectedNewWalletContent = () => {
-    var _a;
     const { t } = useTranslation();
     const { setMultiWalletWidgetState, primaryWallet } = useInternalDynamicContext();
     const handleClick = () => {
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     };
-    return (jsxs(DefaultPromptLayout, { dataTestId: 'detected-new-wallet-modal', icon: jsx(WalletIcon, { walletKey: (_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key }), title: t('dyn_detected_new_wallet.title'), children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content', children: t('dyn_detected_new_wallet.description', {
-                    walletName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.name,
-                }) }), jsx(TypographyButton, { buttonClassName: 'detected-new-wallet-modal__confirm-button', expanded: true, onClick: handleClick, typographyProps: {
-                    variant: 'button_secondary',
-                }, children: t('dyn_detected_new_wallet.confirm_button') }), jsx(Divider, { fullWidth: true, text: 'Or' }), jsx(LogoutButton, { isTextButton: false, buttonClassName: 'detected-new-wallet-modal__log-out-button' })] }));
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+    return (jsxs(DefaultPromptLayout, { dataTestId: 'detected-new-wallet-modal', icon: jsx(WalletIcon, { walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key }), title: t('dyn_detected_new_wallet.title'), children: [jsxs("div", { className: 'detected-new-wallet-modal__top-section', children: [jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', "data-testid": 'content', children: t('dyn_detected_new_wallet.description', {
+                            walletName: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.name,
+                        }) }), walletConnector &&
+                        isHardwareWalletConnector(walletConnector) &&
+                        walletConnector.canConnectWithHardwareWallet() && (jsx(HardwareWalletToggle, { connectors: [walletConnector], copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', label: t('dyn_select_chain.using_hardware_wallet_toggle_label') })), jsx(TypographyButton, { expanded: true, onClick: handleClick, typographyProps: {
+                            variant: 'button_secondary',
+                        }, children: t('dyn_detected_new_wallet.confirm_button') })] }), jsx(Divider, { fullWidth: true, text: 'Or' }), jsx(LogoutButton, { isTextButton: false, buttonClassName: 'detected-new-wallet-modal__log-out-button' })] }));
 };
 const DetectedNewWalletWidgetPortal = () => (jsx(WidgetPortal, { onClose: useCloseMultiWalletPrompt(), children: jsx(DetectedNewWalletContent, {}) }));
 const DetectedNewWalletModal = () => (jsx(PromptModal, { onClose: useCloseMultiWalletPrompt(), children: jsx(DetectedNewWalletContent, {}) }));

package/src/lib/widgets/DynamicWidget/prompts/PendingAccountSwitchModal/PendingAccountSwitchModal.cjs

@@ -85,12 +85,13 @@ require('../../views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const PendingAccountSwitchContent = () => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { selectedWalletWithAction, primaryWallet, secondaryWallets } = useInternalDynamicContext.useInternalDynamicContext();
     const selectedConnector = (_a = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) === null || _a === void 0 ? void 0 : _a.connector;
     const isSameWallet = (selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key) === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.key);
     const { data: connectedWallet } = useConnectedAccountWallet.useConnectedAccountWallet((_b = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) === null || _b === void 0 ? void 0 : _b.connector, secondaryWallets);
-    return (jsxRuntime.jsx(DefaultPromptModal.DefaultPromptLayout, { dataTestId: 'pending-account-switch', icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key }), title: `Switch wallet in ${selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.connector.name}`, children: isSameWallet || !connectedWallet ? (jsxRuntime.jsx(SwitchAccountView.SwitchAccountView, { selectedWalletToSwitchTo: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet })) : (jsxRuntime.jsx(SwitchOrUseActiveAccountView.SwitchOrUseActiveAccountView, { connectedWallet: connectedWallet, selectedWalletToSwitchTo: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet })) }));
+    const selectedWalletToSwitchTo = (_d = (_c = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) !== null && _c !== void 0 ? _c : primaryWallet) !== null && _d !== void 0 ? _d : undefined;
+    return (jsxRuntime.jsx(DefaultPromptModal.DefaultPromptLayout, { dataTestId: 'pending-account-switch', icon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key }), title: `Switch wallet in ${selectedWalletToSwitchTo === null || selectedWalletToSwitchTo === void 0 ? void 0 : selectedWalletToSwitchTo.connector.name}`, children: isSameWallet || !connectedWallet ? (jsxRuntime.jsx(SwitchAccountView.SwitchAccountView, { selectedWalletToSwitchTo: selectedWalletToSwitchTo })) : (jsxRuntime.jsx(SwitchOrUseActiveAccountView.SwitchOrUseActiveAccountView, { connectedWallet: connectedWallet, selectedWalletToSwitchTo: selectedWalletToSwitchTo })) }));
 };
 const PendingAccountSwitchWidgetPortal = () => (jsxRuntime.jsx(WidgetPortal.WidgetPortal, { children: jsxRuntime.jsx(PendingAccountSwitchContent, {}) }));
 const PendingAccountSwitchModal = () => (jsxRuntime.jsx(PromptModal.PromptModal, { children: jsxRuntime.jsx(PendingAccountSwitchContent, {}) }));

package/src/lib/widgets/DynamicWidget/prompts/PendingAccountSwitchModal/PendingAccountSwitchModal.js

@@ -81,12 +81,13 @@ import '../../views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const PendingAccountSwitchContent = () => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { selectedWalletWithAction, primaryWallet, secondaryWallets } = useInternalDynamicContext();
     const selectedConnector = (_a = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) === null || _a === void 0 ? void 0 : _a.connector;
     const isSameWallet = (selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key) === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.key);
     const { data: connectedWallet } = useConnectedAccountWallet((_b = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) === null || _b === void 0 ? void 0 : _b.connector, secondaryWallets);
-    return (jsx(DefaultPromptLayout, { dataTestId: 'pending-account-switch', icon: jsx(WalletIcon, { walletKey: selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key }), title: `Switch wallet in ${selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.connector.name}`, children: isSameWallet || !connectedWallet ? (jsx(SwitchAccountView, { selectedWalletToSwitchTo: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet })) : (jsx(SwitchOrUseActiveAccountView, { connectedWallet: connectedWallet, selectedWalletToSwitchTo: selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet })) }));
+    const selectedWalletToSwitchTo = (_d = (_c = selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet) !== null && _c !== void 0 ? _c : primaryWallet) !== null && _d !== void 0 ? _d : undefined;
+    return (jsx(DefaultPromptLayout, { dataTestId: 'pending-account-switch', icon: jsx(WalletIcon, { walletKey: selectedConnector === null || selectedConnector === void 0 ? void 0 : selectedConnector.key }), title: `Switch wallet in ${selectedWalletToSwitchTo === null || selectedWalletToSwitchTo === void 0 ? void 0 : selectedWalletToSwitchTo.connector.name}`, children: isSameWallet || !connectedWallet ? (jsx(SwitchAccountView, { selectedWalletToSwitchTo: selectedWalletToSwitchTo })) : (jsx(SwitchOrUseActiveAccountView, { connectedWallet: connectedWallet, selectedWalletToSwitchTo: selectedWalletToSwitchTo })) }));
 };
 const PendingAccountSwitchWidgetPortal = () => (jsx(WidgetPortal, { children: jsx(PendingAccountSwitchContent, {}) }));
 const PendingAccountSwitchModal = () => (jsx(PromptModal, { children: jsx(PendingAccountSwitchContent, {}) }));

package/src/lib/widgets/DynamicWidget/prompts/PendingAccountSwitchModal/SwitchOrUseActiveAccountView/SwitchOrUseActiveAccountView.cjs

@@ -61,8 +61,8 @@ require('../../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-var Divider = require('../../../../../components/Divider/Divider.cjs');
 var Icon = require('../../../../../components/Icon/Icon.cjs');
+var Divider = require('../../../../../components/Divider/Divider.cjs');
 require('../../../context/DynamicWidgetContext.cjs');
 require('../../../../../components/IconButton/IconButton.cjs');
 require('../../../../../components/MenuList/Dropdown/Dropdown.cjs');

package/src/lib/widgets/DynamicWidget/prompts/PendingAccountSwitchModal/SwitchOrUseActiveAccountView/SwitchOrUseActiveAccountView.js

@@ -57,8 +57,8 @@ import '../../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import { Divider } from '../../../../../components/Divider/Divider.js';
 import { Icon } from '../../../../../components/Icon/Icon.js';
+import { Divider } from '../../../../../components/Divider/Divider.js';
 import '../../../context/DynamicWidgetContext.js';
 import '../../../../../components/IconButton/IconButton.js';
 import '../../../../../components/MenuList/Dropdown/Dropdown.js';

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

@@ -1,16 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-
-const isWalletLinked = (address, linkedWallets) => {
-    if (!address || !(linkedWallets === null || linkedWallets === void 0 ? void 0 : linkedWallets.length)) {
-        return false;
-    }
-    const linkedWallet = linkedWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, address, wallet.chain));
-    return Boolean(linkedWallet);
-};
-
-exports.isWalletLinked = isWalletLinked;

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

@@ -1,12 +0,0 @@
-'use client'
-import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
-
-const isWalletLinked = (address, linkedWallets) => {
-    if (!address || !(linkedWallets === null || linkedWallets === void 0 ? void 0 : linkedWallets.length)) {
-        return false;
-    }
-    const linkedWallet = linkedWallets.find((wallet) => isSameAddress(wallet.address, address, wallet.chain));
-    return Boolean(linkedWallet);
-};
-
-export { isWalletLinked };