@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.21

package/src/lib/views/WalletUsedView/WalletUsedView.js

@@ -3,9 +3,9 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { isMobile } from '@dynamic-labs/utils';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
 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';
@@ -13,36 +13,35 @@ import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
+import { PHANTOM_SIGNATURE_STATE } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
-import '../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../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 { useErrorContext } from '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { getVerifyArgs } from '../../utils/functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
 import '../../config/ApiEndpoint.js';
 import '../../locale/locale.js';
-import { transferWallet } from '../../data/api/wallets/wallets.js';
-import { updateJWTAndCreateUserProfile } from '../../utils/functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
+import '@dynamic-labs/store';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
-import { useInternalUserWallets } from '../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../context/UserWalletsContext/UserWalletsContext.js';
 import { getSiweStatement } from '../../utils/functions/getSiweStatement/getSiweStatement.js';
-import { getWalletProvider } from '../../utils/functions/getWalletProvider/getWalletProvider.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import { useLoadingContext } from '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
@@ -57,11 +56,11 @@ import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import { useLoadingContext } from '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
@@ -79,6 +78,7 @@ import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import { useTransferWallet } from '../../utils/hooks/useTransferWallet/useTransferWallet.js';
 
 const WalletUsedView = () => {
     const [isChecked, setIsChecked] = useState(false);
@@ -86,8 +86,7 @@ const WalletUsedView = () => {
     const { setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
     const { setView, goToInitialView } = useViewContext();
-    const { environmentId, displaySiweStatement, authToken, setShowAuthFlow, setUser, appName, siweStatement, setPrimaryWalletId, primaryWallet, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
-    const { addedWalletsIds } = useInternalUserWallets();
+    const { authToken, setShowAuthFlow, appName, siweStatement, setMultiWalletWidgetState, connectWallet, selectedWalletConnector: walletConnector, isSingleWalletAccount, consumeNonce, handleLogOut, } = useInternalDynamicContext();
     const { data: walletAddress } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         const accounts = yield (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getConnectedAccounts());
         return accounts === null || accounts === void 0 ? void 0 : accounts[0];
@@ -95,25 +94,7 @@ const WalletUsedView = () => {
         deps: [walletConnector],
     });
     const shortenedWalletAddress = shortenWalletAddress(walletAddress);
-    const updatePrimaryWalletId = (walletConnector, user) => {
-        const newWalletKey = walletConnector.key;
-        if (user.lastVerifiedCredentialId) {
-            if (!primaryWallet) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-                return;
-            }
-            const currentPrimaryWalletKey = primaryWallet.connector.key;
-            if (newWalletKey === currentPrimaryWalletKey) {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-            // if both wallets are flow wallets, set the last verified wallet as primary
-            // this is a limitation of flow as all wallets use the same flow connector
-            if (primaryWallet.connector.connectedChain === 'FLOW' &&
-                walletConnector.connectedChain === 'FLOW') {
-                setPrimaryWalletId(user.lastVerifiedCredentialId);
-            }
-        }
-    };
+    const completeWalletTransfer = useTransferWallet();
     const handleWalletTransfer = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!walletConnector || !authToken)
             return;
@@ -133,26 +114,27 @@ const WalletUsedView = () => {
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const walletProvider = getWalletProvider(walletConnector);
-            const verifyArgs = yield getVerifyArgs({
-                displaySiweStatement,
-                environmentId,
+            // We need to set to LS when about to transfer phantom wallet on mobile
+            // because the deeplink interrupts this code execution and then redirects back on a new tab.
+            // This resets all state (except for LS obviously). When we receive the phantom signature in this new tab,
+            // we can't tell whether it's supposed to be used to sign a message, verify a wallet sign in/link,
+            // or conclude the transfer, which is why we need this LS variable: it will indicate whether it
+            // is a signature, authentication or transfer.
+            // Check method handleUserResponse in file useResponseHandlers, case 'signMessage'.
+            if (walletConnector.key === 'phantom' && isMobile()) {
+                LocalStorage.setToLS(PHANTOM_SIGNATURE_STATE, {
+                    loseOriginalAccountOnTransfer: isChecked,
+                    submittedAtTimestamp: new Date().toString(),
+                    verificationType: 'awaiting_transfer',
+                });
+            }
+            yield completeWalletTransfer({
                 nonce,
+                overrideSiweStatement: siweStatementToUse,
                 publicWalletAddress: connectionResult.address,
-                siweStatement: siweStatementToUse,
                 skipEmptyAccountCheck: isChecked,
                 walletConnector,
-                walletProvider,
             });
-            const response = yield transferWallet(environmentId, verifyArgs, authToken);
-            const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
-            updatePrimaryWalletId(walletConnector, userProfile);
-            setUser(userProfile);
-            const walletId = userProfile.lastVerifiedCredentialId;
-            if (walletId) {
-                addedWalletsIds.current.push(walletId);
-            }
-            setShowAuthFlow(false);
         }
         catch (error) {
             logger.error(error);

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');
@@ -14,13 +15,13 @@ var CollectUserDataView = require('./CollectUserDataView/CollectUserDataView.cjs
 var CollectUserDataViewNoWallet = require('./CollectUserDataViewNoWallet/CollectUserDataViewNoWallet.cjs');
 var CreatePasswordView = require('./CreatePasswordView/CreatePasswordView.cjs');
 var EmailConfirmationWaitingView = require('./EmailConfirmationWaitingView/EmailConfirmationWaitingView.cjs');
-var EmailUpdate = require('./EmailUpdate/EmailUpdate.cjs');
 var EmailVerification = require('./EmailVerification/EmailVerification.cjs');
 var EmailWalletOTPVerificationView = require('./EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.cjs');
 var EmbeddedRevealView = require('./EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs');
 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');
@@ -58,6 +59,7 @@ require('viem');
 require('viem/chains');
 require('../config/ApiEndpoint.cjs');
 require('../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -66,9 +68,10 @@ require('react-dom');
 require('../context/WalletContext/WalletContext.cjs');
 require('../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../context/MockContext/MockContext.cjs');
-require('../context/FieldsStateContext/FieldsStateContext.cjs');
+require('./CollectUserDataView/useFields.cjs');
 require('../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
@@ -82,11 +85,11 @@ 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');
+require('../context/FieldsStateContext/FieldsStateContext.cjs');
 require('./TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../components/Alert/Alert.cjs');
 require('../components/Input/Input.cjs');
@@ -113,6 +116,9 @@ var WalletLockedView = require('./WalletLockedView/WalletLockedView.cjs');
 var WalletRedirectView = require('./WalletRedirectView/WalletRedirectView.cjs');
 var WalletSignSpinnerView = require('./WalletSignSpinnerView/WalletSignSpinnerView.cjs');
 var WalletUsedView = require('./WalletUsedView/WalletUsedView.cjs');
+var MfaDisplayBackupCodesView = require('./MfaDisplayBackupCodesView/MfaDisplayBackupCodesView.cjs');
+var MfaVerificationView = require('./MfaVerificationView/MfaVerificationView.cjs');
+var MfaRecoveryView = require('./MfaRecoveryView/MfaRecoveryView.cjs');
 var PasskeyNewDomainDetectedView = require('./Passkey/PasskeyNewDomainDetectedView/PasskeyNewDomainDetectedView.cjs');
 
 const viewToComponentMap = {
@@ -136,9 +142,14 @@ 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-display-backup-codes': MfaDisplayBackupCodesView.MfaDisplayBackupCodesView,
+    'mfa-recovery': MfaRecoveryView.MfaRecoveryView,
     'mfa-secure-device': MfaSecureDeviceView.MfaSecureDeviceView,
+    'mfa-verification': MfaVerificationView.MfaVerificationView,
     'multi-wallet-wallet-list': WalletList.WalletList,
     'network-not-supported': NetworkNotSupported.NetworkNotSupported,
     'network-not-supported-manual': NetworkNotSupportedSwitchManual.NetworkNotSupportedSwitchManual,
@@ -159,7 +170,6 @@ const viewToComponentMap = {
     'select-wallet-in-wallet-group': SelectWalletInWalletGroupView.SelectWalletInWalletGroupView,
     'social-redirect-view': SocialRedirectView.SocialRedirectView,
     'social-wrong-account': SocialWrongAccountView.SocialWrongAccountView,
-    'update-email': EmailUpdate.EmailUpdate,
     'verify-email': EmailVerification.EmailVerification,
     'verify-sms': SmsVerification.SmsVerification,
     'wait-for-email-confirmation-view': EmailConfirmationWaitingView.EmailConfirmationWaitingView,

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

@@ -8,7 +8,7 @@ export declare const viewToComponentMap: {
     'chainalysis-blocked-wallet': () => JSX.Element;
     'collect-user-data': () => JSX.Element | null;
     'collect-user-data-login-no-wallet': import("react").FC<{
-        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "chain" | "ens" | "environmentId" | "isAuthenticatedWithAWallet" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "wallet" | "scope";
+        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "chain" | "ens" | "wallet" | "isAuthenticatedWithAWallet" | "environmentId" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "scope" | "missingFields";
         userIdentificationOverride?: string | undefined;
     }>;
     'create-password-view': import("react").FC<import("./CreatePasswordView/CreatePasswordView").CreatePasswordViewProps>;
@@ -23,15 +23,22 @@ 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-display-backup-codes': () => JSX.Element;
+    'mfa-recovery': import("react").FC;
     'mfa-secure-device': ({ type }: import("./MfaSecureDeviceView").MfaSecureDeviceViewProps) => JSX.Element;
+    'mfa-verification': ({ type }: import("./MfaVerificationView").MfaVerificationViewProps) => JSX.Element;
     'multi-wallet-wallet-list': ({ isWalletConnectList, }: import("./WalletList").WalletListProps) => JSX.Element;
     'network-not-supported': () => JSX.Element | null;
     'network-not-supported-manual': import("react").FC;
     'no-access': () => JSX.Element;
     'no-qr-not-installed': () => JSX.Element | null;
-    'passkey-intro': import("react").FC;
+    'passkey-intro': import("react").FC<{
+        chains?: import("@dynamic-labs/sdk-api-core").ChainEnum[] | undefined;
+    }>;
     'passkey-new-domain-detected': import("react").FC;
     'passkey-recovery-add-email': import("react").FC<import("./Passkey/PasskeyRecovery/AddRecoveryEmail/AddRecoveryEmail").AddRecoveryEmailProps>;
     'passkey-recovery-bundle': import("react").FC<import("./Passkey/PasskeyRecovery/BundleValidation/PasskeyBundleRecovery").PasskeyBundleValidationProps>;
@@ -49,7 +56,6 @@ export declare const viewToComponentMap: {
     'select-wallet-in-wallet-group': import("react").FC;
     'social-redirect-view': () => JSX.Element;
     'social-wrong-account': () => JSX.Element | null;
-    'update-email': () => JSX.Element;
     'verify-email': import("react").FC<import("./EmailVerification/EmailVerification").EmailVerificationProps>;
     'verify-sms': import("react").FC;
     'wait-for-email-confirmation-view': () => JSX.Element;

package/src/lib/views/viewToComponentMap.js

@@ -1,5 +1,6 @@
 'use client'
 import { jsx } from 'react/jsx-runtime';
+import { MergeUserAccountsConflictsView } from './MergeUserAccountsConflictsView/MergeUserAccountsConflictsView.js';
 import { AccountExistsView } from './AccountExistsView/AccountExistsView.js';
 import { BridgeNextWalletConnectionView } from './BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js';
 import { BridgeSummaryView } from './BridgeSummaryView/BridgeSummaryView.js';
@@ -10,13 +11,13 @@ import { CollectUserDataView } from './CollectUserDataView/CollectUserDataView.j
 import { CollectUserDataViewNoWallet } from './CollectUserDataViewNoWallet/CollectUserDataViewNoWallet.js';
 import { CreatePasswordView } from './CreatePasswordView/CreatePasswordView.js';
 import { EmailConfirmationWaitingView } from './EmailConfirmationWaitingView/EmailConfirmationWaitingView.js';
-import { EmailUpdate } from './EmailUpdate/EmailUpdate.js';
 import { EmailVerification } from './EmailVerification/EmailVerification.js';
 import { EmailWalletOTPVerificationView } from './EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.js';
 import { EmbeddedRevealView } from './EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js';
 import { FarcasterConnectView } from './FarcasterConnectView/FarcasterConnectView.js';
 import { LoginView } from './LoginView/LoginView.js';
 import { MergeUserAccountsWithSameEmailView } from './MergeUserAccountsWithSameEmailView/MergeUserAccountsWithSameEmailView.js';
+import { MergeUserAccountsView } from './MergeUserAccountsView/MergeUserAccountsView.js';
 import { MfaChooseDeviceView } from './MfaChooseDeviceView/MfaChooseDeviceView.js';
 import { MfaSecureDeviceView } from './MfaSecureDeviceView/MfaSecureDeviceView.js';
 import { NetworkNotSupported } from './NetworkNotSupported/NetworkNotSupported.js';
@@ -54,6 +55,7 @@ import 'viem';
 import 'viem/chains';
 import '../config/ApiEndpoint.js';
 import '../locale/locale.js';
+import '@dynamic-labs/store';
 import '../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../context/AccountExistsContext/AccountExistsContext.js';
 import '../context/UserWalletsContext/UserWalletsContext.js';
@@ -62,9 +64,10 @@ import 'react-dom';
 import '../context/WalletContext/WalletContext.js';
 import '../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../context/MockContext/MockContext.js';
-import '../context/FieldsStateContext/FieldsStateContext.js';
+import './CollectUserDataView/useFields.js';
 import '../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
@@ -78,11 +81,11 @@ 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 '../context/FieldsStateContext/FieldsStateContext.js';
 import './TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../components/Alert/Alert.js';
 import '../components/Input/Input.js';
@@ -109,6 +112,9 @@ import { WalletLockedView } from './WalletLockedView/WalletLockedView.js';
 import { WalletRedirectView } from './WalletRedirectView/WalletRedirectView.js';
 import { WalletSignSpinnerView } from './WalletSignSpinnerView/WalletSignSpinnerView.js';
 import { WalletUsedView } from './WalletUsedView/WalletUsedView.js';
+import { MfaDisplayBackupCodesView } from './MfaDisplayBackupCodesView/MfaDisplayBackupCodesView.js';
+import { MfaVerificationView } from './MfaVerificationView/MfaVerificationView.js';
+import { MfaRecoveryView } from './MfaRecoveryView/MfaRecoveryView.js';
 import { PasskeyNewDomainDetectedView } from './Passkey/PasskeyNewDomainDetectedView/PasskeyNewDomainDetectedView.js';
 
 const viewToComponentMap = {
@@ -132,9 +138,14 @@ const viewToComponentMap = {
     'login-with-email-verification': EmailVerification,
     'login-with-sms-verification': SmsVerification,
     'login-with-wallet-only': LoginView,
+    'merge-user-accounts': MergeUserAccountsView,
+    'merge-user-accounts-conflicts': MergeUserAccountsConflictsView,
     'merge-user-accounts-with-same-email': MergeUserAccountsWithSameEmailView,
     'mfa-choose-device': MfaChooseDeviceView,
+    'mfa-display-backup-codes': MfaDisplayBackupCodesView,
+    'mfa-recovery': MfaRecoveryView,
     'mfa-secure-device': MfaSecureDeviceView,
+    'mfa-verification': MfaVerificationView,
     'multi-wallet-wallet-list': WalletList,
     'network-not-supported': NetworkNotSupported,
     'network-not-supported-manual': NetworkNotSupportedSwitchManual,
@@ -155,7 +166,6 @@ const viewToComponentMap = {
     'select-wallet-in-wallet-group': SelectWalletInWalletGroupView,
     'social-redirect-view': SocialRedirectView,
     'social-wrong-account': SocialWrongAccountView,
-    'update-email': EmailUpdate,
     'verify-email': EmailVerification,
     'verify-sms': SmsVerification,
     'wait-for-email-confirmation-view': EmailConfirmationWaitingView,

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.cjs

@@ -32,6 +32,7 @@ require('viem');
 require('viem/chains');
 require('../../config/ApiEndpoint.cjs');
 require('../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -40,9 +41,10 @@ require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../views/CollectUserDataView/useFields.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
@@ -56,11 +58,11 @@ require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Alert/Alert.cjs');
 require('../../components/Input/Input.cjs');

package/src/lib/widgets/DynamicBridgeWidget/DynamicBridgeWidget.js

@@ -28,6 +28,7 @@ import 'viem';
 import 'viem/chains';
 import '../../config/ApiEndpoint.js';
 import '../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
@@ -36,9 +37,10 @@ import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
-import '../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../views/CollectUserDataView/useFields.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
@@ -52,11 +54,11 @@ import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Alert/Alert.js';
 import '../../components/Input/Input.js';

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeUserProfile/DynamicBridgeUserProfile.cjs

@@ -32,6 +32,7 @@ require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -41,13 +42,14 @@ require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useKYCFlag = require('../../../../utils/hooks/useKYCFlag/useKYCFlag.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
@@ -58,11 +60,11 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/Input/Input.cjs');

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeUserProfile/DynamicBridgeUserProfile.js

@@ -28,6 +28,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -37,13 +38,14 @@ import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useKYCFlag } from '../../../../utils/hooks/useKYCFlag/useKYCFlag.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import 'react-i18next';
-import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
@@ -54,11 +56,11 @@ import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/Input/Input.js';

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.cjs

@@ -29,6 +29,7 @@ require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -37,9 +38,10 @@ require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
@@ -54,11 +56,11 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/Input/Input.cjs');

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCard/DynamicBridgeWalletCard.js

@@ -25,6 +25,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -33,9 +34,10 @@ import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
@@ -50,11 +52,11 @@ import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/Input/Input.js';

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.cjs

@@ -28,6 +28,7 @@ require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -36,9 +37,10 @@ require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
@@ -52,10 +54,10 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../DynamicWidget/context/DynamicWidgetContext.cjs');
 var DotsMenu = require('../../../DynamicWidget/components/DotsMenu/DotsMenu.cjs');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/Alert/Alert.cjs');