fix: display issue

aave · Jan 7, 2025 · 054cfe1 · 054cfe1
1 parent 00d439b
commit 054cfe1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/src/components/transactions/FlowCommons/TxModalDetails.tsx b/src/components/transactions/FlowCommons/TxModalDetails.tsx
@@ -270,15 +270,15 @@ export const DetailsIncentivesLine = ({
     protocolAction,
   });
 
-  if (!hasIncentives) return null;
-
   const hasFutureIncentives = hasIncentivesCheck({
     symbol: futureSymbol || '',
     incentives: futureIncentives,
     market,
     protocolAction,
   });
 
+  if (!hasIncentives && !hasFutureIncentives) return null;
+
   return (
     <Row caption={<Trans>Rewards APR</Trans>} captionVariant="description" mb={4} minHeight={24}>
       <Box
@@ -293,27 +293,31 @@ export const DetailsIncentivesLine = ({
           <Skeleton variant="rectangular" height={20} width={100} sx={{ borderRadius: '4px' }} />
         ) : (
           <>
-            <IncentivesBox
-              symbol={symbol}
-              incentives={incentives || []}
-              market={market}
-              address={address}
-              protocolAction={protocolAction}
-            />
+            {hasIncentives ? (
+              <IncentivesBox
+                symbol={symbol}
+                incentives={incentives || []}
+                market={market}
+                address={address}
+                protocolAction={protocolAction}
+              />
+            ) : (
+              <Typography variant="secondary14">
+                <Trans>None</Trans>
+              </Typography>
+            )}
             {futureSymbol && (
               <>
                 {ArrowRightIcon}
                 {hasFutureIncentives ? (
-                  <>
-                    <IncentivesBox
-                      symbol={futureSymbol || ''}
-                      incentives={futureIncentives || []}
-                      market={market}
-                      address={futureAddress}
-                      protocolAction={protocolAction}
-                      isInModal={true}
-                    />
-                  </>
+                  <IncentivesBox
+                    symbol={futureSymbol || ''}
+                    incentives={futureIncentives || []}
+                    market={market}
+                    address={futureAddress}
+                    protocolAction={protocolAction}
+                    isInModal={true}
+                  />
                 ) : (
                   <Typography variant="secondary14">
                     <Trans>None</Trans>

diff --git a/src/locales/en/messages.po b/src/locales/en/messages.po
@@ -842,6 +842,7 @@ msgstr "Restaking {symbol}"
 msgid "Withdrawing {symbol}"
 msgstr "Withdrawing {symbol}"
 
+#: src/components/transactions/FlowCommons/TxModalDetails.tsx
 #: src/components/transactions/FlowCommons/TxModalDetails.tsx
 #: src/modules/governance/RepresentativesInfoPanel.tsx
 msgid "None"