Skip to content

release(runway): cherry-pick fix: cp-13.1.0 Prevent dapp network change from network manager #35129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gauthierpetetin merged 1 commit into from
Aug 15, 2025
Merged

release(runway): cherry-pick fix: cp-13.1.0 Prevent dapp network change from network manager #35129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions test/e2e/tests/request-queuing/ui.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,15 +480,12 @@ describe('Request-queue UI changes', function () {
// Open the popup with shimmed activeTabOrigin
await openPopupWithActiveTabOrigin(driver, DAPP_URL);

// Switch to mainnet
await driver.clickElement('[data-testid="sort-by-networks"]');
await driver.clickElement({
text: 'Default',
});
await driver.clickElement({
text: 'Ethereum Mainnet',
tag: 'p',
});
// Switch to mainnet using per-dapp connected network flow
await driver.clickElement('[data-testid="connection-menu"]');
await driver.clickElement(
'[data-testid="connected-site-popover-network-button"]',
);
await driver.clickElement('[data-testid="Ethereum Mainnet"]');

// Switch back to the Dapp tab
await driver.switchToWindowWithUrl(DAPP_URL);
Expand Down
1 change: 1 addition & 0 deletions ui/components/multichain/connected-site-popover/connected-site-popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export const ConnectedSitePopover = ({
}),
)
}
data-testid="connected-site-popover-network-button"
>
{currentNetwork?.name}
</ButtonLink>
Expand Down
52 changes: 3 additions & 49 deletions ui/components/multichain/network-manager/hooks/useNetworkChangeHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,19 @@ import {
MetaMetricsEventCategory,
MetaMetricsEventName,
} from '../../../../../shared/constants/metametrics';
import { convertCaipToHexChainId } from '../../../../../shared/modules/network.utils';
import {
convertCaipToHexChainId,
getRpcDataByChainId,
} from '../../../../../shared/modules/network.utils';
import {
addPermittedChain,
detectNfts,
setActiveNetwork,
setEnabledNetworks,
setNetworkClientIdForDomain,
setNextNonce,
showPermittedNetworkToast,
updateCustomNonce,
} from '../../../../store/actions';
import { FEATURED_NETWORK_CHAIN_IDS } from '../../../../../shared/constants/network';
import {
getAllChainsToPoll,
getAllDomains,
getEnabledNetworksByNamespace,
getMultichainNetworkConfigurationsByChainId,
getOriginOfCurrentTab,
getPermittedEVMAccountsForSelectedTab,
getPermittedEVMChainsForSelectedTab,
getSelectedMultichainNetworkChainId,
} from '../../../../selectors';
import { MetaMetricsContext } from '../../../../contexts/metametrics';
Expand Down Expand Up @@ -63,18 +53,10 @@ export const useNetworkChangeHandlers = () => {
const dispatch = useDispatch();
const trackEvent = useContext(MetaMetricsContext);

const selectedTabOrigin = useSelector(getOriginOfCurrentTab);
const domains = useSelector(getAllDomains);
const [multichainNetworks, evmNetworks] = useSelector(
const [multichainNetworks] = useSelector(
getMultichainNetworkConfigurationsByChainId,
);
const currentChainId = useSelector(getSelectedMultichainNetworkChainId);
const permittedChainIds = useSelector((state) =>
getPermittedEVMChainsForSelectedTab(state, selectedTabOrigin),
);
const permittedAccountAddresses = useSelector((state) =>
getPermittedEVMAccountsForSelectedTab(state, selectedTabOrigin),
);

const enabledNetworksByNamespace = useSelector(getEnabledNetworksByNamespace);
const allChainIds = useSelector(getAllChainsToPoll);
Expand Down Expand Up @@ -104,8 +86,6 @@ export const useNetworkChangeHandlers = () => {
(chainId: CaipChainId) => {
const { namespace } = parseCaipChainId(chainId);
const hexChainId = convertCaipToHexChainId(chainId);
const { defaultRpcEndpoint } = getRpcDataByChainId(chainId, evmNetworks);
const finalNetworkClientId = defaultRpcEndpoint.networkClientId;

const isPopularNetwork = FEATURED_NETWORK_CHAIN_IDS.includes(hexChainId);

Expand Down Expand Up @@ -140,34 +120,8 @@ export const useNetworkChangeHandlers = () => {
),
);
}

// If presently on a dapp, communicate a change to
// the dapp via silent switchEthereumChain that the
// network has changed due to user action
if (selectedTabOrigin && domains[selectedTabOrigin]) {
// setActiveNetwork should be called before setNetworkClientIdForDomain
// to ensure that the isConnected value can be accurately inferred from
// NetworkController.state.networksMetadata in return value of
// `metamask_getProviderState` requests and `metamask_chainChanged` events.
setNetworkClientIdForDomain(selectedTabOrigin, finalNetworkClientId);
}

if (permittedAccountAddresses.length > 0) {
dispatch(addPermittedChain(selectedTabOrigin, chainId));
if (!permittedChainIds.includes(hexChainId)) {
dispatch(showPermittedNetworkToast());
}
}
},
[
evmNetworks,
dispatch,
enabledNetworksByNamespace,
selectedTabOrigin,
domains,
permittedAccountAddresses.length,
permittedChainIds,
],
[dispatch, enabledNetworksByNamespace],
);

const handleNonEvmNetworkChange = useCallback(
Expand Down
Loading