@blocklet/payment-react-headless 1.26.0 → 1.26.2

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

@@ -5,6 +5,6 @@ export declare function applyPromotionCode(sessionId: string, code: string, curr
     error?: string;
 }>;
 export declare function removePromotionCode(sessionId: string): Promise<void>;
-export declare function recalculatePromotion(sessionId: string, currencyId: string | null | undefined): Promise<void>;
+export declare function recalculatePromotion(sessionId: string, currencyId: string | null | undefined): Promise<TCheckoutSessionExpanded>;
 export declare function isPromotionActive(session: TCheckoutSessionExpanded | undefined | null): boolean;
 export declare function hasAppliedDiscounts(session: TCheckoutSessionExpanded | undefined | null): boolean;

package/lib/checkout/core/promotion.js

@@ -49,9 +49,12 @@ async function removePromotionCode(sessionId) {
   await _api.default.delete(_api.API.REMOVE_PROMOTION(sessionId));
 }
 async function recalculatePromotion(sessionId, currencyId) {
-  await _api.default.post(_api.API.RECALCULATE_PROMOTION_SESSION(sessionId), {
+  const {
+    data
+  } = await _api.default.post(_api.API.RECALCULATE_PROMOTION_SESSION(sessionId), {
     currency_id: currencyId
   });
+  return data;
 }
 function isPromotionActive(session) {
   return session?.allow_promotion_codes !== false;

package/lib/checkout/hooks/useBillingInterval.js

@@ -16,23 +16,26 @@ function useBillingInterval() {
     items,
     session,
     effectiveSessionId,
-    refresh
+    refresh,
+    sessionData,
+    setSessionData
   } = (0, _SessionContext.useSessionContext)();
   const {
     currency
   } = (0, _PaymentMethodContext.usePaymentMethodContext)();
   const currencyId = currency?.id || null;
   const [switching, setSwitching] = (0, _react.useState)(false);
+  const [pendingInterval, setPendingInterval] = (0, _react.useState)(null);
   const upsell = (0, _ahooks.useMemoizedFn)(async (fromId, toId) => {
     try {
-      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to upsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const downsell = (0, _ahooks.useMemoizedFn)(async priceId => {
     try {
-      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh);
+      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to downsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -41,12 +44,13 @@ function useBillingInterval() {
     const parsed = (0, _billingInterval.parseBillingInterval)(items);
     if (!parsed) return null;
     return {
-      current: parsed.current,
+      current: pendingInterval || parsed.current,
       available: parsed.available,
       switching,
       switch: async interval => {
         const target = parsed.available.find(a => a.interval === interval);
         if (!target || switching) return;
+        setPendingInterval(interval);
         setSwitching(true);
         try {
           if (!parsed.firstItem.upsell_price_id && target.priceId) {
@@ -56,8 +60,9 @@ function useBillingInterval() {
           }
         } finally {
           setSwitching(false);
+          setPendingInterval(null);
         }
       }
     };
-  }, [items, effectiveSessionId, switching]);
+  }, [items, effectiveSessionId, switching, pendingInterval]);
 }

package/lib/checkout/hooks/useCheckout.js

@@ -21,6 +21,7 @@ function useCheckout(sessionId) {
     error,
     errorCode,
     refresh,
+    setSessionData,
     sessionData,
     resolvedSessionId,
     vendorCount,
@@ -30,12 +31,12 @@ function useCheckout(sessionId) {
   } = (0, _useCheckoutSession.useCheckoutSession)(sessionId);
   const session = sessionData?.checkoutSession;
   const effectiveSessionId = resolvedSessionId || sessionId;
-  const paymentMethodHook = (0, _usePaymentMethod.usePaymentMethod)(sessionData, effectiveSessionId, refresh);
+  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 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);
-  const items = session?.line_items || [];
+  const items = (0, _react.useMemo)(() => session?.line_items || [], [session?.line_items]);
   const currencyId = paymentMethodHook.currency?.id || null;
   const prevCurrencyRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(() => {
@@ -43,26 +44,34 @@ function useCheckout(sessionId) {
     if (!currId || !session) 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 && sessionData) {
+          setSessionData({
+            ...sessionData,
+            checkoutSession: recalculated,
+            quotes: void 0
+          });
+        }
+      });
     }
   }, [paymentMethodHook.currency?.id, session?.id]);
   const updateQuantity = (0, _ahooks.useMemoizedFn)(async (itemId, qty) => {
     try {
-      await (0, _lineItems.adjustQuantity)(effectiveSessionId, itemId, qty, currencyId, session, refresh);
+      await (0, _lineItems.adjustQuantity)(effectiveSessionId, itemId, qty, currencyId, session, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to update quantity:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const upsell = (0, _ahooks.useMemoizedFn)(async (fromId, toId) => {
     try {
-      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to upsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const downsell = (0, _ahooks.useMemoizedFn)(async priceId => {
     try {
-      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh);
+      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to downsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -87,14 +96,14 @@ function useCheckout(sessionId) {
   const addCrossSell = (0, _ahooks.useMemoizedFn)(async () => {
     if (!crossSellItem) return;
     try {
-      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItem.id, session, currencyId, refresh);
+      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItem.id, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to add cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const removeCrossSell = (0, _ahooks.useMemoizedFn)(async () => {
     try {
-      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh);
+      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to remove cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -119,7 +128,7 @@ function useCheckout(sessionId) {
   const setDonationAmount = (0, _ahooks.useMemoizedFn)(async (priceId, amount) => {
     if (!isDonation) return;
     try {
-      await (0, _lineItems.changeDonationAmount)(effectiveSessionId, priceId, amount, session, currencyId, refresh);
+      await (0, _lineItems.changeDonationAmount)(effectiveSessionId, priceId, amount, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to change amount:", (0, _checkoutAugmented.getErrorMessage)(err));
     }

package/lib/checkout/hooks/useCrossSell.js

@@ -16,7 +16,9 @@ function useCrossSell() {
     items,
     session,
     effectiveSessionId,
-    refresh
+    refresh,
+    sessionData,
+    setSessionData
   } = (0, _SessionContext.useSessionContext)();
   const {
     currency
@@ -53,7 +55,7 @@ function useCrossSell() {
     const crossSellItemPrice = (0, _lineItems.getCrossSellItem)(items);
     if (!crossSellItemPrice) return;
     try {
-      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItemPrice.id, session, currencyId, refresh);
+      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItemPrice.id, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to add cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -61,7 +63,7 @@ function useCrossSell() {
   const remove = (0, _ahooks.useMemoizedFn)(async () => {
     if (session?.status === "complete") return;
     try {
-      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh);
+      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to remove cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }

package/lib/checkout/hooks/useLineItems.js

@@ -17,7 +17,9 @@ function useLineItems() {
     session,
     effectiveSessionId,
     isDonation,
-    refresh
+    refresh,
+    sessionData,
+    setSessionData
   } = (0, _SessionContext.useSessionContext)();
   const {
     currency
@@ -34,7 +36,7 @@ function useLineItems() {
           const qty = Math.max(1, parseInt(qtyStr, 10));
           if (Number.isFinite(qty) && qty !== item.quantity) {
             defaultQtyApplied.current = true;
-            (0, _lineItems.adjustQuantity)(effectiveSessionId, item.price_id, qty, currencyId, session, refresh);
+            (0, _lineItems.adjustQuantity)(effectiveSessionId, item.price_id, qty, currencyId, session, refresh, sessionData, setSessionData);
             break;
           }
         }
@@ -44,18 +46,18 @@ function useLineItems() {
   const updateQuantity = (0, _ahooks.useMemoizedFn)(async (itemId, qty) => {
     if (session?.status === "complete") return;
     try {
-      await (0, _lineItems.adjustQuantity)(effectiveSessionId, itemId, qty, currencyId, session, refresh);
+      await (0, _lineItems.adjustQuantity)(effectiveSessionId, itemId, qty, currencyId, session, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to update quantity:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const upsell = (0, _ahooks.useMemoizedFn)(async (fromId, toId) => {
     if (session?.status === "complete") return;
-    await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+    await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
   });
   const downsell = (0, _ahooks.useMemoizedFn)(async priceId => {
     if (session?.status === "complete") return;
-    await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh);
+    await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
   });
   const embeddedCrossSellItem = (0, _react.useMemo)(() => (0, _lineItems.getCrossSellItem)(items), [items]);
   const [fetchedCrossSellItem, setFetchedCrossSellItem] = (0, _react.useState)(null);
@@ -87,7 +89,7 @@ function useLineItems() {
     if (session?.status === "complete") return;
     if (!crossSellItem) return;
     try {
-      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItem.id, session, currencyId, refresh);
+      await (0, _crossSell.addCrossSellItem)(effectiveSessionId, crossSellItem.id, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to add cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -95,7 +97,7 @@ function useLineItems() {
   const removeCrossSell = (0, _ahooks.useMemoizedFn)(async () => {
     if (session?.status === "complete") return;
     try {
-      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh);
+      await (0, _crossSell.removeCrossSellItem)(effectiveSessionId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to remove cross-sell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
@@ -104,7 +106,7 @@ function useLineItems() {
     if (session?.status === "complete") return;
     if (!isDonation) return;
     try {
-      await (0, _lineItems.changeDonationAmount)(effectiveSessionId, priceId, amount, session, currencyId, refresh);
+      await (0, _lineItems.changeDonationAmount)(effectiveSessionId, priceId, amount, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to change amount:", (0, _checkoutAugmented.getErrorMessage)(err));
     }

package/lib/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/lib/checkout/hooks/usePaymentMethod.js

@@ -9,10 +9,11 @@ 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) {
-  const methods = sessionData?.paymentMethods || [];
+function usePaymentMethod(sessionData, sessionId, refreshSession, setSessionData) {
+  const methods = (0, _react.useMemo)(() => sessionData?.paymentMethods || [], [sessionData?.paymentMethods]);
   const session = sessionData?.checkoutSession;
   const [currencyId, setCurrencyId] = (0, _react.useState)(() => (0, _paymentMethod.getInitialCurrencyId)(session, methods));
   const [switching, setSwitching] = (0, _react.useState)(false);
@@ -47,7 +48,9 @@ function usePaymentMethod(sessionData, sessionId, refreshSession) {
     if (!method || !sessionId) return;
     setSwitching(true);
     try {
-      await _api.default.put(_api.API.SWITCH_CURRENCY(sessionId), {
+      const {
+        data
+      } = await _api.default.put(_api.API.SWITCH_CURRENCY(sessionId), {
         currency_id: newCurrencyId,
         payment_method_id: method.id
       });
@@ -55,7 +58,20 @@ function usePaymentMethod(sessionData, sessionId, refreshSession) {
       try {
         localStorage.setItem((0, _paymentMethod.getCurrencyStorageKey)(session?.user?.did), newCurrencyId);
       } catch {}
-      await refreshSession(true);
+      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,
+          quotes: void 0
+        });
+      } else {
+        await refreshSession(true);
+      }
     } catch (err) {
       console.error("Failed to switch currency:", (0, _checkoutAugmented.getErrorMessage)(err));
       if (session?.currency_id) {

package/lib/checkout/hooks/useUpsell.js

@@ -13,7 +13,9 @@ function useUpsell() {
   const {
     session,
     effectiveSessionId,
-    refresh
+    refresh,
+    sessionData,
+    setSessionData
   } = (0, _SessionContext.useSessionContext)();
   const {
     currency
@@ -21,14 +23,14 @@ function useUpsell() {
   const currencyId = currency?.id || null;
   const upsell = (0, _ahooks.useMemoizedFn)(async (fromId, toId) => {
     try {
-      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh);
+      await (0, _lineItems.performUpsell)(effectiveSessionId, fromId, toId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to upsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }
   });
   const downsell = (0, _ahooks.useMemoizedFn)(async priceId => {
     try {
-      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh);
+      await (0, _lineItems.performDownsell)(effectiveSessionId, priceId, session, currencyId, refresh, sessionData, setSessionData);
     } catch (err) {
       console.error("Failed to downsell:", (0, _checkoutAugmented.getErrorMessage)(err));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react-headless",
-  "version": "1.26.0",
+  "version": "1.26.2",
   "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.0",
+    "@blocklet/payment-types": "1.26.2",
     "@ocap/util": "^1.28.5",
     "ahooks": "^3.8.5",
     "google-libphonenumber": "^3.2.42",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9585ec8bc077fc5f8a8c5946d05436b10576e145"
+  "gitHead": "71242a68d27d56666487176425153dc08071960f"
 }

package/src/checkout/context/CheckoutProvider.tsx

@@ -38,12 +38,13 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
 
   const session = sessionData?.checkoutSession;
   const effectiveSessionId = resolvedSessionId || sessionId;
-  const items = (session?.line_items || []) as TLineItemExpanded[];
+  const items = useMemo(() => (session?.line_items || []) as TLineItemExpanded[], [session?.line_items]);
   const isDonation = session?.submit_type === 'donate';
 
   const sessionValue = useMemo<SessionContextValue>(
     () => ({
       sessionData,
+      setSessionData,
       sessionId,
       effectiveSessionId,
       isLoading,
@@ -60,6 +61,7 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
     }),
     [
       sessionData,
+      setSessionData,
       sessionId,
       effectiveSessionId,
       isLoading,
@@ -77,16 +79,20 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
   );
 
   // 2. Payment method layer
-  const paymentMethodHook = usePaymentMethodHook(sessionData, effectiveSessionId, refresh);
+  const paymentMethodHook = usePaymentMethodHook(sessionData, effectiveSessionId, refresh, setSessionData);
 
-  // Recalculate promotion when currency changes
+  // Recalculate promotion when currency changes — use response directly (no extra GET)
   const prevCurrencyRef = useRef<string | null>(null);
   useEffect(() => {
     const currId = paymentMethodHook.currency?.id || null;
     if (!currId || !session || session.status === 'complete') return;
     if (prevCurrencyRef.current === null || currId !== prevCurrencyRef.current) {
       prevCurrencyRef.current = currId;
-      recalculatePromotionIfNeeded(session, effectiveSessionId, currId).then(() => refresh(true));
+      recalculatePromotionIfNeeded(session, effectiveSessionId, currId).then((recalculated) => {
+        if (recalculated && sessionData) {
+          setSessionData({ ...sessionData, checkoutSession: recalculated, quotes: undefined });
+        }
+      });
     }
   }, [paymentMethodHook.currency?.id, session?.id]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -219,7 +225,14 @@ export function CheckoutProvider({ sessionId, children }: CheckoutProviderProps)
       if (intervalRef.current) clearInterval(intervalRef.current);
       document.removeEventListener('visibilitychange', handleVisibility);
     };
-  }, [hasDynamicPricing, paymentMethodHook.isStripe, effectiveSessionId, paymentMethodHook.currency?.id, session?.status]); // eslint-disable-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    hasDynamicPricing,
+    paymentMethodHook.isStripe,
+    effectiveSessionId,
+    paymentMethodHook.currency?.id,
+    session?.status,
+  ]);
 
   const exchangeRateValue = useMemo<ExchangeRateContextValue>(
     () => ({