Merge branch 'develop' into 17191-onboarding-unit-tests-import-srp

MetaMask · Apr 19, 2023 · 2843c99 · 2843c99
2 parents 09b8866 + 5bb8797
commit 2843c99
Show file tree

Hide file tree

Showing 57 changed files with 1,203 additions and 613 deletions.
diff --git a/.storybook/initial-states/approval-screens/add-suggested-token.js b/.storybook/initial-states/approval-screens/add-suggested-token.js
@@ -2,82 +2,82 @@ export const suggestedAssets = [
   {
     asset: {
       address: '0x6b175474e89094c44da98b954eedeac495271d0f',
-      symbol: 'META',
+      symbol: 'ETH',
       decimals: 18,
-      image: 'metamark.svg',
-      unlisted: false
+      image: './images/eth_logo.png',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
-      'symbol': '0X',
-      'decimals': 18,
-      'image': '0x.svg',
-      'unlisted': false
+      address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
+      symbol: '0X',
+      decimals: 18,
+      image: '0x.svg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
-      'symbol': 'AST',
-      'decimals': 18,
-      'image': 'ast.png',
-      'unlisted': false
+      address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+      symbol: 'AST',
+      decimals: 18,
+      image: 'ast.png',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
-      'symbol': 'BAT',
-      'decimals': 18,
-      'image': 'BAT_icon.svg',
-      'unlisted': false
+      address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+      symbol: 'BAT',
+      decimals: 18,
+      image: 'BAT_icon.svg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
-      'symbol': 'CVL',
-      'decimals': 18,
-      'image': 'CVL_token.svg',
-      'unlisted': false
+      address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
+      symbol: 'CVL',
+      decimals: 18,
+      image: 'CVL_token.svg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
-      'symbol': 'GLA',
-      'decimals': 18,
-      'image': 'gladius.svg',
-      'unlisted': false
+      address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
+      symbol: 'GLA',
+      decimals: 18,
+      image: 'gladius.svg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
-      'symbol': 'GNO',
-      'decimals': 18,
-      'image': 'gnosis.svg',
-      'unlisted': false
+      address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
+      symbol: 'GNO',
+      decimals: 18,
+      image: 'gnosis.svg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
-      'symbol': 'OMG',
-      'decimals': 18,
-      'image': 'omg.jpg',
-      'unlisted': false
+      address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
+      symbol: 'OMG',
+      decimals: 18,
+      image: 'omg.jpg',
+      unlisted: false,
     },
   },
   {
     asset: {
-      'address': '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
-      'symbol': 'WED',
-      'decimals': 18,
-      'image': 'wed.png',
-      'unlisted': false
+      address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
+      symbol: 'WED',
+      decimals: 18,
+      image: 'wed.png',
+      unlisted: false,
     },
   },
-]
+];
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -172,9 +172,9 @@ const state = {
       },
       '0x6b175474e89094c44da98b954eedeac495271d0f': {
         address: '0x6b175474e89094c44da98b954eedeac495271d0f',
-        symbol: 'META',
+        symbol: 'ETH',
         decimals: 18,
-        image: 'metamark.svg',
+        image: './images/eth_logo.png',
         unlisted: false,
       },
       '0xB8c77482e45F1F44dE1745F52C74426C631bDD52': {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.28.3]
