调整部分bug

public/locales/zh-CN.json

@@ -217,7 +217,7 @@
   "Prize Pot": "奖金池",
   "Winners": "获胜者",
   "No. Matched": "中的号码数",
-  "Approve Contract": "批准合约",
+  "Approve %coin% Contract": "批准 %coin% 合约",
   "%asset% staked": "%asset% 已质押",
   "Total Value Locked": "锁定的总价值",
   "Across all LPs and Syrup Pools": "在所有 LP 和 Syrup 资金池中",
@@ -1117,6 +1117,7 @@
   "Enter a keyword search": "输入关键字搜索",
   "By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins": "使用页面右上方的邀请，可邀请新用户进入，并在用户购买币后获得",
   "The commission": "的提成！",
+  "footer %number% text": "使用页面右上方的邀请，可邀请新用户进入，并在用户购买币后获得 %number% 的提成！",
   "market value": "市值",
   "Loaded all": "已加载全部",
   "Insufficient Balance": "余额不足",

src/config/localization/translations.json

@@ -217,7 +217,7 @@
   "Prize Pot": "Prize Pot",
   "Winners": "Winners",
   "No. Matched": "No. Matched",
-  "Approve Contract": "Approve Contract",
+  "Approve %coin% Contract": "Approve %coin% Contract",
   "%asset% staked": "%asset% staked",
   "Total Value Locked": "Total Value Locked",
   "Across all LPs and Syrup Pools": "Across all LPs and Syrup Pools",
@@ -1246,6 +1246,7 @@
   "Enter a keyword search": "Enter a keyword search",
   "By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins": "By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins",
   "The commission": "The commission！",
+  "footer %number% text": "By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins %number% The commission！",
   "market value": "market value",
   "Loaded all": "Loaded all",
   "HCC Currency amount": "HCC Currency amount",

src/views/Board/index.tsx

@@ -89,7 +89,7 @@ const Boards: React.FC = () => {
       if (item.pid === 1) {
         setBoardNum(item.num)
       } else if (item.pid === 2) {
-        setHolder(item.waitWithdrawAmount)
+        setHolder(item.num)
       }
     })
     setTotalAmount(total)

src/views/Referral/components/BuyActions.tsx

@@ -101,7 +101,7 @@ const BuyActions: React.FC = () => {
             handleApprove(onUsdtApprove)
           }}
         >
-          {t('Approve %coin% Contract', { coin: 'usdt' })}
+          {t('Approve %coin% Contract', { coin: 'USDT' })}
         </Btn>
       )}
 
@@ -112,7 +112,7 @@ const BuyActions: React.FC = () => {
             handleApprove(onHccApprove)
           }}
         >
