From e2cd27a7d0a521c18987a45cd0defd79c79d0179 Mon Sep 17 00:00:00 2001 From: MartinGbz Date: Fri, 3 Jan 2025 17:15:16 +0100 Subject: [PATCH 1/9] feat: put the merit button directly in the IncentivesCard --- src/components/incentives/IncentivesCard.tsx | 28 ++++++- .../BorrowAssetsListMobileItem.tsx | 22 ++---- .../BorrowedPositionsListItem.tsx | 22 ++---- src/modules/dashboard/lists/ListAPRColumn.tsx | 10 ++- .../SuppliedPositionsListMobileItem.tsx | 22 ++---- .../SupplyAssetsList/SupplyAssetsListItem.tsx | 22 ++---- .../SupplyAssetsListMobileItem.tsx | 22 ++---- src/modules/markets/MarketAssetsListItem.tsx | 7 -- .../markets/MarketAssetsListMobileItem.tsx | 77 ++++++++----------- src/modules/migration/MigrationListItem.tsx | 2 + .../migration/MigrationListMobileItem.tsx | 2 + 11 files changed, 108 insertions(+), 128 deletions(-) diff --git a/src/components/incentives/IncentivesCard.tsx b/src/components/incentives/IncentivesCard.tsx index 4b32d926a7..a055c5927b 100644 --- a/src/components/incentives/IncentivesCard.tsx +++ b/src/components/incentives/IncentivesCard.tsx @@ -1,10 +1,11 @@ +import { ProtocolAction } from '@aave/contract-helpers'; import { ReserveIncentiveResponse } from '@aave/math-utils/dist/esm/formatters/incentive/calculate-reserve-incentives'; -import { Box } from '@mui/material'; +import { Box, useMediaQuery } from '@mui/material'; import { ReactNode } from 'react'; import { FormattedNumber } from '../primitives/FormattedNumber'; import { NoData } from '../primitives/NoData'; -import { IncentivesButton } from './IncentivesButton'; +import { IncentivesButton, MeritIncentivesButton } from './IncentivesButton'; interface IncentivesCardProps { symbol: string; @@ -15,6 +16,8 @@ interface IncentivesCardProps { align?: 'center' | 'flex-end'; color?: string; tooltip?: ReactNode; + market: string; + protocolAction?: ProtocolAction; } export const IncentivesCard = ({ @@ -26,7 +29,10 @@ export const IncentivesCard = ({ align, color, tooltip, + market, + protocolAction, }: IncentivesCardProps) => { + const isTableChangedToCards = useMediaQuery('(max-width:1125px)'); return ( )} - - + + + + ); }; diff --git a/src/modules/dashboard/lists/BorrowAssetsList/BorrowAssetsListMobileItem.tsx b/src/modules/dashboard/lists/BorrowAssetsList/BorrowAssetsListMobileItem.tsx index 592b8da2b7..1cbe8e7d8e 100644 --- a/src/modules/dashboard/lists/BorrowAssetsList/BorrowAssetsListMobileItem.tsx +++ b/src/modules/dashboard/lists/BorrowAssetsList/BorrowAssetsListMobileItem.tsx @@ -1,7 +1,6 @@ import { ProtocolAction } from '@aave/contract-helpers'; import { Trans } from '@lingui/macro'; import { Box, Button } from '@mui/material'; -import { MeritIncentivesButton } from 'src/components/incentives/IncentivesButton'; import { VariableAPYTooltip } from 'src/components/infoTooltips/VariableAPYTooltip'; import { useRootStore } from 'src/store/root'; import { DashboardReserve } from 'src/utils/dashboardSortUtils'; @@ -73,19 +72,14 @@ export const BorrowAssetsListMobileItem = ({ captionVariant="description" mb={2} > - - - - +