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

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';

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.cjs

@@ -0,0 +1,123 @@
+'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 walletBook = require('@dynamic-labs/wallet-book');
+var iconic = require('@dynamic-labs/iconic');
+require('../../events/dynamicEvents.cjs');
+require('@dynamic-labs/utils');
+require('../../context/DynamicContext/DynamicContext.cjs');
+require('@dynamic-labs/sdk-api-core');
+var logger = require('../../shared/logger.cjs');
+require('@dynamic-labs/wallet-connector-core');
+var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
+var user = require('../../shared/assets/user.cjs');
+var shortenWalletAddress = require('../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
+require('../../utils/constants/colors.cjs');
+require('../../utils/constants/values.cjs');
+require('../../shared/utils/classes/storage/localStorage.cjs');
+require('../../shared/consts/index.cjs');
+var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.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 Alert = require('../../components/Alert/Alert.cjs');
+var Typography = require('../../components/Typography/Typography.cjs');
+var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
+require('../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../components/IconButton/IconButton.cjs');
+require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../components/Input/Input.cjs');
+require('../../components/IsBrowser/IsBrowser.cjs');
+require('../../components/MenuList/Dropdown/Dropdown.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('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../components/Popper/Popper/Popper.cjs');
+require('../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../WalletList/WalletList.cjs');
+require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../context/LoadingContext/LoadingContext.cjs');
+require('../../context/FooterAnimationContext/index.cjs');
+require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useMergeUserAccounts = require('../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.cjs');
+
+const MergeUserAccountsView = (props) => {
+    const { selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setView } = ViewContext.useViewContext();
+    const { mergeUserAccounts } = useMergeUserAccounts.useMergeUserAccounts();
+    const { t } = reactI18next.useTranslation();
+    const [error, setError] = React.useState('');
+    const { mergeConflicts, walletAddress } = props;
+    const goToConflictsResolutionView = () => {
+        // back button on conflicts resolution view should go back to this view
+        const onConflictsResolutionBackClick = () => {
+            setView('merge-user-accounts', props);
+        };
+        setView('merge-user-accounts-conflicts', { mergeConflicts: (mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.conflicts) || [] }, {
+            onBackClick: onConflictsResolutionBackClick,
+        });
+    };
+    const handleMergeConfirm = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        // if there are conflicts, show the conflicts resolution view, otherwise merge
+        if (mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.conflicts.length) {
+            goToConflictsResolutionView();
+            return;
+        }
+        try {
+            yield mergeUserAccounts([]);
+        }
+        catch (error) {
+            logger.logger.error('Error merging user accounts', error);
+            setError(t('dyn_merge_user_accounts.errors.merge_error'));
+        }
+    });
+    const renderDuplicatedInfo = () => {
+        if (walletAddress) {
+            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key, className: 'merge-user-accounts__accounts__item__icon' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', weight: 'medium', color: 'secondary', className: 'merge-user-accounts__accounts__item__text', children: shortenWalletAddress.shortenWalletAddress(walletAddress, 3, 3) })] }));
+        }
+        return (jsxRuntime.jsx(iconic.UserProfileIcon, { className: 'merge-user-accounts__accounts__item__icon' }));
+    };
+    return (jsxRuntime.jsxs("div", { className: 'merge-user-accounts', children: [error && (jsxRuntime.jsx(Alert.Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxRuntime.jsxs("div", { className: 'merge-user-accounts__container', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.same_wallet.content', children: t('dyn_merge_user_accounts.same_wallet.content') }), jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts', children: jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() }) }), jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
+                            color: 'inherit',
+                        }, startSlot: jsxRuntime.jsx(user.ReactComponent, {}), expanded: true, copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') })] })] }));
+};
+
+exports.MergeUserAccountsView = MergeUserAccountsView;

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

@@ -0,0 +1,4 @@
+import { FC } from 'react';
+import { MergeAccountsConfirmationErrorProps } from '@dynamic-labs/utils';
+export type MergeUserAccountsViewProps = Pick<MergeAccountsConfirmationErrorProps, 'mergeConflicts' | 'walletAddress'>;
+export declare const MergeUserAccountsView: FC<MergeUserAccountsViewProps>;

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.js

@@ -0,0 +1,119 @@
+'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { WalletIcon } from '@dynamic-labs/wallet-book';
+import { UserProfileIcon } from '@dynamic-labs/iconic';
+import '../../events/dynamicEvents.js';
+import '@dynamic-labs/utils';
+import '../../context/DynamicContext/DynamicContext.js';
+import '@dynamic-labs/sdk-api-core';
+import { logger } from '../../shared/logger.js';
+import '@dynamic-labs/wallet-connector-core';
+import { useViewContext } from '../../context/ViewContext/ViewContext.js';
+import { ReactComponent as SvgUser } from '../../shared/assets/user.js';
+import { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
+import '../../utils/constants/colors.js';
+import '../../utils/constants/values.js';
+import '../../shared/utils/classes/storage/localStorage.js';
+import '../../shared/consts/index.js';
+import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.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 { Alert } from '../../components/Alert/Alert.js';
+import { Typography } from '../../components/Typography/Typography.js';
+import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
+import '../../components/ShadowDOM/ShadowDOM.js';
+import '../../components/IconButton/IconButton.js';
+import '../../components/InlineWidget/InlineWidget.js';
+import '../../components/Input/Input.js';
+import '../../components/IsBrowser/IsBrowser.js';
+import '../../components/MenuList/Dropdown/Dropdown.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 '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../components/Popper/Popper/Popper.js';
+import '../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import '../WalletList/WalletList.js';
+import '../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../context/LoadingContext/LoadingContext.js';
+import '../../context/FooterAnimationContext/index.js';
+import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../context/PasskeyContext/PasskeyContext.js';
+import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useMergeUserAccounts } from '../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.js';
+
+const MergeUserAccountsView = (props) => {
+    const { selectedWalletConnector } = useInternalDynamicContext();
+    const { setView } = useViewContext();
+    const { mergeUserAccounts } = useMergeUserAccounts();
+    const { t } = useTranslation();
+    const [error, setError] = useState('');
+    const { mergeConflicts, walletAddress } = props;
+    const goToConflictsResolutionView = () => {
+        // back button on conflicts resolution view should go back to this view
+        const onConflictsResolutionBackClick = () => {
+            setView('merge-user-accounts', props);
+        };
+        setView('merge-user-accounts-conflicts', { mergeConflicts: (mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.conflicts) || [] }, {
+            onBackClick: onConflictsResolutionBackClick,
+        });
+    };
+    const handleMergeConfirm = () => __awaiter(void 0, void 0, void 0, function* () {
+        // if there are conflicts, show the conflicts resolution view, otherwise merge
+        if (mergeConflicts === null || mergeConflicts === void 0 ? void 0 : mergeConflicts.conflicts.length) {
+            goToConflictsResolutionView();
+            return;
+        }
+        try {
+            yield mergeUserAccounts([]);
+        }
+        catch (error) {
+            logger.error('Error merging user accounts', error);
+            setError(t('dyn_merge_user_accounts.errors.merge_error'));
+        }
+    });
+    const renderDuplicatedInfo = () => {
+        if (walletAddress) {
+            return (jsxs(Fragment, { children: [jsx(WalletIcon, { walletKey: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key, className: 'merge-user-accounts__accounts__item__icon' }), jsx(Typography, { variant: 'body_small', weight: 'medium', color: 'secondary', className: 'merge-user-accounts__accounts__item__text', children: shortenWalletAddress(walletAddress, 3, 3) })] }));
+        }
+        return (jsx(UserProfileIcon, { className: 'merge-user-accounts__accounts__item__icon' }));
+    };
+    return (jsxs("div", { className: 'merge-user-accounts', children: [error && (jsx(Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxs("div", { className: 'merge-user-accounts__container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.same_wallet.content', children: t('dyn_merge_user_accounts.same_wallet.content') }), jsx("div", { className: 'merge-user-accounts__accounts', children: jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() }) }), jsx(TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
+                            color: 'inherit',
+                        }, startSlot: jsx(SvgUser, {}), expanded: true, copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') })] })] }));
+};
+
+export { MergeUserAccountsView };

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

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

package/src/lib/views/MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.cjs

@@ -111,7 +111,7 @@ const MergeUserAccountsWithSameEmailView = ({ returnToView }) => {
             throw new utils.DynamicError('Something went wrong, please try again.');
         }
         catch (e) {
-            setError(t('dyn_merge_user_accounts.errors.merge_error'));
+            setError(t('dyn_merge_user_accounts_with_same_email.errors.merge_error'));
             if (user$1) {
                 setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
@@ -135,9 +135,9 @@ const MergeUserAccountsWithSameEmailView = ({ returnToView }) => {
                                     breakpoint: 4,
                                     cutEnd: 1,
                                     cutStart: 2,
-                                }) })] })] }), jsxRuntime.jsx(Typography.Typography, { weight: 'regular', variant: 'title', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__header', copykey: 'dyn_merge_user_accounts.title', children: t('dyn_merge_user_accounts.title') }), jsxRuntime.jsxs(Typography.Typography, { weight: 'medium', variant: 'body_normal', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__body', copykey: 'dyn_merge_user_accounts.existing_account', children: [t('dyn_merge_user_accounts.existing_account'), ' ', jsxRuntime.jsx("span", { className: 'merge-user-accounts-with-same-email__text--bold', children: shortenEmail.shortenEmail(email, {
+                                }) })] })] }), jsxRuntime.jsx(Typography.Typography, { weight: 'regular', variant: 'title', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__header', copykey: 'dyn_merge_user_accounts_with_same_email.title', children: t('dyn_merge_user_accounts_with_same_email.title') }), jsxRuntime.jsxs(Typography.Typography, { weight: 'medium', variant: 'body_normal', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__body', copykey: 'dyn_merge_user_accounts_with_same_email.existing_account', children: [t('dyn_merge_user_accounts_with_same_email.existing_account'), ' ', jsxRuntime.jsx("span", { className: 'merge-user-accounts-with-same-email__text--bold', children: shortenEmail.shortenEmail(email, {
                             breakpoint: 14,
-                        }) }), ' ', t('dyn_merge_user_accounts.existing_account_trail')] }), jsxRuntime.jsxs("div", { className: 'merge-user-accounts-with-same-email__buttons', children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleMergeUserAccounts, buttonVariant: 'primary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') }), jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleUseDifferentEmail, buttonVariant: 'secondary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts.cancel_button', children: t('dyn_merge_user_accounts.cancel_button') })] })] }));
+                        }) }), ' ', t('dyn_merge_user_accounts_with_same_email.existing_account_trail')] }), jsxRuntime.jsxs("div", { className: 'merge-user-accounts-with-same-email__buttons', children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleMergeUserAccounts, buttonVariant: 'primary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts_with_same_email.confirm_button', children: t('dyn_merge_user_accounts_with_same_email.confirm_button') }), jsxRuntime.jsx(TypographyButton.TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleUseDifferentEmail, buttonVariant: 'secondary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts_with_same_email.cancel_button', children: t('dyn_merge_user_accounts_with_same_email.cancel_button') })] })] }));
 };
 
 exports.MergeUserAccountsWithSameEmailView = MergeUserAccountsWithSameEmailView;

