feat: juice apys #2550

foodaka · 2025-07-24T15:10:39Z

General Changes

Adds together the APYs for merit and protocol so the rates are combined

  const isBorrow = protocolAction === ProtocolAction.borrow;
  const displayAPY = isBorrow
    ? protocolAPY - protocolIncentivesAPR - meritIncentivesAPR - merklIncentivesAPR
    : protocolAPY + protocolIncentivesAPR + meritIncentivesAPR + merklIncentivesAPR;

Developer Notes

Add any notes here that may be helpful for reviewers.

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 · 2025-07-24T15:10:44Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
interface	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 11, 2025 4:23pm

github-actions · 2025-07-29T08:26:22Z

Ipfs hash: bafybeiavgkpqirq3tspdocomiwjcfxbi7lrkueqmcedviihbjewnf4fzfu
Ipfs preview link: https://bafybeiavgkpqirq3tspdocomiwjcfxbi7lrkueqmcedviihbjewnf4fzfu.ipfs.cf-ipfs.com/

github-actions · 2025-07-29T08:26:29Z

📦 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! 🙌

github-actions · 2025-08-08T15:45:10Z

Ipfs hash: bafybeibuabwkfo4ngdovhy5dagiyy64c5wrjk66ubcikabif6nm6aouiyi
Ipfs preview link: https://bafybeibuabwkfo4ngdovhy5dagiyy64c5wrjk66ubcikabif6nm6aouiyi.ipfs.cf-ipfs.com/

github-actions · 2025-08-08T15:45:17Z

📦 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! 🙌

github-actions · 2025-08-08T16:00:56Z

Ipfs hash: bafybeibihranxcraiu34y6lqbee32gjjeshdiy7kmq5pmkgvvclsqnfhc4
Ipfs preview link: https://bafybeibihranxcraiu34y6lqbee32gjjeshdiy7kmq5pmkgvvclsqnfhc4.ipfs.cf-ipfs.com/

github-actions · 2025-08-08T16:01:05Z

📦 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! 🙌

mgrabina

two observations more

is it possible to have negative total apy? EURC in ethereum

It's a bit confusing to see one apy in the borrows column (with incentives) and another in the detail page (without)

mgrabina · 2025-08-08T16:17:20Z

src/components/transactions/Borrow/BorrowModalContent.tsx

+  console.log('WHAT IS THE USER', user);
  // amount calculations
  const maxAmountToBorrow = getMaxAmountAvailableToBorrow(poolReserve, user);

+  console.log('maxAmountToBorrow', maxAmountToBorrow);
+


removed in 13c82b4

mgrabina · 2025-08-08T16:23:24Z

src/components/incentives/IncentivesButton.tsx

