Merge pull request #375 from invariant-labs/hot-fix-negative-apr-apy

Hot fix negative apr apy
invariant-labs · Jan 15, 2025 · be55b7d · be55b7d
2 parents c3bb2cb + cefb268
commit be55b7d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/components/Modals/PromotedPoolPopover/PromotedPoolPopover.tsx b/src/components/Modals/PromotedPoolPopover/PromotedPoolPopover.tsx
@@ -148,9 +148,9 @@ export const PromotedPoolPopover = ({
                   <span className={classes.apr}>APR</span>
                 </Typography>{' '}
                 <Typography className={classes.whiteText}>
-                  {`${apy > 1000 ? '>1000%' : apy === 0 ? '' : apy.toFixed(2) + '%'}`}
+                  {`${apy > 1000 ? '>1000%' : apy === 0 ? '' : Math.abs(apy).toFixed(2) + '%'}`}
                   <span className={classes.apr}>
-                    {`${apr > 1000 ? '>1000%' : apr === 0 ? '-' : apr.toFixed(2) + '%'}`}
+                    {`${apr > 1000 ? '>1000%' : apr === 0 ? '-' : Math.abs(apr).toFixed(2) + '%'}`}
                   </span>
                 </Typography>
               </div>

diff --git a/src/components/PopularPools/Card/Card.tsx b/src/components/PopularPools/Card/Card.tsx
@@ -185,7 +185,7 @@ const Card: React.FC<ICard> = ({
                 {apy !== undefined && showAPY && (
                   <StatsLabel
                     title='APY'
-                    value={`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '-' : convertedApy.toFixed(2) + '%'}`}
+                    value={`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '-' : Math.abs(convertedApy).toFixed(2) + '%'}`}
                   />
                 )}
                 <StatsLabel title='Fee' value={fee + '%'} />

diff --git a/src/components/Stats/PoolListItem/PoolListItem.tsx b/src/components/Stats/PoolListItem/PoolListItem.tsx
@@ -210,11 +210,11 @@ const PoolListItem: React.FC<IProps> = ({
           {!isSmd && showAPY ? (
             <Box className={classes.row}>
               <Typography>
-                {`${convertedApr > 1000 ? '>1000%' : convertedApr === 0 ? '-' : convertedApr.toFixed(2) + '%'}`}
+                {`${convertedApr > 1000 ? '>1000%' : convertedApr === 0 ? '-' : Math.abs(convertedApr).toFixed(2) + '%'}`}
                 <span
                   className={
                     classes.apy
-                  }>{`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '' : convertedApy.toFixed(2) + '%'}`}</span>
+                  }>{`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '' : Math.abs(convertedApy).toFixed(2) + '%'}`}</span>
               </Typography>
               {isPromoted && (
                 <>

diff --git a/src/pages/LeaderboardPage/components/PoolListItem/PoolListItem.tsx b/src/pages/LeaderboardPage/components/PoolListItem/PoolListItem.tsx
@@ -157,11 +157,11 @@ const PoolListItem: React.FC<IProps> = ({
           </Grid>
           {!isSm && showAPY ? (
             <Typography className={classes.row}>
-              {`${convertedApr > 1000 ? '>1000%' : convertedApr === 0 ? '-' : convertedApr.toFixed(2) + '%'}`}
+              {`${convertedApr > 1000 ? '>1000%' : convertedApr === 0 ? '-' : Math.abs(convertedApr).toFixed(2) + '%'}`}
               <span
                 className={
                   classes.apy
-                }>{`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '' : convertedApy.toFixed(2) + '%'}`}</span>
+                }>{`${convertedApy > 1000 ? '>1000%' : convertedApy === 0 ? '' : Math.abs(convertedApy).toFixed(2) + '%'}`}</span>
             </Typography>
           ) : null}
           <Typography>{fee}%</Typography>

diff --git a/src/pages/LeaderboardPage/components/PoolListItem/Variants/CustomPoolListItem.tsx b/src/pages/LeaderboardPage/components/PoolListItem/Variants/CustomPoolListItem.tsx
@@ -188,7 +188,7 @@ export const CustomPoolListItem: React.FC<IProps> = ({
                     ? '>1000%'
                     : convertedApy === 0
                       ? ''
-                      : convertedApy.toFixed(2) + '%'}
+                      : Math.abs(convertedApy).toFixed(2) + '%'}
                 </span>
                 <span
                   style={{
@@ -202,7 +202,7 @@ export const CustomPoolListItem: React.FC<IProps> = ({
                     ? '>1000%'
                     : convertedApr === 0
                       ? ''
-                      : convertedApr.toFixed(2) + '%'}
+                      : Math.abs(convertedApr).toFixed(2) + '%'}
                 </span>
               </Box>
             </Box>

diff --git a/src/utils/uiUtils.ts b/src/utils/uiUtils.ts
@@ -44,7 +44,7 @@ export const shortenAddress = (address: string, chars = 4) =>
   address.length > 8 ? `${address.slice(0, chars)}...${address.slice(-chars)}` : address
 
 export const apyToApr = (apy: number) => {
-  const dailyRate = Math.pow(1 + apy / 100, 1 / 365) - 1
+  const dailyRate = Math.pow(1 + Math.abs(apy) / 100, 1 / 365) - 1
   return dailyRate * 365 * 100
 }
 

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -1826,17 +1826,17 @@ export const calculateAPYAndAPR = (
   tvl?: number
 ) => {
   if (volume === undefined || fee === undefined || tvl === undefined) {
-    return { convertedApy: apy, convertedApr: apyToApr(apy) }
+    return { convertedApy: Math.abs(apy), convertedApr: Math.abs(apyToApr(apy)) }
   }
 
   if (poolsToRecalculateAPY.includes(poolAddress ?? '')) {
     const parsedApr = ((volume * fee) / tvl) * 365
 
     const parsedApy = (Math.pow((volume * fee * 0.01) / tvl + 1, 365) - 1) * 100
 
-    return { convertedApy: parsedApy, convertedApr: parsedApr }
+    return { convertedApy: Math.abs(parsedApy), convertedApr: Math.abs(parsedApr) }
   } else {
-    return { convertedApy: apy, convertedApr: apyToApr(apy) }
+    return { convertedApy: Math.abs(apy), convertedApr: Math.abs(apyToApr(apy)) }
   }
 }