-          {t('Approve %coin% Contract', { coin: 'hcc' })}
+          {t('Approve %coin% Contract', { coin: 'HCC' })}
         </Btn>
       )}
       {allowanceList?.usdt && allowanceList.hcc ? (

src/views/Referral/components/BuyNftModal.tsx

@@ -51,10 +51,10 @@ const BuyNftModal: React.FC<BuyNftModalProps> = ({ onDismiss }) => {
   const referralCommanderConfigInfo = useReferralCommanderConfigInfo()
   const referralRewardInfo = useReferralNormalConfigInfo()
   return (
-    <ModalDiv title={`${t('purchase')}${referralCommanderConfigInfo.properties.name}`} onDismiss={onDismiss}>
+    <ModalDiv title={`${t('purchase')}${referralRewardInfo.properties?.name}`} onDismiss={onDismiss}>
       <Flex alignItems="center" flexWrap="wrap" justifyContent="center">
         <ImageDiv
-          src={referralCommanderConfigInfo.properties.cover as string}
+          src={referralCommanderConfigInfo.properties?.cover as string}
           width={250}
           height={250}
           marginBottom="20px"
@@ -67,11 +67,8 @@ const BuyNftModal: React.FC<BuyNftModalProps> = ({ onDismiss }) => {
           />
           <TextFlex text={t('Enjoy a higher percentage than ordinary users')} color="#FFF9FA" />
           <TextFlex text={t('Commander NFT can be traded in the NFT market')} color="#F5FFF9" />
-          <FlexCom
+          <FlexCom name={t('First stage sharing ratio')} value={`${referralCommanderConfigInfo.dividendFirst}%`} />
-            name={t('First stage sharing ratio')}
+          <FlexCom name={t('Secondary split ratio')} value={`${referralCommanderConfigInfo.dividendSecond}%`} />
-            value={`${formatDivNumber(referralRewardInfo.dividendFirst)}%`}
-          />
-          <FlexCom name={t('Secondary split ratio')} value={`${formatDivNumber(referralRewardInfo.dividendSecond)}%`} />
           <FlexCom name={t('Contract address')} value={t('Contract address')} />
           <FlexCom name={t('Assets agreement')} value={t('Assets agreement')} />
           <FlexCom name={t('Assets and chain')} value={t('Assets and chain')} />

src/views/Referral/components/Connected.tsx

@@ -58,7 +58,6 @@ const ConnectedCom: React.FC = () => {
   const [onBuyModal] = useModal(<BuyNftModal />)
   const referralNormalConfigInfo = useReferralNormalConfigInfo()
   const referralRewardInfo = useReferralRewardInfo()
-  const referralCommanderConfigInfo = useReferralCommanderConfigInfo()
   const [loading, setLoading] = useState(false)
   const withdraw = useWithdraw()
   const { toastSuccess } = useToast()
@@ -76,11 +75,11 @@ const ConnectedCom: React.FC = () => {
     <MainDiv>
       <HeaderMain title={t('recommend')} />
       <>
-        <FlexCom name={t('The lower the number of')} value={`${referralRewardInfo?.inviteNum}(人)`} />
+        <FlexCom name={t('The lower the number of')} value={`${referralRewardInfo?.inviteNum || 0}(人)`} />
-        <FlexCom name={t('HCC total revenue')} value={`${referralRewardInfo?.inviteReward}(HCC)`} />
+        <FlexCom name={t('HCC total revenue')} value={`${referralRewardInfo?.inviteReward || 0}(HCC)`} />
         <FlexCom
           name={t('To get profit')}
-          value={`${referralRewardInfo?.inviteReward - referralRewardInfo?.inviteRewardReceive}(HCC)`}
+          value={`${referralRewardInfo?.inviteReward - referralRewardInfo?.inviteRewardReceive || 0}(HCC)`}
         />
       </>
       <FooterBtn>
@@ -96,9 +95,7 @@ const ConnectedCom: React.FC = () => {
         <UpBtn onClick={onBuyModal}>{t('Upgrade commander')}</UpBtn>
       </FooterBtn>
       <FooterDiv>
-        <TextDiv>{`${t(
+        <TextDiv>{t('footer %number% text', { number: `${referralNormalConfigInfo?.dividendFirst || 0}%` })}</TextDiv>
-          'By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins',
-        )}${formatDivNumber(referralCommanderConfigInfo?.dividendFirst)}%${t('The commission')}`}</TextDiv>
         {/* <TextDiv color="textSubtle">{t('each time')}</TextDiv>
         <TextDiv color="textSubtle">{t('last bid')}</TextDiv>
         <TextDiv color="textSubtle">{t('commission fee')}</TextDiv> */}

src/views/Referral/components/Regimental.tsx

@@ -106,8 +106,8 @@ const RegimentalCom: React.FC = () => {
         </LogoImage>
 
         <>
-          <FlexCom name={t('The lower the number of')} value={`${referralRewardInfo.inviteNum as number}(人)`} />
+          <FlexCom name={t('The lower the number of')} value={`${(referralRewardInfo.inviteNum as number) || 0}(人)`} />
-          <FlexCom name={t('total revenue')} value={`${referralRewardInfo.inviteReward as number}(HCC)`} />
+          <FlexCom name={t('total revenue')} value={`${(referralRewardInfo.inviteReward as number) || 0}(HCC)`} />
           <FlexCom
             name={t('revenue')}
             value={`${
@@ -116,31 +116,12 @@ const RegimentalCom: React.FC = () => {
           />
           <FlexCom
             name={t('First stage sharing ratio')}
-            value={`${formatDivNumber(referralCommanderConfigInfo.dividendFirst as number)}%`}
+            value={`${formatDivNumber(referralCommanderConfigInfo.dividendFirst || 0)}%`}
           />
           <FlexCom
             name={t('Secondary split ratio')}
-            value={`${formatDivNumber(referralCommanderConfigInfo.dividendSecond as number)}%`}
+            value={`${formatDivNumber((referralCommanderConfigInfo.dividendSecond as number) || 0)}%`}
           />
-          {/* <FlexCom name={t('First stage sharing ratio')} value="100000(人)" />
-          <FlexCom
-            name={t('HCC total revenue percentage :10%')}
-            paddings="0 10px"
-            leftColor="textSubtle"
-            value={`${referralCommanderConfigInfo.dividendFirst}%`}
-          />
-          <FlexCom name={t('Number of secondary subordinates')} value="100000.00(人)" />
-          <FlexCom
-            name={t('HCC total revenue percentage :10%')}
-            paddings="0 10px"
-            leftColor="textSubtle"
-            value="100000.00(HCC)"
-          />
-          <FlexCom name={t('HCC total revenue')} value={`${referralRewardInfo.inviteReward}(HCC)`} />
-          <FlexCom
-            name={t('To get profit')}
-            value={`${referralRewardInfo.inviteReward - referralRewardInfo.inviteRewardReceive}(HCC)`}
-          /> */}
         </>
 
         <FooterBtn>
@@ -156,9 +137,11 @@ const RegimentalCom: React.FC = () => {
           {/* <UpBtn>{t('Upgrade commander')}</UpBtn> */}
         </FooterBtn>
         <FooterDiv>
-          <TextDiv>{`${t(
+          <TextDiv>
-            'By using the invitation at the top right of the page, new users can be invited to enter and obtained after users purchase coins',
+            {t('footer %number% text', {
-          )}${formatDivNumber(referralCommanderConfigInfo?.dividendFirst)}%${t('The commission')}`}</TextDiv>
+              number: `${referralCommanderConfigInfo?.dividendFirst || 0}%`,
+            })}
+          </TextDiv>
           {/* <TextDiv color="textSubtle">{t('each time')}</TextDiv>
           <TextDiv color="textSubtle">{t('last bid')}</TextDiv>
           <TextDiv color="textSubtle">{t('commission fee')}</TextDiv> */}