m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

MenuItem: Fix layout of menu item with subtitle (#17650)

Browse Source
This commit is contained in:
David Walsh 2023-02-21 09:50:54 -06:00 committed by GitHub
parent 1f9b5a2293
commit 1e5f9da592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/tests/dapp-interactions.spec.js
View File

@ -109,7 +109,7 @@ describe('Dapp interactions', function () {
await driver.clickElement( await driver.clickElement(
'[data-testid ="account-options-menu-button"]', '[data-testid ="account-options-menu-button"]',
); );
await driver.clickElement({ text: 'Connected sites', tag: 'span' }); await driver.clickElement({ text: 'Connected sites', tag: 'div' });
const connectedDapp1 = await driver.isElementPresent({ const connectedDapp1 = await driver.isElementPresent({
text: 'http://127.0.0.1:8080', text: 'http://127.0.0.1:8080',
tag: 'bdi', tag: 'bdi',

2
test/e2e/tests/token-details.spec.js
View File

@ -36,7 +36,7 @@ describe('Token Details', function () {
await driver.clickElement({ text: 'Add custom token', tag: 'button' }); await driver.clickElement({ text: 'Add custom token', tag: 'button' });
await driver.clickElement({ text: 'Import tokens', tag: 'button' }); await driver.clickElement({ text: 'Import tokens', tag: 'button' });
await driver.clickElement('[aria-label="Asset options"]'); await driver.clickElement('[aria-label="Asset options"]');
await driver.clickElement({ text: 'Token details', tag: 'span' }); await driver.clickElement({ text: 'Token details', tag: 'div' });
const tokenAddressFound = { const tokenAddressFound = {
text: tokenAddress, text: tokenAddress,

6
ui/components/ui/menu/menu-item.js
View File

@ -20,8 +20,10 @@ const MenuItem = ({
{iconName ? ( {iconName ? (
<Icon name={iconName} size={ICON_SIZES.SM} marginRight={2} /> <Icon name={iconName} size={ICON_SIZES.SM} marginRight={2} />
) : null} ) : null}
<span>{children}</span> <div>
{subtitle} <div>{children}</div>
{subtitle ? <div>{subtitle}</div> : null}
</div>
</button> </button>
); );