@daimo/sdk 1.7.0 → 1.8.1

package/dist/web/hooks/useDraftDeposit.js

@@ -1,7 +1,8 @@
 import { useEffect, useRef, useState } from "react";
 import { useSessionDepositState, } from "./useAccountFlow.js";
 import { formatUserError } from "./formatUserError.js";
-import { t } from "./locale.js";
+import { getLocale, t } from "./locale.js";
+import { getAuthorizedRoutingAmount, isExpiredRequestToPay, } from "../components/account/accountPaymentCompatibility.js";
 /**
  * Debounced draft-deposit upsert. Fires `upsertDeposit` each time the amount
  * settles, stores the result on the session deposit state. Used by every
@@ -115,7 +116,7 @@ export function useDraftDeposit({ client, accountFlow, sessionId, rail, depositA
         },
     };
 }
-export async function signAndUpsertDeposit({ client, accountFlow, sessionId, depositAmount, authorizedAmount, rail, }) {
+export async function signAndUpsertDeposit({ client, accountFlow, sessionId, depositAmount, authorizedAmount, paymentInput, rail, }) {
     const token = await accountFlow.getAccessToken();
     if (!token)
         throw new Error("not authenticated");
@@ -132,10 +133,12 @@ export async function signAndUpsertDeposit({ client, accountFlow, sessionId, dep
         sessionId,
         rail,
         depositAmount,
+        locale: getLocale(),
         deliverySig,
         deliverySigData: deliverySignData,
         routingSig,
         routingSigData: routingSignData,
+        paymentInput,
     }, auth);
 }
 /** Sign + upsert a deposit and require payment info (bank rails). */
