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

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.cjs

@@ -78,7 +78,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 var Select = require('../../../../components/Select/Select.cjs');
 
-const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
+const UserField = ({ fieldData: { key, label, type, autoComplete }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
     if (name === 'tShirtSize') {
         return (jsxRuntime.jsx(formik.Field, { copykey: key, as: Select.Select, type: type, id: name, name: name, label: label, error: errors[name] && touched[name], selectDataTestId: 'tShirtSizeSelect', message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]), disabled: disabled, children: index.tShirtSizes.map((size) => (jsxRuntime.jsx("option", { value: size, children: size }, size))) }, name));
     }
@@ -94,10 +94,10 @@ const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled,
     else if (name === 'phoneNumber') {
         return (jsxRuntime.jsx(formik.Field, { name: name, as: UserPhoneField.UserPhoneField, disabled: disabled, label: label, required: required, error: touched[name] && errors[name]
                 ? getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name])
-                : undefined, verify: verify }, name));
+                : undefined, verify: verify, autoComplete: autoComplete }, name));
     }
     else {
-        return (jsxRuntime.jsx(formik.Field, { copykey: key, disabled: disabled, as: Input.Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]) }, name));
+        return (jsxRuntime.jsx(formik.Field, { copykey: key, disabled: disabled, as: Input.Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage.getDisplayErrorMessage(label, errors[name]), autoComplete: autoComplete }, name));
     }
 };
 

package/src/lib/views/CollectUserDataView/UserDataFields/UserField/UserField.js

@@ -74,7 +74,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import { Select } from '../../../../components/Select/Select.js';
 
-const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
+const UserField = ({ fieldData: { key, label, type, autoComplete }, fieldSettings: { enabled, name, required, verify }, errors, touched, disabled, policiesConsentInnerComponentArray, }) => {
     if (name === 'tShirtSize') {
         return (jsx(Field, { copykey: key, as: Select, type: type, id: name, name: name, label: label, error: errors[name] && touched[name], selectDataTestId: 'tShirtSizeSelect', message: touched[name] && getDisplayErrorMessage(label, errors[name]), disabled: disabled, children: tShirtSizes.map((size) => (jsx("option", { value: size, children: size }, size))) }, name));
     }
@@ -90,10 +90,10 @@ const UserField = ({ fieldData: { key, label, type }, fieldSettings: { enabled,
     else if (name === 'phoneNumber') {
         return (jsx(Field, { name: name, as: UserPhoneField, disabled: disabled, label: label, required: required, error: touched[name] && errors[name]
                 ? getDisplayErrorMessage(label, errors[name])
-                : undefined, verify: verify }, name));
+                : undefined, verify: verify, autoComplete: autoComplete }, name));
     }
     else {
-        return (jsx(Field, { copykey: key, disabled: disabled, as: Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage(label, errors[name]) }, name));
+        return (jsx(Field, { copykey: key, disabled: disabled, as: Input, type: type, id: name, name: name, label: label, optional: enabled && !required, error: errors[name] && touched[name], message: touched[name] && getDisplayErrorMessage(label, errors[name]), autoComplete: autoComplete }, name));
     }
 };
 

package/src/lib/views/CollectUserDataView/useFields.cjs

