Skip to content

refactor: update network switching metrics to include chain ID and custom network status #38524

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

Open
PatrykLucka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: update network switching metrics to include chain ID and custom network status #38524

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
31 changes: 30 additions & 1 deletion ui/components/multichain/network-list-menu/network-list-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ import {
FEATURED_RPCS,
TEST_CHAINS,
CHAIN_ID_PORTFOLIO_LANDING_PAGE_URL_MAP,
BUILT_IN_NETWORKS,
} from '../../../../shared/constants/network';
import { MULTICHAIN_NETWORK_TO_ACCOUNT_TYPE_NAME } from '../../../../shared/constants/multichain/networks';
import {
MULTICHAIN_NETWORK_TO_ACCOUNT_TYPE_NAME,
MultichainNetworks,
} from '../../../../shared/constants/multichain/networks';
import {
getShowTestNetworks,
getOriginOfCurrentTab,
Expand Down Expand Up @@ -423,6 +427,28 @@ export const NetworkListMenu = ({ onClose }: NetworkListMenuProps) => {
? convertCaipToHexChainId(currentChainId)
: currentChainId;

// Check if the destination network is custom (not built-in, featured, or multichain)
const hexChainId = chain.isEvm
? convertCaipToHexChainId(chain.chainId)
: chain.chainId;

const isBuiltInNetwork = Object.values(BUILT_IN_NETWORKS).some(
(builtInNetwork) => builtInNetwork.chainId === hexChainId,
);
const isFeaturedRpc = FEATURED_RPCS.some(
(featuredRpc) => featuredRpc.chainId === hexChainId,
);
const isMultichainProviderConfig = Object.values(MultichainNetworks).some(
(multichainNetwork) =>
multichainNetwork === chain.chainId ||
(chain.isEvm
? convertCaipToHexChainId(chain.chainId)
: chain.chainId) === multichainNetwork,
);

const isCustomNetwork =
!isBuiltInNetwork && !isFeaturedRpc && !isMultichainProviderConfig;

trackEvent({
event: MetaMetricsEventName.NavNetworkSwitched,
category: MetaMetricsEventCategory.Network,
Expand All @@ -437,6 +463,9 @@ export const NetworkListMenu = ({ onClose }: NetworkListMenuProps) => {
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
// eslint-disable-next-line @typescript-eslint/naming-convention
to_network: chainIdToTrack,
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
// eslint-disable-next-line @typescript-eslint/naming-convention
custom_network: isCustomNetwork,
},
});
};
Expand Down
30 changes: 30 additions & 0 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 @@ -23,6 +23,11 @@ import {
getSelectedMultichainNetworkChainId,
} from '../../../../selectors';
import { MetaMetricsContext } from '../../../../contexts/metametrics';
import {
BUILT_IN_NETWORKS,
FEATURED_RPCS,
} from '../../../../../shared/constants/network';
import { MultichainNetworks } from '../../../../../shared/constants/multichain/networks';

// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
// eslint-disable-next-line @typescript-eslint/naming-convention
Expand Down Expand Up @@ -143,6 +148,28 @@ export const useNetworkChangeHandlers = () => {
? convertCaipToHexChainId(currentChainId)
: currentChainId;

// Check if the destination network is custom (not built-in, featured, or multichain)
const hexChainId = chain.isEvm
? convertCaipToHexChainId(chain.chainId)
: chain.chainId;

const isBuiltInNetwork = Object.values(BUILT_IN_NETWORKS).some(
(builtInNetwork) => builtInNetwork.chainId === hexChainId,
);
const isFeaturedRpc = FEATURED_RPCS.some(
(featuredRpc) => featuredRpc.chainId === hexChainId,
);
const isMultichainProviderConfig = Object.values(MultichainNetworks).some(
(multichainNetwork) =>
multichainNetwork === chain.chainId ||
(chain.isEvm
? convertCaipToHexChainId(chain.chainId)
: chain.chainId) === multichainNetwork,
);

const isCustomNetwork =
!isBuiltInNetwork && !isFeaturedRpc && !isMultichainProviderConfig;

trackEvent({
event: MetaMetricsEventName.NavNetworkSwitched,
category: MetaMetricsEventCategory.Network,
Expand All @@ -157,6 +184,9 @@ export const useNetworkChangeHandlers = () => {
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
// eslint-disable-next-line @typescript-eslint/naming-convention
to_network: chainIdToTrack,
// TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
// eslint-disable-next-line @typescript-eslint/naming-convention
custom_network: isCustomNetwork,
},
});
},
Expand Down
25 changes: 24 additions & 1 deletion ui/pages/confirmations/confirmation/confirmation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ import {
NETWORKS_BYPASSING_VALIDATION,
} from '@metamask/controller-utils';
import { DIALOG_APPROVAL_TYPES } from '@metamask/snaps-rpc-methods';
import { CHAIN_SPEC_URL } from '../../../../shared/constants/network';
import {
CHAIN_SPEC_URL,
BUILT_IN_NETWORKS,
FEATURED_RPCS,
} from '../../../../shared/constants/network';
import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
import {
MetaMetricsEventCategory,
Expand Down Expand Up @@ -476,6 +481,23 @@ export default function ConfirmationPage({
pendingConfirmation?.requestData?.fromNetworkConfiguration?.chainId &&
pendingConfirmation?.requestData?.toNetworkConfiguration?.chainId
) {
// Check if the destination network is custom (not built-in, featured, or multichain)
const toChainId =
pendingConfirmation.requestData.toNetworkConfiguration.chainId;

const isBuiltInNetwork = Object.values(BUILT_IN_NETWORKS).some(
(builtInNetwork) => builtInNetwork.chainId === toChainId,
);
const isFeaturedRpc = FEATURED_RPCS.some(
(featuredRpc) => featuredRpc.chainId === toChainId,
);
const isMultichainProviderConfig = Object.values(MultichainNetworks).some(
(multichainNetwork) => multichainNetwork === toChainId,
);

const isCustomNetwork =
!isBuiltInNetwork && !isFeaturedRpc && !isMultichainProviderConfig;

trackEvent({
category: MetaMetricsEventCategory.Network,
event: MetaMetricsEventName.NavNetworkSwitched,
Expand All @@ -485,6 +507,7 @@ export default function ConfirmationPage({
pendingConfirmation.requestData.fromNetworkConfiguration.chainId,
to_network:
pendingConfirmation.requestData.toNetworkConfiguration.chainId,
custom_network: isCustomNetwork,
referrer: {
url: window.location.origin,
},
Expand Down
Loading