@blocklet/payment-react-headless 1.26.1 → 1.26.3

package/es/checkout/hooks/useLineItems.js

@@ -12,12 +12,13 @@ import {
 } from "../core/lineItems.js";
 import { addCrossSellItem, removeCrossSellItem, fetchCrossSellItem } from "../core/crossSell.js";
 export function useLineItems() {
-  const { items, session, effectiveSessionId, isDonation, refresh } = useSessionContext();
+  const { items, session, effectiveSessionId, isDonation, refresh, sessionData, setSessionData } = useSessionContext();
   const { currency } = usePaymentMethodContext();
   const currencyId = currency?.id || null;
   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) {
@@ -26,7 +27,16 @@ export function useLineItems() {
           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;
           }
         }
@@ -37,18 +47,18 @@ export function useLineItems() {
   const updateQuantity = useMemoizedFn(async (itemId, qty) => {
     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) {
       console.error("Failed to update quantity:", getErrorMessage(err));
     }
   });
   const upsell = useMemoizedFn(async (fromId, toId) => {
     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) => {
     if (session?.status === "complete") return;
-    await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh);
+    await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
   });
   const embeddedCrossSellItem = useMemo(() => getCrossSellItem(items), [items]);
   const [fetchedCrossSellItem, setFetchedCrossSellItem] = useState(null);
@@ -80,7 +90,15 @@ export function useLineItems() {
     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) {
       console.error("Failed to add cross-sell:", getErrorMessage(err));
     }
@@ -88,7 +106,7 @@ export function useLineItems() {
   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) {
       console.error("Failed to remove cross-sell:", getErrorMessage(err));
     }
@@ -97,7 +115,16 @@ export function useLineItems() {
     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) {
       console.error("Failed to change amount:", getErrorMessage(err));
     }

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

@@ -23,4 +23,4 @@ export interface UsePaymentMethodReturn {
         status: 'idle' | 'ready' | 'processing' | 'succeeded' | 'failed';
     } | null;
 }
-export declare function usePaymentMethod(sessionData: SessionData | null, sessionId: string, refreshSession: (force?: boolean) => Promise<void>): UsePaymentMethodReturn;
+export declare function usePaymentMethod(sessionData: SessionData | null, sessionId: string, refreshSession: (force?: boolean) => Promise<void>, setSessionData?: (data: SessionData) => void): UsePaymentMethodReturn;

package/es/checkout/hooks/usePaymentMethod.js

@@ -9,8 +9,8 @@ import {
   findMethodAndCurrency,
   buildPaymentTypes
 } from "../core/paymentMethod.js";
-export function usePaymentMethod(sessionData, sessionId, refreshSession) {
-  const methods = sessionData?.paymentMethods || [];
+export function usePaymentMethod(sessionData, sessionId, refreshSession, setSessionData) {
+  const methods = useMemo(() => sessionData?.paymentMethods || [], [sessionData?.paymentMethods]);
   const session = sessionData?.checkoutSession;
   const [currencyId, setCurrencyId] = useState(() => getInitialCurrencyId(session, methods));
   const [switching, setSwitching] = useState(false);
@@ -43,7 +43,7 @@ export function usePaymentMethod(sessionData, sessionId, refreshSession) {
     if (!method || !sessionId) return;
     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
       });
@@ -55,7 +55,11 @@ export function usePaymentMethod(sessionData, sessionId, refreshSession) {
         );
       } catch {
       }
