@dynamic-labs/sdk-react-core 4.3.0 → 4.3.1

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

@@ -0,0 +1,13 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+const getWalletUniqueId = ({ address, connectorKey, chain, }) => `${connectorKey}-${address}-${chain}`;
+
+exports.getWalletUniqueId = getWalletUniqueId;

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

@@ -0,0 +1,10 @@
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+export declare const getWalletUniqueId: ({ address, connectorKey, chain, }: {
+    address: string;
+    connectorKey: string;
+    chain: string;
+}) => string;

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

@@ -0,0 +1,9 @@
+'use client'
+/**
+ * Generates a unique id for a wallet, based on the address,
+ * connector key, and chain.
+ * This is used to identify a wallet no matter if it's connected only or linked.
+ */
+const getWalletUniqueId = ({ address, connectorKey, chain, }) => `${connectorKey}-${address}-${chain}`;
+
+export { getWalletUniqueId };

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

@@ -0,0 +1 @@
+export { getWalletUniqueId } from './getWalletUniqueId';

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

@@ -82,3 +82,4 @@ export * from './fiatUtils';
 export * from './isAuthenticatedWithAWallet';
 export * from './networksAndChains';
 export * from './updatePrimaryWalletId';
+export * from './getWalletUniqueId';

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

@@ -27,6 +27,7 @@ require('../../../store/state/nonce/nonce.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
+var getWalletUniqueId = require('../../functions/getWalletUniqueId/getWalletUniqueId.cjs');
 require('../../../store/state/user/user.cjs');
 var session = require('../../../data/api/session/session.cjs');
 require('../../../locale/locale.cjs');
@@ -117,18 +118,6 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [connectedWalletsInfo, walletConnectorOptions]);
-    const getNextIdAvailable = React.useCallback((currentWallets) => {
-        const existingIds = currentWallets.map(({ id }) => id);
-        const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-wallet-', '')))
-            .sort((a, b) => a - b);
-        for (let i = 0; i < sortedIds.length; i++) {
-            if (sortedIds[i] !== i) {
-                return i;
-            }
-        }
-        return sortedIds.length;
-    }, []);
     const updateConnectedWalletById = React.useCallback((walletId, walletObject) => {
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
@@ -225,7 +214,11 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         // https://linear.app/dynamic-labs/issue/QNTM-784/rework-the-way-we-compute-wallet-ids
         if (!isConnectOnly.isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
-        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        const walletId = getWalletUniqueId.getWalletUniqueId({
+            address: walletAddress,
+            chain: walletConnector.connectedChain,
+            connectorKey: walletConnector.key,
+        });
         if (!primaryWalletId$1) {
             updatePrimaryWalletId.updatePrimaryWalletId(walletId);
         }

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

@@ -23,6 +23,7 @@ import '../../../store/state/nonce/nonce.js';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
+import { getWalletUniqueId } from '../../functions/getWalletUniqueId/getWalletUniqueId.js';
 import '../../../store/state/user/user.js';
 import { createVisit } from '../../../data/api/session/session.js';
 import '../../../locale/locale.js';
@@ -113,18 +114,6 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [connectedWalletsInfo, walletConnectorOptions]);
-    const getNextIdAvailable = useCallback((currentWallets) => {
-        const existingIds = currentWallets.map(({ id }) => id);
-        const sortedIds = existingIds
-            .map((id) => Number(id.replace('connect-wallet-', '')))
-            .sort((a, b) => a - b);
-        for (let i = 0; i < sortedIds.length; i++) {
-            if (sortedIds[i] !== i) {
-                return i;
-            }
-        }
-        return sortedIds.length;
-    }, []);
     const updateConnectedWalletById = useCallback((walletId, walletObject) => {
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
@@ -221,7 +210,11 @@ const useConnectWallet = ({ authMode, enableVisitTrackingOnConnectOnly, environm
         // https://linear.app/dynamic-labs/issue/QNTM-784/rework-the-way-we-compute-wallet-ids
         if (!isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
-        const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        const walletId = getWalletUniqueId({
+            address: walletAddress,
+            chain: walletConnector.connectedChain,
+            connectorKey: walletConnector.key,
+        });
         if (!primaryWalletId) {
             updatePrimaryWalletId(walletId);
         }

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

@@ -152,6 +152,10 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
                 copykey: 'dyn_embedded_delete.title',
                 heading: t('dyn_embedded_delete.title'),
             },
+            'embedded-wallet-exists': {
+                copykey: 'dyn_wallet_link.already_exists.title',
+                heading: t('dyn_wallet_link.already_exists.title'),
+            },
             'external-funding-wallet-list': {
                 copykey: 'dyn_receive_external_wallet_funds.wallet_list.title',
                 heading: t('dyn_receive_external_wallet_funds.wallet_list.title'),

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

@@ -148,6 +148,10 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
                 copykey: 'dyn_embedded_delete.title',
                 heading: t('dyn_embedded_delete.title'),
             },
+            'embedded-wallet-exists': {
+                copykey: 'dyn_wallet_link.already_exists.title',
+                heading: t('dyn_wallet_link.already_exists.title'),
+            },
             'external-funding-wallet-list': {
                 copykey: 'dyn_receive_external_wallet_funds.wallet_list.title',
                 heading: t('dyn_receive_external_wallet_funds.wallet_list.title'),

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

@@ -197,6 +197,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 option: walletConnector.name,
                 type: 'wallet',
             }, { error: e });
+        if (e instanceof utils.EmbeddedWalletExistsError) {
+            setView('embedded-wallet-exists');
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof utils.WalletUsedError) {
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError, StorageService, WalletUsedError, MergeAccountsConfirmationError, ChainalysisError, GateBlockedError, SandboxMaximumThresholdReachedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { DynamicError, StorageService, EmbeddedWalletExistsError, WalletUsedError, MergeAccountsConfirmationError, ChainalysisError, GateBlockedError, SandboxMaximumThresholdReachedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -193,6 +193,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 option: walletConnector.name,
                 type: 'wallet',
             }, { error: e });
+        if (e instanceof EmbeddedWalletExistsError) {
+            setView('embedded-wallet-exists');
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof WalletUsedError) {
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);

package/src/lib/views/WalletAlreadyExistsView/WalletAlreadyExistsView.cjs

@@ -0,0 +1,109 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../_virtual/_tslib.cjs');
+var jsxRuntime = require('react/jsx-runtime');
+var reactI18next = require('react-i18next');
+var walletBook = require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
+require('../../components/Alert/Alert.cjs');
+require('react');
+require('../../events/dynamicEvents.cjs');
+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');
+var shortenWalletAddress = require('../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
+require('../../utils/constants/colors.cjs');
+require('../../utils/constants/values.cjs');
+require('../../store/state/loadingAndLifecycle.cjs');
+require('../../shared/consts/index.cjs');
+var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../store/state/nonce/nonce.cjs');
+require('../../store/state/projectSettings/projectSettings.cjs');
+require('../../config/ApiEndpoint.cjs');
+require('../../store/state/user/user.cjs');
+require('../../locale/locale.cjs');
+require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../utils/functions/compareChains/compareChains.cjs');
+require('../../context/ThemeContext/ThemeContext.cjs');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
+require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
+require('../../context/WalletContext/WalletContext.cjs');
+require('../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
+require('yup');
+require('../../context/MockContext/MockContext.cjs');
+require('../CollectUserDataView/useFields.cjs');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../store/state/walletOptions/walletOptions.cjs');
+var Typography = require('../../components/Typography/Typography.cjs');
+require('../../context/FooterAnimationContext/index.cjs');
+require('../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('react-focus-lock');
+require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../components/IconButton/IconButton.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.cjs');
+require('formik');
+require('../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
+require('../../store/state/sendBalances.cjs');
+require('../../components/Input/Input.cjs');
+require('../../components/OverlayCard/OverlayCard.cjs');
+require('../TransactionConfirmationView/TransactionConfirmationView.cjs');
+require('../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../widgets/DynamicWidget/views/ReceiveExternalWalletFunds/ReceiveExternalWalletFunds.cjs');
+require('../../../index.cjs');
+require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../context/ConnectWithOtpContext/constants.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../store/state/tokenBalances.cjs');
+require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
+require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/IsBrowser/IsBrowser.cjs');
+require('../../components/Popper/Popper/Popper.cjs');
+require('../../components/Popper/PopperContext/PopperContext.cjs');
+require('qrcode');
+
+const WalletAlreadyExistsView = () => {
+    const { selectedWalletConnector: walletConnector } = useInternalDynamicContext.useInternalDynamicContext();
+    const { t } = reactI18next.useTranslation();
+    const { data: walletAddress } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const accounts = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getConnectedAccounts());
+        return accounts === null || accounts === void 0 ? void 0 : accounts[0];
+    }), {
+        deps: [walletConnector],
+    });
+    const shortenedWalletAddress = shortenWalletAddress.shortenWalletAddress(walletAddress);
+    return (jsxRuntime.jsxs("div", { className: 'wallet-already-exists-view__container', children: [jsxRuntime.jsx("div", { className: 'wallet-already-exists-view__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { icon: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.metadata.icon, walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key, width: 64, height: 64 }) }), jsxRuntime.jsx(Typography.Typography, { className: 'wallet-already-exists-view__shorten-wallet-address', variant: 'body_normal', weight: 'medium', color: 'primary', children: shortenedWalletAddress }), jsxRuntime.jsx(Typography.Typography, { className: 'wallet-already-exists-view__copy', variant: 'body_normal', color: 'secondary', weight: 'regular', children: t('dyn_wallet_link.already_exists.description') })] }));
+};
+
+exports.WalletAlreadyExistsView = WalletAlreadyExistsView;

package/src/lib/views/WalletAlreadyExistsView/WalletAlreadyExistsView.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const WalletAlreadyExistsView: () => JSX.Element;

package/src/lib/views/WalletAlreadyExistsView/WalletAlreadyExistsView.js

@@ -0,0 +1,105 @@
+'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useTranslation } from 'react-i18next';
+import { WalletIcon } from '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
+import '../../components/Alert/Alert.js';
+import 'react';
+import '../../events/dynamicEvents.js';
+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 { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
+import '../../utils/constants/colors.js';
+import '../../utils/constants/values.js';
+import '../../store/state/loadingAndLifecycle.js';
+import '../../shared/consts/index.js';
+import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../store/state/nonce/nonce.js';
+import '../../store/state/projectSettings/projectSettings.js';
+import '../../config/ApiEndpoint.js';
+import '../../store/state/user/user.js';
+import '../../locale/locale.js';
+import '../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../utils/functions/compareChains/compareChains.js';
+import '../../context/ThemeContext/ThemeContext.js';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
+import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
+import '../../context/WalletContext/WalletContext.js';
+import '../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
+import 'yup';
+import '../../context/MockContext/MockContext.js';
+import '../CollectUserDataView/useFields.js';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../store/state/walletOptions/walletOptions.js';
+import { Typography } from '../../components/Typography/Typography.js';
+import '../../context/FooterAnimationContext/index.js';
+import '../../components/ShadowDOM/ShadowDOM.js';
+import '../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
+import '../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import 'react-focus-lock';
+import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../components/IconButton/IconButton.js';
+import '../../components/MenuList/Dropdown/Dropdown.js';
+import 'formik';
+import '../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
+import '../../store/state/sendBalances.js';
+import '../../components/Input/Input.js';
+import '../../components/OverlayCard/OverlayCard.js';
+import '../TransactionConfirmationView/TransactionConfirmationView.js';
+import '../../context/PasskeyContext/PasskeyContext.js';
+import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../widgets/DynamicWidget/views/ReceiveExternalWalletFunds/ReceiveExternalWalletFunds.js';
+import '../../../index.js';
+import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../context/ConnectWithOtpContext/constants.js';
+import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../store/state/tokenBalances.js';
+import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
+import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/IsBrowser/IsBrowser.js';
+import '../../components/Popper/Popper/Popper.js';
+import '../../components/Popper/PopperContext/PopperContext.js';
+import 'qrcode';
+
+const WalletAlreadyExistsView = () => {
+    const { selectedWalletConnector: walletConnector } = useInternalDynamicContext();
+    const { t } = useTranslation();
+    const { data: walletAddress } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
+        const accounts = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getConnectedAccounts());
+        return accounts === null || accounts === void 0 ? void 0 : accounts[0];
+    }), {
+        deps: [walletConnector],
+    });
+    const shortenedWalletAddress = shortenWalletAddress(walletAddress);
+    return (jsxs("div", { className: 'wallet-already-exists-view__container', children: [jsx("div", { className: 'wallet-already-exists-view__icon', children: jsx(WalletIcon, { icon: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.metadata.icon, walletKey: walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key, width: 64, height: 64 }) }), jsx(Typography, { className: 'wallet-already-exists-view__shorten-wallet-address', variant: 'body_normal', weight: 'medium', color: 'primary', children: shortenedWalletAddress }), jsx(Typography, { className: 'wallet-already-exists-view__copy', variant: 'body_normal', color: 'secondary', weight: 'regular', children: t('dyn_wallet_link.already_exists.description') })] }));
+};
+
+export { WalletAlreadyExistsView };

package/src/lib/views/WalletAlreadyExistsView/index.d.ts

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

package/src/lib/views/viewToComponentMap.cjs

@@ -134,6 +134,7 @@ var WalletRedirectView = require('./WalletRedirectView/WalletRedirectView.cjs');
 var WalletSignSpinnerView = require('./WalletSignSpinnerView/WalletSignSpinnerView.cjs');
 var WalletUsedView = require('./WalletUsedView/WalletUsedView.cjs');
 var DepositView = require('./DepositView/DepositView.cjs');
+var WalletAlreadyExistsView = require('./WalletAlreadyExistsView/WalletAlreadyExistsView.cjs');
 require('../store/state/tokenBalances.cjs');
 require('../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 require('../components/InlineWidget/InlineWidget.cjs');
@@ -161,6 +162,7 @@ const viewToComponentMap = {
     'embedded-reveal-account-view': EmbeddedRevealView.EmbeddedRevealView,
     'embedded-reveal-view': EmbeddedRevealView.EmbeddedRevealView,
     'embedded-wallet-auth-choice': EmbeddedAuthChoice.EmbeddedAuthChoice,
+    'embedded-wallet-exists': WalletAlreadyExistsView.WalletAlreadyExistsView,
     'external-funding-wallet-list': WalletList.WalletList,
     'farcaster-connect-view': FarcasterConnectView.FarcasterConnectView,
     'gate-blocked-wallet': NoAccess.NoAccess,

package/src/lib/views/viewToComponentMap.d.ts

@@ -19,6 +19,7 @@ export declare const viewToComponentMap: {
     'embedded-reveal-account-view': import("react").FC<import("./EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView").EmbeddedRevealViewProps>;
     'embedded-reveal-view': import("react").FC<import("./EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView").EmbeddedRevealViewProps>;
     'embedded-wallet-auth-choice': import("react").FC<import("./Passkey/EmbeddedAuthChoice/EmbeddedAuthChoice").EmbeddedAuthChoiceProps>;
+    'embedded-wallet-exists': () => JSX.Element;
     'external-funding-wallet-list': ({ isWalletConnectList, onSelectWallet, viewWalletsFilter, }: import("./WalletList").WalletListProps) => JSX.Element;
     'farcaster-connect-view': ({ url }: import("./FarcasterConnectView/FarcasterConnectView").FarcasterConnectViewProps) => JSX.Element;
     'gate-blocked-wallet': () => JSX.Element;

package/src/lib/views/viewToComponentMap.js

@@ -130,6 +130,7 @@ import { WalletRedirectView } from './WalletRedirectView/WalletRedirectView.js';
 import { WalletSignSpinnerView } from './WalletSignSpinnerView/WalletSignSpinnerView.js';
 import { WalletUsedView } from './WalletUsedView/WalletUsedView.js';
 import { DepositView } from './DepositView/DepositView.js';
+import { WalletAlreadyExistsView } from './WalletAlreadyExistsView/WalletAlreadyExistsView.js';
 import '../store/state/tokenBalances.js';
 import '../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import '../components/InlineWidget/InlineWidget.js';
@@ -157,6 +158,7 @@ const viewToComponentMap = {
     'embedded-reveal-account-view': EmbeddedRevealView,
     'embedded-reveal-view': EmbeddedRevealView,
     'embedded-wallet-auth-choice': EmbeddedAuthChoice,
+    'embedded-wallet-exists': WalletAlreadyExistsView,
     'external-funding-wallet-list': WalletList,
     'farcaster-connect-view': FarcasterConnectView,
     'gate-blocked-wallet': NoAccess,

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

@@ -99,13 +99,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 const SecondaryWallets = ({ hideUnlinkAction = false }) => {
-    const { disconnectWallet, getConnectedWalletById, bridgeChains } = useInternalDynamicContext.useInternalDynamicContext();
-    const wallet = getConnectedWalletById('connect-wallet-1');
-    const NetworkIcon = wallet && getChainIcon.getChainIcon(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
-    const networkInfo = wallet && walletConnectorCore.getChainInfoWithOverrides(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [!wallet && (jsxRuntime.jsx(DynamicBridgeWidgetEmptyCard.DynamicBridgeWidgetEmptyCard, { chain: bridgeChains === null || bridgeChains === void 0 ? void 0 : bridgeChains[1].chain })), wallet && NetworkIcon && (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, { networkIcon: jsxRuntime.jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletKey: wallet.connector.key, walletAddress: wallet.address, walletBalance: 
+    const { disconnectWallet, bridgeChains, connectedWallets, primaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const secondaryWallet = connectedWallets.find((wallet) => wallet.id !== primaryWalletId);
+    const NetworkIcon = secondaryWallet && getChainIcon.getChainIcon(secondaryWallet === null || secondaryWallet === void 0 ? void 0 : secondaryWallet.chain);
+    const networkInfo = secondaryWallet && walletConnectorCore.getChainInfoWithOverrides(secondaryWallet === null || secondaryWallet === void 0 ? void 0 : secondaryWallet.chain);
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [!secondaryWallet && (jsxRuntime.jsx(DynamicBridgeWidgetEmptyCard.DynamicBridgeWidgetEmptyCard, { chain: bridgeChains === null || bridgeChains === void 0 ? void 0 : bridgeChains[1].chain })), secondaryWallet && NetworkIcon && (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, { networkIcon: jsxRuntime.jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletKey: secondaryWallet.connector.key, walletAddress: secondaryWallet.address, walletBalance: 
                     // eslint-disable-next-line react/jsx-wrap-multilines
-                    jsxRuntime.jsx(Balance.Balance, { wallet: wallet, network: wallet.chain }), onDisconnectClick: !hideUnlinkAction ? () => disconnectWallet(wallet.id) : undefined }, wallet.id) }))] }));
+                    jsxRuntime.jsx(Balance.Balance, { wallet: secondaryWallet, network: secondaryWallet.chain }), onDisconnectClick: !hideUnlinkAction
+                        ? () => disconnectWallet(secondaryWallet.id)
+                        : undefined }, secondaryWallet.id) }))] }));
 };
 const MemoSecondaryWallets = React__default["default"].memo(SecondaryWallets);
 

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

@@ -91,13 +91,15 @@ import { useInternalDynamicContext } from '../../../../../../context/DynamicCont
 import { DynamicBridgeWidgetEmptyCard } from '../../../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.js';
 
 const SecondaryWallets = ({ hideUnlinkAction = false }) => {
-    const { disconnectWallet, getConnectedWalletById, bridgeChains } = useInternalDynamicContext();
-    const wallet = getConnectedWalletById('connect-wallet-1');
-    const NetworkIcon = wallet && getChainIcon(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
-    const networkInfo = wallet && getChainInfoWithOverrides(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
-    return (jsxs(Fragment, { children: [!wallet && (jsx(DynamicBridgeWidgetEmptyCard, { chain: bridgeChains === null || bridgeChains === void 0 ? void 0 : bridgeChains[1].chain })), wallet && NetworkIcon && (jsx(DynamicBridgeWalletCard, { networkIcon: jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsx(DynamicBridgeWalletCardBody, { walletKey: wallet.connector.key, walletAddress: wallet.address, walletBalance: 
+    const { disconnectWallet, bridgeChains, connectedWallets, primaryWalletId } = useInternalDynamicContext();
+    const secondaryWallet = connectedWallets.find((wallet) => wallet.id !== primaryWalletId);
+    const NetworkIcon = secondaryWallet && getChainIcon(secondaryWallet === null || secondaryWallet === void 0 ? void 0 : secondaryWallet.chain);
+    const networkInfo = secondaryWallet && getChainInfoWithOverrides(secondaryWallet === null || secondaryWallet === void 0 ? void 0 : secondaryWallet.chain);
+    return (jsxs(Fragment, { children: [!secondaryWallet && (jsx(DynamicBridgeWidgetEmptyCard, { chain: bridgeChains === null || bridgeChains === void 0 ? void 0 : bridgeChains[1].chain })), secondaryWallet && NetworkIcon && (jsx(DynamicBridgeWalletCard, { networkIcon: jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsx(DynamicBridgeWalletCardBody, { walletKey: secondaryWallet.connector.key, walletAddress: secondaryWallet.address, walletBalance: 
                     // eslint-disable-next-line react/jsx-wrap-multilines
-                    jsx(Balance, { wallet: wallet, network: wallet.chain }), onDisconnectClick: !hideUnlinkAction ? () => disconnectWallet(wallet.id) : undefined }, wallet.id) }))] }));
+                    jsx(Balance, { wallet: secondaryWallet, network: secondaryWallet.chain }), onDisconnectClick: !hideUnlinkAction
+                        ? () => disconnectWallet(secondaryWallet.id)
+                        : undefined }, secondaryWallet.id) }))] }));
 };
 const MemoSecondaryWallets = React__default.memo(SecondaryWallets);
 

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

@@ -119,7 +119,7 @@ const DynamicWidgetWallets = () => {
                                 : t('dyn_widget.empty_wallets_action_connect'),
                         }) })) : (jsxRuntime.jsx("div", { className: 'dynamic-widget-wallets__body__wallet-list', children: secondaryWallets.map((wallet, index) => {
                             var _a;
-                            return (jsxRuntime.jsx(Wallet.Wallet, { ens: (_a = getWalletVerifiedCredential.getWalletVerifiedCredential(wallet.address, user === null || user === void 0 ? void 0 : user.verifiedCredentials, wallet.chain)) === null || _a === void 0 ? void 0 : _a.nameService, wallet: wallet }, wallet.id));
+                            return (jsxRuntime.jsx(Wallet.Wallet, { ens: (_a = getWalletVerifiedCredential.getWalletVerifiedCredential(wallet.address, user === null || user === void 0 ? void 0 : user.verifiedCredentials, wallet.chain)) === null || _a === void 0 ? void 0 : _a.nameService, wallet: wallet, clickable: true }, wallet.id));
                         }) })) }) })] }));
 };
 

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

