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

Jump to bottom

Fix hover on account menu #20153

Merged
merged 2 commits into from
Jul 24, 2023
Merged

Fix hover on account menu #20153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8988617
Fix hover on account menu
garrettbear Jul 24, 2023
7d95e5b
remove excessive color prop
garrettbear Jul 24, 2023
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
12 changes: 4 additions & 8 deletions ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,16 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
>
<div
class="mm-box mm-text multichain-account-list-item__account-name mm-text--body-md mm-text--ellipsis mm-box--margin-inline-end-2 mm-box--color-text-default"
class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
>
<button
class="mm-box mm-text mm-button-base mm-button-base--ellipsis multichain-account-list-item__account-name__button mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-text--ellipsis mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-text-default mm-box--background-color-transparent"
class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
>
<span
class="mm-box mm-text mm-text--inherit mm-text--ellipsis mm-box--color-text-default"
>
Test Account
</span>
Test Account
</button>
</div>
<div
class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--align-items-center mm-box--color-text-default"
class="mm-box mm-text multichain-account-list-item__asset mm-text--body-md mm-text--ellipsis mm-text--text-align-end mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-flex-end mm-box--align-items-center mm-box--color-text-default"
>
<div
class="currency-display-component"
Expand Down
21 changes: 13 additions & 8 deletions ui/components/multichain/account-list-item/account-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
Box,
AvatarFavicon,
Tag,
ButtonLink,
ButtonIcon,
IconName,
IconSize,
Expand All @@ -30,6 +29,8 @@ import {
Size,
BorderColor,
Display,
BackgroundColor,
BlockSize,
} from '../../../helpers/constants/design-system';
import { HardwareKeyringNames } from '../../../../shared/constants/hardware-wallets';
import { KeyringType } from '../../../../shared/constants/keyring';
Expand Down Expand Up @@ -138,19 +139,22 @@ export const AccountListItem = ({
display={Display.Flex}
justifyContent={JustifyContent.spaceBetween}
>
<Text
ellipsis
as="div"
<Box
className="multichain-account-list-item__account-name"
marginInlineEnd={2}
>
<ButtonLink
<Text
as="button"
onClick={(e) => {
e.stopPropagation();
onClick();
}}
variant={TextVariant.bodyMdMedium}
className="multichain-account-list-item__account-name__button"
color={Color.textDefault}
padding={0}
backgroundColor={BackgroundColor.transparent}
width={BlockSize.Full}
textAlign={TextAlign.Left}
ellipsis
>
{identity.name.length > MAXIMUM_CHARACTERS_WITHOUT_TOOLTIP ? (
Expand All @@ -164,14 +168,15 @@ export const AccountListItem = ({
) : (
identity.name
)}
</ButtonLink>
</Text>
</Text>
</Box>
<Text
as="div"
className="multichain-account-list-item__asset"
display={Display.Flex}
flexDirection={FlexDirection.Row}
alignItems={AlignItems.center}
justifyContent={JustifyContent.flexEnd}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@darkwing the alignment felt weird to me, so I added this fix. Not sure if this aligns with design

Before

Screenshot 2023-07-24 at 11 48 19 AM

After

Screenshot 2023-07-24 at 12 59 48 PM

ellipsis
textAlign={TextAlign.End}
>
Expand Down
Loading