@dynamic-labs/sdk-react-core 2.1.0-alpha.1 → 2.1.0-alpha.10

package/src/lib/views/Passkey/utils/{createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.js → createEmbeddedWalletRequest/createEmbeddedWalletRequest.js}

@@ -20,42 +20,41 @@ import '../../../../locale/locale.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import { addPasskeyIdentifierToWalletConnector } from '../../../../utils/functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.js';
 import 'viem';
 import 'viem/chains';
 
-const createEmbeddedWalletWithPasskey = (_a) => __awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, authToken, chains, }) {
-    var _b;
+const createEmbeddedWalletRequest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, authToken, chains, webAuthnAttestation, withAuthenticator, }) {
     if (!authToken) {
         throw new DynamicError('Auth token is not defined');
     }
     if (!walletConnector) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     if (!user) {
         throw new DynamicError('User is not defined');
     }
     walletConnector.setEmail(user.email);
-    if (!user.email) {
-        const passkeyIdentifier = user.phoneNumber ||
-            ((_b = user.verifiedCredentials.find((vc) => vc.oauthDisplayName)) === null || _b === void 0 ? void 0 : _b.oauthDisplayName) ||
-            '';
-        walletConnector.setPasskeyIdentifier(passkeyIdentifier);
+    let authenticatorBody;
+    if (withAuthenticator || webAuthnAttestation !== undefined) {
+        if (!user.email) {
+            addPasskeyIdentifierToWalletConnector(walletConnector, user);
+        }
+        const { attestation, challenge, displayName } = webAuthnAttestation || (yield walletConnector.getWebAuthnAttestation());
+        authenticatorBody = {
+            attestation: attestation,
+            challenge,
+            passkeyAlias: displayName,
+        };
     }
-    const { attestation, challenge, displayName } = yield walletConnector.getWebAuthnAttestation();
-    const signersResponse = yield createTurnkeyEmbeddedWallet({
-        attestation: attestation,
-        chains,
-        challenge,
-        environmentId,
-        passkeyAlias: displayName,
-        userJwt: authToken,
-    });
+    const signersResponse = yield createTurnkeyEmbeddedWallet(Object.assign({ chains,
+        environmentId, userJwt: authToken }, authenticatorBody));
     const { jwt } = signersResponse;
     const decodedJwt = decodeJwt(jwt);
     if (decodedJwt === undefined)
         throw new DynamicError('Invalid token!');
     const primaryChain = walletConnector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, primaryChain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, [primaryChain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
@@ -69,4 +68,4 @@ const createEmbeddedWalletWithPasskey = (_a) => __awaiter(void 0, [_a], void 0,
     };
 });
 
-export { createEmbeddedWalletWithPasskey };
+export { createEmbeddedWalletRequest };

package/src/lib/views/Passkey/utils/createEmbeddedWalletRequest/index.d.ts

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

package/src/lib/views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs

@@ -0,0 +1,16 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+
+const findPrimaryEmbeddedChain = (projectSettings) => {
+    var _a, _b, _c;
+    const embeddedChainConfig = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.chainConfigurations) || [];
+    return ((_c = embeddedChainConfig.find((chain) => chain.primary)) === null || _c === void 0 ? void 0 : _c.name) === 'SOL'
+        ? sdkApiCore.ChainEnum.Sol
+        : sdkApiCore.ChainEnum.Evm;
+};
+
+exports.findPrimaryEmbeddedChain = findPrimaryEmbeddedChain;

package/src/lib/views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.d.ts

@@ -0,0 +1,2 @@
+import { ChainEnum, ProjectSettings } from '@dynamic-labs/sdk-api-core';
+export declare const findPrimaryEmbeddedChain: (projectSettings?: ProjectSettings) => ChainEnum;

package/src/lib/views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js

@@ -0,0 +1,12 @@
+'use client'
+import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+
+const findPrimaryEmbeddedChain = (projectSettings) => {
+    var _a, _b, _c;
+    const embeddedChainConfig = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.chainConfigurations) || [];
+    return ((_c = embeddedChainConfig.find((chain) => chain.primary)) === null || _c === void 0 ? void 0 : _c.name) === 'SOL'
+        ? ChainEnum.Sol
+        : ChainEnum.Evm;
+};
+
+export { findPrimaryEmbeddedChain };

