@dynamic-labs/sdk-react-core 2.0.0-alpha.6 → 2.0.0-alpha.7

package/src/lib/utils/functions/mergeNetworks/mergeNetworks.d.ts

@@ -0,0 +1,13 @@
+import { GenericNetwork } from '@dynamic-labs/types';
+/**
+ * Will merge the networks in the first param to the networks in the second param.
+ * The firs param's networks will have priority in case of conflicts.
+ *
+ * @example
+ * const DynamicSettings = {
+ *    overrides: {
+ *        evmNetworks: (networks) => mergeNetworks(myEvmNetworks, networks),
+ *    }
+ * }
+ */
+export declare const mergeNetworks: (priorityNetworks: GenericNetwork[], secondaryNetworks: GenericNetwork[]) => GenericNetwork[];

package/src/lib/utils/functions/mergeNetworks/mergeNetworks.js

@@ -0,0 +1,22 @@
+/**
+ * Will merge the networks in the first param to the networks in the second param.
+ * The firs param's networks will have priority in case of conflicts.
+ *
+ * @example
+ * const DynamicSettings = {
+ *    overrides: {
+ *        evmNetworks: (networks) => mergeNetworks(myEvmNetworks, networks),
+ *    }
+ * }
+ */
+const mergeNetworks = (priorityNetworks, secondaryNetworks) => {
+    const networks = [...priorityNetworks];
+    secondaryNetworks.forEach((network) => {
+        const hasNetwork = networks.some((item) => item.chainId === network.chainId);
+        if (!hasNetwork)
+            networks.push(network);
+    });
+    return networks;
+};
+
+export { mergeNetworks };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -84,7 +84,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, enableForcedNetworkValidation, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -147,7 +147,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 network: walletNetwork,
                 walletConnector,
             });
-            if (!usesSupportedNetwork && Boolean(enableForcedNetworkValidation)) {
+            const isNetworkValidationEnabledForSignIn = networkValidationMode === 'always' ||
+                networkValidationMode === 'sign-in';
+            if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported-manual');
                 }

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -80,7 +80,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = useViewContext();
     const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, enableForcedNetworkValidation, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -143,7 +143,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 network: walletNetwork,
                 walletConnector,
             });
-            if (!usesSupportedNetwork && Boolean(enableForcedNetworkValidation)) {
+            const isNetworkValidationEnabledForSignIn = networkValidationMode === 'always' ||
+                networkValidationMode === 'sign-in';
+            if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported-manual');
                 }

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs

@@ -63,6 +63,7 @@ require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Se
 require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js

@@ -59,6 +59,7 @@ import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Sec
 import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../context/LoadingContext/LoadingContext.js';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';

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

@@ -46,3 +46,4 @@ export { useEmbeddedWalletAuthenticator } from './useEmbeddedWalletAuthenticator
 export { useViewSettings } from './useViewSettings';
 export { useSendBalance } from './useSendBalance';
 export { useEmbeddedWalletPassword } from './useEmbeddedWalletPassword';
+export { useSetWalletConnectorFetchers } from './useSetWalletConnectorFetchers';

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

@@ -116,7 +116,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'passkey-new-domain-detected' &&
         view.type !== 'social-redirect-view' &&
         view.type !== 'update-email' &&
-        view.type !== 'collect-user-data-login-with-email' &&
+        view.type !== 'collect-user-data-login-no-wallet' &&
         view.type !== 'passkey-recovery-bundle' &&
         view.type !== 'passkey-recovery-start' &&
         view.type !== 'embedded-reveal-view' &&

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

@@ -112,7 +112,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'passkey-new-domain-detected' &&
         view.type !== 'social-redirect-view' &&
         view.type !== 'update-email' &&
-        view.type !== 'collect-user-data-login-with-email' &&
+        view.type !== 'collect-user-data-login-no-wallet' &&
         view.type !== 'passkey-recovery-bundle' &&
         view.type !== 'passkey-recovery-start' &&
         view.type !== 'embedded-reveal-view' &&

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

@@ -66,6 +66,7 @@ require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secon
 require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../config/ApiEndpoint.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');

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

@@ -62,6 +62,7 @@ import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Second
 import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../config/ApiEndpoint.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../shared/logger.cjs');
@@ -27,6 +27,7 @@ var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('viem/chains');
+var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -34,6 +35,7 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 require('@dynamic-labs/types');
 require('yup');
 require('react-i18next');
