From 1771bb08d642b65ce71e42c17e5c0aeb70c84a86 Mon Sep 17 00:00:00 2001 From: Andrew Schmidt Date: Thu, 13 Oct 2022 20:17:32 -0500 Subject: [PATCH] fix: use correct aave price on amm market --- .../transactions/ClaimRewards/ClaimRewardsModalContent.tsx | 5 +++-- src/modules/dashboard/DashboardTopPanel.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/transactions/ClaimRewards/ClaimRewardsModalContent.tsx b/src/components/transactions/ClaimRewards/ClaimRewardsModalContent.tsx index 28d9cf1667..a9020a028d 100644 --- a/src/components/transactions/ClaimRewards/ClaimRewardsModalContent.tsx +++ b/src/components/transactions/ClaimRewards/ClaimRewardsModalContent.tsx @@ -1,3 +1,4 @@ +import { ChainId } from '@aave/contract-helpers'; import { normalize, UserIncentiveData } from '@aave/math-utils'; import { Trans } from '@lingui/macro'; import { Box, Typography } from '@mui/material'; @@ -32,7 +33,7 @@ export enum ErrorType { export const ClaimRewardsModalContent = () => { const { gasLimit, mainTxState: claimRewardsTxState, txError } = useModalContext(); const { user, reserves } = useAppDataContext(); - const { currentChainId, currentMarketData, currentMarket } = useProtocolDataContext(); + const { currentChainId, currentMarketData } = useProtocolDataContext(); const { chainId: connectedChainId, watchModeOnlyAddress } = useWeb3Context(); const [claimableUsd, setClaimableUsd] = useState('0'); const [selectedRewardSymbol, setSelectedRewardSymbol] = useState('all'); @@ -53,7 +54,7 @@ export const ClaimRewardsModalContent = () => { let tokenPrice = 0; // getting price from reserves for the native rewards for v2 markets if (!currentMarketData.v3 && Number(rewardBalance) > 0) { - if (currentMarket === 'proto_mainnet') { + if (currentMarketData.chainId === ChainId.mainnet) { const aave = reserves.find((reserve) => reserve.symbol === 'AAVE'); tokenPrice = aave ? Number(aave.priceInUSD) : 0; } else { diff --git a/src/modules/dashboard/DashboardTopPanel.tsx b/src/modules/dashboard/DashboardTopPanel.tsx index e73e0dd3ba..f2691b954c 100644 --- a/src/modules/dashboard/DashboardTopPanel.tsx +++ b/src/modules/dashboard/DashboardTopPanel.tsx @@ -1,3 +1,4 @@ +import { ChainId } from '@aave/contract-helpers'; import { normalize, UserIncentiveData, valueToBigNumber } from '@aave/math-utils'; import { Trans } from '@lingui/macro'; import { Box, Button, useMediaQuery, useTheme } from '@mui/material'; @@ -27,7 +28,7 @@ import { useAppDataContext } from '../../hooks/app-data-provider/useAppDataProvi import { LiquidationRiskParametresInfoModal } from './LiquidationRiskParametresModal/LiquidationRiskParametresModal'; export const DashboardTopPanel = () => { - const { currentNetworkConfig, currentMarketData, currentMarket } = useProtocolDataContext(); + const { currentNetworkConfig, currentMarketData } = useProtocolDataContext(); const { user, reserves, loading } = useAppDataContext(); const { currentAccount } = useWeb3Context(); const [open, setOpen] = useState(false); @@ -44,7 +45,7 @@ export const DashboardTopPanel = () => { let tokenPrice = 0; // getting price from reserves for the native rewards for v2 markets if (!currentMarketData.v3 && Number(rewardBalance) > 0) { - if (currentMarket === 'proto_mainnet') { + if (currentMarketData.chainId === ChainId.mainnet) { const aave = reserves.find((reserve) => reserve.symbol === 'AAVE'); tokenPrice = aave ? Number(aave.priceInUSD) : 0; } else {