@dynamic-labs/sdk-react-core 0.19.0-alpha.0 → 0.19.0-alpha.2

package/src/lib/context/SendBalanceContext/SendBalanceContext.js

@@ -37,9 +37,13 @@ import 'yup';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { SendBalanceModal } from '../../modals/SendBalanceModal/SendBalanceModal.js';
+import '../../views/CollectUserDataView/fieldsConfig.js';
 import '../MockContext/MockContext.js';
 import '../CaptchaContext/CaptchaContext.js';
-import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import '../EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../UserFieldEditorContext/UserFieldEditorContext.js';
 import { noWalletError, invalidWalletTypeError } from './SendBalanceContext.errors.js';
 
 const sendBalanceContext = createContext(undefined);

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.cjs

@@ -38,15 +38,19 @@ require('formik');
 require('yup');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
-var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
+require('../../views/CollectUserDataView/fieldsConfig.cjs');
 require('../MockContext/MockContext.cjs');
+var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
 require('../CaptchaContext/CaptchaContext.cjs');
-require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+require('../EmailVerificationContext/EmailVerificationContext.cjs');
+require('@dynamic-labs/types');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../UserFieldEditorContext/UserFieldEditorContext.cjs');
 
 const SocialRedirectContext = React.createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -139,6 +143,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     }
                 }
                 else {
+                    yield connectWallet(socialWalletConnector);
                     const address = yield socialWalletConnector.fetchPublicAddress();
                     walletUiUtils.disabledConfirmationOnce();
                     yield verifyWallet({

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.js

@@ -34,15 +34,19 @@ import 'formik';
 import 'yup';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
-import { useErrorContext } from '../ErrorContext/ErrorContext.js';
+import '../../views/CollectUserDataView/fieldsConfig.js';
 import '../MockContext/MockContext.js';
+import { useErrorContext } from '../ErrorContext/ErrorContext.js';
 import '../CaptchaContext/CaptchaContext.js';
-import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import '../EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../UserFieldEditorContext/UserFieldEditorContext.js';
 
 const SocialRedirectContext = createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
     const verifyWallet = useVerifyWallet({
@@ -135,6 +139,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     }
                 }
                 else {
+                    yield connectWallet(socialWalletConnector);
                     const address = yield socialWalletConnector.fetchPublicAddress();
                     walletUiUtils.disabledConfirmationOnce();
                     yield verifyWallet({

package/src/lib/context/UserFieldEditorContext/UserFieldEditorContext.cjs

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../_virtual/_tslib.cjs');
+var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
+var UserFieldEditorModal = require('../../modals/UserFieldEditorModal/UserFieldEditorModal.cjs');
+require('@dynamic-labs/utils');
+require('@dynamic-labs/sdk-api');
+require('../../config/ApiEndpoint.cjs');
+require('../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('../ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../utils/constants/colors.cjs');
+require('../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/rpc-providers');
+require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
+require('../DynamicContext/DynamicContext.cjs');
+require('../ErrorContext/ErrorContext.cjs');
+require('../AccessDeniedContext/AccessDeniedContext.cjs');
+require('../AccountExistsContext/AccountExistsContext.cjs');
+var useConfirmationModal = require('../../utils/hooks/useConfirmationModal/useConfirmationModal.cjs');
+require('../../components/ShadowDOM/ShadowDOM.cjs');
+require('../ThemeContext/ThemeContext.cjs');
+require('react-dom');
+require('react-focus-lock');
+require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../components/IconButton/IconButton.cjs');
+require('../../components/Alert/Alert.cjs');
+require('../../components/Popper/Popper/Popper.cjs');
+require('../../components/Popper/PopperContext/PopperContext.cjs');
+require('formik');
+require('yup');
+require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../MockContext/MockContext.cjs');
+require('../CaptchaContext/CaptchaContext.cjs');
+require('../EmailVerificationContext/EmailVerificationContext.cjs');
+require('@dynamic-labs/types');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../views/CollectUserDataView/fieldsConfig.cjs');
+
+const UserFieldEditorContext = React.createContext(undefined);
+const UserFieldEditorContextProvider = ({ children, }) => {
+    const { modal, open } = useConfirmationModal.useConfirmationModal({
+        elementId: 'dynamic-edit-user-field',
+    });
+    /** Links the modal's actions to "open"'s resolve and reject */
+    const openUserFieldEditor = React.useCallback((modalProps, applyChanges) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        return open((resolve, reject) => {
+            const onSubmit = (fields) => applyChanges(fields).then((result) => resolve({ fields, updateUserResult: result }));
+            return (jsxRuntime.jsx(UserFieldEditorModal.UserFieldEditorModal, { fields: modalProps.fields, submitText: modalProps.submitText, title: modalProps.title, subtitle: modalProps.subtitle, onCancel: reject, onSubmit: onSubmit }));
+        });
+    }), [open]);
+    return (jsxRuntime.jsxs(UserFieldEditorContext.Provider, Object.assign({ value: { open: openUserFieldEditor } }, { children: [modal, children] })));
+};
+
+exports.UserFieldEditorContext = UserFieldEditorContext;
+exports.UserFieldEditorContextProvider = UserFieldEditorContextProvider;

package/src/lib/context/UserFieldEditorContext/UserFieldEditorContext.d.ts

@@ -0,0 +1,14 @@
+import { FC, PropsWithChildren } from 'react';
+import { UserFields } from '@dynamic-labs/sdk-api';
+import { UserFieldEditorModalProps } from '../../modals/UserFieldEditorModal';
+import { UpdateUserReturnPayload } from '../../utils/hooks/useUserUpdateRequest/useUpdateUser';
+type ModalPropsType = Omit<UserFieldEditorModalProps, 'onCancel' | 'onSubmit'>;
+export type ModalReturn = {
+    fields: UserFields;
+    updateUserResult: UpdateUserReturnPayload;
+};
+export declare const UserFieldEditorContext: import("react").Context<{
+    open: (modalProps: ModalPropsType, applyChanges: (fields: UserFields) => Promise<UpdateUserReturnPayload>) => Promise<ModalReturn>;
+} | undefined>;
+export declare const UserFieldEditorContextProvider: FC<PropsWithChildren>;
+export {};

package/src/lib/context/UserFieldEditorContext/UserFieldEditorContext.js

@@ -0,0 +1,62 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { createContext, useCallback } from 'react';
+import { UserFieldEditorModal } from '../../modals/UserFieldEditorModal/UserFieldEditorModal.js';
+import '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api';
+import '../../config/ApiEndpoint.js';
+import '../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import '../ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../utils/constants/colors.js';
+import '../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/rpc-providers';
+import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
+import '../DynamicContext/DynamicContext.js';
+import '../ErrorContext/ErrorContext.js';
+import '../AccessDeniedContext/AccessDeniedContext.js';
+import '../AccountExistsContext/AccountExistsContext.js';
+import { useConfirmationModal } from '../../utils/hooks/useConfirmationModal/useConfirmationModal.js';
+import '../../components/ShadowDOM/ShadowDOM.js';
+import '../ThemeContext/ThemeContext.js';
+import 'react-dom';
+import 'react-focus-lock';
+import '../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../components/IconButton/IconButton.js';
+import '../../components/Alert/Alert.js';
+import '../../components/Popper/Popper/Popper.js';
+import '../../components/Popper/PopperContext/PopperContext.js';
+import 'formik';
+import 'yup';
+import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/MenuList/Dropdown/Dropdown.js';
+import '../MockContext/MockContext.js';
+import '../CaptchaContext/CaptchaContext.js';
+import '../EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../views/CollectUserDataView/fieldsConfig.js';
+
+const UserFieldEditorContext = createContext(undefined);
+const UserFieldEditorContextProvider = ({ children, }) => {
+    const { modal, open } = useConfirmationModal({
+        elementId: 'dynamic-edit-user-field',
+    });
+    /** Links the modal's actions to "open"'s resolve and reject */
+    const openUserFieldEditor = useCallback((modalProps, applyChanges) => __awaiter(void 0, void 0, void 0, function* () {
+        return open((resolve, reject) => {
+            const onSubmit = (fields) => applyChanges(fields).then((result) => resolve({ fields, updateUserResult: result }));
+            return (jsx(UserFieldEditorModal, { fields: modalProps.fields, submitText: modalProps.submitText, title: modalProps.title, subtitle: modalProps.subtitle, onCancel: reject, onSubmit: onSubmit }));
+        });
+    }), [open]);
+    return (jsxs(UserFieldEditorContext.Provider, Object.assign({ value: { open: openUserFieldEditor } }, { children: [modal, children] })));
+};
+
+export { UserFieldEditorContext, UserFieldEditorContextProvider };

package/src/lib/context/UserFieldEditorContext/index.d.ts

@@ -0,0 +1 @@
+export * from './UserFieldEditorContext';

package/src/lib/context/ViewContext/ViewContext.d.ts

@@ -1,5 +1,5 @@
 import { SetStateAction, Dispatch, PropsWithChildren, FC } from 'react';
-export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists';
+export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'wallet-cannot-be-transferred';
 export type ViewContextProps = {
     setView: Dispatch<SetStateAction<ViewType>>;
     view: ViewType;

package/src/lib/context/WalletContext/WalletContext.cjs

@@ -22,6 +22,7 @@ require('../../config/ApiEndpoint.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../AccountExistsContext/AccountExistsContext.cjs');
 require('../CaptchaContext/CaptchaContext.cjs');
+require('../EmailVerificationContext/EmailVerificationContext.cjs');
 var useSyncPrimaryWallet = require('../../utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs');
 
 const WalletContext = React.createContext(undefined);

package/src/lib/context/WalletContext/WalletContext.js

@@ -18,6 +18,7 @@ import '../../config/ApiEndpoint.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
 import '../AccountExistsContext/AccountExistsContext.js';
 import '../CaptchaContext/CaptchaContext.js';
+import '../EmailVerificationContext/EmailVerificationContext.js';
 import { useSyncPrimaryWallet } from '../../utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js';
 
 const WalletContext = createContext(undefined);

package/src/lib/data/api.cjs

@@ -128,6 +128,9 @@ const verifyEmail = ({ verificationToken, verificationUUID, environmentId, }, us
     catch (e) {
         const data = yield e.json();
         logger.logger.error(data.error);
+        if (data.code === sdkApi$1.UnprocessableEntityErrorCode.UserHasAlreadyAccountWithEmail) {
+            throw new utils.UserHasAccountWithEmailError(data.error);
+        }
         throw new utils.EmailVerificationError(data.code);
     }
 });
@@ -336,9 +339,24 @@ const updateUserProfileFields = (jwt, environmentId, fields) => _tslib.__awaiter
         throw e;
     }
 });
-const verifyOAuth = (environmentId, providerType, { code }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getOauthLoginUrl = (environmentId, providerType, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { url } = yield sdkApi(userJwt).oauthLoginUrl({
+            environmentId,
+            providerType,
+        });
+        return url;
+    }
+    catch (e) {
+        logger.logger.error(e);
+        return undefined;
+    }
+});
+const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const oauthRequest = {
         code,
+        codeVerifier,
+        state,
     };
     try {
         const { jwt } = yield sdkApi(userJwt).oauthVerify({
@@ -396,6 +414,18 @@ const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(voi
     catch (e) {
         logger.logger.error(e);
     }
+});
+const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { jwt } = yield sdkApi(userJwt).mergeUsers({
+            environmentId,
+        });
+        return jwt;
+    }
+    catch (e) {
+        logger.logger.error(e);
+        throw e;
+    }
 });
 
 exports.createEmailVerification = createEmailVerification;
