Merge branch 'develop' into chore/mmassets-328_polish-multichain-toke…

…n-list-styles
MetaMask · Aug 23, 2024 · fd3c3b7 · fd3c3b7
2 parents dae0ccf + 800a9d3
commit fd3c3b7
Show file tree

Hide file tree

Showing 228 changed files with 2,137 additions and 6,570 deletions.
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -1,13 +1,13 @@
 import { draftTransactionInitialState } from '../ui/ducks/send';
 import { KeyringType } from '../shared/constants/keyring';
-import { NetworkType } from '@metamask/controller-utils';
 import { NetworkStatus } from '@metamask/network-controller';
 import { EthAccountType } from '@metamask/keyring-api';
 import { CHAIN_IDS } from '../shared/constants/network';
 import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
 import { getJsxElementFromComponent } from '@metamask/snaps-utils';
 import { FirstTimeFlowType } from '../shared/constants/onboarding';
 import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
+import { mockNetworkState } from '../test/stub/networks';
 
 const state = {
   invalidCustomNetwork: {
@@ -181,15 +181,6 @@ const state = {
         1559: true,
       },
     },
-    selectedNetworkClientId: NetworkType.mainnet,
-    networksMetadata: {
-      [NetworkType.mainnet]: {
-        EIPS: {
-          1559: true,
-        },
-        status: NetworkStatus.Available,
-      },
-    },
     gasFeeEstimates: '0x5208',
     swapsState: {
       quotes: {},
@@ -705,13 +696,6 @@ const state = {
     connectedStatusPopoverHasBeenShown: true,
     swapsWelcomeMessageHasBeenShown: true,
     defaultHomeActiveTabName: 'Tokens',
-    providerConfig: {
-      type: 'sepolia',
-      ticker: 'ETH',
-      nickname: 'Sepolia',
-      rpcUrl: '',
-      chainId: '0xaa36a7',
-    },
     network: '5',
     accounts: {
       '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': {
@@ -1234,21 +1218,23 @@ const state = {
         accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
       },
     ],
-    networkConfigurations: {
-      'test-networkConfigurationId-1': {
+    ...mockNetworkState({
+        id: 'test-networkConfigurationId-1',
         rpcUrl: 'https://testrpc.com',
         chainId: '0x1',
         nickname: 'mainnet',
-        rpcPrefs: { blockExplorerUrl: 'https://etherscan.io' },
-      },
-      'test-networkConfigurationId-2': {
+        blockExplorerUrl: 'https://etherscan.io',
+        metadata: {
+          EIPS: { 1559: true },
+          status: NetworkStatus.Available,
+        }
+      }, {
+        id: 'test-networkConfigurationId-2',
         rpcUrl: 'http://localhost:8545',
         chainId: '0x539',
         ticker: 'ETH',
         nickname: 'Localhost 8545',
-        rpcPrefs: {},
-      },
-    },
+      }),
     accountTokens: {
       '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': {
         '0x1': [