@@ -115,7 +115,7 @@ const DynamicWidgetWallets = () => {
                                 : t('dyn_widget.empty_wallets_action_connect'),
                         }) })) : (jsx("div", { className: 'dynamic-widget-wallets__body__wallet-list', children: secondaryWallets.map((wallet, index) => {
                             var _a;
-                            return (jsx(Wallet, { ens: (_a = getWalletVerifiedCredential(wallet.address, user === null || user === void 0 ? void 0 : user.verifiedCredentials, wallet.chain)) === null || _a === void 0 ? void 0 : _a.nameService, wallet: wallet }, wallet.id));
+                            return (jsx(Wallet, { ens: (_a = getWalletVerifiedCredential(wallet.address, user === null || user === void 0 ? void 0 : user.verifiedCredentials, wallet.chain)) === null || _a === void 0 ? void 0 : _a.nameService, wallet: wallet, clickable: true }, wallet.id));
                         }) })) }) })] }));
 };
 

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

@@ -4,8 +4,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-require('react');
 var copy = require('../../../../shared/assets/copy.cjs');
 var key = require('../../../../shared/assets/key.cjs');
 var switchHorizontal = require('../../../../shared/assets/switch-horizontal.cjs');
@@ -55,6 +55,7 @@ require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs')
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
+var classNames = require('../../../../utils/functions/classNames/classNames.cjs');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');
 var Typography = require('../../../../components/Typography/Typography.cjs');
