@dynamic-labs/sdk-react-core 1.1.0-phantom.0 → 1.2.0-alpha.0

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.js

@@ -1,28 +1,27 @@
-import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { DynamicError } from '@dynamic-labs/utils';
-import { dynamicEvents } from '../../../../events/dynamicEvents.js';
+import '../../../../events/dynamicEvents.js';
+import '../../../../../../_virtual/_tslib.js';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
-import { logger } from '../../../../shared/logger.js';
+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 { ReactComponent as SvgClose } from '../../../../shared/assets/close.js';
 import { ReactComponent as SvgSignInWithEmail } from '../../../../shared/assets/sign-in-with-email.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
-import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import '@dynamic-labs/multi-wallet';
-import { isAccountAbstractionWallet } from '../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.js';
 import 'viem/chains';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -31,8 +30,9 @@ import '../../../../context/EmailVerificationContext/EmailVerificationContext.js
 import 'react-dom';
 import { useElementById } from '../../../../utils/hooks/useElementById/useElementById.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
-import { useMutation } from '../../../../utils/hooks/useMutation/useMutation.js';
-import { iframeContainerId, iframeElementId } from '../constants.js';
+import { iframeContainerId } from '../constants.js';
+import { useIsTurnkeyWallet } from '../../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
+import { useInitEmbeddedWalletAuthMethod } from '../../../../utils/hooks/useInitEmbeddedWalletAuthMethod/useInitEmbeddedWalletAuthMethod.js';
 import '@dynamic-labs/types';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
@@ -46,7 +46,6 @@ import '../../../../components/Transition/OpacityTransition/OpacityTransition.js
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../../context/FooterAnimationContext/index.js';
-import { useIsTurnkeyWallet } from '../../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { Typography } from '../../../../components/Typography/Typography.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -65,10 +64,11 @@ import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '@dynamic-labs/viem-utils';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/viem-utils';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
+import '../../../../components/IsBrowser/IsBrowser.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import { NeedHelpSection } from '../../../../components/NeedHelpSection/NeedHelpSection.js';
 import '../../../../components/Popper/Popper/Popper.js';
@@ -77,32 +77,13 @@ import '../../../WalletList/WalletList.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import { initPasskeyRecovery } from '../../utils/passkeyRecovery/passkeyRecovery.js';
 
-const PasskeyInitRecovery = () => {
-    const { authToken, primaryWallet, environmentId, setShowAuthFlow, user } = useInternalDynamicContext();
+const PasskeyInitRecovery = ({ authenticatorType, }) => {
+    const { setShowAuthFlow } = useInternalDynamicContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet();
-    const { setView } = useViewContext();
+    const { initAuthMethod, isLoading, error } = useInitEmbeddedWalletAuthMethod();
     const iframeContainerRef = useElementById(iframeContainerId);
     const { t } = useTranslation();
-    const { mutate: initRecovery, isLoading, error, } = useMutation(() => __awaiter(void 0, void 0, void 0, function* () {
-        const wallet = isAccountAbstractionWallet(primaryWallet)
-            ? createOwnerWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [])
-            : primaryWallet;
-        yield initPasskeyRecovery({
-            authToken,
-            environmentId,
-            iframeContainer: iframeContainerRef.current,
-            iframeElementId,
-            wallet,
-        });
-        setView('passkey-recovery-bundle');
-    }), {
-        onFailure: (err) => {
-            logger.error('Failed to init passkey recovery', err);
-            dynamicEvents.emit('passkeyRecoveryFailed', err);
-        },
-    });
     const errorText = useMemo(() => {
         if (!error) {
             return undefined;
@@ -117,7 +98,10 @@ const PasskeyInitRecovery = () => {
         ? 'dyn_passkey_secure_modal'
         : 'dyn_passkey_recovery';
     const closeButton = (jsx(IconButton, { type: 'button', onClick: () => setShowAuthFlow(false, { emitCancelAuth: true }), "data-testid": 'close-button', children: jsx(SvgClose, {}) }));
-    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t(`${translationKey}.start.title`) }) }), jsxs("div", { className: 'passkey-recovery-view', children: [jsx(IconWithSpinner, { Icon: EmailIcon, isSpinning: isLoading, iconSize: 96 }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-recovery-view__subtitle', children: t(`${translationKey}.start.description`) }), errorText && jsx(ErrorContainer, { children: errorText }), jsx("div", { className: 'passkey-recovery-view__actions', children: jsx(Button, { buttonPadding: 'large', dataTestId: 'passkey-recovery-button', onClick: () => initRecovery(), disabled: isLoading, showInternalLoading: false, children: jsx("div", { children: jsx(Typography, { children: t(`${translationKey}.start.start_button`) }) }) }) }), jsx(NeedHelpSection, {})] })] }));
+    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t(`${translationKey}.start.title`) }) }), jsxs("div", { className: 'passkey-recovery-view', children: [jsx(IconWithSpinner, { Icon: EmailIcon, isSpinning: isLoading, iconSize: 96 }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-recovery-view__subtitle', children: t(`${translationKey}.start.description`) }), errorText && jsx(ErrorContainer, { children: errorText }), jsx("div", { className: 'passkey-recovery-view__actions', children: jsx(Button, { buttonPadding: 'large', dataTestId: 'passkey-recovery-button', onClick: () => initAuthMethod({
+                                authenticatorType,
+                                iframeContainer: iframeContainerRef.current,
+                            }), disabled: isLoading, showInternalLoading: false, children: jsx("div", { children: jsx(Typography, { children: t(`${translationKey}.start.start_button`) }) }) }) }), jsx(NeedHelpSection, { isRecoveryFlow: true })] })] }));
 };
 
 export { PasskeyInitRecovery };

