diff --git a/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts b/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts index f383a19ac8cb..8fa5651dc366 100644 --- a/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts +++ b/test/e2e/benchmarks/flows/user-journey/onboarding-import-wallet.ts @@ -84,7 +84,8 @@ export async function runOnboardingImportWalletBenchmark(): Promise { JSON.stringify({ regulationType: 'DELETE_ONLY', subjectType: 'USER_ID', - subjectIds: [MOCK_META_METRICS_ID], + subjectIds: [MOCK_ANALYTICS_ID], }), ) .thenCallback(() => ({ @@ -80,8 +80,9 @@ describe('Delete MetaMetrics Data', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -142,8 +143,9 @@ describe('Delete MetaMetrics Data', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: false, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/developer-options-sentry.spec.ts b/test/e2e/tests/metrics/developer-options-sentry.spec.ts index 1a09ab81587a..07b82936936f 100644 --- a/test/e2e/tests/metrics/developer-options-sentry.spec.ts +++ b/test/e2e/tests/metrics/developer-options-sentry.spec.ts @@ -6,7 +6,7 @@ import { Driver } from '../../webdriver/driver'; import { login } from '../../page-objects/flows/login.flow'; import { triggerCrash } from '../../page-objects/flows/crash.flow'; import ErrorPage from '../../page-objects/pages/error-page'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; async function mockSentryError(mockServer: MockttpServer) { return [ @@ -28,8 +28,9 @@ describe('Developer Options - Sentry', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -55,8 +56,9 @@ describe('Developer Options - Sentry', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/error-page.spec.ts b/test/e2e/tests/metrics/error-page.spec.ts index 178fcd0c49ea..0c00f8416fd2 100644 --- a/test/e2e/tests/metrics/error-page.spec.ts +++ b/test/e2e/tests/metrics/error-page.spec.ts @@ -1,7 +1,7 @@ import { strict as assert } from 'assert'; import { Mockttp } from 'mockttp'; import { getEventPayloads, withFixtures } from '../../helpers'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import ErrorPage from '../../page-objects/pages/error-page'; import { triggerCrash } from '../../page-objects/flows/crash.flow'; @@ -34,8 +34,9 @@ describe('Error Page', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -74,8 +75,9 @@ describe('Error Page', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/errors.spec.ts b/test/e2e/tests/metrics/errors.spec.ts index b340a2c15d5b..4777f99e8a2a 100644 --- a/test/e2e/tests/metrics/errors.spec.ts +++ b/test/e2e/tests/metrics/errors.spec.ts @@ -10,7 +10,7 @@ import { SENTRY_UI_STATE } from '../../../../app/scripts/constants/sentry-state' import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { withFixtures, sentryRegEx } from '../../helpers'; import { PAGES } from '../../webdriver/driver'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import LoginPage from '../../page-objects/pages/login-page'; import { login } from '../../page-objects/flows/login.flow'; import { mockSpotPrices } from '../tokens/utils/mocks'; @@ -293,8 +293,9 @@ describe('Sentry errors', function () { fixtures: { ...new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: null, - participateInMetaMetrics: false, + analyticsId: null, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), // Intentionally corrupt state to trigger migration error during initialization @@ -365,8 +366,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: null, - participateInMetaMetrics: false, + analyticsId: null, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), @@ -441,8 +443,9 @@ describe('Sentry errors', function () { fixtures: { ...new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), // Intentionally corrupt state to trigger migration error during initialization @@ -525,8 +528,9 @@ describe('Sentry errors', function () { fixtures: { ...new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), // Intentionally corrupt state to trigger migration error during initialization @@ -626,8 +630,9 @@ describe('Sentry errors', function () { fixtures: { ...new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .withBadPreferencesControllerState() .build(), @@ -715,8 +720,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -798,8 +804,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -904,8 +911,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: null, - participateInMetaMetrics: false, + analyticsId: null, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), @@ -977,8 +985,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: null, - participateInMetaMetrics: false, + analyticsId: null, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), @@ -1050,8 +1059,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -1139,8 +1149,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -1240,8 +1251,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -1323,8 +1335,9 @@ describe('Sentry errors', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/marketing-cookieid.spec.ts b/test/e2e/tests/metrics/marketing-cookieid.spec.ts index 687cd45d53fb..9157b0c8b894 100644 --- a/test/e2e/tests/metrics/marketing-cookieid.spec.ts +++ b/test/e2e/tests/metrics/marketing-cookieid.spec.ts @@ -8,7 +8,7 @@ import { } from '../../helpers'; import { TestSuiteArguments } from '../confirmations/transactions/shared'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; -import { MOCK_META_METRICS_ID, WINDOW_TITLES } from '../../constants'; +import { MOCK_ANALYTICS_ID, WINDOW_TITLES } from '../../constants'; import HomePage from '../../page-objects/pages/home/homepage'; import PrivacySettings from '../../page-objects/pages/settings/privacy-settings'; import SettingsPage from '../../page-objects/pages/settings/settings-page'; @@ -49,8 +49,9 @@ describe('Marketing cookieId', function (this: Suite) { }, fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, dataCollectionForMarketing: true, }) .build(), @@ -95,8 +96,9 @@ describe('Marketing cookieId', function (this: Suite) { }, fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -180,8 +182,9 @@ describe('Marketing cookieId', function (this: Suite) { }, fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, dataCollectionForMarketing: true, }) .build(), diff --git a/test/e2e/tests/metrics/metametrics-persistence.spec.ts b/test/e2e/tests/metrics/metametrics-persistence.spec.ts index 515330263ea8..df8335633f08 100644 --- a/test/e2e/tests/metrics/metametrics-persistence.spec.ts +++ b/test/e2e/tests/metrics/metametrics-persistence.spec.ts @@ -1,7 +1,7 @@ import { strict as assert } from 'assert'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { getCleanAppState, withFixtures } from '../../helpers'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import HomePage from '../../page-objects/pages/home/homepage'; import PrivacySettings from '../../page-objects/pages/settings/privacy-settings'; import SettingsPage from '../../page-objects/pages/settings/settings-page'; @@ -13,8 +13,9 @@ describe('MetaMetrics ID persistence', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -24,7 +25,7 @@ describe('MetaMetrics ID persistence', function () { let uiState = await getCleanAppState(driver); - assert.equal(uiState.metamask.analyticsId, MOCK_META_METRICS_ID); + assert.equal(uiState.metamask.analyticsId, MOCK_ANALYTICS_ID); // goes to the privacy settings screen and toggle off participate in metaMetrics await new HomePage(driver).headerNavbar.openSettingsPage(); @@ -44,7 +45,7 @@ describe('MetaMetrics ID persistence', function () { assert.equal( uiState.metamask.analyticsId, - MOCK_META_METRICS_ID, + MOCK_ANALYTICS_ID, 'Metametrics ID should be preserved when toggling off metametrics collection', ); @@ -58,7 +59,7 @@ describe('MetaMetrics ID persistence', function () { assert.equal( uiState.metamask.analyticsId, - MOCK_META_METRICS_ID, + MOCK_ANALYTICS_ID, 'Metametrics ID should be preserved when toggling on metametrics collection', ); }, diff --git a/test/e2e/tests/metrics/metrics-opt-in-out.spec.ts b/test/e2e/tests/metrics/metrics-opt-in-out.spec.ts index 93590841ba93..2ad36624eb56 100644 --- a/test/e2e/tests/metrics/metrics-opt-in-out.spec.ts +++ b/test/e2e/tests/metrics/metrics-opt-in-out.spec.ts @@ -3,7 +3,7 @@ import { Mockttp } from 'mockttp'; import { Browser } from 'selenium-webdriver'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; -import { MOCK_META_METRICS_ID, WALLET_PASSWORD } from '../../constants'; +import { MOCK_ANALYTICS_ID, WALLET_PASSWORD } from '../../constants'; import OnboardingMetricsPage from '../../page-objects/pages/onboarding/onboarding-metrics-page'; import OnboardingPasswordPage from '../../page-objects/pages/onboarding/onboarding-password-page'; import SecureWalletPage from '../../page-objects/pages/onboarding/secure-wallet-page'; @@ -72,7 +72,7 @@ describe('Metrics Opt In/Out events', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -123,7 +123,7 @@ describe('Metrics Opt In/Out events', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/nft-detection-metrics.spec.ts b/test/e2e/tests/metrics/nft-detection-metrics.spec.ts index 99feaf36c28a..ebbfaaa9c901 100644 --- a/test/e2e/tests/metrics/nft-detection-metrics.spec.ts +++ b/test/e2e/tests/metrics/nft-detection-metrics.spec.ts @@ -3,7 +3,7 @@ import { Mockttp } from 'mockttp'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { completeCreateNewWalletOnboardingFlow } from '../../page-objects/flows/onboarding.flow'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; /** * Mocks the segment API multiple times for specific payloads that we expect to @@ -37,8 +37,9 @@ describe('Nft detection event', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .withPreferencesController({ useTokenDetection: true, @@ -51,7 +52,8 @@ describe('Nft detection event', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeCreateNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }); const events = await getEventPayloads(driver, mockedEndpoints); assert.equal(events.length, 1); diff --git a/test/e2e/tests/metrics/permissions-approved.spec.ts b/test/e2e/tests/metrics/permissions-approved.spec.ts index 0b4571acf29c..cfdee2dc5ac7 100644 --- a/test/e2e/tests/metrics/permissions-approved.spec.ts +++ b/test/e2e/tests/metrics/permissions-approved.spec.ts @@ -4,7 +4,7 @@ import { Suite } from 'mocha'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { MetaMetricsRequestedThrough } from '../../../../shared/constants/metametrics'; -import { DEFAULT_FIXTURE_ACCOUNT, MOCK_META_METRICS_ID } from '../../constants'; +import { DEFAULT_FIXTURE_ACCOUNT, MOCK_ANALYTICS_ID } from '../../constants'; import TestDapp from '../../page-objects/pages/test-dapp'; import { login } from '../../page-objects/flows/login.flow'; import { connectAccountToTestDapp } from '../../page-objects/flows/test-dapp.flow'; @@ -51,8 +51,9 @@ describe('Permissions Approved Event', function (this: Suite) { dappOptions: { numberOfTestDapps: 1 }, fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/segment-user-traits.spec.ts b/test/e2e/tests/metrics/segment-user-traits.spec.ts index 4c47c8cc9a09..5cd3515632b0 100644 --- a/test/e2e/tests/metrics/segment-user-traits.spec.ts +++ b/test/e2e/tests/metrics/segment-user-traits.spec.ts @@ -6,7 +6,7 @@ import { completeCreateNewWalletOnboardingFlow, createNewWalletOnboardingFlow, } from '../../page-objects/flows/onboarding.flow'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import HeaderNavbar from '../../page-objects/pages/header-navbar'; import SettingsPage from '../../page-objects/pages/settings/settings-page'; import PrivacySettings from '../../page-objects/pages/settings/privacy-settings'; @@ -78,7 +78,7 @@ describe('Segment User Traits', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -87,7 +87,8 @@ describe('Segment User Traits', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await createNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, dataCollectionForMarketing: true, }); await waitForExpectedTraits(driver, mockedEndpoints, { @@ -107,7 +108,7 @@ describe('Segment User Traits', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -116,7 +117,8 @@ describe('Segment User Traits', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await createNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, dataCollectionForMarketing: false, }); await waitForExpectedTraits(driver, mockedEndpoints, { @@ -136,7 +138,7 @@ describe('Segment User Traits', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -145,7 +147,8 @@ describe('Segment User Traits', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await createNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, dataCollectionForMarketing: false, }); const events = await getEventPayloads(driver, mockedEndpoints); @@ -159,7 +162,7 @@ describe('Segment User Traits', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -168,7 +171,8 @@ describe('Segment User Traits', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeCreateNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, }); const events = await getEventPayloads(driver, mockedEndpoints); assert.equal(events.length, 0); @@ -197,7 +201,7 @@ describe('Segment User Traits', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -206,7 +210,8 @@ describe('Segment User Traits', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeCreateNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, }); const events = await getEventPayloads(driver, mockedEndpoints); assert.equal(events.length, 0); diff --git a/test/e2e/tests/metrics/sessions.spec.ts b/test/e2e/tests/metrics/sessions.spec.ts index d5b48d944b23..b6c406302b0d 100644 --- a/test/e2e/tests/metrics/sessions.spec.ts +++ b/test/e2e/tests/metrics/sessions.spec.ts @@ -28,7 +28,8 @@ describe('Sessions', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -49,7 +50,8 @@ describe('Sessions', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/signature-approved.spec.ts b/test/e2e/tests/metrics/signature-approved.spec.ts index abf57846f906..3bd116421dde 100644 --- a/test/e2e/tests/metrics/signature-approved.spec.ts +++ b/test/e2e/tests/metrics/signature-approved.spec.ts @@ -4,7 +4,7 @@ import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { DEFAULT_FIXTURE_ACCOUNT, - MOCK_META_METRICS_ID, + MOCK_ANALYTICS_ID, WINDOW_TITLES, } from '../../constants'; import { MetaMetricsRequestedThrough } from '../../../../shared/constants/metametrics'; @@ -97,8 +97,9 @@ describe('Signature Approved Event', function () { fixtures: new FixtureBuilderV2() .withPermissionControllerConnectedToTestDapp() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -156,8 +157,9 @@ describe('Signature Approved Event', function () { fixtures: new FixtureBuilderV2() .withPermissionControllerConnectedToTestDapp() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -209,8 +211,9 @@ describe('Signature Approved Event', function () { fixtures: new FixtureBuilderV2() .withPermissionControllerConnectedToTestDapp() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -262,8 +265,9 @@ describe('Signature Approved Event', function () { fixtures: new FixtureBuilderV2() .withPermissionControllerConnectedToTestDapp() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index af54564b1cf1..39d38eef9cbb 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -241,7 +241,6 @@ "marketingCampaignCookieId": null, "metaMetricsDataDeletionId": null, "metaMetricsDataDeletionTimestamp": 0, - "metaMetricsId": "string", "metamaskNotificationsList": "object", "metamaskNotificationsReadList": "object", "methodData": "object", @@ -273,7 +272,6 @@ "orderedTransactionHistory": "object", "outdatedBrowserWarningLastShown": "object", "overrideContentSecurityPolicyHeader": true, - "participateInMetaMetrics": "boolean", "passkeyAutoUnlockSuppressed": "boolean", "passkeyRecord": null, "pendingApprovalCount": "number", diff --git a/test/e2e/tests/metrics/swaps.spec.js b/test/e2e/tests/metrics/swaps.spec.js index ac5997d6165c..6ce97ee89af1 100644 --- a/test/e2e/tests/metrics/swaps.spec.js +++ b/test/e2e/tests/metrics/swaps.spec.js @@ -29,7 +29,7 @@ const { TRADES_API_MOCK_RESULT, NETWORKS_2_API_MOCK_RESULT, } = require('../../../data/mock-data'); -const { MOCK_META_METRICS_ID } = require('../../constants'); +const { MOCK_ANALYTICS_ID } = require('../../constants'); const numberOfSegmentRequests = 19; @@ -98,8 +98,9 @@ describe.skip('Swap Eth for another Token', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), localNodeOptions: { diff --git a/test/e2e/tests/metrics/token-detection-metrics.spec.ts b/test/e2e/tests/metrics/token-detection-metrics.spec.ts index 6b30a0f6d5d3..bf73b1cd36ca 100644 --- a/test/e2e/tests/metrics/token-detection-metrics.spec.ts +++ b/test/e2e/tests/metrics/token-detection-metrics.spec.ts @@ -3,7 +3,7 @@ import { Mockttp } from 'mockttp'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; import { completeCreateNewWalletOnboardingFlow } from '../../page-objects/flows/onboarding.flow'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; /** * Mocks the segment API multiple times for specific payloads that we expect to @@ -47,8 +47,9 @@ describe('Token detection event', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -57,7 +58,8 @@ describe('Token detection event', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeCreateNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }); const events = await getEventPayloads(driver, mockedEndpoints); diff --git a/test/e2e/tests/metrics/traces.spec.ts b/test/e2e/tests/metrics/traces.spec.ts index 7322b55c4539..ac243a1a0be1 100644 --- a/test/e2e/tests/metrics/traces.spec.ts +++ b/test/e2e/tests/metrics/traces.spec.ts @@ -41,7 +41,8 @@ describe('Traces', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -62,7 +63,8 @@ describe('Traces', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), @@ -83,7 +85,8 @@ describe('Traces', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), @@ -104,7 +107,8 @@ describe('Traces', function () { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - participateInMetaMetrics: false, + completedMetaMetricsOnboarding: true, + optedIn: false, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/transaction-finalized.spec.ts b/test/e2e/tests/metrics/transaction-finalized.spec.ts index 8334d88cde00..3f9e6cd64910 100644 --- a/test/e2e/tests/metrics/transaction-finalized.spec.ts +++ b/test/e2e/tests/metrics/transaction-finalized.spec.ts @@ -7,7 +7,7 @@ import { withFixtures, } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import { login } from '../../page-objects/flows/login.flow'; import { sendRedesignedTransactionToAddress } from '../../page-objects/flows/send-transaction.flow'; import ActivityListPage from '../../page-objects/pages/home/activity-list'; @@ -155,8 +155,9 @@ describe('Transaction Finalized Event', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .withAppStateController({ pna25Acknowledged: true, diff --git a/test/e2e/tests/metrics/unlock-wallet.spec.ts b/test/e2e/tests/metrics/unlock-wallet.spec.ts index 4b312fb371ae..915268e0b543 100644 --- a/test/e2e/tests/metrics/unlock-wallet.spec.ts +++ b/test/e2e/tests/metrics/unlock-wallet.spec.ts @@ -3,7 +3,7 @@ import { Mockttp } from 'mockttp'; import { Suite } from 'mocha'; import { getEventPayloads, withFixtures } from '../../helpers'; import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import { login } from '../../page-objects/flows/login.flow'; type PageEvent = { @@ -36,8 +36,9 @@ describe('Unlock wallet', function (this: Suite) { { fixtures: new FixtureBuilderV2() .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, - participateInMetaMetrics: true, + analyticsId: MOCK_ANALYTICS_ID, + completedMetaMetricsOnboarding: true, + optedIn: true, }) .build(), title: this.test?.fullTitle(), diff --git a/test/e2e/tests/metrics/wallet-created.spec.ts b/test/e2e/tests/metrics/wallet-created.spec.ts index 65224234aefc..08dd5440f0a9 100644 --- a/test/e2e/tests/metrics/wallet-created.spec.ts +++ b/test/e2e/tests/metrics/wallet-created.spec.ts @@ -8,7 +8,7 @@ import { createNewWalletWithSocialLoginOnboardingFlow, handleSidepanelPostOnboarding, } from '../../page-objects/flows/onboarding.flow'; -import { MOCK_META_METRICS_ID } from '../../constants'; +import { MOCK_ANALYTICS_ID } from '../../constants'; import { OAuthMockttpService } from '../../helpers/seedless-onboarding/mocks'; import OnboardingCompletePage from '../../page-objects/pages/onboarding/onboarding-complete-page'; import { Driver } from '../../webdriver/driver'; @@ -106,7 +106,7 @@ describe('Wallet Created Events', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -115,7 +115,8 @@ describe('Wallet Created Events', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeCreateNewWalletOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }); const events = await getEventPayloads(driver, mockedEndpoints); assert.equal(events.length, 6); @@ -205,7 +206,7 @@ describe('Wallet Created Events', function () { { fixtures: new FixtureBuilderV2({ onboarding: true }) .withMetaMetricsController({ - metaMetricsId: MOCK_META_METRICS_ID, + analyticsId: MOCK_ANALYTICS_ID, }) .build(), title: this.test?.fullTitle(), @@ -241,15 +242,15 @@ describe('Wallet Created Events', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { const onboardingOptions: { driver: Driver; - participateInMetaMetrics?: boolean; + optedIn?: boolean; dataCollectionForMarketing?: boolean; } = { driver, }; // If running in Firefox, set the onboarding options to true - // Otherwise, `participateInMetaMetrics` is automatically set to true for social login users + // Otherwise, `optedIn` is automatically set to true for social login users if (process.env.SELENIUM_BROWSER === Browser.FIREFOX) { - onboardingOptions.participateInMetaMetrics = true; + onboardingOptions.optedIn = true; onboardingOptions.dataCollectionForMarketing = true; } diff --git a/test/e2e/tests/metrics/wallet-imported.spec.ts b/test/e2e/tests/metrics/wallet-imported.spec.ts index 1777d34b6249..97828e5b04c3 100644 --- a/test/e2e/tests/metrics/wallet-imported.spec.ts +++ b/test/e2e/tests/metrics/wallet-imported.spec.ts @@ -38,7 +38,8 @@ describe('Wallet Created Events - Imported Account', function () { async ({ driver, mockedEndpoint: mockedEndpoints }) => { await completeImportSRPOnboardingFlow({ driver, - participateInMetaMetrics: true, + completedMetaMetricsOnboarding: true, + optedIn: true, }); const events = await getEventPayloads(driver, mockedEndpoints);