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

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');
@@ -64,17 +67,17 @@ require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBa
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
-require('../../../views/WalletList/WalletList.cjs');
 require('formik');
 require('qrcode');
-require('@hcaptcha/react-hcaptcha');
-require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('i18next');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.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);
         }
@@ -123,6 +142,8 @@ const useEmbeddedWallet = () => {
             wallet = yield createCoinbaseMPCWallet(jwt, decodedJwt, chain, password);
         }
         else if (isTurnkeyProviderEnabled) {
+            // TEMP: immediately disable loading state
+            setIsLoadingEmbeddedWallet(false);
             wallet = yield createTurnkeyWallet(jwt, decodedJwt, chain);
         }
         setIsLoadingEmbeddedWallet(false);
@@ -132,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';
@@ -60,17 +63,17 @@ import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBan
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
-import '../../../views/WalletList/WalletList.js';
 import 'formik';
 import 'qrcode';
-import '@hcaptcha/react-hcaptcha';
-import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import 'i18next';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.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);
         }
@@ -119,6 +138,8 @@ const useEmbeddedWallet = () => {
             wallet = yield createCoinbaseMPCWallet(jwt, decodedJwt, chain, password);
         }
         else if (isTurnkeyProviderEnabled) {
+            // TEMP: immediately disable loading state
+            setIsLoadingEmbeddedWallet(false);
             wallet = yield createTurnkeyWallet(jwt, decodedJwt, chain);
         }
         setIsLoadingEmbeddedWallet(false);
