@dynamic-labs/sdk-react-core 1.0.0-alpha.0 → 1.0.0-alpha.3

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

@@ -11,24 +11,33 @@ require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
-var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 
 const useConnectedWalletsNetworkValidation = () => {
-    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     React.useEffect(() => {
-        if (!isBridgeFlow) {
+        /**
+         * This check was added to prevent the "wrong network" modal from appearing
+         * after logging out. It seems like on log out, there is a render where the
+         * connectedWallets hasn't been cleared out yet, so the logic in this hook
+         * runs and ends up showing the "wrong network" modal if the connected wallet
+         * is on an unsupported network. by checking sdkHasLoaded, we prevent this
+         * extra popup because handleLogOut flips sdkHasLoaded to false, so on the
+         * next render it will already be false.
+         */
+        if (!sdkHasLoaded) {
             return;
         }
         const connectedWalletsWithInvalidNetwork = connectedWallets.filter((connectedWallet) => {
-            const isChainInWalletsToConnect = walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
+            const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
             const isSupported = isSupportedNetwork.isSupportedNetwork({
                 network: connectedWallet.network,
                 walletConnector: connectedWallet.connector,
@@ -39,11 +48,11 @@ const useConnectedWalletsNetworkValidation = () => {
             // If we found wallets that require a change of network
             // then, one by one, in the first one we require a change of network.
             const [connectedWalletWithInvalidNetwork] = connectedWalletsWithInvalidNetwork;
-            // Keeps the first wallet connectedWallet in setSelectedWalletConnector
+            // Keeps the first wallet connectedWallet in setSelectedWalletConnectorKey
             // This is required because NetworkNotSupported uses walletConnector to display wallet icon, address etc.
             if (connectedWalletWithInvalidNetwork.connector.name !==
                 (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name)) {
-                setSelectedWalletConnector(connectedWalletWithInvalidNetwork.connector);
+                setSelectedWalletConnectorKey(connectedWalletWithInvalidNetwork.connector.key);
             }
             const networkNotSupportedView = isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(connectedWalletWithInvalidNetwork.connector)
                 ? 'network-not-supported'
@@ -57,13 +66,13 @@ const useConnectedWalletsNetworkValidation = () => {
         // because closing modal on network switch causes it to re-open
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
+        sdkHasLoaded,
         connectedWallets,
-        isBridgeFlow,
         selectedWalletConnector,
-        setSelectedWalletConnector,
+        setSelectedWalletConnectorKey,
         setShowAuthFlow,
         setView,
-        walletsToConnectByChain,
+        bridgeChainsToConnect,
     ]);
 };
 

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

@@ -7,24 +7,33 @@ import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
-import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 
 const useConnectedWalletsNetworkValidation = () => {
-    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();
+    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     useEffect(() => {
-        if (!isBridgeFlow) {
+        /**
+         * This check was added to prevent the "wrong network" modal from appearing
+         * after logging out. It seems like on log out, there is a render where the
+         * connectedWallets hasn't been cleared out yet, so the logic in this hook
+         * runs and ends up showing the "wrong network" modal if the connected wallet
+         * is on an unsupported network. by checking sdkHasLoaded, we prevent this
+         * extra popup because handleLogOut flips sdkHasLoaded to false, so on the
+         * next render it will already be false.
+         */
+        if (!sdkHasLoaded) {
             return;
         }
         const connectedWalletsWithInvalidNetwork = connectedWallets.filter((connectedWallet) => {
-            const isChainInWalletsToConnect = walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
+            const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
             const isSupported = isSupportedNetwork({
                 network: connectedWallet.network,
                 walletConnector: connectedWallet.connector,
@@ -35,11 +44,11 @@ const useConnectedWalletsNetworkValidation = () => {
             // If we found wallets that require a change of network
             // then, one by one, in the first one we require a change of network.
             const [connectedWalletWithInvalidNetwork] = connectedWalletsWithInvalidNetwork;
-            // Keeps the first wallet connectedWallet in setSelectedWalletConnector
+            // Keeps the first wallet connectedWallet in setSelectedWalletConnectorKey
             // This is required because NetworkNotSupported uses walletConnector to display wallet icon, address etc.
             if (connectedWalletWithInvalidNetwork.connector.name !==
                 (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name)) {
-                setSelectedWalletConnector(connectedWalletWithInvalidNetwork.connector);
+                setSelectedWalletConnectorKey(connectedWalletWithInvalidNetwork.connector.key);
             }
             const networkNotSupportedView = isProgrammableNetworkSwitchSupported(connectedWalletWithInvalidNetwork.connector)
                 ? 'network-not-supported'
@@ -53,13 +62,13 @@ const useConnectedWalletsNetworkValidation = () => {
         // because closing modal on network switch causes it to re-open
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
+        sdkHasLoaded,
         connectedWallets,
-        isBridgeFlow,
         selectedWalletConnector,
-        setSelectedWalletConnector,
+        setSelectedWalletConnectorKey,
         setShowAuthFlow,
         setView,
-        walletsToConnectByChain,
+        bridgeChainsToConnect,
     ]);
 };
 

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

@@ -12,15 +12,15 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
-require('@dynamic-labs/multi-wallet');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
+var index = require('../../functions/storeAuthToken/index.cjs');
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -8,15 +8,15 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
-import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
-import '@dynamic-labs/multi-wallet';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
+import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext();

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

@@ -66,6 +66,15 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
         'network-not-supported': {
             heading: 'Update Network',
         },
+        'passkey-recovery-bundle': {
+            heading: t('dyn_passkey_recovery.code.title'),
+        },
+        'passkey-recovery-complete': {
+            heading: t('dyn_passkey_recovery.complete.title'),
+        },
+        'passkey-recovery-start': {
+            heading: t('dyn_passkey_recovery.start.title'),
+        },
         'pending-connect': {
             heading: t('dyn_login.connect_wallet.title'),
         },

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

@@ -62,6 +62,15 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
         'network-not-supported': {
             heading: 'Update Network',
         },
+        'passkey-recovery-bundle': {
+            heading: t('dyn_passkey_recovery.code.title'),
+        },
+        'passkey-recovery-complete': {
+            heading: t('dyn_passkey_recovery.complete.title'),
+        },
+        'passkey-recovery-start': {
+            heading: t('dyn_passkey_recovery.start.title'),
+        },
         'pending-connect': {
             heading: t('dyn_login.connect_wallet.title'),
         },

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

@@ -10,6 +10,19 @@ var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
 var useConnectWithEmail = require('../useConnectWithEmail/useConnectWithEmail.cjs');
 var api = require('../../../data/api.cjs');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
@@ -23,10 +36,12 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     const { providers } = projectSettings || {};
     const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
     const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.provider === sdkApi.ProviderEnum.MagicLink ||
-            provider.provider === sdkApi.ProviderEnum.Blocto).length);
-    const handleEmailOnlyLoginSubmit = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.enabledAt &&
+            (provider.provider === sdkApi.ProviderEnum.MagicLink ||
+                provider.provider === sdkApi.ProviderEnum.Blocto)).length);
+    const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield api.createEmailVerification({
+            captchaToken,
             email: emailInput,
             environmentId,
         });
@@ -37,17 +52,37 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     const handleMagicLinkOrBloctoSubmit = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         yield connectWithEmail(emailInput);
     });
-    const submitEmail = (emailInput) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const submitEmail = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (isMagicOrBloctoEnabled) {
             yield handleMagicLinkOrBloctoSubmit(emailInput);
             return;
         }
-        yield handleEmailOnlyLoginSubmit(emailInput);
+        yield handleEmailOnlyLoginSubmit(emailInput, captchaToken);
+    });
+    const handleEmailSubmitWithOptionalCaptcha = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if ((emailWalletConnector !== undefined ||
+            isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) &&
+            (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
+            // see: https://linear.app/dynamic-labs/issue/DYN-2517
+            // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
+            const { emailProvider } = yield api.getEmailProvider({
+                email: emailInput,
+                environmentId,
+            });
+            // For v0.19 we will support emailOnly and Dynamic as email providers
+            // For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
+            // Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
+            if (emailProvider === sdkApi.ProviderEnum.EmailOnly ||
+                emailProvider === sdkApi.ProviderEnum.Dynamic) {
+                yield handleEmailOnlyLoginSubmit(emailInput, captchaToken);
+                return;
+            }
+        }
+        yield submitEmail(emailInput, captchaToken);
     });
     return {
-        handleEmailOnlyLoginSubmit,
+        handleEmailSubmitWithOptionalCaptcha,
         isEmailProviderLoading,
-        submitEmail,
     };
 };
 

package/src/lib/utils/hooks/useEmailProvider/useEmailProvider.d.ts

@@ -3,8 +3,7 @@ type Props = {
     emailWalletConnector: IEmailWalletConnector | undefined;
 };
 export declare const useEmailProvider: ({ emailWalletConnector }: Props) => {
-    handleEmailOnlyLoginSubmit: (emailInput: string) => Promise<void>;
+    handleEmailSubmitWithOptionalCaptcha: (emailInput: string, captchaToken?: string) => Promise<void>;
     isEmailProviderLoading: boolean;
-    submitEmail: (emailInput: string) => Promise<void>;
 };
 export {};

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

@@ -5,7 +5,20 @@ import { useEmailVerificationContext } from '../../../context/EmailVerificationC
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
 import { useConnectWithEmail } from '../useConnectWithEmail/useConnectWithEmail.js';
-import { createEmailVerification } from '../../../data/api.js';
+import { getEmailProvider, createEmailVerification } from '../../../data/api.js';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 
 const useEmailProvider = ({ emailWalletConnector }) => {
     const { projectSettings, environmentId } = useInternalDynamicContext();
@@ -19,10 +32,12 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     const { providers } = projectSettings || {};
     const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
     const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.provider === ProviderEnum.MagicLink ||
-            provider.provider === ProviderEnum.Blocto).length);
-    const handleEmailOnlyLoginSubmit = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.enabledAt &&
+            (provider.provider === ProviderEnum.MagicLink ||
+                provider.provider === ProviderEnum.Blocto)).length);
+    const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield createEmailVerification({
+            captchaToken,
             email: emailInput,
             environmentId,
         });
@@ -33,17 +48,37 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     const handleMagicLinkOrBloctoSubmit = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
         yield connectWithEmail(emailInput);
     });
