Merge branch 'main' into djb/e2e-tsconfig

Author: dbrans

package.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",

privacy-snapshot.json

@@ -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"
 ]

test/e2e/tests/bridge/bridge-test-utils.ts

@@ -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]);
   };
 

test/e2e/tests/phishing-controller/mocks.js

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

test/e2e/tests/portfolio/portfolio-site.spec.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',
+        );
       },
     );
   });

ui/components/app/create-new-vault/create-new-vault.js

@@ -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(() => {

ui/components/app/create-new-vault/create-new-vault.test.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);
+    });
   });
 });
 

ui/pages/keychains/restore-vault.stories.tsx

@@ -9,6 +9,10 @@ const store = mockStore({
   appState: {
     isLoading: false,
   },
+  metamask: {
+    isSignedIn: true,
+    sessionData: undefined,
+  }
 });
 
 const meta: Meta<typeof RestoreVaultPage> = {

yarn.lock

@@ -6108,9 +6108,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@metamask/profile-sync-controller@npm:10.0.0"
+"@metamask/profile-sync-controller@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "@metamask/profile-sync-controller@npm:10.1.0"
   dependencies:
     "@metamask/base-controller": "npm:^8.0.0"
     "@metamask/keyring-api": "npm:^17.2.0"
@@ -6130,7 +6130,7 @@ __metadata:
     "@metamask/providers": ^18.1.0
     "@metamask/snaps-controllers": ^9.19.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/107f751488dafa3017a9cb75f808b27fc9864c25cdc6b7a50557f646982465c6812cbb09c00f62b01cc343c88d52ff5558378a23b2480df4ddb7589c72ee09a8
+  checksum: 10/09dfc1eb6a12c2e109b795f0b7dbd196fec5126996e7b39729f901802fbaf19fc41f1f8a7ff5ccb4f70d86a8e8e021667bbc4bcc3f8e593601376631e45419e1
   languageName: node
   linkType: hard
 
@@ -27369,7 +27369,7 @@ __metadata:
     "@metamask/ppom-validator": "npm:0.36.0"
     "@metamask/preferences-controller": "npm:^15.0.2"
     "@metamask/preinstalled-example-snap": "npm:^0.3.0"
-    "@metamask/profile-sync-controller": "npm:^10.0.0"
+    "@metamask/profile-sync-controller": "npm:^10.1.0"
     "@metamask/providers": "npm:^20.0.0"
     "@metamask/queued-request-controller": "npm:^7.0.1"
     "@metamask/rate-limit-controller": "npm:^6.0.3"