fix: fix network verification chainID and name verification for popul…

…ar network
MetaMask · Mar 15, 2024 · b534824 · b534824
1 parent 61536d6
commit b534824
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 24 deletions.
diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.test.tsx
@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
 
 const mockNetworkInfo = {
   chainName: 'Test Chain',
-  chainId: '1',
+  chainId: '0xa',
   rpcUrl: 'http://test.com',
   ticker: 'TEST',
   blockExplorerUrl: 'http://explorer.test.com',
@@ -68,4 +68,13 @@ describe('NetworkVerificationInfo', () => {
       getByText(strings('add_custom_network.unrecognized_chain_name')),
     ).toThrow('Unable to find an element with text');
   });
+
+  it('should render chainId on decimal', () => {
+    (useSelector as jest.Mock).mockReturnValue(true);
+    const { getByText } = render(
+      <NetworkVerificationInfo customNetworkInformation={mockNetworkInfo} />,
+    );
+
+    expect(getByText('10')).toBeTruthy();
+  });
 });
diff --git a/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx b/app/components/UI/NetworkVerificationInfo/NetworkVerificationInfo.tsx
@@ -34,6 +34,7 @@ import {
 } from '../../../util/networks';
 import { NetworkApprovalModalSelectorsIDs } from '../../../../e2e/selectors/Modals/NetworkApprovalModal.selectors';
 import hideKeyFromUrl from '../../../util/hideKeyFromUrl';
