@blocklet/payment-react 1.26.0 → 1.26.2

package/lib/checkout-v2/panels/left/composite-panel.js

@@ -61,6 +61,9 @@ function CompositePanel() {
   const canUpsell = nonCrossSellItems.length <= 1;
   const hasTopUpsell = canUpsell && !!upsellPrimaryItem && ["subscription", "setup"].includes(mode);
   const isUpselled = !!upsellPrimaryItem?.upsell_price;
+  const [upsellSwitching, setUpsellSwitching] = (0, _react.useState)(false);
+  const [pendingUpsell, setPendingUpsell] = (0, _react.useState)(null);
+  const visualIsUpselled = pendingUpsell !== null ? pendingUpsell : isUpselled;
   const currentInterval = hasTopUpsell ? upsellPrimaryItem.price?.recurring?.interval : null;
   const upsellInterval = hasTopUpsell ? upsellTarget?.recurring?.interval : null;
   let upsellSavings = 0;
@@ -88,7 +91,7 @@ function CompositePanel() {
   const isMultiItem = lineItems.items.length > 1;
   const activeSx = {
     bgcolor: "primary.main",
-    color: "#fff",
+    color: theme => (0, _format.primaryContrastColor)(theme),
     boxShadow: "0 4px 6px -1px rgba(0,0,0,0.1), 0 2px 4px -2px rgba(0,0,0,0.1)"
   };
   const inactiveSx = {
@@ -277,15 +280,21 @@ function CompositePanel() {
             },
             children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
               onClick: async () => {
-                if (isUpselled) {
+                if (isUpselled && !upsellSwitching) {
+                  setPendingUpsell(false);
+                  setUpsellSwitching(true);
                   try {
                     await lineItems.downsell(upsellPrimaryItem.upsell_price?.id || upsellPrimaryItem.price_id);
                   } catch (err) {
+                    setPendingUpsell(null);
                     _Toast.default.error(err?.response?.data?.error || err?.message || "Failed");
+                  } finally {
+                    setUpsellSwitching(false);
+                    setPendingUpsell(null);
                   }
                 }
               },
-              sx: capsuleBtnSx(!isUpselled),
+              sx: capsuleBtnSx(!visualIsUpselled),
               children: /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
                 component: "span",
                 sx: {
@@ -298,15 +307,21 @@ function CompositePanel() {
               })
             }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
               onClick: async () => {
-                if (!isUpselled) {
+                if (!isUpselled && !upsellSwitching) {
+                  setPendingUpsell(true);
+                  setUpsellSwitching(true);
                   try {
                     await lineItems.upsell(upsellPrimaryItem.price_id, upsellTarget.id);
                   } catch (err) {
+                    setPendingUpsell(null);
                     _Toast.default.error(err?.response?.data?.error || err?.message || "Failed");
+                  } finally {
+                    setUpsellSwitching(false);
+                    setPendingUpsell(null);
                   }
                 }
               },
-              sx: capsuleBtnSx(isUpselled),
+              sx: capsuleBtnSx(visualIsUpselled),
               children: /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
                 component: "span",
                 sx: {

package/lib/checkout-v2/panels/left/credit-topup-panel.js

@@ -144,12 +144,8 @@ function CreditTopupPanel() {
         interval: intervalDisplay
       });
     }
-    const productDesc = product?.description || "";
-    if (productDesc && productDesc.length > 10 && productDesc !== creditName) {
-      return productDesc;
-    }
     return "";
-  }, [creditAmount, currencySymbol, hasSchedule, scheduleConfig, creditName, product, t]);
+  }, [creditAmount, currencySymbol, hasSchedule, scheduleConfig, t]);
   const validityText = (0, _react.useMemo)(() => {
     if (!hasExpiry) return "";
     return t("payment.checkout.creditTopup.validFor", {

package/lib/checkout-v2/panels/right/payment-panel.js

@@ -561,7 +561,8 @@ function PaymentPanel() {
             remove: promotion.remove
           },
           discounts,
-          discountAmount: pricing.discount
+          discountAmount: pricing.discount,
+          isAmountLoading
         })]
       }), (() => {
         const totalStr = pricing.total || "0";
@@ -710,7 +711,7 @@ function PaymentPanel() {
             })]
           })]
         });