@@ -128,8 +149,11 @@ const useEmbeddedWallet = () => {
         createTurnkeyWallet,
         internalCreatePassword,
         onboardingOnlyJwt,
+        primaryWallet,
         projectSettings,
         setIsLoadingEmbeddedWallet,
+        setPrimaryWalletId,
+        walletConnectorOptions,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -25,10 +25,10 @@ require('../../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
-require('../../../../config/ApiEndpoint.cjs');
 require('react-international-phone');
 var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 require('viem/chains');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
@@ -60,17 +60,17 @@ require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSucces
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
-require('../../../../views/WalletList/WalletList.cjs');
 require('formik');
 require('qrcode');
-require('@hcaptcha/react-hcaptcha');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../../views/WalletList/WalletList.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('i18next');
+require('@hcaptcha/react-hcaptcha');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
+require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');

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

@@ -21,10 +21,10 @@ import '../../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWallet } from '../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
-import '../../../../config/ApiEndpoint.js';
 import 'react-international-phone';
 import { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import 'viem/chains';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
@@ -56,17 +56,17 @@ import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccess
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
-import '../../../../views/WalletList/WalletList.js';
 import 'formik';
 import 'qrcode';
-import '@hcaptcha/react-hcaptcha';
-import '../../../../context/LoadingContext/LoadingContext.js';
+import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import 'i18next';
+import '@hcaptcha/react-hcaptcha';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.js';
+import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';

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

@@ -4,28 +4,30 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var sdkApi = require('@dynamic-labs/sdk-api');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-var logger = require('../../../shared/logger.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');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
+var index = require('../../functions/storeAuthToken/index.cjs');
 require('viem/chains');
-var updateUserInfo = require('../../functions/updateUserInfo/updateUserInfo.cjs');
 var api = require('../../../data/api.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -56,17 +58,18 @@ require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBa
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
-require('../../../views/WalletList/WalletList.cjs');
 require('formik');
 require('qrcode');
-require('@hcaptcha/react-hcaptcha');
-require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 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');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -80,59 +83,50 @@ const useEmbeddedWalletPassword = () => {
     const { setView } = ViewContext.useViewContext();
     const createPassword = React.useCallback((isClaim, isSignUp) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setShowAuthFlow(true, { ignoreIfIsEmbeddedWidget: false });
-        // TODO: remove comment when views are added
-        // if (isClaim) {
-        //   setView('wallet-claim-intro');
-        // } else {
-        //   setView('create-password-view', {
-        //     isSignUp,
-        //     notCalledFromWalletUtils: true,
-        //   });
-        // }
+        if (isClaim) {
+            setView('wallet-claim-intro');
+        }
+        else {
+            setView('create-password-view', {
+                isSignUp,
+                notCalledFromWalletUtils: true,
+            });
+        }
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreatePasswordCompleted', (password) => resolve(password));
             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) {
                 throw new Error('No primary wallet');
             }
             const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-            yield api.updateEmbeddedWalletPasscode({
-                // set currentPasscode to undefined if oldPassword is null or empty
-                currentPasscode: oldPassword || undefined,
-                environmentId,
-                passcode: newPassword,
-                source: sdkApi.PasswordSourceTypeEnum.User,
-                walletId: primaryWallet.id,
-            }, jwt);
-            const refreshedToken = yield api.refreshAuth({
-                environmentId,
-                userJwt: jwt,
-            });
+            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 user = yield updateUserInfo.updateUserInfo(updatedJwt);
-            if (!user) {
-                logger.logger.error('Error updating jwt after changing password');
+            const decodedJwt = decodeJwt.decodeJwt(updatedJwt);
+            if (!decodedJwt) {
+                logger.logger.error('Error updating jwt after claiming wallet');
                 return;
             }
+            const user = createUserProfile.createUserProfile(decodedJwt);
+            index.storeAuthToken(updatedJwt);
             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

@@ -1,28 +1,30 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { PasswordSourceTypeEnum } from '@dynamic-labs/sdk-api';
 import '../../../context/DynamicContext/DynamicContext.js';
-import { logger } from '../../../shared/logger.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 { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
+import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import 'viem/chains';
-import { updateUserInfo } from '../../functions/updateUserInfo/updateUserInfo.js';
-import { updateEmbeddedWalletPasscode, refreshAuth } from '../../../data/api.js';
+import { claimEmbeddedWallet } from '../../../data/api.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
@@ -52,17 +54,18 @@ import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBan
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
-import '../../../views/WalletList/WalletList.js';
 import 'formik';
 import 'qrcode';
-import '@hcaptcha/react-hcaptcha';
-import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 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';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -76,59 +79,50 @@ const useEmbeddedWalletPassword = () => {
     const { setView } = useViewContext();
     const createPassword = useCallback((isClaim, isSignUp) => __awaiter(void 0, void 0, void 0, function* () {
         setShowAuthFlow(true, { ignoreIfIsEmbeddedWidget: false });
-        // TODO: remove comment when views are added
-        // if (isClaim) {
-        //   setView('wallet-claim-intro');
-        // } else {
-        //   setView('create-password-view', {
-        //     isSignUp,
-        //     notCalledFromWalletUtils: true,
-        //   });
-        // }
+        if (isClaim) {
+            setView('wallet-claim-intro');
+        }
+        else {
+            setView('create-password-view', {
+                isSignUp,
+                notCalledFromWalletUtils: true,
+            });
+        }
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreatePasswordCompleted', (password) => resolve(password));
             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) {
                 throw new Error('No primary wallet');
             }
             const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-            yield updateEmbeddedWalletPasscode({
-                // set currentPasscode to undefined if oldPassword is null or empty
-                currentPasscode: oldPassword || undefined,
-                environmentId,
-                passcode: newPassword,
-                source: PasswordSourceTypeEnum.User,
-                walletId: primaryWallet.id,
-            }, jwt);
-            const refreshedToken = yield refreshAuth({
-                environmentId,
-                userJwt: jwt,
-            });
+            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 user = yield updateUserInfo(updatedJwt);
-            if (!user) {
-                logger.error('Error updating jwt after changing password');
+            const decodedJwt = decodeJwt(updatedJwt);
+            if (!decodedJwt) {
+                logger.error('Error updating jwt after claiming wallet');
                 return;
             }
+            const user = createUserProfile(decodedJwt);
+            storeAuthToken(updatedJwt);
             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,
     };
 };