@@ -153,6 +156,7 @@ async function upsertPlainDraftDeposit({ client, accountFlow, sessionId, rail, d
         sessionId,
         rail,
         depositAmount,
+        locale: getLocale(),
     }, { bearerToken: token });
 }
 async function createSignedDraftDeposit({ client, accountFlow, sessionId, rail, depositAmount, }) {
@@ -165,9 +169,12 @@ async function createSignedDraftDeposit({ client, accountFlow, sessionId, rail,
     });
     if (preview.payment === null)
         return preview;
-    const signedAmount = preview.payment.flow === "wallet-pay-widget"
-        ? preview.payment.purchaseAmount
-        : depositAmount;
+    if (preview.payment.flow === "institution-picker")
+        return preview;
+    if (isExpiredRequestToPay(preview.payment)) {
+        return preview;
+    }
+    const signedAmount = getAuthorizedRoutingAmount(preview.payment, depositAmount);
     return signAndUpsertDeposit({
         client,
         accountFlow,

package/dist/web/hooks/useDraftDeposit.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDraftDeposit.js","sourceRoot":"","sources":["../../../src/web/hooks/useDraftDeposit.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDraftDeposit.js","sourceRoot":"","sources":["../../../src/web/hooks/useDraftDeposit.ts"],"names":[],"mappings":"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"}

package/dist/web/hooks/useRequestToPayDeposit.d.ts

@@ -0,0 +1,26 @@
+import type { AccountDeposit, AccountRail } from "../../common/account.js";
+/** Create/replay, promote, and poll one request-to-pay deposit. */
+export declare function useRequestToPayDeposit({ sessionId, clientSecret, rail, resumePayment, onAdvance, }: {
+    sessionId: string;
+    clientSecret: string;
+    rail: AccountRail;
+    resumePayment: boolean;
+    onAdvance: (deposit: AccountDeposit) => void;
+}): {
+    depositAmount: string;
+    payment: (import("../../common/account.js").DepositConstraints & {
+        flow: Extract<import("../../common/account.js").DepositPaymentInteraction, "request-to-pay">;
+        ui: import("../../common/account.js").DepositRequestToPayUi;
+        instructions: string;
+        payableAmount: string;
+        paymentCode: string;
+        expiresAt: number;
+        expectedSettlementAmount: string;
+        retry: import("../../common/account.js").DepositRequestToPayRetry;
+    }) | null;
+    providerExpired: boolean;
+    contractMismatch: boolean;
+    error: string | null;
+    retry: () => void;
+};
+//# sourceMappingURL=useRequestToPayDeposit.d.ts.map

package/dist/web/hooks/useRequestToPayDeposit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRequestToPayDeposit.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useRequestToPayDeposit.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,cAAc,EACd,WAAW,EACZ,MAAM,yBAAyB,CAAC;AAOjC,mEAAmE;AACnE,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,YAAY,EACZ,IAAI,EACJ,aAAa,EACb,SAAS,GACV,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;CAC9C;;;;;;;;;;;;;;;;EAqFA"}

package/dist/web/hooks/useRequestToPayDeposit.js

@@ -0,0 +1,81 @@
+import { useEffect, useState } from "react";
+import { getRequestToPayContract } from "../components/account/accountPaymentCompatibility.js";
+import { useDaimoClient } from "./DaimoClientContext.js";
+import { useDepositPoller } from "./useDepositPoller.js";
+import { useDraftDeposit } from "./useDraftDeposit.js";
+import { useAccountFlow, useSessionDepositState } from "./useAccountFlow.js";
+/** Create/replay, promote, and poll one request-to-pay deposit. */
+export function useRequestToPayDeposit({ sessionId, clientSecret, rail, resumePayment, onAdvance, }) {
+    const client = useDaimoClient();
+    const accountFlow = useAccountFlow();
+    const { depositState, setDepositState, clearDepositState } = useSessionDepositState(sessionId);
+    const depositAmount = depositState?.depositAmount ?? "";
+    const [providerExpired, setProviderExpired] = useState(false);
+    const { payment: draftedPayment, error, retry, } = useDraftDeposit({
+        client,
+        accountFlow,
+        sessionId,
+        rail,
+        depositAmount,
+        enabled: depositAmount !== "",
+        draftMode: resumePayment ? "plain" : "signed",
+    });
+    const startedPayment = depositState?.kind === "started"
+        ? getRequestToPayContract(depositState.payment)
+        : null;
+    const payment = startedPayment ??
+        (draftedPayment ? getRequestToPayContract(draftedPayment) : null);
+    const candidatePayment = depositState?.kind === "started"
+        ? depositState.payment
+        : draftedPayment;
+    const contractMismatch = candidatePayment != null && payment == null;
+    const currentDepositId = depositState?.kind === "drafted" || depositState?.kind === "started"
+        ? depositState.depositId
+        : null;
+    useEffect(() => {
+        if (!payment || !depositAmount || !currentDepositId)
+            return;
+        if (depositState?.kind === "started")
+            return;
+        setDepositState({
+            depositAmount,
+            kind: "started",
+            depositId: currentDepositId,
+            payment,
+        });
+    }, [
+        currentDepositId,
+        depositAmount,
+        depositState?.kind,
+        payment,
+        setDepositState,
+    ]);
+    useDepositPoller({
+        client,
+        sessionId,
+        clientSecret,
+        onUpdate(deposit) {
+            if (deposit.status === "expired") {
+                setProviderExpired(true);
+                return;
+            }
+            if (deposit.status !== "initiated" &&
+                deposit.status !== "awaiting_payment") {
+                clearDepositState();
+                onAdvance(deposit);
+            }
+        },
+        shouldStop: (deposit) => deposit.status === "expired" ||
+            deposit.status === "failed" ||
+            deposit.status === "completed",
+    });
+    return {
+        depositAmount,
+        payment,
+        providerExpired,
+        contractMismatch,
+        error,
+        retry,
+    };
+}
+//# sourceMappingURL=useRequestToPayDeposit.js.map

package/dist/web/hooks/useRequestToPayDeposit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRequestToPayDeposit.js","sourceRoot":"","sources":["../../../src/web/hooks/useRequestToPayDeposit.ts"],"names":[],"mappings":"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"}

package/dist/web/hooks/useSessionNav.d.ts

@@ -1,4 +1,5 @@
-import type { AccountAuthConfig } from "../api/index.js";
+import type { AccountDepositStatus } from "../../common/account.js";
+import type { AccountAuthConfig, DaimoCountryCode, RecreateSessionWithNavResponse } from "../api/index.js";
 import type { SessionWithNav } from "../api/navTree.js";
 import type { WalletPaymentOption } from "../api/walletTypes.js";
 import { type DaimoPlatform } from "../platform.js";
@@ -20,16 +21,20 @@ type SessionNavResult = {
         autoNav?: boolean;
     }) => void;
     handleBack: () => void;
+    handleReset: () => void;
     handleAmountContinue: (amountUsd: number) => void;
     handleRetry: () => void;
     handleRefresh: () => Promise<void>;
+    handleAccountSessionRecreate: (depositAmount: string) => Promise<void>;
     handleInjectedWalletSelect: (wallet: InjectedWallet) => void;
     handleChainSelect: (chain: "evm" | "solana") => void;
     handleWalletSelectToken: (token: WalletPaymentOption) => void;
     handleWalletSending: (token: WalletPaymentOption, amountUsd: number) => void;
     handleShowMobileWallets: (nodeId: string) => void;
     /** Advance account flow to the next screen. */
-    handleAccountAdvance: (nextType: AccountNavEntry["type"]) => void;
+    handleAccountAdvance: (nextType: AccountNavEntry["type"], options?: {
+        initialStatus?: AccountDepositStatus;
+    }) => void;
     /** Reset the current account rail after logout. */
     handleAccountLogout: () => void;
 };
@@ -38,6 +43,10 @@ export declare function useSessionNav(session: SessionWithNav, setSession: React
     enableFiatPopup?: boolean;
     /** Node to auto-navigate to on load (popup deep-link). */
     startNodeId?: string;
+    /** Selected country used when rebuilding nav for a recreated session. */
+    countryCode?: DaimoCountryCode;
+    /** Propagates non-session fields from the recreate response. */
+    onRecreate?: (response: RecreateSessionWithNavResponse) => void;
 }): SessionNavResult;
 export {};
 //# sourceMappingURL=useSessionNav.d.ts.map