-    const submitEmail = (emailInput) => __awaiter(void 0, void 0, void 0, function* () {
+    const submitEmail = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         if (isMagicOrBloctoEnabled) {
             yield handleMagicLinkOrBloctoSubmit(emailInput);
             return;
         }
-        yield handleEmailOnlyLoginSubmit(emailInput);
+        yield handleEmailOnlyLoginSubmit(emailInput, captchaToken);
+    });
+    const handleEmailSubmitWithOptionalCaptcha = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+        if ((emailWalletConnector !== undefined ||
+            isTurnkeyEnabled(projectSettings)) &&
+            (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.confirmEmailProviderForVerify)) {
+            // see: https://linear.app/dynamic-labs/issue/DYN-2517
+            // if confirmWalletTransfers setting is true, check api first to confirm emailProvider
+            const { emailProvider } = yield getEmailProvider({
+                email: emailInput,
+                environmentId,
+            });
+            // For v0.19 we will support emailOnly and Dynamic as email providers
+            // For v0.20/v1 we need to remove emailOnly and leave Dynamic as the only one email provider
+            // Ticket: https://linear.app/dynamic-labs/issue/GVTY-213/remove-emailonly-as-a-provider-from-sdk
+            if (emailProvider === ProviderEnum.EmailOnly ||
+                emailProvider === ProviderEnum.Dynamic) {
+                yield handleEmailOnlyLoginSubmit(emailInput, captchaToken);
+                return;
+            }
+        }
+        yield submitEmail(emailInput, captchaToken);
     });
     return {
-        handleEmailOnlyLoginSubmit,
+        handleEmailSubmitWithOptionalCaptcha,
         isEmailProviderLoading,
-        submitEmail,
     };
 };
 

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

