From faf5691bc2a0e18f9dd976f75792ae0436a2e5f2 Mon Sep 17 00:00:00 2001 From: Alejandro <95312462+AGMASO@users.noreply.github.com> Date: Sun, 22 Mar 2026 12:02:20 +0100 Subject: [PATCH 1/2] fix: api endpoint and logo --- src/components/incentives/IncentivesTooltipContent.tsx | 5 +++++ src/hooks/useMerklIncentives.ts | 2 +- src/hooks/useMerklPointsIncentives.ts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/incentives/IncentivesTooltipContent.tsx b/src/components/incentives/IncentivesTooltipContent.tsx index dddad64966..be650c01e7 100644 --- a/src/components/incentives/IncentivesTooltipContent.tsx +++ b/src/components/incentives/IncentivesTooltipContent.tsx @@ -218,6 +218,11 @@ const IncentivesSymbolMap: { symbol: 'awrsETH', aToken: true, }, + aPlaGHO: { + tokenIconSymbol: 'GHO', + symbol: 'aGHO', + aToken: true, + }, }; interface IncentivesTooltipContentProps { diff --git a/src/hooks/useMerklIncentives.ts b/src/hooks/useMerklIncentives.ts index 648c8f75ad..174527e842 100644 --- a/src/hooks/useMerklIncentives.ts +++ b/src/hooks/useMerklIncentives.ts @@ -144,7 +144,7 @@ type WhitelistApiResponse = { }; const MERKL_ENDPOINT = - 'https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave&items=100&status=LIVE'; // Merkl API + 'https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave&items=100&status=LIVE'; // Merkl API const WHITELIST_ENDPOINT = 'https://apps.aavechan.com/api/aave/merkl/whitelist-token-list'; // Endpoint to fetch whitelisted tokens const checkOpportunityAction = ( opportunityAction: OpportunityAction, diff --git a/src/hooks/useMerklPointsIncentives.ts b/src/hooks/useMerklPointsIncentives.ts index edf9bb8303..fb00ff2e49 100644 --- a/src/hooks/useMerklPointsIncentives.ts +++ b/src/hooks/useMerklPointsIncentives.ts @@ -31,7 +31,7 @@ type ReserveIncentiveAdditionalData = { // Normalize to lowercase for case-insensitive comparison const INK_POINT_TOKEN_ADDRESSES = ['0x40aBd730Cc9dA34a8EE9823fEaBDBa35E50c4ac7'.toLowerCase()]; const MERKL_TYDRO_ENDPOINT = - 'https://api-merkl.angle.money/v4/opportunities?mainProtocolId=tydro&chainName=ink&items=100&status=LIVE'; // Merkl API + 'https://api.merkl.xyz/v4/opportunities?mainProtocolId=tydro&chainName=ink&items=100&status=LIVE'; // Merkl API const checkOpportunityAction = ( opportunityAction: OpportunityAction, From 738dfb089042a12f56feb0cf972f6f13c73d90ec Mon Sep 17 00:00:00 2001 From: Alejandro <95312462+AGMASO@users.noreply.github.com> Date: Sun, 22 Mar 2026 12:21:45 +0100 Subject: [PATCH 2/2] feat: add rule to avoid displaying apy value beside badge --- src/components/incentives/IncentivesButton.tsx | 7 ++++++- src/components/incentives/IncentivesCard.tsx | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/incentives/IncentivesButton.tsx b/src/components/incentives/IncentivesButton.tsx index 66ba2d5bf6..5a8fdb2ba4 100644 --- a/src/components/incentives/IncentivesButton.tsx +++ b/src/components/incentives/IncentivesButton.tsx @@ -173,6 +173,7 @@ export const MerklIncentivesButton = (params: { protocolAction?: ProtocolAction; protocolAPY?: number; protocolIncentives?: ReserveIncentiveResponse[]; + hideValue?: boolean; }) => { const [open, setOpen] = useState(false); const { data: merklIncentives } = useMerklIncentives(params); @@ -197,7 +198,11 @@ export const MerklIncentivesButton = (params: { setOpen={setOpen} open={open} > - + ); }; diff --git a/src/components/incentives/IncentivesCard.tsx b/src/components/incentives/IncentivesCard.tsx index 706bcf999e..4d914c3641 100644 --- a/src/components/incentives/IncentivesCard.tsx +++ b/src/components/incentives/IncentivesCard.tsx @@ -111,6 +111,14 @@ export const IncentivesCard = ({ const isSghoPage = typeof router?.asPath === 'string' && router.asPath.toLowerCase().startsWith('/sgho'); const hideMeritValue = symbol === 'GHO' && !isSghoPage; + const isMarketsOrDashboardPage = + typeof router?.pathname === 'string' && + (router.pathname.startsWith('/dashboard') || router.pathname.startsWith('/markets')); + // Hide GHO Merkl value on dashboard/markets; show only the badge icon. + const hideMerklValue = + symbol === 'GHO' && + (protocolAction === ProtocolAction.borrow || protocolAction === ProtocolAction.supply) && + isMarketsOrDashboardPage; const incentivesContent = ( <> @@ -136,6 +144,7 @@ export const IncentivesCard = ({ protocolAction={protocolAction} protocolAPY={protocolAPY} protocolIncentives={incentives || []} + hideValue={hideMerklValue} />