From d1ae8613255cd584fd06acc260eef31c95437441 Mon Sep 17 00:00:00 2001 From: memoyil <2213635+memoyil@users.noreply.github.com> Date: Mon, 30 Sep 2024 04:54:05 +0200 Subject: [PATCH] perf: Don't fetch cake price when currency is not and not enabled (#10719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That hook instance in swap usually not directly fetching from rpc since instance in menu component doing the fetch but disabling it still bring some perf benefits --- ## PR-Codex overview This PR focuses on replacing instances of `cakePriceBusd` with `cakePrice` throughout various components. This change streamlines the code by ensuring a consistent reference to the cake price across the application. ### Detailed summary - Replaced `cakePriceBusd` with `cakePrice` in multiple files. - Updated calculations for `mcap`, `prizeInBusd`, and `balanceInBusd` to use `cakePrice`. - Adjusted conditions and hooks to reference the new `cakePrice` variable. - Ensured all related calculations maintain functionality with the new variable. > ✨ Ask PR-Codex anything about this PR by commenting with `/codex {your question}` --- apps/web/src/hooks/useStablecoinPrice.ts | 4 ++-- .../components/Dashboard/CommissionInfo.tsx | 10 ++++----- .../Dashboard/Reward/LatestReward.tsx | 10 ++++----- .../hooks/useLeaderboard.tsx | 8 +++---- .../components/CakeRewardsCard.tsx | 14 ++++++------ .../CakeStaking/components/LockCakeForm.tsx | 6 ++--- .../Home/components/Banners/LotteryBanner.tsx | 4 ++-- .../Banners/hooks/useIsRenderUserBanner.ts | 4 ++-- .../src/views/Home/components/CakeDataRow.tsx | 4 ++-- .../CommunitySection/LotteryCardContent.tsx | 8 +++---- .../components/UserBanner/HarvestCard.tsx | 4 ++-- .../views/Home/hooks/useGetTopFarmsByApr.tsx | 6 ++--- .../Ifos/hooks/v2/useGetPublicIfoData.ts | 4 ++-- .../Ifos/hooks/v3/useGetPublicIfoData.ts | 4 ++-- .../Ifos/hooks/v7/useGetPublicIfoData.ts | 4 ++-- .../Ifos/hooks/v8/useGetPublicIfoData.ts | 4 ++-- .../BuyTicketsModal/BuyTicketsModal.tsx | 4 ++-- .../ClaimPrizesModal/ClaimPrizesInner.tsx | 4 ++-- .../web/src/views/Lottery/components/Hero.tsx | 4 ++-- .../views/Lottery/components/NextDrawCard.tsx | 4 ++-- .../PreviousRoundCard/FooterExpanded.tsx | 4 ++-- .../components/RewardBracketDetail.tsx | 4 ++-- .../CakeVaultCard/RecentCakeProfitRow.tsx | 4 ++-- .../VaultCardActions/HasSharesActions.tsx | 8 +++---- .../CakeVaultCard/VaultStakeModal.tsx | 8 +++---- .../BenefitsModal/RevenueSharing.tsx | 6 ++--- .../views/Pottery/components/Banner/index.tsx | 4 ++-- .../AllHistoryCard/PreviousRoundCardBody.tsx | 4 ++-- .../Pot/Claim/AvailableWithdraw.tsx | 4 ++-- .../components/Pot/Claim/PrizeToBeClaimed.tsx | 4 ++-- .../Pottery/components/Pot/YourDeposit.tsx | 4 ++-- .../views/Pottery/components/Pot/index.tsx | 4 ++-- .../src/views/TradingCompetition/helpers.ts | 22 +++++++++---------- .../components/CurrentRewardPool.tsx | 4 ++-- .../components/Leaderboard/DesktopResult.tsx | 6 ++--- .../components/Leaderboard/MobileResult.tsx | 6 ++--- .../components/Leaderboard/RankingCard.tsx | 6 ++--- .../YourTradingReward/CurrentPeriod.tsx | 4 ++-- .../YourTradingReward/QualifiedPreview.tsx | 8 +++---- .../VeCake/VeCakePreview.tsx | 4 ++-- .../TradingReward/hooks/useRewardInCake.tsx | 6 ++--- 41 files changed, 119 insertions(+), 119 deletions(-) diff --git a/apps/web/src/hooks/useStablecoinPrice.ts b/apps/web/src/hooks/useStablecoinPrice.ts index 67d6f05114380..eda5518a87333 100644 --- a/apps/web/src/hooks/useStablecoinPrice.ts +++ b/apps/web/src/hooks/useStablecoinPrice.ts @@ -29,9 +29,9 @@ export function useStablecoinPrice( const chainId = currency?.chainId const { enabled, hideIfPriceImpactTooHigh } = { ...DEFAULT_CONFIG, ...config } - const cakePrice = useCakePrice() + const isCake = Boolean(chainId && currency && CAKE[chainId] && currency.wrapped.equals(CAKE[chainId])) + const cakePrice = useCakePrice({ enabled: Boolean(isCake && enabled) }) const stableCoin = chainId && chainId in ChainId ? STABLE_COIN[chainId as ChainId] : undefined - const isCake = chainId && currency && CAKE[chainId] && currency.wrapped.equals(CAKE[chainId]) const isStableCoin = currency && stableCoin && currency.wrapped.equals(stableCoin) diff --git a/apps/web/src/views/AffiliatesProgram/components/Dashboard/CommissionInfo.tsx b/apps/web/src/views/AffiliatesProgram/components/Dashboard/CommissionInfo.tsx index 940347fc3277d..f9fce1d44f4a7 100644 --- a/apps/web/src/views/AffiliatesProgram/components/Dashboard/CommissionInfo.tsx +++ b/apps/web/src/views/AffiliatesProgram/components/Dashboard/CommissionInfo.tsx @@ -88,19 +88,19 @@ const chartConfig: ChartInfo[] = [ const CommissionInfo: React.FC> = ({ affiliate }) => { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { totalUsers, totalEarnFeeUSD } = affiliate.metric const totalCakeEarned = useMemo(() => { - const cakeBalance = new BigNumber(totalEarnFeeUSD).div(cakePriceBusd).toNumber() + const cakeBalance = new BigNumber(totalEarnFeeUSD).div(cakePrice).toNumber() return formatNumber(cakeBalance) - }, [cakePriceBusd, totalEarnFeeUSD]) + }, [cakePrice, totalEarnFeeUSD]) const chartData = useMemo(() => { return chartConfig .map((chart) => { const usdValue: string = affiliate.metric[chart?.id] ?? '0' - const cakeBalance = new BigNumber(usdValue).div(cakePriceBusd).toNumber() + const cakeBalance = new BigNumber(usdValue).div(cakePrice).toNumber() const valuePercentage = new BigNumber(usdValue).div(totalEarnFeeUSD) const percentage = new BigNumber(valuePercentage.isNaN() ? '0' : valuePercentage).times(100).toNumber() return { @@ -112,7 +112,7 @@ const CommissionInfo: React.FC> = ( } }) .sort((a, b) => b.cakeValueAsNumber - a.cakeValueAsNumber) - }, [affiliate?.metric, cakePriceBusd, totalEarnFeeUSD]) + }, [affiliate?.metric, cakePrice, totalEarnFeeUSD]) return ( diff --git a/apps/web/src/views/AffiliatesProgram/components/Dashboard/Reward/LatestReward.tsx b/apps/web/src/views/AffiliatesProgram/components/Dashboard/Reward/LatestReward.tsx index bd0eb4736f228..4786a30a28562 100644 --- a/apps/web/src/views/AffiliatesProgram/components/Dashboard/Reward/LatestReward.tsx +++ b/apps/web/src/views/AffiliatesProgram/components/Dashboard/Reward/LatestReward.tsx @@ -43,19 +43,19 @@ const LatestReward: React.FC> = ({ const { isUserExist } = useUserExist() const { toastSuccess, toastError } = useToast() const { signMessageAsync } = useSignMessage() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const [isAffiliateClaimLoading, setIsAffiliateClaimLoading] = useState(false) const [isUserClaimLoading, setIsUserClaimLoading] = useState(false) const contract = useAffiliateProgramContract({ chainId: ChainId.BSC }) const affiliateTotalCakeEarned = useMemo( - () => new BigNumber(affiliateRewardFeeUSD).div(cakePriceBusd).toNumber(), - [cakePriceBusd, affiliateRewardFeeUSD], + () => new BigNumber(affiliateRewardFeeUSD).div(cakePrice).toNumber(), + [cakePrice, affiliateRewardFeeUSD], ) const userTotalCakeEarned = useMemo( - () => new BigNumber(userRewardFeeUSD).div(cakePriceBusd).toNumber(), - [cakePriceBusd, userRewardFeeUSD], + () => new BigNumber(userRewardFeeUSD).div(cakePrice).toNumber(), + [cakePrice, userRewardFeeUSD], ) const handleClaim = async (isAffiliateClaim: boolean) => { diff --git a/apps/web/src/views/AffiliatesProgram/hooks/useLeaderboard.tsx b/apps/web/src/views/AffiliatesProgram/hooks/useLeaderboard.tsx index fd71f5cd513a9..6a2ea76525921 100644 --- a/apps/web/src/views/AffiliatesProgram/hooks/useLeaderboard.tsx +++ b/apps/web/src/views/AffiliatesProgram/hooks/useLeaderboard.tsx @@ -16,16 +16,16 @@ interface Leaderboard { } const useLeaderboard = (): Leaderboard => { - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { data, isPending } = useQuery({ - queryKey: ['affiliates-program', 'affiliate-program-leaderboard', cakePriceBusd], + queryKey: ['affiliates-program', 'affiliate-program-leaderboard', cakePrice], queryFn: async () => { const response = await fetch(`/api/affiliates-program/leader-board`) const result = await response.json() const list: ListType[] = result.affiliates.map((affiliate) => { - const cakeBalance = new BigNumber(affiliate.metric.totalEarnFeeUSD).div(cakePriceBusd) + const cakeBalance = new BigNumber(affiliate.metric.totalEarnFeeUSD).div(cakePrice) return { ...affiliate, cakeBalance: cakeBalance.isNaN() ? '0' : cakeBalance.toString(), @@ -34,7 +34,7 @@ const useLeaderboard = (): Leaderboard => { return list }, - enabled: cakePriceBusd.gt(0), + enabled: cakePrice.gt(0), refetchOnWindowFocus: false, refetchOnReconnect: false, }) diff --git a/apps/web/src/views/CakeStaking/components/CakeRewardsCard.tsx b/apps/web/src/views/CakeStaking/components/CakeRewardsCard.tsx index 8ae8e0c5954f0..2174ce9e1983c 100644 --- a/apps/web/src/views/CakeStaking/components/CakeRewardsCard.tsx +++ b/apps/web/src/views/CakeStaking/components/CakeRewardsCard.tsx @@ -94,7 +94,7 @@ export const CakeRewardsCard = ({ onDismiss }) => { currentLanguage: { locale }, } = useTranslation() const { isDesktop } = useMatchBreakpoints() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { cakeUnlockTime, cakeLockedAmount } = useCakeLockStatus() const { balanceOfAt, totalSupplyAt, nextDistributionTimestamp, lastTokenTimestamp, availableClaim } = useRevenueSharingVeCake() @@ -112,8 +112,8 @@ export const CakeRewardsCard = ({ onDismiss }) => { [availableClaimFromCakePool], ) const availableCakePoolCakeUsdValue = useMemo( - () => new BigNumber(availableCakePoolCake).times(cakePriceBusd).toNumber(), - [availableCakePoolCake, cakePriceBusd], + () => new BigNumber(availableCakePoolCake).times(cakePrice).toNumber(), + [availableCakePoolCake, cakePrice], ) const availableRevenueSharingCake = useMemo( @@ -121,8 +121,8 @@ export const CakeRewardsCard = ({ onDismiss }) => { [availableClaim], ) const availableRevenueSharingCakeUsdValue = useMemo( - () => new BigNumber(availableRevenueSharingCake).times(cakePriceBusd).toNumber(), - [availableRevenueSharingCake, cakePriceBusd], + () => new BigNumber(availableRevenueSharingCake).times(cakePrice).toNumber(), + [availableRevenueSharingCake, cakePrice], ) const totalAvailableClaim = useMemo( @@ -130,8 +130,8 @@ export const CakeRewardsCard = ({ onDismiss }) => { [availableClaim, availableClaimFromCakePool], ) const totalAvailableClaimUsdValue = useMemo( - () => new BigNumber(totalAvailableClaim).times(cakePriceBusd).toNumber(), - [totalAvailableClaim, cakePriceBusd], + () => new BigNumber(totalAvailableClaim).times(cakePrice).toNumber(), + [totalAvailableClaim, cakePrice], ) const showExpireSoonWarning = useMemo(() => { diff --git a/apps/web/src/views/CakeStaking/components/LockCakeForm.tsx b/apps/web/src/views/CakeStaking/components/LockCakeForm.tsx index a0a05f67e83b4..a55b5f36c365d 100644 --- a/apps/web/src/views/CakeStaking/components/LockCakeForm.tsx +++ b/apps/web/src/views/CakeStaking/components/LockCakeForm.tsx @@ -21,10 +21,10 @@ const CakeInput: React.FC<{ disabled?: boolean }> = ({ value, onUserInput, disabled }) => { const { t } = useTranslation() - const cakeUsdPrice = useCakePrice() + const cakePrice = useCakePrice() const cakeUsdValue = useMemo(() => { - return cakeUsdPrice && value ? cakeUsdPrice.times(value).toNumber() : 0 - }, [cakeUsdPrice, value]) + return cakePrice && value ? cakePrice.times(value).toNumber() : 0 + }, [cakePrice, value]) const [percent, setPercent] = useState(null) const _cakeBalance = useBSCCakeBalance() const cakeBalance = BigInt(_cakeBalance.toString()) diff --git a/apps/web/src/views/Home/components/Banners/LotteryBanner.tsx b/apps/web/src/views/Home/components/Banners/LotteryBanner.tsx index d27fd48096009..632af856e0b1f 100644 --- a/apps/web/src/views/Home/components/Banners/LotteryBanner.tsx +++ b/apps/web/src/views/Home/components/Banners/LotteryBanner.tsx @@ -72,8 +72,8 @@ const LotteryPrice: React.FC = () => { const { data } = useQuery({ queryKey: ['currentLottery'], }) - const cakePriceBusd = useCakePrice() - const prizeInBusd = new BigNumber(data?.amountCollectedInCake || Number.NaN).times(cakePriceBusd) + const cakePrice = useCakePrice() + const prizeInBusd = new BigNumber(data?.amountCollectedInCake || Number.NaN).times(cakePrice) const prizeTotal = getBalanceNumber(prizeInBusd) const { t } = useTranslation() diff --git a/apps/web/src/views/Home/components/Banners/hooks/useIsRenderUserBanner.ts b/apps/web/src/views/Home/components/Banners/hooks/useIsRenderUserBanner.ts index 9ee27cc1cdb1b..3cf38cd492504 100644 --- a/apps/web/src/views/Home/components/Banners/hooks/useIsRenderUserBanner.ts +++ b/apps/web/src/views/Home/components/Banners/hooks/useIsRenderUserBanner.ts @@ -11,8 +11,8 @@ const useIsRenderUserBanner = () => { const { account, chainId } = useActiveWeb3React() const { earningsSum: farmEarningsSum } = useFarmsWithBalance() - const cakePriceBusd = useCakePrice() - const isEarningsBusdZero = new BigNumber(farmEarningsSum).multipliedBy(cakePriceBusd).isZero() + const cakePrice = useCakePrice() + const isEarningsBusdZero = new BigNumber(farmEarningsSum).multipliedBy(cakePrice).isZero() const { data: shouldRenderUserBanner } = useQuery({ queryKey: ['shouldRenderUserBanner', account], diff --git a/apps/web/src/views/Home/components/CakeDataRow.tsx b/apps/web/src/views/Home/components/CakeDataRow.tsx index 61d0e4eb74b57..1c8ba3dc7e8ac 100644 --- a/apps/web/src/views/Home/components/CakeDataRow.tsx +++ b/apps/web/src/views/Home/components/CakeDataRow.tsx @@ -124,8 +124,8 @@ const CakeDataRow = () => { enabled: Boolean(loadData), refetchInterval: SLOW_INTERVAL, }) - const cakePriceBusd = useCakePrice() - const mcap = cakePriceBusd.times(circulatingSupply) + const cakePrice = useCakePrice() + const mcap = cakePrice.times(circulatingSupply) const mcapString = formatLocalisedCompactNumber(mcap.toNumber(), isMobile) useEffect(() => { diff --git a/apps/web/src/views/Home/components/CommunitySection/LotteryCardContent.tsx b/apps/web/src/views/Home/components/CommunitySection/LotteryCardContent.tsx index 935abf5e1fda2..5a3a4728dd11f 100644 --- a/apps/web/src/views/Home/components/CommunitySection/LotteryCardContent.tsx +++ b/apps/web/src/views/Home/components/CommunitySection/LotteryCardContent.tsx @@ -25,7 +25,7 @@ const LotteryCardContent = () => { const { t } = useTranslation() const { observerRef, isIntersecting } = useIntersectionObserver() const [loadData, setLoadData] = useState(false) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { data: currentLotteryId } = useQuery({ queryKey: ['currentLotteryId'], queryFn: fetchCurrentLotteryId, @@ -46,10 +46,10 @@ const LotteryCardContent = () => { refetchOnWindowFocus: false, }) - const cakePrizesText = t('%cakePrizeInUsd% in CAKE prizes this round', { cakePrizeInUsd: cakePriceBusd.toString() }) - const [pretext, prizesThisRound] = cakePrizesText.split(cakePriceBusd.toString()) + const cakePrizesText = t('%cakePrizeInUsd% in CAKE prizes this round', { cakePrizeInUsd: cakePrice.toString() }) + const [pretext, prizesThisRound] = cakePrizesText.split(cakePrice.toString()) const amountCollectedInCake = currentLottery ? parseFloat(currentLottery.amountCollectedInCake) : null - const currentLotteryPrize = amountCollectedInCake ? cakePriceBusd.times(amountCollectedInCake) : null + const currentLotteryPrize = amountCollectedInCake ? cakePrice.times(amountCollectedInCake) : null useEffect(() => { if (isIntersecting) { diff --git a/apps/web/src/views/Home/components/UserBanner/HarvestCard.tsx b/apps/web/src/views/Home/components/UserBanner/HarvestCard.tsx index 86f3a49835ba2..2f451292eeb55 100644 --- a/apps/web/src/views/Home/components/UserBanner/HarvestCard.tsx +++ b/apps/web/src/views/Home/components/UserBanner/HarvestCard.tsx @@ -51,11 +51,11 @@ const HarvestCard: React.FC> = ({ onHa const { fetchWithCatchTxError, loading: v2PendingTx } = useCatchTxError() const { farmsWithStakedBalance, earningsSum: farmEarningsSum } = useFarmsWithBalance() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const masterChefAddress = useMasterchef() const { isMobile } = useMatchBreakpoints() const gasPrice = useGasPrice() - const earningsBusd = new BigNumber(farmEarningsSum).multipliedBy(cakePriceBusd) + const earningsBusd = new BigNumber(farmEarningsSum).multipliedBy(cakePrice) const numTotalToCollect = farmsWithStakedBalance.length const numFarmsToCollect = farmsWithStakedBalance.filter( (value) => (value && 'pid' in value && value.pid !== 0) || (value && 'sendTx' in value && value.sendTx !== null), diff --git a/apps/web/src/views/Home/hooks/useGetTopFarmsByApr.tsx b/apps/web/src/views/Home/hooks/useGetTopFarmsByApr.tsx index a085c68cd251b..1d1cc3e1675e5 100644 --- a/apps/web/src/views/Home/hooks/useGetTopFarmsByApr.tsx +++ b/apps/web/src/views/Home/hooks/useGetTopFarmsByApr.tsx @@ -23,7 +23,7 @@ const useGetTopFarmsByApr = (isIntersecting: boolean) => { version: 2 | 3 } | null)[] >(() => [null, null, null, null, null]) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { chainId } = useActiveChainId() const { status: fetchStatus, isFetching } = useQuery({ @@ -77,7 +77,7 @@ const useGetTopFarmsByApr = (isIntersecting: boolean) => { const { cakeRewardsApr, lpRewardsApr } = getFarmApr( chainId, farm.poolWeight, - cakePriceBusd, + cakePrice, totalLiquidity, farm.lpAddress, regularCakePerBlock, @@ -102,7 +102,7 @@ const useGetTopFarmsByApr = (isIntersecting: boolean) => { ) setTopFarms(sortedByApr.slice(0, 5)) } - }, [cakePriceBusd, chainId, farms, farmsV3.farmsWithPrice, fetchStatus, isLoading, regularCakePerBlock, farmsV3Aprs]) + }, [cakePrice, chainId, farms, farmsV3.farmsWithPrice, fetchStatus, isLoading, regularCakePerBlock, farmsV3Aprs]) return { topFarms, fetched: fetchStatus === 'success' && !isFetching, chainId } } diff --git a/apps/web/src/views/Ifos/hooks/v2/useGetPublicIfoData.ts b/apps/web/src/views/Ifos/hooks/v2/useGetPublicIfoData.ts index 591d0c21eb84c..4f8e116299aeb 100644 --- a/apps/web/src/views/Ifos/hooks/v2/useGetPublicIfoData.ts +++ b/apps/web/src/views/Ifos/hooks/v2/useGetPublicIfoData.ts @@ -31,9 +31,9 @@ const formatPool = (pool) => ({ */ const useGetPublicIfoData = (ifo: Ifo): PublicIfoData => { const { address } = ifo - const cakePriceUsd = useCakePrice() + const cakePrice = useCakePrice() const lpTokenPriceInUsd = useLpTokenPrice(ifo.currency.symbol) - const currencyPriceInUSD = ifo.currency === bscTokens.cake ? cakePriceUsd : lpTokenPriceInUsd + const currencyPriceInUSD = ifo.currency === bscTokens.cake ? cakePrice : lpTokenPriceInUsd const [state, setState] = useState({ isInitialized: false, diff --git a/apps/web/src/views/Ifos/hooks/v3/useGetPublicIfoData.ts b/apps/web/src/views/Ifos/hooks/v3/useGetPublicIfoData.ts index 4d902a5219be6..08e6b9993e537 100644 --- a/apps/web/src/views/Ifos/hooks/v3/useGetPublicIfoData.ts +++ b/apps/web/src/views/Ifos/hooks/v3/useGetPublicIfoData.ts @@ -44,9 +44,9 @@ const ROUND_DIGIT = 3 */ const useGetPublicIfoData = (ifo: Ifo): PublicIfoData => { const { address, plannedStartTime } = ifo - const cakePriceUsd = useCakePrice() + const cakePrice = useCakePrice() const lpTokenPriceInUsd = useLpTokenPrice(ifo.currency.symbol) - const currencyPriceInUSD = ifo.currency === bscTokens.cake ? cakePriceUsd : lpTokenPriceInUsd + const currencyPriceInUSD = ifo.currency === bscTokens.cake ? cakePrice : lpTokenPriceInUsd const [state, setState] = useState({ isInitialized: false, diff --git a/apps/web/src/views/Ifos/hooks/v7/useGetPublicIfoData.ts b/apps/web/src/views/Ifos/hooks/v7/useGetPublicIfoData.ts index 0414f9ac11bd0..143b7801673a2 100644 --- a/apps/web/src/views/Ifos/hooks/v7/useGetPublicIfoData.ts +++ b/apps/web/src/views/Ifos/hooks/v7/useGetPublicIfoData.ts @@ -99,9 +99,9 @@ const useGetPublicIfoData = (ifo: Ifo): PublicIfoData => { const { address: account } = useAccount() const { chainId } = ifo const { address, plannedStartTime } = ifo - const cakePriceUsd = useCakePrice() + const cakePrice = useCakePrice() const lpTokenPriceInUsd = useLpTokenPrice(ifo.currency.symbol) - const currencyPriceInUSD = ifo.currency === CAKE[ifo.chainId] ? cakePriceUsd : lpTokenPriceInUsd + const currencyPriceInUSD = ifo.currency === CAKE[ifo.chainId] ? cakePrice : lpTokenPriceInUsd const [state, setState] = useState(INITIAL_STATE) diff --git a/apps/web/src/views/Ifos/hooks/v8/useGetPublicIfoData.ts b/apps/web/src/views/Ifos/hooks/v8/useGetPublicIfoData.ts index 87b85bc972b81..720dd559ce407 100644 --- a/apps/web/src/views/Ifos/hooks/v8/useGetPublicIfoData.ts +++ b/apps/web/src/views/Ifos/hooks/v8/useGetPublicIfoData.ts @@ -99,9 +99,9 @@ const useGetPublicIfoData = (ifo: Ifo): PublicIfoData => { const { address: account } = useAccount() const { chainId } = ifo const { address, plannedStartTime } = ifo - const cakePriceUsd = useCakePrice() + const cakePrice = useCakePrice() const lpTokenPriceInUsd = useLpTokenPrice(ifo.currency.symbol) - const currencyPriceInUSD = ifo.currency === CAKE[ifo.chainId] ? cakePriceUsd : lpTokenPriceInUsd + const currencyPriceInUSD = ifo.currency === CAKE[ifo.chainId] ? cakePrice : lpTokenPriceInUsd const [state, setState] = useState(INITIAL_STATE) diff --git a/apps/web/src/views/Lottery/components/BuyTicketsModal/BuyTicketsModal.tsx b/apps/web/src/views/Lottery/components/BuyTicketsModal/BuyTicketsModal.tsx index e0ccb65c60ba8..36bd494deb94b 100644 --- a/apps/web/src/views/Lottery/components/BuyTicketsModal/BuyTicketsModal.tsx +++ b/apps/web/src/views/Lottery/components/BuyTicketsModal/BuyTicketsModal.tsx @@ -86,7 +86,7 @@ const BuyTicketsModal: React.FC> = const stringifiedUserCake = userCake.toJSON() const memoisedUserCake = useMemo(() => new BigNumber(stringifiedUserCake), [stringifiedUserCake]) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const dispatch = useAppDispatch() const hasFetchedBalance = fetchStatus === FetchStatus.Fetched const userCakeDisplayBalance = getFullDisplayBalance(userCake, 18, 3) @@ -321,7 +321,7 @@ const BuyTicketsModal: React.FC> = value={ticketsToBuy} onUserInput={handleInputChange} currencyValue={ - cakePriceBusd.gt(0) && + cakePrice.gt(0) && `~${ticketsToBuy ? getFullDisplayBalance(priceTicketInCake.times(new BigNumber(ticketsToBuy))) : '0.00'} CAKE` } /> diff --git a/apps/web/src/views/Lottery/components/ClaimPrizesModal/ClaimPrizesInner.tsx b/apps/web/src/views/Lottery/components/ClaimPrizesModal/ClaimPrizesInner.tsx index c8a21876615af..1513095c780ac 100644 --- a/apps/web/src/views/Lottery/components/ClaimPrizesModal/ClaimPrizesInner.tsx +++ b/apps/web/src/views/Lottery/components/ClaimPrizesModal/ClaimPrizesInner.tsx @@ -37,9 +37,9 @@ const ClaimInnerContainer: React.FC> = const lotteryContract = useLotteryV2Contract() const activeClaimData = roundsToClaim[activeClaimIndex] - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const cakeReward = activeClaimData.cakeTotal - const dollarReward = cakeReward.times(cakePriceBusd) + const dollarReward = cakeReward.times(cakePrice) const rewardAsBalance = getBalanceAmount(cakeReward).toNumber() const dollarRewardAsBalance = getBalanceAmount(dollarReward).toNumber() diff --git a/apps/web/src/views/Lottery/components/Hero.tsx b/apps/web/src/views/Lottery/components/Hero.tsx index 43dcb9edb6af8..db6a44f3d7c52 100644 --- a/apps/web/src/views/Lottery/components/Hero.tsx +++ b/apps/web/src/views/Lottery/components/Hero.tsx @@ -217,8 +217,8 @@ const Hero = () => { isTransitioning, } = useLottery() - const cakePriceBusd = useCakePrice() - const prizeInBusd = amountCollectedInCake.times(cakePriceBusd) + const cakePrice = useCakePrice() + const prizeInBusd = amountCollectedInCake.times(cakePrice) const prizeTotal = getBalanceNumber(prizeInBusd) const ticketBuyIsDisabled = status !== LotteryStatus.OPEN || isTransitioning diff --git a/apps/web/src/views/Lottery/components/NextDrawCard.tsx b/apps/web/src/views/Lottery/components/NextDrawCard.tsx index 23dc0e0379ab2..8aa19541b1f11 100644 --- a/apps/web/src/views/Lottery/components/NextDrawCard.tsx +++ b/apps/web/src/views/Lottery/components/NextDrawCard.tsx @@ -66,8 +66,8 @@ const NextDrawCard = () => { const [isExpanded, setIsExpanded] = useState(false) const ticketBuyIsDisabled = status !== LotteryStatus.OPEN || isTransitioning - const cakePriceBusd = useCakePrice() - const prizeInBusd = amountCollectedInCake.times(cakePriceBusd) + const cakePrice = useCakePrice() + const prizeInBusd = amountCollectedInCake.times(cakePrice) const endTimeMs = parseInt(endTime, 10) * 1000 const endDate = new Date(endTimeMs) const isLotteryOpen = status === LotteryStatus.OPEN diff --git a/apps/web/src/views/Lottery/components/PreviousRoundCard/FooterExpanded.tsx b/apps/web/src/views/Lottery/components/PreviousRoundCard/FooterExpanded.tsx index d4829400f8116..562139ac13114 100644 --- a/apps/web/src/views/Lottery/components/PreviousRoundCard/FooterExpanded.tsx +++ b/apps/web/src/views/Lottery/components/PreviousRoundCard/FooterExpanded.tsx @@ -26,7 +26,7 @@ const PreviousRoundCardFooter: React.FC< const { t } = useTranslation() const [fetchedLotteryGraphData, setFetchedLotteryGraphData] = useState() const lotteryGraphDataFromState = useGetLotteryGraphDataById(lotteryId) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() useEffect(() => { if (!lotteryId) return @@ -43,7 +43,7 @@ const PreviousRoundCardFooter: React.FC< let prizeInBusd = new BigNumber(NaN) if (lotteryNodeData) { const { amountCollectedInCake } = lotteryNodeData - prizeInBusd = amountCollectedInCake.times(cakePriceBusd) + prizeInBusd = amountCollectedInCake.times(cakePrice) } const getTotalUsers = (): string | null => { diff --git a/apps/web/src/views/Lottery/components/RewardBracketDetail.tsx b/apps/web/src/views/Lottery/components/RewardBracketDetail.tsx index 9b38224a628ab..71ade43a64d17 100644 --- a/apps/web/src/views/Lottery/components/RewardBracketDetail.tsx +++ b/apps/web/src/views/Lottery/components/RewardBracketDetail.tsx @@ -22,7 +22,7 @@ const RewardBracketDetail: React.FC { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const getRewardText = () => { const numberMatch = rewardBracket + 1 @@ -59,7 +59,7 @@ const RewardBracketDetail: React.FC )} diff --git a/apps/web/src/views/Pools/components/CakeVaultCard/RecentCakeProfitRow.tsx b/apps/web/src/views/Pools/components/CakeVaultCard/RecentCakeProfitRow.tsx index baef708a625f0..9afa5b040dd63 100644 --- a/apps/web/src/views/Pools/components/CakeVaultCard/RecentCakeProfitRow.tsx +++ b/apps/web/src/views/Pools/components/CakeVaultCard/RecentCakeProfitRow.tsx @@ -15,13 +15,13 @@ const RecentCakeProfitCountdownRow = ({ pool }: { pool: Pool.DeserializedPool> = const { stakingToken } = pool const { t } = useTranslation() - const cakePriceBusd = useCakePrice() - const stakedDollarValue = cakePriceBusd.gt(0) - ? getBalanceNumber(cakeAsBigNumber?.multipliedBy(cakePriceBusd), stakingToken.decimals) + const cakePrice = useCakePrice() + const stakedDollarValue = cakePrice.gt(0) + ? getBalanceNumber(cakeAsBigNumber?.multipliedBy(cakePrice), stakingToken.decimals) : 0 const [onPresentTokenRequired] = useModal() @@ -68,7 +68,7 @@ const HasSharesActions: React.FC> = - {cakePriceBusd.gt(0) ? ( + {cakePrice.gt(0) ? ( > = const [percent, setPercent] = useState(0) const [showRoiCalculator, setShowRoiCalculator] = useState(false) const { hasUnstakingFee } = useWithdrawalFeeTimer(parseInt(lastDepositedTime || '0', 10), userShares || BIG_ZERO) - const cakePriceBusd = useCakePrice() - const usdValueStaked = new BigNumber(stakeAmount).times(cakePriceBusd) - const formattedUsdValueStaked = cakePriceBusd.gt(0) && stakeAmount ? formatNumber(usdValueStaked.toNumber()) : '' + const cakePrice = useCakePrice() + const usdValueStaked = new BigNumber(stakeAmount).times(cakePrice) + const formattedUsdValueStaked = cakePrice.gt(0) && stakeAmount ? formatNumber(usdValueStaked.toNumber()) : '' const { flexibleApy } = useVaultApy() const { allowance, setLastUpdated } = useCheckVaultApprovalStatus(vaultKey) const { handleApprove: handleCakeApprove, pendingTx: cakePendingTx } = useVaultApprove(vaultKey, setLastUpdated) @@ -263,7 +263,7 @@ const VaultStakeModal: React.FC> = value={stakeAmount} isWarning={needEnable} onUserInput={handleStakeInputChange} - currencyValue={cakePriceBusd.gt(0) && `~${formattedUsdValueStaked || 0} USD`} + currencyValue={cakePrice.gt(0) && `~${formattedUsdValueStaked || 0} USD`} decimals={stakingToken.decimals} /> {needEnable && ( diff --git a/apps/web/src/views/Pools/components/RevenueSharing/BenefitsModal/RevenueSharing.tsx b/apps/web/src/views/Pools/components/RevenueSharing/BenefitsModal/RevenueSharing.tsx index 3686aaa799b1f..58e328fd67d0b 100644 --- a/apps/web/src/views/Pools/components/RevenueSharing/BenefitsModal/RevenueSharing.tsx +++ b/apps/web/src/views/Pools/components/RevenueSharing/BenefitsModal/RevenueSharing.tsx @@ -21,15 +21,15 @@ const RevenueSharing: React.FunctionComponent getBalanceAmount(new BigNumber(availableClaim)).toNumber(), [availableClaim]) const availableCakeUsdValue = useMemo( - () => new BigNumber(availableCake).times(cakePriceBusd).toNumber(), - [availableCake, cakePriceBusd], + () => new BigNumber(availableCake).times(cakePrice).toNumber(), + [availableCake, cakePrice], ) const showNoCakeAmountWarning = useMemo( diff --git a/apps/web/src/views/Pottery/components/Banner/index.tsx b/apps/web/src/views/Pottery/components/Banner/index.tsx index 9ae6aa6a11f0a..01fdb89371f39 100644 --- a/apps/web/src/views/Pottery/components/Banner/index.tsx +++ b/apps/web/src/views/Pottery/components/Banner/index.tsx @@ -70,11 +70,11 @@ interface BannerProps { const Banner: React.FC> = ({ handleScroll }) => { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { publicData } = usePotteryData() const { getLockedApy } = useVaultApy() - const prizeInBusd = publicData.totalPrize.times(cakePriceBusd) + const prizeInBusd = publicData.totalPrize.times(cakePrice) const prizeTotal = getBalanceNumber(prizeInBusd) const apy = useMemo(() => Number(getLockedApy(weeksToSeconds(10))), [getLockedApy]) diff --git a/apps/web/src/views/Pottery/components/FinishedRounds/AllHistoryCard/PreviousRoundCardBody.tsx b/apps/web/src/views/Pottery/components/FinishedRounds/AllHistoryCard/PreviousRoundCardBody.tsx index 2d08b4e93b647..f9c46790ad35d 100644 --- a/apps/web/src/views/Pottery/components/FinishedRounds/AllHistoryCard/PreviousRoundCardBody.tsx +++ b/apps/web/src/views/Pottery/components/FinishedRounds/AllHistoryCard/PreviousRoundCardBody.tsx @@ -58,11 +58,11 @@ const PreviousRoundCardBody: React.FC latestRoundId && new BigNumber(latestRoundId).minus(1).eq(roundId), diff --git a/apps/web/src/views/Pottery/components/Pot/Claim/AvailableWithdraw.tsx b/apps/web/src/views/Pottery/components/Pot/Claim/AvailableWithdraw.tsx index 5a0bbc2f47540..e1a75646348ea 100644 --- a/apps/web/src/views/Pottery/components/Pot/Claim/AvailableWithdraw.tsx +++ b/apps/web/src/views/Pottery/components/Pot/Claim/AvailableWithdraw.tsx @@ -19,7 +19,7 @@ const AvailableWithdraw: React.FC getDrawnDate(locale, lockedDate?.toString()), [lockedDate, locale]) const withdrawableDate = dayjs.unix(parseInt(lockedDate, 10)).add(70, 'days').unix() diff --git a/apps/web/src/views/Pottery/components/Pot/Claim/PrizeToBeClaimed.tsx b/apps/web/src/views/Pottery/components/Pot/Claim/PrizeToBeClaimed.tsx index 016afd9122049..e1c868a6f8795 100644 --- a/apps/web/src/views/Pottery/components/Pot/Claim/PrizeToBeClaimed.tsx +++ b/apps/web/src/views/Pottery/components/Pot/Claim/PrizeToBeClaimed.tsx @@ -12,10 +12,10 @@ interface PrizeToBeClaimedProps { const PrizeToBeClaimed: React.FC> = ({ userData }) => { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const rewardToken = getBalanceNumber(userData.rewards) - const rewardInBusd = new BigNumber(rewardToken).times(cakePriceBusd).toNumber() + const rewardInBusd = new BigNumber(rewardToken).times(cakePrice).toNumber() return ( diff --git a/apps/web/src/views/Pottery/components/Pot/YourDeposit.tsx b/apps/web/src/views/Pottery/components/Pot/YourDeposit.tsx index 795fe94f0b8df..fbcce9d9a2691 100644 --- a/apps/web/src/views/Pottery/components/Pot/YourDeposit.tsx +++ b/apps/web/src/views/Pottery/components/Pot/YourDeposit.tsx @@ -13,10 +13,10 @@ interface YourDepositProps { const YourDeposit: React.FC> = ({ depositBalance }) => { const { t } = useTranslation() const { address: account } = useAccount() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { userData } = usePotteryData() const totalDepositBalance = getBalanceAmount(depositBalance).toNumber() - const balanceInBusd = new BigNumber(totalDepositBalance).times(cakePriceBusd).toNumber() + const balanceInBusd = new BigNumber(totalDepositBalance).times(cakePrice).toNumber() return ( diff --git a/apps/web/src/views/Pottery/components/Pot/index.tsx b/apps/web/src/views/Pottery/components/Pot/index.tsx index 4a3466b1ee921..9548565aedd71 100644 --- a/apps/web/src/views/Pottery/components/Pot/index.tsx +++ b/apps/web/src/views/Pottery/components/Pot/index.tsx @@ -66,14 +66,14 @@ const BalanceStyle = styled(Balance)` const Pot: React.FC = () => { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { isMobile } = useMatchBreakpoints() const { publicData } = usePotteryData() const [activeTab, setIndex] = useState(POT_CATEGORY.Deposit) const handleClick = useCallback((tabType: POT_CATEGORY) => setIndex(tabType), []) - const prizeInBusd = publicData.totalPrize.times(cakePriceBusd) + const prizeInBusd = publicData.totalPrize.times(cakePrice) const prizeTotal = getBalanceNumber(prizeInBusd) const tabMenuItems = useMemo(() => { diff --git a/apps/web/src/views/TradingCompetition/helpers.ts b/apps/web/src/views/TradingCompetition/helpers.ts index 2a0d1c98e5b79..ae377d2339e8b 100644 --- a/apps/web/src/views/TradingCompetition/helpers.ts +++ b/apps/web/src/views/TradingCompetition/helpers.ts @@ -13,10 +13,10 @@ export const localiseTradingVolume = (value?: number, decimals = 0) => { export const useCompetitionCakeRewards = (userCakeReward: string | number) => { const cakeAsBigNumber = new BigNumber(userCakeReward as string) const cakeBalance = getBalanceNumber(cakeAsBigNumber) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() return { cakeReward: cakeBalance, - dollarValueOfCakeReward: cakePriceBusd.multipliedBy(cakeBalance).toNumber(), + dollarValueOfCakeReward: cakePrice.multipliedBy(cakeBalance).toNumber(), } } @@ -42,11 +42,11 @@ export const useFanTokenCompetitionRewards = ({ const lazioBalance = getBalanceNumber(lazioAsBigNumber, 8) const portoBalance = getBalanceNumber(portoAsBigNumber, 8) const santosBalance = getBalanceNumber(santosAsBigNumber, 8) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const dollarValueOfTokensReward = - cakePriceBusd && lazioPriceBUSD && portoPriceBUSD && santosPriceBUSD - ? cakePriceBusd.multipliedBy(cakeBalance).toNumber() + + cakePrice && lazioPriceBUSD && portoPriceBUSD && santosPriceBUSD + ? cakePrice.multipliedBy(cakeBalance).toNumber() + multiplyPriceByAmount(lazioPriceBUSD, lazioBalance, 8) + multiplyPriceByAmount(portoPriceBUSD, portoBalance, 8) + multiplyPriceByAmount(santosPriceBUSD, santosBalance, 8) @@ -73,11 +73,11 @@ export const useMoboxCompetitionRewards = ({ const moboxAsBigNumber = userMoboxRewards ? new BigNumber(userMoboxRewards) : new BigNumber(0) const cakeBalance = getBalanceNumber(cakeAsBigNumber) const moboxBalance = getBalanceNumber(moboxAsBigNumber) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const dollarValueOfTokensReward = - cakePriceBusd && moboxPriceBUSD - ? cakePriceBusd.multipliedBy(cakeBalance).toNumber() + multiplyPriceByAmount(moboxPriceBUSD, moboxBalance, 8) + cakePrice && moboxPriceBUSD + ? cakePrice.multipliedBy(cakeBalance).toNumber() + multiplyPriceByAmount(moboxPriceBUSD, moboxBalance, 8) : null return { @@ -99,11 +99,11 @@ export const useModCompetitionRewards = ({ const darAsBigNumber = userDarRewards ? new BigNumber(userDarRewards) : new BigNumber(0) const cakeBalance = getBalanceNumber(cakeAsBigNumber) const darBalance = getBalanceNumber(darAsBigNumber, bscTokens.dar.decimals) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const dollarValueOfTokensReward = - cakePriceBusd && darPriceBUSD - ? cakePriceBusd.multipliedBy(cakeBalance).toNumber() + + cakePrice && darPriceBUSD + ? cakePrice.multipliedBy(cakeBalance).toNumber() + multiplyPriceByAmount(darPriceBUSD, darBalance, bscTokens.dar.decimals) : null diff --git a/apps/web/src/views/TradingReward/components/CurrentRewardPool.tsx b/apps/web/src/views/TradingReward/components/CurrentRewardPool.tsx index ca1410f5dcca1..1dc6cbbba1587 100644 --- a/apps/web/src/views/TradingReward/components/CurrentRewardPool.tsx +++ b/apps/web/src/views/TradingReward/components/CurrentRewardPool.tsx @@ -95,7 +95,7 @@ const CurrentRewardPool: React.FC> = ({ rank }) => { - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { profile, isLoading: isProfileLoading } = useProfileForAddress(rank.origin) const { domainName, avatar } = useDomainNameForAddress(rank.origin, !profile && !isProfileLoading) const cakeAmount = useMemo( - () => new BigNumber(rank?.estimateRewardUSD).div(cakePriceBusd).toNumber(), - [cakePriceBusd, rank?.estimateRewardUSD], + () => new BigNumber(rank?.estimateRewardUSD).div(cakePrice).toNumber(), + [cakePrice, rank?.estimateRewardUSD], ) return ( diff --git a/apps/web/src/views/TradingReward/components/Leaderboard/MobileResult.tsx b/apps/web/src/views/TradingReward/components/Leaderboard/MobileResult.tsx index 117c700aba55b..87c17b30463b8 100644 --- a/apps/web/src/views/TradingReward/components/Leaderboard/MobileResult.tsx +++ b/apps/web/src/views/TradingReward/components/Leaderboard/MobileResult.tsx @@ -26,13 +26,13 @@ interface MobileResultProps { const MobileResult: React.FC> = ({ isMyRank, rank }) => { const { t } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { profile, isLoading: isProfileLoading } = useProfileForAddress(rank.origin) const { domainName, avatar } = useDomainNameForAddress(rank.origin, !profile && !isProfileLoading) const cakeAmount = useMemo( - () => new BigNumber(rank?.estimateRewardUSD).div(cakePriceBusd).toNumber(), - [cakePriceBusd, rank?.estimateRewardUSD], + () => new BigNumber(rank?.estimateRewardUSD).div(cakePrice).toNumber(), + [cakePrice, rank?.estimateRewardUSD], ) return ( diff --git a/apps/web/src/views/TradingReward/components/Leaderboard/RankingCard.tsx b/apps/web/src/views/TradingReward/components/Leaderboard/RankingCard.tsx index a636cfd781988..fe2b5ad14a39a 100644 --- a/apps/web/src/views/TradingReward/components/Leaderboard/RankingCard.tsx +++ b/apps/web/src/views/TradingReward/components/Leaderboard/RankingCard.tsx @@ -51,13 +51,13 @@ const getRankingColor = (rank: number) => { const RankingCard: React.FC> = ({ rank, user }) => { const { t } = useTranslation() const rankColor = getRankingColor(rank) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { profile, isLoading: isProfileLoading } = useProfileForAddress(user?.origin) const { domainName, avatar } = useDomainNameForAddress(user?.origin, !profile && !isProfileLoading) const cakeAmount = useMemo( - () => new BigNumber(user?.estimateRewardUSD).div(cakePriceBusd).toNumber() ?? 0, - [cakePriceBusd, user?.estimateRewardUSD], + () => new BigNumber(user?.estimateRewardUSD).div(cakePrice).toNumber() ?? 0, + [cakePrice, user?.estimateRewardUSD], ) return ( diff --git a/apps/web/src/views/TradingReward/components/TopTraders/YourTradingReward/CurrentPeriod.tsx b/apps/web/src/views/TradingReward/components/TopTraders/YourTradingReward/CurrentPeriod.tsx index a4c69a6472225..a18f5a8e07623 100644 --- a/apps/web/src/views/TradingReward/components/TopTraders/YourTradingReward/CurrentPeriod.tsx +++ b/apps/web/src/views/TradingReward/components/TopTraders/YourTradingReward/CurrentPeriod.tsx @@ -41,7 +41,7 @@ const CurrentPeriod: React.FC> = ({ t, currentLanguage: { locale }, } = useTranslation() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { data: rank } = useUserTradeRank({ campaignId: currentUserCampaignInfo?.campaignId ?? '' }) const currentDate = Date.now() / 1000 @@ -65,7 +65,7 @@ const CurrentPeriod: React.FC> = ({ timeRemaining, totalEstimateRewardUSD: currentUserCampaignInfo?.totalEstimateRewardUSD ?? 0, totalReward: currentUserCampaignInfo?.canClaim ?? '0', - cakePriceBusd, + cakePrice, rewardPrice: currentRewardInfo?.rewardPrice ?? '0', rewardTokenDecimal: currentRewardInfo?.rewardTokenDecimal ?? 0, }) diff --git a/apps/web/src/views/TradingReward/components/YourTradingReward/QualifiedPreview.tsx b/apps/web/src/views/TradingReward/components/YourTradingReward/QualifiedPreview.tsx index 22d58a6760725..c83e16423f66a 100644 --- a/apps/web/src/views/TradingReward/components/YourTradingReward/QualifiedPreview.tsx +++ b/apps/web/src/views/TradingReward/components/YourTradingReward/QualifiedPreview.tsx @@ -53,7 +53,7 @@ const QualifiedPreview: React.FC> const timeUntil = getTimePeriods(timeRemaining) - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const rewardInUSD = useRewardInUSD({ timeRemaining, @@ -67,7 +67,7 @@ const QualifiedPreview: React.FC> timeRemaining, totalEstimateRewardUSD: currentUserCampaignInfo?.totalEstimateRewardUSD ?? 0, totalReward: currentUserCampaignInfo?.canClaim ?? '0', - cakePriceBusd, + cakePrice, rewardPrice: currentRewardInfo?.rewardPrice ?? '0', rewardTokenDecimal: currentRewardInfo?.rewardTokenDecimal ?? 0, }) @@ -79,8 +79,8 @@ const QualifiedPreview: React.FC> ) const totalMapCapCovertCakeAmount = useMemo( - () => new BigNumber(totalMapCap).dividedBy(cakePriceBusd).toNumber() ?? 0, - [totalMapCap, cakePriceBusd], + () => new BigNumber(totalMapCap).dividedBy(cakePrice).toNumber() ?? 0, + [totalMapCap, cakePrice], ) const additionalAmount = useMemo(() => { diff --git a/apps/web/src/views/TradingReward/components/YourTradingReward/VeCake/VeCakePreview.tsx b/apps/web/src/views/TradingReward/components/YourTradingReward/VeCake/VeCakePreview.tsx index d72f9ac07b199..6824a7fad2bbe 100644 --- a/apps/web/src/views/TradingReward/components/YourTradingReward/VeCake/VeCakePreview.tsx +++ b/apps/web/src/views/TradingReward/components/YourTradingReward/VeCake/VeCakePreview.tsx @@ -38,7 +38,7 @@ export const VeCakePreview: React.FC }) => { const { t } = useTranslation() const router = useRouter() - const cakePriceBusd = useCakePrice() + const cakePrice = useCakePrice() const { status, cakeLockExpired, cakeLocked } = useCakeLockStatus() const timeUntil = getTimePeriods(timeRemaining) @@ -72,7 +72,7 @@ export const VeCakePreview: React.FC timeRemaining, totalEstimateRewardUSD: currentUserCampaignInfo?.totalEstimateRewardUSD ?? 0, totalReward: currentUserCampaignInfo?.canClaim ?? '0', - cakePriceBusd, + cakePrice, rewardPrice: currentRewardInfo?.rewardPrice ?? '0', rewardTokenDecimal: currentRewardInfo?.rewardTokenDecimal ?? 0, }) diff --git a/apps/web/src/views/TradingReward/hooks/useRewardInCake.tsx b/apps/web/src/views/TradingReward/hooks/useRewardInCake.tsx index 67d8ca575fb63..5f67b60dca2e1 100644 --- a/apps/web/src/views/TradingReward/hooks/useRewardInCake.tsx +++ b/apps/web/src/views/TradingReward/hooks/useRewardInCake.tsx @@ -5,7 +5,7 @@ interface UseRewardInCakeProps { timeRemaining: number totalEstimateRewardUSD: number totalReward: string - cakePriceBusd: BigNumber + cakePrice: BigNumber rewardPrice: string rewardTokenDecimal: number } @@ -14,7 +14,7 @@ const useRewardInCake = ({ timeRemaining, totalEstimateRewardUSD, totalReward, - cakePriceBusd, + cakePrice, rewardPrice, rewardTokenDecimal = 18, }: UseRewardInCakeProps) => { @@ -23,7 +23,7 @@ const useRewardInCake = ({ const rewardCakePrice = getBalanceAmount(new BigNumber(rewardPrice ?? '0'), rewardTokenDecimal ?? 0) const totalCakeReward = reward.div(rewardCakePrice).isNaN() ? 0 : reward.div(rewardCakePrice).toNumber() - return timeRemaining > 0 ? estimateRewardUSD.div(cakePriceBusd).toNumber() : totalCakeReward + return timeRemaining > 0 ? estimateRewardUSD.div(cakePrice).toNumber() : totalCakeReward } export default useRewardInCake