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: vertically align asset image #25988

Merged
merged 1 commit into from
Jul 19, 2024
Merged

fix: vertically align asset image #25988

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
62 changes: 35 additions & 27 deletions ...ents/multichain/asset-picker-amount/asset-picker/__snapshots__/asset-picker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,33 @@ exports[`AssetPicker matches snapshot 1`] = `
class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
>
<div
class="mm-box mm-badge-wrapper mm-box--display-inline-block"
class="mm-box mm-box--display-flex"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
>
<img
aria-hidden="true"
class="mm-avatar-token__token-image--blurred"
src="./images/eth_logo.svg"
/>
<img
alt="NATIVE TICKER logo"
class="mm-avatar-token__token-image--size-reduced"
src="./images/eth_logo.svg"
/>
</div>
<div
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
class="mm-box mm-badge-wrapper mm-box--display-inline-block"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
>
<img
aria-hidden="true"
class="mm-avatar-token__token-image--blurred"
src="./images/eth_logo.svg"
/>
<img
alt="NATIVE TICKER logo"
class="mm-avatar-token__token-image--size-reduced"
src="./images/eth_logo.svg"
/>
</div>
<div
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
>
?
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-muted box--border-style-solid box--border-width-1"
>
?
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -80,20 +84,24 @@ exports[`AssetPicker render if disabled 1`] = `
class="mm-box mm-box--display-flex mm-box--gap-3 mm-box--align-items-center"
>
<div
class="mm-box mm-badge-wrapper mm-box--display-inline-block"
class="mm-box mm-box--display-flex"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
>
s
</div>
<div
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
class="mm-box mm-badge-wrapper mm-box--display-inline-block"
>
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-md mm-avatar-token mm-avatar-token--with-halo mm-text--body-sm mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full"
>
s
</div>
<div
class="mm-box mm-badge-wrapper__badge-container mm-badge-wrapper__badge-container--circular-top-right"
>
?
<div
class="mm-box mm-text mm-avatar-base mm-avatar-base--size-xs mm-avatar-network mm-text--body-xs mm-text--text-transform-uppercase mm-box--display-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-background-alternative mm-box--rounded-full mm-box--border-color-border-default box--border-style-solid box--border-width-1"
>
?
</div>
</div>
</div>
</div>
Expand Down
48 changes: 25 additions & 23 deletions ui/components/multichain/asset-picker-amount/asset-picker/asset-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,30 +179,32 @@ export function AssetPicker({
title={handleAssetPickerTitle()}
>
<Box display={Display.Flex} alignItems={AlignItems.center} gap={3}>
<BadgeWrapper
badge={
<AvatarNetwork
size={AvatarNetworkSize.Xs}
name={currentNetwork?.nickname}
src={currentNetwork?.rpcPrefs?.imageUrl}
backgroundColor={testNetworkBackgroundColor}
borderColor={
primaryTokenImage
? BorderColor.borderMuted
: BorderColor.borderDefault
}
<Box display={Display.Flex}>
<BadgeWrapper
badge={
<AvatarNetwork
size={AvatarNetworkSize.Xs}
name={currentNetwork?.nickname}
src={currentNetwork?.rpcPrefs?.imageUrl}
backgroundColor={testNetworkBackgroundColor}
borderColor={
primaryTokenImage
? BorderColor.borderMuted
: BorderColor.borderDefault
}
/>
}
>
<AvatarToken
borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
src={primaryTokenImage}
size={AvatarTokenSize.Md}
showHalo={!isNFT}
name={symbol}
{...(isNFT && { backgroundColor: BackgroundColor.transparent })}
/>
}
>
<AvatarToken
borderRadius={isNFT ? BorderRadius.LG : BorderRadius.full}
src={primaryTokenImage}
size={AvatarTokenSize.Md}
showHalo={!isNFT}
name={symbol}
{...(isNFT && { backgroundColor: BackgroundColor.transparent })}
/>
</BadgeWrapper>
</BadgeWrapper>
</Box>

<Tooltip disabled={!isSymbolLong} title={symbol} position="bottom">
<Text className="asset-picker__symbol" variant={TextVariant.bodyMd}>
Expand Down