From 6c6b4aca1eddd60a42a2fd773448867fd37c5913 Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Tue, 29 Nov 2022 11:01:23 -0500 Subject: [PATCH] fix issue preventing switching to localhost (#16707) --- .../rpc-method-middleware/handlers/switch-ethereum-chain.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js index c32dc4620..7c5edc155 100644 --- a/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js +++ b/app/scripts/lib/rpc-method-middleware/handlers/switch-ethereum-chain.js @@ -6,6 +6,7 @@ import { NETWORK_TO_NAME_MAP, CHAIN_ID_TO_RPC_URL_MAP, CURRENCY_SYMBOLS, + NETWORK_TYPES, } from '../../../../../shared/constants/network'; import { isPrefixedFormattedHexString, @@ -107,7 +108,10 @@ async function switchEthereumChainHandler( type: MESSAGE_TYPE.SWITCH_ETHEREUM_CHAIN, requestData, }); - if (chainId in CHAIN_ID_TO_TYPE_MAP) { + if ( + chainId in CHAIN_ID_TO_TYPE_MAP && + approvedRequestData.type !== NETWORK_TYPES.LOCALHOST + ) { setProviderType(approvedRequestData.type); } else { await updateRpcTarget(approvedRequestData);