Skip to content

[WALLET-1153] Update token list item UI #1251

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[WALLET-1153] Update token list item UI #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions src/libs/layout/containers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ export const LeftAlignedCenteredFlexRow = styled(AlignedFlexRow)`
justify-content: flex-start;
`;

export const RightAlignedCenteredFlexRow = styled(AlignedFlexRow)`
justify-content: flex-end;
`;

export const SpaceBetweenFlexRow = styled(FlexRow)`
width: 100%;
justify-content: space-between;
Expand Down
124 changes: 69 additions & 55 deletions src/libs/ui/components/token-plate/token-plate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import { TokenType } from '@hooks/use-casper-token';
import {
AlignedFlexRow,
AlignedSpaceBetweenFlexRow,
RightAlignedCenteredFlexRow,
RightAlignedFlexColumn,
SpacingSize
FlexColumn,
SpacingSize,
getSpacingSize
} from '@libs/layout';
import { SvgIcon, Tooltip, Typography } from '@libs/ui/components';

const TokenAmountContainer = styled(RightAlignedFlexColumn)`
max-width: 120px;
const TokenAmountContainer = styled(FlexColumn)`
max-width: 300px;
`;

const TokenNameContainer = styled.div`
max-width: 100px;
max-width: 200px;
`;

const ListItemContainer = styled(AlignedSpaceBetweenFlexRow)<{
Expand All @@ -28,6 +28,11 @@ const ListItemContainer = styled(AlignedSpaceBetweenFlexRow)<{
padding: ${({ chevron }) => (chevron ? '10px 12px 10px 16px' : '10px 16px')};
`;

const TokenDetailsContainer = styled(AlignedFlexRow)`
column-gap: ${getSpacingSize(SpacingSize.Tiny)};
row-gap: ${getSpacingSize(SpacingSize.None)};
`;

const LogoImg = styled.img`
width: 32px;
height: 32px;
Expand Down Expand Up @@ -65,57 +70,66 @@ export const TokenPlate = ({
) : (
<SvgIcon src={token?.icon || ''} alt={token?.name} size={32} />
)}
<TokenNameContainer>
<Tooltip
title={
token?.name && token.name.length > 10 ? token.name : undefined
}
fullWidth
overflowWrap
>
<Typography type="body" ellipsis loading={!token?.name}>
{token?.name}
</Typography>
</Tooltip>
</TokenNameContainer>
</AlignedFlexRow>
<AlignedFlexRow gap={SpacingSize.Small}>
<TokenAmountContainer>
<Tooltip
title={
(token?.amount && token.amount.length > 7) ||
(token?.symbol && token.symbol.length > 6)
? `${token?.amount} ${token?.symbol}`
: undefined
}
placement="bottomLeft"
overflowWrap
fullWidth
>
<RightAlignedCenteredFlexRow gap={SpacingSize.Small}>
<Typography type="bodyHash" ellipsis loading={!token?.amount}>
{token?.amount}
</Typography>
<Typography
type="bodyHash"
color="contentSecondary"
ellipsis={!!(token?.symbol && token.symbol.length > 6)}
loading={!token?.symbol && token?.symbol !== ''}
>
{token?.symbol}
<FlexColumn>
<TokenNameContainer>
<Tooltip
title={
token?.name && token.name.length > 10 ? token.name : undefined
}
fullWidth
overflowWrap
>
<Typography type="bodySemiBold" ellipsis loading={!token?.name}>
{token?.name}
</Typography>
</RightAlignedCenteredFlexRow>
</Tooltip>
{(token?.name === 'Casper' || token?.amountFiat) && (
<Typography
type="listSubtext"
color="contentSecondary"
loading={!token?.amountFiat}
</Tooltip>
</TokenNameContainer>

<TokenAmountContainer>
<Tooltip
title={
(token?.amount && token.amount.length > 7) ||
(token?.symbol && token.symbol.length > 6)
? `${token?.amount} ${token?.symbol}`
: undefined
}
placement="bottomLeft"
overflowWrap
fullWidth
>
{token?.amountFiat}
</Typography>
)}
</TokenAmountContainer>
<TokenDetailsContainer wrap="wrap">
<Typography
type="captionHash"
ellipsis
loading={!token?.amount}
>
{token?.amount}
</Typography>

<Typography
type="captionHash"
color="contentSecondary"
ellipsis={!!(token?.symbol && token.symbol.length > 6)}
loading={!token?.symbol && token?.symbol !== ''}
>
{token?.symbol}
</Typography>

{(token?.name === 'Casper' || token?.amountFiat) && (
<Typography
type="captionRegular"
color="contentSecondary"
loading={!token?.amountFiat}
>
({token?.amountFiat})
</Typography>
)}
</TokenDetailsContainer>
</Tooltip>
</TokenAmountContainer>
</FlexColumn>
</AlignedFlexRow>
<AlignedFlexRow>
{chevron && <SvgIcon src="assets/icons/chevron.svg" size={16} />}
</AlignedFlexRow>
</ListItemContainer>
Expand Down
Loading