From ad457846d653152cfcc30b0cad28f7a18d8c4f55 Mon Sep 17 00:00:00 2001 From: myf <> Date: Tue, 24 May 2022 10:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Menu/index.tsx | 6 +-- src/state/hooks.ts | 7 +++- src/state/ido/index.ts | 40 +------------------ .../BoardCard/CardActionsContainer.tsx | 6 +-- src/views/Home/components/FristCom.tsx | 6 +-- src/views/Ido/components/HeaderStatus.tsx | 4 +- src/views/Ido/components/IdoInput.tsx | 8 ++-- src/views/Ido/components/IdoPurchaseCard.tsx | 4 +- src/views/Ido/hooks/index.ts | 2 +- 9 files changed, 18 insertions(+), 65 deletions(-) diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index e32d0b0..05c6fda 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -60,11 +60,7 @@ const Menu = (props) => { const [price, setPrice] = useState(0) useEffect(() => { getDetails() - if (hccPriceUsdt.toString() === 'Infinity') { - setPrice(0) - } else { - setPrice(hccPriceUsdt.toNumber()) - } + setPrice(hccPriceUsdt) }, []) return ( { const cakeBnbFarm = useFarmFromPid(251) return new BigNumber(cakeBnbFarm.token.busdPrice) } -export const usePriceHccUsdt = (): BigNumber => { +export const usePriceHccUsdt = (): number => { const hccUsdtFarm = useFarmFromPid(1000) // NEED CHANGE - return new BigNumber(hccUsdtFarm.token.busdPrice) + return new BigNumber(hccUsdtFarm.token.busdPrice).toString() || !hccUsdtFarm.token.busdPrice + ? 0 + : new BigNumber(hccUsdtFarm.token.busdPrice).toNumber() + // return new BigNumber(hccUsdtFarm.token.busdPrice) } // Block diff --git a/src/state/ido/index.ts b/src/state/ido/index.ts index 68668da..b059604 100644 --- a/src/state/ido/index.ts +++ b/src/state/ido/index.ts @@ -1,51 +1,13 @@ import { createSlice } from '@reduxjs/toolkit' -import { getReferralRewardInfo, getReferralConfigInfo } from 'services/referral' -import { ReferralInfo, ReferralConfigType, ReferralConfigInfo } from 'types/referral' import BigNumber from 'bignumber.js' import erc20ABI from 'config/abi/erc20.json' import multicall from 'utils/multicall' import tokens from 'config/constants/tokens' import { getAddress, getIdoPurchaseAddress } from 'utils/addressHelpers' -import { ReferralState } from '../types' -const initialState: ReferralState = { - commanderConfigInfo: {}, - normalConfigInfo: {}, - isCommander: false, - rewardInfo: {}, -} const payWayList = { usdt: tokens.usdt, } -export const referralSlice = createSlice({ - name: 'Ido', - initialState, - reducers: { - setReferralInfo: (state, action) => { - console.log(action) - }, - }, -}) - -// Actions -export const { setReferralInfo } = referralSlice.actions -// Thunks -// export const fetchReferralInfoAsync = (account) => async (dispatch) => { -// if (!account) { -// dispatch(setReferralInfo({})) -// return -// } -// const data: ReferralInfo = await getReferralRewardInfo() -// const configInfo: ReferralConfigInfo[] = await getReferralConfigInfo() -// dispatch( -// setReferralInfo({ -// commanderConfigInfo: configInfo?.find((item) => item.type === ReferralConfigType.COMMANDER) || {}, -// normalConfigInfo: configInfo?.find((item) => item.type === ReferralConfigType.NORMAL) || {}, -// isCommander: data.isCommander, -// rewardInfo: data.reward || {}, -// }), -// ) -// } export const fetchIdoUserAllowances = async (account: string) => { const calls = Object.values(payWayList).map((payWayItem) => { @@ -63,4 +25,4 @@ export const fetchIdoUserAllowances = async (account: string) => { } } -export default referralSlice.reducer +export default fetchIdoUserAllowances diff --git a/src/views/Board/components/BoardCard/CardActionsContainer.tsx b/src/views/Board/components/BoardCard/CardActionsContainer.tsx index f628472..c977fa0 100644 --- a/src/views/Board/components/BoardCard/CardActionsContainer.tsx +++ b/src/views/Board/components/BoardCard/CardActionsContainer.tsx @@ -52,11 +52,7 @@ const CardActions: React.FC = ({ board, account }) => { const [price, setPrice] = useState(0) useEffect(() => { - if (hccPriceUsdt.toString() === 'Infinity') { - setPrice(0) - } else { - setPrice(Number(hccPriceUsdt.toNumber().toFixed(3))) - } + setPrice(hccPriceUsdt) }, []) const handleApprove = useCallback(async () => { diff --git a/src/views/Home/components/FristCom.tsx b/src/views/Home/components/FristCom.tsx index 743957d..35949fe 100644 --- a/src/views/Home/components/FristCom.tsx +++ b/src/views/Home/components/FristCom.tsx @@ -156,11 +156,7 @@ const FristCom: React.FC = () => { setDetail(data) } useEffect(() => { - if (hccPriceUsdt.toString() === 'Infinity') { - setPrice(0) - } else { - setPrice(hccPriceUsdt.toNumber()) - } + setPrice(hccPriceUsdt) getDetail() }, []) const openLink = (link) => { diff --git a/src/views/Ido/components/HeaderStatus.tsx b/src/views/Ido/components/HeaderStatus.tsx index 867c35c..955b99c 100644 --- a/src/views/Ido/components/HeaderStatus.tsx +++ b/src/views/Ido/components/HeaderStatus.tsx @@ -16,12 +16,12 @@ interface RoundDetailProps { token?: string total?: number } -interface Props { +interface HeaderStatusProps { status?: string roundDetail?: RoundDetailProps } -const HeaderStatus: React.FC = ({ status, roundDetail }) => { +const HeaderStatus: React.FC = ({ status, roundDetail }) => { const { t } = useTranslation() return ( diff --git a/src/views/Ido/components/IdoInput.tsx b/src/views/Ido/components/IdoInput.tsx index ca92de4..35ef1c4 100644 --- a/src/views/Ido/components/IdoInput.tsx +++ b/src/views/Ido/components/IdoInput.tsx @@ -19,14 +19,14 @@ const CoinText = styled(Text)` margin-bottom: 20px; ` -interface InputProps { +interface ExchangeInputProps { name: string value?: number | string - isDisabled?: boolean + disabled?: boolean onChange: (e: React.FormEvent) => void } -const ExchangeInput: React.FC = ({ name, value, onChange, isDisabled = true }) => { +const ExchangeInput: React.FC = ({ name, value, onChange, disabled = true }) => { const { t } = useTranslation() return ( @@ -37,7 +37,7 @@ const ExchangeInput: React.FC = ({ name, value, onChange, isDisabled placeholder={t('Please enter the amount')} onChange={onChange} type="number" - disabled={isDisabled} + disabled={disabled} /> ) diff --git a/src/views/Ido/components/IdoPurchaseCard.tsx b/src/views/Ido/components/IdoPurchaseCard.tsx index 12a7804..de1625d 100644 --- a/src/views/Ido/components/IdoPurchaseCard.tsx +++ b/src/views/Ido/components/IdoPurchaseCard.tsx @@ -153,9 +153,9 @@ const ExchangeCard: React.FC = ({ status, roundDetail, time }) => { {idoInfo?.name} - + - + {account ? ( allowanceList.usdt ? ( diff --git a/src/views/Ido/hooks/index.ts b/src/views/Ido/hooks/index.ts index 0b5b929..3bed001 100644 --- a/src/views/Ido/hooks/index.ts +++ b/src/views/Ido/hooks/index.ts @@ -51,7 +51,7 @@ export const useBuyTransaction = () => { const transaction = async (amount) => { const data = await getPurchaseActivity() const { id } = data - const params = [id, new BigNumber(amount).times(new BigNumber(10).pow(18)).toString()] + const params = [id, getDecimalAmount(amount).toString()] const res = await idoPurchase.purchaseWithLock(...params) return res }