@dynamic-labs/sdk-react-core 2.1.0-alpha.9 → 2.1.1

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -12,11 +12,10 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getProperErrorMessage = require('../../../modals/SignMessageConfirmationModal/getProperErrorMessage.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('../../../context/ViewContext/ViewContext.cjs');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var close = require('../../../shared/assets/close.cjs');
 var exportEmbeddedHero = require('../../../shared/assets/export-embedded-hero.cjs');
 var eyeOffIcon = require('../../../shared/assets/eye-off-icon.cjs');
@@ -35,6 +34,7 @@ require('viem');
 require('viem/chains');
 var getEOAWallet = require('../../../utils/functions/getEOAWallet/getEOAWallet.cjs');
 var ApiEndpoint = require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -43,14 +43,17 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
+var turnkeyExport = require('../utils/turnkeyExport/turnkeyExport.cjs');
 var usePromise = require('../../../utils/hooks/usePromise/usePromise.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
 require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
+require('../../CollectUserDataView/useFields.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');
@@ -62,9 +65,9 @@ require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs'
 require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -88,20 +91,20 @@ require('qrcode');
 require('../../WalletList/WalletList.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-var turnkeyExport = require('../utils/turnkeyExport/turnkeyExport.cjs');
 var constants = require('../constants.cjs');
 require('../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const EmbeddedRevealView = ({ exportPrivateKey, }) => {
     var _a, _b, _c;
-    const { authToken, primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { shadowRoot } = ShadowDOM.useShadowDOMContext();
+    const { setView } = ViewContext.useViewContext();
     const [acknowledgement1, setAcknowledgement1] = React.useState(false);
     const [hasRevealedCoinbaseMpcKey, setHasRevealedCoinbaseMpcKey] = React.useState(false);
     const iframeContainerRef = React.useRef(null);
-    const decodedJwt = decodeJwt.decodeJwt(authToken);
-    const walletProperties = (_b = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     const isCoinbaseMpcWallet = wallet && walletConnectorCore.isCoinbaseMpcWalletConnector(wallet.connector);
@@ -138,9 +141,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, }) => {
         if (isTurnkeyWallet) {
             return turnkeyExport.exportCredential({
                 address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-                authToken,
                 environmentId,
-                userEmail: user === null || user === void 0 ? void 0 : user.email,
+                user,
                 wallet,
             });
         }
@@ -169,8 +171,16 @@ const EmbeddedRevealView = ({ exportPrivateKey, }) => {
         if (error instanceof utils.DynamicError) {
             return error.message;
         }
-        return getProperErrorMessage.getProperErrorMessage(error);
-    }, [error]);
+        try {
+            return getProperErrorMessage.getProperErrorMessage(error);
+        }
+        catch (e) {
+            if (e instanceof utils.AccessBlockedError) {
+                setView('access-blocked');
+            }
+            return;
+        }
+    }, [error, setView]);
     const { t } = reactI18next.useTranslation();
     const contentHeader = (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__body__description', children: !isLoading && data && !error ? (jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: t('dyn_embedded_reveal.reveal_description') })) : (jsxRuntime.jsx("div", { className: 'embedded-reveal-view__header', children: jsxRuntime.jsx(exportEmbeddedHero.ReactComponent, {}) })) }));
     React.useEffect(() => {

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -3,16 +3,15 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useState, useRef, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DynamicError } from '@dynamic-labs/utils';
+import { DynamicError, AccessBlockedError } from '@dynamic-labs/utils';
 import { isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { getProperErrorMessage } from '../../../modals/SignMessageConfirmationModal/getProperErrorMessage.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/DynamicContext.js';
-import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '../../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgClose } from '../../../shared/assets/close.js';
 import { ReactComponent as SvgExportEmbeddedHero } from '../../../shared/assets/export-embedded-hero.js';
 import { ReactComponent as SvgEyeOffIcon } from '../../../shared/assets/eye-off-icon.js';
@@ -31,6 +30,7 @@ import 'viem';
 import 'viem/chains';
 import { getEOAWallet } from '../../../utils/functions/getEOAWallet/getEOAWallet.js';
 import ApiEndpoint from '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -39,14 +39,17 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
+import { cleanupExport, exportCredential, initExport } from '../utils/turnkeyExport/turnkeyExport.js';
 import { usePromise } from '../../../utils/hooks/usePromise/usePromise.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
 import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
+import '../../CollectUserDataView/useFields.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';
@@ -58,9 +61,9 @@ import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
@@ -84,20 +87,20 @@ import 'qrcode';
 import '../../WalletList/WalletList.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import { cleanupExport, exportCredential, initExport } from '../utils/turnkeyExport/turnkeyExport.js';
 import { iframeContainerId, iframeElementId } from '../constants.js';
 import '../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 
 const EmbeddedRevealView = ({ exportPrivateKey, }) => {
     var _a, _b, _c;
-    const { authToken, primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext();
+    const { primaryWallet, user, setShowAuthFlow, environmentId } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { shadowRoot } = useShadowDOMContext();
+    const { setView } = useViewContext();
     const [acknowledgement1, setAcknowledgement1] = useState(false);
     const [hasRevealedCoinbaseMpcKey, setHasRevealedCoinbaseMpcKey] = useState(false);
     const iframeContainerRef = useRef(null);
-    const decodedJwt = decodeJwt(authToken);
-    const walletProperties = (_b = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const walletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
     const isCoinbaseMpcWallet = wallet && isCoinbaseMpcWalletConnector(wallet.connector);
@@ -134,9 +137,8 @@ const EmbeddedRevealView = ({ exportPrivateKey, }) => {
         if (isTurnkeyWallet) {
             return exportCredential({
                 address: exportPrivateKey ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-                authToken,
                 environmentId,
-                userEmail: user === null || user === void 0 ? void 0 : user.email,
+                user,
                 wallet,
             });
         }
@@ -165,8 +167,16 @@ const EmbeddedRevealView = ({ exportPrivateKey, }) => {
         if (error instanceof DynamicError) {
             return error.message;
         }
-        return getProperErrorMessage(error);
-    }, [error]);
+        try {
+            return getProperErrorMessage(error);
+        }
+        catch (e) {
+            if (e instanceof AccessBlockedError) {
+                setView('access-blocked');
+            }
+            return;
+        }
+    }, [error, setView]);
     const { t } = useTranslation();
     const contentHeader = (jsx("div", { className: 'embedded-reveal-view__body__description', children: !isLoading && data && !error ? (jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: t('dyn_embedded_reveal.reveal_description') })) : (jsx("div", { className: 'embedded-reveal-view__header', children: jsx(SvgExportEmbeddedHero, {}) })) }));
     useEffect(() => {

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var decodeJwt = require('../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -19,7 +18,13 @@ require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
+var errors = require('../../../../utils/constants/errors.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
 var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
+require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
 
 const initExport = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ iframeContainer, iframeElementId, wallet, }) {
@@ -27,23 +32,19 @@ 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('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings', errors.INVALID_WALLET_DATA);
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
     if (!publicKey) {
-        throw new utils.DynamicError('Something went wrong');
+        throw new utils.DynamicError('Something went wrong', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     return turnkeyExportHandler;
 });
-const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
+const handleExportInitCheck = ({ user, wallet, }) => {
     var _a, _b;
-    if (!authToken) {
-        throw new utils.DynamicError('User must be logged in');
-    }
-    const decodedJwt = decodeJwt.decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new utils.DynamicError('User must be logged in with a valid token');
+    if (!user) {
+        throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
@@ -51,8 +52,8 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
         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);
-    const walletProperties = (_b = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    connector.setEmail(user.email);
+    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const turnkeyHDWalletId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const privateKeyId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyPrivateKeyId;
     const organizationId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeySubOrganizationId;
@@ -77,16 +78,15 @@ const extractExportBundle = ({ address, privateKeyId, activity, }) => {
         : exportWalletResult;
     return result === null || result === void 0 ? void 0 : result.exportBundle;
 };
-const exportCredential = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ authToken, userEmail, wallet, environmentId, address, }) {
+const exportCredential = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ user, wallet, environmentId, address, }) {
     const { connector, turnkeyHDWalletId, privateKeyId, organizationId } = handleExportInitCheck({
-        authToken,
-        userEmail,
+        user,
         wallet,
     });
     const turnkeyExportHandler = connector.getExportHandler();
     const targetPublicKey = turnkeyExportHandler.publicKey;
     if (!targetPublicKey) {
-        throw new utils.DynamicError('Must initialize export first');
+        throw new utils.DynamicError('Must initialize export first', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     // calls turnkey export api
     let newActivity;
@@ -117,18 +117,24 @@ const exportCredential = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function
         const res = yield embeddedWallets.exportEmbeddedWallet({
             activityId,
             environmentId,
-            userJwt: authToken || '',
             walletId: (wallet === null || wallet === void 0 ? void 0 : wallet.id) || '',
         });
         exportBundle = res === null || res === void 0 ? void 0 : res.exportBundle;
     }
     if (!exportBundle) {
-        throw new utils.DynamicError('Invalid export response');
+        throw new utils.DynamicError('Invalid export response', errors.ERROR_PROCESSING_REVEAL_REQUEST);
     }
     if (address || privateKeyId) {
-        return turnkeyExportHandler.verifyExportPrivateKey(exportBundle);
+        return turnkeyExportHandler.verifyExportPrivateKey({
+            chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain,
+            exportBundle,
+            organizationId,
+        });
     }
-    return turnkeyExportHandler.verifyExportWallet(exportBundle);
+    return turnkeyExportHandler.verifyExportWallet({
+        exportBundle,
+        organizationId,
+    });
 });
 const cleanupExport = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ wallet }) {
     var _e;

package/src/lib/views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.d.ts

@@ -1,4 +1,5 @@
 import { Wallet } from '../../../../shared';
+import { UserProfile } from '../../../../..';
 export declare const initExport: ({ iframeContainer, iframeElementId, wallet, }: {
     iframeContainer: HTMLElement;
     iframeElementId: string;
@@ -9,9 +10,8 @@ export declare const extractExportBundle: ({ address, privateKeyId, activity, }:
     privateKeyId?: string;
     activity: any;
 }) => any;
-export declare const exportCredential: ({ authToken, userEmail, wallet, environmentId, address, }: {
-    authToken: string | undefined;
-    userEmail: string | undefined;
+export declare const exportCredential: ({ user, wallet, environmentId, address, }: {
+    user: UserProfile | undefined;
     wallet: Wallet | null;
     environmentId: string;
     address?: string;

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

@@ -2,7 +2,6 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { isPasskeyWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
-import { decodeJwt } from '../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -15,7 +14,13 @@ import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../config/ApiEndpoint.js';
+import { INVALID_WALLET_DATA, ERROR_PROCESSING_REVEAL_REQUEST, USER_NOT_LOGGED_IN } from '../../../../utils/constants/errors.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
 import { exportEmbeddedWallet } from '../../../../data/api/embeddedWallets/embeddedWallets.js';
+import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
 
 const initExport = (_a) => __awaiter(void 0, [_a], void 0, function* ({ iframeContainer, iframeElementId, wallet, }) {
@@ -23,23 +28,19 @@ 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('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
+        throw new DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings', INVALID_WALLET_DATA);
     }
     const turnkeyExportHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getExportHandler();
     const publicKey = yield turnkeyExportHandler.initExport(iframeContainer, iframeElementId);
     if (!publicKey) {
-        throw new DynamicError('Something went wrong');
+        throw new DynamicError('Something went wrong', ERROR_PROCESSING_REVEAL_REQUEST);
     }
     return turnkeyExportHandler;
 });
-const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
+const handleExportInitCheck = ({ user, wallet, }) => {
     var _a, _b;
-    if (!authToken) {
-        throw new DynamicError('User must be logged in');
-    }
-    const decodedJwt = decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new DynamicError('User must be logged in with a valid token');
+    if (!user) {
+        throw new DynamicError(USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
@@ -47,8 +48,8 @@ const handleExportInitCheck = ({ authToken, userEmail, wallet, }) => {
         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);
-    const walletProperties = (_b = (_a = decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    connector.setEmail(user.email);
+    const walletProperties = (_b = (_a = user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const turnkeyHDWalletId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyHDWalletId;
     const privateKeyId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeyPrivateKeyId;
     const organizationId = walletProperties === null || walletProperties === void 0 ? void 0 : walletProperties.turnkeySubOrganizationId;
@@ -73,16 +74,15 @@ const extractExportBundle = ({ address, privateKeyId, activity, }) => {
         : exportWalletResult;
     return result === null || result === void 0 ? void 0 : result.exportBundle;
 };
-const exportCredential = (_c) => __awaiter(void 0, [_c], void 0, function* ({ authToken, userEmail, wallet, environmentId, address, }) {
+const exportCredential = (_c) => __awaiter(void 0, [_c], void 0, function* ({ user, wallet, environmentId, address, }) {
     const { connector, turnkeyHDWalletId, privateKeyId, organizationId } = handleExportInitCheck({
-        authToken,
-        userEmail,
+        user,
         wallet,
     });
     const turnkeyExportHandler = connector.getExportHandler();
     const targetPublicKey = turnkeyExportHandler.publicKey;
     if (!targetPublicKey) {
-        throw new DynamicError('Must initialize export first');
+        throw new DynamicError('Must initialize export first', ERROR_PROCESSING_REVEAL_REQUEST);
     }
     // calls turnkey export api
     let newActivity;
@@ -113,18 +113,24 @@ const exportCredential = (_c) => __awaiter(void 0, [_c], void 0, function* ({ au
         const res = yield exportEmbeddedWallet({
             activityId,
             environmentId,
-            userJwt: authToken || '',
             walletId: (wallet === null || wallet === void 0 ? void 0 : wallet.id) || '',
         });
         exportBundle = res === null || res === void 0 ? void 0 : res.exportBundle;
     }
     if (!exportBundle) {
-        throw new DynamicError('Invalid export response');
+        throw new DynamicError('Invalid export response', ERROR_PROCESSING_REVEAL_REQUEST);
     }
     if (address || privateKeyId) {
-        return turnkeyExportHandler.verifyExportPrivateKey(exportBundle);
+        return turnkeyExportHandler.verifyExportPrivateKey({
+            chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain,
+            exportBundle,
+            organizationId,
+        });
     }
-    return turnkeyExportHandler.verifyExportWallet(exportBundle);
+    return turnkeyExportHandler.verifyExportWallet({
+        exportBundle,
+        organizationId,
+    });
 });
 const cleanupExport = (_d) => __awaiter(void 0, [_d], void 0, function* ({ wallet }) {
     var _e;

package/src/lib/views/EnterPasswordView/EnterPasswordView.cjs

@@ -30,6 +30,7 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -38,12 +39,14 @@ require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../utils/hooks/useMutation/useMutation.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
+require('../CollectUserDataView/useFields.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');
@@ -55,9 +58,9 @@ require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -80,6 +83,7 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 var ToggleVisibilityButton = require('../../components/ToggleVisibilityButton/ToggleVisibilityButton.cjs');
 
 const EnterPasswordView = ({ mutation, onSuccess, onError, closeView = true, }) => {

package/src/lib/views/EnterPasswordView/EnterPasswordView.js

@@ -26,6 +26,7 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import '../../locale/locale.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
@@ -34,12 +35,14 @@ import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
 import '../../context/ThemeContext/ThemeContext.js';
+import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../utils/hooks/useMutation/useMutation.js';
 import '@dynamic-labs/types';
+import '../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../context/MockContext/MockContext.js';
+import '../CollectUserDataView/useFields.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';
@@ -51,9 +54,9 @@ import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
-import '../../context/LoadingContext/LoadingContext.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
@@ -76,6 +79,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 '../../context/IpConfigurationContext/IpConfigurationContext.js';
 import { ToggleVisibilityButton } from '../../components/ToggleVisibilityButton/ToggleVisibilityButton.js';
 
 const EnterPasswordView = ({ mutation, onSuccess, onError, closeView = true, }) => {

package/src/lib/views/FarcasterConnectView/FarcasterConnectView.cjs

@@ -26,6 +26,7 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -34,14 +35,16 @@ require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
 var useIconThemeVariant = require('../../utils/hooks/useIconThemeVariant/useIconThemeVariant.cjs');
+require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
+require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../context/MockContext/MockContext.cjs');
-require('react-i18next');
+require('../CollectUserDataView/useFields.cjs');
 require('../../context/FieldsStateContext/FieldsStateContext.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');
@@ -50,10 +53,10 @@ require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 require('../../context/ThemeContext/ThemeContext.cjs');
-require('../../context/LoadingContext/LoadingContext.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -74,6 +77,7 @@ require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 
 const FarcasterConnectView = ({ url }) => {
     const iconThemeVariant = useIconThemeVariant.useIconThemeVariant();