@dynamic-labs/sdk-react-core 0.19.0-alpha.16 → 0.19.0-alpha.18

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

@@ -19,9 +19,35 @@ import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, setConnectedWallets] = useState([]);
+    const unlinkConnectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
+        const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
+        yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
+        const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
+        setConnectedWalletsInfo(updatedConnectedWalletsInfo);
+        onUnlink(updatedConnectedWalletsInfo, walletToDisconnect);
+        if (walletId !== primaryWalletId) {
+            return;
+        }
+        const hasConnectedWallet = updatedConnectedWalletsInfo.length > 0;
+        if (isBridgeFlow || !hasConnectedWallet) {
+            clearPrimaryWalletId();
+        }
+        else {
+            setPrimaryWalletId(updatedConnectedWalletsInfo[0].id);
+        }
+    }), [
+        clearPrimaryWalletId,
+        connectedWallets,
+        connectedWalletsInfo,
+        isBridgeFlow,
+        onUnlink,
+        primaryWalletId,
+        setConnectedWalletsInfo,
+        setPrimaryWalletId,
+    ]);
     // The function to update and define the connectedWallets list.
     // It uses walletConnector to get the current wallet address and network
     // The address and network in the runtime are updated by the event listeners
@@ -32,14 +58,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         if (!walletConnectors.length) {
             return;
         }
-        const nextConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => __awaiter(void 0, void 0, void 0, function* () {
+        const updatedConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => __awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = getWalletConnectorByKey(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
             if (!walletConnector) {
                 logger.error('Could not find walletConnector: ' +
                     storedConnectedWalletInfo.walletConnectorKey);
-                return Promise.resolve(null);
+                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                return null;
             }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
+            if (!walletAddress) {
+                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                return null;
+            }
             const walletNetwork = yield walletConnector.getNetwork();
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
@@ -50,14 +81,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 id: storedConnectedWalletInfo.id,
                 network: walletNetwork,
             };
-            return Promise.resolve(walletObject);
+            return walletObject;
         })))).filter((wallet) => Boolean(wallet));
-        setConnectedWallets(nextConnectedWallets);
-    }), [connectedWalletsInfo, wallets]);
+        setConnectedWallets(updatedConnectedWallets);
+    }), [connectedWalletsInfo, unlinkConnectedWallet, wallets]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
         updateConnectedWalletsList();
-    }, [updateConnectedWalletsList]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [connectedWalletsInfo, wallets]);
     const getNextIdAvailable = useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
@@ -81,15 +113,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
-        const nextConnectedWalletsInfo = [...connectedWalletsInfo];
-        nextConnectedWalletsInfo.push({
+        const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
+        updatedConnectedWalletsInfo.push({
             id: walletId,
             provider,
             walletChain,
             walletConnectorKey,
         });
-        setConnectedWalletsInfo(nextConnectedWalletsInfo);
-        return Promise.resolve();
+        setConnectedWalletsInfo(updatedConnectedWalletsInfo);
     };
     // Updates connected wallet (network and address) and verifies connected wallet connection
     const refreshConnectedWallet = (walletId, walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
@@ -167,20 +198,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 });
             }
         }
-        return Promise.resolve(publicWalletAddress);
-    });
-    const unlinkConnectedWallet = (walletId) => __awaiter(void 0, void 0, void 0, function* () {
-        const connectedWalletToUnlink = connectedWallets.find((wallet) => wallet.id === walletId);
-        if (!connectedWalletToUnlink) {
-            return;
-        }
-        yield connectedWalletToUnlink.connector.endSession();
-        const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
-        if (walletId === primaryWalletId) {
-            clearPrimaryWalletId();
-        }
-        setConnectedWalletsInfo(filteredWallets);
-        onUnlink(connectedWalletToUnlink, filteredWallets);
+        return publicWalletAddress;
     });
     const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
-require('react');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
@@ -20,7 +20,7 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('@dynamic-labs/sdk-api');
-var isPasskeyEmbeddedWalletEnabled = require('../../functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.cjs');
+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');
@@ -37,13 +37,13 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent.isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
         }
-        if (!isPasskeyEmbeddedWalletEnabled.isPasskeyEmbeddedWalletEnabled(projectSettings)) {
+        if (!isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled');
         }
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
@@ -72,7 +72,15 @@ 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

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import 'react';
 import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
@@ -16,7 +16,7 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/sdk-api';
-import { isPasskeyEmbeddedWalletEnabled } from '../../functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.js';
+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';
@@ -33,13 +33,13 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = () => __awaiter(void 0, void 0, void 0, function* () {
+    const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         if (!jwt) {
             throw new Error('User is not logged in');
         }
-        if (!isPasskeyEmbeddedWalletEnabled(projectSettings)) {
+        if (!isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled');
         }
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
@@ -68,7 +68,15 @@ const useEmbeddedWallet = () => {
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
-    });
+    }), [
+        internalEvents,
+        internalSetShowAuthFlow,
+        onboardingOnlyJwt,
+        projectSettings,
+        setPrimaryWalletId,
+        setView,
+        wallets,
+    ]);
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

@@ -5,10 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 
 const useIsLoggedIn = () => {
-    const { authMode, user, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
-    if (authMode === 'connect-and-sign')
-        return Boolean(user);
-    return Boolean(primaryWallet);
+    const { user, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
+    return Boolean(user || primaryWallet);
 };
 
 exports.useIsLoggedIn = useIsLoggedIn;

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

@@ -1,10 +1,8 @@
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 
 const useIsLoggedIn = () => {
-    const { authMode, user, primaryWallet } = useInternalDynamicContext();
-    if (authMode === 'connect-and-sign')
-        return Boolean(user);
-    return Boolean(primaryWallet);
+    const { user, primaryWallet } = useInternalDynamicContext();
+    return Boolean(user || primaryWallet);
 };
 
 export { useIsLoggedIn };

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

@@ -25,10 +25,10 @@ const usePrimaryWalletId = (internalEvents) => {
     const setPrimaryWalletId = React.useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearPrimaryWalletId = () => {
+    const clearPrimaryWalletId = React.useCallback(() => {
         clearPrimaryWalletIdStorage();
         internalEvents.emit('clearPrimaryWallet');
-    };
+    }, [clearPrimaryWalletIdStorage, internalEvents]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -21,10 +21,10 @@ const usePrimaryWalletId = (internalEvents) => {
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearPrimaryWalletId = () => {
+    const clearPrimaryWalletId = useCallback(() => {
         clearPrimaryWalletIdStorage();
         internalEvents.emit('clearPrimaryWallet');
-    };
+    }, [clearPrimaryWalletIdStorage, internalEvents]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -147,7 +147,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                createEmbeddedWallet();
+                yield createEmbeddedWallet();
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
             }
             catch (e) {

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

@@ -143,7 +143,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                createEmbeddedWallet();
+                yield createEmbeddedWallet();
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
             }
             catch (e) {

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -95,7 +95,7 @@ const EmailVerification = () => {
     const { view, setView, goToInitialView } = ViewContext.useViewContext();
     const { error, setError, setErrorMessage } = ErrorContext.useErrorContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
-    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, setIsVerificationInProgress, isVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, setIsVerificationInProgress, isVerificationInProgress, projectSettings, } = useInternalDynamicContext.useInternalDynamicContext();
     const { email, verificationUUID, setVerificationUUID } = EmailVerificationContext.useEmailVerificationContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
@@ -127,6 +127,7 @@ const EmailVerification = () => {
             setIsVerificationInProgress(false);
     };
     const handleComplete = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -147,7 +148,9 @@ const EmailVerification = () => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                yield createEmbeddedWallet();
+                if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation) {
+                    yield createEmbeddedWallet();
+                }
             }
             catch (e) {
                 setShowAuthFlow(false);
@@ -182,6 +185,7 @@ const EmailVerification = () => {
         setView,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _b;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -215,7 +219,9 @@ const EmailVerification = () => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                yield createEmbeddedWallet();
+                if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) {
+                    yield createEmbeddedWallet();
+                }
             }
             catch (e) {
                 setShowAuthFlow(false);

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -91,7 +91,7 @@ const EmailVerification = () => {
     const { view, setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { setExistentAccountData } = useAccountExistsContext();
-    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, setIsVerificationInProgress, isVerificationInProgress, } = useInternalDynamicContext();
+    const { environmentId, onboardingOnlyJwt, handleLogOut, authToken, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, setIsVerificationInProgress, isVerificationInProgress, projectSettings, } = useInternalDynamicContext();
     const { email, verificationUUID, setVerificationUUID } = useEmailVerificationContext();
     const { loading, setLoading } = useLoadingContext();
     const { createEmbeddedWallet } = useEmbeddedWallet();
@@ -123,6 +123,7 @@ const EmailVerification = () => {
             setIsVerificationInProgress(false);
     };
     const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -143,7 +144,9 @@ const EmailVerification = () => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                yield createEmbeddedWallet();
+                if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation) {
+                    yield createEmbeddedWallet();
+                }
             }
             catch (e) {
                 setShowAuthFlow(false);
@@ -178,6 +181,7 @@ const EmailVerification = () => {
         setView,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -211,7 +215,9 @@ const EmailVerification = () => {
             try {
                 // this function will check turnkey wallet enabled and create wallet if needed
                 // if not enabled, it will throw an error.
-                yield createEmbeddedWallet();
+                if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) {
+                    yield createEmbeddedWallet();
+                }
             }
             catch (e) {
                 setShowAuthFlow(false);

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -20,7 +20,7 @@ require('viem');
 require('../../../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
-var isPasskeyEmbeddedWalletEnabled = require('../../../../utils/functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.cjs');
+var isTurnkeyEnabled = require('../../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var Input = require('../../../../components/Input/Input.cjs');
@@ -91,8 +91,7 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
         try {
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();
-            if ((isEmailWalletProviderEnabled ||
-                isPasskeyEmbeddedWalletEnabled.isPasskeyEmbeddedWalletEnabled(projectSettings)) &&
+            if ((isEmailWalletProviderEnabled || 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

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -16,7 +16,7 @@ import 'viem';
 import '../../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/multi-wallet';
-import { isPasskeyEmbeddedWalletEnabled } from '../../../../utils/functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.js';
+import { isTurnkeyEnabled } from '../../../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { Input } from '../../../../components/Input/Input.js';
@@ -87,8 +87,7 @@ const LoginEmailForm = ({ isLoading: isExternalLoading, onSubmit, onSubmitError,
         }
         try {
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit();
-            if ((isEmailWalletProviderEnabled ||
-                isPasskeyEmbeddedWalletEnabled(projectSettings)) &&
+            if ((isEmailWalletProviderEnabled || 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

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.cjs

@@ -43,10 +43,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         walletsFilter,
     });
     const isUsingMultiWallet = Boolean(localStorage.LocalStorage.getFromLS(localStorage$1.AUTH_USER));
-    return !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxRuntime.jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet) => {
-                var _a;
-                return (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, disabled: disabled }, wallet.key + ((_a = wallet.groupedWallets) === null || _a === void 0 ? void 0 : _a.length)));
-            }), jsxRuntime.jsx(ListItemButton.ListItemButton, { text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
+    return !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxRuntime.jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, disabled: disabled }, `${wallet.key}_${index}`))), jsxRuntime.jsx(ListItemButton.ListItemButton, { text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
 };
 
 exports.WalletSimpleSignIn = WalletSimpleSignIn;

package/src/lib/views/LoginView/sections/WalletSignInSection/WalletSimpleSignIn/WalletSimpleSignIn.js

@@ -39,10 +39,7 @@ const WalletSimpleSignIn = ({ previewWalletsNumber, disabled = false, onshowAllW
         walletsFilter,
     });
     const isUsingMultiWallet = Boolean(LocalStorage.getFromLS(AUTH_USER));
-    return !projectSettings ? (jsx(Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet) => {
-                var _a;
-                return (jsx(WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, disabled: disabled }, wallet.key + ((_a = wallet.groupedWallets) === null || _a === void 0 ? void 0 : _a.length)));
-            }), jsx(ListItemButton, { text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
+    return !projectSettings ? (jsx(Skeleton, { count: previewWalletsNumber + 1, className: 'login-with-email-wallet-list__skeleton' })) : (jsxs("div", { className: 'login-with-email-wallet-list__container', "data-testid": 'top-wallets-list', children: [walletsList.map((wallet, index) => (jsx(WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, disabled: disabled }, `${wallet.key}_${index}`))), jsx(ListItemButton, { text: t('dyn_wallet_list.view_all'), onClick: onshowAllWallets, numberOfWallets: numberOfWallets, disabled: disabled })] }));
 };
 
 export { WalletSimpleSignIn };

package/src/lib/views/LoginView/useLoginView.cjs

@@ -21,9 +21,17 @@ require('@dynamic-labs/multi-wallet');
 var isEmailProviderEnabled = require('../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
 var index = require('../../utils/functions/getEnabledProviders/index.cjs');
 
+/* eslint-disable multiline-comment-style */
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    /** Takes from wallets only those that can be selected in the wallet list by the user.
+     * Should filter out embedded wallets
+     * WHY: when we decide whether to show wallets or not, we need to know how many wallets
+     * will actually be rendered. It would be especially bad to only have for ex "turnkey" in
+     * wallets and then display an empty wallet list (since turnkey doesn't render)
+     */
+    const selectableWallets = wallets.filter(({ key }) => key !== 'turnkey');
     const { t } = reactI18next.useTranslation();
     const hasEnabledProviders = Boolean(index.getEnabledProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers).length);
     const isWalletOnly = React.useMemo(() => {
@@ -81,7 +89,7 @@ const useLoginView = () => {
      * @returns
      */
     const filterLoginViewSections = (sections) => {
-        if (wallets === null || wallets === void 0 ? void 0 : wallets.length) {
+        if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
@@ -90,7 +98,7 @@ const useLoginView = () => {
         // if not the first index, no separator is needed
         // if the first index but does not have wallets or providers,
         // it'll show only one view section - no separator is needed
-        if (index !== 0 || !(wallets === null || wallets === void 0 ? void 0 : wallets.length) || !hasEnabledProviders) {
+        if (index !== 0 || !(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) || !hasEnabledProviders) {
             return [];
         }
         return [
@@ -115,7 +123,7 @@ const useLoginView = () => {
                 // add separator if wallets defined
                 addSeparator(index));
             }
-            if (loginItem === 'wallet' && (wallets === null || wallets === void 0 ? void 0 : wallets.length)) {
+            if (loginItem === 'wallet' && (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length)) {
                 // if showWalletsButton is true, it should show "Connec with Wallet" button
                 const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
                     ? 0

package/src/lib/views/LoginView/useLoginView.js

@@ -17,9 +17,17 @@ import '@dynamic-labs/multi-wallet';
 import { isEmailProviderEnabled } from '../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
 import { getEnabledProviders } from '../../utils/functions/getEnabledProviders/index.js';
 
+/* eslint-disable multiline-comment-style */
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, } = useInternalDynamicContext();
+    /** Takes from wallets only those that can be selected in the wallet list by the user.
+     * Should filter out embedded wallets
+     * WHY: when we decide whether to show wallets or not, we need to know how many wallets
+     * will actually be rendered. It would be especially bad to only have for ex "turnkey" in
+     * wallets and then display an empty wallet list (since turnkey doesn't render)
+     */
+    const selectableWallets = wallets.filter(({ key }) => key !== 'turnkey');
     const { t } = useTranslation();
     const hasEnabledProviders = Boolean(getEnabledProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers).length);
     const isWalletOnly = useMemo(() => {
@@ -77,7 +85,7 @@ const useLoginView = () => {
      * @returns
      */
     const filterLoginViewSections = (sections) => {
-        if (wallets === null || wallets === void 0 ? void 0 : wallets.length) {
+        if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
@@ -86,7 +94,7 @@ const useLoginView = () => {
         // if not the first index, no separator is needed
         // if the first index but does not have wallets or providers,
         // it'll show only one view section - no separator is needed
-        if (index !== 0 || !(wallets === null || wallets === void 0 ? void 0 : wallets.length) || !hasEnabledProviders) {
+        if (index !== 0 || !(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) || !hasEnabledProviders) {
             return [];
         }
         return [
@@ -111,7 +119,7 @@ const useLoginView = () => {
                 // add separator if wallets defined
                 addSeparator(index));
             }
-            if (loginItem === 'wallet' && (wallets === null || wallets === void 0 ? void 0 : wallets.length)) {
+            if (loginItem === 'wallet' && (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length)) {
                 // if showWalletsButton is true, it should show "Connec with Wallet" button
                 const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
                     ? 0

package/src/lib/views/TransactionConfirmationView/TransactionConfirmationView.cjs

@@ -89,7 +89,7 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         provider,
         transaction,
     });
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => transaction.to);
+    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => { var _a; return (_a = transaction.to) === null || _a === void 0 ? void 0 : _a.toString(); });
     const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise.usePromise(() => transaction.from);
     const { data: transactionValue, isLoading: isTransactionValueLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const val = yield transaction.value;

package/src/lib/views/TransactionConfirmationView/TransactionConfirmationView.js

@@ -85,7 +85,7 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         provider,
         transaction,
     });
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => transaction.to);
+    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => { var _a; return (_a = transaction.to) === null || _a === void 0 ? void 0 : _a.toString(); });
     const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise(() => transaction.from);
     const { data: transactionValue, isLoading: isTransactionValueLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         const val = yield transaction.value;

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

@@ -15,7 +15,7 @@ const WalletGroupView = () => {
     if (!selectedWalletGroup)
         throw new Error('Could not access WalletGroup view without selected group');
     const walletBookData = walletBook.getWalletGroup(walletBook$1, selectedWalletGroup === null || selectedWalletGroup === void 0 ? void 0 : selectedWalletGroup.key);
-    return (jsxRuntime.jsx(SelectWalletChainLayout.SelectWalletChainLayout, { HeaderIcon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: selectedWalletGroup.groupedWallets.map((wallet) => (jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet }, wallet.key))) }));
+    return (jsxRuntime.jsx(SelectWalletChainLayout.SelectWalletChainLayout, { HeaderIcon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet }, `${wallet.key}_${index}`))) }));
 };
 
 exports.WalletGroupView = WalletGroupView;

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

@@ -11,7 +11,7 @@ const WalletGroupView = () => {
     if (!selectedWalletGroup)
         throw new Error('Could not access WalletGroup view without selected group');
     const walletBookData = getWalletGroup(walletBook, selectedWalletGroup === null || selectedWalletGroup === void 0 ? void 0 : selectedWalletGroup.key);
-    return (jsx(SelectWalletChainLayout, { HeaderIcon: jsx(WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: selectedWalletGroup.groupedWallets.map((wallet) => (jsx(WalletGroupItem, { wallet: wallet }, wallet.key))) }));
+    return (jsx(SelectWalletChainLayout, { HeaderIcon: jsx(WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: selectedWalletGroup.groupedWallets.map((wallet, index) => (jsx(WalletGroupItem, { wallet: wallet }, `${wallet.key}_${index}`))) }));
 };
 
 export { WalletGroupView };

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

@@ -80,7 +80,7 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     };
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'wallet-list__container', children: [error && jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: error }), !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { className: 'wallet-list__search-skeleton' })) : (isSearchEnabled && (jsxRuntime.jsx(Search.Search, { label: `Search through ${numberOfWallets} wallets...`, value: filterValue, onChange: ({ target: { value } }) => handleFilterValueChange(value), onClickClear: () => handleFilterValueChange('') }))), jsxRuntime.jsxs("div", { className: classNames.classNames('wallet-list__scroll-container', {
                             'wallet-list__scroll-container--full-height': isSearchEnabled,
-                        }), "data-testid": 'wallet-list-scroll-container', ref: walletListScrollRef, onScroll: handleScroll, children: [!projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: 10, className: 'wallet-list__tile-skeleton' })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [wallets.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: "Oops, no login methods have been configured." })), wallets.length && walletsList.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { title: 'No wallet found.', subtitle: 'Try searching for a different wallet', image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (walletsList.map((wallet) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: multiWallet, onResetSearchValue: () => handleFilterValueChange('') }, wallet.key))))] })), isSearchEnabled && !filterValue && projectSettings && (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, {}))] })] }), noDefaultFooter && (jsxRuntime.jsx("div", { className: classNames.classNames('wallet-list__tiny-footer', {
+                        }), "data-testid": 'wallet-list-scroll-container', ref: walletListScrollRef, onScroll: handleScroll, children: [!projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: 10, className: 'wallet-list__tile-skeleton' })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [wallets.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: "Oops, no login methods have been configured." })), wallets.length && walletsList.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { title: 'No wallet found.', subtitle: 'Try searching for a different wallet', image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (walletsList.map((wallet, index) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: multiWallet, onResetSearchValue: () => handleFilterValueChange('') }, `${wallet.key}_${index}`))))] })), isSearchEnabled && !filterValue && projectSettings && (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, {}))] })] }), noDefaultFooter && (jsxRuntime.jsx("div", { className: classNames.classNames('wallet-list__tiny-footer', {
                     'wallet-list__tiny-footer--hidden': footerIsVisible,
                 }), "data-testid": 'wallet-list-tiny-footer' }))] }));
 };