package/src/lib/views/MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.js

@@ -107,7 +107,7 @@ const MergeUserAccountsWithSameEmailView = ({ returnToView }) => {
             throw new DynamicError('Something went wrong, please try again.');
         }
         catch (e) {
-            setError(t('dyn_merge_user_accounts.errors.merge_error'));
+            setError(t('dyn_merge_user_accounts_with_same_email.errors.merge_error'));
             if (user) {
                 setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
@@ -131,9 +131,9 @@ const MergeUserAccountsWithSameEmailView = ({ returnToView }) => {
                                     breakpoint: 4,
                                     cutEnd: 1,
                                     cutStart: 2,
-                                }) })] })] }), jsx(Typography, { weight: 'regular', variant: 'title', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__header', copykey: 'dyn_merge_user_accounts.title', children: t('dyn_merge_user_accounts.title') }), jsxs(Typography, { weight: 'medium', variant: 'body_normal', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__body', copykey: 'dyn_merge_user_accounts.existing_account', children: [t('dyn_merge_user_accounts.existing_account'), ' ', jsx("span", { className: 'merge-user-accounts-with-same-email__text--bold', children: shortenEmail(email, {
+                                }) })] })] }), jsx(Typography, { weight: 'regular', variant: 'title', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__header', copykey: 'dyn_merge_user_accounts_with_same_email.title', children: t('dyn_merge_user_accounts_with_same_email.title') }), jsxs(Typography, { weight: 'medium', variant: 'body_normal', className: 'merge-user-accounts-with-same-email__text merge-user-accounts-with-same-email__text__body', copykey: 'dyn_merge_user_accounts_with_same_email.existing_account', children: [t('dyn_merge_user_accounts_with_same_email.existing_account'), ' ', jsx("span", { className: 'merge-user-accounts-with-same-email__text--bold', children: shortenEmail(email, {
                             breakpoint: 14,
-                        }) }), ' ', t('dyn_merge_user_accounts.existing_account_trail')] }), jsxs("div", { className: 'merge-user-accounts-with-same-email__buttons', children: [jsx(TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleMergeUserAccounts, buttonVariant: 'primary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') }), jsx(TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleUseDifferentEmail, buttonVariant: 'secondary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts.cancel_button', children: t('dyn_merge_user_accounts.cancel_button') })] })] }));
+                        }) }), ' ', t('dyn_merge_user_accounts_with_same_email.existing_account_trail')] }), jsxs("div", { className: 'merge-user-accounts-with-same-email__buttons', children: [jsx(TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleMergeUserAccounts, buttonVariant: 'primary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts_with_same_email.confirm_button', children: t('dyn_merge_user_accounts_with_same_email.confirm_button') }), jsx(TypographyButton, { className: 'merge-user-accounts-with-same-email__buttons__button', onClick: handleUseDifferentEmail, buttonVariant: 'secondary', buttonPadding: 'large', copykey: 'dyn_merge_user_accounts_with_same_email.cancel_button', children: t('dyn_merge_user_accounts_with_same_email.cancel_button') })] })] }));
 };
 
 export { MergeUserAccountsWithSameEmailView };

