Merge branch 'main' into ogp/37428

Author: OGPoyraz

app/_locales/en/messages.json

@@ -379,6 +379,7 @@ class SmartTransactionHook {
               status: SmartTransactionStatuses.PENDING,
               creationTime: Date.now(),
               uuid,
+              chainId: this.#chainId,
             },
             isDapp: this.#isDapp,
             txId: this.#transactionMeta.id,

app/_locales/en_GB/messages.json

@@ -1,15 +1,14 @@
 /* eslint-disable @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
+import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
 import { createDappTransaction } from '../../../page-objects/flows/transaction';
+import ActivityListPage from '../../../page-objects/pages/home/activity-list';
+import HomePage from '../../../page-objects/pages/home/homepage';
 import TestDapp from '../../../page-objects/pages/test-dapp';
 import { Driver } from '../../../webdriver/driver';
 
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../../fixture-builder');
-const {
-  withFixtures,
-  unlockWallet,
-  WINDOW_TITLES,
-} = require('../../../helpers');
+const { withFixtures, WINDOW_TITLES } = require('../../../helpers');
 
 describe('dApp Request Gas Limit', function () {
   it('should update the gas limit in the activity list after submitting a request with custom gas (lower than 21000)', async function () {
@@ -29,7 +28,7 @@ describe('dApp Request Gas Limit', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
 
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
@@ -52,12 +51,13 @@ describe('dApp Request Gas Limit', function () {
         );
 
         // Click on Activity tab
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
 
         // Wait for the transaction to appear and click on it
-        await driver.clickElement('[data-testid="activity-list-item"]');
+        const activityList = new ActivityListPage(driver);
+        await activityList.checkFailedTxNumberDisplayedInActivity(1);
+        await activityList.clickTransactionListItem();
 
         // Now on transaction details page, find and verify the gas limit
         const rows = await driver.findElements(
@@ -91,7 +91,7 @@ describe('dApp Request Gas Limit', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
 
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
@@ -114,12 +114,13 @@ describe('dApp Request Gas Limit', function () {
         );
 
         // Click on Activity tab
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
 
         // Wait for the transaction to appear and click on it
-        await driver.clickElement('[data-testid="activity-list-item"]');
+        const activityList = new ActivityListPage(driver);
+        await activityList.checkFailedTxNumberDisplayedInActivity(1);
+        await activityList.clickTransactionListItem();
 
         // Now on transaction details page, find and verify the gas limit
         const rows = await driver.findElements(
@@ -153,7 +154,7 @@ describe('dApp Request Gas Limit', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
 
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
@@ -176,12 +177,13 @@ describe('dApp Request Gas Limit', function () {
         );
 
         // Click on Activity tab
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
 
         // Wait for the transaction to appear and click on it
-        await driver.clickElement('[data-testid="activity-list-item"]');
+        const activityList = new ActivityListPage(driver);
+        await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
+        await activityList.clickTransactionListItem();
 
         // Now on transaction details page, find and verify the gas limit
         const rows = await driver.findElements(
@@ -215,7 +217,7 @@ describe('dApp Request Gas Limit', function () {
         title: this.test?.fullTitle(),
       },
       async ({ driver }: { driver: Driver }) => {
-        await unlockWallet(driver);
+        await loginWithBalanceValidation(driver);
 
         const testDapp = new TestDapp(driver);
         await testDapp.openTestDappPage();
@@ -238,12 +240,13 @@ describe('dApp Request Gas Limit', function () {
         );
 
         // Click on Activity tab
-        await driver.clickElement(
-          '[data-testid="account-overview__activity-tab"]',
-        );
+        const homePage = new HomePage(driver);
+        await homePage.goToActivityList();
 
         // Wait for the transaction to appear and click on it
-        await driver.clickElement('[data-testid="activity-list-item"]');
+        const activityList = new ActivityListPage(driver);
+        await activityList.checkConfirmedTxNumberDisplayedInActivity(1);
+        await activityList.clickTransactionListItem();
 
         // Now on transaction details page, find and verify the gas limit
         const rows = await driver.findElements(

app/scripts/lib/smart-transaction/smart-transactions.ts

@@ -257,7 +257,7 @@ describe('MetaMask onboarding', function () {
 
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
-        await homePage.checkExpectedBalanceIsDisplayed('17,000.00', '$');
+        await homePage.checkExpectedBalanceIsDisplayed('10', 'ETH');
         await homePage.checkAddNetworkMessageIsDisplayed(networkName);
       },
     );

test/e2e/tests/confirmations/transactions/request-gas-limit.spec.ts

@@ -676,6 +676,7 @@ export const createSwapsMockStore = () => {
                   '0x55ad39634ee10d417b6e190cfd3736098957e958879cffe78f1f00f4fd2654d6',
                 minedTx: 'success',
               },
+              chainId: CHAIN_IDS.MAINNET,
             },
             {
               uuid: 'uuid2',
@@ -689,6 +690,7 @@ export const createSwapsMockStore = () => {
                   '0x55ad39634ee10d417b6e190cfd3736098957e958879cffe78f1f00f4fd2654d6',
                 minedTx: 'success',
               },
+              chainId: CHAIN_IDS.MAINNET,
             },
           ],
         },

test/e2e/tests/onboarding/onboarding.spec.ts

@@ -35,6 +35,7 @@ import { MetaMetricsContext } from '../../../../contexts/metametrics';
 import { SafeChain } from '../../../../pages/settings/networks-tab/networks-form/use-safe-chains';
 import { isGlobalNetworkSelectorRemoved } from '../../../../selectors/selectors';
 import { isEvmChainId } from '../../../../../shared/lib/asset-utils';
+import { sortAssetsWithPriority } from '../util/sortAssetsWithPriority';
 
 type TokenListProps = {
   onTokenClick: (chainId: string, address: string) => void;
@@ -102,34 +103,32 @@ function TokenList({ onTokenClick, safeChains }: TokenListProps) {
         }
 
         // Mapping necessary to comply with the type. Fields will be overriden with useTokenDisplayInfo
-        return assets
-          .filter((asset) => {
-            if (shouldHideZeroBalanceTokens && asset.balance === '0') {
-              return false;
-            }
-            return true;
-          })
-          .map((asset) => {
-            const token: TokenWithFiatAmount = {
-              ...asset,
-              tokenFiatAmount: asset.fiat?.balance,
-              secondary: null,
-              title: asset.name,
-              address:
-                'address' in asset ? asset.address : (asset.assetId as Hex),
-              chainId: asset.chainId as Hex,
-            };
-
-            return token;
-          });
+        return assets.filter((asset) => {
+          if (shouldHideZeroBalanceTokens && asset.balance === '0') {
+            return false;
+          }
+          return true;
+        });
       },
     );
-    const accountAssets = sortAssets(
-      [...accountAssetsPreSort],
+
+    const accountAssets = sortAssetsWithPriority(
+      accountAssetsPreSort,
       tokenSortConfig,
     );
 
-    return accountAssets;
+    return accountAssets.map((asset) => {
+      const token: TokenWithFiatAmount = {
+        ...asset,
+        tokenFiatAmount: asset.fiat?.balance,
+        secondary: null,
+        title: asset.name,
+        address: 'address' in asset ? asset.address : (asset.assetId as Hex),
+        chainId: asset.chainId as Hex,
+      };
+
+      return token;
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [