@blocklet/payment-react-headless 1.26.1 → 1.26.3

package/src/checkout/hooks/useCrossSell.ts

@@ -17,7 +17,7 @@ export interface UseCrossSellReturn {
 }
 
 export function useCrossSell(): UseCrossSellReturn {
-  const { items, session, effectiveSessionId, refresh } = useSessionContext();
+  const { items, session, effectiveSessionId, refresh, sessionData, setSessionData } = useSessionContext();
   const { currency } = usePaymentMethodContext();
   const currencyId = currency?.id || null;
 
@@ -61,7 +61,15 @@ export function useCrossSell(): UseCrossSellReturn {
     const crossSellItemPrice = getCrossSellItem(items);
     if (!crossSellItemPrice) return;
     try {
-      await addCrossSellItem(effectiveSessionId, crossSellItemPrice.id, session, currencyId, refresh);
+      await addCrossSellItem(
+        effectiveSessionId,
+        crossSellItemPrice.id,
+        session,
+        currencyId,
+        refresh,
+        sessionData,
+        setSessionData
+      );
     } catch (err: unknown) {
       console.error('Failed to add cross-sell:', getErrorMessage(err));
     }
@@ -70,7 +78,7 @@ export function useCrossSell(): UseCrossSellReturn {
   const remove = useMemoizedFn(async () => {
     if (session?.status === 'complete') return;
     try {
-      await removeCrossSellItem(effectiveSessionId, session, currencyId, refresh);
+      await removeCrossSellItem(effectiveSessionId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err: unknown) {
       console.error('Failed to remove cross-sell:', getErrorMessage(err));
     }

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/useLineItems.ts

@@ -39,14 +39,21 @@ export interface UseLineItemsReturn {
 }
 
 export function useLineItems(): UseLineItemsReturn {
-  const { items, session, effectiveSessionId, isDonation, refresh } = useSessionContext();
+  const { items, session, effectiveSessionId, isDonation, refresh, sessionData, setSessionData } = useSessionContext();
   const { currency } = usePaymentMethodContext();
   const currencyId = currency?.id || null;
 
   // Default quantity from URL params: ?qty=5 or ?qty_price_xxx=10 (matching original product-item.tsx)
   const defaultQtyApplied = useRef(false);
   useEffect(() => {
-    if (defaultQtyApplied.current || !effectiveSessionId || !items.length || !currencyId || session?.status === 'complete') return;
+    if (
+      defaultQtyApplied.current ||
+      !effectiveSessionId ||
+      !items.length ||
+      !currencyId ||
+      session?.status === 'complete'
+    )
+      return;
     try {
       const params = new URLSearchParams(window.location.search);
       for (const item of items) {
@@ -55,7 +62,16 @@ export function useLineItems(): UseLineItemsReturn {
           const qty = Math.max(1, parseInt(qtyStr, 10));
           if (Number.isFinite(qty) && qty !== item.quantity) {
             defaultQtyApplied.current = true;
-            adjustQuantity(effectiveSessionId, item.price_id, qty, currencyId, session, refresh);
+            adjustQuantity(
+              effectiveSessionId,
+              item.price_id,
+              qty,
+              currencyId,
+              session,
+              refresh,
+              sessionData,
+              setSessionData
+            );
             break; // only apply to the first matching item for ?qty
           }
         }
@@ -68,7 +84,7 @@ export function useLineItems(): UseLineItemsReturn {
   const updateQuantity = useMemoizedFn(async (itemId: string, qty: number) => {
     if (session?.status === 'complete') return;
     try {
-      await adjustQuantity(effectiveSessionId, itemId, qty, currencyId, session, refresh);
+      await adjustQuantity(effectiveSessionId, itemId, qty, currencyId, session, refresh, sessionData, setSessionData);
     } catch (err: unknown) {
       console.error('Failed to update quantity:', getErrorMessage(err));
     }
@@ -76,12 +92,12 @@ export function useLineItems(): UseLineItemsReturn {
 
   const upsell = useMemoizedFn(async (fromId: string, toId: string) => {
     if (session?.status === 'complete') return;
-    await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+    await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
   });
 
   const downsell = useMemoizedFn(async (priceId: string) => {
     if (session?.status === 'complete') return;
-    await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh);
+    await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
   });
 
   // Cross-sell item detection (must be before addCrossSell so it can reference crossSellItem)
@@ -124,7 +140,15 @@ export function useLineItems(): UseLineItemsReturn {
     if (session?.status === 'complete') return;
     if (!crossSellItem) return;
     try {
-      await addCrossSellItem(effectiveSessionId, crossSellItem.id, session, currencyId, refresh);
+      await addCrossSellItem(
+        effectiveSessionId,
+        crossSellItem.id,
+        session,
+        currencyId,
+        refresh,
+        sessionData,
+        setSessionData
+      );
     } catch (err: unknown) {
       console.error('Failed to add cross-sell:', getErrorMessage(err));
     }
@@ -133,7 +157,7 @@ export function useLineItems(): UseLineItemsReturn {
   const removeCrossSell = useMemoizedFn(async () => {
     if (session?.status === 'complete') return;
     try {
-      await removeCrossSellItem(effectiveSessionId, session, currencyId, refresh);
+      await removeCrossSellItem(effectiveSessionId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err: unknown) {
       console.error('Failed to remove cross-sell:', getErrorMessage(err));
     }
@@ -143,7 +167,16 @@ export function useLineItems(): UseLineItemsReturn {
     if (session?.status === 'complete') return;
     if (!isDonation) return;
     try {
-      await changeDonationAmount(effectiveSessionId, priceId, amount, session, currencyId, refresh);
+      await changeDonationAmount(
+        effectiveSessionId,
+        priceId,
+        amount,
+        session,
+        currencyId,
+        refresh,
+        sessionData,
+        setSessionData
+      );
     } catch (err: unknown) {
       console.error('Failed to change amount:', getErrorMessage(err));
     }

package/src/checkout/hooks/usePaymentMethod.ts

@@ -42,9 +42,10 @@ export interface UsePaymentMethodReturn {
 export function usePaymentMethod(
   sessionData: SessionData | null,
   sessionId: string,
-  refreshSession: (force?: boolean) => Promise<void>
+  refreshSession: (force?: boolean) => Promise<void>,
+  setSessionData?: (data: SessionData) => void
 ): UsePaymentMethodReturn {
-  const methods = sessionData?.paymentMethods || [];
+  const methods = useMemo(() => sessionData?.paymentMethods || [], [sessionData?.paymentMethods]);
   const session = sessionData?.checkoutSession;
 
   const [currencyId, setCurrencyId] = useState<string | null>(() => getInitialCurrencyId(session, methods));
@@ -88,7 +89,7 @@ export function usePaymentMethod(
 
     setSwitching(true);
     try {
-      await api.put(API.SWITCH_CURRENCY(sessionId), {
+      const { data } = await api.put(API.SWITCH_CURRENCY(sessionId), {
         currency_id: newCurrencyId,
         payment_method_id: method.id,
       });
@@ -105,8 +106,14 @@ export function usePaymentMethod(
         // Ignore
       }
 
-      // Refresh session to get updated data (backend clears quote on currency switch)
-      await refreshSession(true);
+      // 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: data, quotes: undefined });
+      } else {
+        await refreshSession(true);
+      }
     } catch (err: unknown) {
       console.error('Failed to switch currency:', getErrorMessage(err));
       // Fallback: align with backend currency to resolve currencyMismatch
@@ -131,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/hooks/useUpsell.ts

@@ -11,13 +11,13 @@ export interface UseUpsellReturn {
 }
 
 export function useUpsell(): UseUpsellReturn {
-  const { session, effectiveSessionId, refresh } = useSessionContext();
+  const { session, effectiveSessionId, refresh, sessionData, setSessionData } = useSessionContext();
   const { currency } = usePaymentMethodContext();
   const currencyId = currency?.id || null;
 
   const upsell = useMemoizedFn(async (fromId: string, toId: string) => {
     try {
-      await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+      await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err: unknown) {
       console.error('Failed to upsell:', getErrorMessage(err));
     }
@@ -25,7 +25,7 @@ export function useUpsell(): UseUpsellReturn {
 
   const downsell = useMemoizedFn(async (priceId: string) => {
     try {
-      await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh);
+      await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err: unknown) {
       console.error('Failed to downsell:', getErrorMessage(err));
     }

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)