@anker-in/campaign-ui 0.4.4 → 0.4.5-beta.2

package/src/components/credits/context/hooks/useRedeemableList.ts

@@ -23,7 +23,7 @@ function useRedeemableList(props?: { consumeType: AlpcConsumeType }) {
     {
       data: { consume_credit_rules: ConsumeCreditRuleResponse[] }
     },
-    { consume_type?: AlpcConsumeType, user_id?: string}
+    { consume_type?: AlpcConsumeType; user_id?: string }
   >({
     url: `/v1/credit/consume_credit_rules`,
     initData: {
@@ -34,32 +34,37 @@ function useRedeemableList(props?: { consumeType: AlpcConsumeType }) {
     },
   })
 
-  const getRedeemableList = useCallback((props?: { consumeType?: AlpcConsumeType}) => {
-    trigger(
-      {
-        user_id: profile?.user_id,
-        ...(props?.consumeType && {consume_type: props.consumeType})
-      },
-      {
-        onSuccess(responseData) {
-          console.log('responseData', responseData)
-          let list = responseData.data.consume_credit_rules || []
-          // let cList = list.filter(i => i.consume_type == 1) || []
-          // let pList = list.filter(i => i.consume_type == 2) || []
-          // cList = cList.sort((prev, next) => prev.consume_credits - next.consume_credits)
-          // pList = pList.sort((prev, next) => prev.consume_credits - next.consume_credits)
-          // const resultList = cList.concat(pList)
-          setRedeemableList(list)
+  const getRedeemableList = useCallback(
+    (props?: { consumeType?: AlpcConsumeType }) => {
+      trigger(
+        {
+          user_id: profile?.user_id,
+          ...(props?.consumeType && { consume_type: props.consumeType }),
         },
-      }
-    )
-  }, [profile, trigger, locale])
+        {
+          onSuccess(responseData) {
+            console.log('responseData', responseData)
+            const data = responseData?.data || responseData
+            let list = data?.consume_credit_rules || []
+            // let cList = list.filter(i => i.consume_type == 1) || []
+            // let pList = list.filter(i => i.consume_type == 2) || []
+            // cList = cList.sort((prev, next) => prev.consume_credits - next.consume_credits)
+            // pList = pList.sort((prev, next) => prev.consume_credits - next.consume_credits)
+            // const resultList = cList.concat(pList)
+            setRedeemableList(list)
+          },
+        }
+      )
+    },
+    [profile, trigger, locale]
+  )
 
   useEffect(() => {
-    if (!isLoadingProfile) {
-      getRedeemableList({ consumeType: props?.consumeType })
+    if (!brand || isLoadingProfile) {
+      return
     }
-  }, [getRedeemableList, isLoadingProfile])
+    getRedeemableList({ consumeType: props?.consumeType })
+  }, [getRedeemableList, isLoadingProfile, brand])
 
   return {
     listLoading,

package/src/components/credits/context/hooks/useUploadReceipt.tsx

@@ -1,29 +1,34 @@
 import useSWRMutation from 'swr/mutation'
+import { useHeadlessContext } from '@anker-in/lib'
 
-export const uploadReceipt = async (
-  _: any,
-  { arg: { orderName } }: { arg: { orderName: string } }
-): Promise<{
-  ok: boolean
-  code: number
-}> => {
-  const response = await fetch(`/api/multipass/mktsrv/v1/credit/upload_third_party_order`, {
-    credentials: 'include',
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      order_name: orderName,
-    }),
-  })
-  const { data } = await response.json()
-  return {
-    ok: data?.code === 0,
-    code: data?.code,
+export const useUploadReceipt = () => {
+  const { locale } = useHeadlessContext()
+
+  const uploadReceipt = async (
+    _: any,
+    { arg: { orderName } }: { arg: { orderName: string } }
+  ): Promise<{
+    ok: boolean
+    code: number
+  }> => {
+    const response = await fetch(`/api/multipass/mktsrv/v1/credit/upload_third_party_order`, {
+      credentials: 'include',
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'current-language': locale,
+      },
+      body: JSON.stringify({
+        order_name: orderName,
+      }),
+    })
+    const result = await response.json()
+    const { data } = result
+    return {
+      ok: result?.code === 0 || data?.code === 0,
+      code: result?.code ?? data?.code,
+    }
   }
-}
 
-export const useUploadReceipt = () => {
   return useSWRMutation('/api/multipass/mktsrv/v1/credit/upload_third_party_order', uploadReceipt)
 }

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

@@ -32,8 +32,9 @@ function RedeemCouponModal({
         return
       }
 
-      if (responseData?.data?.success) {
-        setCouponCode(responseData.data.coupon_code)
+      const data = responseData?.data || responseData
+      if (data?.success) {
+        setCouponCode(data.coupon_code)
         fetchCreditInfo(profile?.user_id)
       } else {
         let errorMsg

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

@@ -40,8 +40,9 @@ function RedeemVirtualProductModal({
         return
       }
 
-      if (responseData?.data?.id) {
-        setGiftCardId(responseData.data.id)
+      const data = responseData?.data || responseData
+      if (data?.id) {
+        setGiftCardId(data.id)
         fetchCreditInfo(profile?.user_id)
       } else {
         handleRedeemError(responseData.code)

package/src/components/credits/modal/SubscribeModal.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useState } from 'react'
-import { useRouter } from 'next/router'
 import { Button, Checkbox, Picture, Text } from '@anker-in/headless-ui'
 import { classNames, fetcher, gaTrack, useHeadlessContext } from '@anker-in/lib'
 import Cookies from 'js-cookie'
@@ -43,9 +42,8 @@ const getAdCookie = () => {
 }
 
 export function CreditsSubscribeModal({ copy, onSuccess, ...props }: CreditsSubscribeModalProps) {
-  const { brand } = useHeadlessContext()
+  const { brand, locale } = useHeadlessContext()
   const rounded = ROUNDED_BRANDS.includes(brand)
-  const { locale } = useRouter()
   const [policy, setPolicy] = useState(false)
   const [email, setEmail] = useState('')
   const [errorMessage, setErrorMessage] = useState('')
@@ -137,7 +135,7 @@ export function CreditsSubscribeModal({ copy, onSuccess, ...props }: CreditsSubs
       animationClassName="md:translate-y-[100vh]"
       {...props}
     >
-      <div className="flex flex-col gap-[16px] text-center min-l:px-[16px]">
+      <div className="min-l:px-[16px] flex flex-col gap-[16px] text-center">
         <div>
           <Text className={classNames('mb-[24px] text-[22px] font-bold')} html={copy.title}></Text>
         </div>
@@ -173,7 +171,7 @@ export function CreditsSubscribeModal({ copy, onSuccess, ...props }: CreditsSubs
           >
             <Picture
               source="https://cdn.shopify.com/s/files/1/0512/8568/8505/files/icon_email.png?v=1697527383"
-              className="h-[24px] w-[24px]"
+              className="size-[24px]"
               alt="email"
             />
           </Button>
@@ -181,7 +179,7 @@ export function CreditsSubscribeModal({ copy, onSuccess, ...props }: CreditsSubs
         <div className="flex w-full">
           <Checkbox checked={policy} onCheckedChange={() => setPolicy(!policy)} required className="border-[#1d1d1f]" />
           <label
-            className="text-left ml-2 text-[14px] font-semibold text-[#777] [&_a]:underline"
+            className="ml-2 text-left text-[14px] font-semibold text-[#777] [&_a]:underline"
             dangerouslySetInnerHTML={{
               __html: copy?.policy || '',
             }}

package/src/components/registration/authCodeActivate/index.tsx

@@ -48,10 +48,11 @@ export const AuthCodeActivate: React.FC<AuthCodeActivateProps> = ({ copy }) => {
   }, [focusIndex])
 
   useEffect(() => {
-    if (sendEmailData?.data?.data?.active_token) {
-      setActiveToken(sendEmailData.data.data.active_token)
+    const token = sendEmailData?.data?.data?.active_token ?? sendEmailData?.data?.active_token
+    if (token) {
+      setActiveToken(token)
     }
-  }, [sendEmailData?.data?.data?.active_token])
+  }, [sendEmailData?.data?.data?.active_token, sendEmailData?.data?.active_token])
 
   useEffect(() => {
     setIsSendingActivateEmail(isSendingEmail)
@@ -184,7 +185,8 @@ export const AuthCodeActivate: React.FC<AuthCodeActivateProps> = ({ copy }) => {
                 }, 3000)
               }
             } else {
-              if (data?.data?.error_code === '104') {
+              const errorCode = data?.data?.error_code ?? data?.error_code
+              if (errorCode === '104') {
                 if (onAuthSuccess) {
                   onAuthSuccess()
                 } else {
@@ -193,9 +195,9 @@ export const AuthCodeActivate: React.FC<AuthCodeActivateProps> = ({ copy }) => {
                     window.location.reload()
                   }, 3000)
                 }
-              } else if (data?.data?.error_code === '142') {
+              } else if (errorCode === '142') {
                 setError(copy?.incorrectCodeError || 'Invalid verification code.')
-              } else if (data?.data?.error_code === '154') {
+              } else if (errorCode === '154') {
                 setError(copy?.expiredCodeMessage || '')
               } else {
                 setError(copy?.sendEmailErrorMessage || '')