m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Remove bottom space when hiding testnet (#12821)

Browse Source
This commit is contained in:
朱里 2022-01-06 03:04:34 +08:00 committed by GitHub
parent fc185e3139
commit b9093e2a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ui/components/app/dropdowns/network-dropdown.js
View File

@ -3,7 +3,6 @@ import React, { Component } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import { compose } from 'redux'; import { compose } from 'redux';
import classnames from 'classnames';
import Button from '../../ui/button'; import Button from '../../ui/button';
import * as actions from '../../../store/actions'; import * as actions from '../../../store/actions';
import { openAlert as displayInvalidCustomNetworkAlert } from '../../../ducks/alerts/invalid-custom-network'; import { openAlert as displayInvalidCustomNetworkAlert } from '../../../ducks/alerts/invalid-custom-network';
@ -362,21 +361,19 @@ class NetworkDropdown extends Component {
this.props.provider, this.props.provider,
)} )}
<div {shouldShowTestNetworks && (
className={classnames('network-dropdown-testnets', { <>
'network-dropdown-testnets--no-visibility': !shouldShowTestNetworks, {this.renderNetworkEntry('ropsten')}
})} {this.renderNetworkEntry('kovan')}
> {this.renderNetworkEntry('rinkeby')}
{this.renderNetworkEntry('ropsten')} {this.renderNetworkEntry('goerli')}
{this.renderNetworkEntry('kovan')} {this.renderCustomRpcList(
{this.renderNetworkEntry('rinkeby')} rpcListDetailForLocalHost,
{this.renderNetworkEntry('goerli')} this.props.provider,
{this.renderCustomRpcList( { isLocalHost: true },
rpcListDetailForLocalHost, )}
this.props.provider, </>
{ isLocalHost: true }, )}
)}
</div>
</div> </div>
{this.renderAddCustomButton()} {this.renderAddCustomButton()}

8
ui/components/app/dropdowns/network-dropdown.test.js
View File

@ -147,6 +147,10 @@ describe('Network Dropdown', () => {
'addNetwork', 'addNetwork',
); );
}); });
it('shows test networks in the dropdown', () => {
expect(wrapper.find('.network-dropdown-list li')).toHaveLength(8);
});
}); });
describe('NetworkDropdown in appState is true and show test networks is false', () => { describe('NetworkDropdown in appState is true and show test networks is false', () => {
@ -193,5 +197,9 @@ describe('Network Dropdown', () => {
'addNetwork', 'addNetwork',
); );
}); });
it('does not show test networks in the dropdown', () => {
expect(wrapper.find('.network-dropdown-list li')).toHaveLength(3);
});
}); });
}); });

6
ui/css/itcss/components/network.scss
View File

@ -141,12 +141,6 @@
background-color: $scorpion; background-color: $scorpion;
} }
.network-dropdown-testnets {
&--no-visibility {
visibility: hidden;
}
}
.network-dropdown-title { .network-dropdown-title {
@include H4; @include H4;