合并冲突

public/locales/zh-CN.json

@@ -1127,5 +1127,9 @@
   "capital pool": "资金池",
   "Unclaimed income": "待领取收益",
   "pledge": "质押",
+<<<<<<< HEAD
   "top": "置顶"
+=======
+  "Invite": "邀请"
+>>>>>>> dev
 }

src/App.tsx

@@ -1,6 +1,6 @@
 import React, { lazy, useEffect } from 'react'
 import { Router, Redirect, Route, Switch } from 'react-router-dom'
-import { ResetCSS } from '@pancakeswap/uikit'
+import { ResetCSS, ConfigProvider } from '@pancakeswap/uikit'
 import { useDispatch } from 'react-redux'
 import BigNumber from 'bignumber.js'
 import useEagerConnect from 'hooks/useEagerConnect'
@@ -10,6 +10,7 @@ import { initAxios } from 'utils/request'
 import useToast from 'hooks/useToast'
 import { useAccountEventListener } from 'hooks/useAccountEventListener'
 import { fetchUserInfo, clearUserInfo } from 'state/actions'
+import { useTranslation } from 'contexts/Localization'
 import { useAccount } from 'state/userInfo/hooks'
 import GlobalStyle from './style/Global'
 import Menu from './components/Menu'
@@ -70,6 +71,7 @@ const App: React.FC = () => {
   const dispatch = useDispatch()
   const toast = useToast()
   const account = useAccount()
+  const { t } = useTranslation()
 
   useEffect(() => {
     initAxios(() => {
@@ -81,6 +83,7 @@ const App: React.FC = () => {
   }, [account])
 
   return (
+    <ConfigProvider t={t}>
       <Router history={history}>
         <ResetCSS />
         <GlobalStyle />
@@ -183,6 +186,7 @@ const App: React.FC = () => {
         <ToastListener />
         <DatePickerPortal />
       </Router>
+    </ConfigProvider>
   )
 }
 

src/views/Board/components/BoardCard/BoardCard.tsx

@@ -123,16 +123,18 @@ const BoardCard: React.FC<NodeCardProps> = ({ board, account }) => {
   return (
     <FCard>
       <CardHeading name={t(board.name)} img={board.img} tokenSymbol={board.tokenSymbol} />
-
-      <CardDiv>
+      {account && (
         <div>
           <FlexText name={t('HCC Currency amount')} value={board.userData?.amount} />
-          {board.userData?.name === 'Board' ? <FlexText name={t('Lock up time')} value={countDown} /> : ''}
+          {board.userData?.name === 'Board' ? (
+            <FlexText name={t('Lock up time')} value={board.userData?.unlockTime} />
+          ) : (
+            ''
+          )}
           <FlexText name={t('possess LP')} value={board.userData?.rewardDebt} />
         </div>
+      )}
       <CardActionsContainer board={board} account={account} />
-      </CardDiv>
-
       {/* <Divider />
       <ExpandableSectionButton
         onClick={() => setShowExpandableSection(!showExpandableSection)}