@anker-in/campaign-ui 0.2.0 → 0.2.2-beta.1

package/src/components/credits/creditsNavigation/CreditsNavigation.tsx

@@ -0,0 +1,123 @@
+import { useEffect, useState, useRef, useCallback } from 'react'
+import { classNames as cn } from '@anker-in/lib'
+import { Container } from '@anker-in/headless-ui'
+import { CreditsNavigationCopy } from './type'
+
+export const CreditsNavigation = ({ copy }: { copy: CreditsNavigationCopy }) => {
+  const [activeId, setActiveId] = useState<string>('')
+  const observerRef = useRef<IntersectionObserver | null>(null)
+
+  // 平滑滚动到目标模块
+  const scrollToSection = (targetId: string) => {
+    const element = document.getElementById(targetId)
+    if (element) {
+      const navHeight = 56 // 导航栏高度
+      const elementPosition = element.getBoundingClientRect().top + window.pageYOffset
+      const offsetPosition = elementPosition - navHeight
+
+      window.scrollTo({
+        top: offsetPosition,
+        behavior: 'smooth',
+      })
+    }
+  }
+
+  // 使用 Intersection Observer 监听模块可见性
+  const setupObserver = useCallback(() => {
+    // 清理之前的 observer
+    if (observerRef.current) {
+      observerRef.current.disconnect()
+    }
+
+    // 计算每个元素在视口中的可见面积
+    const visibilityMap = new Map<string, number>()
+
+    const observerCallback = (entries: IntersectionObserverEntry[]) => {
+      entries.forEach(entry => {
+        const id = entry.target.id
+        if (!id) return
+
+        // 计算可见面积
+        const visibleHeight = entry.intersectionRect.height
+        const visibleWidth = entry.intersectionRect.width
+        const visibleArea = visibleHeight * visibleWidth
+
+        visibilityMap.set(id, entry.isIntersecting ? visibleArea : 0)
+      })
+
+      // 找出可见面积最大的元素
+      let maxArea = 0
+      let maxId = ''
+
+      visibilityMap.forEach((area, id) => {
+        if (area > maxArea) {
+          maxArea = area
+          maxId = id
+        }
+      })
+
+      if (maxId && maxId !== activeId) {
+        setActiveId(maxId)
+      }
+    }
+
+    // 创建新的 observer
+    observerRef.current = new IntersectionObserver(observerCallback, {
+      threshold: [0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1],
+      rootMargin: '-56px 0px 0px 0px', // 考虑导航栏高度
+    })
+
+    // 观察所有目标元素
+    copy.items.forEach(item => {
+      const element = document.getElementById(item.targetId)
+      if (element && observerRef.current) {
+        observerRef.current.observe(element)
+      }
+    })
+  }, [copy.items, activeId])
+
+  useEffect(() => {
+    setupObserver()
+
+    return () => {
+      if (observerRef.current) {
+        observerRef.current.disconnect()
+      }
+    }
+  }, [setupObserver])
+
+  return (
+    <nav className={cn('sticky top-0 z-50 bg-white')}>
+      <Container asChild>
+        <div
+          className={cn(
+            'md:overflow-x-auto md:overflow-y-hidden md:-mx-[16px] md:px-[16px]',
+            'md:scrollbar-hide md:[&::-webkit-scrollbar]:hidden md:[-ms-overflow-style:none] md:[scrollbar-width:none]'
+          )}
+        >
+          <ul className={cn('flex items-end gap-[24px] pt-[16px] md:gap-[16px] md:pr-[16px]')}>
+            {copy.items.map((item, index) => {
+              const isActive = activeId === item.targetId
+              return (
+                <li key={index} className={cn('md:flex-shrink-0')}>
+                  <button
+                    onClick={() => scrollToSection(item.targetId)}
+                    className={cn(
+                      'pb-[16px] text-[14px] font-bold tracking-[-0.28px] leading-[1.4]',
+                      'transition-all duration-200 relative border-b-4 whitespace-nowrap',
+                      isActive
+                        ? 'text-[#080a0f] border-brand-1'
+                        : 'text-[#4a4c56] hover:text-[#080a0f] border-transparent'
+                    )}
+                  >
+                    {item.label}
+                  </button>
+                </li>
+              )
+            })}
+          </ul>
+        </div>
+      </Container>
+    </nav>
+  )
+}

