fix: aprs check inside the IncentivesButton component

aave · Jan 8, 2025 · 4251320 · 4251320
1 parent 296de8d
commit 4251320
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/components/incentives/IncentivesButton.tsx b/src/components/incentives/IncentivesButton.tsx
@@ -95,7 +95,7 @@ export const ZkIgniteIncentivesButton = (params: {
 export const IncentivesButton = ({ incentives, symbol, displayBlank }: IncentivesButtonProps) => {
   const [open, setOpen] = useState(false);
 
-  if (!(incentives && incentives.length > 0)) {
+  if (!(incentives && incentives.filter((i) => i.incentiveAPR !== '0').length > 0)) {
     if (displayBlank) {
       return <BlankIncentives />;
     } else {

diff --git a/src/components/incentives/IncentivesCard.tsx b/src/components/incentives/IncentivesCard.tsx
@@ -38,8 +38,10 @@ interface IncentivesBoxProps {
 }
 
 export const hasIncentivesCheck = (incentives: IncentivesBoxProps) => {
-  const lmIncentivesCheck =
-    incentives.incentives && incentives.incentives.filter((i) => i.incentiveAPR !== '0').length > 0;
+  const lmIncentives = IncentivesButton({
+    symbol: incentives.symbol,
+    incentives: incentives.incentives,
+  });
 
   const meritIncentives = MeritIncentivesButton({
     symbol: incentives.symbol,
@@ -52,7 +54,8 @@ export const hasIncentivesCheck = (incentives: IncentivesBoxProps) => {
     rewardedAsset: incentives.address,
     protocolAction: incentives.protocolAction,
   });
-  if (lmIncentivesCheck || meritIncentives || zkIgniteIncentives) {
+
+  if (lmIncentives || meritIncentives || zkIgniteIncentives) {
     return true;
   } else {
     return false;

diff --git a/src/components/transactions/FlowCommons/TxModalDetails.tsx b/src/components/transactions/FlowCommons/TxModalDetails.tsx
@@ -300,6 +300,7 @@ export const DetailsIncentivesLine = ({
                 market={market}
                 address={address}
                 protocolAction={protocolAction}
+                isInModal={true}
               />
             ) : (
               <Typography variant="secondary14">