From 3436fb2df272b4a936ac5719bbd71919df7c9b46 Mon Sep 17 00:00:00 2001
From: katty barroso <kattybarroso1321@gmail.com>
Date: Tue, 7 Jan 2025 15:46:48 +0100
Subject: [PATCH] Fix values on pool overview page

---
 .../src/components/PoolOverview/KeyMetrics.tsx | 12 ++++++++++--
 .../IssuerCreatePool/PoolSetupSection.tsx      | 18 +++++++++++-------
 .../src/pages/IssuerCreatePool/index.tsx       |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
index 107302352f..f5c24d4b47 100644
--- a/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
+++ b/centrifuge-app/src/components/PoolOverview/KeyMetrics.tsx
@@ -136,6 +136,8 @@ export const KeyMetrics = ({ poolId }: Props) => {
       metric:
         centrifugeTargetAPYs[poolId as keyof typeof centrifugeTargetAPYs] || tinlakeData[poolId as TinlakeDataKey]
           ? 'Target APY'
+          : metadata?.tranches
+          ? Object.values(metadata?.tranches)[0].apy
           : '30-day APY',
       value: tinlakeData[poolId as TinlakeDataKey]
         ? tinlakeData[poolId as TinlakeDataKey]
@@ -218,10 +220,16 @@ export const KeyMetrics = ({ poolId }: Props) => {
           {metrics.map(({ metric, value }, index) => {
             return (
               <Box key={index} display="flex" justifyContent="space-between" paddingY={1} alignItems="center">
-                <Text color="textSecondary" variant="body2" textOverflow="ellipsis" whiteSpace="nowrap">
+                <Text
+                  textTransform="capitalize"
+                  color="textSecondary"
+                  variant="body2"
+                  textOverflow="ellipsis"
+                  whiteSpace="nowrap"
+                >
                   {metric}
                 </Text>
-                <Text variant="body2" textOverflow="ellipsis" whiteSpace="nowrap">
+                <Text textTransform="capitalize" variant="body2" textOverflow="ellipsis" whiteSpace="nowrap">
                   {value}
                 </Text>
               </Box>
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx
index 2c197cd482..026db21272 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/PoolSetupSection.tsx
@@ -148,13 +148,17 @@ export const PoolSetupSection = () => {
                           connectedType === 'evm' ? isEvmAddress(field.value) : isAddress(field.value)
 
                         return (
-                          <FieldWithErrorMessage
-                            {...field}
-                            as={TextInput}
-                            placeholder="Type address..."
-                            value={isValidAddress ? utils.formatAddress(field.value) : field.value}
-                            onChange={(e) => form.setFieldValue(field.name, e.target.value)}
-                          />
+                          <Box mt={2}>
+                            <FieldWithErrorMessage
+                              {...field}
+                              as={TextInput}
+                              placeholder="Type address..."
+                              value={isValidAddress ? utils.formatAddress(field.value) : field.value}
+                              onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                                form.setFieldValue(field.name, e.target.value)
+                              }
+                            />
+                          </Box>
                         )
                       }}
                     </Field>
diff --git a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
index 89bfb34acc..4387e76ccb 100644
--- a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
+++ b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx
@@ -523,6 +523,7 @@ const IssuerCreatePoolPage = () => {
                   small
                   onClick={() => form.handleSubmit()}
                   loading={createProxiesIsPending || transactionIsPending || form.isSubmitting}
+                  disabled={Object.keys(errors).length > 0}
                 >
                   Create pool
                 </Button>