From bdad087afdad528cfc4d8e04be14d116bd79fd11 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Fri, 11 Oct 2024 13:44:57 -0400
Subject: [PATCH 1/7] Update inputs, UI, and types to support multiple ratings

---
 .../src/components/IssuerSection.tsx          | 42 +++++++-----
 .../components/PoolOverview/KeyMetrics.tsx    | 52 ++++++---------
 .../IssuerCreatePool/PoolRatingInput.tsx      | 64 +++++++++++++++----
 .../src/pages/IssuerCreatePool/index.tsx      | 32 +++++-----
 .../pages/IssuerPool/Configuration/Issuer.tsx | 20 +++---
 centrifuge-js/src/modules/pools.ts            | 30 ++++-----
 6 files changed, 132 insertions(+), 108 deletions(-)

diff --git a/centrifuge-app/src/components/IssuerSection.tsx b/centrifuge-app/src/components/IssuerSection.tsx
index 8ba196b26..29a8570e5 100644
--- a/centrifuge-app/src/components/IssuerSection.tsx
+++ b/centrifuge-app/src/components/IssuerSection.tsx
@@ -207,27 +207,35 @@ const Links = ({ links }: { links: { label: string; href?: string; show: boolean
 }
 
 export function RatingDetails({ metadata }: IssuerSectionProps) {
-  const rating = metadata?.pool?.rating
+  const ratings = metadata?.pool?.poolRatings
 
-  return rating?.ratingAgency || rating?.ratingValue || rating?.ratingReportUrl ? (
+  return ratings?.length ? (
     <Stack gap={1}>
       <Text variant="heading2">Pool rating</Text>
       <Shelf flexDirection="column" alignItems="flex-start">
-        <Shelf gap={1}>
-          {rating.ratingAgency && (
-            <LabelValueStack label="Rating agency" value={<Text variant="body2">{rating.ratingAgency}</Text>} />
-          )}
-          {rating.ratingValue && (
-            <LabelValueStack label="Rating" value={<Text variant="body2">{rating.ratingValue}</Text>} />
-          )}
-        </Shelf>
-      </Shelf>
-      <Shelf>
-        {rating?.ratingReportUrl && (
-          <AnchorButton href={rating.ratingReportUrl} target="_blank" variant="secondary" icon={IconExternalLink}>
-            View full report
-          </AnchorButton>
-        )}
+        {ratings?.map((rating) => {
+          return (
+            <Stack gap={1} key={rating.agency}>
+              <Shelf flexDirection="column" alignItems="flex-start">
+                <Shelf gap={1}>
+                  {rating.agency && (
+                    <LabelValueStack label="Rating agency" value={<Text variant="body2">{rating.agency}</Text>} />
+                  )}
+                  {rating.value && (
+                    <LabelValueStack label="Rating" value={<Text variant="body2">{rating.value}</Text>} />
+                  )}
+                </Shelf>
+              </Shelf>
+              <Shelf>
+                {rating?.reportUrl && (
+                  <AnchorButton href={rating.reportUrl} target="_blank" variant="secondary" icon={IconExternalLink}>
+                    View full report
+                  </AnchorButton>
+                )}
+              </Shelf>
+            </Stack>
+          )
+        })}
       </Shelf>
     </Stack>
   ) : null
diff --git a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
index ed169d950..bd25addf7 100644
--- a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
+++ b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
@@ -144,39 +144,27 @@ export const KeyMetrics = ({ poolId }: Props) => {
       metric: 'Pool structure',
       value: metadata?.pool?.poolStructure ? metadata?.pool?.poolStructure : '-',
     },
-    ...(metadata?.pool?.rating?.ratingValue
-      ? [
-          {
-            metric: 'Rating',
-            value: (
-              <Tooltip
-                delay={300}
-                bodyWidth="maxContent"
-                body={
-                  <TooltipBody
-                    title={metadata?.pool?.rating?.ratingAgency ?? ''}
-                    subtitle="View Report"
-                    url={metadata?.pool?.rating?.ratingReportUrl ?? ''}
-                  />
-                }
+    ...(metadata?.pool?.poolRatings?.length
+      ? metadata?.pool?.poolRatings.map((rating) => ({
+          metric: 'Rating',
+          value: (
+            <Tooltip
+              delay={300}
+              bodyWidth="maxContent"
+              body={<TooltipBody title={rating.agency ?? ''} subtitle="View Report" url={rating.reportUrl ?? ''} />}
+            >
+              <Box
+                border={`1px solid ${theme.colors.backgroundInverted}`}
+                borderRadius={20}
+                padding="2px 10px"
+                display="flex"
               >
-                <Box
-                  border={`1px solid ${theme.colors.backgroundInverted}`}
-                  borderRadius={20}
-                  padding="2px 10px"
-                  display="flex"
-                >
-                  {metadata?.pool?.rating?.ratingAgency?.includes('moody') ? (
-                    <IconMoody size={16} />
-                  ) : (
-                    <IconSp size={16} />
-                  )}
-                  <Text>{metadata?.pool?.rating?.ratingValue}</Text>
-                </Box>
-              </Tooltip>
-            ),
-          },
-        ]
+                {rating.agency?.includes('moody') ? <IconMoody size={16} /> : <IconSp size={16} />}
+                <Text>{rating.value}</Text>
+              </Box>
+            </Tooltip>
+          ),
+        }))
       : []),
 
     {
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx b/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
index c46c6c94d..94948a00b 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
@@ -1,20 +1,56 @@
-import { Grid, Stack, Text, TextInput } from '@centrifuge/fabric'
+import { PoolMetadataInput } from '@centrifuge/centrifuge-js'
+import { Box, Button, Grid, IconMinusCircle, Shelf, Stack, Text, TextInput } from '@centrifuge/fabric'
+import { FieldArray, useFormikContext } from 'formik'
 import { FieldWithErrorMessage } from '../../components/FieldWithErrorMessage'
 
 export function PoolRatingInput() {
+  const form = useFormikContext<PoolMetadataInput>()
+  console.log('🚀 ~ form:', form.values.poolRatings)
   return (
-    <Stack gap={2}>
-      <Text variant="heading2">Pool rating</Text>
-      <Grid columns={[1, 2]} equalColumns gap={2} rowGap={3}>
-        <FieldWithErrorMessage name="ratingAgency" as={TextInput} label="Rating agency" placeholder="Agency Name..." />
-        <FieldWithErrorMessage name="ratingValue" as={TextInput} label="Rating" placeholder="Rating value..." />
-        <FieldWithErrorMessage
-          name="ratingReportUrl"
-          as={TextInput}
-          label="Rating report URL"
-          placeholder="https://..."
-        />
-      </Grid>
-    </Stack>
+    <FieldArray name="poolRatings">
+      {({ push, remove }) => (
+        <Stack gap={2}>
+          <Shelf justifyContent="space-between" gap={2}>
+            <Text variant="heading2">Pool rating</Text>
+            <Button variant="secondary" small onClick={() => push({ agency: '', value: '', reportUrl: '' })}>
+              {form.values.poolRatings.length ? 'Add another' : 'Add'}
+            </Button>
+          </Shelf>
+          <Stack gap={3}>
+            {form.values.poolRatings.length
+              ? form.values.poolRatings.map((rating, index) => (
+                  <Shelf key={index} gap={2}>
+                    <>
+                      <Grid flex={1} columns={[1, 2]} equalColumns gap={2} rowGap={3}>
+                        <FieldWithErrorMessage
+                          name={`poolRatings.${index}.agency`}
+                          as={TextInput}
+                          label="Rating agency"
+                          placeholder="Agency Name..."
+                        />
+                        <FieldWithErrorMessage
+                          name={`poolRatings.${index}.value`}
+                          as={TextInput}
+                          label="Rating"
+                          placeholder="Rating value..."
+                        />
+                        <FieldWithErrorMessage
+                          name={`poolRatings.${index}.reportUrl`}
+                          as={TextInput}
+                          label="Rating report URL"
+                          placeholder="https://..."
+                        />
+                      </Grid>
+                    </>
+                    <Box pt={1}>
+                      <Button variant="tertiary" icon={IconMinusCircle} onClick={() => remove(index)} />
+                    </Box>
+                  </Shelf>
+                ))
+              : null}
+          </Stack>
+        </Stack>
+      )}
+    </FieldArray>
   )
 }
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
index 33eddcef8..a240ed960 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
@@ -115,9 +115,11 @@ export type CreatePoolValues = Omit<
   investorType: string
   issuerShortDescription: string
   issuerCategories: { type: string; value: string }[]
-  ratingAgency: string
-  ratingValue: string
-  ratingReportUrl: string
+  poolRatings: {
+    agency?: string
+    value?: string
+    reportUrl?: string
+  }[]
   poolStructure: string
 }
 
@@ -150,9 +152,7 @@ const initialValues: CreatePoolValues = {
   reportAuthorAvatar: null,
   reportUrl: '',
 
-  ratingAgency: '',
-  ratingValue: '',
-  ratingReportUrl: '',
+  poolRatings: [],
 
   tranches: [createEmptyTranche('')],
   adminMultisig: {
@@ -466,12 +466,12 @@ function CreatePoolForm() {
           url: values.reportUrl,
         }
       }
-      if (values.ratingReportUrl) {
-        metadataValues.poolRating = {
-          ratingAgency: values.ratingAgency,
-          ratingValue: values.ratingValue,
-          ratingReportUrl: values.ratingReportUrl,
-        }
+      if (values.poolRatings.length > 0) {
+        metadataValues.poolRatings = values.poolRatings.map((rating) => ({
+          agency: rating.agency,
+          value: rating.value,
+          reportUrl: rating.reportUrl,
+        }))
       }
 
       const nonJuniorTranches = metadataValues.tranches.slice(1)
@@ -631,7 +631,7 @@ function CreatePoolForm() {
                   {({ field, form, meta }: FieldProps) => (
                     <Select
                       name="poolType"
-                      label={<Tooltips type="poolType" variant="secondary" />}
+                      label={<Tooltips type="poolType" size="sm" />}
                       onChange={(event) => form.setFieldValue('poolType', event.target.value)}
                       onBlur={field.onBlur}
                       errorMessage={meta.touched && meta.error ? meta.error : undefined}
@@ -668,7 +668,7 @@ function CreatePoolForm() {
                   {({ field, meta, form }: FieldProps) => (
                     <Select
                       name="assetClass"
-                      label={<Tooltips type="assetClass" label="Asset class*" variant="secondary" />}
+                      label={<Tooltips type="assetClass" label="Asset class*" size="sm" />}
                       onChange={(event) => {
                         form.setFieldValue('assetClass', event.target.value)
                         form.setFieldValue('subAssetClass', '', false)
@@ -687,7 +687,7 @@ function CreatePoolForm() {
                   {({ field, meta, form }: FieldProps) => (
                     <FieldWithErrorMessage
                       name="investorType"
-                      label={<Tooltips type="investorType" label="Investor Type*" variant="secondary" />}
+                      label={<Tooltips type="investorType" label="Investor Type*" size="sm" />}
                       onChange={(event: any) => form.setFieldValue('investorType', event.target.value)}
                       onBlur={field.onBlur}
                       errorMessage={meta.touched && meta.error ? meta.error : undefined}
@@ -719,7 +719,7 @@ function CreatePoolForm() {
                     return (
                       <Select
                         name="currency"
-                        label={<Tooltips type="currency" label="Currency*" variant="secondary" />}
+                        label={<Tooltips type="currency" label="Currency*" size="sm" />}
                         onChange={(event) => form.setFieldValue('currency', event.target.value)}
                         onBlur={field.onBlur}
                         errorMessage={meta.touched && meta.error ? meta.error : undefined}
diff --git a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
index e7edcf09d..f132668c5 100644
--- a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
@@ -34,9 +34,7 @@ type Values = Pick<
   | 'reportUrl'
   | 'reportAuthorName'
   | 'reportAuthorTitle'
-  | 'ratingAgency'
-  | 'ratingValue'
-  | 'ratingReportUrl'
+  | 'poolRatings'
 > & {
   reportAuthorAvatar: string | null | File
 }
@@ -73,9 +71,7 @@ export function Issuer() {
       reportAuthorAvatar: metadata?.pool?.reports?.[0]?.author?.avatar
         ? `avatar.${metadata.pool.reports[0].author.avatar.mime?.split('/')[1]}`
         : null,
-      ratingAgency: metadata?.pool?.rating?.ratingAgency ?? '',
-      ratingValue: metadata?.pool?.rating?.ratingValue ?? '',
-      ratingReportUrl: metadata?.pool?.rating?.ratingReportUrl ?? '',
+      poolRatings: metadata?.pool?.poolRatings ?? [],
     }),
     [metadata, logoFile]
   )
@@ -132,11 +128,11 @@ export function Issuer() {
             website: values.website,
           },
           details: values.details,
-          rating: {
-            ratingAgency: values.ratingAgency,
-            ratingValue: values.ratingValue,
-            ratingReportUrl: values.ratingReportUrl,
-          },
+          poolRatings: values.poolRatings.map((rating) => ({
+            agency: rating.agency ?? '',
+            value: rating.value ?? '',
+            reportUrl: rating.reportUrl ?? '',
+          })),
         },
       }
 
@@ -220,7 +216,7 @@ export function Issuer() {
             <Stack gap={2}>
               <IssuerDetails metadata={metadata} />
               {metadata?.pool?.reports?.[0] && <PoolAnalysis inverted metadata={metadata} />}
-              {metadata?.pool?.rating && <RatingDetails metadata={metadata} />}
+              {metadata?.pool?.poolRatings?.length && <RatingDetails metadata={metadata} />}
             </Stack>
           )}
         </PageSection>
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 9dd6e73b5..c854c65bb 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -692,11 +692,11 @@ export interface PoolMetadataInput {
     authorAvatar: FileType | null
     url: string
   }
-  poolRating?: {
-    ratingAgency?: string
-    ratingValue?: string
-    ratingReportUrl?: string
-  }
+  poolRatings: {
+    agency?: string
+    value?: string
+    reportUrl?: string
+  }[]
 
   executiveSummary: FileType | null
   website: string
@@ -760,11 +760,11 @@ export type PoolMetadata = {
     status: PoolStatus
     listed: boolean
     reports?: PoolReport[]
-    rating?: {
-      ratingAgency?: string
-      ratingValue?: string
-      ratingReportUrl?: string
-    }
+    poolRatings?: {
+      agency?: string
+      value?: string
+      reportUrl?: string
+    }[]
   }
   pod?: {
     indexer?: string | null
@@ -851,6 +851,7 @@ export type AssetTransaction = {
     id: string
     metadata: string
     type: AssetType
+    currentPrice: string | null
   }
   fromAsset?: {
     id: string
@@ -1144,13 +1145,7 @@ export function getPoolsModule(inst: Centrifuge) {
         status: 'open',
         listed: metadata.listed ?? true,
         poolFees: metadata.poolFees,
-        rating: metadata.poolRating
-          ? {
-              ratingAgency: metadata.poolRating.ratingAgency,
-              ratingValue: metadata.poolRating.ratingValue,
-              ratingReportUrl: metadata.poolRating.ratingReportUrl,
-            }
-          : undefined,
+        poolRatings: metadata.poolRatings.length > 0 ? metadata.poolRatings : [],
         reports: metadata.poolReport
           ? [
               {
@@ -3199,6 +3194,7 @@ export function getPoolsModule(inst: Centrifuge) {
             realizedProfitFifo
             asset {
               id
+              currentPrice
               metadata
               name
               type

From 1c309aeb83e69de68fc3de651403f7182f95f461 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Fri, 11 Oct 2024 18:06:05 -0400
Subject: [PATCH 2/7] Add report pdf support

---
 .../src/components/IssuerSection.tsx          | 13 +++-
 .../components/PoolOverview/KeyMetrics.tsx    | 71 ++++++++++++-------
 .../IssuerCreatePool/PoolRatingInput.tsx      | 26 +++++--
 .../src/pages/IssuerCreatePool/index.tsx      | 44 ++++++++----
 .../pages/IssuerPool/Configuration/Issuer.tsx | 52 ++++++++++----
 centrifuge-js/src/modules/pools.ts            |  4 +-
 6 files changed, 152 insertions(+), 58 deletions(-)

diff --git a/centrifuge-app/src/components/IssuerSection.tsx b/centrifuge-app/src/components/IssuerSection.tsx
index 29a8570e5..cb47d4670 100644
--- a/centrifuge-app/src/components/IssuerSection.tsx
+++ b/centrifuge-app/src/components/IssuerSection.tsx
@@ -208,6 +208,7 @@ const Links = ({ links }: { links: { label: string; href?: string; show: boolean
 
 export function RatingDetails({ metadata }: IssuerSectionProps) {
   const ratings = metadata?.pool?.poolRatings
+  const cent = useCentrifuge()
 
   return ratings?.length ? (
     <Stack gap={1}>
@@ -226,12 +227,22 @@ export function RatingDetails({ metadata }: IssuerSectionProps) {
                   )}
                 </Shelf>
               </Shelf>
-              <Shelf>
+              <Shelf gap={2}>
                 {rating?.reportUrl && (
                   <AnchorButton href={rating.reportUrl} target="_blank" variant="secondary" icon={IconExternalLink}>
                     View full report
                   </AnchorButton>
                 )}
+                {rating?.reportFile && (
+                  <AnchorButton
+                    href={cent.metadata.parseMetadataUrl(rating.reportFile.uri)}
+                    target="_blank"
+                    variant="secondary"
+                    icon={IconExternalLink}
+                  >
+                    Download report
+                  </AnchorButton>
+                )}
               </Shelf>
             </Stack>
           )
diff --git a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
index bd25addf7..a49fffceb 100644
--- a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
+++ b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
@@ -1,5 +1,5 @@
 import { CurrencyBalance, DailyTrancheState, Price } from '@centrifuge/centrifuge-js'
-import { NetworkIcon, formatBalanceAbbreviated } from '@centrifuge/centrifuge-react'
+import { NetworkIcon, formatBalanceAbbreviated, useCentrifuge } from '@centrifuge/centrifuge-react'
 import { Box, Card, IconArrowRightWhite, IconMoody, IconSp, Shelf, Stack, Text, Tooltip } from '@centrifuge/fabric'
 import capitalize from 'lodash/capitalize'
 import startCase from 'lodash/startCase'
@@ -66,6 +66,7 @@ export const KeyMetrics = ({ poolId }: Props) => {
   const tranchesIds = pool.tranches.map((tranche) => tranche.id)
   const dailyTranches = useDailyTranchesStates(tranchesIds)
   const theme = useTheme()
+  const cent = useCentrifuge()
   const averageMaturity = useAverageMaturity(poolId)
 
   const expenseRatio = useMemo(() => {
@@ -148,21 +149,38 @@ export const KeyMetrics = ({ poolId }: Props) => {
       ? metadata?.pool?.poolRatings.map((rating) => ({
           metric: 'Rating',
           value: (
-            <Tooltip
-              delay={300}
-              bodyWidth="maxContent"
-              body={<TooltipBody title={rating.agency ?? ''} subtitle="View Report" url={rating.reportUrl ?? ''} />}
-            >
-              <Box
-                border={`1px solid ${theme.colors.backgroundInverted}`}
-                borderRadius={20}
-                padding="2px 10px"
-                display="flex"
+            <Shelf gap={2}>
+              <Tooltip
+                delay={300}
+                bodyWidth="maxContent"
+                body={
+                  <TooltipBody
+                    title={rating.agency ?? ''}
+                    links={[
+                      { text: 'View report', url: rating.reportUrl ?? '' },
+                      ...(rating.reportFile
+                        ? [
+                            {
+                              text: 'Download report',
+                              url: cent.metadata.parseMetadataUrl(rating.reportFile?.uri ?? ''),
+                            },
+                          ]
+                        : []),
+                    ]}
+                  />
+                }
               >
-                {rating.agency?.includes('moody') ? <IconMoody size={16} /> : <IconSp size={16} />}
-                <Text>{rating.value}</Text>
-              </Box>
-            </Tooltip>
+                <Box
+                  border={`1px solid ${theme.colors.backgroundInverted}`}
+                  borderRadius={20}
+                  padding="2px 10px"
+                  display="flex"
+                >
+                  {rating.agency?.includes('moody') ? <IconMoody size={16} /> : <IconSp size={16} />}
+                  <Text>{rating.value}</Text>
+                </Box>
+              </Tooltip>
+            </Shelf>
           ),
         }))
       : []),
@@ -220,21 +238,26 @@ const TooltipBody = ({
         </Text>
         {links ? (
           links.map((link, index) => (
-            <a key={index} target="_blank" rel="noopener noreferrer" href={link.url}>
+            <Shelf>
+              <a key={`${link.text}-${index}`} target="_blank" rel="noopener noreferrer" href={link.url}>
+                <Text variant="body3" color="white">
+                  {link.text}
+                </Text>
+              </a>
+              <IconArrowRightWhite size="iconSmall" />
+            </Shelf>
+          ))
+        ) : (
+          <Shelf>
+            <a target="_blank" rel="noopener noreferrer" href={url}>
               <Text variant="body3" color="white">
                 {subtitle}
               </Text>
             </a>
-          ))
-        ) : (
-          <a target="_blank" rel="noopener noreferrer" href={url}>
-            <Text variant="body3" color="white">
-              {subtitle}
-            </Text>
-          </a>
+            <IconArrowRightWhite size="iconSmall" />
+          </Shelf>
         )}
       </Box>
-      <IconArrowRightWhite size="iconSmall" />
     </Box>
   )
 }
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx b/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
index 94948a00b..b78183697 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/PoolRatingInput.tsx
@@ -1,18 +1,21 @@
 import { PoolMetadataInput } from '@centrifuge/centrifuge-js'
-import { Box, Button, Grid, IconMinusCircle, Shelf, Stack, Text, TextInput } from '@centrifuge/fabric'
-import { FieldArray, useFormikContext } from 'formik'
+import { Box, Button, FileUpload, Grid, IconMinusCircle, Shelf, Stack, Text, TextInput } from '@centrifuge/fabric'
+import { Field, FieldArray, FieldProps, useFormikContext } from 'formik'
 import { FieldWithErrorMessage } from '../../components/FieldWithErrorMessage'
 
 export function PoolRatingInput() {
   const form = useFormikContext<PoolMetadataInput>()
-  console.log('🚀 ~ form:', form.values.poolRatings)
   return (
     <FieldArray name="poolRatings">
       {({ push, remove }) => (
         <Stack gap={2}>
           <Shelf justifyContent="space-between" gap={2}>
             <Text variant="heading2">Pool rating</Text>
-            <Button variant="secondary" small onClick={() => push({ agency: '', value: '', reportUrl: '' })}>
+            <Button
+              variant="secondary"
+              small
+              onClick={() => push({ agency: '', value: '', reportUrl: '', reportFile: null })}
+            >
               {form.values.poolRatings.length ? 'Add another' : 'Add'}
             </Button>
           </Shelf>
@@ -40,6 +43,21 @@ export function PoolRatingInput() {
                           label="Rating report URL"
                           placeholder="https://..."
                         />
+                        <Field name={`poolRatings.${index}.reportFile`}>
+                          {({ field, meta, form }: FieldProps) => (
+                            <FileUpload
+                              file={field.value}
+                              onFileChange={(file) => {
+                                form.setFieldTouched(`poolRatings.${index}.reportFile`, true, false)
+                                form.setFieldValue(`poolRatings.${index}.reportFile`, file)
+                              }}
+                              accept="application/pdf"
+                              label="Report PDF"
+                              placeholder="Choose file"
+                              errorMessage={meta.touched && meta.error ? meta.error : undefined}
+                            />
+                          )}
+                        </Field>
                       </Grid>
                     </>
                     <Box pt={1}>
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
index a240ed960..27c95509d 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
@@ -3,6 +3,7 @@ import {
   AddFee,
   CurrencyKey,
   FeeTypes,
+  FileType,
   PoolMetadataInput,
   TrancheInput,
 } from '@centrifuge/centrifuge-js/dist/modules/pools'
@@ -91,7 +92,7 @@ export const createEmptyTranche = (trancheName: string): Tranche => ({
 
 export type CreatePoolValues = Omit<
   PoolMetadataInput,
-  'poolIcon' | 'issuerLogo' | 'executiveSummary' | 'adminMultisig' | 'poolFees' | 'poolReport'
+  'poolIcon' | 'issuerLogo' | 'executiveSummary' | 'adminMultisig' | 'poolFees' | 'poolReport' | 'poolRatings'
 > & {
   poolIcon: File | null
   issuerLogo: File | null
@@ -119,6 +120,7 @@ export type CreatePoolValues = Omit<
     agency?: string
     value?: string
     reportUrl?: string
+    reportFile?: File | null
   }[]
   poolStructure: string
 }
@@ -426,15 +428,20 @@ function CreatePoolForm() {
         return
       }
 
+      const pinFile = async (file: File): Promise<FileType> => {
+        const pinned = await lastValueFrom(centrifuge.metadata.pinFile(await getFileDataURI(file)))
+        return { uri: pinned.uri, mime: file.type }
+      }
+
       // Handle pinning files (pool icon, issuer logo, and executive summary)
-      const promises = [lastValueFrom(centrifuge.metadata.pinFile(await getFileDataURI(values.poolIcon)))]
+      const promises = [pinFile(values.poolIcon)]
 
       if (values.issuerLogo) {
-        promises.push(lastValueFrom(centrifuge.metadata.pinFile(await getFileDataURI(values.issuerLogo))))
+        promises.push(pinFile(values.issuerLogo))
       }
 
       if (!isTestEnv && values.executiveSummary) {
-        promises.push(lastValueFrom(centrifuge.metadata.pinFile(await getFileDataURI(values.executiveSummary))))
+        promises.push(pinFile(values.executiveSummary))
       }
 
       const [pinnedPoolIcon, pinnedIssuerLogo, pinnedExecSummary] = await Promise.all(promises)
@@ -454,9 +461,7 @@ function CreatePoolForm() {
       if (values.reportUrl) {
         let avatar = null
         if (values.reportAuthorAvatar) {
-          const pinned = await lastValueFrom(
-            centrifuge.metadata.pinFile(await getFileDataURI(values.reportAuthorAvatar))
-          )
+          const pinned = await pinFile(values.reportAuthorAvatar)
           avatar = { uri: pinned.uri, mime: values.reportAuthorAvatar.type }
         }
         metadataValues.poolReport = {
@@ -466,12 +471,25 @@ function CreatePoolForm() {
           url: values.reportUrl,
         }
       }
-      if (values.poolRatings.length > 0) {
-        metadataValues.poolRatings = values.poolRatings.map((rating) => ({
-          agency: rating.agency,
-          value: rating.value,
-          reportUrl: rating.reportUrl,
-        }))
+      if (values.poolRatings) {
+        const newRatingReportPromise = await Promise.all(
+          values.poolRatings.map((rating) => (rating.reportFile ? pinFile(rating.reportFile) : null))
+        )
+        const ratings = values.poolRatings.map((rating, index) => {
+          let reportFile: FileType | null = rating.reportFile
+            ? { uri: rating.reportFile.name, mime: rating.reportFile.type }
+            : null
+          if (rating.reportFile && newRatingReportPromise[index]?.uri) {
+            reportFile = newRatingReportPromise[index] ?? null
+          }
+          return {
+            agency: rating.agency ?? '',
+            value: rating.value ?? '',
+            reportUrl: rating.reportUrl ?? '',
+            reportFile: reportFile ?? null,
+          }
+        })
+        metadataValues.poolRatings = ratings
       }
 
       const nonJuniorTranches = metadataValues.tranches.slice(1)
diff --git a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
index f132668c5..90659f6ce 100644
--- a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
@@ -1,4 +1,4 @@
-import { PoolMetadata } from '@centrifuge/centrifuge-js'
+import { FileType, PoolMetadata } from '@centrifuge/centrifuge-js'
 import { useCentrifuge, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
 import { Button, Stack } from '@centrifuge/fabric'
 import { Form, FormikProvider, useFormik } from 'formik'
@@ -71,7 +71,11 @@ export function Issuer() {
       reportAuthorAvatar: metadata?.pool?.reports?.[0]?.author?.avatar
         ? `avatar.${metadata.pool.reports[0].author.avatar.mime?.split('/')[1]}`
         : null,
-      poolRatings: metadata?.pool?.poolRatings ?? [],
+      poolRatings:
+        metadata?.pool?.poolRatings?.map((rating) => ({
+          ...rating,
+          reportFile: rating.reportFile ? `report.${rating.reportFile.mime?.split('/')[1]}` : ('' as any),
+        })) ?? [],
     }),
     [metadata, logoFile]
   )
@@ -89,21 +93,24 @@ export function Issuer() {
       const execSummaryChanged = values.executiveSummary !== initialValues.executiveSummary
       const logoChanged = values.issuerLogo !== initialValues.issuerLogo
 
+      const pinFile = async (file: File) => {
+        const pinned = await lastValueFrom(cent.metadata.pinFile(await getFileDataURI(file as File)))
+        return { uri: pinned.uri, mime: (file as File).type }
+      }
+
       if (!hasChanges) {
         setIsEditing(false)
         actions.setSubmitting(false)
         return
       }
       let execSummaryUri
-      if (execSummaryChanged) {
-        execSummaryUri = (
-          await lastValueFrom(cent.metadata.pinFile(await getFileDataURI(values.executiveSummary as File)))
-        ).uri
+      if (execSummaryChanged && values.executiveSummary) {
+        execSummaryUri = (await pinFile(values.executiveSummary)).uri
         prefetchMetadata(execSummaryUri)
       }
       let logoUri
       if (logoChanged && values.issuerLogo) {
-        logoUri = (await lastValueFrom(cent.metadata.pinFile(await getFileDataURI(values.issuerLogo as File)))).uri
+        logoUri = (await pinFile(values.issuerLogo)).uri
         prefetchMetadata(logoUri)
       }
       const newPoolMetadata: PoolMetadata = {
@@ -128,11 +135,6 @@ export function Issuer() {
             website: values.website,
           },
           details: values.details,
-          poolRatings: values.poolRatings.map((rating) => ({
-            agency: rating.agency ?? '',
-            value: rating.value ?? '',
-            reportUrl: rating.reportUrl ?? '',
-          })),
         },
       }
 
@@ -140,9 +142,7 @@ export function Issuer() {
         let avatar = null
         const avatarChanged = values.reportAuthorAvatar !== initialValues.reportAuthorAvatar
         if (avatarChanged && values.reportAuthorAvatar) {
-          const pinned = await lastValueFrom(
-            cent.metadata.pinFile(await getFileDataURI(values.reportAuthorAvatar as File))
-          )
+          const pinned = await pinFile(values.reportAuthorAvatar as File)
           avatar = { uri: pinned.uri, mime: (values.reportAuthorAvatar as File).type }
         }
         newPoolMetadata.pool.reports = [
@@ -157,6 +157,28 @@ export function Issuer() {
         ]
       }
 
+      if (values.poolRatings) {
+        const newRatingReportPromise = await Promise.all(
+          values.poolRatings.map((rating) => (rating.reportFile ? pinFile(rating.reportFile) : null))
+        )
+
+        const ratings = values.poolRatings.map((rating, index) => {
+          let reportFile: FileType | null = rating.reportFile
+            ? { uri: rating.reportFile.name, mime: rating.reportFile.type }
+            : null
+          if (rating.reportFile && newRatingReportPromise[index]?.uri) {
+            reportFile = newRatingReportPromise[index] ?? null
+          }
+          return {
+            agency: rating.agency ?? '',
+            value: rating.value ?? '',
+            reportUrl: rating.reportUrl ?? '',
+            reportFile: reportFile ?? null,
+          }
+        })
+        newPoolMetadata.pool.poolRatings = ratings
+      }
+
       execute([poolId, newPoolMetadata], { account })
       actions.setSubmitting(false)
     },
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index c854c65bb..bd72e2e6c 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -653,7 +653,7 @@ export type IssuerDetail = {
   body: string
 }
 
-type FileType = { uri: string; mime: string }
+export type FileType = { uri: string; mime: string }
 
 export type PoolReport = {
   author: {
@@ -696,6 +696,7 @@ export interface PoolMetadataInput {
     agency?: string
     value?: string
     reportUrl?: string
+    reportFile?: FileType | null
   }[]
 
   executiveSummary: FileType | null
@@ -764,6 +765,7 @@ export type PoolMetadata = {
       agency?: string
       value?: string
       reportUrl?: string
+      reportFile?: FileType | null
     }[]
   }
   pod?: {

From 55d702faca85a3069e59f2af63b004ae46665067 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Fri, 11 Oct 2024 18:10:40 -0400
Subject: [PATCH 3/7] Undo

---
 centrifuge-js/src/modules/pools.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index bd72e2e6c..2d4a23161 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -3196,7 +3196,6 @@ export function getPoolsModule(inst: Centrifuge) {
             realizedProfitFifo
             asset {
               id
-              currentPrice
               metadata
               name
               type

From d340fa2e56b1df0a5c324a487ad6fbd78a9a3309 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Tue, 15 Oct 2024 12:07:54 -0400
Subject: [PATCH 4/7] Improve rendering of multiple ratings

---
 .../components/PoolOverview/KeyMetrics.tsx    | 78 ++++++++++---------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
index a49fffceb..cee233c48 100644
--- a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
+++ b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
@@ -146,43 +146,47 @@ export const KeyMetrics = ({ poolId }: Props) => {
       value: metadata?.pool?.poolStructure ? metadata?.pool?.poolStructure : '-',
     },
     ...(metadata?.pool?.poolRatings?.length
-      ? metadata?.pool?.poolRatings.map((rating) => ({
-          metric: 'Rating',
-          value: (
-            <Shelf gap={2}>
-              <Tooltip
-                delay={300}
-                bodyWidth="maxContent"
-                body={
-                  <TooltipBody
-                    title={rating.agency ?? ''}
-                    links={[
-                      { text: 'View report', url: rating.reportUrl ?? '' },
-                      ...(rating.reportFile
-                        ? [
-                            {
-                              text: 'Download report',
-                              url: cent.metadata.parseMetadataUrl(rating.reportFile?.uri ?? ''),
-                            },
-                          ]
-                        : []),
-                    ]}
-                  />
-                }
-              >
-                <Box
-                  border={`1px solid ${theme.colors.backgroundInverted}`}
-                  borderRadius={20}
-                  padding="2px 10px"
-                  display="flex"
-                >
-                  {rating.agency?.includes('moody') ? <IconMoody size={16} /> : <IconSp size={16} />}
-                  <Text>{rating.value}</Text>
-                </Box>
-              </Tooltip>
-            </Shelf>
-          ),
-        }))
+      ? [
+          {
+            metric: 'Rating',
+            value: (
+              <Shelf gap={1}>
+                {metadata?.pool?.poolRatings.map((rating) => (
+                  <Tooltip
+                    delay={300}
+                    bodyWidth="maxContent"
+                    body={
+                      <TooltipBody
+                        title={rating.agency ?? ''}
+                        links={[
+                          { text: 'View report', url: rating.reportUrl ?? '' },
+                          ...(rating.reportFile
+                            ? [
+                                {
+                                  text: 'Download report',
+                                  url: cent.metadata.parseMetadataUrl(rating.reportFile?.uri ?? ''),
+                                },
+                              ]
+                            : []),
+                        ]}
+                      />
+                    }
+                  >
+                    <Box
+                      border={`1px solid ${theme.colors.backgroundInverted}`}
+                      borderRadius={20}
+                      padding="2px 10px"
+                      display="flex"
+                    >
+                      {rating.agency?.includes('moody') ? <IconMoody size={16} /> : <IconSp size={16} />}
+                      <Text>{rating.value}</Text>
+                    </Box>
+                  </Tooltip>
+                ))}
+              </Shelf>
+            ),
+          },
+        ]
       : []),
 
     {

From afc3d7a35ce9e872e26a48c229cfb27856a811e9 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Tue, 15 Oct 2024 12:08:35 -0400
Subject: [PATCH 5/7] Fix editing file upload

---
 .../src/components/IssuerSection.tsx          |  2 +-
 .../pages/IssuerPool/Configuration/Issuer.tsx | 45 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/centrifuge-app/src/components/IssuerSection.tsx b/centrifuge-app/src/components/IssuerSection.tsx
index cb47d4670..6a4a644d0 100644
--- a/centrifuge-app/src/components/IssuerSection.tsx
+++ b/centrifuge-app/src/components/IssuerSection.tsx
@@ -213,7 +213,7 @@ export function RatingDetails({ metadata }: IssuerSectionProps) {
   return ratings?.length ? (
     <Stack gap={1}>
       <Text variant="heading2">Pool rating</Text>
-      <Shelf flexDirection="column" alignItems="flex-start">
+      <Shelf flexDirection="column" alignItems="flex-start" gap={2}>
         {ratings?.map((rating) => {
           return (
             <Stack gap={1} key={rating.agency}>
diff --git a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
index 90659f6ce..d1b984e9c 100644
--- a/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Configuration/Issuer.tsx
@@ -1,4 +1,4 @@
-import { FileType, PoolMetadata } from '@centrifuge/centrifuge-js'
+import { PoolMetadata } from '@centrifuge/centrifuge-js'
 import { useCentrifuge, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
 import { Button, Stack } from '@centrifuge/fabric'
 import { Form, FormikProvider, useFormik } from 'formik'
@@ -158,25 +158,34 @@ export function Issuer() {
       }
 
       if (values.poolRatings) {
-        const newRatingReportPromise = await Promise.all(
-          values.poolRatings.map((rating) => (rating.reportFile ? pinFile(rating.reportFile) : null))
+        const updatedRatings = await Promise.all(
+          values.poolRatings.map(async (newRating, index) => {
+            const existingRating = oldMetadata.pool.poolRatings?.[index]
+
+            if (JSON.stringify(newRating) === JSON.stringify(existingRating)) {
+              return existingRating
+            }
+
+            const newReportFile = typeof newRating.reportFile === 'object' ? newRating.reportFile : null
+            // remove the existing reportFile from the newRating so we don't accidentally overwrite it with the string representation
+            // the existing reportFile will still be captured in the existingRating
+            delete newRating.reportFile
+            const mergedRating = { ...existingRating, ...newRating }
+
+            if (newReportFile) {
+              try {
+                const pinnedFile = await pinFile(newReportFile)
+                mergedRating.reportFile = pinnedFile
+              } catch (error) {
+                console.error('Error pinning file:', error)
+              }
+            }
+
+            return mergedRating
+          })
         )
 
-        const ratings = values.poolRatings.map((rating, index) => {
-          let reportFile: FileType | null = rating.reportFile
-            ? { uri: rating.reportFile.name, mime: rating.reportFile.type }
-            : null
-          if (rating.reportFile && newRatingReportPromise[index]?.uri) {
-            reportFile = newRatingReportPromise[index] ?? null
-          }
-          return {
-            agency: rating.agency ?? '',
-            value: rating.value ?? '',
-            reportUrl: rating.reportUrl ?? '',
-            reportFile: reportFile ?? null,
-          }
-        })
-        newPoolMetadata.pool.poolRatings = ratings
+        newPoolMetadata.pool.poolRatings = updatedRatings as PoolMetadata['pool']['poolRatings']
       }
 
       execute([poolId, newPoolMetadata], { account })

From f0184db2a2ec191cf7298c9ad69d915e4e187f93 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Tue, 15 Oct 2024 12:44:49 -0400
Subject: [PATCH 6/7] Clean up tinlake data

---
 .../Charts/PoolPerformanceChart.tsx           |  5 +-
 .../src/components/PoolCard/index.tsx         | 97 +++++++++++--------
 .../components/PoolOverview/KeyMetrics.tsx    | 17 +---
 .../PoolOverview/TrancheTokenCards.tsx        | 11 ++-
 4 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/centrifuge-app/src/components/Charts/PoolPerformanceChart.tsx b/centrifuge-app/src/components/Charts/PoolPerformanceChart.tsx
index 333ef7ea7..507c104ae 100644
--- a/centrifuge-app/src/components/Charts/PoolPerformanceChart.tsx
+++ b/centrifuge-app/src/components/Charts/PoolPerformanceChart.tsx
@@ -10,6 +10,7 @@ import { daysBetween, formatDate } from '../../utils/date'
 import { formatBalance, formatBalanceAbbreviated, formatPercentage } from '../../utils/formatting'
 import { useLoans } from '../../utils/useLoans'
 import { useDailyPoolStates, usePool } from '../../utils/usePools'
+import { DYF_POOL_ID } from '../PoolCard'
 import { Tooltips, tooltipText } from '../Tooltips'
 import { TooltipContainer, TooltipTitle } from './Tooltip'
 import { getOneDayPerMonth, getRangeNumber } from './utils'
@@ -160,7 +161,7 @@ function PoolPerformanceChart() {
             nav: todayAssetValue,
             juniorTokenPrice: tranchePrices.juniorTokenPrice ?? 0,
             seniorTokenPrice: tranchePrices.seniorTokenPrice ?? null,
-            juniorAPY: pool.id === '1655476167' ? 15 : todayJuniorApy,
+            juniorAPY: pool.id === DYF_POOL_ID ? 15 : todayJuniorApy,
             seniorAPY: todaySeniorApy,
           }
         }
@@ -181,7 +182,7 @@ function PoolPerformanceChart() {
     nav: todayAssetValue,
     price: todayPrice,
     currency: pool.currency.symbol,
-    juniorAPY: pool.id === '1655476167' ? 15 : todayJuniorApy,
+    juniorAPY: pool.id === DYF_POOL_ID ? 15 : todayJuniorApy,
     seniorAPY: todaySeniorApy,
     ...trancheTodayPrice,
   }
diff --git a/centrifuge-app/src/components/PoolCard/index.tsx b/centrifuge-app/src/components/PoolCard/index.tsx
index 3e0c17542..f861de872 100644
--- a/centrifuge-app/src/components/PoolCard/index.tsx
+++ b/centrifuge-app/src/components/PoolCard/index.tsx
@@ -25,8 +25,6 @@ export type MetaData = {
   }
 }
 
-type TinlakeTranchesKey = 'silver' | 'blocktowerThree' | 'blocktowerFour'
-
 type TrancheWithCurrency = Pick<Token, 'yield30DaysAnnualized' | 'interestRatePerSec' | 'currency' | 'id' | 'seniority'>
 
 const StyledRouterTextLink = styled(RouterTextLink)`
@@ -58,32 +56,55 @@ const StyledCard = styled(Card)`
 `
 
 const tinlakeTranches = {
-  silver: {
-    Junior: '15%',
-    Senior: '7%',
+  NS2: {
+    name: 'New Silver 3',
+    tranches: [
+      { name: 'Junior', apr: '15%', minInvestment: '-' },
+      { name: 'Senior', apr: '7%', minInvestment: '5K' },
+    ],
     shortDescription: ' Real estate bridge loans for fix and flip projects, maturing in 12-24 months.',
-    InvestorType: 'Qualified Investors',
+    investorType: 'Qualified Investors',
   },
-  blocktowerThree: {
-    Junior: '15%',
-    Senior: '4%',
+  BT3: {
+    name: 'BlockTower Series 3',
+    tranches: [
+      { name: 'Junior', apr: '15%', minInvestment: '-' },
+      { name: 'Senior', apr: '4%', minInvestment: '-' },
+    ],
     shortDescription: ' Investment-grade consumer ABS, auto ABS, and CLOs under 4 years.',
-    InvestorType: 'Private',
+    investorType: 'Private',
   },
-  blocktowerFour: {
-    Junior: '15%',
-    Senior: '4%',
+  BT4: {
+    name: 'BlockTower Series 4',
+    tranches: [
+      { name: 'Junior', apr: '15%', minInvestment: '-' },
+      { name: 'Senior', apr: '4%', minInvestment: '-' },
+    ],
     shortDescription: 'Investment-grade consumer ABS, auto ABS, and CLOs under 4 years.',
-    InvestorType: 'Private',
+    investorType: 'Private',
   },
   none: {
-    Junior: '-',
-    Senior: '-',
+    name: '-',
+    tranches: [
+      { name: 'Junior', apr: '-', minInvestment: '-' },
+      { name: 'Senior', apr: '-', minInvestment: '-' },
+    ],
     shortDescription: '',
-    InvestorType: '-',
+    investorType: '-',
   },
 }
 
+export const DYF_POOL_ID = '1655476167'
+export const NS3_POOL_ID = '1615768079'
+
+export type CentrifugeTargetAPYs = keyof typeof centrifugeTargetAPYs
+export const centrifugeTargetAPYs = {
+  [DYF_POOL_ID]: ['15%'],
+  [NS3_POOL_ID]: ['8.0%', '16%'],
+}
+
+type TinlakeTranchesKey = keyof typeof tinlakeTranches
+
 export type PoolCardProps = {
   poolId?: string
   name?: string
@@ -112,25 +133,14 @@ export function PoolCard({
 }: PoolCardProps) {
   const theme = useTheme()
   const isOneTranche = tranches && tranches?.length === 1
-  const isTinlakePool =
-    poolId === '0x53b2d22d07E069a3b132BfeaaD275b10273d381E' ||
-    poolId === '0x90040F96aB8f291b6d43A8972806e977631aFFdE' ||
-    poolId === '0x55d86d51Ac3bcAB7ab7d2124931FbA106c8b60c7'
-
-  const tinlakeObjKey = () => {
-    if (name?.includes('Silver')) return 'silver'
-    else if (name?.includes('BlockTower Series 3')) return 'blocktowerThree'
-    else if (name?.includes('BlockTower Series 4')) return 'blocktowerFour'
-    else return 'none'
-  }
+  const isTinlakePool = poolId?.startsWith('0x')
 
-  const getTinlakeMinInvestment = (trancheName: 'Junior' | 'Senior') => {
-    if (name?.includes('Silver') && trancheName === 'Senior') return '5K'
-    else return '-'
-  }
+  const tinlakeKey = (Object.keys(tinlakeTranches).find(
+    (key) => tinlakeTranches[key as TinlakeTranchesKey].name === name
+  ) || 'none') as TinlakeTranchesKey
 
   const renderText = (text: string, isApr?: boolean) => {
-    if (isApr && poolId === '1615768079') {
+    if (isApr && poolId === NS3_POOL_ID) {
       return (
         <Box display="flex">
           <Text fontWeight={500} as="h2" variant={isOneTranche ? 'heading1' : 'body1'} style={{ width: 35 }}>
@@ -151,9 +161,9 @@ export function PoolCard({
 
   const calculateApy = (tranche: TrancheWithCurrency) => {
     const daysSinceCreation = createdAt ? daysBetween(createdAt, new Date()) : 0
-    if (poolId === '1655476167') return '15%'
-    if (poolId === '1615768079' && tranche.seniority === 0) return '8.0%'
-    if (poolId === '1615768079' && tranche.seniority === 1) return '16%'
+    if (poolId === DYF_POOL_ID) return centrifugeTargetAPYs[DYF_POOL_ID][0]
+    if (poolId === NS3_POOL_ID && tranche.seniority === 0) return centrifugeTargetAPYs[NS3_POOL_ID][0]
+    if (poolId === NS3_POOL_ID && tranche.seniority === 1) return centrifugeTargetAPYs[NS3_POOL_ID][1]
     if (daysSinceCreation > 30 && tranche.yield30DaysAnnualized)
       return formatPercentage(tranche.yield30DaysAnnualized, true, {}, 1)
     if (tranche.interestRatePerSec) {
@@ -165,7 +175,6 @@ export function PoolCard({
   const tranchesData = useMemo(() => {
     return tranches
       ?.map((tranche: TrancheWithCurrency) => {
-        const key = tinlakeObjKey() as TinlakeTranchesKey
         const words = tranche.currency.name.trim().split(' ')
         const metadata = metaData?.tranches[tranche.id] ?? null
         const trancheName = words[words.length - 1]
@@ -176,16 +185,18 @@ export function PoolCard({
 
         return {
           name: trancheName,
-          apr: isTinlakePool ? tinlakeTranches[key][trancheName as 'Junior' | 'Senior'] : calculateApy(tranche),
+          apr: isTinlakePool
+            ? tinlakeTranches[tinlakeKey].tranches.find((t) => t.name === trancheName)?.apr
+            : calculateApy(tranche),
           minInvestment: isTinlakePool
-            ? getTinlakeMinInvestment(trancheName as 'Junior' | 'Senior')
+            ? tinlakeTranches[tinlakeKey].tranches.find((t) => t.name === trancheName)?.minInvestment
             : metadata && metadata.minInitialInvestment
             ? `$${formatBalanceAbbreviated(investmentBalance, '', 0)}`
             : '-',
         }
       })
       .reverse()
-  }, [calculateApy, getTinlakeMinInvestment, isTinlakePool, metaData?.tranches, tinlakeObjKey, tranches])
+  }, [calculateApy, isTinlakePool, metaData?.tranches, tinlakeKey, tranches])
 
   return (
     <RouterTextLink to={`${poolId}`} style={{ textDecoration: 'none' }}>
@@ -240,7 +251,7 @@ export function PoolCard({
           )}
           <Stack>
             <Text as="span" variant="body3" color="textButtonPrimaryDisabled">
-              {poolId === '1655476167' ? 'Target' : 'APY'}
+              {poolId === DYF_POOL_ID ? 'Target' : 'APY'}
             </Text>
             {tranchesData?.map((tranche) => renderText(`${tranche.apr}`, true))}
           </Stack>
@@ -256,7 +267,7 @@ export function PoolCard({
             <Box marginY={12}>
               <Text as="p" variant="body2" color="textButtonPrimaryDisabled">
                 {isTinlakePool
-                  ? tinlakeTranches[tinlakeObjKey()].shortDescription
+                  ? tinlakeTranches[tinlakeKey].shortDescription
                   : metaData?.pool?.issuer?.shortDescription}
               </Text>
             </Box>
@@ -269,7 +280,7 @@ export function PoolCard({
           <Text variant="body2">Investor type</Text>
           <Text variant="body2">
             {' '}
-            {isTinlakePool ? tinlakeTranches[tinlakeObjKey()].InvestorType : metaData?.pool?.investorType ?? '-'}
+            {isTinlakePool ? tinlakeTranches[tinlakeKey].investorType : metaData?.pool?.investorType ?? '-'}
           </Text>
         </Box>
       </StyledCard>
diff --git a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
index 512046889..f36c050f6 100644
--- a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
+++ b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
@@ -10,6 +10,7 @@ import { formatBalance, formatPercentage } from '../../utils/formatting'
 import { useAverageMaturity } from '../../utils/useAverageMaturity'
 import { useActiveDomains } from '../../utils/useLiquidityPools'
 import { useDailyTranchesStates, usePool, usePoolFees, usePoolMetadata } from '../../utils/usePools'
+import { centrifugeTargetAPYs } from '../PoolCard'
 import { PoolStatus } from '../PoolCard/PoolStatus'
 import { getPoolStatus } from '../PoolList'
 import { Spinner } from '../Spinner'
@@ -32,10 +33,7 @@ type Tranche = Pick<DailyTrancheState, 'id'> & {
   }
 }
 
-type TinlakeDataKey =
-  | '0x53b2d22d07E069a3b132BfeaaD275b10273d381E'
-  | '0x55d86d51Ac3bcAB7ab7d2124931FbA106c8b60c7'
-  | '0x90040F96aB8f291b6d43A8972806e977631aFFdE'
+type TinlakeDataKey = keyof typeof tinlakeData
 
 const tinlakeData = {
   '0x53b2d22d07E069a3b132BfeaaD275b10273d381E': '7% - 15% target',
@@ -108,11 +106,6 @@ export const KeyMetrics = ({ poolId }: Props) => {
     })
   }, [metadata?.tranches, pool.currency.decimals])
 
-  const getHardCodedApy = () => {
-    if (poolId === '1655476167') return '15%'
-    if (poolId === '1615768079') return '8% - 16%'
-  }
-
   const isBT3BT4 =
     poolId === '0x53b2d22d07E069a3b132BfeaaD275b10273d381E' ||
     poolId === '0x90040F96aB8f291b6d43A8972806e977631aFFdE' ||
@@ -124,11 +117,11 @@ export const KeyMetrics = ({ poolId }: Props) => {
       value: `${capitalize(startCase(metadata?.pool?.asset?.class))} - ${metadata?.pool?.asset?.subClass}`,
     },
     {
-      metric: poolId === '1655476167' || poolId === '1615768079' ? 'Target APY' : '30-day APY',
+      metric: centrifugeTargetAPYs[poolId as keyof typeof centrifugeTargetAPYs] ? 'Target APY' : '30-day APY',
       value: tinlakeData[poolId as TinlakeDataKey]
         ? tinlakeData[poolId as TinlakeDataKey]
-        : poolId === '1655476167' || poolId === '1615768079'
-        ? getHardCodedApy()
+        : centrifugeTargetAPYs[poolId as keyof typeof centrifugeTargetAPYs]
+        ? centrifugeTargetAPYs[poolId as keyof typeof centrifugeTargetAPYs].join(' - ')
         : tranchesAPY?.length
         ? tranchesAPY.map((tranche, index) => {
             const formatted = formatPercentage(tranche)
diff --git a/centrifuge-app/src/components/PoolOverview/TrancheTokenCards.tsx b/centrifuge-app/src/components/PoolOverview/TrancheTokenCards.tsx
index 024f8bb18..5c9a84602 100644
--- a/centrifuge-app/src/components/PoolOverview/TrancheTokenCards.tsx
+++ b/centrifuge-app/src/components/PoolOverview/TrancheTokenCards.tsx
@@ -7,6 +7,7 @@ import { daysBetween } from '../../utils/date'
 import { formatBalance, formatPercentage } from '../../utils/formatting'
 import { usePool } from '../../utils/usePools'
 import { DataTable } from '../DataTable'
+import { CentrifugeTargetAPYs, DYF_POOL_ID, NS3_POOL_ID, centrifugeTargetAPYs } from '../PoolCard'
 import { PoolMetaDataPartial } from '../PoolList'
 
 export const TrancheTokenCards = ({
@@ -32,9 +33,11 @@ export const TrancheTokenCards = ({
   const columnConfig = useMemo(() => {
     const calculateApy = (trancheToken: Token) => {
       if (isTinlakePool && getTrancheText(trancheToken) === 'senior') return formatPercentage(trancheToken.apy)
-      if (poolId === '1655476167') return '15%'
-      if (poolId === '1615768079' && trancheToken.seniority === 0) return '8%'
-      if (poolId === '1615768079' && trancheToken.seniority === 1) return '16%'
+      if (poolId === DYF_POOL_ID) return centrifugeTargetAPYs[poolId as CentrifugeTargetAPYs][0]
+      if (poolId === NS3_POOL_ID && trancheToken.seniority === 0)
+        return centrifugeTargetAPYs[poolId as CentrifugeTargetAPYs][0]
+      if (poolId === NS3_POOL_ID && trancheToken.seniority === 1)
+        return centrifugeTargetAPYs[poolId as CentrifugeTargetAPYs][1]
       if (daysSinceCreation < 30) return 'N/A'
       return trancheToken.yield30DaysAnnualized
         ? formatPercentage(new Perquintill(trancheToken.yield30DaysAnnualized))
@@ -49,7 +52,7 @@ export const TrancheTokenCards = ({
         width: '40%',
       },
       {
-        header: poolId === '1655476167' || poolId === '1615768079' ? 'Target' : 'APY',
+        header: poolId === DYF_POOL_ID || poolId === NS3_POOL_ID ? 'Target' : 'APY',
         align: 'left',
         formatter: (v: any) => (v ? calculateApy(v) : '-'),
       },

From 616caf1943a456f0d71f1bf7278cb329a1e58dd9 Mon Sep 17 00:00:00 2001
From: sophian <littlejohn.sophia@gmail.com>
Date: Tue, 15 Oct 2024 13:16:41 -0400
Subject: [PATCH 7/7] Fix link to internal onboarding if no external URL is
 provided

---
 centrifuge-app/src/pages/Pool/Overview/index.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/centrifuge-app/src/pages/Pool/Overview/index.tsx b/centrifuge-app/src/pages/Pool/Overview/index.tsx
index 074ecee36..49b124d10 100644
--- a/centrifuge-app/src/pages/Pool/Overview/index.tsx
+++ b/centrifuge-app/src/pages/Pool/Overview/index.tsx
@@ -3,7 +3,7 @@ import { useWallet } from '@centrifuge/centrifuge-react'
 import { Box, Button, Card, Grid, TextWithPlaceholder } from '@centrifuge/fabric'
 import Decimal from 'decimal.js-light'
 import * as React from 'react'
-import { useParams } from 'react-router'
+import { useNavigate, useParams } from 'react-router'
 import styled, { useTheme } from 'styled-components'
 import { InvestRedeemContext, InvestRedeemProvider } from '../../../../src/components/InvestRedeem/InvestRedeemProvider'
 import { InvestRedeemProps } from '../../../components/InvestRedeem/InvestRedeem'
@@ -155,6 +155,7 @@ export function InvestButton(props: InvestRedeemProps) {
   const [open, setOpen] = React.useState(false)
   const connectAndOpen = useConnectBeforeAction(() => setOpen(true))
   const { connectedType, showNetworks } = useWallet()
+  const navigate = useNavigate()
 
   const getButtonText = (state: any) => {
     if (!state.isAllowedToInvest && connectedType !== null) {
@@ -181,7 +182,9 @@ export function InvestButton(props: InvestRedeemProps) {
               <Button
                 onClick={() => {
                   if (!state.isAllowedToInvest && connectedType !== null) {
-                    window.open(metadata?.onboarding?.externalOnboardingUrl)
+                    metadata?.onboarding?.externalOnboardingUrl
+                      ? window.open(metadata?.onboarding?.externalOnboardingUrl)
+                      : navigate(`/onboarding?poolId=${poolId}&trancheId=${trancheId}`)
                   } else if (connectedType === null) {
                     showNetworks()
                   } else {