package/src/lib/views/viewToComponentMap.cjs

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var MergeUserAccountsConflictsView = require('./MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.cjs');
 var AccountExistsView = require('./AccountExistsView/AccountExistsView.cjs');
 var BridgeNextWalletConnectionView = require('./BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs');
 var BridgeSummaryView = require('./BridgeSummaryView/BridgeSummaryView.cjs');
@@ -21,6 +22,7 @@ var EmbeddedRevealView = require('./EmbeddedReveal/EmbeddedRevealView/EmbeddedRe
 var FarcasterConnectView = require('./FarcasterConnectView/FarcasterConnectView.cjs');
 var LoginView = require('./LoginView/LoginView.cjs');
 var MergeUserAccountsWithSameEmailView = require('./MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.cjs');
+var MergeUserAccountsView = require('./MergeUserAccountsView/MergeUserAccountsView.cjs');
 var MfaChooseDeviceView = require('./MfaChooseDeviceView/MfaChooseDeviceView.cjs');
 var MfaSecureDeviceView = require('./MfaSecureDeviceView/MfaSecureDeviceView.cjs');
 var NetworkNotSupported = require('./NetworkNotSupported/NetworkNotSupported.cjs');
@@ -136,6 +138,8 @@ const viewToComponentMap = {
     'login-with-email-verification': EmailVerification.EmailVerification,
     'login-with-sms-verification': SmsVerification.SmsVerification,
     'login-with-wallet-only': LoginView.LoginView,
+    'merge-user-accounts': MergeUserAccountsView.MergeUserAccountsView,
+    'merge-user-accounts-conflicts': MergeUserAccountsConflictsView.MergeUserAccountsConflictsView,
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView.MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView.MfaChooseDeviceView,
     'mfa-secure-device': MfaSecureDeviceView.MfaSecureDeviceView,

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

@@ -23,6 +23,8 @@ export declare const viewToComponentMap: {
     'login-with-email-verification': import("react").FC<import("./EmailVerification/EmailVerification").EmailVerificationProps>;
     'login-with-sms-verification': import("react").FC;
     'login-with-wallet-only': () => JSX.Element;
+    'merge-user-accounts': import("react").FC<import("./MergeUserAccountsView/MergeUserAccountsView").MergeUserAccountsViewProps>;
+    'merge-user-accounts-conflicts': import("react").FC<import("./MergeUserAccountsConflictsView/MergeUserAccountsConflictsView").MergeUserAccountsConflictsViewProps>;
     'merge-user-accounts-with-same-email': import("react").FC<import("./MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView").MergeUserAccountsWithSameEmailViewProps>;
     'mfa-choose-device': () => JSX.Element;
     'mfa-secure-device': ({ type }: import("./MfaSecureDeviceView").MfaSecureDeviceViewProps) => JSX.Element;