package/dist/web/hooks/useSessionNav.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSessionNav.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useSessionNav.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAQV,cAAc,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM/E,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAY,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAmB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE5E,KAAK,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAA;CAAE,CAAC;AAW3E,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,WAAW,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IAEnB,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC1E,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC,0BAA0B,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7D,iBAAiB,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,QAAQ,KAAK,IAAI,CAAC;IACrD,uBAAuB,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC9D,mBAAmB,EAAE,CAAC,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7E,uBAAuB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAElD,+CAA+C;IAC/C,oBAAoB,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAClE,mDAAmD;IACnD,mBAAmB,EAAE,MAAM,IAAI,CAAC;CACjC,CAAC;AA0DF,wBAAgB,aAAa,CAC3B,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,EAChE,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,QAAQ,CAAC,EAAE,aAAa,EACxB,UAAU,CAAC,EAAE,gBAAgB,EAC7B,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,EACrC,OAAO,CAAC,EAAE;IACR,qDAAqD;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,0DAA0D;IAC1D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GACA,gBAAgB,CA88BlB"}
+{"version":3,"file":"useSessionNav.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useSessionNav.ts"],"names":[],"mappings":"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"}

package/dist/web/hooks/useSessionNav.js

@@ -1,10 +1,11 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from "react";
-import { getAccountPaymentEntryTarget } from "../components/account/accountNav.js";
+import { getAccountPaymentEntryTarget, getDepositResumeTarget, shouldRecoverExpiredPayment, } from "../components/account/accountNav.js";
+import { getNodePaymentInteraction } from "../components/account/accountPaymentCompatibility.js";
+import { recreateAccountPaymentSession, runAccountSessionRecreateOnce, } from "../components/account/accountSessionRecreate.js";
 import { detectPlatform, isDesktop } from "../platform.js";
-import { isFramed, railRequiresPopup } from "../components/account/fiatPopup.js";
+import { interactionRequiresPopup, isFramed, } from "../components/account/fiatPopup.js";
 import { pruneCompletedAccountAuth } from "./accountAuthNav.js";
 import { useDaimoClient } from "./DaimoClientContext.js";
-import { formatUserError } from "./formatUserError.js";
 import { t } from "./locale.js";
 import { createNavLogger } from "./navEvent.js";
 import { findNode } from "./types.js";
@@ -60,6 +61,11 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
         return { nodeId, nodeType };
     }, [topEntry, session.navTree]);
     const canGoBack = stack.length > 0 && stack.some((e) => !e.autoNav);