-      })(), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Button, {
+      })(), /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Button, {
         variant: "contained",
         size: "large",
         fullWidth: true,
@@ -720,15 +721,51 @@ function PaymentPanel() {
           size: 20,
           color: "inherit"
         }) : null,
-        endIcon: !isProcessing ? /* @__PURE__ */(0, _jsxRuntime.jsx)(_ArrowForward.default, {}) : void 0,
         sx: {
           py: 1.5,
           fontSize: "1.1rem",
           fontWeight: 600,
           textTransform: "none",
-          borderRadius: "12px"
+          borderRadius: "12px",
+          color: theme => (0, _format.primaryContrastColor)(theme),
+          position: "relative",
+          overflow: "hidden",
+          "&:hover": {
+            bgcolor: "primary.main"
+          },
+          "&:hover .arrow-icon": {
+            transform: "translateX(4px)"
+          },
+          "&:hover .shine-layer": {
+            transform: "translateX(100%)"
+          }
         },
-        children: isProcessing ? `${t("payment.checkout.processing")}...` : buttonLabel
+        children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
+          component: "span",
+          sx: {
+            position: "relative",
+            zIndex: 1
+          },
+          children: isProcessing ? `${t("payment.checkout.processing")}...` : buttonLabel
+        }), !isProcessing && /* @__PURE__ */(0, _jsxRuntime.jsx)(_ArrowForward.default, {
+          className: "arrow-icon",
+          sx: {
+            ml: 1,
+            position: "relative",
+            zIndex: 1,
+            transition: "transform 0.2s ease"
+          }
+        }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
+          className: "shine-layer",
+          sx: {
+            position: "absolute",
+            inset: 0,
+            background: "linear-gradient(90deg, transparent, rgba(255,255,255,0.12), transparent)",
+            transform: "translateX(-100%)",
+            transition: "transform 0.7s ease",
+            pointerEvents: "none"
+          }
+        })]
       }), isMobile && /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {
         direction: "row",
         alignItems: "center",
@@ -828,7 +865,7 @@ function PaymentPanel() {
         mode,
         subscription,
         staking: pricing.staking,
-        appName: session?.metadata?.app_name || "New Payment Kit"
+        appName: (0, _util.getStatementDescriptor)(session?.line_items || [])
       }), !isMobile && /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {
         direction: "row",
         alignItems: "center",

package/lib/checkout-v2/utils/format.d.ts

@@ -1,4 +1,5 @@
 import type { TPaymentCurrency } from '@blocklet/payment-types';
+export { primaryContrastColor } from '../../libs/util';
 export declare const INTERVAL_LOCALE_KEY: Record<string, string>;
 export declare function countryCodeToFlag(code: string): string;
 export declare function formatTokenAmount(unitAmount: string | number | bigint, currency: TPaymentCurrency | null): string;
@@ -56,4 +57,3 @@ interface ItemMeta {
  * Works for the "primary product" header above the item list.
  */
 export declare function getSessionHeaderMeta(t: TFn, session: any, product: any, items: any[]): ItemMeta;
-export {};

package/lib/checkout-v2/utils/format.js

@@ -10,9 +10,16 @@ exports.formatTokenAmount = formatTokenAmount;
 exports.formatTrialText = formatTrialText;
 exports.getSessionHeaderMeta = getSessionHeaderMeta;
 exports.getUnitAmountForCurrency = getUnitAmountForCurrency;
+Object.defineProperty(exports, "primaryContrastColor", {
+  enumerable: true,
+  get: function () {
+    return _util2.primaryContrastColor;
+  }
+});
 exports.tSafe = tSafe;
 exports.whiteTooltipSx = void 0;
 var _util = require("@ocap/util");
+var _util2 = require("../../libs/util");
 const INTERVAL_LOCALE_KEY = exports.INTERVAL_LOCALE_KEY = {
   day: "common.daily",
   week: "common.weekly",
@@ -35,7 +42,7 @@ function formatTokenAmount(unitAmount, currency) {
       minimumFractionDigits: 0,
       maximumFractionDigits: precision
     });
-    return formatted.replace(/\.?0+$/, "") || "0";
+    return formatted.replace(/(\.\d*?)0+$/, "$1").replace(/\.$/, "") || "0";
   } catch {
     return "0";
   }
@@ -69,7 +76,7 @@ function formatDynamicUnitPrice(price, currency, exchangeRate) {
         return tokenAmount.toLocaleString("en-US", {
           minimumFractionDigits: 0,
           maximumFractionDigits: precision
-        }).replace(/\.?0+$/, "") || "0";
+        }).replace(/(\.\d*?)0+$/, "$1").replace(/\.$/, "") || "0";
       }
     }
   }