+### Fixed
+- Fix network switching prompted by dapps for users that added the network prior to v10.28.0. ([#18513](https://github.com/MetaMask/metamask-extension/pull/18513))
+
+## [10.28.2]
+### Fixed
+- Fix network switching prompted by dapps by fixing the `wallet_switchEthereumChain` handler. ([#18483](https://github.com/MetaMask/metamask-extension/pull/18483))
+- Fix to ensure all users see the NFT and transaction security notifications ([#18460](https://github.com/MetaMask/metamask-extension/pull/18460))
+- Fix issue blocking Hindi, Japanese and Turkish language users from installing from the Chrome store ([#18487](https://github.com/MetaMask/metamask-extension/pull/18487))
+
 ## [10.28.1]
 ### Changed
 - Fix release automation ([#18427](https://github.com/MetaMask/metamask-extension/pull/18427))
@@ -3643,7 +3653,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.28.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.28.3...HEAD
+[10.28.3]: https://github.com/MetaMask/metamask-extension/compare/v10.28.2...v10.28.3
+[10.28.2]: https://github.com/MetaMask/metamask-extension/compare/v10.28.1...v10.28.2
 [10.28.1]: https://github.com/MetaMask/metamask-extension/compare/v10.28.0...v10.28.1
 [10.28.0]: https://github.com/MetaMask/metamask-extension/compare/v10.27.0...v10.28.0
 [10.27.0]: https://github.com/MetaMask/metamask-extension/compare/v10.26.2...v10.27.0

diff --git a/app/images/eth_logo.png b/app/images/eth_logo.png
diff --git a/app/images/eth_logo.svg b/app/images/eth_logo.svg
diff --git a/app/scripts/controllers/network/network-controller.test.ts b/app/scripts/controllers/network/network-controller.test.ts
@@ -7308,14 +7308,14 @@ describe('NetworkController', () => {
   });
 
   describe('removeNetworkConfigurations', () => {
-    it('should remove a network configuration', async () => {
-      const networkConfigurationId = 'networkConfigurationId';
+    it('removes a network configuration', async () => {
+      const networkConfigurationId = 'testNetworkConfigurationId';
       await withController(
         {
           state: {
             networkConfigurations: {
               [networkConfigurationId]: {
-                id: 'aaaaaa',
+                id: networkConfigurationId,
                 rpcUrl: 'https://test-rpc-url',
                 ticker: 'old_rpc_ticker',
                 nickname: 'old_rpc_chainName',
@@ -7326,25 +7326,44 @@ describe('NetworkController', () => {
           },
         },
         async ({ controller }) => {
-          expect(
-            Object.values(controller.store.getState().networkConfigurations),
-          ).toStrictEqual([
-            {
-              id: 'aaaaaa',
-              rpcUrl: 'https://test-rpc-url',
-              ticker: 'old_rpc_ticker',
-              nickname: 'old_rpc_chainName',
-              rpcPrefs: { blockExplorerUrl: 'testchainscan.io' },
-              chainId: '0x1',
-            },
-          ]);
           controller.removeNetworkConfiguration(networkConfigurationId);
+
           expect(
             controller.store.getState().networkConfigurations,
           ).toStrictEqual({});
         },
       );
     });
+
+    it('throws if the networkConfigurationId it is passed does not correspond to a network configuration in state', async () => {
+      const testNetworkConfigurationId = 'testNetworkConfigurationId';
+      const invalidNetworkConfigurationId = 'invalidNetworkConfigurationId';
+      await withController(
+        {
+          state: {
+            networkConfigurations: {
+              [testNetworkConfigurationId]: {
+                rpcUrl: 'https://rpc-url.com',
+                ticker: 'old_rpc_ticker',
+                nickname: 'old_rpc_nickname',
+                rpcPrefs: { blockExplorerUrl: 'testchainscan.io' },
+                chainId: '0x1',
+                id: testNetworkConfigurationId,
+              },
+            },
+          },
+        },
+        async ({ controller }) => {
+          expect(() =>
+            controller.removeNetworkConfiguration(
+              invalidNetworkConfigurationId,
+            ),
+          ).toThrow(
+            `networkConfigurationId ${invalidNetworkConfigurationId} does not match a configured networkConfiguration`,
+          );
+        },
+      );
+    });
   });
 });
 

diff --git a/app/scripts/controllers/network/network-controller.ts b/app/scripts/controllers/network/network-controller.ts
@@ -1141,9 +1141,12 @@ export class NetworkController extends EventEmitter {
    * @param networkConfigurationId - The unique id for the network configuration
    * to remove.
    */
-  removeNetworkConfiguration(
-    networkConfigurationId: NetworkConfigurationId,
-  ): void {
+  removeNetworkConfiguration(networkConfigurationId: NetworkConfigurationId) {
+    if (!this.store.getState().networkConfigurations[networkConfigurationId]) {
+      throw new Error(
+        `networkConfigurationId ${networkConfigurationId} does not match a configured networkConfiguration`,
+      );
+    }
     const networkConfigurations = {
       ...this.store.getState().networkConfigurations,
     };