@dynamic-labs/sdk-react-core 4.0.0-alpha.37 → 4.0.0-alpha.39

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

@@ -34,6 +34,7 @@ export * from './useUserUpdateRequest';
 export * from './useRpcProviders';
 export { useValidateSession } from './useValidateSession';
 export { useVerifyWallet } from './useVerifyWallet';
+export type { WalletConnectorProps } from './useCreateWalletConnectorOptions';
 export { useCreateWalletConnectorOptions } from './useCreateWalletConnectorOptions';
 export { useWalletConnectors } from './useWalletConnectors';
 export { useWalletItemActions } from './useWalletItemActions';

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

@@ -38,6 +38,7 @@ var createEmbeddedWalletRequest = require('../../../views/Passkey/utils/createEm
 var findPasskeyEmailWalletConnector = require('../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../functions/compareChains/compareChains.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -92,9 +93,13 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 // This hook needs to be async that's why it's not using useMutation
 const useCreateDynamicEmbeddedWalletMutation = () => {
     var _a, _b;
-    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState();
+    const { getSessionPublicKey, shouldRegisterSessionKeysOnSignin } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({
+        environmentId,
+        projectSettings,
+    });
     const embeddedChainConfig = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.chainConfigurations) || [];
     const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
     const embeddedChains = embeddedChainConfig
@@ -108,10 +113,16 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
+        let sessionPublicKey;
+        // get the session public key that was created in the login/signup flow
+        if (shouldRegisterSessionKeysOnSignin()) {
+            sessionPublicKey = getSessionPublicKey();
+        }
         try {
             const { embeddedWalletVerifiedCredential, updatedUser, walletConnector, } = yield createEmbeddedWalletRequest.createEmbeddedWalletRequest({
                 chains: chains !== null && chains !== void 0 ? chains : embeddedChains,
                 environmentId,
+                sessionPublicKey,
                 user,
                 walletConnector: findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, primaryEmbeddedChain),
                 webAuthnAttestation: options === null || options === void 0 ? void 0 : options.webAuthnAttestation,

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

@@ -34,6 +34,7 @@ import { createEmbeddedWalletRequest } from '../../../views/Passkey/utils/create
 import { findPasskeyEmailWalletConnector } from '../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../functions/compareChains/compareChains.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -88,9 +89,13 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 // This hook needs to be async that's why it's not using useMutation
 const useCreateDynamicEmbeddedWalletMutation = () => {
     var _a, _b;
-    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings } = useInternalDynamicContext();
+    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings, environmentId, } = useInternalDynamicContext();
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState();
+    const { getSessionPublicKey, shouldRegisterSessionKeysOnSignin } = useEmbeddedWalletSessionKeys({
+        environmentId,
+        projectSettings,
+    });
     const embeddedChainConfig = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.chainConfigurations) || [];
     const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
     const embeddedChains = embeddedChainConfig
@@ -104,10 +109,16 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
+        let sessionPublicKey;
+        // get the session public key that was created in the login/signup flow
+        if (shouldRegisterSessionKeysOnSignin()) {
+            sessionPublicKey = getSessionPublicKey();
+        }
         try {
             const { embeddedWalletVerifiedCredential, updatedUser, walletConnector, } = yield createEmbeddedWalletRequest({
                 chains: chains !== null && chains !== void 0 ? chains : embeddedChains,
                 environmentId,
+                sessionPublicKey,
                 user,
                 walletConnector: findPasskeyEmailWalletConnector(walletConnectorOptions, primaryEmbeddedChain),
                 webAuthnAttestation: options === null || options === void 0 ? void 0 : options.webAuthnAttestation,

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/index.d.ts

@@ -1 +1,2 @@
 export { useCreateWalletConnectorOptions } from './useCreateWalletConnectorOptions';
+export type { WalletConnectorProps } from './useCreateWalletConnectorOptions';

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

@@ -3,12 +3,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
-require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('../../constants/colors.cjs');
@@ -28,41 +28,22 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 var walletConnectorOptions = require('../../../store/state/walletConnectorOptions.cjs');
 var verifyRequiredConnectorsAreSetup = require('./utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs');
 
-const useCreateWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+const useCreateWalletConnectorOptions = (_a) => {
+    var { projectSettings, networkConfigurations, walletBook, walletConnectorsProp, walletConnectorExtensions } = _a, props = _tslib.__rest(_a, ["projectSettings", "networkConfigurations", "walletBook", "walletConnectorsProp", "walletConnectorExtensions"]);
     const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const walletBookLength = React.useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions$1 = React.useMemo(() => {
-        if (!projectSettings ||
-            !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
-            !networkConfigurations)
+        if (!projectSettings || !walletBookLength || !networkConfigurations)
             return [];
         return data.getWallets({
-            getSupportedWalletOpts: {
-                appLogoUrl,
-                appName,
-                coinbaseWalletPreference,
-                deepLinkPreference,
-                flowNetwork,
-                mobileExperience,
-                networkConfigurations,
-                settings: projectSettings,
-                skipMemo: true,
-                walletBook,
-                walletConnectPreferredChains,
-                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-                walletUiUtils,
-            },
+            getSupportedWalletOpts: Object.assign({ networkConfigurations, settings: projectSettings, skipMemo: true, walletBook, walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [] }, props),
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        appLogoUrl,
-        appName,
         projectSettings,
         walletConnectorsKey,
-        walletConnectPreferredChains,
-        flowNetwork,
         walletBookLength,
         networkConfigurations,
     ]);

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

@@ -2,7 +2,7 @@ import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
 import { type MobileExperience, type CoinbaseWalletPreference, type NetworkConfigurationMap, type WalletUiUtils } from '@dynamic-labs/types';
 import { DeepLinkVariant, InternalWalletConnector, WalletConnectorExtension, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
-type Props = {
+export type WalletConnectorProps = {
     appLogoUrl?: string;
     appName?: string;
     coinbaseWalletPreference?: CoinbaseWalletPreference;
@@ -17,7 +17,6 @@ type Props = {
     walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
-export declare const useCreateWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
+export declare const useCreateWalletConnectorOptions: ({ projectSettings, networkConfigurations, walletBook, walletConnectorsProp, walletConnectorExtensions, ...props }: WalletConnectorProps) => {
     walletConnectorOptions: import("../../../shared").WalletOption[];
 };
-export {};

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

@@ -1,10 +1,10 @@
 'use client'
+import { __rest } from '../../../../../_virtual/_tslib.js';
 import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
-import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '../../constants/colors.js';
@@ -24,41 +24,22 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import { setWalletConnectorOptions } from '../../../store/state/walletConnectorOptions.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
-const useCreateWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+const useCreateWalletConnectorOptions = (_a) => {
+    var { projectSettings, networkConfigurations, walletBook, walletConnectorsProp, walletConnectorExtensions } = _a, props = __rest(_a, ["projectSettings", "networkConfigurations", "walletBook", "walletConnectorsProp", "walletConnectorExtensions"]);
     const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
     const walletBookLength = useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = useMemo(() => {
-        if (!projectSettings ||
-            !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
-            !networkConfigurations)
+        if (!projectSettings || !walletBookLength || !networkConfigurations)
             return [];
         return getWallets({
-            getSupportedWalletOpts: {
-                appLogoUrl,
-                appName,
-                coinbaseWalletPreference,
-                deepLinkPreference,
-                flowNetwork,
-                mobileExperience,
-                networkConfigurations,
-                settings: projectSettings,
-                skipMemo: true,
-                walletBook,
-                walletConnectPreferredChains,
-                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-                walletUiUtils,
-            },
+            getSupportedWalletOpts: Object.assign({ networkConfigurations, settings: projectSettings, skipMemo: true, walletBook, walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [] }, props),
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        appLogoUrl,
-        appName,
         projectSettings,
         walletConnectorsKey,
-        walletConnectPreferredChains,
-        flowNetwork,
         walletBookLength,
         networkConfigurations,
     ]);

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

@@ -98,6 +98,16 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
         utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateJwk, false), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
         return { privateKey, privateKeyJwk: privateJwk, publicKey };
     });
+    const getSessionPublicKey = () => {
+        const sessionKeysSS = utils.StorageService.getItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        const decodedSessionKeys = sessionKeysSS
+            ? JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString())
+            : undefined;
+        if (!(decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.publicKey)) {
+            throw new Error('Could not find session keys.');
+        }
+        return decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.publicKey;
+    };
     const shouldRegisterSessionKeysOnSignin = () => {
         var _a;
         return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion) ===
@@ -117,6 +127,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     const removeSessionKey = React.useCallback(() => utils.StorageService.removeItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS), []);
     return {
         generateSessionKey,
+        getSessionPublicKey,
         registerEmbeddedWalletSessionKey,
         removeSessionKey,
         shouldRegisterSessionKeysOnSignin,

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

@@ -15,6 +15,7 @@ export declare const useEmbeddedWalletSessionKeys: ({ environmentId, projectSett
         privateKeyJwk: JsonWebKey;
         publicKey: string;
     }>;
+    getSessionPublicKey: () => string;
     registerEmbeddedWalletSessionKey: ({ ignoreRestore, }?: {
         ignoreRestore?: boolean;
     }) => Promise<SessionKey | {

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

@@ -94,6 +94,16 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
         StorageService.setItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateJwk, false), SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
         return { privateKey, privateKeyJwk: privateJwk, publicKey };
     });
+    const getSessionPublicKey = () => {
+        const sessionKeysSS = StorageService.getItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        const decodedSessionKeys = sessionKeysSS
+            ? JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString())
+            : undefined;
+        if (!(decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.publicKey)) {
+            throw new Error('Could not find session keys.');
+        }
+        return decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.publicKey;
+    };
     const shouldRegisterSessionKeysOnSignin = () => {
         var _a;
         return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion) ===
@@ -113,6 +123,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     const removeSessionKey = useCallback(() => StorageService.removeItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS), []);
     return {
         generateSessionKey,
+        getSessionPublicKey,
         registerEmbeddedWalletSessionKey,
         removeSessionKey,
         shouldRegisterSessionKeysOnSignin,

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

@@ -36,12 +36,12 @@ require('../../../store/state/environmentId.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');

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

@@ -32,12 +32,12 @@ import '../../../store/state/environmentId.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';

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

@@ -27,7 +27,7 @@ var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.c
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 
 const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
-    const isLoadingRef = React.useRef(true);
+    const [isLoading, setIsLoading] = React.useState(true);
     const didRefreshUserRef = React.useRef(false);
     const user$2 = user.getUser();
     /**
@@ -77,7 +77,7 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
             if (projectSettings) {
                 // only set to false if projectSettings are available,
                 // otherwise isCookieEnabled might be a false negative
-                isLoadingRef.current = false;
+                setIsLoading(false);
             }
         });
         // Ensure this effect only runs once
@@ -85,9 +85,7 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
             return;
         maybeInitUserRefresh();
     }, [user$2, projectSettings, environmentId, setPrimaryWalletId]);
-    return {
-        isLoading: isLoadingRef.current,
-    };
+    return { isLoading };
 };
 
 exports.useResetCookieLocalStorage = useResetCookieLocalStorage;

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useRef, useEffect } from 'react';
+import { useState, useRef, useEffect } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -23,7 +23,7 @@ import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 
 const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
-    const isLoadingRef = useRef(true);
+    const [isLoading, setIsLoading] = useState(true);
     const didRefreshUserRef = useRef(false);
     const user = getUser();
     /**
@@ -73,7 +73,7 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
             if (projectSettings) {
                 // only set to false if projectSettings are available,
                 // otherwise isCookieEnabled might be a false negative
-                isLoadingRef.current = false;
+                setIsLoading(false);
             }
         });
         // Ensure this effect only runs once
@@ -81,9 +81,7 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
             return;
         maybeInitUserRefresh();
     }, [user, projectSettings, environmentId, setPrimaryWalletId]);
-    return {
-        isLoading: isLoadingRef.current,
-    };
+    return { isLoading };
 };
 
 export { useResetCookieLocalStorage };

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

@@ -35,12 +35,12 @@ require('../../../store/state/environmentId.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');

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

@@ -31,12 +31,12 @@ import '../../../store/state/environmentId.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';

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

@@ -42,11 +42,11 @@ var fetchNonce = require('../../functions/fetchNonce/fetchNonce.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 var useUserAuth = require('../useUserAuth/useUserAuth.cjs');
 var farcaster = require('./farcaster/farcaster.cjs');
 require('yup');

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

@@ -38,11 +38,11 @@ import { fetchNonce } from '../../functions/fetchNonce/fetchNonce.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
 import { connect, watchStatus } from './farcaster/farcaster.js';
 import 'yup';

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

@@ -41,12 +41,12 @@ var getWalletProvider = require('../../functions/getWalletProvider/getWalletProv
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 var useUserAuth = require('../useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');

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

@@ -37,12 +37,12 @@ import { getWalletProvider } from '../../functions/getWalletProvider/getWalletPr
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';

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

@@ -48,6 +48,7 @@ var useOtpVerificationRequest = require('../../utils/hooks/authenticationHooks/u
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');
 var findPrimaryEmbeddedChain = require('../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var useEmbeddedWalletSessionKeys = require('../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var usePasskeyRecovery = require('../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.cjs');
@@ -58,7 +59,6 @@ var VerificationContext = require('../../context/VerificationContext/Verificatio
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useOnUnmount = require('../../utils/hooks/useOnUnmount/useOnUnmount.cjs');
 require('@dynamic-labs/types');
-var useEmbeddedWalletSessionKeys = require('../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 var useUserAuth = require('../../utils/hooks/useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');

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

@@ -44,6 +44,7 @@ import { useOtpVerificationRequest } from '../../utils/hooks/authenticationHooks
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
 import { findPrimaryEmbeddedChain } from '../Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { useEmbeddedWalletSessionKeys } from '../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { usePasskeyRecovery } from '../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js';
@@ -54,7 +55,6 @@ import { useVerification } from '../../context/VerificationContext/VerificationC
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useOnUnmount } from '../../utils/hooks/useOnUnmount/useOnUnmount.js';
 import '@dynamic-labs/types';
-import { useEmbeddedWalletSessionKeys } from '../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import { useUserAuth } from '../../utils/hooks/useUserAuth/useUserAuth.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';

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

@@ -27,7 +27,7 @@ var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWall
 require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
 
-const createEmbeddedWalletRequest = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, chains, webAuthnAttestation, withAuthenticator, }) {
+const createEmbeddedWalletRequest = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, chains, sessionPublicKey, webAuthnAttestation, withAuthenticator, }) {
     if (!walletConnector) {
         throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
@@ -48,7 +48,8 @@ const createEmbeddedWalletRequest = (_a) => _tslib.__awaiter(void 0, [_a], void
         };
     }
     const updatedUser = yield embeddedWallets.createTurnkeyEmbeddedWallet(Object.assign({ chains,
-        environmentId }, authenticatorBody));
+        environmentId,
+        sessionPublicKey }, authenticatorBody));
     if (!updatedUser) {
         throw new utils.DynamicError('Failed to create embedded wallet');
     }

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

@@ -8,8 +8,9 @@ type CreateEmbeddedWalletRequestProps = {
     chains: EmbeddedWalletChainEnum[];
     webAuthnAttestation?: WebAuthnAttestation;
     withAuthenticator: boolean;
+    sessionPublicKey?: string;
 };
-export declare const createEmbeddedWalletRequest: ({ user, walletConnector, environmentId, chains, webAuthnAttestation, withAuthenticator, }: CreateEmbeddedWalletRequestProps) => Promise<{
+export declare const createEmbeddedWalletRequest: ({ user, walletConnector, environmentId, chains, sessionPublicKey, webAuthnAttestation, withAuthenticator, }: CreateEmbeddedWalletRequestProps) => Promise<{
     embeddedWalletVerifiedCredential: import("@dynamic-labs/sdk-api-core").JwtVerifiedCredential;
     updatedUser: UserProfile;
     walletConnector: IPasskeyWalletConnector & IEmailWalletConnector;

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

@@ -23,7 +23,7 @@ import { createTurnkeyEmbeddedWallet } from '../../../../data/api/embeddedWallet
 import '../../../../store/state/user/user.js';
 import '../../../../locale/locale.js';
 
-const createEmbeddedWalletRequest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, chains, webAuthnAttestation, withAuthenticator, }) {
+const createEmbeddedWalletRequest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ user, walletConnector, environmentId, chains, sessionPublicKey, webAuthnAttestation, withAuthenticator, }) {
     if (!walletConnector) {
         throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
@@ -44,7 +44,8 @@ const createEmbeddedWalletRequest = (_a) => __awaiter(void 0, [_a], void 0, func
         };
     }
     const updatedUser = yield createTurnkeyEmbeddedWallet(Object.assign({ chains,
-        environmentId }, authenticatorBody));
+        environmentId,
+        sessionPublicKey }, authenticatorBody));
     if (!updatedUser) {
         throw new DynamicError('Failed to create embedded wallet');
     }

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.cjs

@@ -34,6 +34,7 @@ require('../../../store/state/environmentId.cjs');
 var useOtpVerificationRequest = require('../../../utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.cjs');
 require('react-dom');
 require('../../../utils/functions/compareChains/compareChains.cjs');
+var useEmbeddedWalletSessionKeys = require('../../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 var VerificationContext = require('../../../context/VerificationContext/VerificationContext.cjs');
 require('../../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
@@ -42,7 +43,6 @@ require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchem
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
 var useOnUnmount = require('../../../utils/hooks/useOnUnmount/useOnUnmount.cjs');
 require('@dynamic-labs/types');
-var useEmbeddedWalletSessionKeys = require('../../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 var useUserAuth = require('../../../utils/hooks/useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');

package/src/lib/views/SmsVerification/useSmsVerification/useSmsVerification.js

@@ -30,6 +30,7 @@ import '../../../store/state/environmentId.js';
 import { useOtpVerificationRequest } from '../../../utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.js';
 import 'react-dom';
 import '../../../utils/functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
 import '../../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
@@ -38,7 +39,6 @@ import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
 import { useOnUnmount } from '../../../utils/hooks/useOnUnmount/useOnUnmount.js';
 import '@dynamic-labs/types';
-import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import { useUserAuth } from '../../../utils/hooks/useUserAuth/useUserAuth.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';

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

@@ -125,7 +125,7 @@ const WalletListItem = ({ disabled = false, wallet, onResetSearchValue, recommen
     });
     const name = _isWalletGroup
         ? walletBook.getWalletGroup(walletBook$1, wallet.key).name
-        : walletBook.getWalletBookWallet(walletBook$1, wallet.key).name;
+        : wallet.walletConnector.metadata.name;
     const leading = (jsxRuntime.jsx(walletBook.WalletIcon, { className: 'wallet-list-item__leading', icon: (_a = wallet.walletConnector) === null || _a === void 0 ? void 0 : _a.metadata.icon, walletKey: wallet.key, style: { height: pixelToRem.pixelToRem(28), width: pixelToRem.pixelToRem(28) } }));
     const trailing = (jsxRuntime.jsx(ListTileAnimatedTrailing.ListTileAnimatedTrailing, { hoverElement: 
         // eslint-disable-next-line react/jsx-wrap-multilines