@dynamic-labs/sdk-react-core 3.0.0-alpha.1 → 3.0.0-alpha.10

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

@@ -17,16 +17,14 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
@@ -120,6 +118,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 connected: true,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
+                key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             };
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);
             if (!smartWallet$1) {
@@ -133,7 +132,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet$1.id);
             }
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, getAuthToken.getAuthToken(), updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

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

@@ -13,16 +13,14 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
@@ -116,6 +114,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 connected: true,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
+                key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             };
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);
             if (!smartWallet) {
@@ -129,7 +128,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 });
                 setPrimaryWalletId(smartWallet.id);
             }
-            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, getAuthToken(), updatedUser);
+            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {

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

@@ -15,6 +15,7 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -23,8 +24,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');

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

@@ -11,6 +11,7 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -19,8 +20,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';

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

@@ -15,6 +15,7 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -23,8 +24,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');

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

@@ -11,6 +11,7 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -19,8 +20,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';

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

@@ -16,6 +16,7 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
@@ -23,14 +24,12 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var isProviderEnabled = require('../../functions/isProviderEnabled/isProviderEnabled.cjs');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('viem');
-require('viem/chains');
 var email = require('../../../data/api/email/email.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+var isProviderEnabled = require('../../functions/isProviderEnabled/isProviderEnabled.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -12,6 +12,7 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -19,14 +20,12 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
 import { getEmailProvider, createEmailVerification } from '../../../data/api/email/email.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -16,6 +16,7 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
@@ -24,13 +25,11 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('viem');
-require('viem/chains');
-var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
+var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -12,6 +12,7 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -20,13 +21,11 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
-import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -14,29 +14,31 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+var values = require('../../constants/values.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('viem');
-require('viem/chains');
-var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
+var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');
@@ -101,7 +103,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
@@ -138,14 +140,26 @@ const useEmbeddedWallet = () => {
         }
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
-    const shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
+    const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
+        if (verifiedUser) {
+            const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+            const verifiedCredentialChain = values.ChainEnumToVerifiedCredentialName[primaryEmbeddedChain];
+            const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+                verifiedCredentialChain,
+            ]);
+            if (embeddedWalletVerifiedCredential) {
+                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                return false;
+            }
+        }
         if (
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings) &&
@@ -154,7 +168,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -1,5 +1,6 @@
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../shared';
+import { UserProfile } from '../../../..';
 /**
  * @returns {
  *  createEmbeddedWallet, - creates Dynamic embedded wallet according to the settings
@@ -18,9 +19,9 @@ export declare const useEmbeddedWallet: () => {
     readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
         webAuthnAttestation: import("dist/packages/wallet-connector-core/src").WebAuthnAttestation;
     } | undefined) => Promise<Wallet | undefined>;
-    readonly createOrRestoreSession: (options: {
+    readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
-    } | undefined) => Promise<string>;
+    } | undefined) => Promise<string | undefined>;
     readonly createPasskey: (options: {
         oneTimeCode: string;
     } | undefined) => Promise<import("dist/packages/wallet-connector-core/src").WebAuthnAttestation>;
@@ -33,6 +34,6 @@ export declare const useEmbeddedWallet: () => {
         htmlContainerId?: string | undefined;
     } | undefined) => Promise<boolean>;
     readonly sendOneTimeCode: () => Promise<string>;
-    readonly shouldAutoCreateEmbeddedWallet: () => boolean;
+    readonly shouldAutoCreateEmbeddedWallet: (verifiedUser?: UserProfile) => boolean;
     readonly userHasEmbeddedWallet: () => boolean;
 };

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

@@ -10,29 +10,31 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
-import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
-import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import { hasEmbeddedWallet } from '../../functions/hasEmbeddedWallet/hasEmbeddedWallet.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 { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';
@@ -97,7 +99,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
@@ -134,14 +136,26 @@ const useEmbeddedWallet = () => {
         }
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
-    const shouldAutoCreateEmbeddedWallet = useCallback(() => {
+    const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
+        if (verifiedUser) {
+            const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
+            const verifiedCredentialChain = ChainEnumToVerifiedCredentialName[primaryEmbeddedChain];
+            const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+                verifiedCredentialChain,
+            ]);
+            if (embeddedWalletVerifiedCredential) {
+                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                return false;
+            }
+        }
         if (
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled(projectSettings) &&
@@ -150,7 +164,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -13,7 +13,6 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/f
 require('../../../../constants/values.cjs');
 var errors = require('../../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../../functions/getAuthToken/getAuthToken.cjs');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
@@ -21,25 +20,25 @@ require('../../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../constants/colors.cjs');
 require('../../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../../shared/utils/classes/storage/sessionStorage.cjs');
 var generateRandomPassword = require('../../../../../shared/utils/functions/generateRandomPassword/generateRandomPassword.cjs');
 require('../../../../../shared/consts/index.cjs');
 require('react-international-phone');
+require('../../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../../../locale/locale.cjs');
+var wallets = require('../../../../../data/api/wallets/wallets.cjs');
 var getVerifyArgs = require('../../../../functions/getVerifyArgs/getVerifyArgs.cjs');
-require('viem');
-require('viem/chains');
 var findCoinbaseMPCWallet = require('../../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
 var getCoinbaseMPCConnectorFetchers = require('../../../../functions/getCoinbaseMPCConnectorFetchers/getCoinbaseMPCConnectorFetchers.cjs');
-require('../../../../../context/DynamicContext/DynamicContext.cjs');
 var dynamicEvents = require('../../../../../events/dynamicEvents.cjs');
+require('../../../../../context/DynamicContext/DynamicContext.cjs');
+var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../../locale/locale.cjs');
-var wallets = require('../../../../../data/api/wallets/wallets.cjs');
 var getSiweStatement = require('../../../../functions/getSiweStatement/getSiweStatement.cjs');
 require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -86,13 +85,13 @@ require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyn
 require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
     const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setError } = ErrorContext.useErrorContext();
     const returnExistingCoinbaseMPCWallet = React.useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
@@ -102,10 +101,11 @@ const useCoinbaseMPC = () => {
             connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
+            key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         };
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
-    const linkCoinbaseMPCWallet = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ connector, backupCode, password, source, }) {
+    const linkCoinbaseMPCWallet = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
@@ -146,6 +146,7 @@ const useCoinbaseMPC = () => {
         siweStatement,
     ]);
     const createNewCoinbaseMPCWallet = React.useCallback((connector, password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _c;
         const initialWalletPassword = password
             ? password
             : generateRandomPassword.generateRandomPassword(DYNAMIC_PASSWORD_LENGTH);
@@ -167,8 +168,9 @@ const useCoinbaseMPC = () => {
                 connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken.getAuthToken(), updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {
@@ -182,11 +184,11 @@ const useCoinbaseMPC = () => {
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
     const createCoinbaseMPCWallet = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (chains = [sdkApiCore.ChainEnum.Evm], password) {
-        var _b;
+        var _d;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        const connector = (_d = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _d === void 0 ? void 0 : _d.walletConnector;
         if (!connector || !walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
             const error = new utils.DynamicError('CoinbaseWaaSWalletConnectors not found');
             logger.logger.error('Failed to create embedded wallet', error);