@dynamic-labs/sdk-react-core 4.103.0 → 4.104.0

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## [4.104.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.103.0...v4.104.0) (2026-11-03)
+
+
+### Features
+
+* **sdk-react-core:** offer passkey recovery when export fails in upgrade flow [v4] ([#12641](https://github.com/dynamic-labs/dynamic-auth/issues/12641)) ([916829f](https://github.com/dynamic-labs/dynamic-auth/commit/916829f1eaf9f6cae7d8c0b5069512fceafa15a4))
+* **webview:** forward policiesConsentLabels manifest field to SDK settings [v4] ([#12608](https://github.com/dynamic-labs/dynamic-auth/issues/12608)) ([b9ef167](https://github.com/dynamic-labs/dynamic-auth/commit/b9ef1676576eea8452c7149308492aea578b6c91))
+
+
+### Bug Fixes
+
+* **iconic:** add Zerion wallet icon [v4] ([#12651](https://github.com/dynamic-labs/dynamic-auth/issues/12651)) ([f5257ee](https://github.com/dynamic-labs/dynamic-auth/commit/f5257ee28fc7e8d46657957f59c13503e7eccce8))
+* **react-native:** serialize WalletConnect native storage values as JSON strings ([#12682](https://github.com/dynamic-labs/dynamic-auth/issues/12682)) ([df2795a](https://github.com/dynamic-labs/dynamic-auth/commit/df2795aa432a94e429859082468b89705226dc70))
+* **sdk-react-core:** default wallet return redirectUrl to current page [v4] ([#12660](https://github.com/dynamic-labs/dynamic-auth/issues/12660)) ([29b8f38](https://github.com/dynamic-labs/dynamic-auth/commit/29b8f380858ef65c52187aeb50123a287eb7b4ec))
+* **waas-svm:** keep the blockhash of a transaction another key already signed ([#12678](https://github.com/dynamic-labs/dynamic-auth/issues/12678)) ([549553c](https://github.com/dynamic-labs/dynamic-auth/commit/549553c1275b3cc3995e183966a32a5f6ae63534)), closes [#12676](https://github.com/dynamic-labs/dynamic-auth/issues/12676)
+
 ## [4.103.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.102.0...v4.103.0) (2026-10-27)
 
 

package/package.cjs

@@ -3,10 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.103.0";
+var version = "4.104.0";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.136.0",
-	"@dynamic-labs-sdk/client": "1.47.0",
+	"@dynamic-labs/sdk-api-core": "0.142.0",
+	"@dynamic-labs-sdk/client": "1.48.0",
 	"@dynamic-labs-wallet/browser-wallet-client": "1.1.43",
 	"@dynamic-labs-wallet/forward-mpc-client": "2.0.2",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,8 +1,8 @@
 'use client'
-var version = "4.103.0";
+var version = "4.104.0";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.136.0",
-	"@dynamic-labs-sdk/client": "1.47.0",
+	"@dynamic-labs/sdk-api-core": "0.142.0",
+	"@dynamic-labs-sdk/client": "1.48.0",
 	"@dynamic-labs-wallet/browser-wallet-client": "1.1.43",
 	"@dynamic-labs-wallet/forward-mpc-client": "2.0.2",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.103.0",
+  "version": "4.104.0",
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.136.0",
-    "@dynamic-labs-sdk/client": "1.47.0",
+    "@dynamic-labs/sdk-api-core": "0.142.0",
+    "@dynamic-labs-sdk/client": "1.48.0",
     "@dynamic-labs-wallet/browser-wallet-client": "1.1.43",
     "@dynamic-labs-wallet/forward-mpc-client": "2.0.2",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -18,17 +18,17 @@
     "react-i18next": "13.5.0",
     "react-international-phone": "4.5.0",
     "yup": "0.32.11",
-    "@dynamic-labs/assert-package-version": "4.103.0",
-    "@dynamic-labs/iconic": "4.103.0",
-    "@dynamic-labs/locale": "4.103.0",
-    "@dynamic-labs/logger": "4.103.0",
-    "@dynamic-labs/multi-wallet": "4.103.0",
-    "@dynamic-labs/rpc-providers": "4.103.0",
-    "@dynamic-labs/store": "4.103.0",
-    "@dynamic-labs/types": "4.103.0",
-    "@dynamic-labs/utils": "4.103.0",
-    "@dynamic-labs/wallet-book": "4.103.0",
-    "@dynamic-labs/wallet-connector-core": "4.103.0",
+    "@dynamic-labs/assert-package-version": "4.104.0",
+    "@dynamic-labs/iconic": "4.104.0",
+    "@dynamic-labs/locale": "4.104.0",
+    "@dynamic-labs/logger": "4.104.0",
+    "@dynamic-labs/multi-wallet": "4.104.0",
+    "@dynamic-labs/rpc-providers": "4.104.0",
+    "@dynamic-labs/store": "4.104.0",
+    "@dynamic-labs/types": "4.104.0",
+    "@dynamic-labs/utils": "4.104.0",
+    "@dynamic-labs/wallet-book": "4.104.0",
+    "@dynamic-labs/wallet-connector-core": "4.104.0",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/NeedHelpSection/NeedHelpSection.cjs

@@ -15,7 +15,7 @@ var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
-const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCredential, }) => {
+const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCredential, goBack, wallet, }) => {
     var _a, _b, _c, _d, _e, _f;
     const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
@@ -36,9 +36,8 @@ const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCrede
             return (jsxRuntime.jsx(TextButton.TextButton, { copykey: 'dyn_need_help_section.help_button', className: classNames.classNames('need-help-section__helper-link'), onClick: () => initPasskeyRecoveryProcess(undefined, {
                     settings: isExport
                         ? {
-                            goBack: () => {
-                                pushView('embedded-reveal-view');
-                            },
+                            goBack: goBack !== null && goBack !== void 0 ? goBack : (() => pushView('embedded-reveal-view')),
+                            wallet,
                         }
                         : undefined,
                     type: 'helpSession',

package/src/lib/components/NeedHelpSection/NeedHelpSection.d.ts

@@ -1,9 +1,12 @@
 /// <reference types="react" />
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+import { Wallet, WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
 type Props = {
     isRecoveryFlow?: boolean;
     isExport?: boolean;
     walletCredential?: JwtVerifiedCredential;
+    goBack?: () => void;
+    wallet?: Wallet<WalletConnectorCore.WalletConnector>;
 };
-export declare const NeedHelpSection: ({ isRecoveryFlow, isExport, walletCredential, }: Props) => JSX.Element | null;
+export declare const NeedHelpSection: ({ isRecoveryFlow, isExport, walletCredential, goBack, wallet, }: Props) => JSX.Element | null;
 export {};

package/src/lib/components/NeedHelpSection/NeedHelpSection.js

@@ -11,7 +11,7 @@ import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import '../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
-const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCredential, }) => {
+const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCredential, goBack, wallet, }) => {
     var _a, _b, _c, _d, _e, _f;
     const { projectSettings } = useInternalDynamicContext();
     const { t } = useTranslation();
@@ -32,9 +32,8 @@ const NeedHelpSection = ({ isRecoveryFlow = false, isExport = false, walletCrede
             return (jsx(TextButton, { copykey: 'dyn_need_help_section.help_button', className: classNames('need-help-section__helper-link'), onClick: () => initPasskeyRecoveryProcess(undefined, {
                     settings: isExport
                         ? {
-                            goBack: () => {
-                                pushView('embedded-reveal-view');
-                            },
+                            goBack: goBack !== null && goBack !== void 0 ? goBack : (() => pushView('embedded-reveal-view')),
+                            wallet,
                         }
                         : undefined,
                     type: 'helpSession',

package/src/lib/shared/types/embeddedWallets.d.ts

@@ -1,3 +1,4 @@
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
 export type EmbeddedWalletSessionSettings = {
     emailCode: string;
     userId: string;
@@ -5,6 +6,7 @@ export type EmbeddedWalletSessionSettings = {
 };
 export type EmbeddedWalletCurrentActionSettings = {
     goBack?: () => void;
+    wallet?: Wallet;
 };
 export type EmbeddedWalletCurrentAction = {
     type: 'signMessage' | 'sendTransaction' | 'helpSession' | 'signTransaction' | 'reveal';

package/src/lib/store/utils/settingsUtils/settingsUtils.cjs

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var React = require('react');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs/sdk-api-core');
-require('react');
 require('eventemitter3');
 require('@dynamic-labs/utils');
 require('@dynamic-labs-sdk/client');
@@ -16,6 +16,7 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
+var isSSR = require('../../../shared/utils/functions/isSSR/isSSR.cjs');
 require('../../../utils/constants/colors.cjs');
 require('../../../utils/constants/values.cjs');
 require('../../../shared/consts/index.cjs');
@@ -39,7 +40,25 @@ const useDynamicSettingsValue = (projectSettingName, dynamicSettingName) => {
     return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general[projectSettingName]) !== null && _a !== void 0 ? _a : dynamicSettings[dynamicSettingName]);
 };
 const useAppName = () => useDynamicSettingsValue('displayName', 'appName');
-const useRedirectUrl = () => dynamicContextProps.useDynamicSettings().redirectUrl;
+// Mobile wallets that connect via deeplink (e.g. Backpack over WalletConnect)
+// return the user through the redirect metadata/deeplink param built from this
+// value. With no explicit redirectUrl there is nothing to return through, so
+// the wallet falls back to opening the dapp in the system browser. Defaulting
+// to the current page keeps the return inside the dapp. `||` is intentional:
+// an empty redirectUrl is meaningless to wallets and should fall back too. The
+// fallback strips query and fragment so ambient credentials in the URL (e.g.
+// auth tokens) are never handed to the wallet as return metadata. The fallback
+// is captured once via a lazy useState initializer rather than derived on every
+// render: client-side navigation changes the pathname, and redirectUrl feeds
+// the walletConnectorOptions memo — a changing value would rebuild every
+// wallet connector mid-session and drop imperatively-set providers (e.g. the
+// waas password provider).
+const useRedirectUrl = () => {
+    const [locationFallback] = React.useState(() => isSSR.isSSR()
+        ? undefined
+        : `${window.location.origin}${window.location.pathname}`);
+    return dynamicContextProps.useDynamicSettings().redirectUrl || locationFallback;
+};
 
 exports.useAppName = useAppName;
 exports.useRedirectUrl = useRedirectUrl;

package/src/lib/store/utils/settingsUtils/settingsUtils.js

@@ -1,7 +1,7 @@
 'use client'
+import { useState } from 'react';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs/sdk-api-core';
-import 'react';
 import 'eventemitter3';
 import '@dynamic-labs/utils';
 import '@dynamic-labs-sdk/client';
@@ -12,6 +12,7 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
+import { isSSR } from '../../../shared/utils/functions/isSSR/isSSR.js';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/consts/index.js';
@@ -35,6 +36,24 @@ const useDynamicSettingsValue = (projectSettingName, dynamicSettingName) => {
     return ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.general[projectSettingName]) !== null && _a !== void 0 ? _a : dynamicSettings[dynamicSettingName]);
 };
 const useAppName = () => useDynamicSettingsValue('displayName', 'appName');
-const useRedirectUrl = () => useDynamicSettings().redirectUrl;
+// Mobile wallets that connect via deeplink (e.g. Backpack over WalletConnect)
+// return the user through the redirect metadata/deeplink param built from this
+// value. With no explicit redirectUrl there is nothing to return through, so
+// the wallet falls back to opening the dapp in the system browser. Defaulting
+// to the current page keeps the return inside the dapp. `||` is intentional:
+// an empty redirectUrl is meaningless to wallets and should fall back too. The
+// fallback strips query and fragment so ambient credentials in the URL (e.g.
+// auth tokens) are never handed to the wallet as return metadata. The fallback
+// is captured once via a lazy useState initializer rather than derived on every
+// render: client-side navigation changes the pathname, and redirectUrl feeds
+// the walletConnectorOptions memo — a changing value would rebuild every
+// wallet connector mid-session and drop imperatively-set providers (e.g. the
+// waas password provider).
+const useRedirectUrl = () => {
+    const [locationFallback] = useState(() => isSSR()
+        ? undefined
+        : `${window.location.origin}${window.location.pathname}`);
+    return useDynamicSettings().redirectUrl || locationFallback;
+};
 
 export { useAppName, useRedirectUrl };

package/src/lib/utils/hooks/usePasskeyRecovery/usePasskeyRecovery.cjs

@@ -99,7 +99,10 @@ const usePasskeyRecovery = () => {
         return true;
     }), [wallet, isTurnkeyWalletWithoutAuthenticator, isSessionRestored]);
     const initPasskeyRecoveryProcess = React.useCallback((authenticatorType, currentAction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f;
+        var _f, _g, _h;
+        // Recovery can target a non-primary wallet (e.g. a later wallet in the
+        // upgrade flow); fall back to the primary wallet.
+        const recoveryWallet = (_g = (_f = currentAction === null || currentAction === void 0 ? void 0 : currentAction.settings) === null || _f === void 0 ? void 0 : _f.wallet) !== null && _g !== void 0 ? _g : wallet;
         const validateRecoveryRequest = () => {
             if (!user$1) {
                 throw new Error(errors.USER_NOT_LOGGED_IN);
@@ -110,25 +113,26 @@ const usePasskeyRecovery = () => {
             if (!hasEmbeddedWallet.hasEmbeddedWallet(user$1)) {
                 throw new Error('Dynamic embedded wallet not found');
             }
-            if (wallet && !walletConnectorCore.isPasskeyWalletConnector(wallet.connector)) {
+            if (recoveryWallet &&
+                !walletConnectorCore.isPasskeyWalletConnector(recoveryWallet.connector)) {
                 throw new Error('Dynamic embedded wallet not found.');
             }
         };
         validateRecoveryRequest();
-        const turnkeyRecoveryHandler = (wallet === null || wallet === void 0 ? void 0 : wallet.connector).getAuthenticatorHandler();
+        const turnkeyRecoveryHandler = (recoveryWallet === null || recoveryWallet === void 0 ? void 0 : recoveryWallet.connector).getAuthenticatorHandler();
         // email auth - session is still up, so create passkey authenticator usign the same session
         if (authenticatorType === 'passkey' &&
             turnkeyRecoveryHandler.isSessionActive()) {
             yield passkeyRecovery.addNewPasskeyAuthenticator({
                 environmentId,
                 user: user$1,
-                wallet: wallet,
+                wallet: recoveryWallet,
             });
             setShowAuthFlow(false);
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            return wallet;
+            return recoveryWallet;
         }
-        const supportedAuthenticators = getEnabledEmbeddedWalletsAuthenticators.getEnabledEmbeddedWalletsAuthenticators((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.supportedSecurityMethods);
+        const supportedAuthenticators = getEnabledEmbeddedWalletsAuthenticators.getEnabledEmbeddedWalletsAuthenticators((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.supportedSecurityMethods);
         const supportedAuthenticatorMethods = supportedAuthenticators
             ? Object.keys(supportedAuthenticators)
             : [];

package/src/lib/utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js

@@ -95,7 +95,10 @@ const usePasskeyRecovery = () => {
         return true;
     }), [wallet, isTurnkeyWalletWithoutAuthenticator, isSessionRestored]);
     const initPasskeyRecoveryProcess = useCallback((authenticatorType, currentAction) => __awaiter(void 0, void 0, void 0, function* () {
-        var _f;
+        var _f, _g, _h;
+        // Recovery can target a non-primary wallet (e.g. a later wallet in the
+        // upgrade flow); fall back to the primary wallet.
+        const recoveryWallet = (_g = (_f = currentAction === null || currentAction === void 0 ? void 0 : currentAction.settings) === null || _f === void 0 ? void 0 : _f.wallet) !== null && _g !== void 0 ? _g : wallet;
         const validateRecoveryRequest = () => {
             if (!user) {
                 throw new Error(USER_NOT_LOGGED_IN);
@@ -106,25 +109,26 @@ const usePasskeyRecovery = () => {
             if (!hasEmbeddedWallet(user)) {
                 throw new Error('Dynamic embedded wallet not found');
             }
-            if (wallet && !isPasskeyWalletConnector(wallet.connector)) {
+            if (recoveryWallet &&
+                !isPasskeyWalletConnector(recoveryWallet.connector)) {
                 throw new Error('Dynamic embedded wallet not found.');
             }
         };
         validateRecoveryRequest();
-        const turnkeyRecoveryHandler = (wallet === null || wallet === void 0 ? void 0 : wallet.connector).getAuthenticatorHandler();
+        const turnkeyRecoveryHandler = (recoveryWallet === null || recoveryWallet === void 0 ? void 0 : recoveryWallet.connector).getAuthenticatorHandler();
         // email auth - session is still up, so create passkey authenticator usign the same session
         if (authenticatorType === 'passkey' &&
             turnkeyRecoveryHandler.isSessionActive()) {
             yield addNewPasskeyAuthenticator({
                 environmentId,
                 user,
-                wallet: wallet,
+                wallet: recoveryWallet,
             });
             setShowAuthFlow(false);
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            return wallet;
+            return recoveryWallet;
         }
-        const supportedAuthenticators = getEnabledEmbeddedWalletsAuthenticators((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.supportedSecurityMethods);
+        const supportedAuthenticators = getEnabledEmbeddedWalletsAuthenticators((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.supportedSecurityMethods);
         const supportedAuthenticatorMethods = supportedAuthenticators
             ? Object.keys(supportedAuthenticators)
             : [];

package/src/lib/views/WalletUpgradeFlowView/WalletUpgradeFlowView.cjs

@@ -78,6 +78,7 @@ var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs
 require('../../components/IconButton/IconButton.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
+var getProperErrorMessage = require('../../modals/SignMessageConfirmationModal/getProperErrorMessage.cjs');
 var useDynamicWaas = require('../../utils/hooks/useDynamicWaas/useDynamicWaas.cjs');
 var useRefreshAuth = require('../../utils/hooks/useRefreshAuth/useRefreshAuth.cjs');
 require('../../utils/hooks/useWalletDelegation/DelegationError.cjs');
@@ -104,6 +105,7 @@ require('../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePas
 require('../../widgets/DynamicWidget/views/ManageTotpMfaWidgetView/ManageTotpMfaWidgetView.cjs');
 require('../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 var Textarea = require('../../components/Textarea/Textarea.cjs');
+var NeedHelpSection = require('../../components/NeedHelpSection/NeedHelpSection.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('@marsidev/react-turnstile');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
@@ -124,19 +126,20 @@ require('../../components/IsBrowser/IsBrowser.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 
-const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
-    var _a;
+const WalletUpgradeFlowView = ({ wallets, method, startIndex = 0, onComplete, onCancel, }) => {
+    var _a, _b;
     const { setShowAuthFlow, user, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const { upgradeToDynamicWaas } = useDynamicWaas.useDynamicWaas();
     const { t } = reactI18next.useTranslation();
     const { pushView } = ViewContext.useViewContext();
-    const [currentWalletIndex, setCurrentWalletIndex] = React.useState(0);
+    const [currentWalletIndex, setCurrentWalletIndex] = React.useState(startIndex);
     const [privateKeyInput, setPrivateKeyInput] = React.useState('');
     const [iframeContainerRef, setIframeContainerRef] = React.useState(null);
     const isLastWallet = currentWalletIndex === wallets.length - 1;
     const completedSteps = currentWalletIndex;
     const totalSteps = wallets.length;
     const refresh = useRefreshAuth.useRefreshAuth();
+    const walletCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((cred) => { var _a; return cred.address === ((_a = wallets[currentWalletIndex]) === null || _a === void 0 ? void 0 : _a.address); });
     // Check if current wallet is a WaaS wallet based on its properties
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const onExportReady = (isReady, wallet) => {
@@ -159,6 +162,22 @@ const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
             dynamicEvents.dynamicEvents.emit('embeddedWalletRevealFailed', err);
         },
     });
+    // Map the raw export failure (e.g. a rejected WebAuthn ceremony) to the
+    // same user-facing copy the main widget export view shows.
+    const exportErrorText = React.useMemo(() => {
+        if (!exportError) {
+            return undefined;
+        }
+        try {
+            return getProperErrorMessage.getProperErrorMessage(exportError, user);
+        }
+        catch (e) {
+            if (e instanceof utils.AccessBlockedError) {
+                pushView('access-blocked');
+            }
+            return undefined;
+        }
+    }, [exportError, pushView, user]);
     // Track successful export for emitting event on unmount
     const revealedWalletRef = React.useRef(null);
     React.useEffect(() => {
@@ -216,11 +235,13 @@ const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
                                         ? 'wallet-upgrade-flow-view__step--completed'
                                         : ''} ${index === currentWalletIndex
                                         ? 'wallet-upgrade-flow-view__step--current'
-                                        : ''}`, children: [jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-indicator', children: index < completedSteps ? (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-check', children: "\u2713" })) : (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-number', children: index + 1 })) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: index <= currentWalletIndex ? 'primary' : 'secondary', className: 'wallet-upgrade-flow-view__step-title', children: getStepTitle(index) })] }), index < totalSteps - 1 && (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-separator' }))] }, index))) }) })) }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__content', children: [exportError && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: exportError instanceof Error
-                            ? exportError.message
-                            : t('dyn_wallet_upgrade_flow.export_failed') })), upgradeError && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: upgradeError instanceof Error
+                                        : ''}`, children: [jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-indicator', children: index < completedSteps ? (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-check', children: "\u2713" })) : (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-number', children: index + 1 })) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: index <= currentWalletIndex ? 'primary' : 'secondary', className: 'wallet-upgrade-flow-view__step-title', children: getStepTitle(index) })] }), index < totalSteps - 1 && (jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__step-separator' }))] }, index))) }) })) }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__content', children: [exportError && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: exportErrorText !== null && exportErrorText !== void 0 ? exportErrorText : t('dyn_wallet_upgrade_flow.export_failed') })), upgradeError && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: upgradeError instanceof Error
                             ? upgradeError.message
-                            : t('dyn_wallet_upgrade_flow.upgrade_failed') })), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__title-section', children: [jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', children: t('dyn_wallet_upgrade_flow.title') }), jsxRuntime.jsx(Typography.Typography, { color: 'secondary', className: 'wallet-upgrade-flow-view__subtitle', children: t('dyn_wallet_upgrade_flow.copy_private_key_subtitle') })] }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__export-section', children: [jsxRuntime.jsx(Typography.Typography, { color: 'primary', variant: 'body_normal', weight: 'bold', className: 'wallet-upgrade-flow-view__section-title', children: t('dyn_wallet_upgrade_flow.copy_private_key_title') }), jsxRuntime.jsx(EmbeddedWalletExport.EmbeddedWalletExport, { wallet: wallets[currentWalletIndex], isTurnkeyWallet: true, isWaasWallet: isWaasWallet, data: exportData, onIframeContainerRef: setIframeContainerRef, onExportReady: onExportReady }, `wallet-export-${currentWalletIndex}-${(_a = wallets[currentWalletIndex]) === null || _a === void 0 ? void 0 : _a.id}`)] }), jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__input-section', children: jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__input-container', children: [jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', weight: 'bold', color: 'primary', copykey: 'dyn_embedded_reveal.step_2_title', children: [jsxRuntime.jsx("span", { className: 'wallet-upgrade-flow__step-description', children: t('dyn_wallet_upgrade_flow.step_2_upgrade_description') }), ' '] }), jsxRuntime.jsx(Textarea.Textarea, { id: 'paste-private-key-input', value: privateKeyInput, onChange: (e) => setPrivateKeyInput(e.target.value), variant: 'regular', className: 'wallet-upgrade-flow__paste-input', label: '' })] }) })] }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__actions', children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'brand-primary', onClick: () => handleUpgradeWallet(), disabled: !privateKeyInput.trim() || isUpgrading, loading: isUpgrading, copykey: 'dyn_wallet_upgrade_flow.upgrade_button', typographyProps: {
+                            : t('dyn_wallet_upgrade_flow.upgrade_failed') })), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__title-section', children: [jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', children: t('dyn_wallet_upgrade_flow.title') }), jsxRuntime.jsx(Typography.Typography, { color: 'secondary', className: 'wallet-upgrade-flow-view__subtitle', children: t('dyn_wallet_upgrade_flow.copy_private_key_subtitle') })] }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__export-section', children: [jsxRuntime.jsx(Typography.Typography, { color: 'primary', variant: 'body_normal', weight: 'bold', className: 'wallet-upgrade-flow-view__section-title', children: t('dyn_wallet_upgrade_flow.copy_private_key_title') }), jsxRuntime.jsx(EmbeddedWalletExport.EmbeddedWalletExport, { wallet: wallets[currentWalletIndex], isTurnkeyWallet: true, isWaasWallet: isWaasWallet, data: exportData, onIframeContainerRef: setIframeContainerRef, onExportReady: onExportReady }, `wallet-export-${currentWalletIndex}-${(_b = wallets[currentWalletIndex]) === null || _b === void 0 ? void 0 : _b.id}`)] }), jsxRuntime.jsx("div", { className: 'wallet-upgrade-flow-view__input-section', children: jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__input-container', children: [jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', weight: 'bold', color: 'primary', copykey: 'dyn_embedded_reveal.step_2_title', children: [jsxRuntime.jsx("span", { className: 'wallet-upgrade-flow__step-description', children: t('dyn_wallet_upgrade_flow.step_2_upgrade_description') }), ' '] }), jsxRuntime.jsx(Textarea.Textarea, { id: 'paste-private-key-input', value: privateKeyInput, onChange: (e) => setPrivateKeyInput(e.target.value), variant: 'regular', className: 'wallet-upgrade-flow__paste-input', label: '' })] }) }), exportError && (jsxRuntime.jsx(NeedHelpSection.NeedHelpSection, { isExport: true, walletCredential: walletCredential, wallet: wallets[currentWalletIndex], goBack: () => pushView('wallet-upgrade-flow-view', {
+                            method,
+                            startIndex: currentWalletIndex,
+                            wallets,
+                        }) }))] }), jsxRuntime.jsxs("div", { className: 'wallet-upgrade-flow-view__actions', children: [jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'brand-primary', onClick: () => handleUpgradeWallet(), disabled: !privateKeyInput.trim() || isUpgrading, loading: isUpgrading, copykey: 'dyn_wallet_upgrade_flow.upgrade_button', typographyProps: {
                             color: 'inherit',
                         }, expanded: true, children: t('dyn_wallet_upgrade_flow.upgrade_wallet') }), jsxRuntime.jsx(TypographyButton.TypographyButton, { buttonVariant: 'tertiary', onClick: handleClose, disabled: isUpgrading, children: t('dyn_wallet_upgrade_flow.cancel') })] })] }));
 };

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

