diff --git a/src/components/Card/Card.theme.ts b/src/components/Card/Card.theme.ts index 714890a60fe..12124fa7cdf 100644 --- a/src/components/Card/Card.theme.ts +++ b/src/components/Card/Card.theme.ts @@ -45,6 +45,9 @@ export const CardStyle = { container: { bg: 'background.surface.raised.base', borderColor: 'border.base', + _dark: { + boxShadow: '0 1px 0 var(--chakra-colors-border-base) inset, var(--chakra-shadows-sm)', + }, }, }), unstyled: { diff --git a/src/pages/Yields/components/YieldAvailableToDeposit.tsx b/src/pages/Yields/components/YieldAvailableToDeposit.tsx index 8f0b5b60882..4acdedbb0ef 100644 --- a/src/pages/Yields/components/YieldAvailableToDeposit.tsx +++ b/src/pages/Yields/components/YieldAvailableToDeposit.tsx @@ -141,18 +141,12 @@ export const YieldAvailableToDeposit = memo( } return ( - + - + {translate('yieldXYZ.availableToDeposit')} @@ -182,8 +176,9 @@ export const YieldAvailableToDeposit = memo( )} diff --git a/src/pages/Yields/components/YieldInfoCard.tsx b/src/pages/Yields/components/YieldInfoCard.tsx index 760c704f18e..12a2f668884 100644 --- a/src/pages/Yields/components/YieldInfoCard.tsx +++ b/src/pages/Yields/components/YieldInfoCard.tsx @@ -3,13 +3,13 @@ import { AlertDescription, AlertIcon, Avatar, - Badge, Box, Card, CardBody, Flex, Heading, HStack, + Tag, Text, VStack, } from '@chakra-ui/react' @@ -53,41 +53,8 @@ export const YieldInfoCard = memo( ) - const hasOverlay = validatorOrProvider?.logoURI || yieldItem.chainId - - const stackedIconElement = !hasOverlay ? ( - assetIcon - ) : ( - - {assetIcon} - {validatorOrProvider?.logoURI ? ( - - ) : yieldItem.chainId ? ( - - - - ) : null} - - ) - return ( - + {yieldItem.metadata.deprecated && ( @@ -109,72 +76,41 @@ export const YieldInfoCard = memo( )} - {stackedIconElement} + {assetIcon} {yieldTitle} + + + {type} + + {yieldItem.chainId && ( + + + {yieldItem.network} + + )} + {validatorOrProvider?.name && ( + + {validatorOrProvider.logoURI && ( + + )} + {validatorOrProvider.name} + + )} + - - + + {apy}% {translate('common.apy')} - - {type} - - - - - - {iconSource.assetId ? ( - - ) : ( - - )} - - {yieldItem.token.symbol} - - - {yieldItem.chainId && ( - - - - {yieldItem.network} - - - )} - {validatorOrProvider?.name && ( - - {validatorOrProvider.logoURI && ( - - )} - - {validatorOrProvider.name} - - - )} {description && ( diff --git a/src/pages/Yields/components/YieldPositionCard.tsx b/src/pages/Yields/components/YieldPositionCard.tsx index 624d66bbe30..cf33143f91a 100644 --- a/src/pages/Yields/components/YieldPositionCard.tsx +++ b/src/pages/Yields/components/YieldPositionCard.tsx @@ -415,16 +415,10 @@ export const YieldPositionCard = memo( if (isBalancesLoading) { return ( - + - + {translate('yieldXYZ.myPosition')} @@ -435,16 +429,10 @@ export const YieldPositionCard = memo( } return ( - + - + {headingText} {addressBadge} diff --git a/src/pages/Yields/components/YieldProviderInfo.tsx b/src/pages/Yields/components/YieldProviderInfo.tsx index e3a0a09b9f8..d53109ceca3 100644 --- a/src/pages/Yields/components/YieldProviderInfo.tsx +++ b/src/pages/Yields/components/YieldProviderInfo.tsx @@ -1,5 +1,16 @@ import { ExternalLinkIcon } from '@chakra-ui/icons' -import { Avatar, Box, Button, Flex, Heading, HStack, Link, Text } from '@chakra-ui/react' +import { + Avatar, + Box, + Button, + Card, + CardBody, + Flex, + Heading, + HStack, + Link, + Text, +} from '@chakra-ui/react' import { memo, useMemo } from 'react' import { useTranslate } from 'react-polyglot' @@ -27,36 +38,38 @@ export const YieldProviderInfo = memo( return ( - - - - - {providerLogoURI && ( - - )} - - {translate('yieldXYZ.aboutProvider', { provider: providerName })} - - - - {description} - - {providerWebsite && ( - - - - )} + + + + + + {providerLogoURI && ( + + )} + + {translate('yieldXYZ.aboutProvider', { provider: providerName })} + + {providerWebsite && ( + + + + )} + + + {description} + + - - + + diff --git a/src/pages/Yields/components/YieldStats.tsx b/src/pages/Yields/components/YieldStats.tsx index ff6693763b5..fe14bd30b34 100644 --- a/src/pages/Yields/components/YieldStats.tsx +++ b/src/pages/Yields/components/YieldStats.tsx @@ -1,4 +1,4 @@ -import { Avatar, Box, Flex, SimpleGrid, Text } from '@chakra-ui/react' +import { Avatar, Box, Card, CardBody, Flex, SimpleGrid, Text } from '@chakra-ui/react' import { memo, useMemo } from 'react' import { useTranslate } from 'react-polyglot' import { useSearchParams } from 'react-router-dom' @@ -94,47 +94,55 @@ export const YieldStats = memo(({ yieldItem, balances }: YieldStatsProps) => { ) return ( - - - - {translate('yieldXYZ.tvl')} - - - - - - - {translate('yieldXYZ.rewardSchedule')} - - - {yieldItem.mechanics.rewardSchedule} - - + + + + + + {translate('yieldXYZ.tvl')} + + + - - - {translate('yieldXYZ.type')} - - - {yieldItem.mechanics.type} - - + + + {translate('yieldXYZ.rewardSchedule')} + + + {yieldItem.mechanics.rewardSchedule} + + - {validatorMetadata && ( - - - {translate('yieldXYZ.validator')} - - - {validatorMetadata.logoURI && ( - - )} - - {validatorMetadata.name} + + + {translate('yieldXYZ.type')} + + + {yieldItem.mechanics.type} - - - )} - + + + {validatorMetadata && ( + + + {translate('yieldXYZ.validator')} + + + {validatorMetadata.logoURI && ( + + )} + + {validatorMetadata.name} + + + + )} + + + ) })