package/src/components/credits/creditsNavigation/index.ts

@@ -0,0 +1,2 @@
+export { CreditsNavigation } from './CreditsNavigation'
+export type { CreditsNavigationCopy, NavigationItem } from './type'

package/src/components/credits/creditsNavigation/type.ts

@@ -0,0 +1,10 @@
+// 导航项配置
+export type NavigationItem = {
+  label: string
+  targetId: string // 对应组件的DOM id
+}
+
+// 导航组件配置
+export type CreditsNavigationCopy = {
+  items: NavigationItem[]
+}

package/src/components/credits/creditsRedeemList/AddressForm/CountrySelect.tsx

@@ -2,6 +2,7 @@ import { Picture } from '@anker-in/headless-ui'
 import useClickOutside from '../../context/hooks/useClickOutside'
 import classNames from 'classnames'
 import { useEffect, useState } from 'react'
+import { useHeadlessContext, ROUNDED_BRANDS } from '@anker-in/lib'
 
 interface Country {
   id: string
@@ -20,7 +21,8 @@ interface CountrySelectProps {
 export function CountrySelect({ countries, loading, className, value, onChange }: CountrySelectProps) {
   const [show, setShow] = useState(false)
   const [display, setDisplay] = useState<any>('')
-
+  const { brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
   const dorpdown = useClickOutside<HTMLDivElement>(() => {
     setShow(false)
   })
@@ -53,6 +55,7 @@ export function CountrySelect({ countries, loading, className, value, onChange }
       <div
         className={classNames(
           'absolute left-0 top-0 hidden !h-[50px] rounded-[2px] pr-[45px] text-[16px] font-bold focus:!border-[#6D6D6F] min-l:!block',
+          !rounded && 'rounded-none',
           className
         )}
         onClick={() => {
@@ -71,14 +74,15 @@ export function CountrySelect({ countries, loading, className, value, onChange }
 
       <Picture
         source="https://cdn.shopify.com/s/files/1/0517/6767/3016/files/country-select.png?v=1692202500"
-        imgClassName="pointer-events-none absolute right-0 top-0 bottom-0 !w-[45px] object-cover"
+        className="absolute pointer-events-none right-0 top-0 bottom-0 size-[50px] object-cover"
         alt="arrow"
       />
 
       <div
         ref={dorpdown}
         className={classNames(
-          'absolute left-0 top-[58px] z-30 max-h-[334px] w-full cursor-pointer overflow-auto rounded-[4px] bg-white shadow-[0px_1px_12px_0px_rgba(0,0,0,0.12)]',
+          'absolute left-0 top-[58px] z-30 max-h-[334px] w-full cursor-pointer overflow-auto  bg-white shadow-[0px_1px_12px_0px_rgba(0,0,0,0.12)]',
+          !rounded && 'rounded-none',
           { '!hidden': !show }
         )}
       >

package/src/components/credits/creditsRedeemList/AddressForm/StateSelect.tsx

@@ -2,6 +2,7 @@ import classNames from 'classnames'
 import { Picture } from '@anker-in/headless-ui'
 import { useEffect, useMemo, useState } from 'react'
 import useClickOutside from '../../context/hooks/useClickOutside'
+import { useHeadlessContext, ROUNDED_BRANDS } from '@anker-in/lib'
 
 interface StateSelectProps {
   states: { code: string; id: string; name: string }[]
@@ -16,6 +17,8 @@ interface StateSelectProps {
 export function StateSelect({ states, stateName = '', stateCode = '', className = '', onChange }: StateSelectProps) {
   const [show, setShow] = useState(false)
   const [display, setDisplay] = useState<any>('')
+  const { brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
 
   const dropdown = useClickOutside<HTMLDivElement>(() => {
     setShow(false)
@@ -78,7 +81,8 @@ export function StateSelect({ states, stateName = '', stateCode = '', className
           <div
             ref={dropdown}
             className={classNames(
-              'absolute left-0 top-[58px] z-30 max-h-[334px] w-full cursor-pointer overflow-auto rounded-[4px] bg-white shadow-[0px_1px_12px_0px_rgba(0,0,0,0.12)]',
+              'absolute left-0 top-[58px] z-30 max-h-[334px] w-full cursor-pointer overflow-auto  bg-white shadow-[0px_1px_12px_0px_rgba(0,0,0,0.12)]',
+              !rounded && 'rounded-none',
               { '!hidden': !show }
             )}
           >

package/src/components/credits/creditsRedeemList/AddressForm/index.tsx

@@ -7,13 +7,13 @@ import { Input } from './Input'
 import { StateSelect } from './StateSelect'
 import { ALPC_COUNTRY_MAP } from '../../context/const'
 import { useCreditsContext } from '../../context/provider'
-import { useHeadlessContext } from '@anker-in/lib'
+import { useHeadlessContext, ROUNDED_BRANDS } from '@anker-in/lib'
 import { AddressFormProps } from './type'
 
 export const AddressForm = ({ countries, countriesLoading, form, validate, errors, onChange }: AddressFormProps) => {
   const { profile, customer } = useCreditsContext()
-  const { locale } = useHeadlessContext()
-
+  const { locale, brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
   const [address, setAddress] = useState<Record<string, any>>()
 
   const states = useMemo(() => {
@@ -79,7 +79,8 @@ export const AddressForm = ({ countries, countriesLoading, form, validate, error
               const error = errors.find(item => item.key === input.key)?.message
               const inputClassName = classNames(
                 'h-full w-full appearance-none rounded-[2px] border bg-white px-[14px] py-[17px] leading-[1] outline-none placeholder:text-[#999] autofill:shadow-white focus:border-brand disabled:pointer-events-none disabled:text-[#999] disabled:bg-[#F7F8F9] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none',
-                error ? '!border-[#F84D4F]' : 'border-[#d8d8d8]'
+                error ? '!border-[#F84D4F]' : 'border-[#d8d8d8]',
+                !rounded && 'rounded-none'
               )
 
               if (input.type === 'state') {

package/src/components/credits/creditsRedeemList/{index.tsx → CreditsRedeemList.tsx}

@@ -1,4 +1,4 @@
-import { Container, Heading, Tabs, TabsList, TabsTrigger } from '@anker-in/headless-ui'
+import { Container, Heading, Tabs, TabsList, TabsTrigger, Text } from '@anker-in/headless-ui'
 import classNames from 'classnames'
 import { useCallback, useMemo, useState } from 'react'
 
@@ -7,37 +7,28 @@ import RedeemProductModal from './RedeemProductModal'
 import { useCreditsContext } from '../context/provider'
 import useRedeemableList from '../context/hooks/useRedeemableList'
 import { AlpcConsumeType, AlpcErrorCode } from '../context/const'
-import { useProductsByHandles } from '@anker-in/lib'
+import { useHeadlessContext, useProductsByHandles, gaTrack, ROUNDED_BRANDS } from '@anker-in/lib'
 import type { RedeemableItem as RedeemableItemType } from '../type'
 import { RedeemableItem } from './RedeemableItem'
 import RulesModal from '../modal/rulesModal'
 import { CreditsRedeemListCopy } from './type'
-import { gaTrack } from '../../../helpers/track'
+import { useRegistration } from '../../../components/registration'
+import { numberFormat } from '../context/utils'
 
-export function CreditsRedeemList({
-  copy,
-  className = '',
-  tabClassName = '',
-  hideTitle = false,
-  cardClassName,
-  activate,
-}: {
-  copy: CreditsRedeemListCopy
-  className?: string
-  tabClassName?: string
-  hideTitle?: boolean
-  cardClassName?: string
-  activate: {
-    openAuthCodePopup: () => void
-    isSuccess: boolean
-  }
-}) {
+export const CreditsRedeemList = ({ copy, id }: { copy: CreditsRedeemListCopy; id?: string }) => {
   const {
     profile,
     openSignUpPopup,
     gtm: { pageGroup },
+    pageCommon,
+    creditInfo,
   } = useCreditsContext()
+  const { authCodeActivate } = useRegistration()
+  const { brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
+
   const isLogin = Object.keys(profile || {}).length > 0
+  const isActivated = profile?.activated
 
   const [activeTab, setActiveTab] = useState<string>(copy.list[0].label)
 
@@ -74,6 +65,8 @@ export function CreditsRedeemList({
         const alpcItem = alpcList.find(alpcItem => alpcItem.id === item.id)
         const product = products?.find(product => product.handle === alpcItem?.handle)
         const variant = product?.variants.find(variant => variant.sku === alpcItem?.sku)
+        // 过滤掉库存不足的商品
+        if (alpcItem?.isLimited && (!alpcItem?.remainingInventory || alpcItem.remainingInventory <= 0)) return null
         if (alpcItem?.consumeType === AlpcConsumeType.Product && (!product || !variant)) return null
         return {
           alpc: alpcList.find(alpcItem => alpcItem.id === item.id),
@@ -95,13 +88,22 @@ export function CreditsRedeemList({
   )
 
   return (
-    <Container className={classNames('relative bg-[#F5F5F7]', className)}>
-      {!hideTitle && <Heading as="h2" size="4" html={copy.title} />}
+    <Container id={id} className={classNames('relative bg-[#F5F5F7]')}>
+      <Heading as="h2" size="4" html={copy.title} />
+
+      {/* 可用积分展示 */}
+      {isLogin && isActivated && (
+        <Text
+          html={copy.availableCredits?.replace('$credits', numberFormat(creditInfo?.available_credit || 0).toString())}
+          className="mt-[12px] text-[20px] l-xxl:text-[18px] l:text-[16px] font-bold text-[#4A4C56]"
+          as="p"
+        />
+      )}
 
       <Tabs
-        shape="rounded"
+        shape={rounded ? 'rounded' : 'square'}
         align="left"
-        className={classNames('sticky top-0 z-20 py-[24px] md:justify-center', tabClassName)}
+        className={classNames('sticky top-0 z-20 py-[24px] md:justify-center')}
         value={activeTab.toString()}
         onValueChange={value => {
           setActiveTab(value)
@@ -136,14 +138,13 @@ export function CreditsRedeemList({
               onRedeem={(item: RedeemableItemType) => {
                 if (!isLogin) {
                   openSignUpPopup()
-                } else if (!profile?.activated && !activate.isSuccess) {
-                  activate.openAuthCodePopup()
+                } else if (!profile?.activated && !authCodeActivate.isActivateSuccess) {
+                  authCodeActivate.open()
                 } else {
                   setPopRedeemData(item)
                 }
               }}
               onRulesOpen={setRules}
-              className={cardClassName}
             />
           ))}
         </div>
@@ -180,7 +181,7 @@ export function CreditsRedeemList({
           titleClassName="border-b-transparent h-[56px]"
           rules={rules}
           scrollClassName="md:mt-[8px] md:mb-[24px] md:pt-0"
-          title={copy?.ruleLabel}
+          title={pageCommon?.ruleLabel}
           ruleClassName="text-[#1d1d1f] font-bold"
         />
       )}

package/src/components/credits/creditsRedeemList/NonProductValue.tsx

@@ -1,9 +1,10 @@
 import { Text } from '@anker-in/headless-ui'
 import { RedeemableItem } from '../type'
 import { ConsumeType } from '../context/const'
-import { CreditsRedeemListCopy } from './type'
+import { useCreditsContext } from '../context/provider'
 
-export const NoneProductValue = ({ item, copy }: { item: RedeemableItem; copy: CreditsRedeemListCopy }) => {
+export const NoneProductValue = ({ item }: { item: RedeemableItem }) => {
+  const { pageCommon } = useCreditsContext()
   // shipping coupon 仅展示文案
   if (item.config?.type === ConsumeType.ShippingCoupon) {
     return (
@@ -26,7 +27,7 @@ export const NoneProductValue = ({ item, copy }: { item: RedeemableItem; copy: C
             />
             <Text
               className="ml-[4px] text-[24px] font-bold leading-[2] md:ml-[2px] l:text-[12px] xxl:leading-[1.4] l-xxl:text-[20px]"
-              html={item.config?.type === ConsumeType.GiftCard ? copy?.giftCardLabel : copy?.off}
+              html={item.config?.type === ConsumeType.GiftCard ? pageCommon?.giftCardLabel : pageCommon?.off}
             />
           </div>
         ) : (

package/src/components/credits/creditsRedeemList/RedeemCouponModal.tsx

@@ -30,7 +30,7 @@ function RedeemCouponModal({
   const [disabled, setDisabled] = useState(false)
   const { copy: copyText, copied: copiedStatus } = useCopy()
 
-  const { profile, fetchCreditInfo } = useCreditsContext()
+  const { profile, fetchCreditInfo, pageCommon } = useCreditsContext()
 
   const { isMutating: loading, trigger } = useRedeemCoupon({
     onSuccess(responseData) {
@@ -96,8 +96,8 @@ function RedeemCouponModal({
         )}
       >
         <div className="relative mx-auto h-[164px] w-[324px]">
-          {copy?.imageMapping[item.config?.type]?.url && (
-            <Picture source={copy.imageMapping[item.config.type].url} className="h-full [&_img]:h-full" />
+          {pageCommon?.imageMapping?.[item.config?.type]?.url && (
+            <Picture source={pageCommon.imageMapping[item.config.type].url} className="h-full [&_img]:h-full" />
           )}
           <div className="absolute bottom-[8px] left-[16px] font-extrabold text-white">
             {item.config.value ? (
@@ -126,7 +126,7 @@ function RedeemCouponModal({
                 }
               }}
             >
-              {copiedStatus ? copy?.copied : copy?.copy}
+              {copiedStatus ? pageCommon?.copied : pageCommon?.copy}
             </div>
           </div>
         ) : (
@@ -136,12 +136,12 @@ function RedeemCouponModal({
               'mt-[30px] text-center text-[24px] font-bold leading-[1.2] md:mt-[18px] md:text-[20px] md:leading-[1.2]'
             )}
           >
-            {numberFormat(item.alpc?.consumeCredits)} {copy?.pointUnit}
+            {numberFormat(item.alpc?.consumeCredits)} {pageCommon?.pointUnit}
           </Text>
         )}
         {!couponCode && item.config?.rules?.length > 0 && (
           <div className="mt-[18px] w-full text-[16px] font-bold leading-[1.4] text-[#6D6D6F] md:mt-[12px] md:text-[14px]">
-            <div className="mb-[4px]">{copy?.ruleLabel}:</div>
+            <div className="mb-[4px]">{pageCommon?.ruleLabel}:</div>
             <ul className="ml-4 grid grid-flow-row gap-[4px]">
               {item.config?.rules?.map((text, index) => (
                 <li className="list-disc" key={index}>

package/src/components/credits/creditsRedeemList/RedeemProductModal/Address.tsx

@@ -1,7 +1,7 @@
 import { Button, Text } from '@anker-in/headless-ui'
 import classNames from 'classnames'
 import { AddressForm } from '../AddressForm'
-import { useHeadlessContext } from '@anker-in/lib'
+import { useHeadlessContext, ROUNDED_BRANDS } from '@anker-in/lib'
 import type { RedeemableItem as RedeemableItemType } from '../../type'
 import { CreditsRedeemListCopy } from '../type'
 import { ProductInfo } from './ProductInfo'
@@ -34,7 +34,8 @@ export const Address = ({
   handlePayment,
   item,
 }: AddressProps) => {
-  const { storeDomain } = useHeadlessContext()
+  const { storeDomain, brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
   const { countries = [], isLoading: countriesLoading } = useCountries({ shopifyStoreDomain: storeDomain })
 
   return (
@@ -42,18 +43,20 @@ export const Address = ({
       <div className={classNames('max-h-[500px] overflow-y-auto px-[48px] pb-[24px] md:max-h-[400px] md:px-[16px]')}>
         <div>
           {shippingAddress && <Text className="mb-5 text-[16px] font-bold" html={shippingAddress}></Text>}
-          <AddressForm
-            onChange={setAddress}
-            validate={validateAddress}
-            errors={validateErrors}
-            form={copy.redeemModal.product.addressForm}
-            countries={countries}
-            countriesLoading={countriesLoading}
-          ></AddressForm>
+          {copy.redeemModal?.product?.addressForm && (
+            <AddressForm
+              onChange={setAddress}
+              validate={validateAddress}
+              errors={validateErrors}
+              form={copy.redeemModal.product.addressForm}
+              countries={countries}
+              countriesLoading={countriesLoading}
+            ></AddressForm>
+          )}
         </div>
       </div>
       <div className="sticky bottom-0 flex flex-col items-center justify-center bg-white px-[48px] py-[24px] l:px-[16px]">
-        <div className="flex w-full items-center rounded-[16px] bg-[#F5F5F7] p-[16px]">
+        <div className={classNames('flex w-full items-center bg-[#F5F5F7] p-[16px]', !rounded && 'rounded-none')}>
           {shippingProduct && <Text className="mb-5 text-[16px] font-bold" html={shippingProduct}></Text>}
           <ProductInfo item={item} copy={copy} />
         </div>

package/src/components/credits/creditsRedeemList/RedeemProductModal/Error.tsx

@@ -6,7 +6,7 @@ type ErrorProps = {
 
 export const Error = ({ errorInfo }: ErrorProps) => {
   return (
-    <div className="mx-auto max-w-[404px] text-[16px] text-black/40">
+    <div className="mx-auto max-w-[404px] text-[16px] text-black/40 py-[56px]">
       <Picture className="mx-auto mb-[12px] h-[140px] w-[220px]" source={errorInfo.imageUrl} />
       <Text as="div" className="mt-[16px] text-center" html={errorInfo.message} />
     </div>

package/src/components/credits/creditsRedeemList/RedeemProductModal/Init.tsx

@@ -6,6 +6,7 @@ import type { RedeemableItem as RedeemableItemType } from '../../type'
 import { CreditsRedeemListCopy } from '../type'
 import { ConsumeType } from '../../context/const'
 import { NoneProductValue } from './NonProductValue'
+import { useCreditsContext } from '../../context/provider'
 
 type InitProps = {
   copy: CreditsRedeemListCopy
@@ -16,6 +17,7 @@ type InitProps = {
 }
 
 export const Init = ({ copy, item, loading, disabled, setStatus }: InitProps) => {
+  const { pageCommon } = useCreditsContext()
   const rules = useMemo(() => {
     if (item.config.rules?.length) {
       return item.config.rules
@@ -37,7 +39,7 @@ export const Init = ({ copy, item, loading, disabled, setStatus }: InitProps) =>
               source={
                 item.config?.type === ConsumeType.Product
                   ? item.product.images[0]?.url
-                  : copy?.imageMapping[item.config.type]?.url || item.config.image?.url
+                  : pageCommon?.imageMapping?.[item.config.type]?.url || item.config.image?.url
               }
               className="h-full w-auto [&_img]:h-full [&_img]:w-auto [&_img]:object-contain"
             ></Picture>
@@ -60,7 +62,7 @@ export const Init = ({ copy, item, loading, disabled, setStatus }: InitProps) =>
               as="p"
               className={classNames(' text-center text-[24px] font-bold leading-[1.2] md:text-[20px] md:leading-[1.2]')}
             >
-              {numberFormat(item.alpc?.consumeCredits)} {copy?.pointUnit}
+              {numberFormat(item.alpc?.consumeCredits)} {pageCommon?.pointUnit}
             </Text>
           </div>
           <div className="mt-[16px] w-full text-[14px] font-semibold text-[#777] md:mt-[12px]">

package/src/components/credits/creditsRedeemList/RedeemProductModal/NonProductValue.tsx

@@ -2,8 +2,10 @@ import { Text } from '@anker-in/headless-ui'
 import { RedeemableItem } from '../../type'
 import { CreditsRedeemListCopy } from '../type'
 import { ConsumeType } from '../../context/const'
+import { useCreditsContext } from '../../context/provider'
 
 export const NoneProductValue = ({ item, copy }: { item: RedeemableItem; copy: CreditsRedeemListCopy }) => {
+  const { pageCommon } = useCreditsContext()
   // shipping coupon 仅展示文案
   if (item.config?.type === ConsumeType.ShippingCoupon) {
     return <Text className="text-[24px] w-[70%] font-bold leading-none" html={item.config?.value} as="p" />
@@ -13,7 +15,7 @@ export const NoneProductValue = ({ item, copy }: { item: RedeemableItem; copy: C
         <Text className="text-[64px] font-extrabold leading-none" html={item.config.value.toString()} />
         <Text
           className="text-[24px] font-bold leading-[2]"
-          html={item.config.type === ConsumeType.Coupon ? copy?.off : copy?.giftCardLabel}
+          html={item.config.type === ConsumeType.Coupon ? pageCommon?.off : pageCommon?.giftCardLabel}
         />
       </div>
     ) : (

package/src/components/credits/creditsRedeemList/RedeemProductModal/ProductInfo.tsx

@@ -1,8 +1,9 @@
-import { Picture } from '@anker-in/headless-ui'
+import { Picture, Text } from '@anker-in/headless-ui'
 import { formatPrice } from '../../context/utils'
 import type { RedeemableItem as RedeemableItemType } from '../../type'
 import { CreditsRedeemListCopy } from '../type'
 import { useHeadlessContext } from '@anker-in/lib'
+import { useCreditsContext } from '../../context/provider'
 
 type ProductInfoProps = {
   item: RedeemableItemType
@@ -11,6 +12,7 @@ type ProductInfoProps = {
 
 export const ProductInfo = ({ item, copy }: ProductInfoProps) => {
   const { locale } = useHeadlessContext()
+  const { pageCommon } = useCreditsContext()
 
   return (
     <div className="flex w-full items-center justify-center md:items-start md:justify-start">
@@ -32,9 +34,11 @@ export const ProductInfo = ({ item, copy }: ProductInfoProps) => {
         </div>
 
         <div className="mt-[16px] md:mt-[12px]">
-          <div className="mb-[12px] line-clamp-1 text-[16px] font-bold l:!hidden" title={item.product.title}>
-            {item.product.title}
-          </div>
+          <Text
+            className="mb-[12px] line-clamp-1 text-[16px] font-bold l:!hidden"
+            html={item.product.title}
+            title={item.product.title}
+          ></Text>
           <div className="flex font-semibold leading-[1.4] md:flex-col">
             <div className="mr-[40px] text-[15px] font-bold text-[#777] md:mr-0 md:text-[12px]">
               <div className="mb-[8px] flex items-center md:mb-[4px]">
@@ -60,7 +64,7 @@ export const ProductInfo = ({ item, copy }: ProductInfoProps) => {
               <div className="l:flex l:items-center l:justify-between">
                 <span>{copy.redeemModal.product.totalPriceLabel}: </span>
                 <span className="ml-1">
-                  {item.alpc?.consumeCredits} {copy?.pointUnit}
+                  {item.alpc?.consumeCredits} {pageCommon?.pointUnit}
                 </span>
               </div>
             </div>

package/src/components/credits/creditsRedeemList/RedeemProductModal/Success.tsx

@@ -3,6 +3,7 @@ import classNames from 'classnames'
 import type { RedeemableItem as RedeemableItemType } from '../../type'
 import { CreditsRedeemListCopy } from '../type'
 import { ProductInfo } from './ProductInfo'
+import { useHeadlessContext, ROUNDED_BRANDS } from '@anker-in/lib'
 
 type SuccessProps = {
   copy: CreditsRedeemListCopy
@@ -15,6 +16,8 @@ type SuccessProps = {
 }
 
 export const Success = ({ copy, shippingProduct, loading, address, disabled, onClose, item }: SuccessProps) => {
+  const { brand } = useHeadlessContext()
+  const rounded = ROUNDED_BRANDS.includes(brand)
   return (
     <div className={classNames('max-h-[500px] overflow-y-auto px-[48px] pb-[24px] md:max-h-[400px] md:px-[16px]')}>
       <div className="flex flex-col items-center">
@@ -26,7 +29,7 @@ export const Success = ({ copy, shippingProduct, loading, address, disabled, onC
 
         {shippingProduct && <Text className="mb-5 text-[16px] font-bold" html={shippingProduct}></Text>}
 
-        <div className="flex w-full items-center rounded-[16px] bg-[#F5F5F7] p-[16px]">
+        <div className={classNames('flex w-full items-center bg-[#F5F5F7] p-[16px]', !rounded && 'rounded-none')}>
           <ProductInfo item={item} copy={copy} />
         </div>
 

package/src/components/credits/creditsRedeemList/RedeemProductModal/index.tsx

@@ -25,7 +25,7 @@ function RedeemProductModal({ item, copy, onError, ...props }: RedeemProductModa
   const { fetchCreditInfo, profile } = useCreditsContext()
   const { storeDomain, locale } = useHeadlessContext()
 
-  const { validatorInfo } = copy
+  const { pageCommon } = useCreditsContext()
   const { shippingAddress, shippingProduct } = copy.redeemModal.product
 
   const [status, setStatus] = useState<'init' | 'address' | 'success' | 'error'>('init')
@@ -99,7 +99,7 @@ function RedeemProductModal({ item, copy, onError, ...props }: RedeemProductModa
 
   const { validate: validateAddress, errors: validateErrors } = useAddressValidate({
     address: address,
-    validatorInfo: validatorInfo,
+    validatorInfo: pageCommon?.validatorInfo,
     formData: copy?.redeemModal.product.form?.flat() || [],
     errorLabel: {
       require: copy.redeemModal.product.required,