package/lib/checkout-v2/views/error-view.js

@@ -10,6 +10,7 @@ var _styles = require("@mui/material/styles");
 var _ArrowBack = _interopRequireDefault(require("@mui/icons-material/ArrowBack"));
 var _Header = _interopRequireDefault(require("@blocklet/ui-react/lib/Header"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _format = require("../utils/format");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function GeometricDecoration() {
   const theme = (0, _styles.useTheme)();
@@ -223,6 +224,7 @@ function ErrorContent({
         fontWeight: 600,
         fontSize: 16,
         letterSpacing: "0.02em",
+        color: th => (0, _format.primaryContrastColor)(th),
         boxShadow: `0 8px 32px -4px ${(0, _styles.alpha)(primaryColor, 0.3)}`,
         "&:hover": {
           boxShadow: `0 12px 40px -4px ${(0, _styles.alpha)(primaryColor, 0.4)}`,

package/lib/checkout-v2/views/success-view.js

@@ -537,6 +537,7 @@ function SubscriptionLinks({
           md: 17
         },
         letterSpacing: "0.02em",
+        color: theme => (0, _format.primaryContrastColor)(theme),
         boxShadow: "0 8px 24px -4px rgba(59,130,246,0.25)",
         "&:hover": {
           boxShadow: "0 12px 28px -4px rgba(59,130,246,0.35)"
@@ -577,6 +578,7 @@ function InvoiceLink({
         md: 17
       },
       letterSpacing: "0.02em",
+      color: theme => (0, _format.primaryContrastColor)(theme),
       boxShadow: "0 8px 24px -4px rgba(59,130,246,0.25)",
       "&:hover": {
         boxShadow: "0 12px 28px -4px rgba(59,130,246,0.35)"

package/lib/components/over-due-invoice-payment.js

@@ -335,11 +335,15 @@ function OverdueInvoicePayment({
     } = item;
     const inProcess = payLoading && selectCurrencyId === currency.id;
     const status = paymentStatus[currency.id] || "idle";
+    const containedColorSx = (options?.variant || "contained") === "contained" ? {
+      color: th => (0, _util.primaryContrastColor)(th)
+    } : {};
     if (status === "success") {
       return /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Button, {
         variant: options?.variant || "contained",
         size: "small",
         onClick: () => checkAndHandleInvoicePaid(currency.id),
+        sx: containedColorSx,
         ...(primaryButton ? {} : {
           color: "success",
           startIcon: /* @__PURE__ */(0, _jsxRuntime.jsx)(_iconsMaterial.CheckCircle, {})
@@ -378,7 +382,10 @@ function OverdueInvoicePayment({
           disabled: paying || status === "processing",
           loading: paying || status === "processing",
           onClick: onPay,
-          sx: options?.sx,
+          sx: {
+            ...containedColorSx,
+            ...(options?.sx || {})
+          },
           children: buttonText
         })
       });
@@ -389,7 +396,10 @@ function OverdueInvoicePayment({
       disabled: inProcess,
       loading: inProcess,
       onClick: () => handlePay(item),
-      sx: options?.sx,
+      sx: {
+        ...containedColorSx,
+        ...(options?.sx || {})
+      },
       children: status === "error" ? t("payment.subscription.overdue.retry") : t("payment.subscription.overdue.payNow")
     });
   };

package/lib/libs/util.d.ts

@@ -194,3 +194,11 @@ export declare function getTokenBalanceLink(method: TPaymentMethod, address: str
 export declare function isCreditMetered(price: TPrice): boolean;
 export declare function showStaking(method: TPaymentMethod, currency: TPaymentCurrency, noStake: boolean): boolean;
 export declare function formatLinkWithLocale(url: string, locale?: string): string;
+export declare function primaryContrastColor(theme: {
+    palette: {
+        primary: {
+            main: string;
+        };
+        getContrastText: (bg: string) => string;
+    };
+}): string;

package/lib/libs/util.js

@@ -75,6 +75,7 @@ exports.lazyLoad = lazyLoad;
 exports.mergeExtraParams = void 0;
 exports.openDonationSettings = openDonationSettings;
 exports.parseMarkedText = parseMarkedText;
+exports.primaryContrastColor = primaryContrastColor;
 exports.showStaking = showStaking;
 exports.sleep = sleep;
 exports.stopEvent = stopEvent;
@@ -1644,4 +1645,7 @@ function formatLinkWithLocale(url, locale) {
     const separator = url.includes("?") ? "&" : "?";
     return `${url}${separator}locale=${locale}`;
   }
+}
+function primaryContrastColor(theme) {
+  return theme.palette.getContrastText(theme.palette.primary.main);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.26.0",
+  "version": "1.26.2",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -59,7 +59,7 @@
     "@arcblock/react-hooks": "^3.5.1",
     "@arcblock/ux": "^3.5.1",
     "@arcblock/ws": "^1.28.5",
-    "@blocklet/payment-react-headless": "1.26.0",
+    "@blocklet/payment-react-headless": "1.26.2",
     "@blocklet/theme": "^3.5.1",
     "@blocklet/ui-react": "^3.5.1",
     "@mui/icons-material": "^7.1.2",
@@ -97,7 +97,7 @@
     "@babel/core": "^7.27.4",
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-react": "^7.27.1",
-    "@blocklet/payment-types": "1.26.0",
+    "@blocklet/payment-types": "1.26.2",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -128,5 +128,5 @@
     "vite-plugin-babel": "^1.3.1",
     "vite-plugin-node-polyfills": "^0.23.0"
   },
-  "gitHead": "9585ec8bc077fc5f8a8c5946d05436b10576e145"
+  "gitHead": "71242a68d27d56666487176425153dc08071960f"
 }

package/src/checkout-v2/components/left/cross-sell-card.tsx

@@ -3,7 +3,7 @@ import ShoppingCartCheckoutIcon from '@mui/icons-material/ShoppingCartCheckout';
 import { Avatar, Box, Button, Chip, Stack, Typography } from '@mui/material';
 import type { TPaymentCurrency, TPrice } from '@blocklet/payment-types';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { formatDynamicUnitPrice, tSafe, INTERVAL_LOCALE_KEY } from '../../utils/format';
+import { formatDynamicUnitPrice, tSafe, INTERVAL_LOCALE_KEY, primaryContrastColor } from '../../utils/format';
 
 interface CrossSellCardProps {
   crossSellItem: TPrice;
@@ -53,7 +53,7 @@ export default function CrossSellCard({
             fontWeight: 900,
             letterSpacing: '0.12em',
             bgcolor: 'primary.main',
-            color: '#fff',
+            color: (theme: any) => primaryContrastColor(theme),
             boxShadow: '0 4px 12px rgba(45,124,243,0.2)',
             '& .MuiChip-label': { px: 1.5 },
           }}
@@ -150,7 +150,7 @@ export default function CrossSellCard({
                   transition: 'all 0.2s',
                   '&:hover': {
                     bgcolor: 'primary.main',
-                    color: '#fff',
+                    color: (theme: any) => primaryContrastColor(theme),
                     borderColor: 'primary.main',
                   },
                   '&:active': { transform: 'scale(0.95)' },

package/src/checkout-v2/components/left/product-item-card.tsx

@@ -22,7 +22,13 @@ import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 import type { TLineItemExpanded, TPaymentCurrency } from '@blocklet/payment-types';
 import { getPriceUnitAmountByCurrency } from '@blocklet/payment-react-headless';
 import Toast from '@arcblock/ux/lib/Toast';
-import { INTERVAL_LOCALE_KEY, formatDynamicUnitPrice, formatTokenAmount, formatTrialText } from '../../utils/format';
+import {
+  INTERVAL_LOCALE_KEY,
+  formatDynamicUnitPrice,
+  formatTokenAmount,
+  formatTrialText,
+  primaryContrastColor,
+} from '../../utils/format';
 
 interface ProductItemCardProps {
   item: TLineItemExpanded & { adjustable_quantity?: { enabled: boolean; minimum?: number; maximum?: number } };
@@ -109,7 +115,8 @@ export default function ProductItemCard({
           return (
             tokenAmount
               .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: precision })
-              .replace(/\.?0+$/, '') || '0'
+              .replace(/(\.\d*?)0+$/, '$1')
+              .replace(/\.$/, '') || '0'
           );
         }
       }
@@ -147,7 +154,12 @@ export default function ProductItemCard({
         const discAmount = (numericTotal * couponDetails.percent_off) / 100;
         const abs = Math.abs(discAmount);
         const precision = abs > 0 && abs < 0.01 ? 6 : 2;
-        return `${discAmount.toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: precision }).replace(/\.?0+$/, '') || '0'} ${currency?.symbol || ''}`;
+        return `${
+          discAmount
+            .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: precision })
+            .replace(/(\.\d*?)0+$/, '$1')
+            .replace(/\.$/, '') || '0'
+        } ${currency?.symbol || ''}`;
       }
     }
     if ((item as any).discount_amounts?.length > 0 && currency) {
@@ -207,7 +219,8 @@ export default function ProductItemCard({
           const formatted =
             tokenAmount
               .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: precision })
-              .replace(/\.?0+$/, '') || '0';
+              .replace(/(\.\d*?)0+$/, '$1')
+              .replace(/\.$/, '') || '0';
           return `${formatted} ${currency?.symbol || ''} ${slashText}`;
         }
       }
@@ -238,7 +251,8 @@ export default function ProductItemCard({
           const formatted =
             tokenAmount
               .toLocaleString('en-US', { minimumFractionDigits: 0, maximumFractionDigits: precision })
-              .replace(/\.?0+$/, '') || '0';
+              .replace(/(\.\d*?)0+$/, '$1')
+              .replace(/\.$/, '') || '0';
           return `${formatted} ${currency?.symbol || ''} ${originalSlash}`;
         }
       }
@@ -284,7 +298,7 @@ export default function ProductItemCard({
             fontWeight: 900,
             letterSpacing: '0.12em',
             bgcolor: 'primary.main',
-            color: '#fff',
+            color: (th: any) => primaryContrastColor(th),
             boxShadow: '0 4px 12px rgba(45,124,243,0.2)',
             '& .MuiChip-label': { px: 1.5 },
           }}
@@ -459,12 +473,16 @@ export default function ProductItemCard({
         {/* Discount chip */}
         {discountCode && perItemDiscount && (
           <Box sx={{ mt: 1.5 }}>
-            <Chip
-              icon={<LocalOfferIcon sx={{ color: 'warning.main', fontSize: 'small' }} />}
-              label={`${discountCode} (-${perItemDiscount})`}
-              size="small"
-              sx={{ height: 22, borderRadius: '6px', '& .MuiChip-label': { fontSize: 12 } }}
-            />
+            {isRateLoading ? (
+              <Skeleton variant="rounded" width={160} height={22} sx={{ borderRadius: '6px' }} />
+            ) : (
+              <Chip
+                icon={<LocalOfferIcon sx={{ color: 'warning.main', fontSize: 'small' }} />}
+                label={`${discountCode} (-${perItemDiscount})`}
+                size="small"
+                sx={{ height: 22, borderRadius: '6px', '& .MuiChip-label': { fontSize: 12 } }}
+              />
+            )}
           </Box>
         )}
 

package/src/checkout-v2/components/left/promotion-input.tsx

@@ -9,6 +9,7 @@ import {
   CircularProgress,
   IconButton,
   InputAdornment,
+  Skeleton,
   Stack,
   TextField,
   Typography,
@@ -28,6 +29,8 @@ interface PromotionInputProps {
   discountAmount: string | null;
   /** Start with input field visible (skip the "Add promotion code" button) */
   initialShowInput?: boolean;
+  /** Show skeleton for the discount amount while switching */
+  isAmountLoading?: boolean;
 }
 
 export default function PromotionInput({
@@ -35,6 +38,7 @@ export default function PromotionInput({
   discounts,
   discountAmount,
   initialShowInput = false,
+  isAmountLoading = false,
 }: PromotionInputProps) {
   const { t } = useLocaleContext();
   const [showInput, setShowInput] = useState(false);
@@ -115,9 +119,13 @@ export default function PromotionInput({
                   <CloseIcon sx={{ fontSize: 12, color: '#12b886' }} />
                 </IconButton>
               </Stack>
-              <Typography sx={{ color: 'text.primary', fontWeight: 600, fontSize: 14 }}>
-                -{discountAmount || '0'}
-              </Typography>
+              {isAmountLoading ? (
+                <Skeleton variant="text" width={80} height={22} />
+              ) : (
+                <Typography sx={{ color: 'text.primary', fontWeight: 600, fontSize: 14 }}>
+                  -{discountAmount || '0'}
+                </Typography>
+              )}
             </Stack>
           );
         })}

package/src/checkout-v2/components/right/submit-button.tsx

@@ -1,4 +1,5 @@
 import { Button, CircularProgress } from '@mui/material';
+import { primaryContrastColor } from '../../utils/format';
 
 interface SubmitButtonProps {
   canSubmit: boolean;
@@ -30,6 +31,7 @@ export default function SubmitButton({
         fontSize: '1.3rem',
         fontWeight: 600,
         textTransform: 'none',
+        color: (theme) => primaryContrastColor(theme),
       }}>
       {isProcessing ? processingLabel : label}
     </Button>

package/src/checkout-v2/panels/left/composite-panel.tsx

@@ -17,7 +17,13 @@ import {
 } from '@blocklet/payment-react-headless';
 
 import { useMobile } from '../../../hooks/mobile';
-import { INTERVAL_LOCALE_KEY, formatTrialText, getSessionHeaderMeta, tSafe } from '../../utils/format';
+import {
+  INTERVAL_LOCALE_KEY,
+  formatTrialText,
+  getSessionHeaderMeta,
+  tSafe,
+  primaryContrastColor,
+} from '../../utils/format';
 import ProductItemCard from '../../components/left/product-item-card';
 import BillingToggle from '../../components/left/billing-toggle';
 import CrossSellCard from '../../components/left/cross-sell-card';
@@ -60,6 +66,10 @@ export default function CompositePanel() {
   const canUpsell = nonCrossSellItems.length <= 1;
   const hasTopUpsell = canUpsell && !!upsellPrimaryItem && ['subscription', 'setup'].includes(mode);
   const isUpselled = !!(upsellPrimaryItem as any)?.upsell_price;
+  const [upsellSwitching, setUpsellSwitching] = useState(false);
+  // Optimistic: track which tab the user clicked so highlight switches immediately
+  const [pendingUpsell, setPendingUpsell] = useState<boolean | null>(null);
+  const visualIsUpselled = pendingUpsell !== null ? pendingUpsell : isUpselled;
 
   // Intervals for capsule toggle
   const currentInterval = hasTopUpsell ? (upsellPrimaryItem!.price as any)?.recurring?.interval : null;
@@ -94,7 +104,7 @@ export default function CompositePanel() {
   // Capsule button sx helper
   const activeSx = {
     bgcolor: 'primary.main',
-    color: '#fff',
+    color: (theme: any) => primaryContrastColor(theme),
     boxShadow: '0 4px 6px -1px rgba(0,0,0,0.1), 0 2px 4px -2px rgba(0,0,0,0.1)',
   };
   const inactiveSx = {
@@ -260,17 +270,23 @@ export default function CompositePanel() {
                 {/* Current interval */}
                 <Box
                   onClick={async () => {
-                    if (isUpselled) {
+                    if (isUpselled && !upsellSwitching) {
+                      setPendingUpsell(false);
+                      setUpsellSwitching(true);
                       try {
                         await lineItems.downsell(
                           (upsellPrimaryItem as any).upsell_price?.id || upsellPrimaryItem!.price_id
                         );
                       } catch (err: any) {
+                        setPendingUpsell(null);
                         Toast.error(err?.response?.data?.error || err?.message || 'Failed');
+                      } finally {
+                        setUpsellSwitching(false);
+                        setPendingUpsell(null);
                       }
                     }
                   }}
-                  sx={capsuleBtnSx(!isUpselled)}>
+                  sx={capsuleBtnSx(!visualIsUpselled)}>
                   <Typography component="span" sx={{ fontSize: 14, fontWeight: 700, color: 'inherit', lineHeight: 1 }}>
                     {t(INTERVAL_LOCALE_KEY[currentInterval!] || '')}
                   </Typography>
@@ -278,15 +294,21 @@ export default function CompositePanel() {
                 {/* Upsell interval */}
                 <Box
                   onClick={async () => {
-                    if (!isUpselled) {
+                    if (!isUpselled && !upsellSwitching) {
+                      setPendingUpsell(true);
+                      setUpsellSwitching(true);
                       try {
                         await lineItems.upsell(upsellPrimaryItem!.price_id, upsellTarget.id);
                       } catch (err: any) {
+                        setPendingUpsell(null);
                         Toast.error(err?.response?.data?.error || err?.message || 'Failed');
+                      } finally {
+                        setUpsellSwitching(false);
+                        setPendingUpsell(null);
                       }
                     }
                   }}
-                  sx={capsuleBtnSx(isUpselled)}>
+                  sx={capsuleBtnSx(visualIsUpselled)}>
                   <Typography component="span" sx={{ fontSize: 14, fontWeight: 700, color: 'inherit', lineHeight: 1 }}>
                     {t(INTERVAL_LOCALE_KEY[upsellInterval!] || '')}
                   </Typography>

package/src/checkout-v2/panels/left/credit-topup-panel.tsx

@@ -154,12 +154,8 @@ export default function CreditTopupPanel() {
         ? t('payment.checkout.credit.schedule.withRefresh', { amount: formattedAmount, interval: intervalDisplay })
         : t('payment.checkout.credit.schedule.periodic', { amount: formattedAmount, interval: intervalDisplay });
     }
-    const productDesc = product?.description || '';
-    if (productDesc && productDesc.length > 10 && productDesc !== creditName) {
-      return productDesc;
-    }
     return '';
-  }, [creditAmount, currencySymbol, hasSchedule, scheduleConfig, creditName, product, t]);
+  }, [creditAmount, currencySymbol, hasSchedule, scheduleConfig, t]);
 
   // Validity text: "Credits are valid for X days after purchase."
   const validityText = useMemo(() => {