@@ -404,11 +434,13 @@ exports.fetchNetworkSettings = fetchNetworkSettings;
 exports.fetchNonce = fetchNonce;
 exports.fetchProjectSettings = fetchProjectSettings;
 exports.getEmailProvider = getEmailProvider;
+exports.getOauthLoginUrl = getOauthLoginUrl;
 exports.getOnrampProviders = getOnrampProviders;
 exports.linkWallet = linkWallet;
 exports.mapAuthModeTypeToEnum = mapAuthModeTypeToEnum;
 exports.mapChainToChainEnum = mapChainToChainEnum;
 exports.mapProviderToProviderEnum = mapProviderToProviderEnum;
+exports.mergeUserAccounts = mergeUserAccounts;
 exports.retryEmailVerification = retryEmailVerification;
 exports.revokeSession = revokeSession;
 exports.sendDynamicProps = sendDynamicProps;

package/src/lib/data/api.d.ts

@@ -50,7 +50,8 @@ export declare const verifyWallet: (environmentId: string, { messageToSign, sign
 export declare const fetchNetworkSettings: (environmentId: string) => Promise<NetworkConfigurationResponse[] | undefined>;
 export declare const fetchProjectSettings: (environmentId: string) => Promise<ProjectSettings | undefined>;
 export declare const updateUserProfileFields: (jwt: string | undefined, environmentId: string, fields: UserFields) => Promise<UpdateSelfResponse>;
-export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code }: OauthRequest, userJwt: string) => Promise<string | undefined>;
+export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum, userJwt: string) => Promise<string | undefined>;
+export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest, userJwt: string) => Promise<string | undefined>;
 export declare const unlinkOAuth: ({ environmentId, verifiedCrentialId, }: {
     environmentId: string;
     verifiedCrentialId: string;
@@ -66,3 +67,4 @@ export declare const sendDynamicProps: (environmentId: string, settingsToSend: {
     dynamicContextProps?: object;
     dynamicWagmiSettings?: object;
 }) => Promise<void>;
+export declare const mergeUserAccounts: (userJwt: string, environmentId: string) => Promise<string | undefined>;

package/src/lib/data/api.js

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
-import { NoAccessError, AccountExistsError, EmailVerificationError, DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, EmailProviderError, WalletUsedError, WalletNotDeployedError, ChainalysisError, GateBlockedError } from '@dynamic-labs/utils';
-import { SDKApi, Configuration, VerifyRequestFromJSON, ChainEnum, WalletProviderEnum, AuthModeEnum } from '@dynamic-labs/sdk-api';
+import { NoAccessError, AccountExistsError, EmailVerificationError, UserHasAccountWithEmailError, DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, EmailProviderError, WalletUsedError, WalletNotDeployedError, ChainalysisError, GateBlockedError } from '@dynamic-labs/utils';
+import { UnprocessableEntityErrorCode, SDKApi, Configuration, VerifyRequestFromJSON, ChainEnum, WalletProviderEnum, AuthModeEnum } from '@dynamic-labs/sdk-api';
 import { VERSION, API_VERSION } from '../../version.js';
 import ApiEndpoint from '../config/ApiEndpoint.js';
 import { logger } from '../shared/logger.js';
@@ -124,6 +124,9 @@ const verifyEmail = ({ verificationToken, verificationUUID, environmentId, }, us
     catch (e) {
         const data = yield e.json();
         logger.error(data.error);
+        if (data.code === UnprocessableEntityErrorCode.UserHasAlreadyAccountWithEmail) {
+            throw new UserHasAccountWithEmailError(data.error);
+        }
         throw new EmailVerificationError(data.code);
     }
 });
@@ -332,9 +335,24 @@ const updateUserProfileFields = (jwt, environmentId, fields) => __awaiter(void 0
         throw e;
     }
 });
