From b2fb877052a157ad3649ea6779f8f6505a013001 Mon Sep 17 00:00:00 2001 From: myf <> Date: Fri, 29 Apr 2022 15:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=91=A3=E4=BA=8B=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Menu/config.ts | 10 ++++ src/state/boards/fetchBoardsUser.ts | 7 ++- src/state/boards/index.ts | 5 +- .../Board/components/BoardCard/BoardCard.tsx | 28 ++++------- src/views/Board/index.tsx | 50 +++++++++---------- src/views/Home/components/FristCom.tsx | 6 ++- src/views/Referral/components/Connected.tsx | 12 ++--- 7 files changed, 64 insertions(+), 54 deletions(-) diff --git a/src/components/Menu/config.ts b/src/components/Menu/config.ts index 13d99d3..e9ed631 100644 --- a/src/components/Menu/config.ts +++ b/src/components/Menu/config.ts @@ -25,6 +25,16 @@ const config: (t: ContextApi['t']) => MenuEntry[] = (t) => [ // // }, // ], // }, + { + label: t('Exchange'), + icon: 'FarmIcon', + href: 'https://pancake.kiemtienonline360.com/#/swap', + }, + { + label: t('Liquidity'), + icon: 'FarmIcon', + href: 'https://pancake.kiemtienonline360.com/#/pool', + }, { label: t('Farms'), icon: 'FarmIcon', diff --git a/src/state/boards/fetchBoardsUser.ts b/src/state/boards/fetchBoardsUser.ts index 28174d5..13e833c 100644 --- a/src/state/boards/fetchBoardsUser.ts +++ b/src/state/boards/fetchBoardsUser.ts @@ -4,6 +4,7 @@ import boardABI from 'config/abi/board.json' import multicall from 'utils/multicall' import boardsConfig from 'config/constants/boards' import { getAddress, getBoardAddress } from 'utils/addressHelpers' +import { getBalanceAmount } from 'utils/formatBalance' export const fetchBoardUserAllowances = async (account: string) => { const calls = boardsConfig.map((board) => { @@ -53,13 +54,17 @@ export const fetchBoardUserInfo = async (account: string) => { }, ] const [userInfo, estimatedProfit] = await multicall(board.abi, calls) + console.log(userInfo) return { stakedBalance: new BigNumber(userInfo.amount._hex).toJSON(), unLockTime: userInfo.unLockTime ? new BigNumber(userInfo.unLockTime._hex).toNumber() : 0, estimatedProfit: new BigNumber(estimatedProfit).toJSON(), + name: board.name, + amount: getBalanceAmount(new BigNumber(userInfo.amount?._hex)).toNumber(), + rewardDebt: getBalanceAmount(new BigNumber(userInfo.rewardDebt?._hex)).toNumber(), } }), ) - + console.log('data:', data) return data } diff --git a/src/state/boards/index.ts b/src/state/boards/index.ts index a0e9936..4f8a894 100644 --- a/src/state/boards/index.ts +++ b/src/state/boards/index.ts @@ -49,9 +49,12 @@ export const fetchBoardUserDataAsync = (account) => async (dispatch) => { stakedBalance: userInfo[index].stakedBalance, unlockTime: userInfo[index].unLockTime, estimatedProfit: userInfo[index].estimatedProfit, + name: userInfo[index].name, + amount: userInfo[index].amount, + rewardDebt: userInfo[index].rewardDebt, } }) - + console.log(arrayOfUserDataObjects) dispatch(setBoardsUserData({ arrayOfUserDataObjects })) } diff --git a/src/views/Board/components/BoardCard/BoardCard.tsx b/src/views/Board/components/BoardCard/BoardCard.tsx index 267e3a6..b9e5dc9 100644 --- a/src/views/Board/components/BoardCard/BoardCard.tsx +++ b/src/views/Board/components/BoardCard/BoardCard.tsx @@ -3,6 +3,7 @@ import BigNumber from 'bignumber.js' import styled, { keyframes } from 'styled-components' import { Flex, Text, Skeleton } from '@pancakeswap/uikit' import { provider as ProviderType } from 'web3-core' +import { getDecimalAmountNumber } from 'utils/formatBalance' import { getBoardAddress } from 'utils/addressHelpers' import { useTranslation } from 'contexts/Localization' import ExpandableSectionButton from 'components/ExpandableSectionButton' @@ -61,6 +62,7 @@ const FCard = styled.div` padding: 24px; position: relative; text-align: center; + min-height: 310px; ` const Divider = styled.div` @@ -80,33 +82,23 @@ interface NodeCardProps { removed: boolean provider?: ProviderType account?: string - list?: any } -const NodeCard: React.FC = ({ board, account, list }) => { +const NodeCard: React.FC = ({ board, account }) => { const { t } = useTranslation() const [showExpandableSection, setShowExpandableSection] = useState(false) - return (
- {list.map((item) => { - return ( -
- {board.name === item.name ? ( - <> - - {item.name === 'Board' ? : ''} - - - ) : ( - <> - )} -
- ) - })} + + {board.userData?.name === 'Board' ? ( + + ) : ( + '' + )} +
{/* diff --git a/src/views/Board/index.tsx b/src/views/Board/index.tsx index 2933c82..8f505cd 100644 --- a/src/views/Board/index.tsx +++ b/src/views/Board/index.tsx @@ -18,6 +18,7 @@ import Page from 'components/Layout/Page' import { useBoards } from 'state/hooks' import useRefresh from 'hooks/useRefresh' import { fetchBoardUserDataAsync, fetchBoardsPublicDataAsync } from 'state/actions' +import { fetchBoardUserInfo } from 'state/boards/fetchBoardsUser' import { useTranslation } from 'contexts/Localization' import BoardCard from './components/BoardCard/BoardCard' import HeaderItem from './components/HeaderItem' @@ -55,9 +56,6 @@ const Boards: React.FC = () => { const [boardNum, setBoardNum] = useState(0) const [holderNum, setHolder] = useState(0) - const [withdrawAmount, setWithdrawAmount] = useState(0) - - const [boardsDataList, setBoardsDataList] = useState([]) // // 获取资金池总额 // const getCapital = async () => { // const calls = boardsConfig.map((board) => { @@ -99,7 +97,6 @@ const Boards: React.FC = () => { } }), ) - console.log(boardsData) let total = 0 let waitWithdrawAmountValue = 0 boardsData.forEach((item) => { @@ -115,31 +112,32 @@ const Boards: React.FC = () => { setShareOutBonus(waitWithdrawAmountValue) } // 获取信息 - const fetchInfo = async () => { - const boardsData = await Promise.all( - boardsConfig.map(async (boardConfig) => { - const [boardUserInfo] = await multicall(boardConfig.poolAbi, [ - { - address: getAddress(boardConfig.contractAddress), - name: 'userInfo', - params: [account], - }, - ]) - return { - name: boardConfig.name, - amount: getBalanceAmount(new BigNumber(boardUserInfo.amount?._hex)).toNumber(), - rewardDebt: getBalanceAmount(new BigNumber(boardUserInfo.rewardDebt?._hex)).toNumber(), - unLockTime: new BigNumber(boardUserInfo?.unLockTime?._hex).toNumber(), - } - }), - ) - setBoardsDataList(boardsData) - } + // const fetchInfo = async () => { + // const boardsData = await Promise.all( + // boardsConfig.map(async (boardConfig) => { + // const [boardUserInfo] = await multicall(boardConfig.poolAbi, [ + // { + // address: getAddress(boardConfig.contractAddress), + // name: 'userInfo', + // params: [account], + // }, + // ]) + // return { + // name: boardConfig.name, + // amount: getBalanceAmount(new BigNumber(boardUserInfo.amount?._hex)).toNumber(), + // rewardDebt: getBalanceAmount(new BigNumber(boardUserInfo.rewardDebt?._hex)).toNumber(), + // unLockTime: new BigNumber(boardUserInfo?.unLockTime?._hex).toNumber(), + // } + // }), + // ) + // setBoardsDataList(boardsData) + // } useEffect(() => { dispatch(fetchBoardsPublicDataAsync()) fetchBoardShares() if (account) { - fetchInfo() + // fetchInfo() + // const userInfo = fetchBoardUserInfo(account) dispatch(fetchBoardUserDataAsync(account)) } }, [account, dispatch, fastRefresh]) @@ -149,7 +147,7 @@ const Boards: React.FC = () => {
{boardsList.map((board) => ( - + ))}
diff --git a/src/views/Home/components/FristCom.tsx b/src/views/Home/components/FristCom.tsx index 0d2ea98..e4a2ff5 100644 --- a/src/views/Home/components/FristCom.tsx +++ b/src/views/Home/components/FristCom.tsx @@ -162,8 +162,10 @@ const FristCom: React.FC = () => { {t('Hcc Nft')} {t('Hcc BTC')} - {t('Exchange')} - {t('Bazaar')} + openLink('https://pancake.kiemtienonline360.com/#/swap')}> + {t('Exchange')} + + {/* {t('Bazaar')} */} {detail.outsideChainVos.map((item) => { return ( diff --git a/src/views/Referral/components/Connected.tsx b/src/views/Referral/components/Connected.tsx index 93ffb5b..e36bb2b 100644 --- a/src/views/Referral/components/Connected.tsx +++ b/src/views/Referral/components/Connected.tsx @@ -67,16 +67,16 @@ const ConnectedCom: React.FC = () => { <> - - + + - {referralNormalConfigInfo.receiveLimit <= - referralRewardInfo.inviteReward - referralRewardInfo.inviteRewardReceive ? ( + {referralNormalConfigInfo?.receiveLimit <= + referralRewardInfo?.inviteReward - referralRewardInfo?.inviteRewardReceive ? ( {t('Claim now')} @@ -89,7 +89,7 @@ const ConnectedCom: React.FC = () => { {`${t( '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')}`} + )}${formatDivNumber(referralCommanderConfigInfo?.dividendFirst)}%${t('The commission')}`} {/* {t('each time')} {t('last bid')} {t('commission fee')} */}