@@ -79,15 +81,12 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 // Hook exposed to customers and used internally to trigger embedded reveal
 const useEmbeddedReveal = () => {
-    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, projectSettings, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const { setView } = ViewContext.useViewContext();
-    const initExportProcess = React.useCallback((recoveryPhrase = false) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
+    const turnkeyChecks = ({ jwt, recoveryPhrase, }) => {
         var _a, _b;
-        const jwt = getAuthToken.getAuthToken();
-        if (!jwt) {
-            throw new Error('User is not logged in');
-        }
         if (!isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
         }
@@ -100,6 +99,32 @@ const useEmbeddedReveal = () => {
         if (recoveryPhrase && !turnkeyHDWalletId) {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
+    };
+    const coinbaseMpcChecks = ({ jwt }) => {
+        if (!isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings)) {
+            throw new Error('Coinbase MPC is not enabled. Go to the dashboard and make sure to have Coinbase WaaS and at least one EVM network enabled. Also, make sure you are passing `EthereumWalletConnectors` to the `walletConnectors` prop in `DynamicContextProvider` `settings`.');
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new Error('Coinbase MPC wallet not found');
+        }
+    };
+    const initExportProcess = React.useCallback((recoveryPhrase = false) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!primaryWallet) {
+            throw new Error('No primary wallet');
+        }
+        const jwt = getAuthToken.getAuthToken();
+        if (!jwt) {
+            throw new Error('User is not logged in');
+        }
+        if (isTurnkeyWallet) {
+            turnkeyChecks({ jwt, recoveryPhrase });
+        }
+        if (walletConnectorCore.isCoinbaseMpcWalletConnector(primaryWallet.connector)) {
+            coinbaseMpcChecks({ jwt });
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new Error('Passkey embedded wallet not found');
+        }
         setShowAuthFlow(true, {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
@@ -109,7 +134,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
+    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, setView]);
     return {
         initExportProcess,
     };

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

@@ -1,9 +1,9 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
+import { isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
@@ -23,6 +23,7 @@ import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import 'viem/chains';
+import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -30,6 +31,7 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import '@dynamic-labs/types';
 import 'yup';
 import 'react-i18next';
@@ -75,15 +77,12 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 // Hook exposed to customers and used internally to trigger embedded reveal
 const useEmbeddedReveal = () => {
-    const { projectSettings, setShowAuthFlow } = useInternalDynamicContext();
+    const { primaryWallet, projectSettings, setShowAuthFlow } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { setView } = useViewContext();
-    const initExportProcess = useCallback((recoveryPhrase = false) => __awaiter(void 0, void 0, void 0, function* () {
+    const { isTurnkeyWallet } = useIsTurnkeyWallet();
+    const turnkeyChecks = ({ jwt, recoveryPhrase, }) => {
         var _a, _b;
-        const jwt = getAuthToken();
-        if (!jwt) {
-            throw new Error('User is not logged in');
-        }
         if (!isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
         }
@@ -96,6 +95,32 @@ const useEmbeddedReveal = () => {
         if (recoveryPhrase && !turnkeyHDWalletId) {
             throw new Error('Wallet is non-HD and does not have a recovery phrase');
         }
+    };
+    const coinbaseMpcChecks = ({ jwt }) => {
+        if (!isCoinbaseWaasEnabled(projectSettings)) {
+            throw new Error('Coinbase MPC is not enabled. Go to the dashboard and make sure to have Coinbase WaaS and at least one EVM network enabled. Also, make sure you are passing `EthereumWalletConnectors` to the `walletConnectors` prop in `DynamicContextProvider` `settings`.');
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new Error('Coinbase MPC wallet not found');
+        }
+    };
+    const initExportProcess = useCallback((recoveryPhrase = false) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!primaryWallet) {
+            throw new Error('No primary wallet');
+        }
+        const jwt = getAuthToken();
+        if (!jwt) {
+            throw new Error('User is not logged in');
+        }
+        if (isTurnkeyWallet) {
+            turnkeyChecks({ jwt, recoveryPhrase });
+        }
+        if (isCoinbaseMpcWalletConnector(primaryWallet.connector)) {
+            coinbaseMpcChecks({ jwt });
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new Error('Passkey embedded wallet not found');
+        }
         setShowAuthFlow(true, {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
@@ -105,7 +130,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [setShowAuthFlow, projectSettings, setView, userHasEmbeddedWallet]);
+    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, setView]);
     return {
         initExportProcess,
     };

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

@@ -72,6 +72,7 @@ require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Se
 require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');

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

@@ -68,6 +68,7 @@ import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Sec
 import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../context/LoadingContext/LoadingContext.js';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApi = require('@dynamic-labs/sdk-api');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../shared/logger.cjs');
@@ -26,9 +26,12 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmb
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
+var getUserWalletsFromVerifiedCredentials = require('../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('viem/chains');
+var findCoinbaseMPCWallet = require('../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
+var requiresPasswordForEmbeddedWallet = require('../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
 var requiresPasswordForEmbeddedWalletOnSignup = require('../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.cjs');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../config/ApiEndpoint.cjs');
@@ -85,7 +88,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, primaryWallet, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword.useEmbeddedWalletPassword();
     const { createCoinbaseMPCWallet } = useCoinbaseMPC.useCoinbaseMPC();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
@@ -100,21 +103,37 @@ const useEmbeddedWallet = () => {
     };
     const createPassword = React.useCallback((showIntro) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const createEmbeddedWallet = React.useCallback((chain = sdkApi.ChainEnum.Evm) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         const decodedJwt = decodeJwt.decodeJwt(jwt);
         if (!jwt || !decodedJwt) {
             throw new Error('User is not logged in');
         }
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+        // if user has a wallet and it's not embedded, set it as primary and return,
+        if ((userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) && !embeddedWalletVerifiedCredential) {
+            if (!primaryWallet) {
+                // user logged in through an email linked to a third party wallet
+                // at this point primary wallet is still undefined and we need to set it
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
+            throw new Error('Primary wallet is not an embedded wallet');
+        }
         const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
         const isCoinbaseWaaSProviderEnabled = isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
         if (!isTurnkeyProviderEnabled && !isCoinbaseWaaSProviderEnabled) {
             throw new Error('No embedded wallet is enabled. Go to the dashboard and make sure to have both Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the DynamicContextProvider > settings > walletConnectors.');
         }
-        const hasEmbeddedWallet = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
         setIsLoadingEmbeddedWallet(true);
+        // since we can dynamically change the settings from demov2, we need to set
+        // requires password prop here in case the connector has already been initialized with a different value
+        const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        if (walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
+            connector.setRequiredPassword((_c = requiresPasswordForEmbeddedWallet.requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _c !== void 0 ? _c : false);
+        }
         let password;
-        if (!hasEmbeddedWallet &&
+        if (!embeddedWalletVerifiedCredential &&
             requiresPasswordForEmbeddedWalletOnSignup.requiresPasswordForEmbeddedWalletOnSignup(projectSettings)) {
             password = yield internalCreatePassword(false, true);
         }
@@ -134,8 +153,11 @@ const useEmbeddedWallet = () => {
         createTurnkeyWallet,
         internalCreatePassword,
         onboardingOnlyJwt,
+        primaryWallet,
         projectSettings,
         setIsLoadingEmbeddedWallet,
+        setPrimaryWalletId,
+        walletConnectorOptions,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -1,10 +1,10 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { ChainEnum } from '@dynamic-labs/sdk-api';
+import { isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
@@ -22,9 +22,12 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findE
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
+import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import 'viem/chains';
+import { findCoinbaseMPCWallet } from '../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.js';
+import { requiresPasswordForEmbeddedWallet } from '../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
 import { requiresPasswordForEmbeddedWalletOnSignup } from '../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.js';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../config/ApiEndpoint.js';
@@ -81,7 +84,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, primaryWallet, walletConnectorOptions, } = useInternalDynamicContext();
     const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword();
     const { createCoinbaseMPCWallet } = useCoinbaseMPC();
     const { createTurnkeyWallet } = useTurnkey();
@@ -96,21 +99,37 @@ const useEmbeddedWallet = () => {
     };
     const createPassword = useCallback((showIntro) => __awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const createEmbeddedWallet = useCallback((chain = ChainEnum.Evm) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
         const decodedJwt = decodeJwt(jwt);
         if (!jwt || !decodedJwt) {
             throw new Error('User is not logged in');
         }
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
+        // if user has a wallet and it's not embedded, set it as primary and return,
+        if ((userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) && !embeddedWalletVerifiedCredential) {
+            if (!primaryWallet) {
+                // user logged in through an email linked to a third party wallet
+                // at this point primary wallet is still undefined and we need to set it
+                setPrimaryWalletId(userWaletsCredentials[0].id);
+            }
+            throw new Error('Primary wallet is not an embedded wallet');
+        }
         const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
         const isCoinbaseWaaSProviderEnabled = isCoinbaseWaasEnabled(projectSettings);
         if (!isTurnkeyProviderEnabled && !isCoinbaseWaaSProviderEnabled) {
             throw new Error('No embedded wallet is enabled. Go to the dashboard and make sure to have both Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the DynamicContextProvider > settings > walletConnectors.');
         }
-        const hasEmbeddedWallet = findEmbeddedWalletFromVerifiedCredentials(jwt, chain);
         setIsLoadingEmbeddedWallet(true);
+        // since we can dynamically change the settings from demov2, we need to set
+        // requires password prop here in case the connector has already been initialized with a different value
+        const connector = (_b = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        if (isCoinbaseMpcWalletConnector(connector)) {
+            connector.setRequiredPassword((_c = requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _c !== void 0 ? _c : false);
+        }
         let password;
-        if (!hasEmbeddedWallet &&
+        if (!embeddedWalletVerifiedCredential &&
             requiresPasswordForEmbeddedWalletOnSignup(projectSettings)) {
             password = yield internalCreatePassword(false, true);
         }
@@ -130,8 +149,11 @@ const useEmbeddedWallet = () => {
         createTurnkeyWallet,
         internalCreatePassword,
         onboardingOnlyJwt,
+        primaryWallet,
         projectSettings,
         setIsLoadingEmbeddedWallet,
+        setPrimaryWalletId,
+        walletConnectorOptions,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -66,6 +66,7 @@ require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Secon
 require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../config/ApiEndpoint.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
@@ -96,7 +97,7 @@ const useEmbeddedWalletPassword = () => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreatePasswordFailed', (error) => reject(error));
         });
     }), [setShowAuthFlow, setView]);
-    const changePassword = React.useCallback((newPassword, oldPassword) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const claimWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         try {
             if (!primaryWallet) {
@@ -106,13 +107,13 @@ const useEmbeddedWalletPassword = () => {
             const refreshedToken = yield api.claimEmbeddedWallet({ environmentId, walletId: primaryWallet.id }, jwt);
             // if an error occurs while calling the api, the user won't be logged out
             if ('code' in refreshedToken) {
-                logger.logger.error('Error updating jwt after changing password');
+                logger.logger.error('Error updating jwt after claiming wallet');
                 return;
             }
             const updatedJwt = refreshedToken.jwt;
             const decodedJwt = decodeJwt.decodeJwt(updatedJwt);
             if (!decodedJwt) {
-                logger.logger.error('Error updating jwt after changing password');
+                logger.logger.error('Error updating jwt after claiming wallet');
                 return;
             }
             const user = createUserProfile.createUserProfile(decodedJwt);
@@ -120,12 +121,12 @@ const useEmbeddedWalletPassword = () => {
             setUser(user);
         }
         catch (error) {
-            logger.logger.error('Error changing password', error);
-            throw new Error('Error changing password');
+            logger.logger.error('Error claiming wallet', error);
+            throw new Error('Error claiming wallet');
         }
     }), [environmentId, onboardingOnlyJwt, primaryWallet, setUser]);
     return {
-        changePassword,
+        claimWallet,
         createPassword,
     };
 };

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

@@ -1,4 +1,4 @@
 export declare const useEmbeddedWalletPassword: () => {
-    readonly changePassword: (newPassword: string, oldPassword?: string) => Promise<void>;
+    readonly claimWallet: () => Promise<void>;
     readonly createPassword: (isClaim?: boolean, isSignUp?: boolean) => Promise<string>;
 };

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

@@ -62,6 +62,7 @@ import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Second
 import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../config/ApiEndpoint.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
@@ -92,7 +93,7 @@ const useEmbeddedWalletPassword = () => {
             dynamicEvents.once('embeddedWalletCreatePasswordFailed', (error) => reject(error));
         });
     }), [setShowAuthFlow, setView]);
-    const changePassword = useCallback((newPassword, oldPassword) => __awaiter(void 0, void 0, void 0, function* () {
+    const claimWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         try {
             if (!primaryWallet) {
@@ -102,13 +103,13 @@ const useEmbeddedWalletPassword = () => {
             const refreshedToken = yield claimEmbeddedWallet({ environmentId, walletId: primaryWallet.id }, jwt);
             // if an error occurs while calling the api, the user won't be logged out
             if ('code' in refreshedToken) {
-                logger.error('Error updating jwt after changing password');
+                logger.error('Error updating jwt after claiming wallet');
                 return;
             }
             const updatedJwt = refreshedToken.jwt;
             const decodedJwt = decodeJwt(updatedJwt);
             if (!decodedJwt) {
-                logger.error('Error updating jwt after changing password');
+                logger.error('Error updating jwt after claiming wallet');
                 return;
             }
             const user = createUserProfile(decodedJwt);
@@ -116,12 +117,12 @@ const useEmbeddedWalletPassword = () => {
             setUser(user);
         }
         catch (error) {
-            logger.error('Error changing password', error);
-            throw new Error('Error changing password');
+            logger.error('Error claiming wallet', error);
+            throw new Error('Error claiming wallet');
         }
     }), [environmentId, onboardingOnlyJwt, primaryWallet, setUser]);
     return {
-        changePassword,
+        claimWallet,
         createPassword,
     };
 };