+import { convertHexToDecimal } from '@metamask/controller-utils';
 
 interface Alert {
   alertError: string;
@@ -106,7 +107,9 @@ const NetworkVerificationInfo = ({
       <Text variant={TextVariant.BodyMDBold}>
         {strings('add_custom_network.chain_id')}
       </Text>
-      <Text style={styles.textSection}>{customNetworkInformation.chainId}</Text>
+      <Text style={styles.textSection}>
+        {convertHexToDecimal(customNetworkInformation.chainId)}
+      </Text>
 
       <Text variant={TextVariant.BodyMDBold}>
         {strings('add_custom_network.network_url')}

diff --git a/...components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap b/...components/UI/NetworkVerificationInfo/__snapshots__/NetworkVerificationInfo.test.tsx.snap
@@ -93,32 +93,33 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
         <View
           style={
             Object {
-              "alignItems": "center",
-              "backgroundColor": "#F2F4F6",
+              "backgroundColor": "#FFFFFF",
               "borderRadius": 8,
-              "borderWidth": 1,
               "height": 16,
-              "justifyContent": "center",
               "overflow": "hidden",
               "width": 16,
             }
           }
         >
-          <Text
-            accessibilityRole="text"
+          <Image
+            onError={[Function]}
+            resizeMode="contain"
+            source={
+              Object {
+                "default": Object {
+                  "uri": "MockImage",
+                },
+              }
+            }
             style={
               Object {
-                "color": "#24272A",
-                "fontFamily": "Euclid Circular B",
-                "fontSize": 10,
-                "fontWeight": "400",
-                "letterSpacing": 0,
-                "lineHeight": undefined,
+                "flex": 1,
+                "height": undefined,
+                "width": undefined,
               }
             }
-          >
-            T
-          </Text>
+            testID="network-avatar-image"
+          />
         </View>
         <Text
           accessibilityRole="text"
@@ -353,7 +354,7 @@ exports[`NetworkVerificationInfo renders correctly 1`] = `
               }
             }
           >
-            1
+            10
           </Text>
           <Text
             accessibilityRole="text"

diff --git a/app/components/UI/Ramp/hooks/useIsOriginalNativeTokenSymbol.test.ts b/app/components/UI/Ramp/hooks/useIsOriginalNativeTokenSymbol.test.ts
@@ -9,7 +9,7 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
 
-describe('useNativeTokenFiatAmount', () => {
+describe('useIsOriginalNativeTokenSymbol', () => {
   afterEach(() => {
     jest.clearAllMocks();
   });

diff --git a/app/core/RPCMethods/networkChecker.test.ts b/app/core/RPCMethods/networkChecker.test.ts
@@ -212,4 +212,68 @@ describe('checkSafeNetwork', () => {
     );
     expect(alerts).toEqual([]);
   });
+
+  it('should not return warning name/symbol if it match with popular network', async () => {
+    mockedAxios.get.mockImplementation(() =>
+      Promise.resolve({
+        data: [
+          {
+            chainId: '10',
+            rpc: ['https://optimism-mainnet.infura.io/v3/1234'],
+            name: 'Optimism',
+            nativeCurrency: {
+              symbol: 'ETH',
+              decimals: 18,
+            },
+          },
+        ],
+      }),
+    );
+
+    const alerts = await checkSafeNetwork(
+      '10',
+      'https://optimism-mainnet.infura.io/v3/1234',
+      'Optimism',
+      'ETH',
+    );
+    expect(alerts).toEqual([]);
+  });
+  it('should return warning name/symbol if it doesnt match with popular network and third part provider', async () => {
+    mockedAxios.get.mockImplementation(() =>
+      Promise.resolve({
+        data: [
+          {
+            chainId: '10',
+            rpc: ['https://optimism-mainnet.infura.io/v3/1234'],
+            name: 'Optimism',
+            nativeCurrency: {
+              symbol: 'ETH',
+              decimals: 18,
+            },
+          },
+        ],
+      }),
+    );
+
+    const alerts = await checkSafeNetwork(
+      '10',
+      'https://optimism-mainnet.infura.io/v3/1234',
+      'Optimism test',
+      'OP',
+    );
+    expect(alerts).toEqual([
+      {
+        alertError:
+          "It looks like this network's display name doesn't match its chain ID.",
+        alertSeverity: BannerAlertSeverity.Warning,
+        alertOrigin: 'chain_name',
+      },
+      {
+        alertError:
+          "It looks like this network's symbol doesn't match this chain ID.",
+        alertSeverity: BannerAlertSeverity.Warning,
+        alertOrigin: 'chain_ticker',
+      },
+    ]);
+  });
 });
diff --git a/app/core/RPCMethods/networkChecker.util.ts b/app/core/RPCMethods/networkChecker.util.ts
@@ -2,13 +2,26 @@ import axios from 'axios';
 import { BannerAlertSeverity } from '../../component-library/components/Banners/Banner';
 import { strings } from '../../../locales/i18n';
 import PopularList from '../../util/networks/customNetworks';
+import { toHex } from '@metamask/controller-utils';
 
-const findPopularNetwork = (rpcUrl: string) =>
+const findPopularNetwork = (rpcUrl: string, chainId: string) =>
   PopularList.some((network) => {
     const { origin } = new URL(network.rpcUrl);
-    return origin === rpcUrl;
+    return origin === rpcUrl && network.chainId === chainId;
   });
 
+const findPopularNetworkName = (name: string, chainId: string) =>
+  PopularList.some(
+    (network) =>
+      network.nickname.toLowerCase() === name.toLowerCase() &&
+      network.chainId === chainId,
+  );
+
+const findPopularNetworkSymbol = (symbol: string, chainId: string) =>
+  PopularList.some(
+    (network) => network.ticker === symbol && network.chainId === chainId,
+  );
+
 const checkSafeNetwork = async (
   chainIdDecimal: string,
   rpcUrl: string,
@@ -31,7 +44,7 @@ const checkSafeNetwork = async (
       !matchedChain.rpc
         ?.map((rpc: string) => new URL(rpc).origin)
         .includes(origin) &&
-      !findPopularNetwork(origin)
+      !findPopularNetwork(origin, toHex(chainIdDecimal))
     ) {
       alerts.push({
         alertError: strings('add_custom_network.invalid_rpc_url'),
@@ -46,14 +59,20 @@ const checkSafeNetwork = async (
         alertOrigin: 'decimals',
       });
     }
-    if (matchedChain.name?.toLowerCase() !== nickname?.toLowerCase()) {
+    if (
+      matchedChain.name?.toLowerCase() !== nickname?.toLowerCase() &&
+      !findPopularNetworkName(nickname, toHex(chainIdDecimal))
+    ) {
       alerts.push({
         alertError: strings('add_custom_network.unrecognized_chain_name'),
         alertSeverity: BannerAlertSeverity.Warning,
         alertOrigin: 'chain_name',
       });
     }
-    if (matchedChain.nativeCurrency?.symbol !== ticker) {
+    if (
+      matchedChain.nativeCurrency?.symbol !== ticker &&
+      !findPopularNetworkSymbol(ticker, toHex(chainIdDecimal))
+    ) {
       alerts.push({
         alertError: strings('add_custom_network.unrecognized_chain_ticker'),
         alertSeverity: BannerAlertSeverity.Warning,