Centrifuge App: Fix investor transaction report (#1675)

centrifuge · Nov 1, 2023 · 70c8e32 · 70c8e32
1 parent 3ae0643
commit 70c8e32
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 44 deletions.
diff --git a/centrifuge-app/src/components/Report/PoolBalance.tsx b/centrifuge-app/src/components/Report/PoolBalance.tsx
@@ -31,20 +31,27 @@ export function PoolBalance({ pool }: { pool: Pool }) {
         cell: (row: TableDataRow) => <Text variant={row.heading ? 'heading4' : 'body2'}>{row.name}</Text>,
         width: '200px',
       },
-    ].concat(
-      poolStates.map((state, index) => ({
-        align: 'right',
-        header: `${new Date(state.timestamp).toLocaleDateString('en-US', {
-          month: 'short',
-        })} ${
-          groupBy === 'day'
-            ? new Date(state.timestamp).toLocaleDateString('en-US', { day: 'numeric' })
-            : new Date(state.timestamp).toLocaleDateString('en-US', { year: 'numeric' })
-        }`,
-        cell: (row: TableDataRow) => <Text variant="body2">{(row.value as any)[index]}</Text>,
-        width: '120px',
-      }))
-    )
+    ]
+      .concat(
+        poolStates.map((state, index) => ({
+          align: 'right',
+          header: `${new Date(state.timestamp).toLocaleDateString('en-US', {
+            month: 'short',
+          })} ${
+            groupBy === 'day'
+              ? new Date(state.timestamp).toLocaleDateString('en-US', { day: 'numeric' })
+              : new Date(state.timestamp).toLocaleDateString('en-US', { year: 'numeric' })
+          }`,
+          cell: (row: TableDataRow) => <Text variant="body2">{(row.value as any)[index]}</Text>,
+          width: '120px',
+        }))
+      )
+      .concat({
+        align: 'left',
+        header: '',
+        cell: () => <span />,
+        width: '1fr',
+      })
   }, [poolStates, groupBy])
 
   const overviewRecords: TableDataRow[] = React.useMemo(() => {

diff --git a/centrifuge-app/src/components/Report/ReportContext.tsx b/centrifuge-app/src/components/Report/ReportContext.tsx
@@ -49,7 +49,7 @@ const defaultContext = {
   report: 'pool-balance' as Report,
   setReport() {},
 
-  groupBy: 'day' as GroupBy,
+  groupBy: 'month' as GroupBy,
   setGroupBy() {},
 
   activeTranche: 'all',

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
@@ -2084,7 +2084,6 @@ export function getPoolsModule(inst: Centrifuge) {
 
   function getInvestorTransactions(args: [poolId: string, trancheId?: string, from?: Date, to?: Date]) {
     const [poolId, trancheId, from, to] = args
-    const $api = inst.getApi()
 
     const $query = inst.getSubqueryObservable<{
       investorTransactions: { nodes: SubqueryInvestorTransaction[] }
@@ -2121,35 +2120,27 @@ export function getPoolsModule(inst: Centrifuge) {
       }
     )
 
-    return $api.pipe(
-      switchMap((api) =>
-        combineLatest([$query, api.query.poolSystem.pool(poolId).pipe(take(1)), getCurrencies()]).pipe(
-          switchMap(([queryData, poolValue, currencies]) => {
-            const pool = poolValue.toHuman() as unknown as PoolDetailsData
-            const currency = findCurrency(currencies, pool.currency)!
-            const currencyDecimals = currency.decimals
+    return combineLatest([$query, getPoolCurrency([poolId])]).pipe(
+      switchMap(([queryData, currency]) => {
+        const currencyDecimals = currency.decimals
 
-            return [
-              queryData?.investorTransactions.nodes.map((tx) => {
-                return {
-                  id: tx.id,
-                  timestamp: new Date(tx.timestamp),
-                  accountId: tx.accountId,
-                  trancheId: tx.trancheId,
-                  epochNumber: tx.epochNumber,
-                  type: tx.type as InvestorTransactionType,
-                  currencyAmount: tx.currencyAmount
-                    ? new CurrencyBalance(tx.currencyAmount, currencyDecimals)
-                    : undefined,
-                  tokenAmount: tx.tokenAmount ? new CurrencyBalance(tx.tokenAmount, currencyDecimals) : undefined,
-                  tokenPrice: tx.tokenPrice ? new Price(tx.tokenPrice) : undefined,
-                  transactionFee: tx.transactionFee ? new CurrencyBalance(tx.transactionFee, 18) : undefined, // native tokenks are always denominated in 18
-                }
-              }) as unknown as InvestorTransaction[],
-            ]
-          })
-        )
-      )
+        return [
+          queryData?.investorTransactions.nodes.map((tx) => {
+            return {
+              id: tx.id,
+              timestamp: new Date(tx.timestamp),
+              accountId: tx.accountId,
+              trancheId: tx.trancheId,
+              epochNumber: tx.epochNumber,
+              type: tx.type as InvestorTransactionType,
+              currencyAmount: tx.currencyAmount ? new CurrencyBalance(tx.currencyAmount, currencyDecimals) : undefined,
+              tokenAmount: tx.tokenAmount ? new CurrencyBalance(tx.tokenAmount, currencyDecimals) : undefined,
+              tokenPrice: tx.tokenPrice ? new Price(tx.tokenPrice) : undefined,
+              transactionFee: tx.transactionFee ? new CurrencyBalance(tx.transactionFee, 18) : undefined, // native tokenks are always denominated in 18
+            }
+          }) as unknown as InvestorTransaction[],
+        ]
+      })
     )
   }