+    const countryCode = options?.countryCode;
+    const onRecreate = options?.onRecreate;
+    const accountRecreateRef = useRef(null);
+    const recreatedAmountRef = useRef(undefined);
+    const autoNavRef = useRef(null);
     // ─── Async fetchers ─────────────────────────────────────────────────────
     const fetchTronAddress = useCallback(async (nodeId, amountUsd) => {
         try {
@@ -238,20 +244,67 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
         }
     }, [session.sessionId, session.clientSecret, client]);
     // ─── Account deposit handler ────────────────────────────────────────────────
-    const handleAccountNavigate = useCallback(async (nodeId, node, autoNav) => {
+    const handleAccountNavigate = useCallback(async (nodeId, node, autoNav, options) => {
         const rail = node.fiatMethod;
+        const paymentInteraction = getNodePaymentInteraction(node);
         setStack((prev) => [
             ...prev,
-            { type: "account-loading", nodeId, rail, autoNav },
+            {
+                type: "account-loading",
+                nodeId,
+                rail,
+                paymentInteraction,
+                autoNav,
+            },
         ]);
         const replaceLoading = (entry) => {
             setStack((prev) => replacePendingAccountEntry(prev, nodeId, rail, entry));
         };
+        // Resume: if this session already has a deposit past payment, jump
+        // straight to the status screen. getDeposit is auth-free (clientSecret
+        // only), so a finished deposit never shows a login screen.
+        let existingDeposit = null;
+        try {
+            const response = await client.account.getDeposit({
+                sessionId: session.sessionId,
+                clientSecret: session.clientSecret,
+                refresh: true,
+            });
+            existingDeposit = response.deposit;
+            const resumeType = existingDeposit &&
+                getDepositResumeTarget(existingDeposit.status, paymentInteraction);
+            if (existingDeposit && resumeType) {
+                replaceLoading({
+                    type: resumeType,
+                    nodeId,
+                    rail,
+                    paymentInteraction,
+                    autoNav,
+                    initialStatus: existingDeposit.status,
+                });
+                return;
+            }
+        }
+        catch (err) {
+            console.error("[account-nav] deposit resume check failed:", err);
+            // fall through to the normal enrollment/auth flow
+        }
+        if (options?.popupRequired) {
+            replaceLoading({
+                type: "fiat-popup",
+                nodeId,
+                rail,
+                paymentInteraction,
+                autoNav,
+            });
+            return;
+        }
         if (!accountFlow) {
             replaceLoading({
                 type: "account-error",
                 nodeId,
                 rail,
+                paymentInteraction,
                 autoNav,
                 message: "account deposit is not available for this session.",
             });
@@ -276,10 +329,65 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
             });
             if (result) {
                 if (result.nextAction === "ready_for_payment") {
+                    if (existingDeposit &&
+                        shouldRecoverExpiredPayment(existingDeposit.status, paymentInteraction)) {
+                        accountFlow.setDepositState(session.sessionId, {
+                            depositAmount: existingDeposit.fiatAmount,
+                            kind: "idle",
+                        });
+                        replaceLoading({
+                            type: "account-payment-resume",
+                            nodeId,
+                            rail,
+                            paymentInteraction,
+                            autoNav,
+                        });
+                        return;
+                    }
+                    if (existingDeposit &&
+                        (existingDeposit.status === "initiated" ||
+                            existingDeposit.status === "awaiting_payment") &&
+                        (paymentInteraction === "request-to-pay" ||
+                            paymentInteraction === "institution-picker" ||
+                            paymentInteraction === "hosted-approval" ||
+                            paymentInteraction === "external-app-approval")) {
+                        accountFlow.setDepositState(session.sessionId, {
+                            depositAmount: existingDeposit.fiatAmount,
+                            kind: "idle",
+                        });
+                        replaceLoading({
+                            type: "account-payment-resume",
+                            nodeId,
+                            rail,
+                            paymentInteraction,
+                            autoNav,
+                        });
+                        return;
+                    }
+                    const recreatedAmount = recreatedAmountRef.current;
+                    if (recreatedAmount?.sessionId === session.sessionId) {
+                        recreatedAmountRef.current = undefined;
+                        if (paymentInteraction === "request-to-pay") {
+                            replaceLoading({
+                                type: "account-request-to-pay",
+                                nodeId,
+                                rail,
+                                paymentInteraction,
+                                autoNav,
+                            });
+                            return;
+                        }
+                    }
                     // Some rails skip the amount-first step and go straight to a
                     // unified payment page.
-                    const entryType = getAccountPaymentEntryTarget(rail);
-                    replaceLoading({ type: entryType, nodeId, rail, autoNav });
+                    const entryType = getAccountPaymentEntryTarget(paymentInteraction);
+                    replaceLoading({
+                        type: entryType,
+                        nodeId,
+                        rail,
+                        paymentInteraction,
+                        autoNav,
+                    });
                     return;
                 }
                 if (result.nextAction === "enrollment") {
@@ -287,6 +395,7 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
                         type: "account-enrollment",
                         nodeId,
                         rail,
+                        paymentInteraction,
                         autoNav,
                     });
                     return;
@@ -296,6 +405,7 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
                         type: "account-enrollment-update",
                         nodeId,
                         rail,
+                        paymentInteraction,
                         autoNav,
                         update: result.enrollmentUpdate,
                     });
@@ -308,12 +418,24 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
             accountFlow.setEmail(accountAuth.email);
             const sent = await accountFlow.sendOtp(accountAuth.email);
             if (sent) {
-                replaceLoading({ type: "account-otp", nodeId, rail, autoNav });
+                replaceLoading({
+                    type: "account-otp",
+                    nodeId,
+                    rail,
+                    paymentInteraction,
+                    autoNav,
+                });
                 return;
             }
         }
         // New user or no email hint — start from email
