@blocklet/payment-react-headless 1.26.2 → 1.26.3

package/es/checkout/context/CheckoutProvider.js

@@ -74,8 +74,8 @@ export function CheckoutProvider({ sessionId, children }) {
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
       recalculatePromotionIfNeeded(session, effectiveSessionId, currId).then((recalculated) => {
-        if (recalculated && sessionData) {
-          setSessionData({ ...sessionData, checkoutSession: recalculated, quotes: void 0 });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }
@@ -95,6 +95,7 @@ export function CheckoutProvider({ sessionId, children }) {
       setCurrency: paymentMethodHook.setCurrency,
       stripe: paymentMethodHook.stripe
     }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       paymentMethodHook.current,
       paymentMethodHook.currency,
@@ -120,7 +121,7 @@ export function CheckoutProvider({ sessionId, children }) {
   const mountedRef = useRef(true);
   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);
@@ -154,17 +155,19 @@ export function CheckoutProvider({ sessionId, children }) {
   });
   useEffect(() => {
     mountedRef.current = true;
-    if (!hasDynamicPricing || paymentMethodHook.isStripe || !effectiveSessionId || session?.status === "complete") {
+    if (!hasDynamicPricing || paymentMethodHook.isStripe || paymentMethodHook.switching || !effectiveSessionId || session?.status === "complete") {
       if (paymentMethodHook.isStripe) {
         setExchangeRate(null);
         setRateProvider(null);
         setRateProviderDisplay(null);
         setRateFetchedAt(null);
       }
-      if (session?.status === "complete") {
-        setRateStatus("available");
-      } else {
-        setRateStatus(hasDynamicPricing ? "unavailable" : "available");
+      if (!paymentMethodHook.switching) {
+        if (session?.status === "complete") {
+          setRateStatus("available");
+        } else {
+          setRateStatus(hasDynamicPricing ? "unavailable" : "available");
+        }
       }
       return void 0;
     }
@@ -184,6 +187,7 @@ export function CheckoutProvider({ sessionId, children }) {
   }, [
     hasDynamicPricing,
     paymentMethodHook.isStripe,
+    paymentMethodHook.switching,
     effectiveSessionId,
     paymentMethodHook.currency?.id,
     session?.status

package/es/checkout/context/SessionContext.d.ts

@@ -8,7 +8,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/es/checkout/core/customerForm.js

@@ -32,12 +32,6 @@ export function buildFields(session) {
         required: true,
         group: "address"
       },
-      {
-        name: "billing_address.line2",
-        type: "text",
-        required: false,
-        group: "address"
-      },
       {
         name: "billing_address.city",
         type: "text",

package/es/checkout/core/paymentMethod.js

@@ -21,33 +21,41 @@ export function getCurrencyStorageKey(did) {
   return did ? `${CURRENCY_PREFERENCE_KEY}:${did}` : CURRENCY_PREFERENCE_KEY;
 }
 export function getInitialCurrencyId(session, methods) {
+  const availableCurrencyIds = new Set(
+    methods.flatMap((m) => (m.payment_currencies || []).map((c) => c.id)).filter(Boolean)
+  );
+  const isAvailable = (currencyId) => !!currencyId && availableCurrencyIds.has(currencyId);
+  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 {
     }
     const user = session?.user;
     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;
     }
     try {
       const did = session?.user?.did;
       const stored = localStorage.getItem(getCurrencyStorageKey(did));
-      if (stored) return stored;
+      if (isAvailable(stored)) return stored;
     } catch {
     }
   }
-  return session?.currency_id || null;
+  if (isAvailable(session?.currency_id)) {
+    return session?.currency_id;
+  }
+  return methods[0]?.payment_currencies?.[0]?.id || null;
 }
 export function findMethodAndCurrency(methods, currencyId) {
   if (!currencyId) {
-    const first2 = methods[0];
-    const firstCurrency = first2?.payment_currencies?.[0] || null;
-    return { method: first2 || null, currency: firstCurrency };
+    return { method: null, currency: null };
   }
   for (const method of methods) {
     for (const currency of method.payment_currencies || []) {

package/es/checkout/core/pricing.js

@@ -77,7 +77,6 @@ export function calculateAmounts(items, currency, session, exchangeRate, hasDyna
     exchangeRate: hasDynamicPricing ? exchangeRate : null
   });
   const subtotalBN = new BN(result.total);
-  const subtotalFormatted = formatDynamicPrice(fromUnitToToken(subtotalBN, currency.decimal), hasDynamicPricing);
   const discountBN = calculateCouponDiscount(items, currency, session, hasDynamicPricing, exchangeRate, trialing, false);
   const discount = discountBN.gt(new BN(0)) ? formatDynamicPrice(fromUnitToToken(discountBN.toString(), currency.decimal), hasDynamicPricing) : null;
   const taxAmount = session?.total_details?.amount_tax;
@@ -125,7 +124,7 @@ export function calculateAmounts(items, currency, session, exchangeRate, hasDyna
   const stakingFormatted = stakingBN.gt(new BN(0)) ? `${formatDynamicPrice(fromUnitToToken(stakingBN.toString(), currency.decimal), hasDynamicPricing)} ${currency.symbol}` : null;
   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/es/checkout/hooks/useCheckout.js

@@ -39,7 +39,8 @@ export function useCheckout(sessionId) {
     paymentMethodHook.currency,
     paymentMethodHook.isStripe,
     refresh,
-    paymentMethodHook.current?.type || null
+    paymentMethodHook.current?.type || null,
+    paymentMethodHook.switching
   );
   const formHook = useCustomerForm(
     sessionData,
@@ -63,12 +64,12 @@ export function useCheckout(sessionId) {
   const prevCurrencyRef = useRef(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: void 0 });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }

package/es/checkout/hooks/useCheckoutSession.d.ts

@@ -18,8 +18,8 @@ export interface SessionData {
 export interface UseCheckoutSessionReturn {
     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;

package/es/checkout/hooks/useCheckoutSession.js

@@ -54,6 +54,11 @@ export function useCheckoutSession(sessionId) {
           return;
         }
       }
+      if (data?.stopAcceptingOrders && cs?.status !== "complete") {
+        setError("STOP_ACCEPTING_ORDERS");
+        setIsLoading(false);
+        return;
+      }
       setSessionData(data);
       setIsLoading(false);
     } catch (err) {
@@ -87,6 +92,8 @@ export function useCheckoutSession(sessionId) {
     errorCode = "SESSION_EXPIRED";
   } else if (error === "EMPTY_LINE_ITEMS") {
     errorCode = "EMPTY_LINE_ITEMS";
+  } else if (error === "STOP_ACCEPTING_ORDERS") {
+    errorCode = "STOP_ACCEPTING_ORDERS";
   }
   const vendorCount = session?.line_items?.reduce((count, item) => {
     return count + (item?.price?.product?.vendor_config?.length || 0);

package/es/checkout/hooks/useCheckoutStatus.d.ts

@@ -1,7 +1,7 @@
 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/es/checkout/hooks/useCustomerForm.d.ts

@@ -7,7 +7,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>;
 }

package/es/checkout/hooks/useCustomerForm.js

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

package/es/checkout/hooks/usePaymentMethod.js

@@ -9,7 +9,6 @@ import {
   findMethodAndCurrency,
   buildPaymentTypes
 } from "../core/paymentMethod.js";
-import { recalculatePromotionIfNeeded } from "../core/lineItems.js";
 export function usePaymentMethod(sessionData, sessionId, refreshSession, setSessionData) {
   const methods = useMemo(() => sessionData?.paymentMethods || [], [sessionData?.paymentMethods]);
   const session = sessionData?.checkoutSession;
@@ -56,13 +55,8 @@ export function usePaymentMethod(sessionData, sessionId, refreshSession, setSess
         );
       } catch {
       }
-      let finalSession = data;
-      if (data.discounts?.length) {
-        const recalculated = await recalculatePromotionIfNeeded(session, sessionId, newCurrencyId);
-        if (recalculated) finalSession = recalculated;
-      }
       if (sessionData && setSessionData) {
-        setSessionData({ ...sessionData, checkoutSession: finalSession, quotes: void 0 });
+        setSessionData({ ...sessionData, checkoutSession: data, quotes: void 0 });
       } else {
         await refreshSession(true);
       }

package/es/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/es/checkout/hooks/usePricing.js

@@ -11,7 +11,7 @@ import {
   isPromotionActive
 } from "../core/promotion.js";
 import { updateSlippage } from "../core/submit.js";
-export function usePricing(sessionData, sessionId, currency, isStripe, refreshSession, paymentMethodType) {
+export function usePricing(sessionData, sessionId, currency, isStripe, refreshSession, paymentMethodType, switching) {
   const session = sessionData?.checkoutSession;
   const items = session?.line_items || [];
   const [exchangeRate, setExchangeRate] = useState(null);
@@ -30,7 +30,7 @@ export function usePricing(sessionData, sessionId, currency, isStripe, refreshSe
   const mountedRef = useRef(true);
   const hasDynamicPricing = useMemo(() => checkHasDynamicPricing(items), [items]);
   const fetchRate = useMemoizedFn(async () => {
-    if (!sessionId || !hasDynamicPricing || isStripe) {
+    if (!sessionId || !hasDynamicPricing || isStripe || switching) {
       setRateStatus(hasDynamicPricing ? "unavailable" : "available");
       if (isStripe) {
         setExchangeRate(null);
@@ -62,7 +62,7 @@ export function usePricing(sessionData, sessionId, currency, isStripe, refreshSe
   });
   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);
@@ -95,7 +95,7 @@ export function usePricing(sessionData, sessionId, currency, isStripe, refreshSe
       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 = useMemo(
     () => calculateAmounts(items, currency, session, exchangeRate, hasDynamicPricing, paymentMethodType),
     [items, currency, exchangeRate, hasDynamicPricing, session, paymentMethodType]

package/es/checkout/hooks/useSubmit.js

@@ -328,6 +328,11 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
       });
       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({
@@ -443,7 +448,7 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
     }
   });
   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/es/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/lib/checkout/context/CheckoutProvider.js

@@ -64,12 +64,8 @@ function CheckoutProvider({
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
       (0, _lineItems.recalculatePromotionIfNeeded)(session, effectiveSessionId, currId).then(recalculated => {
-        if (recalculated && sessionData) {
-          setSessionData({
-            ...sessionData,
-            checkoutSession: recalculated,
-            quotes: void 0
-          });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }
@@ -87,7 +83,9 @@ function CheckoutProvider({
     types: paymentMethodHook.types,
     setCurrency: paymentMethodHook.setCurrency,
     stripe: paymentMethodHook.stripe
-  }), [paymentMethodHook.current, paymentMethodHook.currency, paymentMethodHook.available, paymentMethodHook.currencies, paymentMethodHook.isStripe, paymentMethodHook.isCrypto, paymentMethodHook.isCredit, paymentMethodHook.switching, paymentMethodHook.setType, paymentMethodHook.types, paymentMethodHook.setCurrency, paymentMethodHook.stripe]);
+  }),
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [paymentMethodHook.current, paymentMethodHook.currency, paymentMethodHook.available, paymentMethodHook.currencies, paymentMethodHook.isStripe, paymentMethodHook.isCrypto, paymentMethodHook.isCredit, paymentMethodHook.switching, paymentMethodHook.setType, paymentMethodHook.types, paymentMethodHook.setCurrency, paymentMethodHook.stripe]);
   const [exchangeRate, setExchangeRate] = (0, _react.useState)(null);
   const [rateProvider, setRateProvider] = (0, _react.useState)(null);
   const [rateProviderDisplay, setRateProviderDisplay] = (0, _react.useState)(null);
@@ -98,7 +96,7 @@ function CheckoutProvider({
   const mountedRef = (0, _react.useRef)(true);
   const hasDynamicPricing = (0, _react.useMemo)(() => (0, _exchangeRate.checkHasDynamicPricing)(items), [items]);
   const fetchRate = (0, _ahooks.useMemoizedFn)(async () => {
-    if (!effectiveSessionId || !hasDynamicPricing || paymentMethodHook.isStripe) {
+    if (!effectiveSessionId || !hasDynamicPricing || paymentMethodHook.isStripe || paymentMethodHook.switching) {
       setRateStatus(hasDynamicPricing ? "unavailable" : "available");
       if (paymentMethodHook.isStripe) {
         setExchangeRate(null);
@@ -132,17 +130,19 @@ function CheckoutProvider({
   });
   (0, _react.useEffect)(() => {
     mountedRef.current = true;
-    if (!hasDynamicPricing || paymentMethodHook.isStripe || !effectiveSessionId || session?.status === "complete") {
+    if (!hasDynamicPricing || paymentMethodHook.isStripe || paymentMethodHook.switching || !effectiveSessionId || session?.status === "complete") {
       if (paymentMethodHook.isStripe) {
         setExchangeRate(null);
         setRateProvider(null);
         setRateProviderDisplay(null);
         setRateFetchedAt(null);
       }
-      if (session?.status === "complete") {
-        setRateStatus("available");
-      } else {
-        setRateStatus(hasDynamicPricing ? "unavailable" : "available");
+      if (!paymentMethodHook.switching) {
+        if (session?.status === "complete") {
+          setRateStatus("available");
+        } else {
+          setRateStatus(hasDynamicPricing ? "unavailable" : "available");
+        }
       }
       return void 0;
     }
@@ -159,7 +159,7 @@ function CheckoutProvider({
       if (intervalRef.current) clearInterval(intervalRef.current);
       document.removeEventListener("visibilitychange", handleVisibility);
     };
-  }, [hasDynamicPricing, paymentMethodHook.isStripe, effectiveSessionId, paymentMethodHook.currency?.id, session?.status]);
+  }, [hasDynamicPricing, paymentMethodHook.isStripe, paymentMethodHook.switching, effectiveSessionId, paymentMethodHook.currency?.id, session?.status]);
   const exchangeRateValue = (0, _react.useMemo)(() => ({
     rate: exchangeRate,
     provider: rateProvider,

package/lib/checkout/context/SessionContext.d.ts

@@ -8,7 +8,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/lib/checkout/core/customerForm.js

@@ -37,11 +37,6 @@ function buildFields(session) {
       type: "text",
       required: true,
       group: "address"
-    }, {
-      name: "billing_address.line2",
-      type: "text",
-      required: false,
-      group: "address"
     }, {
       name: "billing_address.city",
       type: "text",

package/lib/checkout/core/paymentMethod.js

@@ -36,33 +36,39 @@ function getCurrencyStorageKey(did) {
   return did ? `${CURRENCY_PREFERENCE_KEY}:${did}` : CURRENCY_PREFERENCE_KEY;
 }
 function getInitialCurrencyId(session, methods) {
+  const availableCurrencyIds = new Set(methods.flatMap(m => (m.payment_currencies || []).map(c => c.id)).filter(Boolean));
+  const isAvailable = currencyId => !!currencyId && availableCurrencyIds.has(currencyId);
+  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 {}
     const user = session?.user;
     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;
     }
     try {
       const did = session?.user?.did;
       const stored = localStorage.getItem(getCurrencyStorageKey(did));
-      if (stored) return stored;
+      if (isAvailable(stored)) return stored;
     } catch {}
   }
-  return session?.currency_id || null;
+  if (isAvailable(session?.currency_id)) {
+    return session?.currency_id;
+  }
+  return methods[0]?.payment_currencies?.[0]?.id || null;
 }
 function findMethodAndCurrency(methods, currencyId) {
   if (!currencyId) {
-    const first2 = methods[0];
-    const firstCurrency = first2?.payment_currencies?.[0] || null;
     return {
-      method: first2 || null,
-      currency: firstCurrency
+      method: null,
+      currency: null
     };
   }
   for (const method of methods) {

package/lib/checkout/core/pricing.js

@@ -82,7 +82,6 @@ function calculateAmounts(items, currency, session, exchangeRate, hasDynamicPric
     exchangeRate: hasDynamicPricing ? exchangeRate : null
   });
   const subtotalBN = new _util.BN(result.total);
-  const subtotalFormatted = (0, _format.formatDynamicPrice)((0, _util.fromUnitToToken)(subtotalBN, currency.decimal), hasDynamicPricing);
   const discountBN = calculateCouponDiscount(items, currency, session, hasDynamicPricing, exchangeRate, trialing, false);
   const discount = discountBN.gt(new _util.BN(0)) ? (0, _format.formatDynamicPrice)((0, _util.fromUnitToToken)(discountBN.toString(), currency.decimal), hasDynamicPricing) : null;
   const taxAmount = session?.total_details?.amount_tax;
@@ -124,7 +123,7 @@ function calculateAmounts(items, currency, session, exchangeRate, hasDynamicPric
   const stakingFormatted = stakingBN.gt(new _util.BN(0)) ? `${(0, _format.formatDynamicPrice)((0, _util.fromUnitToToken)(stakingBN.toString(), currency.decimal), hasDynamicPricing)} ${currency.symbol}` : null;
   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/lib/checkout/hooks/useCheckout.js

@@ -32,7 +32,7 @@ function useCheckout(sessionId) {
   const session = sessionData?.checkoutSession;
   const effectiveSessionId = resolvedSessionId || sessionId;
   const paymentMethodHook = (0, _usePaymentMethod.usePaymentMethod)(sessionData, effectiveSessionId, refresh, setSessionData);
-  const pricingHook = (0, _usePricing.usePricing)(sessionData, effectiveSessionId, paymentMethodHook.currency, paymentMethodHook.isStripe, refresh, paymentMethodHook.current?.type || null);
+  const pricingHook = (0, _usePricing.usePricing)(sessionData, effectiveSessionId, paymentMethodHook.currency, paymentMethodHook.isStripe, refresh, paymentMethodHook.current?.type || null, paymentMethodHook.switching);
   const formHook = (0, _useCustomerForm.useCustomerForm)(sessionData, paymentMethodHook.currency?.id || null, paymentMethodHook.current?.id || null);
   const isDonation = session?.submit_type === "donate";
   const submitHook = (0, _useSubmit.useSubmit)(sessionData, effectiveSessionId, paymentMethodHook.currency?.id || null, paymentMethodHook.isStripe, paymentMethodHook.isCredit, isDonation, formHook.values, formHook.validate, refresh);
@@ -41,16 +41,12 @@ function useCheckout(sessionId) {
   const prevCurrencyRef = (0, _react.useRef)(null);
   (0, _react.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;
       (0, _lineItems.recalculatePromotionIfNeeded)(session, effectiveSessionId, currId).then(recalculated => {
-        if (recalculated && sessionData) {
-          setSessionData({
-            ...sessionData,
-            checkoutSession: recalculated,
-            quotes: void 0
-          });
+        if (recalculated) {
+          refresh(true);
         }
       });
     }

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

@@ -18,8 +18,8 @@ export interface SessionData {
 export interface UseCheckoutSessionReturn {
     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;

package/lib/checkout/hooks/useCheckoutSession.js

@@ -66,6 +66,11 @@ function useCheckoutSession(sessionId) {
           return;
         }
       }
+      if (data?.stopAcceptingOrders && cs?.status !== "complete") {
+        setError("STOP_ACCEPTING_ORDERS");
+        setIsLoading(false);
+        return;
+      }
       setSessionData(data);
       setIsLoading(false);
     } catch (err) {
@@ -99,6 +104,8 @@ function useCheckoutSession(sessionId) {
     errorCode = "SESSION_EXPIRED";
   } else if (error === "EMPTY_LINE_ITEMS") {
     errorCode = "EMPTY_LINE_ITEMS";
+  } else if (error === "STOP_ACCEPTING_ORDERS") {
+    errorCode = "STOP_ACCEPTING_ORDERS";
   }
   const vendorCount = session?.line_items?.reduce((count, item) => {
     return count + (item?.price?.product?.vendor_config?.length || 0);

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

@@ -1,7 +1,7 @@
 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/lib/checkout/hooks/useCustomerForm.d.ts

@@ -7,7 +7,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>;
 }

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
   };
 }