@@ -3,6 +3,7 @@ import { Wallet, WalletConnectorCore } from '@dynamic-labs/wallet-connector-core
 export interface WalletUpgradeFlowViewProps {
     wallets: Wallet<WalletConnectorCore.WalletConnector>[];
     method: 'new' | 'existing';
+    startIndex?: number;
     onComplete?: () => void;
     onCancel?: () => void;
 }

package/src/lib/views/WalletUpgradeFlowView/WalletUpgradeFlowView.js

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { useState, useRef, useEffect } from 'react';
+import { useState, useMemo, useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DynamicError } from '@dynamic-labs/utils';
+import { AccessBlockedError, DynamicError } from '@dynamic-labs/utils';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '@dynamic-labs/iconic';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
@@ -74,6 +74,7 @@ import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.j
 import '../../components/IconButton/IconButton.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
+import { getProperErrorMessage } from '../../modals/SignMessageConfirmationModal/getProperErrorMessage.js';
 import { useDynamicWaas } from '../../utils/hooks/useDynamicWaas/useDynamicWaas.js';
 import { useRefreshAuth } from '../../utils/hooks/useRefreshAuth/useRefreshAuth.js';
 import '../../utils/hooks/useWalletDelegation/DelegationError.js';
@@ -100,6 +101,7 @@ import '../../widgets/DynamicWidget/views/ManagePasskeysMfaWidgetView/ManagePass
 import '../../widgets/DynamicWidget/views/ManageTotpMfaWidgetView/ManageTotpMfaWidgetView.js';
 import '../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import { Textarea } from '../../components/Textarea/Textarea.js';
