Fix NAV calc on asset page (#2574)

* Subtract pending fees from nav instead of paid fees * Remove isLoading since it's not defined anymore
centrifuge · Jan 10, 2025 · 214ab90 · 214ab90
1 parent f9aba6b
commit 214ab90
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/centrifuge-app/src/components/LoanList.tsx b/centrifuge-app/src/components/LoanList.tsx
@@ -262,7 +262,7 @@ export function LoanList({ loans }: Props) {
   }, [rows, pool])
 
   const csvUrl = React.useMemo(() => csvData && getCSVDownloadUrl(csvData as any), [csvData])
-  const filteredData = isLoading ? [] : showRepaid ? rows : rows.filter((row) => !row.marketValue?.isZero())
+  const filteredData = showRepaid ? rows : rows.filter((row) => !row.marketValue?.isZero())
   const pagination = usePagination({ data: filteredData, pageSize: 20 })
 
   return (

diff --git a/centrifuge-app/src/pages/Pool/Assets/index.tsx b/centrifuge-app/src/pages/Pool/Assets/index.tsx
@@ -86,7 +86,7 @@ export function PoolDetailAssets() {
   )
 
   const total = isTinlakePool ? pool.nav.total : pool.reserve.total.toDecimal().add(offchainReserve).add(totalAssets)
-  const totalNAV = isTinlakePool ? pool.nav.total : Dec(total as any).sub(pool.fees.totalPaid.toDecimal())
+  const totalNAV = isTinlakePool ? pool.nav.total : Dec(total as any).sub(pool.fees.totalPending.toDecimal())
 
   const pageSummaryData: { label: React.ReactNode; value: React.ReactNode; heading?: boolean }[] = [
     {
@@ -117,7 +117,7 @@ export function PoolDetailAssets() {
             heading: false,
           },
           {
-            label: `Accrued fees (${pool.currency.symbol})`,
+            label: `Total pending fees (${pool.currency.symbol})`,
             value: `${pool.fees.totalPaid.isZero() ? '' : '-'}${formatBalance(pool.fees.totalPaid)}`,
             heading: false,
           },

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
@@ -362,6 +362,7 @@ export type Pool = {
   }
   fees: {
     totalPaid: CurrencyBalance
+    totalPending: CurrencyBalance
   }
   parameters: {
     minEpochTime: number
@@ -2001,14 +2002,17 @@ export function getPoolsModule(inst: Centrifuge) {
     )
 
     const $query = inst.getSubqueryObservable<{
-      pools: { nodes: { id: string; createdAt: string; sumPoolFeesPaidAmount: string }[] }
+      pools: {
+        nodes: { id: string; createdAt: string; sumPoolFeesPaidAmount: string; sumPoolFeesPendingAmount: string }[]
+      }
     }>(
       `query {
           pools {
             nodes {
               id
               createdAt
               sumPoolFeesPaidAmount
+              sumPoolFeesPendingAmount
             }
           }
         }`,
@@ -2239,6 +2243,7 @@ export function getPoolsModule(inst: Centrifuge) {
             createdAt: gqlPool?.createdAt ?? null,
             fees: {
               totalPaid: new CurrencyBalance(gqlPool?.sumPoolFeesPaidAmount ?? 0, pool.currency.decimals),
+              totalPending: new CurrencyBalance(gqlPool?.sumPoolFeesPendingAmount ?? 0, pool.currency.decimals),
             },
           }
           return poolWithGqlData