From 97666e0cfb9a4330ebbae786880e6a3ea32820ce Mon Sep 17 00:00:00 2001
From: Onno Visser <visser.onno@gmail.com>
Date: Fri, 4 Aug 2023 16:28:58 +0200
Subject: [PATCH] CentrifugeJS: Loan refactor (#1521)

---
 .../pages/IssuerPool/Assets/CreateLoan.tsx    |   3 +
 .../pages/IssuerPool/Assets/PricingInput.tsx  |  30 ++-
 .../src/pages/Loan/ExternalFinanceForm.tsx    |  21 +-
 centrifuge-app/src/pages/Loan/FinanceForm.tsx |  25 +-
 centrifuge-js/src/modules/pools.ts            | 220 +++++++++++-------
 fabric/src/components/CurrencyInput/index.tsx |  21 +-
 6 files changed, 194 insertions(+), 126 deletions(-)

diff --git a/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx b/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx
index 3127e5ccc8..a9b3f191b3 100644
--- a/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Assets/CreateLoan.tsx
@@ -68,6 +68,7 @@ export type CreateLoanFormValues = {
     discountRate: number | ''
     maxBorrowQuantity: number | ''
     Isin: string
+    notional: number | ''
   }
 }
 
@@ -220,6 +221,7 @@ function IssuerCreateLoan() {
         discountRate: '',
         maxBorrowQuantity: '',
         Isin: '',
+        notional: '',
       },
     },
     onSubmit: async (values, { setSubmitting }) => {
@@ -234,6 +236,7 @@ function IssuerCreateLoan() {
                 : null,
               Isin: values.pricing.Isin || '',
               maturityDate: new Date(values.pricing.maturityDate),
+              interestRate: Rate.fromPercent(values.pricing.interestRate),
             }
           : {
               valuationMethod: values.pricing.valuationMethod,
diff --git a/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx b/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx
index 5d02a8a491..f5796eeae0 100644
--- a/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Assets/PricingInput.tsx
@@ -44,6 +44,19 @@ export function PricingInput({ poolId }: { poolId: string }) {
             name="pricing.Isin"
             validate={validate.Isin}
           />
+          <Field name="pricing.notional" validate={combine(required(), positiveNumber(), max(Number.MAX_SAFE_INTEGER))}>
+            {({ field, meta, form }: FieldProps) => (
+              <CurrencyInput
+                {...field}
+                label="Notional*"
+                placeholder="0.00"
+                errorMessage={meta.touched ? meta.error : undefined}
+                currency={pool?.currency.symbol}
+                onChange={(value) => form.setFieldValue('pricing.notional', value)}
+                variant="small"
+              />
+            )}
+          </Field>
         </>
       )}
 
@@ -93,18 +106,17 @@ export function PricingInput({ poolId }: { poolId: string }) {
         max={new Date(Date.now() + 5 * 365 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10)}
       />
 
+      <FieldWithErrorMessage
+        as={NumberInput}
+        label={<Tooltips type="financingFee" variant="secondary" label="Financing fee*" />}
+        placeholder="0.00"
+        rightElement="%"
+        name="pricing.interestRate"
+        validate={validate.fee}
+      />
       {(values.pricing.valuationMethod === 'discountedCashFlow' ||
         values.pricing.valuationMethod === 'outstandingDebt') && (
         <>
-          <FieldWithErrorMessage
-            as={NumberInput}
-            label={<Tooltips type="financingFee" variant="secondary" label="Financing fee*" />}
-            placeholder="0.00"
-            rightElement="%"
-            name="pricing.interestRate"
-            validate={validate.fee}
-          />
-
           <FieldWithErrorMessage
             as={NumberInput}
             label={<Tooltips type="advanceRate" variant="secondary" label="Advance rate*" />}
diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
index 00b4a8224e..f87c1afc82 100644
--- a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -114,7 +114,6 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
   const debt = loan.outstandingDebt?.toDecimal() || Dec(0)
   const poolReserve = pool?.reserve.available.toDecimal() ?? Dec(0)
   const maxBorrow = poolReserve.lessThan(availableFinancing) ? poolReserve : availableFinancing
-
   const maturityDatePassed =
     loan?.pricing && 'maturityDate' in loan.pricing && new Date() > new Date(loan.pricing.maturityDate)
 
@@ -201,16 +200,16 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
                   This is calculated through the amount multiplied by the current price of the asset
                 </Text>
               </Stack>
-              {poolReserve.lessThan(availableFinancing) ||
-                ('valuationMethod' in loan.pricing && !loan.pricing.maxBorrowAmount && (
-                  <Shelf alignItems="flex-start" justifyContent="start" gap="4px">
-                    <IconInfo size="iconMedium" />
-                    <Text variant="body3">
-                      The pool&apos;s available reserve ({formatBalance(poolReserve, pool?.currency.symbol)}) is smaller
-                      than the available financing
-                    </Text>
-                  </Shelf>
-                ))}
+              {(poolReserve.lessThan(availableFinancing) ||
+                ('valuationMethod' in loan.pricing && !loan.pricing.maxBorrowAmount)) && (
+                <Shelf alignItems="flex-start" justifyContent="start" gap="4px">
+                  <IconInfo size="iconMedium" />
+                  <Text variant="body3">
+                    The pool&apos;s available reserve ({formatBalance(poolReserve, pool?.currency.symbol)}) is smaller
+                    than the available financing
+                  </Text>
+                </Shelf>
+              )}
               <Stack px={1}>
                 <Button type="submit" loading={isFinanceLoading}>
                   Finance asset
diff --git a/centrifuge-app/src/pages/Loan/FinanceForm.tsx b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
index 5280efe828..c954625742 100644
--- a/centrifuge-app/src/pages/Loan/FinanceForm.tsx
+++ b/centrifuge-app/src/pages/Loan/FinanceForm.tsx
@@ -1,4 +1,4 @@
-import { CurrencyBalance, findBalance, Loan as LoanType } from '@centrifuge/centrifuge-js'
+import { ActiveLoan, CurrencyBalance, findBalance, Loan as LoanType } from '@centrifuge/centrifuge-js'
 import { useBalances, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
 import { Button, Card, CurrencyInput, IconInfo, InlineFeedback, Shelf, Stack, Text } from '@centrifuge/fabric'
 import BN from 'bn.js'
@@ -64,7 +64,11 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
   )
 
   function repayAll() {
-    doRepayAllTransaction([loan.poolId, loan.id], { account, forceProxyType: 'Borrow' })
+    const l = loan as ActiveLoan
+    doRepayAllTransaction([loan.poolId, loan.id, l.totalBorrowed.sub(l.repaid.principal)], {
+      account,
+      forceProxyType: 'Borrow',
+    })
   }
 
   const financeForm = useFormik<FinanceValues>({
@@ -84,8 +88,15 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
       amount: '',
     },
     onSubmit: (values, actions) => {
-      const amount = CurrencyBalance.fromFloat(values.amount, pool.currency.decimals)
-      doRepayTransaction([loan.poolId, loan.id, amount, new BN(0)], { account, forceProxyType: 'Borrow' })
+      const l = loan as ActiveLoan
+      const outstandingPrincipal = l.totalBorrowed.sub(l.repaid.principal)
+      let amount: BN = CurrencyBalance.fromFloat(values.amount, pool.currency.decimals)
+      let interest = new BN(0)
+      if (amount.gt(outstandingPrincipal)) {
+        interest = amount.sub(outstandingPrincipal)
+        amount = outstandingPrincipal
+      }
+      doRepayTransaction([l.poolId, l.id, amount, interest, new BN(0)], { account, forceProxyType: 'Borrow' })
       actions.setSubmitting(false)
     },
     validateOnMount: true,
@@ -100,12 +111,12 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
   if (loan.status === 'Closed') {
     return null
   }
+
   const debt = loan.outstandingDebt?.toDecimal() || Dec(0)
   const poolReserve = pool?.reserve.available.toDecimal() ?? Dec(0)
   const maxBorrow = poolReserve.lessThan(availableFinancing) ? poolReserve : availableFinancing
   const maxRepay = balance.lessThan(loan.outstandingDebt.toDecimal()) ? balance : loan.outstandingDebt.toDecimal()
   const canRepayAll = debtWithMargin?.lte(balance)
-
   const maturityDatePassed =
     loan?.pricing && 'maturityDate' in loan.pricing && new Date() > new Date(loan.pricing.maturityDate)
 
@@ -145,6 +156,7 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
                   return (
                     <CurrencyInput
                       {...field}
+                      value={field.value instanceof Decimal ? field.value.toNumber() : field.value}
                       label="Amount"
                       errorMessage={meta.touched ? meta.error : undefined}
                       secondaryLabel={`${formatBalance(roundDown(maxBorrow), pool?.currency.symbol, 2)} available`}
@@ -156,7 +168,7 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
                   )
                 }}
               </Field>
-              {poolReserve.lessThan(availableFinancing) || (
+              {poolReserve.lessThan(availableFinancing) && (
                 <Shelf alignItems="flex-start" justifyContent="start" gap="4px">
                   <IconInfo size="iconMedium" />
                   <Text variant="body3">
@@ -204,6 +216,7 @@ function InternalFinanceForm({ loan }: { loan: LoanType }) {
                     return (
                       <CurrencyInput
                         {...field}
+                        value={field.value instanceof Decimal ? field.value.toNumber() : field.value}
                         label="Amount"
                         errorMessage={meta.touched ? meta.error : undefined}
                         secondaryLabel={`${formatBalance(roundDown(maxRepay), pool?.currency.symbol, 2)} available`}
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 987928078a..619a1f4fd2 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -19,6 +19,7 @@ import { Dec } from '../utils/Decimal'
 
 const PerquintillBN = new BN(10).pow(new BN(18))
 const PriceBN = new BN(10).pow(new BN(27))
+const MaxU128 = '340282366920938463463374607431768211455'
 
 type AdminRole =
   | 'PoolAdmin'
@@ -77,6 +78,8 @@ type LoanInfoInput =
       maxBorrowAmount: string | null
       Isin: string
       maturityDate: Date
+      interestRate: BN
+      notional: BN
     }
   | {
       valuationMethod: 'discountedCashFlow'
@@ -89,10 +92,11 @@ type LoanInfoInput =
       advanceRate: BN
       interestRate: BN
     }
+
 export type LoanInfoData = {
   /// Specify the repayments schedule of the loan
   schedule: {
-    maturity: { fixed: number }
+    maturity: { fixed: { date: number; extension: number } }
     interestPayments: 'None'
     payDownSchedule: 'None'
   }
@@ -100,6 +104,9 @@ export type LoanInfoData = {
   /// Collateral used for this loan
   collateral: [string, string]
 
+  /// Interest rate per second with any penalty applied
+  interestRate: { fixed: { ratePerYear: string; compounding: 'Secondly' } }
+
   pricing:
     | {
         external: {
@@ -107,6 +114,7 @@ export type LoanInfoData = {
             isin: string
           }
           maxBorrowAmount: { noLimit: null } | { quantity: string }
+          notional: string
         }
       }
     | {
@@ -118,13 +126,11 @@ export type LoanInfoData = {
                 discountedCashFlow: {
                   probabilityOfDefault: string
                   lossGivenDefault: string
-                  discountRate: string
+                  discountRate: { fixed: { ratePerYear: string; compounding: 'Secondly' } }
                 }
               }
           /// Value of the collateral used for this loan
           collateralValue: string
-          /// Interest rate per second with any penalty applied
-          interestRate: string
           maxBorrowAmount:
             | { upToTotalBorrowed: { advanceRate: string } }
             | { upToOutstandingDebt: { advanceRate: string } }
@@ -133,15 +139,15 @@ export type LoanInfoData = {
 
   /// Restrictions of this loan
   restrictions: {
-    borrows: 'NotWrittenOff'
-    repayments: 'None'
+    borrows: 'NotWrittenOff' | 'FullOnce'
+    repayments: 'None' | 'Full'
   }
 }
 
 export type ActiveLoanInfoData = {
   /// Specify the repayments schedule of the loan
   schedule: {
-    maturity: { fixed: number }
+    maturity: { fixed: { date: number; extension: number } }
     interestPayments: 'None'
     payDownSchedule: 'None'
   }
@@ -157,8 +163,14 @@ export type ActiveLoanInfoData = {
               isin: string
             }
             maxBorrowAmount: { noLimit: null } | { quantity: string }
+            notional: string
           }
           outstandingQuantity: string
+          interest: {
+            interestRate: { fixed: { ratePerYear: string; compounding: 'Secondly' } }
+            normalizedAcc: string
+            penalty: string
+          }
         }
       }
     | {
@@ -171,26 +183,27 @@ export type ActiveLoanInfoData = {
                   discountedCashFlow: {
                     probabilityOfDefault: string
                     lossGivenDefault: string
-                    discountRate: string
+                    discountRate: { fixed: { ratePerYear: string; compounding: 'Secondly' } }
                   }
                 }
             /// Value of the collateral used for this loan
             collateralValue: string
-            /// Interest rate per second with any penalty applied
-            interestRate: string
             maxBorrowAmount:
               | { upToTotalBorrowed: { advanceRate: string } }
               | { upToOutstandingDebt: { advanceRate: string } }
           }
-          normalizedDebt: string
-          writeOffPenalty: string
+          interest: {
+            interestRate: { fixed: { ratePerYear: string; compounding: 'Secondly' } }
+            normalizedAcc: string
+            penalty: string
+          }
         }
       }
 
   /// Restrictions of this loan
   restrictions: {
-    borrows: 'NotWrittenOff'
-    repayments: 'None'
+    borrows: 'NotWrittenOff' | 'FullOnce'
+    repayments: 'None' | 'Full'
   }
 }
 
@@ -330,7 +343,11 @@ type ActiveLoanData = ActiveLoanInfoData & {
   writeOffPercentage: string
   originationDate: number
   totalBorrowed: string
-  totalRepaid: string
+  totalRepaid: {
+    interest: string
+    principal: string
+    unscheduled: string
+  }
   normalizedDebt: string
 }
 
@@ -427,6 +444,11 @@ export type ActiveLoan = {
   }
   totalBorrowed: CurrencyBalance
   totalRepaid: CurrencyBalance
+  repaid: {
+    interest: CurrencyBalance
+    principal: CurrencyBalance
+    unscheduled: CurrencyBalance
+  }
   originationDate: string
   normalizedDebt: CurrencyBalance
   outstandingDebt: CurrencyBalance
@@ -1211,7 +1233,7 @@ export function getPoolsModule(inst: Centrifuge) {
     const info: LoanInfoData = {
       /// Specify the repayments schedule of the loan
       schedule: {
-        maturity: { fixed: Math.round(infoInput.maturityDate.getTime() / 1000) },
+        maturity: { fixed: { date: Math.round(infoInput.maturityDate.getTime() / 1000), extension: 0 } },
         interestPayments: 'None',
         payDownSchedule: 'None',
       },
@@ -1219,6 +1241,9 @@ export function getPoolsModule(inst: Centrifuge) {
       /// Collateral used for this loan
       collateral: [collectionId, nftId],
 
+      /// Interest rate per second with any penalty applied
+      interestRate: { fixed: { ratePerYear: infoInput.interestRate.toString(), compounding: 'Secondly' } },
+
       pricing:
         infoInput.valuationMethod === 'oracle'
           ? {
@@ -1228,6 +1253,7 @@ export function getPoolsModule(inst: Centrifuge) {
                 },
                 maxBorrowAmount:
                   infoInput.maxBorrowAmount === null ? { noLimit: null } : { quantity: infoInput.maxBorrowAmount },
+                notional: infoInput.notional.toString(),
               },
             }
           : {
@@ -1239,13 +1265,13 @@ export function getPoolsModule(inst: Centrifuge) {
                         discountedCashFlow: {
                           probabilityOfDefault: infoInput.probabilityOfDefault.toString(),
                           lossGivenDefault: infoInput.lossGivenDefault.toString(),
-                          discountRate: infoInput.discountRate.toString(),
+                          discountRate: {
+                            fixed: { ratePerYear: infoInput.discountRate.toString(), compounding: 'Secondly' },
+                          },
                         },
                       },
                 /// Value of the collateral used for this loan
                 collateralValue: infoInput.value.toString(),
-                /// Interest rate per second with any penalty applied
-                interestRate: infoInput.interestRate.toString(),
                 maxBorrowAmount: {
                   [infoInput.maxBorrowAmount]: { advanceRate: infoInput.advanceRate.toString() },
                 } as any,
@@ -1276,7 +1302,7 @@ export function getPoolsModule(inst: Centrifuge) {
         const borrowSubmittable = api.tx.proxy.proxy(
           aoProxy,
           undefined,
-          api.tx.loans.borrow(poolId, loanId, amount.toString())
+          api.tx.loans.borrow(poolId, loanId, { external: { quantity: amount.toString(), settlementPrice: '' } })
         )
         const oracleFeedSubmittable = api.tx.priceOracle.feedValues([[{ Isin: isin }, price]])
         const batchSubmittable = api.tx.utility.batchAll([oracleFeedSubmittable, borrowSubmittable])
@@ -1290,22 +1316,26 @@ export function getPoolsModule(inst: Centrifuge) {
     const $api = inst.getApi()
     return $api.pipe(
       switchMap((api) => {
-        const submittable = api.tx.loans.borrow(poolId, loanId, amount.toString())
+        const submittable = api.tx.loans.borrow(poolId, loanId, { internal: amount.toString() })
         return inst.wrapSignAndSend(api, submittable, options)
       })
     )
   }
 
   function repayLoanPartially(
-    args: [poolId: string, loanId: string, amount: BN, uncheckedAmount: BN],
+    args: [poolId: string, loanId: string, principal: BN, interest: BN, unchecked: BN],
     options?: TransactionOptions
   ) {
-    const [poolId, loanId, amount, uncheckedAmount] = args
+    const [poolId, loanId, principal, interest, unchecked] = args
     const $api = inst.getApi()
 
     return $api.pipe(
       switchMap((api) => {
-        const submittable = api.tx.loans.repay(poolId, loanId, amount.toString(), uncheckedAmount.toString())
+        const submittable = api.tx.loans.repay(poolId, loanId, {
+          principal: { internal: principal.toString() },
+          interest: interest.toString(),
+          unchecked: unchecked.toString(),
+        })
         return inst.wrapSignAndSend(api, submittable, options)
       })
     )
@@ -1332,25 +1362,18 @@ export function getPoolsModule(inst: Centrifuge) {
     )
   }
 
-  function repayAndCloseLoan(args: [poolId: string, loanId: string], options?: TransactionOptions) {
-    const [poolId, loanId] = args
+  function repayAndCloseLoan(args: [poolId: string, loanId: string, principal: BN], options?: TransactionOptions) {
+    const [poolId, loanId, principal] = args
     const $api = inst.getApi()
 
     return $api.pipe(
-      combineLatestWith(getLoan([poolId, loanId])),
-      combineLatestWith(getPool([poolId])),
-      take(1),
-      switchMap(([[api, loan], pool]) => {
-        // Calculate the debt an hour from now to have some margin
-        const debtWithMargin =
-          loan?.status === 'Active' && loan.pricing.valuationMethod !== 'oracle'
-            ? loan.outstandingDebt
-                .toDecimal()
-                .add(loan.normalizedDebt.toDecimal().mul(loan.pricing.interestRate!.toDecimal().div(365 * 24)))
-            : Dec(0)
-        const amount = CurrencyBalance.fromFloat(debtWithMargin || 0, pool.currency.decimals).toString()
+      switchMap((api) => {
         const submittable = api.tx.utility.batchAll([
-          api.tx.loans.repay(poolId, loanId, amount, '0'),
+          api.tx.loans.repay(poolId, loanId, {
+            principal: { internal: principal.toString() },
+            interest: MaxU128,
+            unchecked: '0',
+          }),
           api.tx.loans.close(poolId, loanId),
         ])
         return inst.wrapSignAndSend(api, submittable, options)
@@ -2157,7 +2180,7 @@ export function getPoolsModule(inst: Centrifuge) {
           )
 
           const currency = rawCurrency.toHuman() as AssetCurrencyData
-          const rates = rateValues.toJSON() as InterestAccrual[]
+          const rates = rateValues.toPrimitive() as InterestAccrual[]
 
           function getSharedLoanInfo(loan: CreatedLoanData | ActiveLoanData | ClosedLoanData) {
             const info = 'info' in loan ? loan.info : loan
@@ -2173,6 +2196,13 @@ export function getPoolsModule(inst: Centrifuge) {
                 ? loan.pricing.external.info
                 : loan.pricing.internal.info
 
+            const interestRate =
+              'info' in loan
+                ? loan.info.interestRate.fixed.ratePerYear
+                : 'external' in loan.pricing
+                ? loan.pricing.external.interest.interestRate.fixed.ratePerYear
+                : loan.pricing.internal.interest.interestRate.fixed.ratePerYear
+
             const discount =
               'valuationMethod' in pricingInfo && 'discountedCashFlow' in pricingInfo.valuationMethod
                 ? pricingInfo.valuationMethod.discountedCashFlow
@@ -2180,7 +2210,7 @@ export function getPoolsModule(inst: Centrifuge) {
             return {
               asset: {
                 collectionId: collectionId.toString(),
-                nftId: hexToBN(nftId).toString(),
+                nftId: nftId.toString(),
               },
               pricing:
                 'priceId' in pricingInfo
@@ -2191,37 +2221,39 @@ export function getPoolsModule(inst: Centrifuge) {
                       maxBorrowAmount:
                         'noLimit' in pricingInfo.maxBorrowAmount
                           ? null
-                          : new CurrencyBalance(hexToBN(pricingInfo.maxBorrowAmount.quantity), currency.decimals),
+                          : new CurrencyBalance(pricingInfo.maxBorrowAmount.quantity, currency.decimals),
                       Isin: Buffer.from(pricingInfo.priceId.isin.substring(2), 'hex').toString(),
-                      maturityDate: new Date(info.schedule.maturity.fixed * 1000).toISOString(),
+                      maturityDate: new Date(info.schedule.maturity.fixed.date * 1000).toISOString(),
                       oracle: oraclePrices[pricingInfo.priceId.isin] || { value: new Rate(0), timestamp: 0 },
                       outstandingQuantity:
                         'external' in info.pricing && 'outstandingQuantity' in info.pricing.external
                           ? new CurrencyBalance(info.pricing.external.outstandingQuantity, currency.decimals)
                           : new CurrencyBalance('0', currency.decimals),
+                      interestRate: new Rate(interestRate),
+                      notional: new CurrencyBalance(pricingInfo.notional, currency.decimals),
                     }
                   : {
                       valuationMethod: ('outstandingDebt' in pricingInfo.valuationMethod
                         ? 'outstandingDebt'
                         : 'discountedCashFlow') as any,
                       maxBorrowAmount: Object.keys(pricingInfo.maxBorrowAmount)[0] as any,
-                      value: new CurrencyBalance(hexToBN(pricingInfo.collateralValue), currency.decimals),
-                      advanceRate: new Rate(hexToBN(Object.values(pricingInfo.maxBorrowAmount)[0].advanceRate)),
+                      value: new CurrencyBalance(pricingInfo.collateralValue, currency.decimals),
+                      advanceRate: new Rate(Object.values(pricingInfo.maxBorrowAmount)[0].advanceRate),
                       probabilityOfDefault: discount?.probabilityOfDefault
-                        ? new Rate(hexToBN(discount.probabilityOfDefault))
+                        ? new Rate(discount.probabilityOfDefault)
                         : undefined,
-                      lossGivenDefault: discount?.lossGivenDefault
-                        ? new Rate(hexToBN(discount.lossGivenDefault))
+                      lossGivenDefault: discount?.lossGivenDefault ? new Rate(discount.lossGivenDefault) : undefined,
+                      discountRate: discount?.discountRate
+                        ? new Rate(discount.discountRate.fixed.ratePerYear)
                         : undefined,
-                      discountRate: discount?.discountRate ? new Rate(hexToBN(discount.discountRate)) : undefined,
-                      interestRate: new Rate(hexToBN(pricingInfo.interestRate)),
-                      maturityDate: new Date(info.schedule.maturity.fixed * 1000).toISOString(),
+                      interestRate: new Rate(interestRate),
+                      maturityDate: new Date(info.schedule.maturity.fixed.date * 1000).toISOString(),
                     },
             }
           }
 
           const createdLoans: CreatedLoan[] = (createdLoanValues as any[]).map(([key, value]) => {
-            const loan = value.toJSON() as unknown as CreatedLoanData
+            const loan = value.toPrimitive() as unknown as CreatedLoanData
             const nil = new CurrencyBalance(0, currency.decimals)
             return {
               ...getSharedLoanInfo(loan),
@@ -2236,25 +2268,36 @@ export function getPoolsModule(inst: Centrifuge) {
             }
           })
 
-          const activeLoans: ActiveLoan[] = (activeLoanValues.toJSON() as any[]).map(
+          const activeLoans: ActiveLoan[] = (activeLoanValues.toPrimitive() as any[]).map(
             ([loanId, loan]: [number, ActiveLoanData]) => {
-              const loanRate =
-                'internal' in loan.pricing
-                  ? new Rate(hexToBN(loan.pricing.internal.info.interestRate)).toDecimal().toString()
-                  : '0'
+              const sharedInfo = getSharedLoanInfo(loan)
               const interestData = rates.find(
-                (rate) => new Rate(hexToBN(rate.interestRatePerSec)).toApr().toDecimalPlaces(4).toString() === loanRate
+                (rate) =>
+                  new Rate(rate.interestRatePerSec).toApr().toDecimalPlaces(4).toString() ===
+                  sharedInfo.pricing.interestRate.toDecimal().toString()
               )
+              const penaltyRate =
+                'external' in loan.pricing
+                  ? loan.pricing.external.interest.penalty
+                  : loan.pricing.internal.interest.penalty
+              const normalizedDebt =
+                'external' in loan.pricing
+                  ? loan.pricing.external.interest.normalizedAcc
+                  : loan.pricing.internal.interest.normalizedAcc
+
               const writeOffStatus = {
-                penaltyInterestRate: new Rate(0), // TODO: fix
-                percentage: new Rate(hexToBN(loan.writeOffPercentage)),
+                penaltyInterestRate: new Rate(penaltyRate),
+                percentage: new Rate(loan.writeOffPercentage),
               }
 
-              const sharedInfo = getSharedLoanInfo(loan)
-
               const outstandingDebt =
                 'internal' in loan.pricing
-                  ? getOutstandingDebt(loan, currency.decimals, interestLastUpdated.toJSON() as number, interestData)
+                  ? getOutstandingDebt(
+                      loan,
+                      currency.decimals,
+                      interestLastUpdated.toPrimitive() as number,
+                      interestData
+                    )
                   : new CurrencyBalance(
                       new BN(loan.pricing.external.outstandingQuantity)
                         .mul(sharedInfo.pricing.oracle?.value ?? new BN(0))
@@ -2262,8 +2305,9 @@ export function getPoolsModule(inst: Centrifuge) {
                       currency.decimals
                     )
 
-              const nil = new CurrencyBalance(0, currency.decimals)
-
+              const repaidPrincipal = new CurrencyBalance(loan.totalRepaid.principal, currency.decimals)
+              const repaidInterest = new CurrencyBalance(loan.totalRepaid.interest, currency.decimals)
+              const repaidUnscheduled = new CurrencyBalance(loan.totalRepaid.unscheduled, currency.decimals)
               return {
                 ...sharedInfo,
                 id: loanId.toString(),
@@ -2271,27 +2315,32 @@ export function getPoolsModule(inst: Centrifuge) {
                 status: 'Active',
                 borrower: addressToHex(loan.borrower),
                 writeOffStatus: writeOffStatus.percentage.isZero() ? undefined : writeOffStatus,
-                totalBorrowed: new CurrencyBalance(hexToBN(loan.totalBorrowed), currency.decimals),
-                totalRepaid: new CurrencyBalance(hexToBN(loan.totalRepaid), currency.decimals),
+                totalBorrowed: new CurrencyBalance(loan.totalBorrowed, currency.decimals),
+                totalRepaid: new CurrencyBalance(
+                  repaidPrincipal.add(repaidInterest).add(repaidUnscheduled),
+                  currency.decimals
+                ),
+                repaid: {
+                  principal: repaidPrincipal,
+                  interest: repaidInterest,
+                  unscheduled: repaidUnscheduled,
+                },
                 originationDate: new Date(loan.originationDate * 1000).toISOString(),
                 outstandingDebt,
-                normalizedDebt:
-                  'internal' in loan.pricing
-                    ? new CurrencyBalance(hexToBN(loan.pricing.internal.normalizedDebt), currency.decimals)
-                    : nil,
+                normalizedDebt: new CurrencyBalance(normalizedDebt, currency.decimals),
               }
             }
           )
 
           const closedLoans: ClosedLoan[] = (closedLoanValues as any[]).map(([key, value]) => {
-            const loan = value.toJSON() as unknown as ClosedLoanData
+            const loan = value.toPrimitive() as unknown as ClosedLoanData
             return {
               ...getSharedLoanInfo(loan),
               id: formatLoanKey(key as StorageKey<[u32, u32]>),
               poolId,
               status: 'Closed',
-              totalBorrowed: new CurrencyBalance(hexToBN(loan.totalBorrowed), currency.decimals),
-              totalRepaid: new CurrencyBalance(hexToBN(loan.totalRepaid), currency.decimals),
+              totalBorrowed: new CurrencyBalance(loan.totalBorrowed, currency.decimals),
+              totalRepaid: new CurrencyBalance(loan.totalRepaid, currency.decimals),
             }
           })
 
@@ -2418,16 +2467,6 @@ export function getPoolsModule(inst: Centrifuge) {
     )
   }
 
-  function getLoan(args: [poolId: string, loanId: string]) {
-    const [poolId, loanId] = args
-    return getLoans([poolId]).pipe(
-      map((loans) => {
-        const loanByLoanId = loans.find((loan) => loan.id === loanId)
-        return loanByLoanId
-      })
-    )
-  }
-
   function getProposedLoanChanges(args: [poolId: string]) {
     const [poolId] = args
     const $api = inst.getApi()
@@ -2501,7 +2540,7 @@ export function getPoolsModule(inst: Centrifuge) {
     const $api = inst.getApi()
 
     return $api.pipe(
-      switchMap((api) => (console.log('api', api), api.query.poolSystem.scheduledUpdate(poolId))),
+      switchMap((api) => api.query.poolSystem.scheduledUpdate(poolId)),
       map((updateData) => {
         const update = updateData.toPrimitive() as any
         if (!update) return null
@@ -2635,12 +2674,15 @@ function getOutstandingDebt(
 ) {
   if (!accrual) return new CurrencyBalance(0, currencyDecimals)
   if (!('internal' in loan.pricing)) return new CurrencyBalance(0, currencyDecimals)
-  const accRate = new Rate(hexToBN(accrual.accumulatedRate)).toDecimal()
-  const rate = new Rate(hexToBN(accrual.interestRatePerSec)).toDecimal()
+  const accRate = new Rate(accrual.accumulatedRate).toDecimal()
+  const rate = new Rate(accrual.interestRatePerSec).toDecimal()
+
   const balance =
-    'internal' in loan.pricing && !loan.normalizedDebt ? loan.pricing.internal.normalizedDebt : loan.normalizedDebt
+    'internal' in loan.pricing && !loan.normalizedDebt
+      ? loan.pricing.internal.interest.normalizedAcc
+      : loan.normalizedDebt
 
-  const normalizedDebt = new CurrencyBalance(hexToBN(balance), currencyDecimals).toDecimal()
+  const normalizedDebt = new CurrencyBalance(balance, currencyDecimals).toDecimal()
   const secondsSinceUpdated = Date.now() / 1000 - lastUpdated
 
   const debtFromAccRate = normalizedDebt.mul(accRate)
diff --git a/fabric/src/components/CurrencyInput/index.tsx b/fabric/src/components/CurrencyInput/index.tsx
index 13d597e805..d5fe1f8774 100644
--- a/fabric/src/components/CurrencyInput/index.tsx
+++ b/fabric/src/components/CurrencyInput/index.tsx
@@ -94,7 +94,7 @@ export const CurrencyInput: React.FC<CurrencyInputProps> = ({
   placeholder = '0.0',
   variant = 'large',
   initialValue,
-  precision = 2,
+  precision = 6,
   ...inputProps
 }) => {
   const [value, setValue] = React.useState(initialValue ? formatThousandSeparator(initialValue) : '')
@@ -108,16 +108,15 @@ export const CurrencyInput: React.FC<CurrencyInputProps> = ({
     }
   }
 
-  // Disabled for now, because it's janky as hell
-  // TODO: fix it
-  // React.useEffect(() => {
-  //   if (inputProps.value) {
-  //     const inputFormatted = formatThousandSeparator(
-  //       Math.floor((inputProps.value as number) * 10 ** precision) / 10 ** precision
-  //     )
-  //     setValue(inputFormatted)
-  //   }
-  // }, [inputProps.value])
+  // TODO: fix jank when typing more decimals than precision allows
+  React.useLayoutEffect(() => {
+    if (inputProps.value) {
+      const inputFormatted = formatThousandSeparator(
+        Math.floor((inputProps.value as number) * 10 ** precision) / 10 ** precision
+      )
+      setValue(inputFormatted)
+    }
+  }, [inputProps.value])
 
   return (
     <InputBox