diff --git a/build.zip b/build.zip new file mode 100644 index 0000000..699f67f Binary files /dev/null and b/build.zip differ diff --git a/public/locales/zh-CN.json b/public/locales/zh-CN.json index 73379b1..0eb35b9 100644 --- a/public/locales/zh-CN.json +++ b/public/locales/zh-CN.json @@ -1141,5 +1141,9 @@ "Please enter a number": "请输入数字", "my wallet": "我的钱包", "Copy the address": "复制地址", - "How to use": "如何使用" + "How to use": "如何使用", + "person": "人", + "Earnings will be cleared after forced cancellation. Confirm cancellation": "强制取消后收益将清空,是否确认取消", + "HighCitySwapInfo": "HIighCitySwap的诞生,源于创始人Liu Bus对区块链技术的狂热追求,他始终相信区块链技术能够得到更广泛的应用。为此,他做了一个勇敢的决定,放弃在其他领域的投资,身心专注投入到区块链技术实践应用当中去,将自己所熟悉的领域——互联网社交,与区块链技术融合,HighCitySwap由此诞生。这就是我们的开始,感谢你们的支持,HighCity团队将永远前行。", + "After pledge, income will lock warehouse%times%": "质押后,收益将锁仓%times%" } diff --git a/src/config/constants/contracts.ts b/src/config/constants/contracts.ts index 33a4039..9bbf5f5 100644 --- a/src/config/constants/contracts.ts +++ b/src/config/constants/contracts.ts @@ -8,7 +8,7 @@ export default { 56: '0x6ab8463a4185b80905e05a9ff80a2d6b714b9e95', }, boardChef: { - 97: '0xe477990fc68d93472e2cc4b1aae21fe30f602c9a', + 97: '0xb4451b4f3cb37dd31abf9876b4325e595c11f302', 56: '0xD34871F12ace1BB8034E18009104b9dA60B84250', // NEED CHANGE 节点董事会合约 }, boardRewardChef: { @@ -16,7 +16,7 @@ export default { 56: '0xD34871F12ace1BB8034E18009104b9dA60B84250', // NEED CHANGE 节点董事会分红合约 }, holderChef: { - 97: '0xa319dfdab0d4ed9a82f6bf85cc94e7d260ac0859', + 97: '0x8faafb4ba8945917e7fe024dbbad0a5fb1da2181', 56: '0xD34871F12ace1BB8034E18009104b9dA60B84250', // NEED CHANGE 持币人 }, holderRewardChef: { diff --git a/src/config/localization/translations.json b/src/config/localization/translations.json index f5a49f9..96e89e0 100644 --- a/src/config/localization/translations.json +++ b/src/config/localization/translations.json @@ -1268,5 +1268,9 @@ "Please enter a number": "Please enter a number", "my wallet": "my wallet", "Copy the address": "Copy the address", - "How to use": "How to use" + "How to use": "How to use", + "person": "person", + "Earnings will be cleared after forced cancellation. Confirm cancellation": "Earnings will be cleared after forced cancellation. Confirm cancellation", + "HighCitySwapInfo": "HIighCitySwap was born from the fanatical pursuit of blockchain technology by its founder Liu Bus, who always believes that blockchain technology can be applied more widely. For this reason, he made a brave decision to give up investment in other fields and focus on the practice and application of blockchain technology. He fused his familiar field -- Internet social interaction with blockchain technology and thus HighCitySwap was born. This is our beginning, thank you for your support, the HighCity team will always move forward.", + "After pledge, income will lock warehouse%times%": "After pledge, income will lock warehouse%times%" } diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts index ea6142f..6008e44 100644 --- a/src/hooks/useAuth.ts +++ b/src/hooks/useAuth.ts @@ -36,7 +36,7 @@ const useAuth = () => { } else { window.localStorage.removeItem(connectorLocalStorageKey) if (error instanceof NoEthereumProviderError || error instanceof NoBscProviderError) { - toastError(t('Provider Error'), t('No provider was found')) + toastError(t('Provider Error')) } else if ( error instanceof UserRejectedRequestErrorInjected || error instanceof UserRejectedRequestErrorWalletConnect diff --git a/src/services/board.ts b/src/services/board.ts new file mode 100644 index 0000000..fbb8ff9 --- /dev/null +++ b/src/services/board.ts @@ -0,0 +1,10 @@ +import request from 'utils/request' + +export const getBaseConfig = () => { + return request.request({ + url: '/high_city/app/api/base/config', + method: 'get', + }) +} + +export default getBaseConfig diff --git a/src/services/referral.ts b/src/services/referral.ts index 341a4c2..d728e98 100644 --- a/src/services/referral.ts +++ b/src/services/referral.ts @@ -34,5 +34,11 @@ export const checkBuyResult = (params) => { params, }) } +export const getContract = () => { + return request.request({ + url: '/high_city/app/api/contract', + method: 'get', + }) +} export default getReferralRewardInfo diff --git a/src/views/Board/components/BoardCard/CardActionsContainer.tsx b/src/views/Board/components/BoardCard/CardActionsContainer.tsx index 85db750..3092b9b 100644 --- a/src/views/Board/components/BoardCard/CardActionsContainer.tsx +++ b/src/views/Board/components/BoardCard/CardActionsContainer.tsx @@ -90,7 +90,7 @@ const CardActions: React.FC = ({ board, accountData }) => {t('Staked')} */} - + {/* */} {/* diff --git a/src/views/Board/components/BoardCard/HarvestAction.tsx b/src/views/Board/components/BoardCard/HarvestAction.tsx index 015bd90..beee83c 100644 --- a/src/views/Board/components/BoardCard/HarvestAction.tsx +++ b/src/views/Board/components/BoardCard/HarvestAction.tsx @@ -3,6 +3,7 @@ import BigNumber from 'bignumber.js' import { Button, Flex, Heading } from '@pancakeswap/uikit' import { useTranslation } from 'contexts/Localization' import { useAppDispatch } from 'state' +import { Boards } from 'state/types' import { fetchFarmUserDataAsync } from 'state/farms' import useToast from 'hooks/useToast' import { getBalanceAmount } from 'utils/formatBalance' @@ -16,9 +17,10 @@ import useHarvestBoard from '../../hooks/useHarvestBoard' interface FarmCardActionsProps { earnings?: BigNumber pid?: number + board?: Boards } -const HarvestAction: React.FC = ({ earnings, pid }) => { +const HarvestAction: React.FC = ({ earnings, pid, board }) => { const { account } = useWeb3React() const { toastSuccess, toastError } = useToast() const { t } = useTranslation() @@ -29,6 +31,7 @@ const HarvestAction: React.FC = ({ earnings, pid }) => { const rawEarningsBalance = account ? getBalanceAmount(earnings) : BIG_ZERO const displayBalance = rawEarningsBalance.toFixed(3, BigNumber.ROUND_DOWN) const earningsBusd = rawEarningsBalance ? rawEarningsBalance.multipliedBy(cakePrice).toNumber() : 0 + const unlockTime = board.userData.unlockTime * 1000 return ( @@ -40,7 +43,7 @@ const HarvestAction: React.FC = ({ earnings, pid }) => { */}