Skip to content

fix: amm market incentives display #1245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2022
Merged

fix: amm market incentives display #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/components/transactions/ClaimRewards/ClaimRewardsModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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<string>('all');
Expand 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 {
Expand Down
5 changes: 3 additions & 2 deletions src/modules/dashboard/DashboardTopPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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);
Expand All @@ -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 {
Expand Down