-      await refreshSession(true);
+      if (sessionData && setSessionData) {
+        setSessionData({ ...sessionData, checkoutSession: data, quotes: void 0 });
+      } else {
+        await refreshSession(true);
+      }
     } catch (err) {
       console.error("Failed to switch currency:", getErrorMessage(err));
       if (session?.currency_id) {

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/hooks/useUpsell.js

@@ -4,19 +4,19 @@ import { useSessionContext } from "../context/SessionContext.js";
 import { usePaymentMethodContext } from "../context/PaymentMethodContext.js";
 import { performUpsell, performDownsell } from "../core/lineItems.js";
 export function useUpsell() {
-  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, toId) => {
     try {
-      await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+      await performUpsell(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to upsell:", getErrorMessage(err));
     }
   });
   const downsell = useMemoizedFn(async (priceId) => {
     try {
-      await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh);
+      await performDownsell(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to downsell:", getErrorMessage(err));
     }

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

@@ -37,10 +37,11 @@ function CheckoutProvider({
   } = (0, _useCheckoutSession.useCheckoutSession)(sessionId);
   const session = sessionData?.checkoutSession;
   const effectiveSessionId = resolvedSessionId || sessionId;
-  const items = session?.line_items || [];
+  const items = (0, _react.useMemo)(() => session?.line_items || [], [session?.line_items]);
   const isDonation = session?.submit_type === "donate";
   const sessionValue = (0, _react.useMemo)(() => ({
     sessionData,
+    setSessionData,
     sessionId,
     effectiveSessionId,
     isLoading,
@@ -54,15 +55,19 @@ function CheckoutProvider({
     product,
     subscription,
     pageInfo
-  }), [sessionData, sessionId, effectiveSessionId, isLoading, error, errorCode, refresh, items, session, isDonation, vendorCount, product, subscription, pageInfo]);
-  const paymentMethodHook = (0, _usePaymentMethod.usePaymentMethod)(sessionData, effectiveSessionId, refresh);
+  }), [sessionData, setSessionData, sessionId, effectiveSessionId, isLoading, error, errorCode, refresh, items, session, isDonation, vendorCount, product, subscription, pageInfo]);
+  const paymentMethodHook = (0, _usePaymentMethod.usePaymentMethod)(sessionData, effectiveSessionId, refresh, setSessionData);
   const prevCurrencyRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(() => {
     const currId = paymentMethodHook.currency?.id || null;
     if (!currId || !session || session.status === "complete") return;
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
-      (0, _lineItems.recalculatePromotionIfNeeded)(session, effectiveSessionId, currId).then(() => refresh(true));
+      (0, _lineItems.recalculatePromotionIfNeeded)(session, effectiveSessionId, currId).then(recalculated => {
+        if (recalculated) {
+          refresh(true);
+        }
+      });
     }
   }, [paymentMethodHook.currency?.id, session?.id]);
   const paymentMethodValue = (0, _react.useMemo)(() => ({
@@ -78,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);
@@ -89,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);
@@ -123,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;
     }
@@ -150,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

@@ -2,11 +2,13 @@ import type { TLineItemExpanded, TCheckoutSessionExpanded } from '@blocklet/paym
 import type { SessionData } from '../hooks/useCheckoutSession';
 export interface SessionContextValue {
     sessionData: SessionData | null;
+    /** Directly replace session data (e.g. using PUT response to skip redundant GET) */
+    setSessionData: (data: SessionData) => void;
     sessionId: string;
     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/crossSell.d.ts

@@ -1,4 +1,5 @@
 import type { TCheckoutSessionExpanded, TPrice } from '@blocklet/payment-types';
-export declare function addCrossSellItem(sessionId: string, crossSellItemId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>): Promise<void>;
-export declare function removeCrossSellItem(sessionId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>): Promise<void>;
+import type { SessionData } from '../hooks/useCheckoutSession';
+export declare function addCrossSellItem(sessionId: string, crossSellItemId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
+export declare function removeCrossSellItem(sessionId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
 export declare function fetchCrossSellItem(sessionId: string): Promise<TPrice | null>;

package/lib/checkout/core/crossSell.js

@@ -10,17 +10,45 @@ var _api = _interopRequireWildcard(require("../../shared/api"));
 var _lineItems = require("./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; }
-async function addCrossSellItem(sessionId, crossSellItemId, session, currencyId, refresh) {
-  await _api.default.put(_api.API.CROSS_SELL(sessionId), {
+async function addCrossSellItem(sessionId, crossSellItemId, session, currencyId, refresh, sessionData, setSessionData) {
+  const {
+    data
+  } = await _api.default.put(_api.API.CROSS_SELL(sessionId), {
     to: crossSellItemId
   });
-  await (0, _lineItems.recalculatePromotionIfNeeded)(session, sessionId, currencyId);
-  await refresh(true);
+  let finalSession = data;
+  if (data.discounts?.length) {
+    const recalculated = await (0, _lineItems.recalculatePromotionIfNeeded)(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
+  }
 }
-async function removeCrossSellItem(sessionId, session, currencyId, refresh) {
-  await _api.default.delete(_api.API.CROSS_SELL(sessionId));
-  await (0, _lineItems.recalculatePromotionIfNeeded)(session, sessionId, currencyId);
-  await refresh(true);
+async function removeCrossSellItem(sessionId, session, currencyId, refresh, sessionData, setSessionData) {
+  const {
+    data
+  } = await _api.default.delete(_api.API.CROSS_SELL(sessionId));
+  let finalSession = data;
+  if (data.discounts?.length) {
+    const recalculated = await (0, _lineItems.recalculatePromotionIfNeeded)(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
+  }
 }
 const pendingFetches = /* @__PURE__ */new Map();
 function fetchCrossSellItem(sessionId) {

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/lineItems.d.ts

@@ -1,7 +1,8 @@
 import type { TCheckoutSessionExpanded, TLineItemExpanded, TPrice } from '@blocklet/payment-types';
-export declare function recalculatePromotionIfNeeded(session: TCheckoutSessionExpanded | undefined | null, sessionId: string, currencyId: string | null | undefined): Promise<void>;
-export declare function adjustQuantity(sessionId: string, itemId: string, qty: number, currencyId: string | null | undefined, session: TCheckoutSessionExpanded | undefined | null, refresh: (force?: boolean) => Promise<void>): Promise<void>;
-export declare function performUpsell(sessionId: string, fromId: string, toId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>): Promise<void>;
-export declare function performDownsell(sessionId: string, priceId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>): Promise<void>;
-export declare function changeDonationAmount(sessionId: string, priceId: string, amount: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>): Promise<void>;
+import type { SessionData } from '../hooks/useCheckoutSession';
+export declare function recalculatePromotionIfNeeded(session: TCheckoutSessionExpanded | undefined | null, sessionId: string, currencyId: string | null | undefined): Promise<TCheckoutSessionExpanded | null>;
+export declare function adjustQuantity(sessionId: string, itemId: string, qty: number, currencyId: string | null | undefined, session: TCheckoutSessionExpanded | undefined | null, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
+export declare function performUpsell(sessionId: string, fromId: string, toId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
+export declare function performDownsell(sessionId: string, priceId: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
+export declare function changeDonationAmount(sessionId: string, priceId: string, amount: string, session: TCheckoutSessionExpanded | undefined | null, currencyId: string | null | undefined, refresh: (force?: boolean) => Promise<void>, sessionData?: SessionData | null, setSessionData?: (data: SessionData) => void): Promise<void>;
 export declare function getCrossSellItem(items: TLineItemExpanded[]): TPrice | null;

package/lib/checkout/core/lineItems.js

@@ -14,56 +14,110 @@ var _promotion = require("./promotion");
 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; }
 async function recalculatePromotionIfNeeded(session, sessionId, currencyId) {
-  if (!(0, _promotion.hasAppliedDiscounts)(session)) return;
+  if (!(0, _promotion.hasAppliedDiscounts)(session)) return null;
   try {
-    await (0, _promotion.recalculatePromotion)(sessionId, currencyId);
-  } catch {}
+    return await (0, _promotion.recalculatePromotion)(sessionId, currencyId);
+  } catch {
+    return null;
+  }
 }
-async function adjustQuantity(sessionId, itemId, qty, currencyId, session, refresh) {
-  await _api.default.put(_api.API.ADJUST_QUANTITY(sessionId), {
+async function adjustQuantity(sessionId, itemId, qty, currencyId, session, refresh, sessionData, setSessionData) {
+  const {
+    data
+  } = await _api.default.put(_api.API.ADJUST_QUANTITY(sessionId), {
     itemId,
     quantity: qty,
     currency_id: currencyId
   });
-  await recalculatePromotionIfNeeded(session, sessionId, currencyId);
-  await refresh(true);
+  let finalSession = data;
+  if (data.discounts?.length || (0, _promotion.hasAppliedDiscounts)(session)) {
+    const recalculated = await recalculatePromotionIfNeeded(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
+  }
 }
-async function performUpsell(sessionId, fromId, toId, session, currencyId, refresh) {
+async function performUpsell(sessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData) {
   if ((session?.line_items?.length || 0) > 1) {
     try {
       await _api.default.delete(_api.API.CROSS_SELL(sessionId));
     } catch {}
   }
-  await _api.default.put(_api.API.UPSELL(sessionId), {
+  const {
+    data
+  } = await _api.default.put(_api.API.UPSELL(sessionId), {
     from: fromId,
     to: toId
   });
-  await recalculatePromotionIfNeeded(session, sessionId, currencyId);
-  await refresh(true);
+  let finalSession = data;
+  if (data.discounts?.length || (0, _promotion.hasAppliedDiscounts)(session)) {
+    const recalculated = await recalculatePromotionIfNeeded(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
+  }
 }
-async function performDownsell(sessionId, priceId, session, currencyId, refresh) {
+async function performDownsell(sessionId, priceId, session, currencyId, refresh, sessionData, setSessionData) {
   if ((session?.line_items?.length || 0) > 1) {
     try {
       await _api.default.delete(_api.API.CROSS_SELL(sessionId));
     } catch {}
   }
-  await _api.default.put(_api.API.DOWNSELL(sessionId), {
+  const {
+    data
+  } = await _api.default.put(_api.API.DOWNSELL(sessionId), {
     from: priceId
   });
-  await recalculatePromotionIfNeeded(session, sessionId, currencyId);
-  await refresh(true);
+  let finalSession = data;
+  if (data.discounts?.length || (0, _promotion.hasAppliedDiscounts)(session)) {
+    const recalculated = await recalculatePromotionIfNeeded(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
+  }
 }
-async function changeDonationAmount(sessionId, priceId, amount, session, currencyId, refresh) {
+async function changeDonationAmount(sessionId, priceId, amount, session, currencyId, refresh, sessionData, setSessionData) {
   const {
     data
   } = await _api.default.put(_api.API.CHANGE_AMOUNT(sessionId), {
     priceId,
     amount
   });
+  let finalSession = data;
   if (data?.discounts?.length) {
-    await recalculatePromotionIfNeeded(session, sessionId, currencyId);
+    const recalculated = await recalculatePromotionIfNeeded(session, sessionId, currencyId);
+    if (recalculated) finalSession = recalculated;
+  }
+  if (sessionData && setSessionData) {
+    setSessionData({
+      ...sessionData,
+      checkoutSession: finalSession,
+      quotes: void 0
+    });
+  } else {
+    await refresh(true);
   }
-  await refresh(true);
 }
 function getCrossSellItem(items) {
   for (const item of items) {

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) {