verbiage, date format, settlement price

centrifuge · Sep 15, 2023 · 1a7e035 · 1a7e035
1 parent 1020c64
commit 1a7e035
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx b/centrifuge-app/src/pages/Loan/ExternalFinanceForm.tsx
@@ -118,7 +118,7 @@ export function ExternalFinanceForm({ loan }: { loan: LoanType }) {
       <Stack as={Card} gap={2} p={2}>
         <Box paddingY={1}>
           <Text variant="heading4">
-            To finance the asset, enter face value and settlement price of the treasury bill.
+            To finance the asset, enter face value and settlement price of the transaction.
           </Text>
         </Box>
         {availableFinancing.greaterThan(0) && !maturityDatePassed && (

diff --git a/centrifuge-app/src/pages/Loan/PricingValues.tsx b/centrifuge-app/src/pages/Loan/PricingValues.tsx
@@ -24,7 +24,7 @@ export function PricingValues({ loan: { pricing }, pool }: Props) {
       <>
         <LabelValueStack label="ISIN" value={pricing.Isin} />
         <LabelValueStack
-          label="Current price"
+          label="Latest price"
           value={`${formatBalance(
             new CurrencyBalance(pricing.oracle.value.toString(), 18).toDecimal(),
             pool.currency.symbol,

diff --git a/centrifuge-app/src/pages/Loan/index.tsx b/centrifuge-app/src/pages/Loan/index.tsx
@@ -27,7 +27,7 @@ import { Tooltips } from '../../components/Tooltips'
 import { nftMetadataSchema } from '../../schemas'
 import { LoanTemplate } from '../../types'
 import { copyToClipboard } from '../../utils/copyToClipboard'
-import { daysBetween, formatDate } from '../../utils/date'
+import { daysBetween, formatDate, isValidDate } from '../../utils/date'
 import { formatBalance, truncateText } from '../../utils/formatting'
 import { useAddress } from '../../utils/useAddress'
 import { useLoan, useNftDocumentId } from '../../utils/useLoans'
@@ -181,7 +181,9 @@ const Loan: React.FC<{ setShowOraclePricing?: () => void }> = ({ setShowOraclePr
                 ?.filter((key) => templateMetadata?.attributes?.[key].public)
                 .map((key) => ({
                   label: templateMetadata?.attributes?.[key].label,
-                  value: nftMetadata?.properties[key],
+                  value: isValidDate(nftMetadata?.properties[key])
+                    ? formatDate(nftMetadata?.properties[key])
+                    : nftMetadata?.properties[key],
                 })) || []),
               {
                 label: 'Maturity date',

diff --git a/centrifuge-app/src/utils/date.ts b/centrifuge-app/src/utils/date.ts
@@ -45,3 +45,8 @@ export function millisecondsToDays(milliseconds: number): number {
   const days = milliseconds / (1000 * 60 * 60 * 24)
   return Math.round(days)
 }
+
+export function isValidDate(value: string) {
+  const date = new Date(value)
+  return !isNaN(date.getTime())
+}
diff --git a/centrifuge-app/src/utils/validation/index.ts b/centrifuge-app/src/utils/validation/index.ts
@@ -32,8 +32,12 @@ export const positiveNumber = (err?: CustomError) => (val?: any) => {
 }
 
 export const settlementPrice = (err?: CustomError) => (val?: any) => {
+  if (val < 1) {
+    return getError('Value must be equal to or larger than 1', err, val)
+  }
+
   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)
+  return regex.test(val) ? '' : getError('Value must be in the format of (1-3).(0-6) digits', err, val)
 }
 
 export const maxDecimals = (decimals: number, err?: CustomError) => (val?: any) => {