Fix bugs

centrifuge · Jan 27, 2025 · 53a9371 · 53a9371
1 parent b2cb773
commit 53a9371
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/centrifuge-app/src/components/Report/CashflowStatement.tsx b/centrifuge-app/src/components/Report/CashflowStatement.tsx
@@ -30,10 +30,6 @@ export function CashflowStatement({ pool }: { pool: Pool }) {
     setReportData(data)
   }, [data])
 
-  if (isLoading) {
-    return <Spinner mt={2} />
-  }
-
   const columns = React.useMemo(() => {
     if (!data.length && !isLoading) {
       return []
@@ -254,6 +250,10 @@ export function CashflowStatement({ pool }: { pool: Pool }) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [grossCashflowRecords, netCashflowRecords])
 
+  if (isLoading) {
+    return <Spinner mt={2} />
+  }
+
   return data?.length > 0 ? (
     <DataTableGroup>
       <DataTable data={grossCashflowRecords} columns={columns} hoverable />

diff --git a/centrifuge-app/src/components/Report/ReportFilter.tsx b/centrifuge-app/src/components/Report/ReportFilter.tsx
@@ -63,12 +63,14 @@ export function ReportFilter({ poolId }: ReportFilterProps) {
         yAxis: data.totalProfitAndLoss?.toDecimal(),
       }))
     } else {
-      return (reportData as CashflowReport[]).map((data) => {
-        return {
-          name: data.timestamp,
-          yAxis: data.totalCashflow?.toDecimal(),
-        }
-      })
+      return (reportData as CashflowReport[])
+        .filter((data) => !data.totalCashflow?.isZero())
+        .map((data) => {
+          return {
+            name: data.timestamp,
+            yAxis: data.totalCashflow?.toDecimal(),
+          }
+        })
     }
   }, [report, reportData])
 
@@ -167,7 +169,7 @@ export function ReportFilter({ poolId }: ReportFilterProps) {
           </AnchorButton>
         </Shelf>
       </Shelf>
-      {transformDataChart?.length && (
+      {!!transformDataChart?.length && (
         <Box mt={4} width="100%" height={200} marginLeft="-50px">
           <SimpleBarChart data={transformDataChart} currency={pool.currency} />
         </Box>

diff --git a/centrifuge-app/src/components/Report/useReportsQuery.tsx b/centrifuge-app/src/components/Report/useReportsQuery.tsx
@@ -57,8 +57,8 @@ export function useReport<T extends ReportsType>(
     () =>
       getAdjustedDates(
         groupBy || undefined,
-        startDate ? new Date(startDate) : undefined,
-        endDate ? new Date(endDate) : undefined,
+        startDate ?? undefined,
+        endDate ?? undefined,
         pool.createdAt ? new Date(pool.createdAt) : undefined
       ),
     [groupBy, startDate, endDate, pool.createdAt]
@@ -71,7 +71,7 @@ export function useReport<T extends ReportsType>(
       const group = groupBy === 'day' || groupBy === 'daily' ? 'day' : groupBy
 
       const rawReport = await sdkPool.reports[reportType]({
-        from: startDate?.toISOString(),
+        from: adjustedStartDate?.toISOString(),
         to: adjustedEndDate?.toISOString(),
         groupBy: group,
         ...filters,

diff --git a/centrifuge-app/src/utils/formatting.ts b/centrifuge-app/src/utils/formatting.ts
@@ -1,5 +1,5 @@
 import { CurrencyBalance, CurrencyMetadata, Perquintill, Price, Rate, TokenBalance } from '@centrifuge/centrifuge-js'
-import Decimal from 'decimal.js'
+import Decimal from 'decimal.js-light'
 
 export function formatBalance(
   amount: CurrencyBalance | TokenBalance | Price | Rate | Decimal | number,