Skip to content

Conversation

@AGMASO
Copy link
Collaborator

@AGMASO AGMASO commented Nov 10, 2025

General Changes

  • Fixes: AAVEV3-6
  • Now the filtering by APYs for supply and borrow is working on MarketPage, taking into account the extra APRs provided by Merit, Merkl, or Aave protocol extra incentives.

Developer Notes


Reviewer Checklist

Please ensure you, as the reviewer(s), have gone through this checklist to ensure that the code changes are ready to ship safely and to help mitigate any downstream issues that may occur.

  • End-to-end tests are passing without any errors
  • Code changes do not significantly increase the application bundle size
  • If there are new 3rd-party packages, they do not introduce potential security threats
  • If there are new environment variables being added, they have been added to the .env.example file as well as the pertinant .github/actions/* files
  • There are no CI changes, or they have been approved by the DevOps and Engineering team(s)

@vercel
Copy link

vercel bot commented Nov 10, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
interface Ready Ready Preview Comment Dec 2, 2025 9:35am

@AGMASO AGMASO changed the title Fix/filtering by apy Fix/filtering by apys on Market page Nov 10, 2025
@github-actions
Copy link

@github-actions
Copy link

📦 Next.js Bundle Analysis for aave-ui

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

@linear
Copy link

linear bot commented Nov 13, 2025

useEffect(() => {
if (supplyDisplayApy === undefined) return;
onApyChange(id, 'supply', supplyDisplayApy);
}, [id, onApyChange, supplyDisplayApy]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's remove onApyChange from useEffect deps to avoid unwanted re-renders

same in others

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


const meritIncentivesAPR = meritIncentives?.breakdown?.meritIncentivesAPR || 0;
const selfAPY = ENABLE_SELF_CAMPAIGN ? meritIncentives?.variants?.selfAPY ?? 0 : 0;
const totalMeritAPY = meritIncentivesAPR + selfAPY;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is APR + APY okay?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason, meritIncentivesAPR has been kept with this name (probably to avoid conflicts between files), but it actually represents the APY.
Screenshot 2025-12-02 at 10 34 38

Comment on lines +107 to +111
return hasInfiniteIncentives
? 'Infinity'
: isBorrow
? protocolAPY - (protocolIncentivesAPY as number) - totalMeritAPY - merklIncentivesAPR
: protocolAPY + (protocolIncentivesAPY as number) + totalMeritAPY + merklIncentivesAPR;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we can remove this one because we have something similar in useIncentivizedApy.ts?

@github-actions
Copy link

github-actions bot commented Dec 2, 2025

@github-actions
Copy link

github-actions bot commented Dec 2, 2025

📦 Next.js Bundle Analysis for aave-ui

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants