mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-02 14:15:06 +01:00
b89630fdd2
* Show portfolio icon in ETH overview
* Show new copy button in QR code modal
* Show address copy button in wallet overview
* Update connected status component
* Remove legacy MenuBar
* Remove legacy ImportTokenLink
* Remove AssetListItem
* Remove DetectedTokensLink
* Remove legacy AppHeader
* Remove MULTICHAIN flag from builds.yml
* Remove legacy AccountMenu
* FIX: Token cell snapshot
* Add data-testid for Account Picker
* Remove multichain check in LoadingNetworkScreen
* Remove MULTICHAIN check for AccountDetailsModal
* Remove MULTICHAIN check for AssetList
* Update QR dimensions
* Remove MULTICHAIN declaration from metamaskrc.dist
* Implement PickerNetwork and NetworkListMenu in onboarding
* Remove legacy NetworkDropdown and Dropdown
* Remove documentation about legacy account menu
* FIX: Fixes route tests for missing data-testid=network-display
* Fix account-menu-icon data-testid
* Fix TokenCell test
* FIX Onboarding Flow tests
* Remove unused locales from AccountMenu removal
* E2E: Fix Import Secret Recovery Phrase: logs out of the vault
* E2E: Fix Show account details: should show the QR code for the account
* E2E: Fix add-account.spec.js
* E2E: Fix state-logs.spec.js
* E2E: Fix lock-account.spec.js
* E2E: Fix settings-general.spec.js
* E2E: Fix advanced-settings.spec.js
* E2E: Fix auto-lock.spec.js
* E2E: Fix backup-restore.spec.js
* E2E: Fix clear-activity.spec.js
* E2E: Fix settings-search.spec.js
* E2E: Fix encrypt-decrypt.spec.js
* E2E: Fix dapp-interactions.spec.js
* E2E: Fix test-snap-management.spec.js
* E2E: Fix add-custom-network.spec.js
* E2E: Fix from-import-ui.spec.js
* E2E: Fix provider-api.spec.js
* E2E: Fix chain-interactions.spec.js
* E2E: Fix custom-rpc-history.spec.js
* Remove network icon from overview components
* E2E: Fix user-actions-benchmark.js
* E2E: Fix benchmark.js
* E2E: Fix add-hide-token.spec.js
* E2E: Fix address-book.spec.js
* E2E: Fix custom-token-add-approve.spec.js
* E2E: Fix incremental-security.spec.js
* E2E: Fix metamask-responsive-ui.spec.js
* E2E: Onboarding.spec.js
* E2E: Fix permissions.spec.js
* E2E: Fix send-hex-address.spec.js
* E2E: Fix send-to-contract.spec.js
* Remove dead AccountOptionsMenu test
* E2E: Fix token-details.spec.js
* E2E: Fix switch-custom-network.spec.js
* E2E: Fix metamask-ui.spec.js
* Revert "UX Multichain: updated border top for activity list (#19176)"
This reverts commit 15598f2a23
.
* E2Es: Fix test-snap-management.spec.js and test-snap-notification.spec.js
* E2Es: Fix add-account.spec.js after flaky test fixes
* e2e flaky test
* adds back the mmi options
* scss fix
* test fix
* removes unnecessary double quotes
* Prevent double logos on login screen
* Update ui/components/ui/list-item/index.scss
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
---------
Co-authored-by: seaona <mariona@gmx.es>
Co-authored-by: Antonio Regadas <antonio.regadas@consensys.net>
Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
71 lines
2.1 KiB
JavaScript
71 lines
2.1 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import { NETWORK_TYPES } from '../../../../shared/constants/network';
|
|
import * as actions from '../../../store/actions';
|
|
import {
|
|
getAllEnabledNetworks,
|
|
getNetworkIdentifier,
|
|
isNetworkLoading,
|
|
} from '../../../selectors';
|
|
import { getProviderConfig } from '../../../ducks/metamask/metamask';
|
|
import LoadingNetworkScreen from './loading-network-screen.component';
|
|
|
|
const DEPRECATED_TEST_NET_CHAINIDS = ['0x3', '0x2a', '0x4'];
|
|
|
|
const mapStateToProps = (state) => {
|
|
const { loadingMessage } = state.appState;
|
|
const providerConfig = getProviderConfig(state);
|
|
const { rpcUrl, chainId, ticker, nickname, type } = providerConfig;
|
|
|
|
const setProviderArgs =
|
|
type === NETWORK_TYPES.RPC ? [rpcUrl, chainId, ticker, nickname] : [type];
|
|
|
|
const providerChainId = chainId;
|
|
const isDeprecatedNetwork =
|
|
DEPRECATED_TEST_NET_CHAINIDS.includes(providerChainId);
|
|
const isInfuraRpcUrl = rpcUrl && new URL(rpcUrl).host.endsWith('.infura.io');
|
|
const showDeprecatedRpcUrlWarning = isDeprecatedNetwork && isInfuraRpcUrl;
|
|
|
|
// Ensure we have a nickname to provide the user
|
|
// in case of connection error
|
|
let networkName = nickname;
|
|
if (networkName === undefined) {
|
|
const networks = getAllEnabledNetworks(state);
|
|
const desiredNetwork = networks.find(
|
|
(network) => network.chainId === chainId,
|
|
);
|
|
if (desiredNetwork) {
|
|
networkName = desiredNetwork.nickname;
|
|
}
|
|
}
|
|
|
|
return {
|
|
isNetworkLoading: isNetworkLoading(state),
|
|
loadingMessage,
|
|
setProviderArgs,
|
|
providerConfig: {
|
|
...providerConfig,
|
|
nickname: networkName,
|
|
},
|
|
providerId: getNetworkIdentifier(state),
|
|
showDeprecatedRpcUrlWarning,
|
|
};
|
|
};
|
|
|
|
const mapDispatchToProps = (dispatch) => {
|
|
return {
|
|
setProviderType: (type) => {
|
|
dispatch(actions.setProviderType(type));
|
|
},
|
|
rollbackToPreviousProvider: () =>
|
|
dispatch(actions.rollbackToPreviousProvider()),
|
|
showNetworkDropdown: () => {
|
|
return dispatch(actions.toggleNetworkMenu());
|
|
},
|
|
};
|
|
};
|
|
|
|
export default connect(
|
|
mapStateToProps,
|
|
mapDispatchToProps,
|
|
)(LoadingNetworkScreen);
|