Merge branch 'main' into 3922-re-simulate-transactions-for-every-new-block

Author: OGPoyraz

Diff for: app/_locales/en/messages.json

@@ -3469,6 +3469,7 @@ export default class MetamaskController extends EventEmitter {
       getOpenMetamaskTabsIds: this.getOpenMetamaskTabsIds,
       markNotificationPopupAsAutomaticallyClosed: () =>
         this.notificationManager.markAsAutomaticallyClosed(),
+      getCode: this.getCode.bind(this),
 
       // primary keyring management
       addNewAccount: this.addNewAccount.bind(this),
@@ -7665,6 +7666,16 @@ export default class MetamaskController extends EventEmitter {
     });
   }
 
+  async getCode(address, networkClientId) {
+    const { provider } =
+      this.networkController.getNetworkClientById(networkClientId);
+
+    return await provider.request({
+      method: 'eth_getCode',
+      params: [address],
+    });
+  }
+
   async _onAccountChange(newAddress) {
     const permittedAccountsMap = getPermittedAccountsByOrigin(
       this.permissionController.state,

Diff for: app/_locales/en_GB/messages.json

@@ -308,7 +308,7 @@
     "@metamask/post-message-stream": "^9.0.0",
     "@metamask/ppom-validator": "0.36.0",
     "@metamask/preinstalled-example-snap": "^0.3.0",
-    "@metamask/profile-sync-controller": "^10.0.0",
+    "@metamask/profile-sync-controller": "^10.1.0",
     "@metamask/providers": "^20.0.0",
     "@metamask/queued-request-controller": "^7.0.1",
     "@metamask/rate-limit-controller": "^6.0.3",

Diff for: app/scripts/metamask-controller.js

@@ -84,5 +84,6 @@
   "unresponsive-rpc.url",
   "user-storage.api.cx.metamask.io",
   "verify.walletconnect.com",
-  "www.4byte.directory"
+  "www.4byte.directory",
+  "api.web3modal.org"
 ]

Diff for: package.json

@@ -14,6 +14,7 @@ const REDESIGN_USER_TRANSACTION_TYPES = [
   TransactionType.batch,
   TransactionType.contractInteraction,
   TransactionType.deployContract,
+  TransactionType.revokeDelegation,
   TransactionType.tokenMethodApprove,
   TransactionType.tokenMethodIncreaseAllowance,
   TransactionType.tokenMethodSetApprovalForAll,

Diff for: privacy-snapshot.json

@@ -9,6 +9,7 @@ import { SMART_CONTRACTS } from '../../seeder/smart-contracts';
 import { CHAIN_IDS } from '../../../../shared/constants/network';
 import { Driver } from '../../webdriver/driver';
 import type { FeatureFlagResponse } from '../../../../shared/types/bridge';
+import { emptyHtmlPage } from '../../mock-e2e';
 import {
   DEFAULT_FEATURE_FLAGS_RESPONSE,
   ETH_CONVERSION_RATE_USD,
@@ -62,7 +63,7 @@ export class BridgePage {
   };
 
   verifyPortfolioTab = async () => {
-    await this.driver.switchToWindowWithTitle('MetaMask Portfolio - Bridge');
+    await this.driver.switchToWindowWithTitle('E2E Test Page');
     await this.driver.waitForUrlContaining({
       url: 'portfolio.metamask.io/bridge',
     });
@@ -101,16 +102,15 @@ const mockServer =
             };
           }),
     );
-    const portfolioMock = async () =>
-      await mockServer_
-        .forGet('https://portfolio.metamask.io/bridge')
-        .always()
-        .thenCallback(() => {
-          return {
-            statusCode: 200,
-            json: {},
-          };
-        });
+    const portfolioMock = mockServer_
+      .forGet(`https://portfolio.metamask.io/bridge`)
+      .always()
+      .thenCallback(() => {
+        return {
+          statusCode: 200,
+          body: emptyHtmlPage(),
+        };
+      });
     return Promise.all([...featureFlagMocks, portfolioMock]);
   };
 

Diff for: shared/lib/confirmation.utils.ts

@@ -112,6 +112,16 @@ async function setupPhishingDetectionMocks(
         body: emptyHtmlPage(blockProvider),
       };
     });