package/src/lib/views/Passkey/RenamePasskeyView/RenamePasskeyView.cjs

@@ -19,6 +19,7 @@ var chevronLeft = require('../../../shared/assets/chevron-left.cjs');
 var close = require('../../../shared/assets/close.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../utils/constants/colors.cjs');
+require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
@@ -61,11 +62,12 @@ var ModalHeader = require('../../../components/ModalHeader/ModalHeader.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/Alert/Alert.cjs');
 var PasskeyCreatedSuccessBanner = require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('@dynamic-labs/viem-utils');
 var PasskeyContext = require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/viem-utils');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 var Input = require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');

package/src/lib/views/Passkey/RenamePasskeyView/RenamePasskeyView.js

@@ -15,6 +15,7 @@ import { ReactComponent as SvgChevronLeft } from '../../../shared/assets/chevron
 import { ReactComponent as SvgClose } from '../../../shared/assets/close.js';
 import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
+import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
@@ -57,11 +58,12 @@ import { ModalHeader } from '../../../components/ModalHeader/ModalHeader.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/Alert/Alert.js';
 import { PasskeySuccessEnum } from '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '@dynamic-labs/viem-utils';
 import { usePasskeyContext } from '../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/viem-utils';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../components/InlineWidget/InlineWidget.js';
 import { Input } from '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';

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

@@ -1,3 +1,5 @@
 export * from './PasskeyIntroView';
 export * from './PasskeyRecovery';
 export * from './RenamePasskeyView';
+export * from './EmbeddedAuthChoice';
+export * from './PasskeyNewDomainDetectedView';

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

@@ -13,16 +13,17 @@ require('react');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('../../../../shared/consts/index.cjs');
 var api = require('../../../../data/api.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 require('viem/chains');
 
-const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId, authToken, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId, authToken, chains, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (!authToken) {
         throw new utils.DynamicError('Auth token is not defined');
     }
@@ -34,8 +35,9 @@ const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId,
     }
     walletConnector.setEmail(user.email);
     const { attestation, challenge } = yield walletConnector.getWebAuthnAttestation();
