Merge branch 'main' into sign_msg_section_design_fix

Author: jpuri

test/e2e/page-objects/pages/test-dapp.ts

@@ -321,6 +321,26 @@ class TestDapp {
     });
   }
 
+  /**
+   * Verifies the accounts connected to the test dapp.
+   *
+   * @param connectedAccounts - The expected connected accounts separated by a comma. If no accounts are connected we can omit the param.
+   */
+  async check_connectedAccounts(connectedAccounts: string = '') {
+    console.log('Verify connected accounts');
+    if (connectedAccounts) {
+      await this.driver.waitForSelector({
+        css: this.connectedAccount,
+        text: connectedAccounts,
+      });
+    } else {
+      await this.driver.waitForSelector({
+        css: this.connectedAccount,
+        text: ' ',
+      });
+    }
+  }
+
   /**
    * Verify the failed personal sign signature.
    *

test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.js

@@ -0,0 +1,78 @@
+import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import TestDapp from '../../page-objects/pages/test-dapp';
+import TransactionConfirmation from '../../page-objects/pages/confirmations/redesign/transaction-confirmation';
+import { Ganache } from '../../seeder/ganache';
+import { Driver } from '../../webdriver/driver';
+import { DEFAULT_FIXTURE_ACCOUNT } from '../../constants';
+import FixtureBuilder from '../../fixture-builder';
+import {
+  withFixtures,
+  defaultGanacheOptions,
+  WINDOW_TITLES,
+} from '../../helpers';
+
+describe('Request Queuing', function () {
+  // TODO: add a new spec which checks that after revoking and connecting again
+  // a pending tx is still closed when using revokePermissions.
+  // To be done once this bug is fixed: #29272
+  it('should clear tx confirmation when revokePermission is called from origin dapp', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder()
+          .withPermissionControllerConnectedToTestDapp()
+          .withPreferencesControllerUseRequestQueueEnabled()
+          .withSelectedNetworkControllerPerDomain()
+          .build(),
+        ganacheOptions: {
+          ...defaultGanacheOptions,
+        },
+        title: this.test?.fullTitle(),
+      },
+      async ({
+        driver,
+        ganacheServer,
+      }: {
+        driver: Driver;
+        ganacheServer?: Ganache;
+      }) => {
+        await loginWithBalanceValidation(driver, ganacheServer);
+
+        // Open test dapp
+        const testDapp = new TestDapp(driver);
+        await testDapp.openTestDappPage();
+        await testDapp.check_connectedAccounts(
+          DEFAULT_FIXTURE_ACCOUNT.toLowerCase(),
+        );
+
+        // Trigger a tx
+        await testDapp.clickSimpleSendButton();
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
+
+        const transactionConfirmation = new TransactionConfirmation(driver);
+        await transactionConfirmation.check_dappInitiatedHeadingTitle();
+
+        // wallet_revokePermissions request
+        const revokePermissionsRequest = JSON.stringify({
+          jsonrpc: '2.0',
+          method: 'wallet_revokePermissions',
+          params: [
+            {
+              eth_accounts: {},
+            },
+          ],
+        });
+        await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
+        await driver.executeScript(
+          `return window.ethereum.request(${revokePermissionsRequest})`,
+        );
+
+        // Should have cleared the tx confirmation
+        await driver.waitUntilXWindowHandles(2);
+
+        // Cleared eth_accounts account label
+        await testDapp.check_connectedAccounts();
+      },
+    );
+  });
+});

test/e2e/tests/request-queuing/sendTx-revokePermissions.spec.ts

@@ -101,7 +101,7 @@ describe('AdvancedGasFeeGasLimit', () => {
       ),
     ).toBeInTheDocument();
     fireEvent.change(document.getElementsByTagName('input')[0], {
-      target: { value: 8000000 },
+      target: { value: 80000000 },
     });
     expect(
       screen.queryByText(
@@ -154,7 +154,7 @@ describe('AdvancedGasFeeGasLimit', () => {
     );
     expect(
       screen.queryByText(
-        `Gas limit must be greater than 29999 and less than 7920050`,
+        `Gas limit must be greater than 29999 and less than 30000000`,
       ),
     ).toBeInTheDocument();
   });

ui/pages/confirmations/components/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.test.js

@@ -5,7 +5,7 @@ import { EtherDenomination } from '../../../../shared/constants/common';
 const MIN_GAS_PRICE_DEC = '0';
 const MIN_GAS_PRICE_HEX = parseInt(MIN_GAS_PRICE_DEC, 10).toString(16);
 const MIN_GAS_LIMIT_DEC = new Numeric('21000', 10);
-const MAX_GAS_LIMIT_DEC = '7920027';
+const MAX_GAS_LIMIT_DEC = '30000000';
 
 const HIGH_FEE_WARNING_MULTIPLIER = 1.5;
 const MIN_GAS_PRICE_GWEI = new Numeric(