@dynamic-labs/sdk-react-core 3.0.0-alpha.52 → 3.0.0-alpha.54

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

@@ -2,7 +2,8 @@
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
-import { Wallet, isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
+import '../../../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
@@ -14,7 +15,6 @@ import '../../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../../../shared/consts/index.js';
-import '../../../../../context/DynamicContext/DynamicContext.js';
 import { dynamicEvents } from '../../../../../events/dynamicEvents.js';
 import '../../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../../context/ErrorContext/ErrorContext.js';
@@ -35,10 +35,11 @@ import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
 import '../../../../../context/WalletContext/WalletContext.js';
+import { useSmartWallets } from '../../../useSmartWallets/useSmartWallets.js';
 import { findPrimaryEmbeddedChain } from '../../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import { findSmartWallet, initializeSmartWallet } from '../../../useWalletConnectors/utils/smartWallet/smartWallet.js';
-import { findPasskeyEmailWalletConnector } from '../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import '../constants.js';
+import { findPasskeyEmailWalletConnector } from '../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
+import { findSmartWallet, initializeSmartWallet } from '../../../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -98,8 +99,8 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 const useTurnkey = () => {
     const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
-    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
+    const { getEOAWallet } = useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
         yield createDynamicEmbeddedWalletMutation({
             chains,
@@ -141,7 +142,7 @@ const useTurnkey = () => {
         });
     }), [setShowAuthFlow, setView]);
     const returnEmbeddedWallet = useCallback((embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWalletByChain(walletConnectorOptions, chain);
         let newPrimaryWalletId = null;
@@ -165,28 +166,29 @@ const useTurnkey = () => {
             setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = new Wallet({
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+        if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
+            throw new Error('Could not find the embedded wallet connector');
+        }
+        const connector = turnkeyWallet.walletConnector;
+        const passkeyWallet = connector.createWallet({
+            address: (yield connector.getAddress()) || '',
+            chain: connector.connectedChain,
+            connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
-            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
-            key: embeddedWalletVerifiedCredential.walletName ||
-                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
-                '',
+            key: embeddedWalletVerifiedCredential.walletName || connector.key || '',
         });
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _c, _d, _e, _f, _g;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
-        const isSessionKeyCompatibleWallet = isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
+        const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
+        const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+        const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
+            (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
@@ -196,10 +198,10 @@ const useTurnkey = () => {
         if (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) ||
             (!embeddedWalletVerifiedCredential && isManualMode)) {
             const hasEmailVC = getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email);
-            if ((!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
+            if ((!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup) &&
                 hasEmailVC) ||
                 (options === null || options === void 0 ? void 0 : options.webAuthnAttestation) ||
-                isSessionKeyCompatibleWallet) {
+                isSessionKeyCompatible) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -213,19 +215,18 @@ const useTurnkey = () => {
             // backend if this called as part of a new user sign up.
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
-                ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
+                ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
                 const walletConnector = findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain(projectSettings));
                 if (!walletConnector) {
-                    throw new Error('Could not find the Embedded wallet connector');
+                    throw new Error('Could not find the embedded wallet connector');
                 }
-                const wallet = new Wallet({
+                const wallet = walletConnector.createWallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    chain: walletConnector.connectedChain || '',
+                    chain: walletConnector.connectedChain,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                    isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    isPrimary: true,
-                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
+                    isAuthenticated: Boolean((_f = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _f === void 0 ? void 0 : _f.isAuthenticatorAttached),
+                    key: (_g = embeddedWalletVerifiedCredential.walletName) !== null && _g !== void 0 ? _g : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
@@ -241,13 +242,14 @@ const useTurnkey = () => {
     }), [
         user,
         projectSettings,
-        returnEmbeddedWallet,
-        setPrimaryWalletId,
+        primaryWallet,
+        getEOAWallet,
         setShowAuthFlow,
+        returnEmbeddedWallet,
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
-        walletConnector,
+        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -1,5 +1,5 @@
 import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
 export declare const useEmbeddedWalletAuthenticator: () => {
     addEmbeddedWalletRecoveryEmail: () => Promise<void>;
-    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("@dynamic-labs/wallet-connector-core").Wallet | undefined>;
+    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("@dynamic-labs/wallet-connector-core").Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector> | undefined>;
 };

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

@@ -27,13 +27,13 @@ require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-var getEOAWallet = require('../../functions/getEOAWallet/getEOAWallet.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+var useSmartWallets = require('../useSmartWallets/useSmartWallets.cjs');
 var passkeyRecovery = require('../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs');
 var constants = require('../../../views/Passkey/PasskeyRecovery/constants.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -98,12 +98,13 @@ const useInitEmbeddedWalletAuthMethod = () => {
     const { setView } = ViewContext.useViewContext();
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState();
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const initAuthMethod = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authenticatorType, iframeContainer, currentAction, }) {
-        var _b, _c, _d, _e;
+        var _b, _c, _d, _e, _f;
         setIsLoading(true);
-        const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-        const sessionExpiration = ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _b === void 0 ? void 0 : _b.sessionKeyDuration) === null || _c === void 0 ? void 0 : _c.amount) || 0;
-        const sessionExpirationUnit = ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.sessionKeyDuration) === null || _e === void 0 ? void 0 : _e.unit) ===
+        const wallet = (_b = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _b !== void 0 ? _b : primaryWallet;
+        const sessionExpiration = ((_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.sessionKeyDuration) === null || _d === void 0 ? void 0 : _d.amount) || 0;
+        const sessionExpirationUnit = ((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.sessionKeyDuration) === null || _f === void 0 ? void 0 : _f.unit) ===
             'minutes'
             ? 60
             : 3600;
@@ -119,7 +120,7 @@ const useInitEmbeddedWalletAuthMethod = () => {
                 iframeElementId: constants.iframeElementId,
                 sessionExpiration: sessionExpiration * sessionExpirationUnit || undefined,
                 user,
-                wallet,
+                wallet: wallet,
             });
             if (showEmailBundle) {
                 setView('passkey-recovery-bundle', {

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

@@ -23,13 +23,13 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import { getEOAWallet } from '../../functions/getEOAWallet/getEOAWallet.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import { useSmartWallets } from '../useSmartWallets/useSmartWallets.js';
 import { initEmbeddedWalletSession } from '../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.js';
 import { iframeElementId } from '../../../views/Passkey/PasskeyRecovery/constants.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -94,12 +94,13 @@ const useInitEmbeddedWalletAuthMethod = () => {
     const { setView } = useViewContext();
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState();
+    const { getEOAWallet } = useSmartWallets();
     const initAuthMethod = (_a) => __awaiter(void 0, [_a], void 0, function* ({ authenticatorType, iframeContainer, currentAction, }) {
-        var _b, _c, _d, _e;
+        var _b, _c, _d, _e, _f;
         setIsLoading(true);
-        const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-        const sessionExpiration = ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _b === void 0 ? void 0 : _b.sessionKeyDuration) === null || _c === void 0 ? void 0 : _c.amount) || 0;
-        const sessionExpirationUnit = ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.sessionKeyDuration) === null || _e === void 0 ? void 0 : _e.unit) ===
+        const wallet = (_b = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _b !== void 0 ? _b : primaryWallet;
+        const sessionExpiration = ((_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.sessionKeyDuration) === null || _d === void 0 ? void 0 : _d.amount) || 0;
+        const sessionExpirationUnit = ((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.sessionKeyDuration) === null || _f === void 0 ? void 0 : _f.unit) ===
             'minutes'
             ? 60
             : 3600;
@@ -115,7 +116,7 @@ const useInitEmbeddedWalletAuthMethod = () => {
                 iframeElementId,
                 sessionExpiration: sessionExpiration * sessionExpirationUnit || undefined,
                 user,
-                wallet,
+                wallet: wallet,
             });
             if (showEmailBundle) {
                 setView('passkey-recovery-bundle', {

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

@@ -34,6 +34,7 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+var useSmartWallets = require('../useSmartWallets/useSmartWallets.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -91,24 +92,25 @@ require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useIsLoggedIn = () => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
-    const isSessionKeyCompatibleWallet = walletConnectorCore.isSessionKeyCompatibleWalletConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) ||
-        (((_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev' &&
-            walletConnectorCore.isSessionKeyCompatibleWalletConnector((_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _b === void 0 ? void 0 : _b.getEOAConnector()));
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
+    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+    const isSessionKeyCompatible = (primaryWallet && walletConnectorCore.isSessionKeyCompatibleWallet(primaryWallet)) ||
+        (eoaWallet && walletConnectorCore.isSessionKeyCompatibleWallet(eoaWallet));
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
     // but it won't have a primaryWallet in this case
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
-    const userWaletsCredentials = (_c = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.filter(({ walletProvider }) => walletProvider);
-    const hasEmbeddedWalletVerifiedCredential = Boolean(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+    const userWalletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+    const hasEmbeddedWalletVerifiedCredential = Boolean(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
     const isTurnkeyPregen = isTurnkeyProviderEnabled &&
-        ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) &&
+        ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
         (!(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup) ||
-            isSessionKeyCompatibleWallet);
+            isSessionKeyCompatible);
     const shouldHaveTurnkeyWallet = isTurnkeyPregen &&
         // if user doesn't have a branded wallet only
-        (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
+        (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
     if (shouldHaveTurnkeyWallet) {

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

@@ -1,5 +1,5 @@
 'use client'
-import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -30,6 +30,7 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import { useSmartWallets } from '../useSmartWallets/useSmartWallets.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -87,24 +88,25 @@ import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useIsLoggedIn = () => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext();
-    const isSessionKeyCompatibleWallet = isSessionKeyCompatibleWalletConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) ||
-        (((_a = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev' &&
-            isSessionKeyCompatibleWalletConnector((_b = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _b === void 0 ? void 0 : _b.getEOAConnector()));
+    const { getEOAWallet } = useSmartWallets();
+    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+    const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
+        (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
     // but it won't have a primaryWallet in this case
     const isLoggedIn = Boolean(user) || (authMode === 'connect-only' && Boolean(primaryWallet));
-    const userWaletsCredentials = (_c = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.filter(({ walletProvider }) => walletProvider);
-    const hasEmbeddedWalletVerifiedCredential = Boolean(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
+    const userWalletsCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+    const hasEmbeddedWalletVerifiedCredential = Boolean(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.find(({ walletProvider }) => walletProvider === 'embeddedWallet'));
     const isTurnkeyPregen = isTurnkeyProviderEnabled &&
-        ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) &&
+        ((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) &&
         (!(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup) ||
-            isSessionKeyCompatibleWallet);
+            isSessionKeyCompatible);
     const shouldHaveTurnkeyWallet = isTurnkeyPregen &&
         // if user doesn't have a branded wallet only
-        (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
+        (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) || hasEmbeddedWalletVerifiedCredential);
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
     if (shouldHaveTurnkeyWallet) {

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

@@ -27,7 +27,6 @@ require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-var getEOAWallet = require('../../functions/getEOAWallet/getEOAWallet.cjs');
 var getUserVerifiedCredentialType = require('../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -35,6 +34,7 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+var useSmartWallets = require('../useSmartWallets/useSmartWallets.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -92,15 +92,12 @@ require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useIsTurnkeyWallet = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const { primaryWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
-    const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
+    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
     const getTurnkeyVerifiedCredential = () => {
-        if (!wallet || !user) {
-            return undefined;
-        }
-        const isPrimaryWalletTurnkey = wallet.connector.key.startsWith('turnkey');
-        if (!isPrimaryWalletTurnkey) {
+        if (!wallet || !user || !wallet.connector.key.startsWith('turnkey')) {
             return undefined;
         }
         const primaryWalletId = wallet.id;
@@ -123,16 +120,15 @@ const useIsTurnkeyWallet = () => {
         return smartContractWalletWithUnclaimedTurnkeySigner;
     };
     const turnkeyVerifiedCredential = getTurnkeyVerifiedCredential();
-    const unclaimedTurnkeyTheSignerOfScw = getUnclaimedTurnkeyTheSignerOfScw();
-    const isUnclaimedTurnkeyTheSignerOfScw = Boolean(unclaimedTurnkeyTheSignerOfScw);
+    const isUnclaimedTurnkeyTheSignerOfScw = Boolean(getUnclaimedTurnkeyTheSignerOfScw());
     const isTurnkeyWallet = Boolean(turnkeyVerifiedCredential || isUnclaimedTurnkeyTheSignerOfScw);
-    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_a = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _a === void 0 ? void 0 : _a.isAuthenticatorAttached);
+    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
     const isTurnkeyWalletWithoutAuthenticator = (isTurnkeyWallet && !hasTurnkeyVerifiedCredentialAuthenticator) ||
         isUnclaimedTurnkeyTheSignerOfScw;
     const hasRecoveryEmail = isTurnkeyWallet &&
         Boolean(getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email));
     const isSessionKeyCompatible = isTurnkeyWallet &&
-        Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isSessionKeyCompatible);
+        Boolean((_c = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _c === void 0 ? void 0 : _c.isSessionKeyCompatible);
     return {
         hasRecoveryEmail,
         hasTurnkeyVerifiedCredentialAuthenticator,

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

@@ -23,7 +23,6 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import { getEOAWallet } from '../../functions/getEOAWallet/getEOAWallet.js';
 import { getUserVerifiedCredentialType } from '../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -31,6 +30,7 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import { useSmartWallets } from '../useSmartWallets/useSmartWallets.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -88,15 +88,12 @@ import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useIsTurnkeyWallet = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const { primaryWallet, user } = useInternalDynamicContext();
-    const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+    const { getEOAWallet } = useSmartWallets();
+    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
     const getTurnkeyVerifiedCredential = () => {
-        if (!wallet || !user) {
-            return undefined;
-        }
-        const isPrimaryWalletTurnkey = wallet.connector.key.startsWith('turnkey');
-        if (!isPrimaryWalletTurnkey) {
+        if (!wallet || !user || !wallet.connector.key.startsWith('turnkey')) {
             return undefined;
         }
         const primaryWalletId = wallet.id;
@@ -119,16 +116,15 @@ const useIsTurnkeyWallet = () => {
         return smartContractWalletWithUnclaimedTurnkeySigner;
     };
     const turnkeyVerifiedCredential = getTurnkeyVerifiedCredential();
-    const unclaimedTurnkeyTheSignerOfScw = getUnclaimedTurnkeyTheSignerOfScw();
-    const isUnclaimedTurnkeyTheSignerOfScw = Boolean(unclaimedTurnkeyTheSignerOfScw);
+    const isUnclaimedTurnkeyTheSignerOfScw = Boolean(getUnclaimedTurnkeyTheSignerOfScw());
     const isTurnkeyWallet = Boolean(turnkeyVerifiedCredential || isUnclaimedTurnkeyTheSignerOfScw);
-    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_a = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _a === void 0 ? void 0 : _a.isAuthenticatorAttached);
+    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
     const isTurnkeyWalletWithoutAuthenticator = (isTurnkeyWallet && !hasTurnkeyVerifiedCredentialAuthenticator) ||
         isUnclaimedTurnkeyTheSignerOfScw;
     const hasRecoveryEmail = isTurnkeyWallet &&
         Boolean(getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email));
     const isSessionKeyCompatible = isTurnkeyWallet &&
-        Boolean((_b = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isSessionKeyCompatible);
+        Boolean((_c = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _c === void 0 ? void 0 : _c.isSessionKeyCompatible);
     return {
         hasRecoveryEmail,
         hasTurnkeyVerifiedCredentialAuthenticator,

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

@@ -98,7 +98,7 @@ const useNetworkDataFromWallet = (wallet) => {
     const { networkConfigurations } = useInternalDynamicContext.useInternalDynamicContext();
     if (!wallet || !network)
         return undefined;
-    if (wallet.chain === 'solana') {
+    if (wallet.chain === 'SOL') {
         return (_a = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.solana) === null || _a === void 0 ? void 0 : _a[0];
     }
     return (_b = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations[wallet.connector.connectedChain.toLowerCase()]) === null || _b === void 0 ? void 0 : _b.find((_network) => _network.chainId === network);

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

@@ -94,7 +94,7 @@ const useNetworkDataFromWallet = (wallet) => {
     const { networkConfigurations } = useInternalDynamicContext();
     if (!wallet || !network)
         return undefined;
-    if (wallet.chain === 'solana') {
+    if (wallet.chain === 'SOL') {
         return (_a = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.solana) === null || _a === void 0 ? void 0 : _a[0];
     }
     return (_b = networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations[wallet.connector.connectedChain.toLowerCase()]) === null || _b === void 0 ? void 0 : _b.find((_network) => _network.chainId === network);

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

@@ -100,14 +100,15 @@ const useNetworkNotSupported = () => {
     });
     const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector, {
         onChange: (walletConnectorNetwork) => {
-            if (!isSupportedNetwork.isSupportedNetwork({
-                network: walletConnectorNetwork,
-                walletConnector,
-            })) {
+            if (!walletConnector ||
+                !isSupportedNetwork.isSupportedNetwork({
+                    network: walletConnectorNetwork,
+                    walletConnector,
+                })) {
                 return;
             }
             finishConnectAndSign({
-                walletConnector: walletConnector,
+                walletConnector,
             }).then(() => {
                 // if user still has to do onboarding, we should not hide the auth flow
                 if (!user && authMode === 'connect-and-sign') {

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

@@ -96,14 +96,15 @@ const useNetworkNotSupported = () => {
     });
     const { network: walletConnectorNetwork } = useWalletConnectorNetwork(walletConnector, {
         onChange: (walletConnectorNetwork) => {
-            if (!isSupportedNetwork({
-                network: walletConnectorNetwork,
-                walletConnector,
-            })) {
+            if (!walletConnector ||
+                !isSupportedNetwork({
+                    network: walletConnectorNetwork,
+                    walletConnector,
+                })) {
                 return;
             }
             finishConnectAndSign({
-                walletConnector: walletConnector,
+                walletConnector,
             }).then(() => {
                 // if user still has to do onboarding, we should not hide the auth flow
                 if (!user && authMode === 'connect-and-sign') {