-        replaceLoading({ type: "account-email", nodeId, rail, autoNav });
+        replaceLoading({
+            type: "account-email",
+            nodeId,
+            rail,
+            paymentInteraction,
+            autoNav,
+        });
     }, [accountAuth, accountFlow, client, session.clientSecret, session.sessionId]);
     // ─── Navigation handlers ────────────────────────────────────────────────
     const handleNavigate = useCallback((nodeId, options) => {
@@ -436,21 +558,10 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
             return;
         }
         if (targetNode.type === "Fiat") {
-            if (enableFiatPopup &&
-                railRequiresPopup(targetNode.fiatMethod) &&
-                isFramed()) {
-                setStack((prev) => [
-                    ...prev,
-                    {
-                        type: "fiat-popup",
-                        nodeId,
-                        rail: targetNode.fiatMethod,
-                        autoNav,
-                    },
-                ]);
-                return;
-            }
-            handleAccountNavigate(nodeId, targetNode, autoNav);
+            const popupRequired = enableFiatPopup &&
+                interactionRequiresPopup(getNodePaymentInteraction(targetNode)) &&
+                isFramed();
+            handleAccountNavigate(nodeId, targetNode, autoNav, { popupRequired });
             return;
         }
     }, [
@@ -478,7 +589,6 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
                 // jump forward when revisited, creating a loop.
                 if (top.type === "account-creating-wallet" ||
                     top.type === "account-enrollment" ||
-                    top.type === "account-provider-otp" ||
                     top.type === "account-enrollment-update") {
                     next.pop();
                     continue;
@@ -583,7 +693,10 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
                 });
                 return;
             }
-            updateWalletTxResult(undefined, formatUserError(err, t.transactionFailed));
+            // Store the raw message: the error page formats it for display
+            // and passes the raw text on to contact support.
+            const raw = err instanceof Error ? err.message : String(err ?? "");
+            updateWalletTxResult(undefined, raw || t.transactionFailed);
         });
     }, [walletFlow, updateWalletTxResult]);
     const handleRetry = useCallback(() => {
@@ -672,14 +785,49 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
             action: "flow_refresh",
         });
         try {
-            const { session: newSession } = await client.internal.sessions.recreate(session.sessionId, session.clientSecret);
+            const response = await client.internal.sessions.recreate(session.sessionId, session.clientSecret, { countryCode });
             setStack([]);
-            setSession(newSession);
+            setSession(response.session);
+            onRecreate?.(response);
         }
         catch (error) {
             console.error("failed to recreate session:", error);
         }
