@dynamic-labs/sdk-react-core 4.32.1-preview.0 → 4.33.0

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

@@ -35,7 +35,6 @@ require('@dynamic-labs-sdk/client/core');
 var client = require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
@@ -372,7 +371,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         shouldRegisterSessionKeysOnSignin,
         signInAccount,
     ]);
-    const connectSocialAccount = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, triggerFundFromExchangeOnSuccess, payingWithDynamic, redirectUrl, telegramAuthToken, showWidgetAfterConnection, }) {
+    const connectSocialAccount = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, }) {
         var _e, _f;
         clearError();
         setIsProcessing(true);
@@ -405,6 +404,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         socialStorage.setSocialStorageFor(provider, {
             captchaToken,
             codeVerifier: usingPkce ? verifier : undefined,
+            isHeadlessSocialSignIn,
             mode: authMode,
             payingWithDynamic,
             showWidgetAfterConnection,

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

@@ -18,6 +18,8 @@ export type ConnectSocialAccountProps = {
     showWidgetAfterConnection?: boolean;
     triggerFundFromExchangeOnSuccess?: ExchangeKeyEnum;
     payingWithDynamic?: PayWithDynamicProps;
+    /** marks the flow as initiated by headless sign-in API */
+    isHeadlessSocialSignIn?: boolean;
 };
 export declare const useSocialAuth: ({ onSettled, onError, onFarcasterUrl, }: UseSocialAuthProps) => {
     readonly checkValidProvider: (provider: ProviderEnum, authMode: SocialAuthMode) => boolean;

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

@@ -31,7 +31,6 @@ import '@dynamic-labs-sdk/client/core';
 import { getDynamicClient } from '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { telegramSignIn, signInOAuth, telegramVerify, verifyOAuth, getOAuthResult, initAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
@@ -368,7 +367,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         shouldRegisterSessionKeysOnSignin,
         signInAccount,
     ]);
-    const connectSocialAccount = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, triggerFundFromExchangeOnSuccess, payingWithDynamic, redirectUrl, telegramAuthToken, showWidgetAfterConnection, }) {
+    const connectSocialAccount = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ authMode, provider, validator, captchaToken, isHeadlessSocialSignIn, payingWithDynamic, triggerFundFromExchangeOnSuccess, redirectUrl, telegramAuthToken, showWidgetAfterConnection, }) {
         var _e, _f;
         clearError();
         setIsProcessing(true);
@@ -401,6 +400,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         setSocialStorageFor(provider, {
             captchaToken,
             codeVerifier: usingPkce ? verifier : undefined,
+            isHeadlessSocialSignIn,
             mode: authMode,
             payingWithDynamic,
             showWidgetAfterConnection,

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

@@ -33,7 +33,6 @@ require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -29,7 +29,6 @@ import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -28,7 +28,6 @@ require('@dynamic-labs-sdk/client/core');
 require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -24,7 +24,6 @@ import '@dynamic-labs-sdk/client/core';
 import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -23,13 +23,13 @@ var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
-var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
-require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
+var useProjectSettings = require('../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
@@ -45,6 +45,7 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+var useMutation = require('../useMutation/useMutation.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
@@ -105,63 +106,134 @@ require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
-const useSyncDynamicWaas = () => {
-    const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+// Validate if all required conditions are met for wallet creation
+const useWalletCreationValidation = () => {
+    const user = useOnboardingCompleteUser.useOnboardingCompleteUser();
+    const projectSettings = useProjectSettings.useProjectSettings();
+    const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
     const { loading: globalLoading } = LoadingContext.useLoadingContext();
+    return React.useCallback(() => {
+        // Check if user is properly authenticated
+        const hasUser = Boolean(user && client.getDynamicClient().user);
+        if (!hasUser) {
+            return { isValid: false, reason: 'User not authenticated' };
+        }
+        if (!projectSettings) {
+            return { isValid: false, reason: 'Project settings not loaded' };
+        }
+        if (!walletConnectorOptions.length) {
+            return { isValid: false, reason: 'No wallet connectors available' };
+        }
+        if (globalLoading) {
+            return { isValid: false, reason: 'Authentication in progress' };
+        }
+        return { isValid: true };
+    }, [user, projectSettings, walletConnectorOptions, globalLoading]);
+};
+// Manage wallet creation with proper error handling
+const useWalletCreation = () => {
+    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { clearStackAndPush } = ViewContext.useViewContext();
-    const user = useOnboardingCompleteUser.useOnboardingCompleteUserProfile();
-    const projectSettings$1 = projectSettings.useProjectSettings();
-    const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
-    const { createWalletAccount, needsAutoCreateWalletChains } = useDynamicWaas.useDynamicWaas();
+    const { createWalletAccount } = useDynamicWaas.useDynamicWaas();
+    const user = useOnboardingCompleteUser.useOnboardingCompleteUser();
+    const environmentId = dynamicContextProps.useEnvironmentId();
+    return useMutation.useMutation((chains) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const startTime = Date.now();
+        // Log wallet creation initiation to DataDog
+        logger.logger.instrument('Auto wallet creation initiated', {
+            chainCount: chains.length,
+            chains: chains.join(','),
+            environmentId,
+            key: 'auto_wallet_creation_initiated',
+            time: 0,
+            userId: user === null || user === void 0 ? void 0 : user.id,
+        });
+        try {
+            yield createWalletAccount(chains);
+            const duration = Date.now() - startTime;
+            // Log successful wallet creation to DataDog
+            logger.logger.instrument('Auto wallet creation successful', {
+                chainCount: chains.length,
+                chains: chains.join(','),
+                environmentId,
+                key: 'auto_wallet_creation_success',
+                time: duration,
+                userId: user === null || user === void 0 ? void 0 : user.id,
+            });
+        }
+        catch (error) {
+            const duration = Date.now() - startTime;
+            // Log failed wallet creation to DataDog
+            logger.logger.instrument('Auto wallet creation failed', {
+                chainCount: chains.length,
+                chains: chains.join(','),
+                environmentId,
+                error: error instanceof Error ? error.message : 'Unknown error',
+                key: 'auto_wallet_creation_failed',
+                time: duration,
+                userId: user === null || user === void 0 ? void 0 : user.id,
+            });
+            throw error;
+        }
+    }), {
+        onFailure: (error) => {
+            logger.logger.error('Error creating dynamic waas wallet', error);
+            setShowAuthFlow(true);
+            clearStackAndPush('backup-unsuccessful');
+        },
+    });
+};
+/**
+ * Hook that synchronizes Dynamic WaaS wallet creation based on user state and configuration.
+ *
+ * This hook automatically creates embedded wallets for enabled chains when:
+ * - User is authenticated and onboarding is complete
+ * - Project settings allow automatic wallet creation
+ * - Required chains don't already have wallets
+ * - No authentication is currently in progress
+ *
+ * The hook ensures wallet creation only happens once per session until logout.
+ */
+const useSyncDynamicWaas = () => {
+    const { needsAutoCreateWalletChains } = useDynamicWaas.useDynamicWaas();
+    const validateWalletCreation = useWalletCreationValidation();
+    const { mutate: createWallets, isLoading: isCreatingWallets } = useWalletCreation();
     const triggeredCreate = React.useRef(false);
+    // Reset the trigger flag on logout
     useDynamicEvents.useInternalDynamicEvents('logout', () => {
         triggeredCreate.current = false;
     });
-    // this is used to trigger createWalletAccount
-    // ** It must be an useEffect because some of the dependencies are async
-    React.useEffect(() => {
-        // Explanation: if the user just logged out, the user from the hook might still be set
-        // but the client will be null.
-        // And if the user is not onboarding complete yet, the hook won't be set even though the client.user is set.
-        // This is why we check for the user AND the client.user.
-        const hasUser = Boolean(user && client.getDynamicClient().user);
-        const syncDynamicWaas = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            try {
-                triggeredCreate.current = true;
-                if (needsAutoCreateWalletChains &&
-                    needsAutoCreateWalletChains.length > 0) {
-                    yield createWalletAccount(needsAutoCreateWalletChains);
-                }
-            }
-            catch (error) {
-                logger.logger.error('Error creating dynamic waas wallet', error);
-                setShowAuthFlow(true);
-                clearStackAndPush('backup-unsuccessful');
-            }
-        });
-        const shouldSyncCreateWallet = needsAutoCreateWalletChains &&
-            needsAutoCreateWalletChains.length > 0 &&
-            !triggeredCreate.current;
-        if (!shouldSyncCreateWallet ||
-            !hasUser ||
-            !projectSettings$1 ||
-            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
-            globalLoading // this will be true if auth is in progress
-        ) {
+    // Determine if wallet creation should be triggered
+    const shouldCreateWallets = React.useCallback(() => {
+        if (triggeredCreate.current || isCreatingWallets) {
+            return false;
+        }
+        if (!(needsAutoCreateWalletChains === null || needsAutoCreateWalletChains === void 0 ? void 0 : needsAutoCreateWalletChains.length)) {
+            return false;
+        }
+        const validation = validateWalletCreation();
+        return validation.isValid;
+    }, [needsAutoCreateWalletChains, validateWalletCreation, isCreatingWallets]);
+    // Handle the wallet creation process
+    const handleWalletCreation = React.useCallback(() => {
+        if (!shouldCreateWallets() || !needsAutoCreateWalletChains) {
             return;
         }
-        syncDynamicWaas();
-    }, [
-        user,
-        projectSettings$1,
-        walletConnectorOptions,
-        globalLoading,
-        setShowAuthFlow,
-        createWalletAccount,
-        primaryWallet,
-        needsAutoCreateWalletChains,
-        clearStackAndPush,
-    ]);
+        logger.logger.debug('Auto wallet creation triggered', {
+            chainCount: needsAutoCreateWalletChains.length,
+            chains: needsAutoCreateWalletChains,
+        });
+        // Call the mutation - it handles its own async logic and error handling
+        createWallets(needsAutoCreateWalletChains);
+        // Set the flag immediately to prevent duplicate calls
+        triggeredCreate.current = true;
+    }, [shouldCreateWallets, needsAutoCreateWalletChains, createWallets]);
+    // Effect to trigger wallet creation when conditions are met
+    React.useEffect(() => {
+        if (shouldCreateWallets()) {
+            handleWalletCreation();
+        }
+    }, [shouldCreateWallets, handleWalletCreation]);
 };
 
 exports.useSyncDynamicWaas = useSyncDynamicWaas;

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

@@ -1 +1,12 @@
+/**
+ * Hook that synchronizes Dynamic WaaS wallet creation based on user state and configuration.
+ *
+ * This hook automatically creates embedded wallets for enabled chains when:
+ * - User is authenticated and onboarding is complete
+ * - Project settings allow automatic wallet creation
+ * - Required chains don't already have wallets
+ * - No authentication is currently in progress
+ *
+ * The hook ensures wallet creation only happens once per session until logout.
+ */
 export declare const useSyncDynamicWaas: () => void;

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useRef, useEffect } from 'react';
+import { useRef, useCallback, useEffect } from 'react';
 import { getDynamicClient } from '../../../client/client.js';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs/sdk-api-core';
@@ -19,13 +19,13 @@ import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
-import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
-import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import { useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../events/dynamicEvents.js';
-import { useOnboardingCompleteUserProfile } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
+import { useOnboardingCompleteUser } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
+import { useProjectSettings } from '../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
@@ -41,6 +41,7 @@ import '../../functions/compareChains/compareChains.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import { useMutation } from '../useMutation/useMutation.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
@@ -101,63 +102,134 @@ import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
-const useSyncDynamicWaas = () => {
-    const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
-    const { loading: globalLoading } = useLoadingContext();
-    const { clearStackAndPush } = useViewContext();
-    const user = useOnboardingCompleteUserProfile();
+// Validate if all required conditions are met for wallet creation
+const useWalletCreationValidation = () => {
+    const user = useOnboardingCompleteUser();
     const projectSettings = useProjectSettings();
     const walletConnectorOptions = useWalletConnectorOptions();
-    const { createWalletAccount, needsAutoCreateWalletChains } = useDynamicWaas();
+    const { loading: globalLoading } = useLoadingContext();
+    return useCallback(() => {
+        // Check if user is properly authenticated
+        const hasUser = Boolean(user && getDynamicClient().user);
+        if (!hasUser) {
+            return { isValid: false, reason: 'User not authenticated' };
+        }
+        if (!projectSettings) {
+            return { isValid: false, reason: 'Project settings not loaded' };
+        }
+        if (!walletConnectorOptions.length) {
+            return { isValid: false, reason: 'No wallet connectors available' };
+        }
+        if (globalLoading) {
+            return { isValid: false, reason: 'Authentication in progress' };
+        }
+        return { isValid: true };
+    }, [user, projectSettings, walletConnectorOptions, globalLoading]);
+};
+// Manage wallet creation with proper error handling
+const useWalletCreation = () => {
+    const { setShowAuthFlow } = useInternalDynamicContext();
+    const { clearStackAndPush } = useViewContext();
+    const { createWalletAccount } = useDynamicWaas();
+    const user = useOnboardingCompleteUser();
+    const environmentId = useEnvironmentId();
+    return useMutation((chains) => __awaiter(void 0, void 0, void 0, function* () {
+        const startTime = Date.now();
+        // Log wallet creation initiation to DataDog
+        logger.instrument('Auto wallet creation initiated', {
+            chainCount: chains.length,
+            chains: chains.join(','),
+            environmentId,
+            key: 'auto_wallet_creation_initiated',
+            time: 0,
+            userId: user === null || user === void 0 ? void 0 : user.id,
+        });
+        try {
+            yield createWalletAccount(chains);
+            const duration = Date.now() - startTime;
+            // Log successful wallet creation to DataDog
+            logger.instrument('Auto wallet creation successful', {
+                chainCount: chains.length,
+                chains: chains.join(','),
+                environmentId,
+                key: 'auto_wallet_creation_success',
+                time: duration,
+                userId: user === null || user === void 0 ? void 0 : user.id,
+            });
+        }
+        catch (error) {
+            const duration = Date.now() - startTime;
+            // Log failed wallet creation to DataDog
+            logger.instrument('Auto wallet creation failed', {
+                chainCount: chains.length,
+                chains: chains.join(','),
+                environmentId,
+                error: error instanceof Error ? error.message : 'Unknown error',
+                key: 'auto_wallet_creation_failed',
+                time: duration,
+                userId: user === null || user === void 0 ? void 0 : user.id,
+            });
+            throw error;
+        }
+    }), {
+        onFailure: (error) => {
+            logger.error('Error creating dynamic waas wallet', error);
+            setShowAuthFlow(true);
+            clearStackAndPush('backup-unsuccessful');
+        },
+    });
+};
+/**
+ * Hook that synchronizes Dynamic WaaS wallet creation based on user state and configuration.
+ *
+ * This hook automatically creates embedded wallets for enabled chains when:
+ * - User is authenticated and onboarding is complete
+ * - Project settings allow automatic wallet creation
+ * - Required chains don't already have wallets
+ * - No authentication is currently in progress
+ *
+ * The hook ensures wallet creation only happens once per session until logout.
+ */
+const useSyncDynamicWaas = () => {
+    const { needsAutoCreateWalletChains } = useDynamicWaas();
+    const validateWalletCreation = useWalletCreationValidation();
+    const { mutate: createWallets, isLoading: isCreatingWallets } = useWalletCreation();
     const triggeredCreate = useRef(false);
+    // Reset the trigger flag on logout
     useInternalDynamicEvents('logout', () => {
         triggeredCreate.current = false;
     });
-    // this is used to trigger createWalletAccount
-    // ** It must be an useEffect because some of the dependencies are async
-    useEffect(() => {
-        // Explanation: if the user just logged out, the user from the hook might still be set
-        // but the client will be null.
-        // And if the user is not onboarding complete yet, the hook won't be set even though the client.user is set.
-        // This is why we check for the user AND the client.user.
-        const hasUser = Boolean(user && getDynamicClient().user);
-        const syncDynamicWaas = () => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                triggeredCreate.current = true;
-                if (needsAutoCreateWalletChains &&
-                    needsAutoCreateWalletChains.length > 0) {
-                    yield createWalletAccount(needsAutoCreateWalletChains);
-                }
-            }
-            catch (error) {
-                logger.error('Error creating dynamic waas wallet', error);
-                setShowAuthFlow(true);
-                clearStackAndPush('backup-unsuccessful');
-            }
-        });
-        const shouldSyncCreateWallet = needsAutoCreateWalletChains &&
-            needsAutoCreateWalletChains.length > 0 &&
-            !triggeredCreate.current;
-        if (!shouldSyncCreateWallet ||
-            !hasUser ||
-            !projectSettings ||
-            !walletConnectorOptions.length || // no connectors to use for the embedded wallet
-            globalLoading // this will be true if auth is in progress
-        ) {
+    // Determine if wallet creation should be triggered
+    const shouldCreateWallets = useCallback(() => {
+        if (triggeredCreate.current || isCreatingWallets) {
+            return false;
+        }
+        if (!(needsAutoCreateWalletChains === null || needsAutoCreateWalletChains === void 0 ? void 0 : needsAutoCreateWalletChains.length)) {
+            return false;
+        }
+        const validation = validateWalletCreation();
+        return validation.isValid;
+    }, [needsAutoCreateWalletChains, validateWalletCreation, isCreatingWallets]);
+    // Handle the wallet creation process
+    const handleWalletCreation = useCallback(() => {
+        if (!shouldCreateWallets() || !needsAutoCreateWalletChains) {
             return;
         }
-        syncDynamicWaas();
-    }, [
-        user,
-        projectSettings,
-        walletConnectorOptions,
-        globalLoading,
-        setShowAuthFlow,
-        createWalletAccount,
-        primaryWallet,
-        needsAutoCreateWalletChains,
-        clearStackAndPush,
-    ]);
+        logger.debug('Auto wallet creation triggered', {
+            chainCount: needsAutoCreateWalletChains.length,
+            chains: needsAutoCreateWalletChains,
+        });
+        // Call the mutation - it handles its own async logic and error handling
+        createWallets(needsAutoCreateWalletChains);
+        // Set the flag immediately to prevent duplicate calls
+        triggeredCreate.current = true;
+    }, [shouldCreateWallets, needsAutoCreateWalletChains, createWallets]);
+    // Effect to trigger wallet creation when conditions are met
+    useEffect(() => {
+        if (shouldCreateWallets()) {
+            handleWalletCreation();
+        }
+    }, [shouldCreateWallets, handleWalletCreation]);
 };
 
 export { useSyncDynamicWaas };

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

@@ -31,7 +31,6 @@ require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../events/dynamicEvents.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -27,7 +27,6 @@ import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -30,7 +30,6 @@ require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../events/dynamicEvents.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -26,7 +26,6 @@ import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -30,7 +30,6 @@ require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../events/dynamicEvents.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -26,7 +26,6 @@ import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -25,7 +25,6 @@ require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../events/dynamicEvents.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');

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

@@ -21,7 +21,6 @@ import '../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '../../../events/dynamicEvents.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { isUserLinkedWithTelegram } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';