Use CurrencyBalance instead of Dec and convert settlement price to Cu…

…rrencyBalance
centrifuge · Sep 15, 2023 · 22b8887 · 22b8887
1 parent 532f334
commit 22b8887
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 16 deletions.
diff --git a/centrifuge-app/src/pages/Loan/HoldingsValues.tsx b/centrifuge-app/src/pages/Loan/HoldingsValues.tsx
@@ -1,6 +1,6 @@
 import { BorrowerTransaction, CurrencyBalance, Pool } from '@centrifuge/centrifuge-js'
+import BN from 'bn.js'
 import { LabelValueStack } from '../../components/LabelValueStack'
-import { Dec } from '../../utils/Decimal'
 import { formatBalance } from '../../utils/formatting'
 
 type Props = {
@@ -12,41 +12,67 @@ export function HoldingsValues({ pool, transactions }: Props) {
   const netSpent =
     transactions?.reduce((sum, trx) => {
       if (trx.type === 'REPAID') {
-        return sum.sub(
-          trx.amount && trx.settlementPrice
-            ? trx.amount.toDecimal().mul(new CurrencyBalance(trx.settlementPrice, pool.currency.decimals).toDecimal())
-            : Dec(0)
+        return new CurrencyBalance(
+          sum.sub(
+            trx.amount && trx.settlementPrice
+              ? trx.amount.mul(
+                  new CurrencyBalance(
+                    trx.settlementPrice.div(new BN(10).pow(new BN(pool.currency.decimals))).toString(),
+                    pool.currency.decimals
+                  )
+                )
+              : CurrencyBalance.fromFloat(0, pool.currency.decimals)
+          ),
+          pool.currency.decimals
         )
       }
 
       if (trx.type === 'BORROWED') {
-        return sum.add(
-          trx.amount && trx.settlementPrice
-            ? trx.amount.toDecimal().mul(new CurrencyBalance(trx.settlementPrice, pool.currency.decimals).toDecimal())
-            : Dec(0)
+        return new CurrencyBalance(
+          sum.add(
+            trx.amount && trx.settlementPrice
+              ? trx.amount.mul(
+                  new CurrencyBalance(
+                    trx.settlementPrice.div(new BN(10).pow(new BN(pool.currency.decimals))).toString(),
+                    pool.currency.decimals
+                  )
+                )
+              : CurrencyBalance.fromFloat(0, pool.currency.decimals)
+          ),
+          pool.currency.decimals
         )
       }
       return sum
-    }, Dec(0)) || Dec(0)
+    }, CurrencyBalance.fromFloat(0, pool.currency.decimals)) || CurrencyBalance.fromFloat(0, pool.currency.decimals)
 
   const currentFace =
     transactions?.reduce((sum, trx) => {
       if (trx.type === 'BORROWED') {
-        return sum.add(trx.amount?.toDecimal() || Dec(0))
+        return new CurrencyBalance(sum.add(trx?.amount || new BN(0)), pool.currency.decimals)
       }
       if (trx.type === 'REPAID') {
-        return sum.sub(trx.amount?.toDecimal() || Dec(0))
+        return new CurrencyBalance(sum.sub(trx?.amount || new BN(0)), pool.currency.decimals)
       }
       return sum
-    }, Dec(0)) || Dec(0)
+    }, CurrencyBalance.fromFloat(0, pool.currency.decimals)) || CurrencyBalance.fromFloat(0, pool.currency.decimals)
 
   return (
     <>
-      <LabelValueStack label="Current face" value={`${formatBalance(currentFace, pool.currency.symbol, 6, 2)}`} />
-      <LabelValueStack label="Net spent" value={`${formatBalance(netSpent.div(100), pool.currency.symbol, 6, 2)}`} />
+      <LabelValueStack
+        label="Current face"
+        value={`${formatBalance(currentFace.toDecimal(), pool.currency.symbol, 6, 2)}`}
+      />
+      <LabelValueStack
+        label="Net spent"
+        value={`${formatBalance(netSpent.toDecimal().div(100), pool.currency.symbol, 6, 2)}`}
+      />
       <LabelValueStack
         label="Average settle price"
-        value={netSpent.isZero() ? '-' : `${formatBalance(netSpent.div(currentFace), pool.currency.symbol, 2, 2)}`}
+        value={
+          netSpent.isZero()
+            ? '-'
+            : `${formatBalance(netSpent.toDecimal().div(currentFace.toDecimal()), pool.currency.symbol, 2, 2)}`
+        }
       />
     </>
   )

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
@@ -2111,6 +2111,7 @@ export function getPoolsModule(inst: Centrifuge) {
       map(([data, currency]) => {
         return data!.borrowerTransactions.nodes.map((tx) => ({
           ...tx,
+          settlementPrice: tx.settlementPrice ? new CurrencyBalance(tx.settlementPrice, currency.decimals) : undefined,
           amount: tx.amount ? new CurrencyBalance(tx.amount, currency.decimals) : undefined,
           timestamp: new Date(`${tx.timestamp}+00:00`),
         })) as unknown as BorrowerTransaction[]