From 08bd178bf5e056527ba8416c05410591f08681b7 Mon Sep 17 00:00:00 2001
From: myf <>
Date: Fri, 24 Jun 2022 14:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B2=E7=9B=92=E3=80=81id?=
 =?UTF-8?q?o=E5=85=91=E6=8D=A2=E3=80=81=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/locales/zh-CN.json                     |  3 ++-
 src/components/Menu/index.tsx                 |  1 +
 src/config/constants/contracts.ts             |  4 ++--
 src/config/localization/translations.json     |  3 ++-
 src/views/Announcement/index.tsx              | 23 ++++++++++++++-----
 .../BoardCard/HolderPoolBoardCard.tsx         |  2 +-
 src/views/Ido/components/HeaderStatus.tsx     |  1 +
 src/views/Ido/index.tsx                       |  2 +-
 8 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/public/locales/zh-CN.json b/public/locales/zh-CN.json
index 94a1037..0018f49 100644
--- a/public/locales/zh-CN.json
+++ b/public/locales/zh-CN.json
@@ -1284,5 +1284,6 @@
   "GIVING": "礼物",
   "PROPS": "道具",
   "rarity": "稀有度",
-  "success": "成功"
+  "success": "成功",
+  "Exchange closed": "兑换已结束"
 }
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
index 660f2aa..18ccea3 100644
--- a/src/components/Menu/index.tsx
+++ b/src/components/Menu/index.tsx
@@ -31,6 +31,7 @@ const Menu = (props) => {
   }, [userInfo])
   const sign = useSignLogin()
   const handleLogin = async (connectorID: ConnectorNames) => {
+    console.log(connectorID)
     await login(connectorID)
     setHasWalletLogin(true)
   }
diff --git a/src/config/constants/contracts.ts b/src/config/constants/contracts.ts
index 1d40adc..1a34935 100644
--- a/src/config/constants/contracts.ts
+++ b/src/config/constants/contracts.ts
@@ -37,12 +37,12 @@ export default {
   referralChef: {
     97: '0x0866962d208e91ea8804db3f547cccf22fe39ea7',
     56: '0x0866962d208e91ea8804db3f547cccf22fe39ea7', // NEED CHANGE 邀请或则军团长
-    5: '0x9C08E33271ea01da9FbC72aE7bDa8FEdAa41ee59',
+    5: '0xafa64f22a09fc197949c45281b2ad381a2b623a3',
   },
   referralRewardChef: {
     97: '0x0fb12ffe4b38730b80c26f44fa540eabfd03a30e',
     56: '0x0fb12ffe4b38730b80c26f44fa540eabfd03a30e', // NEED CHANGE 邀请或则军团长收益
-    5: '0x0fb12ffe4b38730b80c26f44fa540eabfd03a30e',
+    5: '0x9F59C9e98C79c129541d2b316D17F7F97089d067',
   },
   idoPurchase: {
     97: '0x2f562A9fE0325501A6Aa92cd9e2081B026fC35aa',
diff --git a/src/config/localization/translations.json b/src/config/localization/translations.json
index 95161c3..29a660e 100644
--- a/src/config/localization/translations.json
+++ b/src/config/localization/translations.json
@@ -1411,5 +1411,6 @@
   "GIVING": "GIVING",
   "PROPS": "PROPS",
   "rarity": "rarity",
-  "success": "success"
+  "success": "success",
+  "Exchange closed": "Exchange closed"
 }
diff --git a/src/views/Announcement/index.tsx b/src/views/Announcement/index.tsx
index 2d8842a..a43e061 100644
--- a/src/views/Announcement/index.tsx
+++ b/src/views/Announcement/index.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'contexts/Localization'
 // import Container from 'components/Layout/Container'
 import { getAnnouncementPage, getAnnouncementDetail } from 'services/announcement'
 import { Text, Flex, Image, Input, Heading } from '@pancakeswap/uikit'
+import Empty from 'components/Empty'
 import ListItem from './components/ListItem'
 import Detail from './components/Detail'
 
@@ -120,6 +121,10 @@ const TextAll = styled(Text)`
   padding: 20px 0;
   color: #999;
 `
+const EmptyFlex = styled(Flex)`
+  padding: 100px 0;
+  justify-content: center;
+`
 
 const Announcement: React.FC = () => {
   const { t } = useTranslation()
@@ -204,12 +209,18 @@ const Announcement: React.FC = () => {
                 </SearchBtn>
               </InputMain>
             </SearchDiv>
-            <ListMain>
-              {renderContent()}
-              <Flex justifyContent="center" padding={10}>
-                <Pagination count={count} onChange={pageChange} page={pageNum} />
-              </Flex>
-            </ListMain>
+            {list.length > 0 ? (
+              <ListMain>
+                {renderContent()}
+                <Flex justifyContent="center" padding={10}>
+                  <Pagination count={count} onChange={pageChange} page={pageNum} />
+                </Flex>
+              </ListMain>
+            ) : (
+              <EmptyFlex>
+                <Empty />
+              </EmptyFlex>
+            )}
           </TableDiv>
         )}
       </MainDiv>
diff --git a/src/views/Board/components/BoardCard/HolderPoolBoardCard.tsx b/src/views/Board/components/BoardCard/HolderPoolBoardCard.tsx
index 08d2664..4c42308 100644
--- a/src/views/Board/components/BoardCard/HolderPoolBoardCard.tsx
+++ b/src/views/Board/components/BoardCard/HolderPoolBoardCard.tsx
@@ -80,7 +80,7 @@ const HolderPoolBoardCard: React.FC<NodeCardProps> = ({ board, account, boardsDa
               </Text>
               <PriceCoin>
                 <Text fontSize="16px" color="#1FC7D4">
-                  {board.estimatedProfit}
+                  {board.estimatedProfit.toFixed(3)}
                 </Text>
                 <Text fontSize="12px" color="#9BE5EB">
                   {hccPriceUsdt ? (hccPriceUsdt * board.estimatedProfit).toFixed(3) : 0} USDT
diff --git a/src/views/Ido/components/HeaderStatus.tsx b/src/views/Ido/components/HeaderStatus.tsx
index 378a2a3..85785ed 100644
--- a/src/views/Ido/components/HeaderStatus.tsx
+++ b/src/views/Ido/components/HeaderStatus.tsx
@@ -38,6 +38,7 @@ const HeaderStatus: React.FC<HeaderStatusProps> = ({ status, roundDetail }) => {
 
   return (
     <TimeText>
+      {/* {status === 'close' && t('Exchange closed')} */}
       {status === 'none' && t('Exchange not commenced')}
 
       {status === 'proceed' && (
diff --git a/src/views/Ido/index.tsx b/src/views/Ido/index.tsx
index b0488b2..268e60b 100644
--- a/src/views/Ido/index.tsx
+++ b/src/views/Ido/index.tsx
@@ -41,7 +41,7 @@ const Exchange: React.FC = () => {
   const getRound = useGetRound()
   const init = async () => {
     const detail = await getRound()
-    if (!detail || detail.endTime < new Date().getTime() || roundDetail?.remaining === 0) {
+    if (!detail || detail.endTime < new Date().getTime()) {
       setStatus('none')
     } else if (detail.beginTime < new Date().getTime() && detail.endTime > new Date().getTime()) {
       setStatus('proceed')