various tweaks

centrifuge · Sep 8, 2023 · 4be2503 · 4be2503
1 parent 41d843a
commit 4be2503
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 43 deletions.
diff --git a/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx b/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx
@@ -70,6 +70,7 @@ export type CreateLoanFormValues = {
     maxBorrowQuantity: number | ''
     Isin: string
     notional: number | ''
+    maxPriceVariation: number | ''
   }
 }
 
@@ -224,6 +225,7 @@ function IssuerCreateLoan() {
         maxBorrowQuantity: '',
         Isin: '',
         notional: '',
+        maxPriceVariation: '',
       },
     },
     onSubmit: async (values, { setSubmitting }) => {
@@ -233,14 +235,15 @@ function IssuerCreateLoan() {
         values.pricing.valuationMethod === 'oracle'
           ? {
               valuationMethod: values.pricing.valuationMethod,
+              // maxPriceVariation: Rate.fromPercent(values.pricing.maxPriceVariation),
+              maxPriceVariation: '1000000000000000000000000000000',
               maxBorrowAmount: values.pricing.maxBorrowQuantity
                 ? CurrencyBalance.fromFloat(values.pricing.maxBorrowQuantity, decimals)
                 : null,
               Isin: values.pricing.Isin || '',
               maturityDate: new Date(values.pricing.maturityDate),
-              maturityExtensionDays: values.pricing.maturityExtensionDays,
               interestRate: Rate.fromPercent(values.pricing.interestRate),
-              notional: CurrencyBalance.fromFloat(values.pricing.notional, decimals),
+              notional: CurrencyBalance.fromFloat(values.pricing.notional, 18),
             }
           : {
               valuationMethod: values.pricing.valuationMethod,

diff --git a/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx b/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx
@@ -105,14 +105,14 @@ export function PricingInput({ poolId }: { poolId: string }) {
         // Max 5 years from now
         max={new Date(Date.now() + 5 * 365 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10)}
       />
-      <FieldWithErrorMessage
+      {/* <FieldWithErrorMessage
         as={NumberInput}
         label={<Tooltips type="maxPriceVariation" variant="secondary" label="Max price variation*" />}
         placeholder={0}
         rightElement="%"
         name="pricing.maxPriceVariation"
         validate={validate.maxPriceVariation}
-      />
+      /> */}
 
       {(values.pricing.valuationMethod === 'discountedCashFlow' ||
         values.pricing.valuationMethod === 'outstandingDebt') && (

diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -61,9 +61,9 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
     },
     onSubmit: (values, actions) => {
       const price = CurrencyBalance.fromFloat(values.price, pool.currency.decimals)
-      const faceValue = CurrencyBalance.fromFloat(values.faceValue, 18)
+      const quantity = CurrencyBalance.fromFloat((values.faceValue as number) / (values.price as number), 18)
 
-      doFinanceTransaction([loan.poolId, loan.id, faceValue, price, account.actingAddress])
+      doFinanceTransaction([loan.poolId, loan.id, quantity, price, account.actingAddress])
       actions.setSubmitting(false)
     },
     validateOnMount: true,
@@ -76,10 +76,7 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
     },
     onSubmit: (values, actions) => {
       const price = CurrencyBalance.fromFloat(values.price, pool.currency.decimals)
-      const quantity = CurrencyBalance.fromFloat(
-        (values.faceValue as number) / (values.price as number),
-        pool.currency.decimals
-      )
+      const quantity = CurrencyBalance.fromFloat((values.faceValue as number) / (values.price as number), 18)
 
       doRepayTransaction([loan.poolId, loan.id, quantity, new BN(0), new BN(0), price, account.actingAddress])
       actions.setSubmitting(false)
@@ -207,7 +204,7 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
             {/* outstandingDebt needs to be rounded down, b/c onSetMax displays the rounded down value as well */}
             <Text variant="label2">
               {'valuationMethod' in loan.pricing && loan.pricing.valuationMethod === 'oracle'
-                ? `${loan.pricing.outstandingQuantity.toFloat()} @ ${formatBalance(
+                ? `${Dec(loan.pricing.outstandingQuantity.toString()).div('1e18').toFixed(2)} @ ${formatBalance(
                     new CurrencyBalance(loan.pricing.oracle.value, 18),
                     pool?.currency.symbol,
                     2

diff --git a/centrifuge-app/src/pages/Loan/HoldingsValues.tsx b/centrifuge-app/src/pages/Loan/HoldingsValues.tsx
@@ -9,18 +9,13 @@ type Props = {
 }
 
 export function HoldingsValues({ loan: { pricing }, pool, transactions }: Props) {
-  const totalFinanced =
+  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)
-
-  const totalRepaid =
-    transactions?.reduce((sum, trx) => {
-      if (trx.type === 'REPAID') {
+      if (trx.type === 'BORROWED') {
         sum = new CurrencyBalance(sum.add(trx.amount || new CurrencyBalance(0, 27)), 27)
       }
 
@@ -31,27 +26,17 @@ export function HoldingsValues({ loan: { pricing }, pool, transactions }: Props)
     <>
       <LabelValueStack
         label="Current total face"
-        value={`${formatBalance(
-          new CurrencyBalance(pricing.notional.mul(pricing.outstandingQuantity), 27),
-          pool.currency.symbol,
-          6,
-          2
-        )}`}
+        value={`${formatBalance(new CurrencyBalance(currentTotalFace, 24), pool.currency.symbol, 6, 2)}`}
       />
       <LabelValueStack
         label="Current value"
         value={`${formatBalance(
-          new CurrencyBalance(pricing.oracle.value.mul(pricing.outstandingQuantity), 36),
+          new CurrencyBalance(currentTotalFace.mul(pricing.oracle.value), 44),
           pool.currency.symbol,
           6,
           2
         )}`}
       />
-      <LabelValueStack
-        label="Total face purchased"
-        value={`${formatBalance(totalFinanced, pool.currency.symbol, 6, 2)}`}
-      />
-      <LabelValueStack label="Total face sold" value={`${formatBalance(totalRepaid, pool.currency.symbol, 6, 2)}`} />
     </>
   )
 }
diff --git a/centrifuge-app/src/pages/Loan/TransactionTable.tsx b/centrifuge-app/src/pages/Loan/TransactionTable.tsx
@@ -8,9 +8,10 @@ import { formatBalance } from '../../utils/formatting'
 
 type Props = {
   transactions: BorrowerTransaction[]
+  currency: string
 }
 
-export const TransactionTable = ({ transactions }: Props) => {
+export const TransactionTable = ({ transactions, currency }: Props) => {
   const assetTransactions = useMemo(() => {
     const sortedTransactions = transactions.sort((a, b) => {
       if (a.timestamp > b.timestamp) {
@@ -75,19 +76,22 @@ export const TransactionTable = ({ transactions }: Props) => {
         // {
         //   align: 'left',
         //   header: 'Settle price',
-        //   cell: (row) => formatBalance(row.settlePrice, 'USD'),
+        //   cell: (row) => formatBalance(row.settlePrice, currency),
         //   flex: '3',
         // },
         {
           align: 'left',
-          header: 'Net flow',
-          cell: (row) => (row.netFlow ? formatBalance(new CurrencyBalance(row.netFlow, 27), 'USD') : '-'),
+          header: 'Face flow',
+          cell: (row) =>
+            row.netFlow
+              ? `${row.type === 'REPAID' ? '-' : ''}${formatBalance(new CurrencyBalance(row.netFlow, 24), currency)}`
+              : '-',
           flex: '3',
         },
         {
           align: 'left',
           header: 'Position',
-          cell: (row) => formatBalance(row.position, 'USD'),
+          cell: (row) => formatBalance(new CurrencyBalance(row.position, 24), currency),
           flex: '3',
         },
         // TODO: add link to transaction

diff --git a/centrifuge-app/src/pages/Loan/index.tsx b/centrifuge-app/src/pages/Loan/index.tsx
@@ -186,8 +186,12 @@ const Loan: React.FC<{ setShowOraclePricing?: () => void }> = ({ setShowOraclePr
               {
                 label: 'Current value',
                 value: formatBalance(
-                  'outstandingDebt' in loan ? loan.outstandingDebt : new CurrencyBalance(0, pool.currency.decimals),
-                  pool?.currency.symbol
+                  'outstandingDebt' in loan
+                    ? new CurrencyBalance(loan.outstandingDebt, 21)
+                    : new CurrencyBalance(0, 18),
+                  pool?.currency.symbol,
+                  6,
+                  2
                 ),
               },
             ]}
@@ -271,7 +275,7 @@ const Loan: React.FC<{ setShowOraclePricing?: () => void }> = ({ setShowOraclePr
                 </Flex>
               }
             >
-              <TransactionTable transactions={borrowerAssetTransactions} />
+              <TransactionTable transactions={borrowerAssetTransactions} currency={pool.currency.symbol} />
             </PageSection>
           ) : null}
         </>

diff --git a/centrifuge-app/src/utils/validation/index.ts b/centrifuge-app/src/utils/validation/index.ts
@@ -32,7 +32,7 @@ export const positiveNumber = (err?: CustomError) => (val?: any) => {
 }
 
 export const settlementPrice = (err?: CustomError) => (val?: any) => {
-  const regex = new RegExp(/^\d{1,3}\.\d{0,6}$/)
+  const regex = new RegExp(/^\d{1,3}(?:\.\d{1,6})?$/)
   return regex.test(val) ? '' : getError(`Value must be in the format of (1-3).(0-6) digits`, err, val)
 }
 

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
@@ -86,9 +86,9 @@ type LoanInfoInput =
   | {
       valuationMethod: 'oracle'
       maxBorrowAmount: BN | null
+      maxPriceVariation: BN
       Isin: string
       maturityDate: Date
-      maturityExtensionDays: number
       interestRate: BN
       notional: BN
     }
@@ -127,6 +127,7 @@ export type LoanInfoData = {
           }
           maxBorrowAmount: { noLimit: null } | { quantity: string }
           notional: string
+          maxPriceVariation: string
         }
       }
     | {
@@ -1319,7 +1320,7 @@ export function getPoolsModule(inst: Centrifuge) {
         maturity: {
           fixed: {
             date: Math.round(infoInput.maturityDate.getTime() / 1000),
-            extension: infoInput.maturityExtensionDays * SEC_PER_DAY,
+            extension: 'maturityExtensionDays' in infoInput ? infoInput.maturityExtensionDays * SEC_PER_DAY : 0,
           },
         },
         interestPayments: 'None',
@@ -1343,6 +1344,7 @@ export function getPoolsModule(inst: Centrifuge) {
                   infoInput.maxBorrowAmount === null
                     ? { noLimit: null }
                     : { quantity: infoInput.maxBorrowAmount.toString() },
+                maxPriceVariation: infoInput.maxPriceVariation!.toString(),
                 notional: infoInput.notional.toString(),
               },
             }