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

Merge branch 'develop' into master-sync

Browse Source
This commit is contained in:
Thomas Huang 2022-02-09 10:32:11 -08:00 committed by GitHub
commit ad42930bf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/tests/send-eth.spec.js
View File

@ -187,7 +187,7 @@ describe('Send ETH from dapp using advanced gas controls', function () {
// goes to the settings screen // goes to the settings screen
await driver.clickElement('.account-menu__icon'); await driver.clickElement('.account-menu__icon');
await driver.clickElement({ text: 'Settings', tag: 'div' }); await driver.clickElement({ text: 'Settings', tag: 'div' });
await driver.clickElement({ text: 'Advanced', tag: 'h4' }); await driver.clickElement({ text: 'Advanced', tag: 'div' });
await driver.clickElement( await driver.clickElement(
'[data-testid="advanced-setting-show-testnet-conversion"] .settings-page__content-item-col > div > div', '[data-testid="advanced-setting-show-testnet-conversion"] .settings-page__content-item-col > div > div',
); );

8
test/e2e/tests/threebox.spec.js
View File

@ -37,20 +37,20 @@ describe('Threebox', function () {
await driver.clickElement({ text: 'Settings', tag: 'div' }); await driver.clickElement({ text: 'Settings', tag: 'div' });
// turns on threebox syncing // turns on threebox syncing
await driver.clickElement({ text: 'Advanced', tag: 'h4' }); await driver.clickElement({ text: 'Advanced', tag: 'div' });
await driver.clickElement( await driver.clickElement(
'[data-testid="advanced-setting-3box"] .toggle-button div', '[data-testid="advanced-setting-3box"] .toggle-button div',
); );
// updates settings and address book // updates settings and address book
// navigates to General settings // navigates to General settings
await driver.clickElement({ text: 'General', tag: 'h4' }); await driver.clickElement({ text: 'General', tag: 'div' });
// turns on use of blockies // turns on use of blockies
await driver.clickElement('.toggle-button > div'); await driver.clickElement('.toggle-button > div');
// adds an address to the contact list // adds an address to the contact list
await driver.clickElement({ text: 'Contacts', tag: 'h4' }); await driver.clickElement({ text: 'Contacts', tag: 'div' });
await driver.clickElement('.address-book__link'); await driver.clickElement('.address-book__link');
await driver.fill('#nickname', 'Test User Name 11'); await driver.fill('#nickname', 'Test User Name 11');
@ -89,7 +89,7 @@ describe('Threebox', function () {
assert.equal(toggleLabelText, 'ON'); assert.equal(toggleLabelText, 'ON');
// finds the restored address in the contact list // finds the restored address in the contact list
await driver.clickElement({ text: 'Contacts', tag: 'h4' }); await driver.clickElement({ text: 'Contacts', tag: 'div' });
await driver.findElement({ text: 'Test User Name 11', tag: 'div' }); await driver.findElement({ text: 'Test User Name 11', tag: 'div' });
}, },
); );

10
ui/components/app/tab-bar/index.scss
View File

@ -36,13 +36,21 @@
} }
&__content { &__content {
padding: 16px; padding: 12px 18px;
display: flex; display: flex;
flex-flow: row wrap; flex-flow: row wrap;
align-items: center; align-items: center;
position: relative; position: relative;
z-index: 201; z-index: 201;
&__title {
@include H4;
@media screen and (min-width: $break-large) {
@include H6;
}
}
&__description { &__description {
display: none; display: none;

4
ui/components/app/tab-bar/tab-bar.js
View File

@ -1,8 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import Typography from '../../ui/typography/typography';
import { TYPOGRAPHY } from '../../../helpers/constants/design-system';
const TabBar = (props) => { const TabBar = (props) => {
const { tabs = [], onSelect, isActive } = props; const { tabs = [], onSelect, isActive } = props;
@ -19,7 +17,7 @@ const TabBar = (props) => {
> >
<div className="tab-bar__tab__content"> <div className="tab-bar__tab__content">
<div className="tab-bar__tab__content__icon">{icon}</div> <div className="tab-bar__tab__content__icon">{icon}</div>
<Typography variant={TYPOGRAPHY.H4}>{content}</Typography> <div className="tab-bar__tab__content__title">{content}</div>
</div> </div>
<div className="tab-bar__tab__caret" /> <div className="tab-bar__tab__caret" />
</button> </button>

6
ui/pages/settings/index.scss
View File

@ -133,13 +133,13 @@
@media screen and (min-width: $break-large) { @media screen and (min-width: $break-large) {
flex: 0 0 40%; flex: 0 0 40%;
min-width: 264px; max-width: 197px;
padding-top: 8px; padding-top: 13px;
} }
.tab-bar__tab { .tab-bar__tab {
@media screen and (min-width: $break-large) { @media screen and (min-width: $break-large) {
padding: 16px 24px 0; max-height: 50px;
} }
} }
} }