fix: negative apr, type error

cryptoalgebra · May 21, 2024 · 30da727 · 30da727
1 parent b24e042
commit 30da727
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/common/Table/poolsColumns.tsx b/src/components/common/Table/poolsColumns.tsx
@@ -137,7 +137,7 @@ export const poolsColumns: ColumnDef<Pool>[] = [
                 <AvgAPR
                     avgApr={formatPercent.format(row.original.poolAvgApr)}
                     maxApr={formatPercent.format(row.original.poolMaxApr)}
-                    farmApr={row.original.hasActiveFarming && formatPercent.format(row.original.farmApr)}
+                    farmApr={row.original.hasActiveFarming ? formatPercent.format(row.original.farmApr) : undefined}
                 >
                     {formatPercent.format(getValue() as number)}
                 </AvgAPR>

diff --git a/src/components/pools/PoolsList/index.tsx b/src/components/pools/PoolsList/index.tsx
@@ -45,7 +45,7 @@ const PoolsList = () => {
 
             const poolMaxApr = poolsMaxApr && poolsMaxApr[id] ? Number(poolsMaxApr[id].toFixed(2)) : 0;
             const poolAvgApr = poolsAvgApr && poolsAvgApr[id] ? Number(poolsAvgApr[id].toFixed(2)) : 0;
-            const farmApr = activeFarming && farmingsAPR ? farmingsAPR[activeFarming.id] : 0;
+            const farmApr = activeFarming && farmingsAPR && farmingsAPR[activeFarming.id] > 0 ? farmingsAPR[activeFarming.id] : 0;
 
             const avgApr = farmApr + poolAvgApr;