+import { NeedHelpSection } from '../../components/NeedHelpSection/NeedHelpSection.js';
 import '@hcaptcha/react-hcaptcha';
 import '@marsidev/react-turnstile';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
@@ -120,19 +122,20 @@ import '../../components/IsBrowser/IsBrowser.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 
-const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
-    var _a;
+const WalletUpgradeFlowView = ({ wallets, method, startIndex = 0, onComplete, onCancel, }) => {
+    var _a, _b;
     const { setShowAuthFlow, user, environmentId } = useInternalDynamicContext();
     const { upgradeToDynamicWaas } = useDynamicWaas();
     const { t } = useTranslation();
     const { pushView } = useViewContext();
-    const [currentWalletIndex, setCurrentWalletIndex] = useState(0);
+    const [currentWalletIndex, setCurrentWalletIndex] = useState(startIndex);
     const [privateKeyInput, setPrivateKeyInput] = useState('');
     const [iframeContainerRef, setIframeContainerRef] = useState(null);
     const isLastWallet = currentWalletIndex === wallets.length - 1;
     const completedSteps = currentWalletIndex;
     const totalSteps = wallets.length;
     const refresh = useRefreshAuth();
+    const walletCredential = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find((cred) => { var _a; return cred.address === ((_a = wallets[currentWalletIndex]) === null || _a === void 0 ? void 0 : _a.address); });
     // Check if current wallet is a WaaS wallet based on its properties
     const isWaasWallet = Boolean(user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => { var _a; return (_a = vc.walletName) === null || _a === void 0 ? void 0 : _a.startsWith('dynamicwaas'); }));
     const onExportReady = (isReady, wallet) => {
@@ -155,6 +158,22 @@ const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
             dynamicEvents.emit('embeddedWalletRevealFailed', err);
         },
     });