package/src/lib/views/Passkey/utils/findPrimaryEmbeddedChain/index.d.ts

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

package/src/lib/views/Passkey/utils/index.d.ts

@@ -1,4 +1,3 @@
-export * from './createEmbeddedWalletWithPasskey';
+export * from './createEmbeddedWalletRequest';
 export * from './findPasskeyEmailWalletConnector';
-export * from './createPregeneratedWallet';
 export * from './findEmailOtpWalletConnector';

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs

@@ -39,7 +39,7 @@ const initEmbeddedWalletSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0,
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyRecoveryHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getAuthenticatorHandler();
     if (authenticatorType === 'passkey' &&
@@ -76,7 +76,7 @@ const passkeyRecoveryBundleValidation = (_c) => _tslib.__awaiter(void 0, [_c], v
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const decodedJwt = decodeJwt.decodeJwt(authToken);
     if (!decodedJwt) {
@@ -100,7 +100,7 @@ const resentRecoveryEmail = (_h) => _tslib.__awaiter(void 0, [_h], void 0, funct
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const publicKey = (_j = wallet.connector) === null || _j === void 0 ? void 0 : _j.getAuthenticatorHandler().publicKey;
     if (!publicKey) {
@@ -126,7 +126,7 @@ const completePasskeyRecovery = (_k) => _tslib.__awaiter(void 0, [_k], void 0, f
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);
@@ -156,7 +156,7 @@ const completePasskeyRecovery = (_k) => _tslib.__awaiter(void 0, [_k], void 0, f
         throw new utils.DynamicError('Invalid token!');
     }
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
@@ -182,7 +182,7 @@ const addNewPasskeyAuthenticator = (_p) => _tslib.__awaiter(void 0, [_p], void 0
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);
@@ -212,7 +212,7 @@ const addNewPasskeyAuthenticator = (_p) => _tslib.__awaiter(void 0, [_p], void 0
         throw new utils.DynamicError('Invalid token!');
     }
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
@@ -252,7 +252,7 @@ const restoreEmbeddedWalletSession = (_t) => _tslib.__awaiter(void 0, [_t], void
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const sessionSettings = localStorage.LocalStorage.getFromLS(localStorage$1.EMBEDDED_WALLET_SESSION_SETTINGS);
     const turnkeyRecoveryHandler = (_u = wallet.connector) === null || _u === void 0 ? void 0 : _u.getAuthenticatorHandler();
@@ -281,7 +281,7 @@ const addEmailRecovery = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !walletConnectorCore.isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const { turnkeySubOrganizationId, turnkeyUserId } = (_0 = (_z = decodedJwt.verifiedCredentials) === null || _z === void 0 ? void 0 : _z.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _0 === void 0 ? void 0 : _0.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.js

@@ -35,7 +35,7 @@ const initEmbeddedWalletSession = (_a) => __awaiter(void 0, [_a], void 0, functi
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyRecoveryHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getAuthenticatorHandler();
     if (authenticatorType === 'passkey' &&
@@ -72,7 +72,7 @@ const passkeyRecoveryBundleValidation = (_c) => __awaiter(void 0, [_c], void 0,
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const decodedJwt = decodeJwt(authToken);
     if (!decodedJwt) {
@@ -96,7 +96,7 @@ const resentRecoveryEmail = (_h) => __awaiter(void 0, [_h], void 0, function* ({
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const publicKey = (_j = wallet.connector) === null || _j === void 0 ? void 0 : _j.getAuthenticatorHandler().publicKey;
     if (!publicKey) {
@@ -122,7 +122,7 @@ const completePasskeyRecovery = (_k) => __awaiter(void 0, [_k], void 0, function
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);
@@ -152,7 +152,7 @@ const completePasskeyRecovery = (_k) => __awaiter(void 0, [_k], void 0, function
         throw new DynamicError('Invalid token!');
     }
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
@@ -178,7 +178,7 @@ const addNewPasskeyAuthenticator = (_p) => __awaiter(void 0, [_p], void 0, funct
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);
@@ -208,7 +208,7 @@ const addNewPasskeyAuthenticator = (_p) => __awaiter(void 0, [_p], void 0, funct
         throw new DynamicError('Invalid token!');
     }
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
@@ -248,7 +248,7 @@ const restoreEmbeddedWalletSession = (_t) => __awaiter(void 0, [_t], void 0, fun
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const sessionSettings = LocalStorage.getFromLS(EMBEDDED_WALLET_SESSION_SETTINGS);
     const turnkeyRecoveryHandler = (_u = wallet.connector) === null || _u === void 0 ? void 0 : _u.getAuthenticatorHandler();
@@ -277,7 +277,7 @@ const addEmailRecovery = (_y) => __awaiter(void 0, [_y], void 0, function* ({ au
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const { turnkeySubOrganizationId, turnkeyUserId } = (_0 = (_z = decodedJwt.verifiedCredentials) === null || _z === void 0 ? void 0 : _z.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _0 === void 0 ? void 0 : _0.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {

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

@@ -21,7 +21,7 @@ require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
-var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
+require('../../context/ViewContext/ViewContext.cjs');
 var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../shared/consts/index.cjs');
@@ -83,7 +83,6 @@ require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 var index = require('../../utils/functions/walletFilters/index.cjs');
-var isUserLinkingWallet = require('../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.cjs');
 var SearchNotFoundMessage = require('./SearchNotFoundMessage/SearchNotFoundMessage.cjs');
 var WalletListGridTabs = require('./WalletListGridTabs/WalletListGridTabs.cjs');
 var useTabState = require('./hooks/useTabState.cjs');
@@ -93,10 +92,8 @@ var getEffectiveRecommendedWallets = require('./utils/getEffectiveRecommendedWal
 localStorage.LocalStorage.setToLS(localStorage$1.WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, user, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { view } = ViewContext.useViewContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState.useTabState();
-    const isLinkingWallet = isUserLinkingWallet.isUserLinkingWallet(user, view.type, false);
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { error } = ErrorContext.useErrorContext();
     const { showDefaultFooter } = useAuthLayoutChecks.useAuthLayoutChecks();
@@ -126,7 +123,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const isSearchEnabled = Boolean(filterValue) ||
         (numberOfWallets > defaultNumberOfWalletsToShow &&
             walletsList.length !== numberOfWallets);
-    const isTabsEnabled = Boolean((tabsItems === null || tabsItems === void 0 ? void 0 : tabsItems.length) && !isLinkingWallet);
+    const isTabsEnabled = Boolean(tabsItems === null || tabsItems === void 0 ? void 0 : tabsItems.length);
     const walletListScrollRef = React.useRef(null);
     /* istanbul ignore next */
     const handleScroll = () => {

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

@@ -17,7 +17,7 @@ import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
-import { useViewContext } from '../../context/ViewContext/ViewContext.js';
+import '../../context/ViewContext/ViewContext.js';
 import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
@@ -79,7 +79,6 @@ import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import { FilterBridgeChainsName } from '../../utils/functions/walletFilters/index.js';
-import { isUserLinkingWallet } from '../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.js';
 import { SearchNotFoundMessage } from './SearchNotFoundMessage/SearchNotFoundMessage.js';
 import { WalletListGridTabs } from './WalletListGridTabs/WalletListGridTabs.js';
 import { useTabState } from './hooks/useTabState.js';
@@ -89,10 +88,8 @@ import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedW
 LocalStorage.setToLS(WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, user, recommendedWallets, } = useInternalDynamicContext();
-    const { view } = useViewContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, connectedWallets, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
     const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState();
-    const isLinkingWallet = isUserLinkingWallet(user, view.type, false);
     const { walletBook } = useWalletBookContext();
     const { error } = useErrorContext();
     const { showDefaultFooter } = useAuthLayoutChecks();
@@ -122,7 +119,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     const isSearchEnabled = Boolean(filterValue) ||
         (numberOfWallets > defaultNumberOfWalletsToShow &&
             walletsList.length !== numberOfWallets);
-    const isTabsEnabled = Boolean((tabsItems === null || tabsItems === void 0 ? void 0 : tabsItems.length) && !isLinkingWallet);
+    const isTabsEnabled = Boolean(tabsItems === null || tabsItems === void 0 ? void 0 : tabsItems.length);
     const walletListScrollRef = useRef(null);
     /* istanbul ignore next */
     const handleScroll = () => {

package/src/lib/views/WalletLockedView/WalletLockedView.cjs

@@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
-var React = require('react');
 var reactI18next = require('react-i18next');
 var walletBook = require('@dynamic-labs/wallet-book');
+require('react');
 require('../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 require('../../context/DynamicContext/DynamicContext.cjs');
@@ -83,14 +83,8 @@ require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection
 
 const iconSize = 64;
 const WalletLockedView = () => {
-    const { handleLogOut, primaryWallet, setShowAuthFlow, appName, authToken } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleLogOut, primaryWallet, setShowAuthFlow, appName } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
-    React.useEffect(() => {
-        // when there is no valid session, we want to log user out
-        if (!authToken) {
-            handleLogOut();
-        }
-    }, [authToken, handleLogOut]);
     if (!primaryWallet) {
         return null;
     }

package/src/lib/views/WalletLockedView/WalletLockedView.js

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
+import 'react';
 import '../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
@@ -79,14 +79,8 @@ import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.
 
 const iconSize = 64;
 const WalletLockedView = () => {
-    const { handleLogOut, primaryWallet, setShowAuthFlow, appName, authToken } = useInternalDynamicContext();
+    const { handleLogOut, primaryWallet, setShowAuthFlow, appName } = useInternalDynamicContext();
     const { t } = useTranslation();
-    useEffect(() => {
-        // when there is no valid session, we want to log user out
-        if (!authToken) {
-            handleLogOut();
-        }
-    }, [authToken, handleLogOut]);
     if (!primaryWallet) {
         return null;
     }

package/src/lib/views/viewToComponentMap.cjs

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var MergeUserAccountsConflictsView = require('./MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.cjs');
 var AccountExistsView = require('./AccountExistsView/AccountExistsView.cjs');
 var BridgeNextWalletConnectionView = require('./BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs');
 var BridgeSummaryView = require('./BridgeSummaryView/BridgeSummaryView.cjs');
@@ -21,6 +22,7 @@ var EmbeddedRevealView = require('./EmbeddedReveal/EmbeddedRevealView/EmbeddedRe
 var FarcasterConnectView = require('./FarcasterConnectView/FarcasterConnectView.cjs');
 var LoginView = require('./LoginView/LoginView.cjs');
 var MergeUserAccountsWithSameEmailView = require('./MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.cjs');
+var MergeUserAccountsView = require('./MergeUserAccountsView/MergeUserAccountsView.cjs');
 var MfaChooseDeviceView = require('./MfaChooseDeviceView/MfaChooseDeviceView.cjs');
 var MfaSecureDeviceView = require('./MfaSecureDeviceView/MfaSecureDeviceView.cjs');
 var NetworkNotSupported = require('./NetworkNotSupported/NetworkNotSupported.cjs');
@@ -136,6 +138,8 @@ const viewToComponentMap = {
     'login-with-email-verification': EmailVerification.EmailVerification,
     'login-with-sms-verification': SmsVerification.SmsVerification,
     'login-with-wallet-only': LoginView.LoginView,
+    'merge-user-accounts': MergeUserAccountsView.MergeUserAccountsView,
+    'merge-user-accounts-conflicts': MergeUserAccountsConflictsView.MergeUserAccountsConflictsView,
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView.MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView.MfaChooseDeviceView,
     'mfa-secure-device': MfaSecureDeviceView.MfaSecureDeviceView,

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

@@ -8,7 +8,7 @@ export declare const viewToComponentMap: {
     'chainalysis-blocked-wallet': () => JSX.Element;
     'collect-user-data': () => JSX.Element | null;
     'collect-user-data-login-no-wallet': import("react").FC<{
-        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "chain" | "ens" | "environmentId" | "isAuthenticatedWithAWallet" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "wallet" | "scope";
+        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "chain" | "ens" | "wallet" | "isAuthenticatedWithAWallet" | "environmentId" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "scope";
         userIdentificationOverride?: string | undefined;
     }>;
     'create-password-view': import("react").FC<import("./CreatePasswordView/CreatePasswordView").CreatePasswordViewProps>;
@@ -23,6 +23,8 @@ export declare const viewToComponentMap: {
     'login-with-email-verification': import("react").FC<import("./EmailVerification/EmailVerification").EmailVerificationProps>;
     'login-with-sms-verification': import("react").FC;
     'login-with-wallet-only': () => JSX.Element;
+    'merge-user-accounts': import("react").FC<import("./MergeUserAccountsView/MergeUserAccountsView").MergeUserAccountsViewProps>;
+    'merge-user-accounts-conflicts': import("react").FC<import("./MergeUserAccountsConflictsView/MergeUserAccountsConflictsView").MergeUserAccountsConflictsViewProps>;
     'merge-user-accounts-with-same-email': import("react").FC<import("./MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView").MergeUserAccountsWithSameEmailViewProps>;
     'mfa-choose-device': () => JSX.Element;
     'mfa-secure-device': ({ type }: import("./MfaSecureDeviceView").MfaSecureDeviceViewProps) => JSX.Element;
@@ -31,7 +33,9 @@ export declare const viewToComponentMap: {
     'network-not-supported-manual': import("react").FC;
     'no-access': () => JSX.Element;
     'no-qr-not-installed': () => JSX.Element | null;
-    'passkey-intro': import("react").FC;
+    'passkey-intro': import("react").FC<{
+        chains?: import("@dynamic-labs/sdk-api-core").ChainEnum[] | undefined;
+    }>;
     'passkey-new-domain-detected': import("react").FC;
     'passkey-recovery-add-email': import("react").FC<import("./Passkey/PasskeyRecovery/AddRecoveryEmail/AddRecoveryEmail").AddRecoveryEmailProps>;
     'passkey-recovery-bundle': import("react").FC<import("./Passkey/PasskeyRecovery/BundleValidation/PasskeyBundleRecovery").PasskeyBundleValidationProps>;

package/src/lib/views/viewToComponentMap.js

@@ -1,5 +1,6 @@
 'use client'
 import { jsx } from 'react/jsx-runtime';
+import { MergeUserAccountsConflictsView } from './MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.js';
 import { AccountExistsView } from './AccountExistsView/AccountExistsView.js';
 import { BridgeNextWalletConnectionView } from './BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js';
 import { BridgeSummaryView } from './BridgeSummaryView/BridgeSummaryView.js';
@@ -17,6 +18,7 @@ import { EmbeddedRevealView } from './EmbeddedReveal/EmbeddedRevealView/Embedded
 import { FarcasterConnectView } from './FarcasterConnectView/FarcasterConnectView.js';
 import { LoginView } from './LoginView/LoginView.js';
 import { MergeUserAccountsWithSameEmailView } from './MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.js';
+import { MergeUserAccountsView } from './MergeUserAccountsView/MergeUserAccountsView.js';
 import { MfaChooseDeviceView } from './MfaChooseDeviceView/MfaChooseDeviceView.js';
 import { MfaSecureDeviceView } from './MfaSecureDeviceView/MfaSecureDeviceView.js';
 import { NetworkNotSupported } from './NetworkNotSupported/NetworkNotSupported.js';
@@ -132,6 +134,8 @@ const viewToComponentMap = {
     'login-with-email-verification': EmailVerification,
     'login-with-sms-verification': SmsVerification,
     'login-with-wallet-only': LoginView,
+    'merge-user-accounts': MergeUserAccountsView,
+    'merge-user-accounts-conflicts': MergeUserAccountsConflictsView,
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView,
     'mfa-secure-device': MfaSecureDeviceView,

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

@@ -79,7 +79,8 @@ require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumb
 
 const PromptModal = ({ children, isShown = true, onClose, }) => {
     const elementId = 'dynamic-multi-wallet-prompt-modal';
-    useElementById.useElementById(elementId);
+    const { createRootElement } = useElementById.useElementById();
+    createRootElement(elementId);
     return (jsxRuntime.jsx(Portal.Portal, { handleClose: (e) => onClose === null || onClose === void 0 ? void 0 : onClose(e), isShown: isShown, zIndex: index.authModalZIndex, withBackdrop: true, elementId: elementId, children: jsxRuntime.jsx(Modal.Modal, { children: jsxRuntime.jsxs(ModalCard.ModalCard, { children: [onClose && (jsxRuntime.jsx("div", { className: 'prompt-modal__header', children: jsxRuntime.jsx(IconButton.IconButton, { className: 'prompt-modal__close-button', onClick: (e) => onClose(e), type: 'button', "data-testid": 'close-button', children: jsxRuntime.jsx(close.ReactComponent, {}) }) })), jsxRuntime.jsx("div", { className: 'prompt-modal', children: children })] }) }) }));
 };
 

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

@@ -75,7 +75,8 @@ import '../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumbe
 
 const PromptModal = ({ children, isShown = true, onClose, }) => {
     const elementId = 'dynamic-multi-wallet-prompt-modal';
-    useElementById(elementId);
+    const { createRootElement } = useElementById();
+    createRootElement(elementId);
     return (jsx(Portal, { handleClose: (e) => onClose === null || onClose === void 0 ? void 0 : onClose(e), isShown: isShown, zIndex: authModalZIndex, withBackdrop: true, elementId: elementId, children: jsx(Modal, { children: jsxs(ModalCard, { children: [onClose && (jsx("div", { className: 'prompt-modal__header', children: jsx(IconButton, { className: 'prompt-modal__close-button', onClick: (e) => onClose(e), type: 'button', "data-testid": 'close-button', children: jsx(SvgClose, {}) }) })), jsx("div", { className: 'prompt-modal', children: children })] }) }) }));
 };
 

package/src/lib/widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.cjs

@@ -78,7 +78,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useFetchNameService = (address) => {
     const { getNameService, network } = useInternalDynamicContext.useInternalDynamicContext();
     const { data: nameService } = usePromise.usePromise(() => getNameService(address), {
-        deps: [address, network],
+        deps: [address, network, getNameService],
     });
     return nameService;
 };

package/src/lib/widgets/DynamicWidget/hooks/useFetchNameService/useFetchNameService.js

@@ -74,7 +74,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useFetchNameService = (address) => {
     const { getNameService, network } = useInternalDynamicContext();
     const { data: nameService } = usePromise(() => getNameService(address), {
-        deps: [address, network],
+        deps: [address, network, getNameService],
     });
     return nameService;
 };

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

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

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

@@ -1,19 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-var findEmbeddedWalletFromVerifiedCredentials = require('../findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
-
-const isEmbeddedWalletPresent = (jwt, walletName) => {
-    var _a;
-    const embeddedWallet = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, sdkApiCore.ChainEnum.Evm) ||
-        findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, sdkApiCore.ChainEnum.Sol);
-    if (!walletName) {
-        return Boolean(embeddedWallet);
-    }
-    return Boolean((_a = embeddedWallet === null || embeddedWallet === void 0 ? void 0 : embeddedWallet.walletName) === null || _a === void 0 ? void 0 : _a.startsWith(walletName));
-};
-
-exports.isEmbeddedWalletPresent = isEmbeddedWalletPresent;

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

@@ -1 +0,0 @@
-export declare const isEmbeddedWalletPresent: (jwt: string, walletName?: string) => boolean;

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

@@ -1,15 +0,0 @@
-'use client'
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { findEmbeddedWalletFromVerifiedCredentials } from '../findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
-
-const isEmbeddedWalletPresent = (jwt, walletName) => {
-    var _a;
-    const embeddedWallet = findEmbeddedWalletFromVerifiedCredentials(jwt, ChainEnum.Evm) ||
-        findEmbeddedWalletFromVerifiedCredentials(jwt, ChainEnum.Sol);
-    if (!walletName) {
-        return Boolean(embeddedWallet);
-    }
-    return Boolean((_a = embeddedWallet === null || embeddedWallet === void 0 ? void 0 : embeddedWallet.walletName) === null || _a === void 0 ? void 0 : _a.startsWith(walletName));
-};
-
-export { isEmbeddedWalletPresent };

package/src/lib/views/Passkey/utils/createEmbeddedWalletWithPasskey/index.d.ts

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