fix: Multichain AssetList e2e tests

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json

@@ -342,7 +342,6 @@
   },
   "TxController": {
     "methodData": "object",
-    "submitHistory": "object",
     "transactions": "object",
     "lastFetchedBlockNumbers": "object",
     "submitHistory": "object"

test/e2e/tests/metrics/state-snapshots/errors-before-init-opt-in-background-state.json

@@ -118,6 +118,7 @@
         "isRedesignedConfirmationsDeveloperEnabled": "boolean",
         "showConfirmationAdvancedDetails": false,
         "tokenSortConfig": "object",
+        "tokenNetworkFilter": {},
         "showMultiRpcModal": "boolean",
         "shouldShowAggregatedBalancePopover": "boolean",
         "tokenNetworkFilter": {}

test/e2e/tests/privacy-mode/privacy-mode.spec.js

@@ -18,7 +18,7 @@ describe('Privacy Mode', function () {
       async ({ driver }) => {
         async function checkForHeaderValue(value) {
           const balanceElement = await driver.findElement(
-            '[data-testid="eth-overview__primary-currency"] .currency-display-component__text',
+            '[data-testid="account-value-and-suffix"]',
           );
           const surveyText = await balanceElement.getText();
           assert.equal(
@@ -30,15 +30,15 @@ describe('Privacy Mode', function () {
 
         async function checkForTokenValue(value) {
           const balanceElement = await driver.findElement(
-            '[data-testid="multichain-token-list-item-secondary-value"]',
+            '[data-testid="multichain-token-list-item-value"]',
           );
           const surveyText = await balanceElement.getText();
           assert.equal(surveyText, value, `Token balance should be "${value}"`);
         }
 
         async function checkForPrivacy() {
           await checkForHeaderValue('••••••');
-          await checkForTokenValue('•••••••••');
+          await checkForTokenValue('••••••');
         }
 
         async function checkForNoPrivacy() {
@@ -48,7 +48,7 @@ describe('Privacy Mode', function () {
 
         async function togglePrivacy() {
           const balanceElement = await driver.findElement(
-            '[data-testid="eth-overview__primary-currency"] .currency-display-component__text',
+            '[data-testid="account-value-and-suffix"]',
           );
           const initialText = await balanceElement.getText();
 
@@ -81,7 +81,7 @@ describe('Privacy Mode', function () {
 
         async function togglePrivacy() {
           const balanceElement = await driver.findElement(
-            '[data-testid="eth-overview__primary-currency"] .currency-display-component__text',
+            '[data-testid="account-value-and-suffix"]',
           );
           const initialText = await balanceElement.getText();
 

test/e2e/tests/tokens/token-sort.spec.ts

@@ -66,10 +66,8 @@ describe('Token List', function () {
 
         assert.ok(tokenSymbolsBeforeSorting[0].includes('Ethereum'));
 
-        await await driver.clickElement(
-          '[data-testid="sort-by-popover-toggle"]',
-        );
-        await await driver.clickElement('[data-testid="sortByAlphabetically"]');
+        await driver.clickElement('[data-testid="sort-by-popover-toggle"]');
+        await driver.clickElement('[data-testid="sortByAlphabetically"]');
 
         await driver.delay(regularDelayMs);
         const tokenListAfterSortingAlphabetically = await driver.findElements(
@@ -85,12 +83,8 @@ describe('Token List', function () {
           tokenListSymbolsAfterSortingAlphabetically[0].includes('ABC'),
         );
 
-        await await driver.clickElement(
-          '[data-testid="sort-by-popover-toggle"]',
-        );
-        await await driver.clickElement(
-          '[data-testid="sortByDecliningBalance"]',
-        );
+        await driver.clickElement('[data-testid="sort-by-popover-toggle"]');
+        await driver.clickElement('[data-testid="sortByDecliningBalance"]');
 
         await driver.delay(regularDelayMs);
         const tokenListBeforeSortingByDecliningBalance =

test/jest/mock-store.js

@@ -139,6 +139,7 @@ export const createSwapsMockStore = () => {
       preferences: {
         showFiatInTestnets: true,
         smartTransactionsOptInStatus: true,
+        tokenNetworkFilter: {},
         showMultiRpcModal: false,
       },
       transactions: [

ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx

@@ -68,12 +68,13 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   }, [currentNetwork.chainId, TEST_CHAINS]);
 
   const allOpts: Record<string, boolean> = {};
-  Object.keys(allNetworks).forEach((chainId) => {
+  Object.keys(allNetworks || {}).forEach((chainId) => {
     allOpts[chainId] = true;
   });
 
   const allNetworksFilterShown =
-    Object.keys(tokenNetworkFilter).length !== Object.keys(allOpts).length;
+    Object.keys(tokenNetworkFilter || {}).length !==
+    Object.keys(allOpts || {}).length;
 
   useEffect(() => {
     if (isTestNetwork) {
@@ -86,7 +87,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
   // We need to set the default filter for all users to be all included networks, rather than defaulting to empty object
   // This effect is to unblock and derisk in the short-term
   useEffect(() => {
-    if (Object.keys(tokenNetworkFilter).length === 0) {
+    if (Object.keys(tokenNetworkFilter || {}).length === 0) {
       dispatch(setTokenNetworkFilter(allOpts));
     }
   }, []);
@@ -162,7 +163,7 @@ const AssetListControlBar = ({ showTokensLinks }: AssetListControlBarProps) => {
       >
         {process.env.PORTFOLIO_VIEW && (
           <ButtonBase
-            data-testid="network-filter"
+            data-testid="sort-by-networks"
             variant={TextVariant.bodyMdMedium}
             className="asset-list-control-bar__button asset-list-control-bar__network_control"
             onClick={toggleNetworkFilterPopover}

ui/components/app/assets/asset-list/network-filter/network-filter.tsx

@@ -84,23 +84,23 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
 
   useEffect(() => {
     const testnetChains: string[] = TEST_CHAINS;
-    const mainnetChainIds = Object.keys(allNetworks).filter(
+    const mainnetChainIds = Object.keys(allNetworks || {}).filter(
       (chain) => !testnetChains.includes(chain),
     );
     setChainsToShow(mainnetChainIds);
   }, []);
 
   const allOpts: Record<string, boolean> = {};
-  Object.keys(allNetworks).forEach((chain) => {
+  Object.keys(allNetworks || {}).forEach((chain) => {
     allOpts[chain] = true;
   });
 
   return (
     <>
       <SelectableListItem
         isSelected={
-          Object.keys(tokenNetworkFilter).length ===
-          Object.keys(allNetworks).length
+          Object.keys(tokenNetworkFilter || {}).length ===
+          Object.keys(allNetworks || {}).length
         }
         onClick={() => handleFilter(allOpts)}
         testId="network-filter-all"
@@ -161,7 +161,7 @@ const NetworkFilter = ({ handleClose }: SortControlProps) => {
       <SelectableListItem
         isSelected={
           tokenNetworkFilter[chainId] &&
-          Object.keys(tokenNetworkFilter).length === 1
+          Object.keys(tokenNetworkFilter || {}).length === 1
         }
         onClick={() => handleFilter({ [chainId]: true })}
         testId="network-filter-current"