@@ -46,6 +46,7 @@ const useFields = () => {
             validation: yup.string().oneOf(index.countryCodes.map((c) => c.code)),
         },
         email: {
+            autoComplete: 'email',
             key: 'dyn_collect_user_data.fields.email.label',
             label: t('dyn_collect_user_data.fields.email.label'),
             type: 'email',

package/src/lib/views/CollectUserDataView/useFields.d.ts

@@ -4,6 +4,7 @@ export type FieldConfig = {
     key: string;
     type: string;
     validation: StringSchema | BooleanSchema;
+    autoComplete?: string;
 };
 export declare const useFields: () => {
     fieldsConfig: {
@@ -20,6 +21,7 @@ export declare const useFields: () => {
             validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         email: {
+            autoComplete: string;
             key: string;
             label: string;
             type: string;

package/src/lib/views/CollectUserDataView/useFields.js

@@ -42,6 +42,7 @@ const useFields = () => {
             validation: string().oneOf(countryCodes.map((c) => c.code)),
         },
         email: {
+            autoComplete: 'email',
             key: 'dyn_collect_user_data.fields.email.label',
             label: t('dyn_collect_user_data.fields.email.label'),
             type: 'email',

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -27,6 +27,7 @@ require('../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../context/ErrorContext/ErrorContext.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var shortenEmail = require('../../shared/utils/functions/shortenEmail/shortenEmail.cjs');
@@ -100,7 +101,7 @@ require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = React.useState(_showTransferMessage);
     const { handleVerifiedUserWithJWT } = useHandleVerifiedUser.useHandleVerifiedUser();
@@ -135,7 +136,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const handleComplete = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
+        var _g, _h, _j, _k, _l, _m, _o;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -172,16 +173,41 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             if (isTurnkeyWallet &&
                 hasTurnkeyVerifiedCredentialAuthenticator &&
                 !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+                ((_g = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _g === void 0 ? void 0 : _g.email)) {
                 setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
                 yield addRecoveryEmail(updateUserProfileResponse.user.email);
                 setShowAuthFlow(false);
                 return;
             }
-            if (isTurnkeyProviderEnabled &&
-                !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
-                setShowAuthFlow(false);
-                return;
+            if (isTurnkeyProviderEnabled) {
+                const isManualMode = !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation);
+                const isUsingPregeneratedWallets = Boolean(((_l = (_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _k === void 0 ? void 0 : _k.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) &&
+                    !((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.forceAuthenticatorAtSignup));
+                if (isUsingPregeneratedWallets) {
+                    // Pregenerated wallet was created during an
+                    // additional email validation step as part of onboarding
+                    // cannot rely on newUser JWT field here due to session being counted twice
+                    // when authentication happens followed by a separate email kyc step
+                    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(updateUserProfileResponse.jwt);
+                    if (!embeddedWalletVerifiedCredential) {
+                        throw new Error('Could not find an embedded wallet');
+                    }
+                    const wallet = {
+                        address: embeddedWalletVerifiedCredential.address,
+                        authenticated: false,
+                        chain: embeddedWalletVerifiedCredential.chain,
+                        connected: true,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        connector: undefined,
+                        id: embeddedWalletVerifiedCredential.id,
+                    };
+                    dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                }
+                if (isUsingPregeneratedWallets || isManualMode) {
+                    setShowAuthFlow(false);
+                    return;
+                }
             }
             // this function will check turnkey wallet enabled and create wallet if needed
             // if not enabled, it will throw an error.
@@ -217,7 +243,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         hasTurnkeyVerifiedCredentialAuthenticator,
         hasRecoveryEmail,
         isTurnkeyProviderEnabled,
-        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,
@@ -226,10 +251,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setUser,
         addRecoveryEmail,
         setShowAuthFlow,
+        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
+        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup,
         setErrorMessage,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _p, _q;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -264,7 +291,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation)) {
+                !((_q = (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _p === void 0 ? void 0 : _p.embeddedWallets) === null || _q === void 0 ? void 0 : _q.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 return;
             }
@@ -297,7 +324,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
-        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation,
+        (_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -23,6 +23,7 @@ import '../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../context/ErrorContext/ErrorContext.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { shortenEmail } from '../../shared/utils/functions/shortenEmail/shortenEmail.js';
@@ -96,7 +97,7 @@ import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.
 const SECONDS_TO_RETRY = 15;
 const sleepToShowSuccessMessage = () => sleep(1500);
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = useState(_showTransferMessage);
     const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
@@ -131,7 +132,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const handleComplete = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g;
+        var _g, _h, _j, _k, _l, _m, _o;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID || (!authToken && !onboardingOnlyJwt)) {
@@ -168,16 +169,41 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             if (isTurnkeyWallet &&
                 hasTurnkeyVerifiedCredentialAuthenticator &&
                 !hasRecoveryEmail &&
-                ((_e = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _e === void 0 ? void 0 : _e.email)) {
+                ((_g = updateUserProfileResponse === null || updateUserProfileResponse === void 0 ? void 0 : updateUserProfileResponse.user) === null || _g === void 0 ? void 0 : _g.email)) {
                 setUser(updateJWTAndCreateUserProfile(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt));
                 yield addRecoveryEmail(updateUserProfileResponse.user.email);
                 setShowAuthFlow(false);
                 return;
             }
-            if (isTurnkeyProviderEnabled &&
-                !((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
-                setShowAuthFlow(false);
-                return;
+            if (isTurnkeyProviderEnabled) {
+                const isManualMode = !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation);
+                const isUsingPregeneratedWallets = Boolean(((_l = (_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _k === void 0 ? void 0 : _k.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) &&
+                    !((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.forceAuthenticatorAtSignup));
+                if (isUsingPregeneratedWallets) {
+                    // Pregenerated wallet was created during an
+                    // additional email validation step as part of onboarding
+                    // cannot rely on newUser JWT field here due to session being counted twice
+                    // when authentication happens followed by a separate email kyc step
+                    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(updateUserProfileResponse.jwt);
+                    if (!embeddedWalletVerifiedCredential) {
+                        throw new Error('Could not find an embedded wallet');
+                    }
+                    const wallet = {
+                        address: embeddedWalletVerifiedCredential.address,
+                        authenticated: false,
+                        chain: embeddedWalletVerifiedCredential.chain,
+                        connected: true,
+                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                        // @ts-ignore
+                        connector: undefined,
+                        id: embeddedWalletVerifiedCredential.id,
+                    };
+                    dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, updateUserProfileResponse.jwt);
+                }
+                if (isUsingPregeneratedWallets || isManualMode) {
+                    setShowAuthFlow(false);
+                    return;
+                }
             }
             // this function will check turnkey wallet enabled and create wallet if needed
             // if not enabled, it will throw an error.
@@ -213,7 +239,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         hasTurnkeyVerifiedCredentialAuthenticator,
         hasRecoveryEmail,
         isTurnkeyProviderEnabled,
-        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,
@@ -222,10 +247,12 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setUser,
         addRecoveryEmail,
         setShowAuthFlow,
+        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation,
+        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup,
         setErrorMessage,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
-        var _h, _j;
+        var _p, _q;
         setError(undefined);
         setLoading(true);
         if (!verificationUUID) {
@@ -260,7 +287,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
             yield sleepToShowSuccessMessage();
             yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isTurnkeyProviderEnabled &&
-                !((_j = (_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _h === void 0 ? void 0 : _h.embeddedWallets) === null || _j === void 0 ? void 0 : _j.automaticEmbeddedWalletCreation)) {
+                !((_q = (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _p === void 0 ? void 0 : _p.embeddedWallets) === null || _q === void 0 ? void 0 : _q.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 return;
             }
@@ -293,7 +320,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
         setCallback,
         createUserProfileByJWT,
         isTurnkeyProviderEnabled,
-        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation,
+        (_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setOnboardingOnlyJwt,
         setView,

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs

@@ -27,7 +27,7 @@ const initExport = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ i
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
@@ -48,7 +48,7 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js

@@ -23,7 +23,7 @@ const initExport = (_a) => __awaiter(void 0, [_a], void 0, function* ({ iframeCo
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
@@ -44,7 +44,7 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new DynamicError('PasskeyWalletConnector not found');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
     connector.setEmail(userEmail);

package/src/lib/views/MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.cjs

@@ -0,0 +1,126 @@
+'use client'
+'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 reactI18next = require('react-i18next');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+require('../../events/dynamicEvents.cjs');
+require('@dynamic-labs/utils');
+require('../../context/DynamicContext/DynamicContext.cjs');
+var logger = require('../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../utils/constants/colors.cjs');
+require('../../utils/constants/values.cjs');
+require('../../shared/utils/classes/storage/localStorage.cjs');
+var capitalize = require('../../shared/utils/functions/capitalize/capitalize.cjs');
+require('../../shared/consts/index.cjs');
+require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../config/ApiEndpoint.cjs');
+require('../../locale/locale.cjs');
+require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../context/WalletContext/WalletContext.cjs');
+require('../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('yup');
+require('../../context/MockContext/MockContext.cjs');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+var Typography = require('../../components/Typography/Typography.cjs');
+require('../../context/FooterAnimationContext/index.cjs');
+require('../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('react-focus-lock');
+require('../../context/LoadingContext/LoadingContext.cjs');
+require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../components/IconButton/IconButton.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.cjs');
+require('formik');
+var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+var Alert = require('../../components/Alert/Alert.cjs');
+require('../../components/Input/Input.cjs');
+require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useMergeUserAccounts = require('../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.cjs');
+require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/IsBrowser/IsBrowser.cjs');
+require('../../components/Popper/Popper/Popper.cjs');
+require('../../components/Popper/PopperContext/PopperContext.cjs');
+require('qrcode');
+var RadioButton = require('../../components/RadioButton/RadioButton.cjs');
+require('../WalletList/WalletList.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+
+const MergeUserAccountsConflictsView = ({ mergeConflicts }) => {
+    const { mergeUserAccounts } = useMergeUserAccounts.useMergeUserAccounts();
+    const { t } = reactI18next.useTranslation();
+    const [error, setError] = React.useState('');
+    const mergeResolutions = React.useRef(
+    // defaults to current user field values
+    Object.fromEntries(mergeConflicts.map(({ field, currentUser }) => [
+        `${field.name}_${field.type}`,
+        {
+            fieldKey: field.name,
+            type: field.type || sdkApiCore.KycFieldType.Standard,
+            userId: currentUser.userId,
+        },
+    ])));
+    const handleMergeConfirm = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const parsedMergeResolutions = Object.values(mergeResolutions.current).map(({ fieldKey, type, userId }) => ({
+            fieldKey,
+            type,
+            userId,
+        }));
+        try {
+            yield mergeUserAccounts(parsedMergeResolutions);
+        }
+        catch (error) {
+            logger.logger.error('Error merging user accounts', error);
+            setError(t('dyn_merge_user_accounts_conflicts.errors.merge_error'));
+        }
+    });
+    if (!(mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.length)) {
+        return null;
+    }
+    const handleOptionChange = (fieldKey, fieldType, userId, isSelected) => {
+        setError('');
+        if (!isSelected) {
+            return;
+        }
+        mergeResolutions.current[`${fieldKey}_${fieldType}`] = {
+            fieldKey,
+            type: fieldType || sdkApiCore.KycFieldType.Standard,
+            userId,
+        };
+    };
+    return (jsxRuntime.jsxs("div", { className: 'merge-user-accounts-conflicts__container', children: [error && (jsxRuntime.jsx(Alert.Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts-conflicts__error', children: error })), jsxRuntime.jsx("div", { className: 'merge-user-accounts-conflicts__fields', children: mergeConflicts.map(({ field, currentUser, fromUser }) => (jsxRuntime.jsxs("div", { className: 'merge-user-accounts-conflicts__fields__item', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts-conflicts__fields__item__name', children: capitalize.capitalize(field.name) }), jsxRuntime.jsx(RadioButton.RadioButton, { name: field.name, value: currentUser.value, checked: true, className: 'merge-user-accounts-conflicts__fields__item__button', onChange: (e) => handleOptionChange(field.name, field.type, currentUser.userId, e.target.checked), children: currentUser.value }), jsxRuntime.jsx(RadioButton.RadioButton, { name: field.name, value: fromUser.value, className: 'merge-user-accounts-conflicts__fields__item__button', onChange: (e) => handleOptionChange(field.name, field.type, fromUser.userId, e.target.checked), children: fromUser.value })] }, field.name))) }), jsxRuntime.jsx("div", { className: 'merge-user-accounts-conflicts__buttons', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'merge-user-accounts-conflicts__buttons__button', onClick: handleMergeConfirm, buttonVariant: 'primary', buttonPadding: 'large', expanded: true, copykey: 'dyn_merge_user_accounts_conflicts.confirm_button', children: t('dyn_merge_user_accounts_conflicts.confirm_button') }) })] }));
+};
+
+exports.MergeUserAccountsConflictsView = MergeUserAccountsConflictsView;

package/src/lib/views/MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.d.ts

@@ -0,0 +1,6 @@
+import { FC } from 'react';
+import { MergeUserConflict } from '@dynamic-labs/sdk-api-core';
+export type MergeUserAccountsConflictsViewProps = {
+    mergeConflicts: MergeUserConflict[];
+};
+export declare const MergeUserAccountsConflictsView: FC<MergeUserAccountsConflictsViewProps>;

package/src/lib/views/MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.js

@@ -0,0 +1,122 @@
+'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { useState, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { KycFieldType } from '@dynamic-labs/sdk-api-core';
+import '../../events/dynamicEvents.js';
+import '@dynamic-labs/utils';
+import '../../context/DynamicContext/DynamicContext.js';
+import { logger } from '../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import '../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../utils/constants/colors.js';
+import '../../utils/constants/values.js';
+import '../../shared/utils/classes/storage/localStorage.js';
+import { capitalize } from '../../shared/utils/functions/capitalize/capitalize.js';
+import '../../shared/consts/index.js';
+import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../config/ApiEndpoint.js';
+import '../../locale/locale.js';
+import '../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../context/WalletContext/WalletContext.js';
+import '../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import '../../context/MockContext/MockContext.js';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import { Typography } from '../../components/Typography/Typography.js';
+import '../../context/FooterAnimationContext/index.js';
+import '../../components/ShadowDOM/ShadowDOM.js';
+import '../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
+import '../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import 'react-focus-lock';
+import '../../context/LoadingContext/LoadingContext.js';
+import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../components/IconButton/IconButton.js';
+import '../../components/MenuList/Dropdown/Dropdown.js';
+import 'formik';
+import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import { Alert } from '../../components/Alert/Alert.js';
+import '../../components/Input/Input.js';
+import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../context/PasskeyContext/PasskeyContext.js';
+import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useMergeUserAccounts } from '../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.js';
+import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/IsBrowser/IsBrowser.js';
+import '../../components/Popper/Popper/Popper.js';
+import '../../components/Popper/PopperContext/PopperContext.js';
+import 'qrcode';
+import { RadioButton } from '../../components/RadioButton/RadioButton.js';
+import '../WalletList/WalletList.js';
+import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+
+const MergeUserAccountsConflictsView = ({ mergeConflicts }) => {
+    const { mergeUserAccounts } = useMergeUserAccounts();
+    const { t } = useTranslation();
+    const [error, setError] = useState('');
+    const mergeResolutions = useRef(
+    // defaults to current user field values
+    Object.fromEntries(mergeConflicts.map(({ field, currentUser }) => [
+        `${field.name}_${field.type}`,
+        {
+            fieldKey: field.name,
+            type: field.type || KycFieldType.Standard,
+            userId: currentUser.userId,
+        },
+    ])));
+    const handleMergeConfirm = () => __awaiter(void 0, void 0, void 0, function* () {
+        const parsedMergeResolutions = Object.values(mergeResolutions.current).map(({ fieldKey, type, userId }) => ({
+            fieldKey,
+            type,
+            userId,
+        }));
+        try {
+            yield mergeUserAccounts(parsedMergeResolutions);
+        }
+        catch (error) {
+            logger.error('Error merging user accounts', error);
+            setError(t('dyn_merge_user_accounts_conflicts.errors.merge_error'));
+        }
+    });
+    if (!(mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.length)) {
+        return null;
+    }
+    const handleOptionChange = (fieldKey, fieldType, userId, isSelected) => {
+        setError('');
+        if (!isSelected) {
+            return;
+        }
+        mergeResolutions.current[`${fieldKey}_${fieldType}`] = {
+            fieldKey,
+            type: fieldType || KycFieldType.Standard,
+            userId,
+        };
+    };
+    return (jsxs("div", { className: 'merge-user-accounts-conflicts__container', children: [error && (jsx(Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts-conflicts__error', children: error })), jsx("div", { className: 'merge-user-accounts-conflicts__fields', children: mergeConflicts.map(({ field, currentUser, fromUser }) => (jsxs("div", { className: 'merge-user-accounts-conflicts__fields__item', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts-conflicts__fields__item__name', children: capitalize(field.name) }), jsx(RadioButton, { name: field.name, value: currentUser.value, checked: true, className: 'merge-user-accounts-conflicts__fields__item__button', onChange: (e) => handleOptionChange(field.name, field.type, currentUser.userId, e.target.checked), children: currentUser.value }), jsx(RadioButton, { name: field.name, value: fromUser.value, className: 'merge-user-accounts-conflicts__fields__item__button', onChange: (e) => handleOptionChange(field.name, field.type, fromUser.userId, e.target.checked), children: fromUser.value })] }, field.name))) }), jsx("div", { className: 'merge-user-accounts-conflicts__buttons', children: jsx(TypographyButton, { className: 'merge-user-accounts-conflicts__buttons__button', onClick: handleMergeConfirm, buttonVariant: 'primary', buttonPadding: 'large', expanded: true, copykey: 'dyn_merge_user_accounts_conflicts.confirm_button', children: t('dyn_merge_user_accounts_conflicts.confirm_button') }) })] }));
+};
+
+export { MergeUserAccountsConflictsView };

package/src/lib/views/MergeUserAccountsConflictsView/index.d.ts

@@ -0,0 +1 @@
+export { MergeUserAccountsConflictsView } from './MergeUserAccountsConflictsView';