diff --git a/centrifuge-app/src/components/Report/CashflowStatement.tsx b/centrifuge-app/src/components/Report/CashflowStatement.tsx index 317445a0f..4aba2e9e8 100644 --- 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 - } - 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 + } + return data?.length > 0 ? ( diff --git a/centrifuge-app/src/components/Report/ReportFilter.tsx b/centrifuge-app/src/components/Report/ReportFilter.tsx index 0dbbba149..2edeb3e26 100644 --- 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) { - {transformDataChart?.length && ( + {!!transformDataChart?.length && ( diff --git a/centrifuge-app/src/components/Report/useReportsQuery.tsx b/centrifuge-app/src/components/Report/useReportsQuery.tsx index a01d3e76a..4270f05af 100644 --- a/centrifuge-app/src/components/Report/useReportsQuery.tsx +++ b/centrifuge-app/src/components/Report/useReportsQuery.tsx @@ -57,8 +57,8 @@ export function useReport( () => 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( 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 index 1580e26ab..8d69668b6 100644 --- 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,