mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-02 06:07:06 +01:00
31d5c1cf22
* Version v10.18.4 * Fix default currency symbol for `wallet_addEthereumChain` + improve warnings for data that doesn't match our validation expectations (#15201) * set more appropriate default for ticker symbol when wallet_addEthereumChain is called * throw error to dapp when site suggests network with same chainId but different ticker symbol from already added network, instead of showing error and disabled notification to user * Fix Provider Tracking Metrics (#15082) * fix filetype audit (#15334) * Remove decentralized 4byte function signature registry since it contains incorrect signatures and we can't algorithmically check for best option when 4byte.directory is down (#15300) * remove decentralized 4byte function signature registry since it is griefed and we can't algorithmically check for best option when 4byte is down * add migration * remove nock of on chain registry call in getMethodDataAsync test * remove audit exclusion (#15346) * Updates `eth-lattice-keyring` to v0.10.0 (#15261) This is mainly associated with an update in GridPlus SDK and enables better strategies for fetching calldata decoder data. `eth-lattice-keyring` changes: GridPlus/eth-lattice-keyring@v0.7.3...v0.10.0 `gridplus-sdk` changes (which includes a codebase rewrite): GridPlus/gridplus-sdk@v1.2.3...v2.2.2 * Fix 'block link explorer on custom networks' (#13870) * Created a logic for the 'Add a block explorer URL' Removed unused message Message logic rollback Modified history push operation WIP: Pushing before rebasing Applied requested changes Removed unintenionally added code * Lint fix * Metrics fixed * Stop injecting provider on docs.google.com (#15459) * Fix setting of gasPrice when on non-eip 1559 networks (#15628) * Fix setting of gasPrice when on non-eip 1559 networks * Fix unit tests * Fix logic * Update ui/ducks/send/send.test.js Co-authored-by: Mark Stacey <markjstacey@gmail.com> Co-authored-by: Mark Stacey <markjstacey@gmail.com> * [GridPlus] Bumps `eth-lattice-keyring` to v0.11.0 (#15490) * [GridPlus] Bumps `gridplus-sdk` to v2.2.4 (#15561) * remove exclusions for mismatched object jsdoc type casing (#15351) * Improve `tokenId` parsing and clean up `useAssetDetails` hook (#15304) * Fix state creation in setupSentryGetStateGlobal (#15635) * filter breadcrumbs for improved clarity while debugging sentry errors (#15639) * Update v10.18.4 changelog (#15645) * Auto generated changelog * Update 10.18.4 changelog * Run lavamoat:auto * Call metrics event for wallet type selection at the right time (#15591) * Fix Sentry in LavaMoat contexts (#15672) Our Sentry setup relies upon application state, but it wasn't able to access it in LavaMoat builds because it's running in a separate Compartment. A patch has been introduced to the LavaMoat runtime to allow the root Compartment to mutate the `rootGlobals` object, which is accessible from outside the compartment as well. This lets us expose application state to our Sentry integration. * Fix Sentry deduplication of events that were never sent (#15677) The Sentry `Dedupe` integration has been filtering out our events, even when they were never sent due to our `beforeSend` handler. It was wrongly identifying them as duplicates because it has no knowledge of `beforeSend` or whether they were actually sent or not. To resolve this, the filtering we were doing in `beforeSend` has been moved to a Sentry integration. This integration is installed ahead of the `Dedupe` integration, so `Dedupe` should never find out about any events that we filter out, and thus will never consider them as sent when they were not. * Replace `lavamoat-runtime.js` patch (#15682) A patch made in #15672 was found to be unnecessary. Instead of setting a `rootGlobals` object upon construction of the root compartment, we are now creating a `sentryHooks` object in the initial top-level compartment. I hadn't realized at the time that the root compartment would inherit all properties of the initial compartment `globalThis`. This accomplishes the same goals as #15672 except without needing a patch. * Update v10.18.4 changelog * Fix lint issues * Update yarn.lock * Update `depcheck` to latest version (#15690) `depcheck` has been updated to the latest version. This version pins `@babel/parser` to v7.16.4 because of unresolved bugs in v7.16.5 that result in `depcheck` failing to parse TypeScript files correctly. We had a Yarn resolution in place to ensure `@babel/parser@7.16.4` was being used already. That resolution is no longer needed so it has been removed. This should resove the issue the dev team has been seeing lately where `yarn` and `yarn-deduplicate` disagree about the state the lockfile should be in. * Update yarn.lock * Update LavaMoat policy * deduplicate * Update LavaMoat build policy Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com> Co-authored-by: Alex Donesky <adonesky@gmail.com> Co-authored-by: Brad Decker <bhdecker84@gmail.com> Co-authored-by: Alex Miller <asmiller1989@gmail.com> Co-authored-by: Filip Sekulic <filip.sekulic@consensys.net> Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com> Co-authored-by: Dan J Miller <danjm.com@gmail.com> Co-authored-by: Mark Stacey <markjstacey@gmail.com> Co-authored-by: seaona <54408225+seaona@users.noreply.github.com> Co-authored-by: seaona <mariona@gmx.es> Co-authored-by: PeterYinusa <peter.yinusa@consensys.net>
156 lines
5.0 KiB
JavaScript
156 lines
5.0 KiB
JavaScript
import React, { useEffect } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import classnames from 'classnames';
|
|
import { useLocation, useHistory } from 'react-router-dom';
|
|
import { useDispatch, useSelector } from 'react-redux';
|
|
import { useI18nContext } from '../../../hooks/useI18nContext';
|
|
import {
|
|
ADD_NETWORK_ROUTE,
|
|
ADD_POPULAR_CUSTOM_NETWORK,
|
|
NETWORKS_FORM_ROUTE,
|
|
} from '../../../helpers/constants/routes';
|
|
import { setSelectedSettingsRpcUrl } from '../../../store/actions';
|
|
import Button from '../../../components/ui/button';
|
|
import { getEnvironmentType } from '../../../../app/scripts/lib/util';
|
|
import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
|
|
import {
|
|
getFrequentRpcListDetail,
|
|
getIsCustomNetworkListEnabled,
|
|
getNetworksTabSelectedRpcUrl,
|
|
getProvider,
|
|
} from '../../../selectors';
|
|
import {
|
|
NETWORK_TYPE_RPC,
|
|
TEST_CHAINS,
|
|
} from '../../../../shared/constants/network';
|
|
import { defaultNetworksData } from './networks-tab.constants';
|
|
import NetworksTabContent from './networks-tab-content';
|
|
import NetworksForm from './networks-form';
|
|
import NetworksFormSubheader from './networks-tab-subheader';
|
|
|
|
const defaultNetworks = defaultNetworksData.map((network) => ({
|
|
...network,
|
|
viewOnly: true,
|
|
isATestNetwork: TEST_CHAINS.includes(network.chainId),
|
|
}));
|
|
|
|
const NetworksTab = ({ addNewNetwork }) => {
|
|
const t = useI18nContext();
|
|
const dispatch = useDispatch();
|
|
const { pathname } = useLocation();
|
|
const history = useHistory();
|
|
|
|
const environmentType = getEnvironmentType();
|
|
const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
|
|
const shouldRenderNetworkForm =
|
|
isFullScreen ||
|
|
Boolean(pathname.match(NETWORKS_FORM_ROUTE)) ||
|
|
window.location.hash.split('#')[2] === 'blockExplorerUrl';
|
|
|
|
const frequentRpcListDetail = useSelector(getFrequentRpcListDetail);
|
|
const provider = useSelector(getProvider);
|
|
const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl);
|
|
const addPopularNetworkFeatureToggledOn = useSelector(
|
|
getIsCustomNetworkListEnabled,
|
|
);
|
|
|
|
const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
|
|
return {
|
|
label: rpc.nickname,
|
|
iconColor: 'var(--color-icon-alternative)',
|
|
providerType: NETWORK_TYPE_RPC,
|
|
rpcUrl: rpc.rpcUrl,
|
|
chainId: rpc.chainId,
|
|
ticker: rpc.ticker,
|
|
blockExplorerUrl: rpc.rpcPrefs?.blockExplorerUrl || '',
|
|
isATestNetwork: TEST_CHAINS.includes(rpc.chainId),
|
|
};
|
|
});
|
|
|
|
const networksToRender = [
|
|
...defaultNetworks,
|
|
...frequentRpcNetworkListDetails,
|
|
];
|
|
let selectedNetwork =
|
|
networksToRender.find(
|
|
(network) => network.rpcUrl === networksTabSelectedRpcUrl,
|
|
) || {};
|
|
const networkIsSelected = Boolean(selectedNetwork.rpcUrl);
|
|
|
|
let networkDefaultedToProvider = false;
|
|
if (!networkIsSelected) {
|
|
selectedNetwork =
|
|
networksToRender.find((network) => {
|
|
return (
|
|
network.rpcUrl === provider.rpcUrl ||
|
|
(network.providerType !== NETWORK_TYPE_RPC &&
|
|
network.providerType === provider.type)
|
|
);
|
|
}) || {};
|
|
networkDefaultedToProvider = true;
|
|
}
|
|
|
|
useEffect(() => {
|
|
return () => {
|
|
dispatch(setSelectedSettingsRpcUrl(''));
|
|
};
|
|
}, [dispatch]);
|
|
|
|
return (
|
|
<div className="networks-tab__body">
|
|
{isFullScreen ? (
|
|
<NetworksFormSubheader addNewNetwork={addNewNetwork} />
|
|
) : null}
|
|
<div
|
|
className={classnames('networks-tab__content', {
|
|
'networks-tab__content--with-networks-list-popup-footer':
|
|
!isFullScreen && !shouldRenderNetworkForm,
|
|
})}
|
|
>
|
|
{addNewNetwork ? (
|
|
<NetworksForm
|
|
networksToRender={networksToRender}
|
|
addNewNetwork={addNewNetwork}
|
|
/>
|
|
) : (
|
|
<>
|
|
<NetworksTabContent
|
|
networkDefaultedToProvider={networkDefaultedToProvider}
|
|
networkIsSelected={networkIsSelected}
|
|
networksToRender={networksToRender}
|
|
providerUrl={provider.rpcUrl}
|
|
selectedNetwork={selectedNetwork}
|
|
shouldRenderNetworkForm={shouldRenderNetworkForm}
|
|
/>
|
|
{!isFullScreen && !shouldRenderNetworkForm ? (
|
|
<div className="networks-tab__networks-list-popup-footer">
|
|
<Button
|
|
type="primary"
|
|
onClick={() => {
|
|
if (addPopularNetworkFeatureToggledOn) {
|
|
history.push(ADD_POPULAR_CUSTOM_NETWORK);
|
|
} else {
|
|
isFullScreen
|
|
? history.push(ADD_NETWORK_ROUTE)
|
|
: global.platform.openExtensionInBrowser(
|
|
ADD_NETWORK_ROUTE,
|
|
);
|
|
}
|
|
}}
|
|
>
|
|
{t('addNetwork')}
|
|
</Button>
|
|
</div>
|
|
) : null}
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
NetworksTab.propTypes = {
|
|
addNewNetwork: PropTypes.bool,
|
|
};
|
|
export default NetworksTab;
|