integrate settle price

centrifuge · Sep 11, 2023 · e2f8c2b · e2f8c2b
1 parent 4be2503
commit e2f8c2b
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 15 deletions.
diff --git a/centrifuge-app/src/pages/Loan/HoldingsValues.tsx b/centrifuge-app/src/pages/Loan/HoldingsValues.tsx
@@ -1,4 +1,5 @@
 import { BorrowerTransaction, CurrencyBalance, ExternalPricingInfo, Loan, Pool } from '@centrifuge/centrifuge-js'
+import BN from 'bn.js'
 import { LabelValueStack } from '../../components/LabelValueStack'
 import { formatBalance } from '../../utils/formatting'
 
@@ -9,25 +10,59 @@ type Props = {
 }
 
 export function HoldingsValues({ loan: { pricing }, pool, transactions }: Props) {
-  const currentTotalFace =
+  const currentHolding =
     transactions?.reduce((sum, trx) => {
       if (trx.type === 'REPAID') {
-        sum = new CurrencyBalance(sum.sub(trx.amount || new CurrencyBalance(0, 27)), 27)
+        sum = new CurrencyBalance(
+          sum.sub(
+            trx.amount && trx.settlementPrice ? trx.amount.mul(new BN(trx.settlementPrice)) : new CurrencyBalance(0, 27)
+          ),
+          27
+        )
       }
 
       if (trx.type === 'BORROWED') {
-        sum = new CurrencyBalance(sum.add(trx.amount || new CurrencyBalance(0, 27)), 27)
+        sum = new CurrencyBalance(
+          sum.add(
+            trx.amount && trx.settlementPrice ? trx.amount.mul(new BN(trx.settlementPrice)) : new CurrencyBalance(0, 27)
+          ),
+          27
+        )
       }
 
       return sum
     }, new CurrencyBalance(0, 27)) || new CurrencyBalance(0, 27)
 
+  const currentTotalFace =
+    transactions?.reduce((sum, trx) => {
+      if (trx.type === 'BORROWED') {
+        sum = new CurrencyBalance(sum.add(trx.amount || new CurrencyBalance(0, 27)), 27)
+      }
+      if (trx.type === 'REPAID') {
+        sum = new CurrencyBalance(sum.sub(trx.amount || new CurrencyBalance(0, 27)), 27)
+      }
+      return sum
+    }, new CurrencyBalance(0, 27)) || new CurrencyBalance(0, 27)
+
   return (
     <>
       <LabelValueStack
         label="Current total face"
         value={`${formatBalance(new CurrencyBalance(currentTotalFace, 24), pool.currency.symbol, 6, 2)}`}
       />
+      <LabelValueStack
+        label="Current holding"
+        value={`${formatBalance(new CurrencyBalance(currentHolding, 32), pool.currency.symbol, 6, 2)}`}
+      />
+      <LabelValueStack
+        label="Average price"
+        value={`${formatBalance(
+          new CurrencyBalance(currentHolding.div(currentTotalFace), 6),
+          pool.currency.symbol,
+          2,
+          2
+        )}`}
+      />
       <LabelValueStack
         label="Current value"
         value={`${formatBalance(

diff --git a/centrifuge-app/src/pages/Loan/TransactionTable.tsx b/centrifuge-app/src/pages/Loan/TransactionTable.tsx
@@ -32,8 +32,8 @@ export const TransactionTable = ({ transactions, currency }: Props) => {
     return sortedTransactions.map((transaction, index, array) => ({
       type: transaction.type,
       transactionDate: transaction.timestamp,
-      // settlePrice: TODO: add subquery query for fetching settle price
-      netFlow: transaction.amount,
+      settlePrice: transaction.settlementPrice ? new CurrencyBalance(transaction.settlementPrice, 6) : null,
+      faceFlow: transaction.amount,
       position: array.slice(0, index + 1).reduce((sum, trx) => {
         if (trx.type === 'BORROWED') {
           sum = new CurrencyBalance(sum.add(trx.amount || new CurrencyBalance(0, 27)), 27)
@@ -72,26 +72,45 @@ export const TransactionTable = ({ transactions, currency }: Props) => {
           cell: (row) => formatDate(row.transactionDate),
           flex: '3',
         },
-        // TODO: add subquery query for fetching settle price
-        // {
-        //   align: 'left',
-        //   header: 'Settle price',
-        //   cell: (row) => formatBalance(row.settlePrice, currency),
-        //   flex: '3',
-        // },
+
         {
           align: 'left',
           header: 'Face flow',
           cell: (row) =>
-            row.netFlow
-              ? `${row.type === 'REPAID' ? '-' : ''}${formatBalance(new CurrencyBalance(row.netFlow, 24), currency)}`
+            row.faceFlow
+              ? `${row.type === 'REPAID' ? '-' : ''}${formatBalance(
+                  new CurrencyBalance(row.faceFlow, 24),
+                  currency,
+                  6,
+                  2
+                )}`
+              : '-',
+          flex: '3',
+        },
+        {
+          align: 'left',
+          header: 'Settle price',
+          cell: (row) => (row.settlePrice ? formatBalance(row.settlePrice, currency, 6, 2) : '-'),
+          flex: '3',
+        },
+        {
+          align: 'left',
+          header: 'Net cash flow',
+          cell: (row) =>
+            row.faceFlow && row.settlePrice
+              ? `${row.type === 'BORROWED' ? '-' : ''}${formatBalance(
+                  new CurrencyBalance(row.faceFlow.mul(row.settlePrice), 32),
+                  currency,
+                  6,
+                  2
+                )}`
               : '-',
           flex: '3',
         },
         {
           align: 'left',
           header: 'Position',
-          cell: (row) => formatBalance(new CurrencyBalance(row.position, 24), currency),
+          cell: (row) => formatBalance(new CurrencyBalance(row.position, 24), currency, 6, 2),
           flex: '3',
         },
         // TODO: add link to transaction

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
@@ -682,6 +682,7 @@ export type BorrowerTransaction = {
   loanId: string
   type: BorrowerTransactionType
   amount: CurrencyBalance | undefined
+  settlementPrice: string | null
 }
 
 export type Permissions = {
@@ -2089,6 +2090,7 @@ export function getPoolsModule(inst: Centrifuge) {
             type
             timestamp
             amount
+            settlementPrice
           }
         }
       }

diff --git a/centrifuge-js/src/types/subquery.ts b/centrifuge-js/src/types/subquery.ts
@@ -76,6 +76,7 @@ export type SubqueryBorrowerTransaction = {
   loanId: string
   type: BorrowerTransactionType
   amount?: number | null
+  settlementPrice: string | null
 }
 
 export type SubqueryEpoch = {