+
+  await mockServer
+    .forGet(`https://portfolio.metamask.io`)
+    .always()
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        body: emptyHtmlPage(),
+      };
+    });
 }
 
 /**

Diff for: test/e2e/tests/bridge/bridge-test-utils.ts

@@ -1,18 +1,21 @@
 import { MockttpServer } from 'mockttp';
 import { withFixtures } from '../../helpers';
-import { PORTFOLIO_PAGE_TITLE, MOCK_META_METRICS_ID } from '../../constants';
+import { MOCK_META_METRICS_ID } from '../../constants';
 import FixtureBuilder from '../../fixture-builder';
 import { emptyHtmlPage } from '../../mock-e2e';
 import HomePage from '../../page-objects/pages/home/homepage';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
+import MockedPage from '../../page-objects/pages/mocked-page';
 
 describe('Portfolio site', function () {
   async function mockPortfolioSite(mockServer: MockttpServer) {
     return await mockServer
       .forGet('https://portfolio.metamask.io/')
       .withQuery({
         metamaskEntry: 'ext_portfolio_button',
-        metametricsId: 'null',
+        metametricsId: MOCK_META_METRICS_ID,
+        metricsEnabled: 'true',
+        marketingEnabled: 'false',
       })
       .thenCallback(() => {
         return {
@@ -38,12 +41,15 @@ describe('Portfolio site', function () {
       async ({ driver }) => {
         await loginWithBalanceValidation(driver);
         await new HomePage(driver).openPortfolioPage();
-        await driver.switchToWindowWithTitle(PORTFOLIO_PAGE_TITLE);
+        await driver.switchToWindowWithTitle('E2E Test Page');
 
         // Verify site
         await driver.waitForUrl({
           url: `https://portfolio.metamask.io/?metamaskEntry=ext_portfolio_button&metametricsId=${MOCK_META_METRICS_ID}&metricsEnabled=true&marketingEnabled=false`,
         });
+        await new MockedPage(driver).check_displayedMessage(
+          'Empty page by MetaMask',
+        );
       },
     );
   });

Diff for: test/e2e/tests/phishing-controller/mocks.js

@@ -10,6 +10,7 @@ const {
 
 const ERC20_TOKEN_1_MOCK = '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599'; // WBTC
 const ERC20_TOKEN_2_MOCK = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'; // USDC
+const UPGRADED_ACCOUNT_MOCK = '0x9d0ba4ddac06032527b140912ec808ab9451b788';
 const ERC721_TOKEN_MOCK = '0x06012c8cf97bead5deae237070f9587f8e7a266d'; // CryptoKitties
 
 const TOKEN_DETAILS_MOCK = {
@@ -50,7 +51,9 @@ module.exports = {
   },
 
   // eslint-disable-next-line no-empty-function
-  trackMetaMetricsEvent: () => {},
+  trackMetaMetricsEvent: () => {
+    // Intentionally empty
+  },
 
   decodeTransactionData: async (request) => {
     const { contractAddress } = request;
@@ -65,4 +68,12 @@ module.exports = {
 
     return undefined;
   },
+
+  getCode: async (address) => {
+    if (address === UPGRADED_ACCOUNT_MOCK) {
+      return '0x1234';
+    }
+
+    return '0x';
+  },
 };

Diff for: test/e2e/tests/portfolio/portfolio-site.spec.ts

@@ -5,6 +5,7 @@ import TextField from '../../ui/text-field';
 import { ButtonVariant, Button, Checkbox } from '../../component-library';
 import SrpInput from '../srp-input';
 import { PASSWORD_MIN_LENGTH } from '../../../helpers/constants/common';
+import { useSignOut } from '../../../hooks/identity/useAuthentication';
 
 export default function CreateNewVault({
   disabled = false,
@@ -19,6 +20,8 @@ export default function CreateNewVault({
   const [seedPhrase, setSeedPhrase] = useState('');
   const [termsChecked, setTermsChecked] = useState(false);
 
+  const { signOut } = useSignOut();
+
   const t = useI18nContext();
 
   const onPasswordChange = useCallback(
@@ -73,9 +76,10 @@ export default function CreateNewVault({
         return;
       }
 
+      await signOut();
       await onSubmit(password, seedPhrase);
     },
-    [isValid, onSubmit, password, seedPhrase],
+    [isValid, onSubmit, password, seedPhrase, signOut],
   );
 
   const toggleTermsCheck = useCallback(() => {

Diff for: ui/__mocks__/actions.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen, fireEvent } from '@testing-library/react';
+import { screen, fireEvent, waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
 import configureStore from '../../../store/store';
 import mockState from '../../../../test/data/mock-state.json';
@@ -14,6 +14,13 @@ const store = configureStore({
   },
 });
 
+const mockSignOut = jest.fn();
+jest.mock('../../../hooks/identity/useAuthentication', () => ({
+  useSignOut: () => ({
+    signOut: mockSignOut,
+  }),
+}));
+
 describe('CreateNewVault', () => {
   it('renders CreateNewVault component and shows Secret Recovery Phrase text', () => {
     renderWithProvider(
@@ -120,7 +127,7 @@ describe('CreateNewVault', () => {
     expect(submitButton).toBeDisabled();
   });
 
-  it('should valid', () => {
+  it('should sign out the user and submit successfully when password and confirm password match', () => {
     const props = {
       onSubmit: jest.fn(),
       submitText: 'Submit',
@@ -158,7 +165,10 @@ describe('CreateNewVault', () => {
 
     fireEvent.click(submitButton);
 
-    expect(props.onSubmit).toHaveBeenCalledWith(password, TEST_SEED);
+    waitFor(() => {
+      expect(mockSignOut).toHaveBeenCalled();
+      expect(props.onSubmit).toHaveBeenCalledWith(password, TEST_SEED);
+    });
   });
 });