@@ -10,21 +10,22 @@ var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
-require('../../../shared/logger.cjs');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
+var findTurnkeyWallet = require('../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
-var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
-var findTurnkeyWallet = require('../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 var getUserWalletsFromVerifiedCredentials = require('../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
+var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
+var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
@@ -39,7 +40,7 @@ const useEmbeddedWallet = () => {
         return isEmbeddedWalletPresent.isEmbeddedWalletPresent(jwt);
     };
     const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
@@ -50,25 +51,61 @@ const useEmbeddedWallet = () => {
         const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
         // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
         if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
-            internalSetShowAuthFlow(true);
-            setView('passkey-intro');
-            return new Promise((resolve, reject) => {
-                internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
-                internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
-            });
+            return startEmbeddedWalletCreationFlow();
         }
         internalSetShowAuthFlow(false);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(wallets);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
             return Promise.resolve(primaryWallet);
         }
+        // if user already has embedded wallet, returns it
+        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    }), [
+        internalEvents,
+        internalSetShowAuthFlow,
+        onboardingOnlyJwt,
+        projectSettings,
+        setPrimaryWalletId,
+        setView,
+        wallets,
+    ]);
+    const startEmbeddedWalletCreationFlow = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        internalSetShowAuthFlow(true);
+        setView('passkey-intro');
+        return new Promise((resolve, reject) => {
+            internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            internalEvents.current.once('embeddedWalletFailed', (error) => {
+                // when creating a passkey, if user cancels the passkey modal more than once
+                // it will throw this DOMException, but we don't want to let user to have access
+                // to the app before they've a passkey correctly setup
+                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                    logger.logger.error('User cancelled the passkey creation.', error);
+                    return;
+                }
+                reject(error);
+            });
+        });
+    });
+    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c, _d;
         const decodedJwt = decodeJwt.decodeJwt(jwt);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(wallets);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