-    const signersResponse = yield api.createTurnkeyEvmEmbeddedWallet({
+    const signersResponse = yield api.createTurnkeyEmbeddedWallet({
         attestation: attestation,
+        chains,
         challenge,
         environmentId,
         userJwt: authToken,
@@ -44,7 +46,8 @@ const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId,
     const decodedJwt = decodeJwt.decodeJwt(jwt);
     if (decodedJwt === undefined)
         throw new utils.DynamicError('Invalid token!');
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
+    const primaryChain = walletConnector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, primaryChain);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }

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

@@ -1,10 +1,12 @@
 import { IEmailWalletConnector, IPasskeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { ChainEnum } from '@dynamic-labs/sdk-api';
 import { UserProfile } from '../../../../shared';
-export declare const createEmbeddedWalletWithPasskey: ({ user, walletConnector, environmentId, authToken, }: {
+export declare const createEmbeddedWalletWithPasskey: ({ user, walletConnector, environmentId, authToken, chains, }: {
     authToken: string | undefined;
     environmentId: string;
     user: UserProfile | undefined;
     walletConnector: (IPasskeyWalletConnector & IEmailWalletConnector) | undefined;
+    chains: ChainEnum[];
 }) => Promise<{
     decodedJwt: Omit<import("@dynamic-labs/sdk-api").DynamicJwt, "jwt">;
     embeddedWalletVerifiedCredential: import("@dynamic-labs/sdk-api").JwtVerifiedCredential;

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

@@ -9,16 +9,17 @@ import 'react';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '../../../../shared/consts/index.js';
-import { createTurnkeyEvmEmbeddedWallet } from '../../../../data/api.js';
+import { createTurnkeyEmbeddedWallet } from '../../../../data/api.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
 import 'viem/chains';
 
-const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId, authToken, }) => __awaiter(void 0, void 0, void 0, function* () {
+const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId, authToken, chains, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!authToken) {
         throw new DynamicError('Auth token is not defined');
     }
@@ -30,8 +31,9 @@ const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId,
     }
     walletConnector.setEmail(user.email);
     const { attestation, challenge } = yield walletConnector.getWebAuthnAttestation();
-    const signersResponse = yield createTurnkeyEvmEmbeddedWallet({
+    const signersResponse = yield createTurnkeyEmbeddedWallet({
         attestation: attestation,
+        chains,
         challenge,
         environmentId,
         userJwt: authToken,
@@ -40,7 +42,8 @@ const createEmbeddedWalletWithPasskey = ({ user, walletConnector, environmentId,
     const decodedJwt = decodeJwt(jwt);
     if (decodedJwt === undefined)
         throw new DynamicError('Invalid token!');
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
+    const primaryChain = walletConnector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, primaryChain);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }

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

@@ -13,16 +13,17 @@ require('react');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('../../../../shared/consts/index.cjs');
 var api = require('../../../../data/api.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 require('viem/chains');
 
-const createPregeneratedWallet = ({ user, walletConnector, environmentId, authToken, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createPregeneratedWallet = ({ user, walletConnector, environmentId, authToken, chains, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     if (!authToken) {
         throw new utils.DynamicError('Auth token is not defined');
     }
@@ -33,7 +34,8 @@ const createPregeneratedWallet = ({ user, walletConnector, environmentId, authTo
         throw new utils.DynamicError('User is not defined');
     }
     walletConnector.setEmail(user.email);
-    const signersResponse = yield api.createTurnkeyEvmEmbeddedWallet({
+    const signersResponse = yield api.createTurnkeyEmbeddedWallet({
+        chains,
         environmentId,
         userJwt: authToken,
     });
@@ -41,7 +43,8 @@ const createPregeneratedWallet = ({ user, walletConnector, environmentId, authTo
     const decodedJwt = decodeJwt.decodeJwt(jwt);
     if (decodedJwt === undefined)
         throw new utils.DynamicError('Invalid token!');
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
+    const primaryChain = walletConnector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, primaryChain);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }

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

@@ -1,10 +1,12 @@
 import { IEmailWalletConnector, IPasskeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { ChainEnum } from '@dynamic-labs/sdk-api';
 import { UserProfile } from '../../../../shared';
-export declare const createPregeneratedWallet: ({ user, walletConnector, environmentId, authToken, }: {
+export declare const createPregeneratedWallet: ({ user, walletConnector, environmentId, authToken, chains, }: {
     authToken: string | undefined;
     environmentId: string;
     user: UserProfile | undefined;
     walletConnector: (IPasskeyWalletConnector & IEmailWalletConnector) | undefined;
+    chains: ChainEnum[];
 }) => Promise<{
     decodedJwt: Omit<import("@dynamic-labs/sdk-api").DynamicJwt, "jwt">;
     embeddedWalletVerifiedCredential: import("@dynamic-labs/sdk-api").JwtVerifiedCredential;

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

@@ -9,16 +9,17 @@ import 'react';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '../../../../shared/consts/index.js';
-import { createTurnkeyEvmEmbeddedWallet } from '../../../../data/api.js';
+import { createTurnkeyEmbeddedWallet } from '../../../../data/api.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
 import 'viem/chains';
 
-const createPregeneratedWallet = ({ user, walletConnector, environmentId, authToken, }) => __awaiter(void 0, void 0, void 0, function* () {
+const createPregeneratedWallet = ({ user, walletConnector, environmentId, authToken, chains, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!authToken) {
         throw new DynamicError('Auth token is not defined');
     }
@@ -29,7 +30,8 @@ const createPregeneratedWallet = ({ user, walletConnector, environmentId, authTo
         throw new DynamicError('User is not defined');
     }
     walletConnector.setEmail(user.email);
-    const signersResponse = yield createTurnkeyEvmEmbeddedWallet({
+    const signersResponse = yield createTurnkeyEmbeddedWallet({
+        chains,
         environmentId,
         userJwt: authToken,
     });
@@ -37,7 +39,8 @@ const createPregeneratedWallet = ({ user, walletConnector, environmentId, authTo
     const decodedJwt = decodeJwt(jwt);
     if (decodedJwt === undefined)
         throw new DynamicError('Invalid token!');
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
+    const primaryChain = walletConnector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, primaryChain);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }

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

@@ -4,11 +4,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
-const findPasskeyEmailWalletConnector = (wallets) => {
+const findPasskeyEmailWalletConnector = (wallets, chain) => {
     const walletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find((walletConnector) => walletConnectorCore.isPasskeyWalletConnector(walletConnector) &&
-        walletConnectorCore.isEmailWalletConnector(walletConnector));
+        walletConnectorCore.isEmailWalletConnector(walletConnector) &&
+        walletConnector.connectedChain === chain);
     return walletConnector;
 };
 

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

@@ -1,3 +1,4 @@
 import { IEmailWalletConnector, IPasskeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { ChainEnum } from '@dynamic-labs/sdk-api';
 import { WalletOption } from '../../../../shared';
-export declare const findPasskeyEmailWalletConnector: (wallets: WalletOption[]) => (IPasskeyWalletConnector & IEmailWalletConnector) | undefined;
+export declare const findPasskeyEmailWalletConnector: (wallets: WalletOption[], chain: ChainEnum) => (IPasskeyWalletConnector & IEmailWalletConnector) | undefined;

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

@@ -1,10 +1,11 @@
 import { isPasskeyWalletConnector, isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 
-const findPasskeyEmailWalletConnector = (wallets) => {
+const findPasskeyEmailWalletConnector = (wallets, chain) => {
     const walletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find((walletConnector) => isPasskeyWalletConnector(walletConnector) &&
-        isEmailWalletConnector(walletConnector));
+        isEmailWalletConnector(walletConnector) &&
+        walletConnector.connectedChain === chain);
     return walletConnector;
 };
 

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

@@ -13,18 +13,20 @@ require('../../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../../../utils/constants/localStorage.cjs');
 require('../../../../utils/constants/colors.cjs');
-require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../utils/constants/values.cjs');
+var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('../../../../shared/consts/index.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 var removeElementById = require('../../../../utils/functions/removeElementById/removeElementById.cjs');
 require('viem/chains');
 var constants = require('../../PasskeyRecovery/constants.cjs');
 
-const initPasskeyRecovery = ({ authToken, iframeContainer, iframeElementId, environmentId, wallet, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const initEmbeddedWalletSession = ({ authenticatorType, authToken, iframeContainer, iframeElementId, environmentId, userEmail, wallet, sessionExpiration, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (!authToken) {
         throw new utils.DynamicError('Auth token is not defined');
@@ -34,18 +36,32 @@ const initPasskeyRecovery = ({ authToken, iframeContainer, iframeElementId, envi
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
         throw new utils.DynamicError('PasskeyWalletConnector not found');
     }
-    const turnkeyRecoveryHandler = (_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.getRecoverPasskeyHandler();
-    const publicKey = yield turnkeyRecoveryHandler.initRecovery(iframeContainer, iframeElementId);
+    const turnkeyRecoveryHandler = (_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.getAuthenticatorHandler();
+    if (authenticatorType === 'passkey' &&
+        turnkeyRecoveryHandler.isSessionActive()) {
+        return addNewPasskeyAuthenticator({
+            authToken,
+            environmentId,
+            userEmail,
+            wallet,
+        });
+    }
+    const publicKey = yield turnkeyRecoveryHandler.initRecovery(authenticatorType, iframeContainer, iframeElementId, sessionExpiration);
     if (!publicKey) {
         throw new utils.DynamicError('Something went wrong');
     }
-    const { turnkeyRecoveryUserId } = yield api.initPasskeyRecovery({
+    const response = yield api.initEmbeddedWalletSession({
+        authenticatorType,
         environmentId,
         publicKey,
         userJwt: authToken,
         walletId: wallet.id,
     });
-    turnkeyRecoveryHandler.recoveryUserId = turnkeyRecoveryUserId;
+    turnkeyRecoveryHandler.recoveryUserId =
+        authenticatorType === 'passkey'
+            ? response.turnkeyRecoveryUserId
+            : response.turnkeyUserId;
+    return;
 });
 const passkeyRecoveryBundleValidation = ({ authToken, bundleInput, wallet, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _b, _c, _d, _e;
@@ -62,9 +78,16 @@ const passkeyRecoveryBundleValidation = ({ authToken, bundleInput, wallet, }) =>
         throw new utils.DynamicError('User must be logged in with a valid token');
     }
     const organizationId = (_d = (_c = (_b = decodedJwt.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _c === void 0 ? void 0 : _c.walletProperties) === null || _d === void 0 ? void 0 : _d.turnkeySubOrganizationId;
-    return (_e = wallet.connector) === null || _e === void 0 ? void 0 : _e.getRecoverPasskeyHandler().verifyRecoveryCode(bundleInput, organizationId);
+    const turnkeyRecoveryHandler = (_e = wallet.connector) === null || _e === void 0 ? void 0 : _e.getAuthenticatorHandler();
+    yield turnkeyRecoveryHandler.verifyRecoveryCode(bundleInput, organizationId);
+    const sessionSettings = {
+        createdAt: new Date().getTime(),
+        emailCode: bundleInput,
+        userId: turnkeyRecoveryHandler.recoveryUserId,
+    };
+    localStorage.LocalStorage.setToLS(localStorage$1.EMBEDDED_WALLET_SESSION_SETTINGS, sessionSettings);
 });
-const resentRecoveryEmail = ({ authToken, environmentId, wallet, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const resentRecoveryEmail = ({ authenticatorType, authToken, environmentId, wallet, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _f;
     if (!authToken) {
         throw new utils.DynamicError('Auth token is not defined');
@@ -74,11 +97,12 @@ const resentRecoveryEmail = ({ authToken, environmentId, wallet, }) => _tslib.__
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
         throw new utils.DynamicError('PasskeyWalletConnector not found');
     }
-    const publicKey = (_f = wallet.connector) === null || _f === void 0 ? void 0 : _f.getRecoverPasskeyHandler().publicKey;
+    const publicKey = (_f = wallet.connector) === null || _f === void 0 ? void 0 : _f.getAuthenticatorHandler().publicKey;
     if (!publicKey) {
         throw new utils.DynamicError('Could not proceed with your request. Please restart the process.');
     }
-    return api.initPasskeyRecovery({
+    return api.initEmbeddedWalletSession({
+        authenticatorType,
         environmentId,
         publicKey,
         userJwt: authToken,
@@ -105,7 +129,7 @@ const completePasskeyRecovery = ({ authToken, userEmail, environmentId, wallet,
     if (!organizationId) {
         throw new utils.DynamicError('Invalid token!');
     }
-    const turnkeyRecoveryHandler = wallet.connector.getRecoverPasskeyHandler();
+    const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
     const { attestation, challenge } = yield connector.getWebAuthnAttestation();
     // calls turnkey recovery api
     yield turnkeyRecoveryHandler.completeRecovery({
@@ -126,22 +150,105 @@ const completePasskeyRecovery = ({ authToken, userEmail, environmentId, wallet,
     if (decodedJwt === undefined) {
         throw new utils.DynamicError('Invalid token!');
     }
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
+    const chain = connector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
     connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
     // clear iframeStamper and its reference
-    connector.getRecoverPasskeyHandler().clear();
+    connector.getAuthenticatorHandler().clear();
     // deletes iframe container after usage
-    removeElementById.removeElementById(constants.iframeContainerId);
+    removeElementById.removeElementById(constants.iframeElementId);
+    return {
+        decodedJwt,
+        jwt,
+    };
+});
+const addNewPasskeyAuthenticator = ({ authToken, userEmail, environmentId, wallet, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    var _k, _l, _m;
+    if (!authToken) {
+        throw new utils.DynamicError('User must be logged in');
+    }
+    let decodedJwt = decodeJwt.decodeJwt(authToken);
+    if (!decodedJwt) {
+        throw new utils.DynamicError('User must be logged in with a valid token');
+    }
+    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');
+    }
+    const connector = wallet.connector;
+    connector.setEmail(userEmail);
+    const organizationId = (_m = (_l = (_k = decodedJwt.verifiedCredentials) === null || _k === void 0 ? void 0 : _k.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _l === void 0 ? void 0 : _l.walletProperties) === null || _m === void 0 ? void 0 : _m.turnkeySubOrganizationId;
+    if (!organizationId) {
+        throw new utils.DynamicError('Invalid token!');
+    }
+    const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
+    const { attestation, challenge } = yield connector.getWebAuthnAttestation();
+    // calls turnkey create authenticator api
+    yield turnkeyRecoveryHandler.addPasskeyAuthenticator({
+        attestation,
+        challenge,
+        organizationId,
+    });
+    // calls readcost api to add new authenticator
+    const passkeyRecoveryResponse = yield api.completePasskeyRecovery({
+        attestation: attestation,
+        challenge,
+        environmentId,
+        userJwt: authToken,
+        walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+    });
+    const { jwt } = passkeyRecoveryResponse;
+    decodedJwt = decodeJwt.decodeJwt(jwt);
+    if (decodedJwt === undefined) {
+        throw new utils.DynamicError('Invalid token!');
+    }
+    const chain = connector.connectedChain;
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+    if (!embeddedWalletVerifiedCredential) {
+        throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
+    }
+    connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
     return {
         decodedJwt,
         jwt,
     };
 });
+const restoreEmbeddedWalletSession = ({ authToken, iframeContainer, iframeElementId, wallet, sessionExpiration, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    var _o, _p, _q, _r;
+    if (!authToken) {
+        throw new utils.DynamicError('Auth token is not defined');
+    }
+    const decodedJwt = decodeJwt.decodeJwt(authToken);
+    if (!decodedJwt) {
+        throw new utils.DynamicError('User must be logged in with a valid token');
+    }
+    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');
+    }
+    const sessionSettings = localStorage.LocalStorage.getFromLS(localStorage$1.EMBEDDED_WALLET_SESSION_SETTINGS);
+    const turnkeyRecoveryHandler = (_o = wallet.connector) === null || _o === void 0 ? void 0 : _o.getAuthenticatorHandler();
+    if (!sessionSettings || Boolean(turnkeyRecoveryHandler.recoveryUserId)) {
+        return false;
+    }
+    const publicKey = yield turnkeyRecoveryHandler.initRecovery('email', iframeContainer, iframeElementId, sessionExpiration);
+    if (!publicKey) {
+        throw new utils.DynamicError('Something went wrong');
+    }
+    turnkeyRecoveryHandler.recoveryUserId = sessionSettings.userId;
+    const organizationId = (_r = (_q = (_p = decodedJwt.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
+    yield turnkeyRecoveryHandler.verifyRecoveryCode(sessionSettings.emailCode, organizationId);
+    return true;
+});
 
+exports.addNewPasskeyAuthenticator = addNewPasskeyAuthenticator;
 exports.completePasskeyRecovery = completePasskeyRecovery;
-exports.initPasskeyRecovery = initPasskeyRecovery;
+exports.initEmbeddedWalletSession = initEmbeddedWalletSession;
 exports.passkeyRecoveryBundleValidation = passkeyRecoveryBundleValidation;
 exports.resentRecoveryEmail = resentRecoveryEmail;
+exports.restoreEmbeddedWalletSession = restoreEmbeddedWalletSession;