diff --git a/centrifuge-app/src/components/LayoutBase/styles.tsx b/centrifuge-app/src/components/LayoutBase/styles.tsx index 5c430404dd..252f54ee05 100644 --- a/centrifuge-app/src/components/LayoutBase/styles.tsx +++ b/centrifuge-app/src/components/LayoutBase/styles.tsx @@ -116,13 +116,15 @@ export const WalletPositioner = styled(Shelf)` ` export const WalletInner = styled(Stack)` - height: ${HEADER_HEIGHT}px; + height: 80px; justify-content: center; pointer-events: auto; width: 250px; + margin-right: 40px; @media (min-width: ${({ theme }) => theme.breakpoints[BREAK_POINT_COLUMNS]}) { justify-content: flex-end; + height: 50px; } ` diff --git a/centrifuge-app/src/components/PoolCard/index.tsx b/centrifuge-app/src/components/PoolCard/index.tsx index eb3f791926..58696ae6ce 100644 --- a/centrifuge-app/src/components/PoolCard/index.tsx +++ b/centrifuge-app/src/components/PoolCard/index.tsx @@ -47,6 +47,26 @@ const StyledRouterTextLink = styled(RouterTextLink)` margin-top: 8px; text-decoration: none; ` +const StyledCard = styled(Card)` + width: 100%; + max-width: 100%; + height: 320px; + margin-right: 12px; + margin-bottom: 12px; + padding: 12px; + + &:hover { + border: 1px solid ${({ theme }) => theme.colors.backgroundInverted}; + } + + @media (min-width: ${({ theme }) => theme.breakpoints['M']}) { + width: auto; + } + + @media (min-width: ${({ theme }) => theme.breakpoints['XL']}) { + width: auto; + } +` export type PoolCardProps = { poolId?: string @@ -102,7 +122,7 @@ export function PoolCard({ }) as TrancheData[] return ( - + @@ -114,15 +134,15 @@ export function PoolCard({ {iconUri ? ( ) : ( - + )} - TVL ({currencySymbol}) + {currencySymbol && `TVL (${currencySymbol})`} - {valueLocked ? formatBalance(valueLocked, '') : '-'} + {valueLocked ? formatBalance(valueLocked, '') : ''} )} - Asset Type - {assetClass ?? '-'} + {assetClass && 'Asset Type'} + {assetClass ?? ''} - Investor Type - {metaData?.pool?.investorType || '-'} + {metaData?.pool?.investorType && 'Investor Type'} + {metaData?.pool?.investorType ?? ''} - + ) } diff --git a/centrifuge-app/src/components/PoolList.tsx b/centrifuge-app/src/components/PoolList.tsx index 6f31f98116..25c4db63a1 100644 --- a/centrifuge-app/src/components/PoolList.tsx +++ b/centrifuge-app/src/components/PoolList.tsx @@ -31,6 +31,7 @@ export function PoolList() { const [listedPools, , metadataIsLoading] = useListedPools() const isLarge = useIsAboveBreakpoint('L') const isMedium = useIsAboveBreakpoint('M') + const isExtraLarge = useIsAboveBreakpoint('XL') const centPools = listedPools.filter(({ id }) => !id.startsWith('0x')) as Pool[] const centPoolsMetaData: PoolMetaDataPartial[] = useMetadataMulti( @@ -50,7 +51,6 @@ export function PoolList() { const sortedPools = [...openInvestmentPools, ...upcomingPools, ...tinlakePools] return [pools, search ? filterPools([...pools, ...upcomingPools], new URLSearchParams(search)) : sortedPools] - // eslint-disable-next-line react-hooks/exhaustive-deps }, [listedPools, search]) const archivedPools = pools.filter((pool) => pool?.status?.includes('Archived')) @@ -69,22 +69,22 @@ export function PoolList() { - + {metadataIsLoading ? Array(6) .fill(true) .map((_, index) => ( - + )) : filteredPools.map((pool) => ( - + ))} @@ -111,16 +111,17 @@ export function PoolList() { function ArchivedPools({ pools }: { pools: PoolCardProps[] }) { const isMedium = useIsAboveBreakpoint('M') const isLarge = useIsAboveBreakpoint('L') + const isExtraLarge = useIsAboveBreakpoint('XL') return ( - + {pools.map((pool) => ( - + ))} diff --git a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx index bad77b34a3..bbc0fe2b09 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/index.tsx +++ b/centrifuge-app/src/pages/IssuerCreatePool/index.tsx @@ -116,7 +116,6 @@ export type CreatePoolValues = Omit< ratingAgency: string ratingValue: string ratingReport: File | null - minPoolInvestment: number } const initialValues: CreatePoolValues = { @@ -130,7 +129,6 @@ const initialValues: CreatePoolValues = { epochMinutes: 50, // in minutes listed: !import.meta.env.REACT_APP_DEFAULT_UNLIST_POOLS, investorType: '', - minPoolInvestment: 0, issuerName: '', issuerRepName: '', @@ -724,20 +722,6 @@ function CreatePoolForm() { }} - - - {({ field, form }: FieldProps) => ( - form.setFieldValue('minPoolInvestment', value)} - /> - )} - - {({ field, form }: FieldProps) => ( diff --git a/centrifuge-app/src/pages/IssuerCreatePool/validate.ts b/centrifuge-app/src/pages/IssuerCreatePool/validate.ts index 779ba4e29e..9744838687 100644 --- a/centrifuge-app/src/pages/IssuerCreatePool/validate.ts +++ b/centrifuge-app/src/pages/IssuerCreatePool/validate.ts @@ -31,7 +31,6 @@ export const validate = { maxReserve: combine(required(), nonNegativeNumber(), max(Number.MAX_SAFE_INTEGER)), poolType: required(), investorType: required(), - minPoolInvestment: required(), epochHours: combine(required(), nonNegativeNumber(), integer(), max(24 * 7 /* 1 week */)), epochMinutes: combine(required(), nonNegativeNumber(), integer(), max(59)), diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts index 37dab7a4b4..7fe0698140 100644 --- a/centrifuge-js/src/modules/pools.ts +++ b/centrifuge-js/src/modules/pools.ts @@ -645,7 +645,6 @@ interface TrancheFormValues { interestRate: number | '' minRiskBuffer: number | '' minInvestment: number | '' - targetAPY: number | '' } export type IssuerDetail = {