-const verifyOAuth = (environmentId, providerType, { code }, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
+const getOauthLoginUrl = (environmentId, providerType, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { url } = yield sdkApi(userJwt).oauthLoginUrl({
+            environmentId,
+            providerType,
+        });
+        return url;
+    }
+    catch (e) {
+        logger.error(e);
+        return undefined;
+    }
+});
+const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state }, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
     const oauthRequest = {
         code,
+        codeVerifier,
+        state,
     };
     try {
         const { jwt } = yield sdkApi(userJwt).oauthVerify({
@@ -392,6 +410,18 @@ const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, vo
     catch (e) {
         logger.error(e);
     }
+});
+const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { jwt } = yield sdkApi(userJwt).mergeUsers({
+            environmentId,
+        });
+        return jwt;
+    }
+    catch (e) {
+        logger.error(e);
+        throw e;
+    }
 });
 
-export { createEmailVerification, createVisit, fetchNetworkSettings, fetchNonce, fetchProjectSettings, getEmailProvider, getOnrampProviders, linkWallet, mapAuthModeTypeToEnum, mapChainToChainEnum, mapProviderToProviderEnum, retryEmailVerification, revokeSession, sendDynamicProps, signInWithEmailVerification, transferWallet, unlinkOAuth, unlinkWallet, updateUserProfileFields, verifyEmail, verifyOAuth, verifyWallet };
+export { createEmailVerification, createVisit, fetchNetworkSettings, fetchNonce, fetchProjectSettings, getEmailProvider, getOauthLoginUrl, getOnrampProviders, linkWallet, mapAuthModeTypeToEnum, mapChainToChainEnum, mapProviderToProviderEnum, mergeUserAccounts, retryEmailVerification, revokeSession, sendDynamicProps, signInWithEmailVerification, transferWallet, unlinkOAuth, unlinkWallet, updateUserProfileFields, verifyEmail, verifyOAuth, verifyWallet };