+    // Map the raw export failure (e.g. a rejected WebAuthn ceremony) to the
+    // same user-facing copy the main widget export view shows.
+    const exportErrorText = useMemo(() => {
+        if (!exportError) {
+            return undefined;
+        }
+        try {
+            return getProperErrorMessage(exportError, user);
+        }
+        catch (e) {
+            if (e instanceof AccessBlockedError) {
+                pushView('access-blocked');
+            }
+            return undefined;
+        }
+    }, [exportError, pushView, user]);
     // Track successful export for emitting event on unmount
     const revealedWalletRef = useRef(null);
     useEffect(() => {
@@ -212,11 +231,13 @@ const WalletUpgradeFlowView = ({ wallets, method, onComplete, onCancel, }) => {
                                         ? 'wallet-upgrade-flow-view__step--completed'
                                         : ''} ${index === currentWalletIndex
                                         ? 'wallet-upgrade-flow-view__step--current'
-                                        : ''}`, children: [jsx("div", { className: 'wallet-upgrade-flow-view__step-indicator', children: index < completedSteps ? (jsx("div", { className: 'wallet-upgrade-flow-view__step-check', children: "\u2713" })) : (jsx("div", { className: 'wallet-upgrade-flow-view__step-number', children: index + 1 })) }), jsx(Typography, { variant: 'body_small', color: index <= currentWalletIndex ? 'primary' : 'secondary', className: 'wallet-upgrade-flow-view__step-title', children: getStepTitle(index) })] }), index < totalSteps - 1 && (jsx("div", { className: 'wallet-upgrade-flow-view__step-separator' }))] }, index))) }) })) }), jsxs("div", { className: 'wallet-upgrade-flow-view__content', children: [exportError && (jsx(ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: exportError instanceof Error
-                            ? exportError.message
-                            : t('dyn_wallet_upgrade_flow.export_failed') })), upgradeError && (jsx(ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: upgradeError instanceof Error
+                                        : ''}`, children: [jsx("div", { className: 'wallet-upgrade-flow-view__step-indicator', children: index < completedSteps ? (jsx("div", { className: 'wallet-upgrade-flow-view__step-check', children: "\u2713" })) : (jsx("div", { className: 'wallet-upgrade-flow-view__step-number', children: index + 1 })) }), jsx(Typography, { variant: 'body_small', color: index <= currentWalletIndex ? 'primary' : 'secondary', className: 'wallet-upgrade-flow-view__step-title', children: getStepTitle(index) })] }), index < totalSteps - 1 && (jsx("div", { className: 'wallet-upgrade-flow-view__step-separator' }))] }, index))) }) })) }), jsxs("div", { className: 'wallet-upgrade-flow-view__content', children: [exportError && (jsx(ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: exportErrorText !== null && exportErrorText !== void 0 ? exportErrorText : t('dyn_wallet_upgrade_flow.export_failed') })), upgradeError && (jsx(ErrorContainer, { className: 'wallet-upgrade-flow-view__error', children: upgradeError instanceof Error
                             ? upgradeError.message
-                            : t('dyn_wallet_upgrade_flow.upgrade_failed') })), jsxs("div", { className: 'wallet-upgrade-flow-view__title-section', children: [jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', children: t('dyn_wallet_upgrade_flow.title') }), jsx(Typography, { color: 'secondary', className: 'wallet-upgrade-flow-view__subtitle', children: t('dyn_wallet_upgrade_flow.copy_private_key_subtitle') })] }), jsxs("div", { className: 'wallet-upgrade-flow-view__export-section', children: [jsx(Typography, { color: 'primary', variant: 'body_normal', weight: 'bold', className: 'wallet-upgrade-flow-view__section-title', children: t('dyn_wallet_upgrade_flow.copy_private_key_title') }), jsx(EmbeddedWalletExport, { wallet: wallets[currentWalletIndex], isTurnkeyWallet: true, isWaasWallet: isWaasWallet, data: exportData, onIframeContainerRef: setIframeContainerRef, onExportReady: onExportReady }, `wallet-export-${currentWalletIndex}-${(_a = wallets[currentWalletIndex]) === null || _a === void 0 ? void 0 : _a.id}`)] }), jsx("div", { className: 'wallet-upgrade-flow-view__input-section', children: jsxs("div", { className: 'wallet-upgrade-flow-view__input-container', children: [jsxs(Typography, { variant: 'body_normal', weight: 'bold', color: 'primary', copykey: 'dyn_embedded_reveal.step_2_title', children: [jsx("span", { className: 'wallet-upgrade-flow__step-description', children: t('dyn_wallet_upgrade_flow.step_2_upgrade_description') }), ' '] }), jsx(Textarea, { id: 'paste-private-key-input', value: privateKeyInput, onChange: (e) => setPrivateKeyInput(e.target.value), variant: 'regular', className: 'wallet-upgrade-flow__paste-input', label: '' })] }) })] }), jsxs("div", { className: 'wallet-upgrade-flow-view__actions', children: [jsx(TypographyButton, { buttonVariant: 'brand-primary', onClick: () => handleUpgradeWallet(), disabled: !privateKeyInput.trim() || isUpgrading, loading: isUpgrading, copykey: 'dyn_wallet_upgrade_flow.upgrade_button', typographyProps: {
+                            : t('dyn_wallet_upgrade_flow.upgrade_failed') })), jsxs("div", { className: 'wallet-upgrade-flow-view__title-section', children: [jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', children: t('dyn_wallet_upgrade_flow.title') }), jsx(Typography, { color: 'secondary', className: 'wallet-upgrade-flow-view__subtitle', children: t('dyn_wallet_upgrade_flow.copy_private_key_subtitle') })] }), jsxs("div", { className: 'wallet-upgrade-flow-view__export-section', children: [jsx(Typography, { color: 'primary', variant: 'body_normal', weight: 'bold', className: 'wallet-upgrade-flow-view__section-title', children: t('dyn_wallet_upgrade_flow.copy_private_key_title') }), jsx(EmbeddedWalletExport, { wallet: wallets[currentWalletIndex], isTurnkeyWallet: true, isWaasWallet: isWaasWallet, data: exportData, onIframeContainerRef: setIframeContainerRef, onExportReady: onExportReady }, `wallet-export-${currentWalletIndex}-${(_b = wallets[currentWalletIndex]) === null || _b === void 0 ? void 0 : _b.id}`)] }), jsx("div", { className: 'wallet-upgrade-flow-view__input-section', children: jsxs("div", { className: 'wallet-upgrade-flow-view__input-container', children: [jsxs(Typography, { variant: 'body_normal', weight: 'bold', color: 'primary', copykey: 'dyn_embedded_reveal.step_2_title', children: [jsx("span", { className: 'wallet-upgrade-flow__step-description', children: t('dyn_wallet_upgrade_flow.step_2_upgrade_description') }), ' '] }), jsx(Textarea, { id: 'paste-private-key-input', value: privateKeyInput, onChange: (e) => setPrivateKeyInput(e.target.value), variant: 'regular', className: 'wallet-upgrade-flow__paste-input', label: '' })] }) }), exportError && (jsx(NeedHelpSection, { isExport: true, walletCredential: walletCredential, wallet: wallets[currentWalletIndex], goBack: () => pushView('wallet-upgrade-flow-view', {
+                            method,
+                            startIndex: currentWalletIndex,
+                            wallets,
+                        }) }))] }), jsxs("div", { className: 'wallet-upgrade-flow-view__actions', children: [jsx(TypographyButton, { buttonVariant: 'brand-primary', onClick: () => handleUpgradeWallet(), disabled: !privateKeyInput.trim() || isUpgrading, loading: isUpgrading, copykey: 'dyn_wallet_upgrade_flow.upgrade_button', typographyProps: {
                             color: 'inherit',
                         }, expanded: true, children: t('dyn_wallet_upgrade_flow.upgrade_wallet') }), jsx(TypographyButton, { buttonVariant: 'tertiary', onClick: handleClose, disabled: isUpgrading, children: t('dyn_wallet_upgrade_flow.cancel') })] })] }));
 };