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

Fixes to the Linea Goerli implementation (#18290)

Browse Source 
* Ensure that NonInfuraDefaultNetworks are only selected in the dropdown if they are the currently selected network

* Ensure Linea Goerli network appears in network settings tab if added manually
This commit is contained in:
Dan J Miller 2023-03-23 09:07:28 -07:00 committed by Dan Miller
parent 98ed05c7c0
commit 1dc09c027c
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,22 +280,19 @@ class NetworkDropdown extends Component {
} }
renderNonInfuraDefaultNetwork(network) { renderNonInfuraDefaultNetwork(network) {
const { const { provider, setRpcTarget } = this.props;
provider: { type: providerType },
setRpcTarget,
} = this.props;
const isCurrentRpcTarget = providerType === NETWORK_TYPES.RPC; const { chainId, ticker, blockExplorerUrl } = BUILT_IN_NETWORKS[network];
const networkName = NETWORK_TO_NAME_MAP[network];
const rpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
const isCurrentRpcTarget =
provider.type === NETWORK_TYPES.RPC && rpcUrl === provider.rpcUrl;
return ( return (
<DropdownMenuItem <DropdownMenuItem
key={network} key={network}
closeMenu={this.props.hideNetworkDropdown} closeMenu={this.props.hideNetworkDropdown}
onClick={async () => { onClick={async () => {
const { chainId, ticker, blockExplorerUrl } =
BUILT_IN_NETWORKS[network];
const networkName = NETWORK_TO_NAME_MAP[network];
const rpcUrl = CHAIN_ID_TO_RPC_URL_MAP[chainId];
await setRpcTarget(rpcUrl, chainId, ticker, networkName, { await setRpcTarget(rpcUrl, chainId, ticker, networkName, {
blockExplorerUrl, blockExplorerUrl,
}); });
@ -317,7 +314,7 @@ class NetworkDropdown extends Component {
data-testid={`${network}-network-item`} data-testid={`${network}-network-item`}
style={{ style={{
color: color:
providerType === network provider.type === network
? 'var(--color-text-default)' ? 'var(--color-text-default)'
: 'var(--color-text-alternative)', : 'var(--color-text-alternative)',
}} }}

12
ui/pages/settings/networks-tab/networks-tab.js
View File

@ -30,11 +30,13 @@ import NetworksTabContent from './networks-tab-content';
import NetworksForm from './networks-form'; import NetworksForm from './networks-form';
import NetworksFormSubheader from './networks-tab-subheader'; import NetworksFormSubheader from './networks-tab-subheader';
const defaultNetworks = defaultNetworksData.map((network) => ({ const defaultNetworks = defaultNetworksData
.map((network) => ({
...network, ...network,
viewOnly: true, viewOnly: true,
isATestNetwork: TEST_CHAINS.includes(network.chainId), isATestNetwork: TEST_CHAINS.includes(network.chainId),
})); }))
.filter((network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET);
const NetworksTab = ({ addNewNetwork }) => { const NetworksTab = ({ addNewNetwork }) => {
const t = useI18nContext(); const t = useI18nContext();
@ -53,8 +55,7 @@ const NetworksTab = ({ addNewNetwork }) => {
const provider = useSelector(getProvider); const provider = useSelector(getProvider);
const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl); const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl);
const frequentRpcNetworkListDetails = frequentRpcListDetail const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
.map((rpc) => {
return { return {
label: rpc.nickname, label: rpc.nickname,
iconColor: 'var(--color-icon-alternative)', iconColor: 'var(--color-icon-alternative)',
@ -65,8 +66,7 @@ const NetworksTab = ({ addNewNetwork }) => {
blockExplorerUrl: rpc.rpcPrefs?.blockExplorerUrl || '', blockExplorerUrl: rpc.rpcPrefs?.blockExplorerUrl || '',
isATestNetwork: TEST_CHAINS.includes(rpc.chainId), isATestNetwork: TEST_CHAINS.includes(rpc.chainId),
}; };
}) });
.filter((network) => network.chainId !== CHAIN_IDS.LINEA_TESTNET);
let networksToRender = [...defaultNetworks, ...frequentRpcNetworkListDetails]; let networksToRender = [...defaultNetworks, ...frequentRpcNetworkListDetails];