@blocklet/payment-react-headless 1.26.2 → 1.26.4

package/lib/checkout/hooks/useCustomerForm.js

@@ -83,6 +83,10 @@ function useCustomerForm(sessionData, currencyId, methodId) {
     setErrors(result.errors);
     return result.valid;
   });
+  const checkValid = (0, _ahooks.useMemoizedFn)(async () => {
+    const result = await (0, _validation.validateForm)(values, getValidateOptions());
+    return result.valid;
+  });
   const validateField = (0, _ahooks.useMemoizedFn)(async field => {
     const result = await (0, _validation.validateForm)(values, getValidateOptions());
     setErrors(prev => {
@@ -129,7 +133,9 @@ function useCustomerForm(sessionData, currencyId, methodId) {
     errors,
     touched,
     validate,
+    checkValid,
     validateField,
+    prefetched,
     refetchCustomer
   };
 }

package/lib/checkout/hooks/usePaymentMethod.js

@@ -9,7 +9,6 @@ var _ahooks = require("ahooks");
 var _checkoutAugmented = require("../../types/checkout-augmented");
 var _api = _interopRequireWildcard(require("../../shared/api"));
 var _paymentMethod = require("../core/paymentMethod");
-var _lineItems = require("../core/lineItems");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function usePaymentMethod(sessionData, sessionId, refreshSession, setSessionData) {
@@ -58,15 +57,10 @@ function usePaymentMethod(sessionData, sessionId, refreshSession, setSessionData
       try {
         localStorage.setItem((0, _paymentMethod.getCurrencyStorageKey)(session?.user?.did), newCurrencyId);
       } catch {}
-      let finalSession = data;
-      if (data.discounts?.length) {
-        const recalculated = await (0, _lineItems.recalculatePromotionIfNeeded)(session, sessionId, newCurrencyId);
-        if (recalculated) finalSession = recalculated;
-      }
       if (sessionData && setSessionData) {
         setSessionData({
           ...sessionData,
-          checkoutSession: finalSession,
+          checkoutSession: data,
           quotes: void 0
         });
       } else {

package/lib/checkout/hooks/usePricing.d.ts

@@ -54,4 +54,4 @@ export interface UsePricingReturn {
         afterTrialInterval: string | null;
     };
 }
-export declare function usePricing(sessionData: SessionData | null, sessionId: string, currency: TPaymentCurrency | null, isStripe: boolean, refreshSession: (force?: boolean) => Promise<void>, paymentMethodType?: string | null): UsePricingReturn;
+export declare function usePricing(sessionData: SessionData | null, sessionId: string, currency: TPaymentCurrency | null, isStripe: boolean, refreshSession: (force?: boolean) => Promise<void>, paymentMethodType?: string | null, switching?: boolean): UsePricingReturn;

package/lib/checkout/hooks/usePricing.js

@@ -12,7 +12,7 @@ var _exchangeRate = require("../core/exchangeRate");
 var _pricing = require("../core/pricing");
 var _promotion = require("../core/promotion");
 var _submit = require("../core/submit");
-function usePricing(sessionData, sessionId, currency, isStripe, refreshSession, paymentMethodType) {
+function usePricing(sessionData, sessionId, currency, isStripe, refreshSession, paymentMethodType, switching) {
   const session = sessionData?.checkoutSession;
   const items = session?.line_items || [];
   const [exchangeRate, setExchangeRate] = (0, _react.useState)(null);
@@ -31,7 +31,7 @@ function usePricing(sessionData, sessionId, currency, isStripe, refreshSession,
   const mountedRef = (0, _react.useRef)(true);
   const hasDynamicPricing = (0, _react.useMemo)(() => (0, _exchangeRate.checkHasDynamicPricing)(items), [items]);
   const fetchRate = (0, _ahooks.useMemoizedFn)(async () => {
-    if (!sessionId || !hasDynamicPricing || isStripe) {
+    if (!sessionId || !hasDynamicPricing || isStripe || switching) {
       setRateStatus(hasDynamicPricing ? "unavailable" : "available");
       if (isStripe) {
         setExchangeRate(null);
@@ -63,7 +63,7 @@ function usePricing(sessionData, sessionId, currency, isStripe, refreshSession,
   });
   (0, _react.useEffect)(() => {
     mountedRef.current = true;
-    if (!hasDynamicPricing || isStripe || !sessionId || session?.status === "complete") {
+    if (!hasDynamicPricing || isStripe || switching || !sessionId || session?.status === "complete") {
       if (isStripe) {
         setExchangeRate(null);
         setRateProvider(null);
@@ -96,7 +96,7 @@ function usePricing(sessionData, sessionId, currency, isStripe, refreshSession,
       if (pollingRef.current) clearTimeout(pollingRef.current);
       document.removeEventListener("visibilitychange", handleVisibility);
     };
-  }, [hasDynamicPricing, isStripe, sessionId, currency?.id, session?.status]);
+  }, [hasDynamicPricing, isStripe, switching, sessionId, currency?.id, session?.status]);
   const amounts = (0, _react.useMemo)(() => (0, _pricing.calculateAmounts)(items, currency, session, exchangeRate, hasDynamicPricing, paymentMethodType), [items, currency, exchangeRate, hasDynamicPricing, session, paymentMethodType]);
   const quoteMeta = (0, _react.useMemo)(() => (0, _pricing.calculateQuoteMeta)(items, hasDynamicPricing, sessionData), [items, hasDynamicPricing, sessionData]);
   const setSlippage = (0, _ahooks.useMemoizedFn)(async config => {

package/lib/checkout/hooks/useSubmit.js

@@ -330,6 +330,13 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
       });
       return;
     }
+    if (errorCode === "STOP_ACCEPTING_ORDERS") {
+      setStatus("service_suspended");
+      setContext({
+        type: "service_suspended"
+      });
+      return;
+    }
     if (errorCode === "UNIFIED_APP_REQUIRED" || errorCode === "CUSTOMER_LIMITED") {
       setStatus("failed");
       setContext({
@@ -454,7 +461,7 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
     }
   });
   const cancel = (0, _ahooks.useMemoizedFn)(() => {
-    if (status === "confirming_price" || status === "confirming_fast_pay" || status === "credit_insufficient") {
+    if (status === "confirming_price" || status === "confirming_fast_pay" || status === "credit_insufficient" || status === "service_suspended") {
       setStatus("idle");
       setContext(null);
       unlock();

package/lib/checkout/types.d.ts

@@ -1,5 +1,5 @@
 import type { TLineItemExpanded, TPaymentMethodExpanded, TPaymentCurrency, TPrice, TCheckoutSessionExpanded, TPaymentIntent, TCustomer } from '@blocklet/payment-types';
-export type SubmitStatus = 'idle' | 'submitting' | 'confirming_price' | 'confirming_fast_pay' | 'credit_insufficient' | 'waiting_did' | 'waiting_stripe' | 'completed' | 'failed';
+export type SubmitStatus = 'idle' | 'submitting' | 'confirming_price' | 'confirming_fast_pay' | 'credit_insufficient' | 'service_suspended' | 'waiting_did' | 'waiting_stripe' | 'completed' | 'failed';
 export type SubmitContext = {
     type: 'price_change';
     changePercent: number;
@@ -25,6 +25,8 @@ export type SubmitContext = {
     type: 'error';
     message: string;
     code?: string;
+} | {
+    type: 'service_suspended';
 } | null;
 export interface FieldConfig {
     name: string;
@@ -69,8 +71,8 @@ export type CheckoutResult = {
 export interface UseCheckoutReturn {
     isLoading: boolean;
     error: string | null;
-    /** Structured error code: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null */
-    errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+    /** Structured error code */
+    errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
     refresh: () => Promise<void>;
     vendorCount: number;
     product: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react-headless",
-  "version": "1.26.2",
+  "version": "1.26.4",
   "description": "Headless React hooks for payment-kit checkout",
   "keywords": [
     "react",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@arcblock/ws": "^1.28.5",
     "@blocklet/js-sdk": "workspace:*",
-    "@blocklet/payment-types": "1.26.2",
+    "@blocklet/payment-types": "1.26.4",
     "@ocap/util": "^1.28.5",
     "ahooks": "^3.8.5",
     "google-libphonenumber": "^3.2.42",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71242a68d27d56666487176425153dc08071960f"
+  "gitHead": "90fb554f2edfcd1c141e3887eef835b1a545f5ad"
 }

package/src/checkout/context/CheckoutProvider.tsx

@@ -81,7 +81,9 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
   // 2. Payment method layer
   const paymentMethodHook = usePaymentMethodHook(sessionData, effectiveSessionId, refresh, setSessionData);
 
-  // Recalculate promotion when currency changes — use response directly (no extra GET)
+  // Recalculate promotion when currency changes or on initial mount (if discounts exist).
+  // Uses refresh() (fresh GET) instead of POST response to avoid stale-closure overwrites
+  // when switch-currency and recalculate-promotion race. Matches V1 pattern.
   const prevCurrencyRef = useRef<string | null>(null);
   useEffect(() => {
     const currId = paymentMethodHook.currency?.id || null;
@@ -89,8 +91,8 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
       recalculatePromotionIfNeeded(session, effectiveSessionId, currId).then((recalculated) => {
-        if (recalculated && sessionData) {
-          setSessionData({ ...sessionData, checkoutSession: recalculated, quotes: undefined });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }
@@ -111,6 +113,7 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
       setCurrency: paymentMethodHook.setCurrency,
       stripe: paymentMethodHook.stripe,
     }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       paymentMethodHook.current,
       paymentMethodHook.currency,
@@ -140,7 +143,7 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
   const hasDynamicPricing = useMemo(() => checkHasDynamicPricing(items), [items]);
 
   const fetchRate = useMemoizedFn(async () => {
-    if (!effectiveSessionId || !hasDynamicPricing || paymentMethodHook.isStripe) {
+    if (!effectiveSessionId || !hasDynamicPricing || paymentMethodHook.isStripe || paymentMethodHook.switching) {
       setRateStatus(hasDynamicPricing ? 'unavailable' : 'available');
       if (paymentMethodHook.isStripe) {
         setExchangeRate(null);
@@ -181,7 +184,13 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
   useEffect(() => {
     mountedRef.current = true;
 
-    if (!hasDynamicPricing || paymentMethodHook.isStripe || !effectiveSessionId || session?.status === 'complete') {
+    if (
+      !hasDynamicPricing ||
+      paymentMethodHook.isStripe ||
+      paymentMethodHook.switching ||
+      !effectiveSessionId ||
+      session?.status === 'complete'
+    ) {
       // Clear stale rate when switching to Stripe
       if (paymentMethodHook.isStripe) {
         setExchangeRate(null);
@@ -189,16 +198,14 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
         setRateProviderDisplay(null);
         setRateFetchedAt(null);
       }
-      // When session is complete and we already have a rate, keep it as 'available'
-      // (the rate used at payment time is still valid for display).
-      // Otherwise set appropriate status:
-      // - non-dynamic → 'available' (no rate needed)
-      // - dynamic but Stripe or no session → 'unavailable'
-      if (session?.status === 'complete') {
-        // Completed session: rate is irrelevant, suppress unavailable warnings
-        setRateStatus('available');
-      } else {
-        setRateStatus(hasDynamicPricing ? 'unavailable' : 'available');
+      // Don't change rate status during currency switch — keep current rate visible
+      // to avoid triggering "unavailable" toast while switch is in progress.
+      if (!paymentMethodHook.switching) {
+        if (session?.status === 'complete') {
+          setRateStatus('available');
+        } else {
+          setRateStatus(hasDynamicPricing ? 'unavailable' : 'available');
+        }
       }
       return undefined;
     }
@@ -229,6 +236,7 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
   }, [
     hasDynamicPricing,
     paymentMethodHook.isStripe,
+    paymentMethodHook.switching,
     effectiveSessionId,
     paymentMethodHook.currency?.id,
     session?.status,

package/src/checkout/context/SessionContext.ts

@@ -10,7 +10,7 @@ export interface SessionContextValue {
   effectiveSessionId: string;
   isLoading: boolean;
   error: string | null;
-  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
   refresh: (forceRefresh?: boolean) => Promise<void>;
   items: TLineItemExpanded[];
   session: TCheckoutSessionExpanded | null | undefined;

package/src/checkout/core/customerForm.ts

@@ -41,12 +41,6 @@ export function buildFields(session: TCheckoutSessionExpanded | undefined | null
         required: true,
         group: 'address',
       },
-      {
-        name: 'billing_address.line2',
-        type: 'text',
-        required: false,
-        group: 'address',
-      },
       {
         name: 'billing_address.city',
         type: 'text',
@@ -98,7 +92,7 @@ export function createInitialValues(
     payment_method: '',
     payment_currency: session?.currency_id || '',
     billing_address: {
-      country: customer?.address?.country || '',
+      country: customer?.address?.country || 'us',
       state: customer?.address?.state || '',
       city: customer?.address?.city || '',
       line1: customer?.address?.line1 || '',

package/src/checkout/core/paymentMethod.ts

@@ -36,11 +36,22 @@ export function getInitialCurrencyId(
   session: TCheckoutSessionExpanded | undefined | null,
   methods: TPaymentMethodExpanded[]
 ): string | null {
+  const availableCurrencyIds = new Set(
+    methods.flatMap((m) => (m.payment_currencies || []).map((c) => c.id)).filter(Boolean)
+  );
+  const isAvailable = (currencyId?: string | null) => !!currencyId && availableCurrencyIds.has(currencyId);
+
+  // Keep session currency stable when promotion is already applied.
+  // Auto-switching on refresh may trigger recalculate-promotion and remove discount.
+  if (session?.discounts?.length && isAvailable(session.currency_id)) {
+    return session.currency_id;
+  }
+
   if (typeof window !== 'undefined') {
     try {
       const params = new URLSearchParams(window.location.search);
       const urlCurrency = params.get('currencyId') || params.get('currency_id');
-      if (urlCurrency) return urlCurrency;
+      if (isAvailable(urlCurrency)) return urlCurrency;
     } catch {
       // Ignore
     }
@@ -49,28 +60,34 @@ export function getInitialCurrencyId(
     if (user && !hasDidWallet(user)) {
       const stripeMethod = methods.find((m) => m.type === 'stripe');
       const stripeCurrency = stripeMethod?.payment_currencies?.[0];
-      if (stripeCurrency) return stripeCurrency.id;
+      if (isAvailable(stripeCurrency?.id)) return stripeCurrency?.id as string;
     }
 
     try {
       const did = (session as CheckoutSessionRuntime | undefined)?.user?.did;
       const stored = localStorage.getItem(getCurrencyStorageKey(did));
-      if (stored) return stored;
+      if (isAvailable(stored)) return stored;
     } catch {
       // Ignore
     }
   }
-  return session?.currency_id || null;
+
+  if (isAvailable(session?.currency_id)) {
+    return session?.currency_id as string;
+  }
+
+  return methods[0]?.payment_currencies?.[0]?.id || null;
 }
 
 export function findMethodAndCurrency(
   methods: TPaymentMethodExpanded[],
   currencyId: string | null
 ): { method: TPaymentMethodExpanded | null; currency: TPaymentCurrency | null } {
+  // Return null when currencyId hasn't been initialized yet.
+  // Prevents premature fallback to the first currency (which may differ from session.currency_id),
+  // avoiding a wrong-currency recalculate-promotion call that removes fixed-amount discounts.
   if (!currencyId) {
-    const first = methods[0];
-    const firstCurrency = first?.payment_currencies?.[0] || null;
-    return { method: first || null, currency: firstCurrency };
+    return { method: null, currency: null };
   }
 
   for (const method of methods) {

package/src/checkout/core/pricing.ts

@@ -141,7 +141,6 @@ export function calculateAmounts(
   });
 
   const subtotalBN = new BN(result.total);
-  const subtotalFormatted = formatDynamicPrice(fromUnitToToken(subtotalBN, currency.decimal), hasDynamicPricing);
 
   // Calculate discount client-side from coupon data
   const discountBN = calculateCouponDiscount(items, currency, session, hasDynamicPricing, exchangeRate, trialing, false);
@@ -216,7 +215,7 @@ export function calculateAmounts(
 
   return {
     subtotal: `${displaySubtotalFormatted} ${currency.symbol}`,
-    paymentAmount: `${subtotalFormatted} ${currency.symbol}`,
+    paymentAmount: `${totalFormatted} ${currency.symbol}`,
     total: `${totalFormatted} ${currency.symbol}`,
     discount: discount ? `${discount} ${currency.symbol}` : null,
     tax,

package/src/checkout/hooks/useCheckout.ts

@@ -51,7 +51,8 @@ export function useCheckout(sessionId: string): UseCheckoutReturn {
     paymentMethodHook.currency,
     paymentMethodHook.isStripe,
     refresh,
-    paymentMethodHook.current?.type || null
+    paymentMethodHook.current?.type || null,
+    paymentMethodHook.switching
   );
 
   // 4. Customer form
@@ -81,16 +82,18 @@ export function useCheckout(sessionId: string): UseCheckoutReturn {
   const items = useMemo(() => (session?.line_items || []) as TLineItemExpanded[], [session?.line_items]);
   const currencyId = paymentMethodHook.currency?.id || null;
 
-  // Recalculate promotion when currency changes — use response directly (no extra GET)
+  // Recalculate promotion when currency changes or on initial mount (if discounts exist).
+  // Uses refresh() (fresh GET) instead of POST response to avoid stale-closure overwrites
+  // when switch-currency and recalculate-promotion race. Matches V1 pattern.
   const prevCurrencyRef = useRef<string | null>(null);
   useEffect(() => {
     const currId = paymentMethodHook.currency?.id || null;
-    if (!currId || !session) return;
+    if (!currId || !session || session.status === 'complete') return;
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
       recalculatePromotionIfNeeded(session, effectiveSessionId, currId).then((recalculated) => {
-        if (recalculated && sessionData) {
-          setSessionData({ ...sessionData, checkoutSession: recalculated, quotes: undefined });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }

package/src/checkout/hooks/useCheckoutSession.ts

@@ -36,8 +36,8 @@ export interface UseCheckoutSessionReturn {
   // Loading
   isLoading: boolean;
   error: string | null;
-  /** Error code for structured error handling: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null */
-  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+  /** Error code for structured error handling */
+  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
   refresh: (forceRefresh?: boolean) => Promise<void>;
   /** Directly update session data (e.g. after completion polling returns fresh data) */
   setSessionData: (data: SessionData) => void;
@@ -151,6 +151,13 @@ export function useCheckoutSession(sessionId: string): UseCheckoutSessionReturn
         }
       }
 
+      // System-level order acceptance check (only block non-completed sessions)
+      if (data?.stopAcceptingOrders && cs?.status !== 'complete') {
+        setError('STOP_ACCEPTING_ORDERS');
+        setIsLoading(false);
+        return;
+      }
+
       setSessionData(data);
       setIsLoading(false);
     } catch (err: unknown) {
@@ -188,11 +195,13 @@ export function useCheckoutSession(sessionId: string): UseCheckoutSessionReturn
   const resolvedSessionId = resolvedIdRef.current || (isPaymentLink ? '' : sessionId);
 
   // Determine error code for structured handling
-  let errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null = null;
+  let errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null = null;
   if (error === 'SESSION_EXPIRED') {
     errorCode = 'SESSION_EXPIRED';
   } else if (error === 'EMPTY_LINE_ITEMS') {
     errorCode = 'EMPTY_LINE_ITEMS';
+  } else if (error === 'STOP_ACCEPTING_ORDERS') {
+    errorCode = 'STOP_ACCEPTING_ORDERS';
   }
 
   // Count vendor configs for post-payment polling

package/src/checkout/hooks/useCheckoutStatus.ts

@@ -3,7 +3,7 @@ import { useSessionContext } from '../context/SessionContext';
 export interface UseCheckoutStatusReturn {
   isLoading: boolean;
   error: string | null;
-  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
   canSubmit: boolean;
   isCompleted: boolean;
   isDonation: boolean;

package/src/checkout/hooks/useCustomerForm.ts

@@ -14,7 +14,11 @@ export interface UseCustomerFormReturn {
   errors: Partial<Record<string, string>>;
   touched: Record<string, boolean>;
   validate: () => Promise<boolean>;
+  /** Silent validation — returns valid/invalid without setting error messages on the form */
+  checkValid: () => Promise<boolean>;
   validateField: (field: string) => Promise<void>;
+  /** Whether customer info has been prefetched from backend */
+  prefetched: boolean;
   /** Re-fetch customer info from backend and update form values (e.g. after login) */
   refetchCustomer: () => Promise<void>;
 }
@@ -102,6 +106,12 @@ export function useCustomerForm(
     return result.valid;
   });
 
+  // Silent validation — check validity without setting error messages on the form
+  const checkValid = useMemoizedFn(async () => {
+    const result = await validateForm(values, getValidateOptions());
+    return result.valid;
+  });
+
   // Single-field blur validation — matches V1's trigger(fieldName)
   const validateField = useMemoizedFn(async (field: string) => {
     const result = await validateForm(values, getValidateOptions());
@@ -150,7 +160,9 @@ export function useCustomerForm(
     errors,
     touched,
     validate,
+    checkValid,
     validateField,
+    prefetched,
     refetchCustomer,
   };
 }

package/src/checkout/hooks/usePaymentMethod.ts

@@ -13,7 +13,6 @@ import {
   findMethodAndCurrency,
   buildPaymentTypes,
 } from '../core/paymentMethod';
-import { recalculatePromotionIfNeeded } from '../core/lineItems';
 import type { SessionData } from './useCheckoutSession';
 
 export interface UsePaymentMethodReturn {
@@ -107,15 +106,11 @@ export function usePaymentMethod(
         // Ignore
       }
 
-      // Use PUT response directly; if discounts exist, recalculate within switching state
-      let finalSession = data;
-      if (data.discounts?.length) {
-        const recalculated = await recalculatePromotionIfNeeded(session, sessionId, newCurrencyId);
-        if (recalculated) finalSession = recalculated;
-      }
-      // Clear quotes — they are currency-specific and stale after switch
+      // Clear quotes — they are currency-specific and stale after switch.
+      // Do NOT recalculate promotion here; CheckoutProvider's useEffect handles it
+      // after currency change settles, avoiding stale-closure overwrites.
       if (sessionData && setSessionData) {
-        setSessionData({ ...sessionData, checkoutSession: finalSession, quotes: undefined });
+        setSessionData({ ...sessionData, checkoutSession: data, quotes: undefined });
       } else {
         await refreshSession(true);
       }
@@ -143,6 +138,7 @@ export function usePaymentMethod(
 
     const sessionCurrencyId = session.currency_id;
     if (session.status === 'complete') return;
+
     if (sessionCurrencyId && sessionCurrencyId !== currencyId) {
       switchCurrency(currencyId);
     }

package/src/checkout/hooks/usePricing.ts

@@ -71,7 +71,8 @@ export function usePricing(
   currency: TPaymentCurrency | null,
   isStripe: boolean,
   refreshSession: (force?: boolean) => Promise<void>,
-  paymentMethodType?: string | null
+  paymentMethodType?: string | null,
+  switching?: boolean
 ): UsePricingReturn {
   const session = sessionData?.checkoutSession;
   const items: TLineItemExpanded[] = (session?.line_items || []) as TLineItemExpanded[];
@@ -98,7 +99,7 @@ export function usePricing(
 
   // Fetch exchange rate
   const fetchRate = useMemoizedFn(async () => {
-    if (!sessionId || !hasDynamicPricing || isStripe) {
+    if (!sessionId || !hasDynamicPricing || isStripe || switching) {
       setRateStatus(hasDynamicPricing ? 'unavailable' : 'available');
       if (isStripe) {
         setExchangeRate(null);
@@ -136,7 +137,7 @@ export function usePricing(
   useEffect(() => {
     mountedRef.current = true;
 
-    if (!hasDynamicPricing || isStripe || !sessionId || session?.status === 'complete') {
+    if (!hasDynamicPricing || isStripe || switching || !sessionId || session?.status === 'complete') {
       // Clear stale rate when switching to Stripe
       if (isStripe) {
         setExchangeRate(null);
@@ -178,7 +179,7 @@ export function usePricing(
       if (pollingRef.current) clearTimeout(pollingRef.current);
       document.removeEventListener('visibilitychange', handleVisibility);
     };
-  }, [hasDynamicPricing, isStripe, sessionId, currency?.id, session?.status]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [hasDynamicPricing, isStripe, switching, sessionId, currency?.id, session?.status]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Calculate amounts
   const amounts = useMemo(

package/src/checkout/hooks/useSubmit.ts

@@ -479,6 +479,13 @@ export function useSubmit(
       return;
     }
 
+    // STOP_ACCEPTING_ORDERS — show dedicated dialog instead of toast
+    if (errorCode === 'STOP_ACCEPTING_ORDERS') {
+      setStatus('service_suspended');
+      setContext({ type: 'service_suspended' });
+      return;
+    }
+
     // UNIFIED_APP_REQUIRED / CUSTOMER_LIMITED
     if (errorCode === 'UNIFIED_APP_REQUIRED' || errorCode === 'CUSTOMER_LIMITED') {
       setStatus('failed');
@@ -625,7 +632,12 @@ export function useSubmit(
 
   // Cancel
   const cancel = useMemoizedFn(() => {
-    if (status === 'confirming_price' || status === 'confirming_fast_pay' || status === 'credit_insufficient') {
+    if (
+      status === 'confirming_price' ||
+      status === 'confirming_fast_pay' ||
+      status === 'credit_insufficient' ||
+      status === 'service_suspended'
+    ) {
       setStatus('idle');
       setContext(null);
       unlock();

package/src/checkout/types.ts

@@ -16,6 +16,7 @@ export type SubmitStatus =
   | 'confirming_price'
   | 'confirming_fast_pay'
   | 'credit_insufficient'
+  | 'service_suspended'
   | 'waiting_did'
   | 'waiting_stripe'
   | 'completed'
@@ -28,6 +29,7 @@ export type SubmitContext =
   | { type: 'stripe'; clientSecret: string; intentType?: 'payment_intent' | 'setup_intent' }
   | { type: 'did_connect'; action: string; checkpointId: string; extraParams: Record<string, unknown> }
   | { type: 'error'; message: string; code?: string }
+  | { type: 'service_suspended' }
   | null;
 
 // ── Form ──
@@ -83,8 +85,8 @@ export interface UseCheckoutReturn {
   // Loading state
   isLoading: boolean;
   error: string | null;
-  /** Structured error code: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null */
-  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+  /** Structured error code */
+  errorCode: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
   refresh: () => Promise<void>;
 
   // Vendor count (for post-payment vendor order polling)