@blocklet/payment-react 1.26.1 → 1.26.3

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",

package/lib/checkout-v2/views/error-view.d.ts

@@ -1,6 +1,6 @@
 interface ErrorViewProps {
     error: string;
-    errorCode?: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | null;
+    errorCode?: 'SESSION_EXPIRED' | 'EMPTY_LINE_ITEMS' | 'STOP_ACCEPTING_ORDERS' | null;
     mode?: string;
 }
 export default function ErrorView({ error, errorCode, mode }: ErrorViewProps): import("react").JSX.Element;

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)();
@@ -149,6 +150,13 @@ function getErrorConfig(errorCode, error, t) {
       color: "#94a3b8"
     };
   }
+  if (errorCode === "STOP_ACCEPTING_ORDERS") {
+    return {
+      title: t("payment.checkout.stopAcceptingOrders.title"),
+      description: t("payment.checkout.stopAcceptingOrders.description"),
+      color: "#f59e0b"
+    };
+  }
   return {
     title: t("payment.checkout.error.title"),
     description: error,
@@ -223,6 +231,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/components/service-suspended-dialog.d.ts

@@ -0,0 +1,4 @@
+export default function ServiceSuspendedDialog({ open, onClose }: {
+    open: boolean;
+    onClose: () => void;
+}): import("react").JSX.Element;

package/lib/components/service-suspended-dialog.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+module.exports = ServiceSuspendedDialog;
+var _jsxRuntime = require("react/jsx-runtime");
+var _material = require("@mui/material");
+var _styles = require("@mui/material/styles");
+var _PauseCircleOutline = _interopRequireDefault(require("@mui/icons-material/PauseCircleOutline"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ServiceSuspendedDialog({
+  open,
+  onClose
+}) {
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  return /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Dialog, {
+    open,
+    onClose,
+    PaperProps: {
+      sx: {
+        borderRadius: 3,
+        maxWidth: 400,
+        mx: "auto",
+        overflow: "hidden"
+      }
+    },
+    children: /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.DialogContent, {
+      sx: {
+        p: 0
+      },
+      children: [/* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {
+        alignItems: "center",
+        sx: {
+          pt: 4,
+          pb: 3,
+          px: 4,
+          textAlign: "center"
+        },
+        children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
+          sx: {
+            width: 64,
+            height: 64,
+            borderRadius: "50%",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            bgcolor: theme => (0, _styles.alpha)(theme.palette.warning.main, 0.1),
+            mb: 2.5
+          },
+          children: /* @__PURE__ */(0, _jsxRuntime.jsx)(_PauseCircleOutline.default, {
+            sx: {
+              fontSize: 36,
+              color: "warning.main"
+            }
+          })
+        }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
+          sx: {
+            fontWeight: 700,
+            fontSize: 18,
+            mb: 1,
+            color: "text.primary"
+          },
+          children: t("payment.checkout.stopAcceptingOrders.title")
+        }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
+          sx: {
+            color: "text.secondary",
+            fontSize: 14,
+            lineHeight: 1.6
+          },
+          children: t("payment.checkout.stopAcceptingOrders.description")
+        })]
+      }), /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Box, {
+        sx: {
+          px: 4,
+          pb: 3
+        },
+        children: /* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Button, {
+          fullWidth: true,
+          variant: "contained",
+          disableElevation: true,
+          onClick: onClose,
+          sx: {
+            borderRadius: 2,
+            textTransform: "none",
+            fontWeight: 600,
+            py: 1
+          },
+          children: t("common.know")
+        })
+      })]
+    })
+  });
+}

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/lib/locales/en.js

@@ -387,6 +387,10 @@ module.exports = (0, _flat.default)({
         title: "Nothing to show here",
         description: "It seems this checkout session is not configured properly"
       },
+      stopAcceptingOrders: {
+        title: "Service Suspended",
+        description: "New order placement is temporarily unavailable due to a system-level service suspension."
+      },
       error: {
         title: "Something went wrong"
       },

package/lib/locales/zh.js

@@ -416,6 +416,10 @@ module.exports = (0, _flat.default)({
         title: "\u6CA1\u6709\u4EFB\u4F55\u8D2D\u4E70\u9879\u76EE",
         description: "\u53EF\u80FD\u8FD9\u4E2A\u4ED8\u6B3E\u94FE\u63A5\u6CA1\u6709\u6B63\u786E\u914D\u7F6E"
       },
+      stopAcceptingOrders: {
+        title: "\u6682\u505C\u670D\u52A1",
+        description: "\u56E0\u7CFB\u7EDF\u7B56\u7565\u8C03\u6574\uFF0C\u5F53\u524D\u5DF2\u6682\u505C\u65B0\u8BA2\u5355\u670D\u52A1\u3002"
+      },
       error: {
         title: "\u51FA\u4E86\u70B9\u95EE\u9898"
       },

package/lib/payment/form/index.js

@@ -40,6 +40,7 @@ var _loadingButton = _interopRequireDefault(require("../../components/loading-bu
 var _overDueInvoicePayment = _interopRequireDefault(require("../../components/over-due-invoice-payment"));
 var _currency2 = require("../../libs/currency");
 var _confirm = _interopRequireDefault(require("../../components/confirm"));
+var _serviceSuspendedDialog = _interopRequireDefault(require("../../components/service-suspended-dialog"));
 var _priceChangeConfirm = _interopRequireDefault(require("../../components/price-change-confirm"));
 var _validator = require("../../libs/validator");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -181,6 +182,7 @@ function PaymentForm({
     stripeContext: void 0,
     customer,
     customerLimited: false,
+    serviceSuspended: false,
     stripePaying: false,
     fastCheckoutInfo: null,
     creditInsufficientInfo: null,
@@ -1039,6 +1041,12 @@ function PaymentForm({
             customerLimited: true
           });
         }
+        if (errorCode === "STOP_ACCEPTING_ORDERS") {
+          shouldToast = false;
+          setState({
+            serviceSuspended: true
+          });
+        }
       }
       if (shouldToast) {
         _Toast.default.error((0, _util2.formatError)(err));
@@ -1307,6 +1315,11 @@ function PaymentForm({
           }),
           title: t("payment.customer.pastDue.alert.title")
         }
+      }), state.serviceSuspended && /* @__PURE__ */(0, _jsxRuntime.jsx)(_serviceSuspendedDialog.default, {
+        open: true,
+        onClose: () => setState({
+          serviceSuspended: false
+        })
       }), FastCheckoutConfirmDialog, CreditInsufficientDialog, PriceUpdatedDialog, state.priceChangeConfirm?.open && /* @__PURE__ */(0, _jsxRuntime.jsx)(_priceChangeConfirm.default, {
         open: true,
         changePercent: state.priceChangeConfirm.changePercent,
@@ -1617,6 +1630,16 @@ function PaymentForm({
         }),
         title: t("payment.customer.pastDue.alert.title")
       }
+    }), state.serviceSuspended && /* @__PURE__ */(0, _jsxRuntime.jsx)(_confirm.default, {
+      onConfirm: () => setState({
+        serviceSuspended: false
+      }),
+      onCancel: () => setState({
+        serviceSuspended: false
+      }),
+      title: t("payment.checkout.stopAcceptingOrders.title"),
+      message: t("payment.checkout.stopAcceptingOrders.description"),
+      confirm: t("common.confirm")
     }), FastCheckoutConfirmDialog, CreditInsufficientDialog, PriceUpdatedDialog, state.priceChangeConfirm?.open && /* @__PURE__ */(0, _jsxRuntime.jsx)(_priceChangeConfirm.default, {
       open: true,
       changePercent: state.priceChangeConfirm.changePercent,

package/lib/payment/index.js

@@ -87,6 +87,10 @@ function PaymentInner({
     return Array.from(currencyIds);
   }, [paymentMethods]);
   const defaultCurrencyId = (0, _react.useMemo)(() => {
+    const hasAppliedDiscount = Boolean(state.checkoutSession?.discounts?.length);
+    if (hasAppliedDiscount && state.checkoutSession.currency_id && availableCurrencyIds.includes(state.checkoutSession.currency_id)) {
+      return state.checkoutSession.currency_id;
+    }
     if (query.currencyId && availableCurrencyIds.includes(query.currencyId)) {
       return query.currencyId;
     }
@@ -104,7 +108,7 @@ function PaymentInner({
       return state.checkoutSession.currency_id;
     }
     return availableCurrencyIds?.[0];
-  }, [query.currencyId, availableCurrencyIds, session?.user, state.checkoutSession.currency_id, paymentMethods]);
+  }, [query.currencyId, availableCurrencyIds, session?.user, state.checkoutSession, paymentMethods]);
   const defaultMethodId = paymentMethods.find(m => m.payment_currencies.some(c => c.id === defaultCurrencyId))?.id;
   const hideSummaryCard = mode.endsWith("-minimal") || !showCheckoutSummary;
   const methods = (0, _reactHookForm.useForm)({
@@ -127,13 +131,20 @@ function PaymentInner({
     }
   });
   (0, _react.useEffect)(() => {
+    const hasAppliedDiscount = Boolean(state.checkoutSession?.discounts?.length);
+    const currentCurrency = methods.getValues("payment_currency");
+    const currentMethod = methods.getValues("payment_method");
     if (defaultCurrencyId) {
-      methods.setValue("payment_currency", defaultCurrencyId);
+      if (!hasAppliedDiscount || !currentCurrency) {
+        methods.setValue("payment_currency", defaultCurrencyId);
+      }
     }
     if (defaultMethodId) {
-      methods.setValue("payment_method", defaultMethodId);
+      if (!hasAppliedDiscount || !currentMethod) {
+        methods.setValue("payment_method", defaultMethodId);
+      }
     }
-  }, [defaultCurrencyId, defaultMethodId]);
+  }, [defaultCurrencyId, defaultMethodId, state.checkoutSession.discounts]);
   (0, _react.useEffect)(() => {
     if (!(0, _util2.isMobileSafari)()) {
       return () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.26.1",
+  "version": "1.26.3",
   "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.1",
+    "@blocklet/payment-react-headless": "1.26.3",
     "@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.1",
+    "@blocklet/payment-types": "1.26.3",
     "@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": "1ba42f376f040b1214d992420cda37053fc14288"
+  "gitHead": "18c5d045139c572b52465e15c4c63b3e327efab5"
 }

package/src/checkout-v2/components/dialogs/checkout-dialogs.tsx

@@ -9,6 +9,7 @@ import {
 import StripeForm from '../../../payment/form/stripe';
 import ConfirmDialog from '../../../components/confirm';
 import PriceChangeConfirm from '../../../components/price-change-confirm';
+import ServiceSuspendedDialog from '../../../components/service-suspended-dialog';
 import { formatTokenAmount } from '../../utils/format';
 
 function getRedirectUrl(session: any): string | undefined {
@@ -119,6 +120,9 @@ export default function CheckoutDialogs() {
         />
       )}
 
+      {/* Service Suspended Dialog */}
+      {(submit.context as any)?.type === 'service_suspended' && <ServiceSuspendedDialog open onClose={submit.cancel} />}
+
       {/* Credit Insufficient Dialog (matches V1 ConfirmDialog) */}
       {submit.status === 'credit_insufficient' && submit.context?.type === 'credit_insufficient' && (
         <ConfirmDialog

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 } };
@@ -292,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 },
           }}