+            if (smartWallet$1) {
+                setPrimaryWalletId(smartWallet$1.id);
+                smartWallet.initializeSmartWallet({
+                    account: smartWallet$1,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletOptions: wallets,
+                });
+            }
+            else {
+                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            }
         }
         const passkeyWallet = {
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
@@ -78,15 +115,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    }), [
-        internalEvents,
-        internalSetShowAuthFlow,
-        onboardingOnlyJwt,
-        projectSettings,
-        setPrimaryWalletId,
-        setView,
-        wallets,
-    ]);
+    });
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

@@ -6,21 +6,22 @@ import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.j
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import '../../../shared/logger.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
+import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
-import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
-import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
+import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
@@ -35,7 +36,7 @@ const useEmbeddedWallet = () => {
         return isEmbeddedWalletPresent(jwt);
     };
     const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
@@ -46,25 +47,61 @@ const useEmbeddedWallet = () => {
         const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
         // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
         if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
-            internalSetShowAuthFlow(true);
-            setView('passkey-intro');
-            return new Promise((resolve, reject) => {
-                internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
-                internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
-            });
+            return startEmbeddedWalletCreationFlow();
         }
         internalSetShowAuthFlow(false);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
-        const turnkeyWallet = findTurnkeyWallet(wallets);
         // if user logged in with MM for example, just continue the flow
         if (!embeddedWalletVerifiedCredential) {
             return Promise.resolve(primaryWallet);
         }
+        // if user already has embedded wallet, returns it
+        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    }), [
+        internalEvents,
+        internalSetShowAuthFlow,
+        onboardingOnlyJwt,
+        projectSettings,
+        setPrimaryWalletId,
+        setView,
+        wallets,
+    ]);
+    const startEmbeddedWalletCreationFlow = () => __awaiter(void 0, void 0, void 0, function* () {
+        internalSetShowAuthFlow(true);
+        setView('passkey-intro');
+        return new Promise((resolve, reject) => {
+            internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            internalEvents.current.once('embeddedWalletFailed', (error) => {
+                // when creating a passkey, if user cancels the passkey modal more than once
+                // it will throw this DOMException, but we don't want to let user to have access
+                // to the app before they've a passkey correctly setup
+                if (error instanceof DOMException && error.name === 'NotAllowedError') {
+                    logger.error('User cancelled the passkey creation.', error);
+                    return;
+                }
+                reject(error);
+            });
+        });
+    });
+    const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c, _d;
         const decodedJwt = decodeJwt(jwt);
+        const turnkeyWallet = findTurnkeyWallet(wallets);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
-            setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
+            if (smartWallet) {
+                setPrimaryWalletId(smartWallet.id);
+                initializeSmartWallet({
+                    account: smartWallet,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletOptions: wallets,
+                });
+            }
+            else {
+                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            }
         }
         const passkeyWallet = {
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
@@ -74,15 +111,7 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    }), [
-        internalEvents,
-        internalSetShowAuthFlow,
-        onboardingOnlyJwt,
-        projectSettings,
-        setPrimaryWalletId,
-        setView,
-        wallets,
-    ]);
+    });
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,