-    }, [session.sessionId, session.clientSecret, getNodeCtx, setSession, client]);
+    }, [
+        session.sessionId,
+        session.clientSecret,
+        countryCode,
+        getNodeCtx,
+        setSession,
+        client,
+        onRecreate,
+    ]);
+    const handleAccountSessionRecreate = useCallback(async (depositAmount) => {
+        await runAccountSessionRecreateOnce(accountRecreateRef, async () => {
+            const response = await recreateAccountPaymentSession({
+                depositAmount,
+                recreate: () => client.internal.sessions.recreate(session.sessionId, session.clientSecret, { countryCode }),
+                setDepositState: (sessionId, state) => accountFlow?.setDepositState(sessionId, state),
+            });
+            recreatedAmountRef.current = {
+                sessionId: response.session.sessionId,
+                depositAmount,
+            };
+            autoNavRef.current = null;
+            setStack([]);
+            setSession(response.session);
+            onRecreate?.(response);
+        });
+    }, [
+        accountFlow,
+        client,
+        countryCode,
+        onRecreate,
+        session.clientSecret,
+        session.sessionId,
+        setSession,
+    ]);
+    const handleReset = useCallback(() => setStack([]), []);
     // ─── Wallet flow handlers ───────────────────────────────────────────────
     const pendingWalletRef = useRef(null);
     const handleInjectedWalletSelect = useCallback((wallet) => {
@@ -768,7 +916,6 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
     }, []);
     // ─── Internal effects ──────────────────────────────────────────────────
     // Auto-navigate through single-option ChooseOption chains
-    const autoNavRef = useRef(null);
     useLayoutEffect(() => {
         if (!isOpen)
             return;
@@ -818,12 +965,15 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
     }, [topEntry, walletFlow?.wallet, walletFlow?.isConnecting]);
     // ─── Account flow handler ────────────────────────────────────────────────
     /** Advance account flow to the next screen, preserving nodeId + rail. */
-    const handleAccountAdvance = useCallback((nextType) => {
-        const { nodeId, rail } = accountEntry(topEntry);
+    const handleAccountAdvance = useCallback((nextType, options) => {
+        const { nodeId, rail, paymentInteraction } = accountEntry(topEntry);
         const pushPhoneEntry = (type) => {
             setStack((prev) => {
                 const nextStack = pruneCompletedAccountAuth(prev, type);
-                return [...nextStack, { type, nodeId, rail }];
+                return [
+                    ...nextStack,
+                    { type, nodeId, rail, paymentInteraction },
+                ];
             });
         };
         if (nextType === "account-phone" &&
@@ -841,14 +991,23 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
         }
         setStack((prev) => {
             const nextStack = pruneCompletedAccountAuth(prev, nextType);
-            return [...nextStack, { type: nextType, nodeId, rail }];
+            return [
+                ...nextStack,
+                {
+                    type: nextType,
+                    nodeId,
+                    rail,
+                    paymentInteraction,
+                    ...options,
+                },
+            ];
         });
     }, [accountAuth, accountFlow, topEntry]);
     const handleAccountLogout = useCallback(() => {
-        const { nodeId, rail, autoNav } = accountEntry(topEntry);
+        const { nodeId, rail, paymentInteraction, autoNav } = accountEntry(topEntry);
         setStack((prev) => [
             ...prev.filter((entry) => !isSameAccountRailEntry(entry, nodeId, rail)),
-            { type: "account-email", nodeId, rail, autoNav },
+            { type: "account-email", nodeId, rail, paymentInteraction, autoNav },
         ]);
     }, [topEntry]);
     return useMemo(() => ({
@@ -858,9 +1017,11 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
         canGoBack,
         handleNavigate,
         handleBack,
+        handleReset,
         handleAmountContinue,
         handleRetry,
         handleRefresh,
+        handleAccountSessionRecreate,
         handleInjectedWalletSelect,
         handleChainSelect,
         handleShowMobileWallets,
@@ -875,9 +1036,11 @@ export function useSessionNav(session, setSession, isOpen, accountAuth, platform
         canGoBack,
         handleNavigate,
         handleBack,
+        handleReset,
         handleAmountContinue,
         handleRetry,
         handleRefresh,
+        handleAccountSessionRecreate,
         handleInjectedWalletSelect,
         handleChainSelect,
         handleShowMobileWallets,