@@ -467,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,11 +9,13 @@ import {
   CircularProgress,
   IconButton,
   InputAdornment,
+  Skeleton,
   Stack,
   TextField,
   Typography,
 } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { formatCouponTerms } from '../../../libs/util';
 
 interface PromotionInputProps {
   promotion: {
@@ -26,17 +28,23 @@ interface PromotionInputProps {
   };
   discounts: any[];
   discountAmount: string | null;
+  // eslint-disable-next-line react/require-default-props
+  currency?: any;
   /** 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({
   promotion,
   discounts,
   discountAmount,
+  currency = null,
   initialShowInput = false,
+  isAmountLoading = false,
 }: PromotionInputProps) {
-  const { t } = useLocaleContext();
+  const { t, locale } = useLocaleContext();
   const [showInput, setShowInput] = useState(false);
   const [code, setCode] = useState('');
   const [applying, setApplying] = useState(false);
@@ -73,19 +81,7 @@ export default function PromotionInput({
           const discCode =
             disc.promotion_code_details?.code || disc.verification_data?.code || disc.promotion_code || '';
           const coupon = disc.coupon_details || {};
-          const couponOff =
-            coupon.percent_off > 0
-              ? t('payment.checkout.coupon.percentage', { percent: coupon.percent_off })
-              : `${coupon.percent_off || 0}%`;
-          let description = '';
-          if (coupon.duration === 'repeating' && coupon.duration_in_months) {
-            const months = coupon.duration_in_months;
-            description = `${couponOff} for ${months} month${months > 1 ? 's' : ''}`;
-          } else if (coupon.duration === 'forever') {
-            description = t('payment.checkout.coupon.terms.forever', { couponOff });
-          } else if (coupon.duration === 'once') {
-            description = t('payment.checkout.coupon.terms.once', { couponOff });
-          }
+          const description = coupon && currency ? formatCouponTerms(coupon, currency, locale) : '';
           return (
             <Stack
               key={disc.promotion_code || disc.coupon || i}
@@ -115,9 +111,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>
           );
         })}