package/src/lib/layout/DynamicAuthLayout/DynamicAuthLayout.cjs

@@ -34,15 +34,19 @@ require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/Alert/Alert.cjs');
+require('formik');
+require('yup');
+require('../../views/CollectUserDataView/fieldsConfig.cjs');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+require('../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('@dynamic-labs/types');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 var VerticalAccordion = require('../../components/Accordion/components/VerticalAccordion/VerticalAccordion.cjs');
 var AccordionItem = require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
-require('formik');
-require('yup');
 var Modal = require('../../components/Modal/Modal.cjs');
 var ModalCard = require('../../components/ModalCard/ModalCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');

package/src/lib/layout/DynamicAuthLayout/DynamicAuthLayout.js

@@ -30,15 +30,19 @@ import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/Alert/Alert.js';
+import 'formik';
+import 'yup';
+import '../../views/CollectUserDataView/fieldsConfig.js';
 import '../../context/MockContext/MockContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
-import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import '../../context/EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { VerticalAccordion } from '../../components/Accordion/components/VerticalAccordion/VerticalAccordion.js';
 import { AccordionItem } from '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
-import 'formik';
-import 'yup';
 import { Modal } from '../../components/Modal/Modal.js';
 import { ModalCard } from '../../components/ModalCard/ModalCard.js';
 import '../../components/InlineWidget/InlineWidget.js';

package/src/lib/layout/DynamicAuthLayout/Header/header.cjs

@@ -32,21 +32,25 @@ require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs'
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
+var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var ModalHeader = require('../../../components/ModalHeader/ModalHeader.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/Alert/Alert.cjs');
 var Skeleton = require('../../../components/Skeleton/Skeleton.cjs');
+require('formik');
+require('yup');
+require('../../../views/CollectUserDataView/fieldsConfig.cjs');
 require('../../../context/MockContext/MockContext.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 var Tooltip = require('../../../components/Tooltip/Tooltip.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('@dynamic-labs/types');
+require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('formik');
-require('yup');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 var QrCodeContext = require('../../../context/QrCodeContext/QrCodeContext.cjs');
@@ -55,6 +59,7 @@ var index = require('../../../context/FooterAnimationContext/index.cjs');
 
 const Header = ({ onClose: handleClose, heading, projectSettings, walletConnector, }) => {
     const { clearStatesOnBackClick, selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setError } = ErrorContext.useErrorContext();
     const { setShowQrCodeImage } = QrCodeContext.useQrCodeContext();
     const { isFooterExpanded, setIsFooterExpanded } = index.useFooterAnimationContext();
     const { view, goToInitialView } = ViewContext.useViewContext();
@@ -63,11 +68,18 @@ const Header = ({ onClose: handleClose, heading, projectSettings, walletConnecto
     const handleBackClick = React.useCallback(() => {
         goToInitialView();
         setExistentAccountData(undefined);
+        setError(undefined);
         // on back button click in Coinbase wallet clearing state would kill connection and refresh the page
         if ((selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name) !== 'Coinbase') {
             clearStatesOnBackClick();
         }
-    }, [clearStatesOnBackClick, selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name, goToInitialView]);
+    }, [
+        goToInitialView,
+        setExistentAccountData,
+        setError,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        clearStatesOnBackClick,
+    ]);
     const leadingButtons = React.useMemo(() => {
         let buttons = [];
         if (showBackButton) {

package/src/lib/layout/DynamicAuthLayout/Header/header.js

@@ -28,21 +28,25 @@ import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import '../../../context/ErrorContext/ErrorContext.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { ModalHeader } from '../../../components/ModalHeader/ModalHeader.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/Alert/Alert.js';
 import { Skeleton } from '../../../components/Skeleton/Skeleton.js';
+import 'formik';
+import 'yup';
+import '../../../views/CollectUserDataView/fieldsConfig.js';
 import '../../../context/MockContext/MockContext.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 import { Tooltip } from '../../../components/Tooltip/Tooltip.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
-import 'formik';
-import 'yup';
 import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
 import { useQrCodeContext } from '../../../context/QrCodeContext/QrCodeContext.js';
@@ -51,6 +55,7 @@ import { useFooterAnimationContext } from '../../../context/FooterAnimationConte
 
 const Header = ({ onClose: handleClose, heading, projectSettings, walletConnector, }) => {
     const { clearStatesOnBackClick, selectedWalletConnector } = useInternalDynamicContext();
+    const { setError } = useErrorContext();
     const { setShowQrCodeImage } = useQrCodeContext();
     const { isFooterExpanded, setIsFooterExpanded } = useFooterAnimationContext();
     const { view, goToInitialView } = useViewContext();
@@ -59,11 +64,18 @@ const Header = ({ onClose: handleClose, heading, projectSettings, walletConnecto
     const handleBackClick = useCallback(() => {
         goToInitialView();
         setExistentAccountData(undefined);
+        setError(undefined);
         // on back button click in Coinbase wallet clearing state would kill connection and refresh the page
         if ((selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name) !== 'Coinbase') {
             clearStatesOnBackClick();
         }
-    }, [clearStatesOnBackClick, selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name, goToInitialView]);
+    }, [
+        goToInitialView,
+        setExistentAccountData,
+        setError,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        clearStatesOnBackClick,
+    ]);
     const leadingButtons = useMemo(() => {
         let buttons = [];
         if (showBackButton) {

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpHeader/HelpHeader.cjs

@@ -35,13 +35,17 @@ require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var ModalHeader = require('../../../../components/ModalHeader/ModalHeader.cjs');
 var IconButton = require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/Alert/Alert.cjs');
+require('formik');
+require('yup');
+require('../../../../views/CollectUserDataView/fieldsConfig.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('@dynamic-labs/types');
+require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
-require('formik');
-require('yup');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 var index = require('../../../../context/FooterAnimationContext/index.cjs');

package/src/lib/layout/DynamicAuthLayout/HelpContent/HelpHeader/HelpHeader.js

@@ -31,13 +31,17 @@ import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';
 import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import '../../../../components/Alert/Alert.js';
+import 'formik';
+import 'yup';
+import '../../../../views/CollectUserDataView/fieldsConfig.js';
 import '../../../../context/MockContext/MockContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import '@dynamic-labs/types';
+import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
-import 'formik';
-import 'yup';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import { useFooterAnimationContext } from '../../../../context/FooterAnimationContext/index.js';