+            <IncentivesIcon width="16" height="16" />
+          </Box>
+        );
+      } else if (incentivesNetAPR === 'Infinity') {


should we set Inifinite as a const, or use undefinded/uint_max const?

yeah its better 1c15a3e

mgrabina · 2025-08-08T16:23:38Z

src/components/incentives/IncentivesButton.tsx

+        // p: { xs: '0 4px', xsm: '2px 4px' },
+        // border: `1px solid ${open ? theme.palette.action.disabled : theme.palette.divider}`,


can remove?

mgrabina · 2025-08-08T16:26:45Z

src/components/incentives/IncentivesCard.tsx

+
+  const protocolIncentivesAPR =
+    incentives?.reduce((sum, inc) => {
+      return sum + (inc.incentiveAPR === 'Infinity' ? 0 : +inc.incentiveAPR);


is this intended? if incentive is infinite sum 0? if so, nomeclature feels confusing not sure if there is a better way

ive updated here to handle infinity, im not sure tbh how often it is actually infinity but we can display it 1c15a3e

mgrabina · 2025-08-08T16:30:43Z

src/utils/getMaxAmountAvailableToBorrow.ts

+  console.log('USER BORROWS', user.availableBorrowsUSD);
+  console.log(
+    'availableForUserMarketReferenceCurrency',
+    availableForUserMarketReferenceCurrency.toString()
+  );
+  console.log('availableLiquidity', availableLiquidity.toString());


removed in 13c82b4

github-actions · 2025-08-11T08:03:00Z

Ipfs hash: bafybeiehnd3264f6hhjtg5izs3yx32cndcfbveexh6bpjm4hk4kmupczgi
Ipfs preview link: https://bafybeiehnd3264f6hhjtg5izs3yx32cndcfbveexh6bpjm4hk4kmupczgi.ipfs.cf-ipfs.com/

github-actions · 2025-08-11T08:03:00Z

📦 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! 🙌

github-actions · 2025-08-11T08:39:14Z

Ipfs hash: bafybeid6574viylfvvtcmwc7d5hd2ivaydm3nxcvvonxmphuu3vrfr5jzy
Ipfs preview link: https://bafybeid6574viylfvvtcmwc7d5hd2ivaydm3nxcvvonxmphuu3vrfr5jzy.ipfs.cf-ipfs.com/

github-actions · 2025-08-11T08:39:15Z

📦 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! 🙌

Copilot

Pull Request Overview

This PR consolidates APY calculations by combining protocol, merit, and merkl incentives into a single total APY display. The main change replaces individual FormattedNumber display with an IncentivesCard component that calculates and shows the combined rates.

Replaces individual APY display with unified incentives card component
Adds breakdown calculation for total APY including all incentive types
Updates tooltip content to show comprehensive APY breakdown with all incentive sources

Reviewed Changes

Copilot reviewed 10 out of 14 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
src/modules/reserve-overview/SupplyInfo.tsx	Replaces FormattedNumber + IncentivesButton with unified IncentivesCard component
src/locales/en/messages.po	Adds new translation strings for APY breakdown display
src/locales/en/messages.js	Updates compiled translation messages
src/hooks/useMerklIncentives.ts	Adds breakdown calculation with total APY combining protocol and incentive rates
src/hooks/useMeritIncentives.ts	Adds breakdown calculation with total APY combining protocol and incentive rates
src/components/transactions/Borrow/BorrowModalContent.tsx	Adds console.log for debugging purposes
src/components/incentives/MeritIncentivesTooltipContent.tsx	Enhances tooltip to show detailed APY breakdown with all components
src/components/incentives/IncentivesTooltipContent.tsx	Updates tooltip to display comprehensive APY breakdown including all incentive types
src/components/incentives/IncentivesCard.tsx	Implements unified APY calculation combining protocol + all incentive types
src/components/incentives/IncentivesButton.tsx	Updates to support new breakdown calculations and tooltip display

Comments suppressed due to low confidence (1)

src/locales/en/messages.po:2439

The removal of the 'Net APR' translation entry suggests this text is no longer used. Verify that all references to this translation key have been properly updated to use the new 'Net Protocol Incentives' translation instead.

#: src/components/transactions/Borrow/BorrowModalContent.tsx

Copilot · 2025-08-11T08:40:54Z

src/components/transactions/Borrow/BorrowModalContent.tsx

  // amount calculations
  const maxAmountToBorrow = getMaxAmountAvailableToBorrow(poolReserve, user);

+  console.log('maxAmountToBorrow', maxAmountToBorrow);


Remove the console.log statement as it appears to be leftover debugging code and shouldn't be included in production code.

Suggested change

console.log('maxAmountToBorrow', maxAmountToBorrow);

foodaka · 2025-08-11T09:36:39Z

@mgrabina its a good catch on the reserves, ive added it there as well for consistency c5c94fc

github-actions · 2025-08-11T09:41:41Z

Ipfs hash: bafybeifdjqtmfpl52yozvnr53gqrvlodtnd22r755terfayrxy2o5r76yy
Ipfs preview link: https://bafybeifdjqtmfpl52yozvnr53gqrvlodtnd22r755terfayrxy2o5r76yy.ipfs.cf-ipfs.com/

github-actions · 2025-08-11T09:41:48Z

📦 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! 🙌

NandyBa · 2025-08-11T13:59:04Z

src/components/incentives/IncentivesCard.tsx

+  const displayAPY = hasInfiniteIncentives
+    ? 'Infinity'
+    : isBorrow
+    ? protocolAPY - (protocolIncentivesAPR as number) - meritIncentivesAPR - merklIncentivesAPR
+    : protocolAPY + (protocolIncentivesAPR as number) + meritIncentivesAPR + merklIncentivesAPR;


Be aware that you approximate APR as APY here

NandyBa

Before PR:

After PR:

This is wrong

One user have

And you still displaying invalid value here

NandyBa · 2025-08-11T14:14:36Z

Add of incentive on the reserve page is a good thing

github-actions · 2025-08-11T16:27:56Z

Ipfs hash: bafybeidohneuqo3gaglwgk44jderxzj5adssywj3cixd5opityypstwzrm
Ipfs preview link: https://bafybeidohneuqo3gaglwgk44jderxzj5adssywj3cixd5opityypstwzrm.ipfs.cf-ipfs.com/

github-actions · 2025-08-11T16:27:58Z

📦 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! 🙌

MartinGbz · 2025-08-12T11:43:27Z

There are APY display issues on the following components:

(Rewards APY are only display on the Supply and SwapSupplyFrom modals)

SwapSupplyTo:

Borrow

SwapBorrowFrom

SwapBorrowFrom

feat: juice apys

530f135

fix: icon

11d260b

vercel bot had a problem deploying to Preview July 28, 2025 15:20 Failure

fix: layouts

87cc77d

vercel bot deployed to Preview July 29, 2025 08:11 View deployment

chore: sync main

b0ec0ce

vercel bot deployed to Preview July 29, 2025 08:23 View deployment

fix: icon

c8f910b

vercel bot had a problem deploying to Preview August 8, 2025 12:33 Failure

chore: sync main

38e6ca5

foodaka marked this pull request as ready for review August 8, 2025 12:56

vercel bot had a problem deploying to Preview August 8, 2025 12:57 Failure

fix: build

33b8ce0

vercel bot had a problem deploying to Preview August 8, 2025 15:34 Failure

fix: apr bug

b8f58d9

vercel bot deployed to Preview August 8, 2025 15:41 View deployment

fix: handle gho incetive

0f1db7e

vercel bot deployed to Preview August 8, 2025 15:53 View deployment

fix: add icon

d03bfc6

vercel bot deployed to Preview August 8, 2025 15:57 View deployment

mgrabina reviewed Aug 8, 2025

View reviewed changes

chore: remove debug

13c82b4

vercel bot deployed to Preview August 11, 2025 07:59 View deployment

fix: handle infinity

1c15a3e

vercel bot deployed to Preview August 11, 2025 08:36 View deployment

foodaka requested review from JoaquinBattilana and Copilot August 11, 2025 08:40

Copilot AI reviewed Aug 11, 2025

View reviewed changes

feat: add incentives on reserves

c5c94fc

vercel bot deployed to Preview August 11, 2025 09:38 View deployment

NandyBa reviewed Aug 11, 2025

View reviewed changes

feat: apy on merit

39b2b63

vercel bot deployed to Preview August 11, 2025 16:23 View deployment

mgrabina approved these changes Aug 11, 2025

View reviewed changes

foodaka merged commit 930dc79 into main Aug 12, 2025
17 of 18 checks passed

foodaka deleted the feat/aprs branch August 12, 2025 10:31

NandyBa mentioned this pull request Aug 12, 2025

Croped Merit tooltip on reserve page #2580

Closed

		// p: { xs: '0 4px', xsm: '2px 4px' },
		// border: `1px solid ${open ? theme.palette.action.disabled : theme.palette.divider}`,

feat: juice apys #2550

feat: juice apys #2550

Uh oh!

Conversation

foodaka commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

General Changes

Developer Notes

Reviewer Checklist

Uh oh!

vercel bot commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jul 29, 2025

Uh oh!

github-actions bot commented Jul 29, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

github-actions bot commented Aug 8, 2025

Uh oh!

github-actions bot commented Aug 8, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

github-actions bot commented Aug 8, 2025

Uh oh!

github-actions bot commented Aug 8, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

mgrabina left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 11, 2025

Uh oh!

github-actions bot commented Aug 11, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

github-actions bot commented Aug 11, 2025

Uh oh!

github-actions bot commented Aug 11, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Aug 11, 2025

Choose a reason for hiding this comment

Uh oh!

foodaka commented Aug 11, 2025

Uh oh!

github-actions bot commented Aug 11, 2025

Uh oh!

github-actions bot commented Aug 11, 2025

📦 Next.js Bundle Analysis for aave-ui

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NandyBa left a comment

Choose a reason for hiding this comment

Uh oh!

NandyBa commented Aug 11, 2025

foodaka commented Jul 24, 2025 •

edited

Loading

vercel bot commented Jul 24, 2025 •

edited

Loading

MartinGbz commented Aug 12, 2025 •

edited

Loading