Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handle long asset names in send input #7751

Merged
merged 7 commits into from
Sep 17, 2024
Merged

fix: handle long asset names in send input #7751

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee29ac9
feat: scroll text that overflowed
woodenfurniture Sep 16, 2024
1da3afb
feat: lets not be ridiculous, ellipsis and tolltip will do
woodenfurniture Sep 16, 2024
29b39d4
chore: cleanup
woodenfurniture Sep 16, 2024
bfc5377
fix: guh character length truncation is useless
woodenfurniture Sep 16, 2024
72795b5
fix: handle overflow for amounts
woodenfurniture Sep 16, 2024
5813949
Merge branch 'develop' into send-input-long-ass-names
gomesalexandre Sep 17, 2024
c39b042
Merge branch 'develop' into send-input-long-ass-names
gomesalexandre Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions src/components/AccountCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChevronRightIcon } from '@chakra-ui/icons'
import type { ButtonProps } from '@chakra-ui/react'
import { Button, SkeletonCircle, SkeletonText } from '@chakra-ui/react'
import { Box, Button, SkeletonCircle, SkeletonText, Tooltip } from '@chakra-ui/react'
import type { Asset } from '@shapeshiftoss/types'
import { useMemo } from 'react'
import { useCallback, useMemo, useState } from 'react'
import { useTranslate } from 'react-polyglot'

import { Amount } from './Amount/Amount'
Expand All @@ -18,7 +18,9 @@ type AccountCardProps = {
onClick?: () => void
} & ButtonProps

const chevronRightIcon = <ChevronRightIcon boxSize={6} />
const leftIconBoxSize = '40px'
const rightIconBoxSize = 6
const chevronRightIcon = <ChevronRightIcon boxSize={rightIconBoxSize} />

export const AccountCard = ({
asset,
Expand All @@ -32,13 +34,22 @@ export const AccountCard = ({
const translate = useTranslate()
const buttonLeftIcon = useMemo(
() => (
<SkeletonCircle isLoaded={isLoaded} boxSize='40px'>
<AssetIcon assetId={asset.assetId} boxSize='40px' />
<SkeletonCircle isLoaded={isLoaded} boxSize={leftIconBoxSize}>
<AssetIcon assetId={asset.assetId} boxSize={leftIconBoxSize} />
</SkeletonCircle>
),
[asset.assetId, isLoaded],
)

const [willOverflow, setWillOverflow] = useState(false)

const checkOverflow = useCallback((el: HTMLElement | null) => {
if (el) {
const isOverflowing = el.scrollWidth > el.clientWidth
setWillOverflow(isOverflowing)
}
}, [])

return (
<Button
onClick={onClick}
Expand All @@ -51,11 +62,28 @@ export const AccountCard = ({
rightIcon={chevronRightIcon}
{...rest}
>
<SkeletonText noOfLines={2} isLoaded={isLoaded} mr='auto'>
<RawText lineHeight='1' mb={1} data-test='account-card-asset-name-label'>
{asset.name}
</RawText>

<SkeletonText
noOfLines={2}
isLoaded={isLoaded}
mr='auto'
flexGrow={1}
width={`calc(100% - ${leftIconBoxSize} - var(--chakra-sizes-${rightIconBoxSize}))`}
>
<Tooltip label={asset.name} isDisabled={!willOverflow}>
<Box overflow='hidden'>
<RawText
lineHeight='1'
mb={1}
data-test='account-card-asset-name-label'
overflow='hidden'
textOverflow='ellipsis'
whiteSpace='nowrap'
ref={checkOverflow}
>
{asset.name}
</RawText>
</Box>
</Tooltip>
{showCrypto ? (
<Amount.Crypto
color='text.subtle'
Expand All @@ -65,6 +93,9 @@ export const AccountCard = ({
value={cryptoAmountAvailable}
suffix={translate('common.available')}
data-test='account-card-crypto-label'
overflow='hidden'
textOverflow='ellipsis'
whiteSpace='nowrap'
/>
) : (
<Amount.Fiat
Expand All @@ -73,6 +104,9 @@ export const AccountCard = ({
color='text.subtle'
suffix={translate('common.available')}
data-test='account-card-fiat-label'
overflow='hidden'
textOverflow='ellipsis'
whiteSpace='nowrap'
/>
)}
</SkeletonText>
Expand Down
Loading