@@ -100,16 +101,19 @@ require('../../../../store/state/tokenBalances.cjs');
 require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
-const Wallet = ({ wallet, ens }) => {
+const Wallet = ({ wallet, ens, clickable }) => {
     var _a;
     const { connector, address } = wallet;
     const switchWallet = useSwitchWallet.useSwitchWallet();
     const { setSelectedWalletWithAction, projectSettings, authMode } = useInternalDynamicContext.useInternalDynamicContext();
+    const handleSwitchWallet = React.useCallback(() => {
+        switchWallet(wallet.id);
+    }, [switchWallet, wallet.id]);
     const iconSize = 20;
     const options = [
         {
             Icon: jsxRuntime.jsx(switchHorizontal.ReactComponent, {}),
-            callback: () => switchWallet(wallet.id),
+            callback: handleSwitchWallet,
             hide: !((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.isAvailable),
             text: 'Select wallet',
         },
@@ -142,7 +146,9 @@ const Wallet = ({ wallet, ens }) => {
             text: 'Export private keys',
         });
     }
-    return (jsxRuntime.jsxs("div", { className: 'wallet__container', "data-testid": 'wallet', children: [jsxRuntime.jsxs("div", { className: 'wallet__row', children: [jsxRuntime.jsx("div", { className: 'wallet__icon-container', children: jsxRuntime.jsx(AuthProviderIcon.AuthProviderIcon, { iconSize: iconSize, wallet: wallet, showNetworkIcon: true }) }), (ens === null || ens === void 0 ? void 0 : ens.name) ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Typography.Typography, { className: 'wallet__ens-name', variant: 'body_small', color: 'primary', truncate: true, children: ens === null || ens === void 0 ? void 0 : ens.name }), jsxRuntime.jsx("div", { className: 'wallet__row__seperator' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', color: 'secondary', children: shortenWalletAddress.shortenWalletAddress(address, 3, 3) })] })) : (jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', children: shortenWalletAddress.shortenWalletAddress(address, 4, 4) }))] }), jsxRuntime.jsx(DotsMenu.DotsMenu, { "data-testid": 'dots-menu', options: options, buttonClassName: 'wallet__menu', direction: 'left' })] }));
+    return (jsxRuntime.jsxs("div", { className: 'wallet__container', "data-testid": 'wallet', children: [jsxRuntime.jsxs("div", { className: classNames.classNames('wallet__row', {
+                    'wallet__row--clickable': clickable,
+                }), onClick: clickable ? handleSwitchWallet : undefined, children: [jsxRuntime.jsx("div", { className: 'wallet__icon-container', children: jsxRuntime.jsx(AuthProviderIcon.AuthProviderIcon, { iconSize: iconSize, wallet: wallet, showNetworkIcon: true }) }), (ens === null || ens === void 0 ? void 0 : ens.name) ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(Typography.Typography, { className: 'wallet__ens-name', variant: 'body_small', color: 'primary', truncate: true, children: ens === null || ens === void 0 ? void 0 : ens.name }), jsxRuntime.jsx("div", { className: 'wallet__row__separator' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_mini', color: 'secondary', children: shortenWalletAddress.shortenWalletAddress(address, 3, 3) })] })) : (jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', children: shortenWalletAddress.shortenWalletAddress(address, 4, 4) }))] }), jsxRuntime.jsx("div", { className: 'wallet__row__separator wallet__row__menu__separator ' }), jsxRuntime.jsx(DotsMenu.DotsMenu, { "data-testid": 'dots-menu', options: options, buttonClassName: 'wallet__menu', direction: 'left' })] }));
 };
 
 exports.Wallet = Wallet;

package/src/lib/widgets/DynamicWidget/components/Wallet/Wallet.d.ts

@@ -2,11 +2,13 @@
 import { NameServiceData } from '@dynamic-labs/sdk-api-core';
 import { Wallet as WalletType } from '../../../../shared/types';
 type Props = {
+    /** If true, clicking the wallet will set it as the primary wallet */
+    clickable?: boolean;
     ens?: NameServiceData;
     expanded?: boolean;
     expandedWallet?: string;
     setExpandedWallet?: (str?: string) => void;
     wallet: WalletType;
 };
-export declare const Wallet: ({ wallet, ens }: Props) => JSX.Element;
+export declare const Wallet: ({ wallet, ens, clickable }: Props) => JSX.Element;
 export {};