Merge branch 'main' into feat/dynamic-parameters

Author: itsyoboieltr

shared/constants/app-state.ts

@@ -13,7 +13,6 @@ export enum AccountOverviewTabKey {
 export const ACCOUNT_OVERVIEW_TAB_KEY_TO_METAMETRICS_EVENT_NAME_MAP = {
   [AccountOverviewTabKey.Tokens]: MetaMetricsEventName.TokenScreenOpened,
   [AccountOverviewTabKey.DeFi]: MetaMetricsEventName.DeFiScreenOpened,
-  [AccountOverviewTabKey.Nfts]: MetaMetricsEventName.NftScreenOpened,
   [AccountOverviewTabKey.Activity]: MetaMetricsEventName.ActivityScreenOpened,
 } as const;
 

shared/constants/metametrics.ts

@@ -699,10 +699,9 @@ export enum MetaMetricsEventName {
   BannerDisplay = 'Banner Display',
   BannerCloseAll = 'Banner Close All',
   BannerSelect = 'Banner Select',
-  BannerNavigated = 'Banner Navigated',
   BridgeLinkClicked = 'Bridge Link Clicked',
   SwapLinkClicked = 'Swap Link Clicked',
-  CurrentCurrency = 'Current Currency',
+  CurrentCurrency = 'Selected Currency Changed',
   DappViewed = 'Dapp Viewed',
   DecryptionApproved = 'Decryption Approved',
   DecryptionRejected = 'Decryption Rejected',
@@ -714,9 +713,7 @@ export enum MetaMetricsEventName {
   EmptyBuyBannerClicked = 'Empty Buy Banner Clicked',
   EmptyReceiveBannerDisplayed = 'Empty Receive Banner Displayed',
   EmptyReceiveBannerClicked = 'Empty Receive Banner Clicked',
-  EmptyNftsBannerDisplayed = 'Empty NFTs Banner Displayed',
   EmptyNftsBannerClicked = 'Empty NFTs Banner Clicked',
-  EnablingNotifications = 'Notifications Enabled',
   EncryptionPublicKeyApproved = 'Encryption Approved',
   EncryptionPublicKeyRejected = 'Encryption Rejected',
   EncryptionPublicKeyRequested = 'Encryption Requested',
@@ -734,8 +731,6 @@ export enum MetaMetricsEventName {
   KeyGlobalSecurityToggleSelected = 'Key Global Security/Privacy Settings',
   KeyBalanceTokenPriceChecker = 'Key Show Balance and Token Price Checker Settings',
   KeyGasFeeEstimationBuySwapTokens = 'Key Show Gas Fee Estimation, Buy Crypto and Swap Tokens',
-  KeyAutoDetectTokens = 'Key Autodetect tokens',
-  KeyBatchAccountBalanceRequests = 'Key Batch account balance requests',
   MarkAllNotificationsRead = 'Notifications Marked All as Read',
   MetricsOptIn = 'Metrics Opt In',
   MetricsOptOut = 'Metrics Opt Out',
@@ -826,16 +821,12 @@ export enum MetaMetricsEventName {
   TokenImportButtonClicked = 'Import Token Button Clicked',
   TokenScreenOpened = 'Token Screen Opened',
   TokenAdded = 'Token Added',
-  TokenRemoved = 'Token Removed',
-  TokenSortPreference = 'Token Sort Preference',
-  TokenListRefreshed = 'Token List Refreshed',
-  NFTRemoved = 'NFT Removed',
+  TokenSortPreference = 'Token Sort Preference Updated',
   EmptyNFTTabButtonClicked = 'Empty NFT Tab Button Clicked',
   TokenDetected = 'Token Detected',
   TokenHidden = 'Token Hidden',
   TokenImportCanceled = 'Token Import Canceled',
   TokenImportClicked = 'Token Import Clicked',
-  ShowNativeTokenAsMainBalance = 'Show native token as main balance',
   WalletSetupStarted = 'Wallet Setup Started',
   WalletFundsObtained = 'Wallet Funds Obtained',
   WalletImportStarted = 'Wallet Import Started',
@@ -862,7 +853,6 @@ export enum MetaMetricsEventName {
   AddNetworkButtonClick = 'Add Network Button Clicked',
   CustomNetworkAdded = 'Custom Network Added',
   TokenDetailsOpened = 'Token Details Opened',
-  NftScreenOpened = 'NFT Screen Opened',
   NftDetailsOpened = 'NFT Details Opened',
   DeFiScreenOpened = 'DeFi Screen Opened',
   DeFiDetailsOpened = 'DeFi Details Opened',

test/e2e/tests/metrics/nft-detection-metrics.spec.ts

@@ -28,16 +28,6 @@ async function mockSegment(mockServer: Mockttp) {
           statusCode: 200,
         };
       }),
-    await mockServer
-      .forPost('https://api.segment.io/v1/batch')
-      .withJsonBodyIncluding({
-        batch: [{ type: 'track', event: 'nft_autodetection_enabled' }],
-      })
-      .thenCallback(() => {
-        return {
-          statusCode: 200,
-        };
-      }),
   ];
 }
 

test/e2e/tests/settings/show-native-as-main-balance.spec.ts

@@ -1,33 +1,15 @@
-import { expect } from '@playwright/test';
-import { getEventPayloads, withFixtures } from '../../helpers';
-import { MockedEndpoint, Mockttp } from '../../mock-e2e';
+import { withFixtures } from '../../helpers';
 import { Driver } from '../../webdriver/driver';
 import FixtureBuilder from '../../fixture-builder';
 import AdvancedSettings from '../../page-objects/pages/settings/advanced-settings';
 import AssetListPage from '../../page-objects/pages/home/asset-list';
-import HeaderNavbar from '../../page-objects/pages/header-navbar';
 import HomePage from '../../page-objects/pages/home/homepage';
 import SettingsPage from '../../page-objects/pages/settings/settings-page';
 import {
   loginWithBalanceValidation,
   loginWithoutBalanceValidation,
 } from '../../page-objects/flows/login.flow';
 
-async function mockSegment(mockServer: Mockttp) {
-  return [
-    await mockServer
-      .forPost('https://api.segment.io/v1/batch')
-      .withJsonBodyIncluding({
-        batch: [{ type: 'track', event: 'Show native token as main balance' }],
-      })
-      .thenCallback(() => {
-        return {
-          statusCode: 200,
-        };
-      }),
-  ];
-}
-
 describe('Settings: Show native token as main balance', function () {
   it('Should show balance in crypto when toggle is off', async function () {
     await withFixtures(
@@ -106,95 +88,4 @@ describe('Settings: Show native token as main balance', function () {
       },
     );
   });
-
-  it('Should Successfully track the event when toggle is turned off', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-fd20',
-            participateInMetaMetrics: true,
-          })
-          .build(),
-        title: this.test?.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({
-        driver,
-        mockedEndpoint: mockedEndpoints,
-      }: {
-        driver: Driver;
-        mockedEndpoint: MockedEndpoint[];
-      }) => {
-        await loginWithBalanceValidation(driver);
-        await new HeaderNavbar(driver).openSettingsPage();
-        const settingsPage = new SettingsPage(driver);
-        await settingsPage.checkPageIsLoaded();
-        await settingsPage.toggleBalanceSetting();
-
-        const events = await getEventPayloads(driver, mockedEndpoints);
-        expect(events[0].properties).toMatchObject({
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          show_native_token_as_main_balance: false,
-          category: 'Settings',
-          locale: 'en',
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          chain_id: '0x539',
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          environment_type: 'fullscreen',
-        });
-      },
-    );
-  });
-
-  it('Should Successfully track the event when toggle is turned on', async function () {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder()
-          .withMetaMetricsController({
-            metaMetricsId: 'fake-metrics-fd20',
-            participateInMetaMetrics: true,
-          })
-          .withPreferencesControllerShowNativeTokenAsMainBalanceDisabled()
-          .build(),
-        title: this.test?.fullTitle(),
-        testSpecificMock: mockSegment,
-      },
-      async ({
-        driver,
-        mockedEndpoint: mockedEndpoints,
-      }: {
-        driver: Driver;
-        mockedEndpoint: MockedEndpoint[];
-      }) => {
-        await loginWithoutBalanceValidation(driver);
-        const homePage = new HomePage(driver);
-        await homePage.checkPageIsLoaded();
-        await homePage.checkExpectedBalanceIsDisplayed('$42,500.00', 'USD');
-
-        await homePage.headerNavbar.openSettingsPage();
-        const settingsPage = new SettingsPage(driver);
-        await settingsPage.checkPageIsLoaded();
-        await settingsPage.toggleBalanceSetting();
-
-        const events = await getEventPayloads(driver, mockedEndpoints);
-        expect(events[0].properties).toMatchObject({
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          show_native_token_as_main_balance: true,
-          category: 'Settings',
-          locale: 'en',
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          chain_id: '0x539',
-          // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          environment_type: 'fullscreen',
-        });
-      },
-    );
-  });
 });

test/e2e/tests/tokens/nft/remove-nft.spec.ts

@@ -1,36 +1,16 @@
-import { strict as assert } from 'assert';
-import { MockttpServer } from 'mockttp';
-import { withFixtures, getEventPayloads } from '../../../helpers';
+import { withFixtures } from '../../../helpers';
 import { SMART_CONTRACTS } from '../../../seeder/smart-contracts';
 import FixtureBuilder from '../../../fixture-builder';
-import { MetaMetricsEventName } from '../../../../../shared/constants/metametrics';
-import { CHAIN_IDS } from '../../../../../shared/constants/network';
 import { MOCK_META_METRICS_ID } from '../../../constants';
 import Homepage from '../../../page-objects/pages/home/homepage';
 import NFTDetailsPage from '../../../page-objects/pages/nft-details-page';
 import NftListPage from '../../../page-objects/pages/home/nft-list';
 import { loginWithBalanceValidation } from '../../../page-objects/flows/login.flow';
 
-async function mockedNftRemoved(mockServer: MockttpServer) {
-  return await mockServer
-    .forPost('https://api.segment.io/v1/batch')
-    .withJsonBodyIncluding({
-      batch: [{ type: 'track', event: MetaMetricsEventName.NFTRemoved }],
-    })
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-      };
-    });
-}
-
 describe('Remove NFT', function () {
   const smartContract = SMART_CONTRACTS.NFTS;
 
-  it('user should be able to remove ERC721 NFT on details page and removeNft event should be emitted', async function () {
-    async function mockSegment(mockServer: MockttpServer) {
-      return [await mockedNftRemoved(mockServer)];
-    }
+  it('user should be able to remove ERC721 NFT on details page', async function () {
     await withFixtures(
       {
         dappOptions: { numberOfTestDapps: 1 },
@@ -43,19 +23,10 @@ describe('Remove NFT', function () {
           .build(),
         smartContract,
         title: this.test?.fullTitle(),
-        testSpecificMock: mockSegment,
       },
-      async ({
-        driver,
-        localNodes,
-        mockedEndpoint: mockedEndpoints,
-        contractRegistry,
-      }) => {
+      async ({ driver, localNodes }) => {
         await loginWithBalanceValidation(driver, localNodes[0]);
 
-        const contractAddress =
-          await contractRegistry.getContractAddress(smartContract);
-
         // Open the NFT details page and click to remove NFT
         await new Homepage(driver).goToNftTab();
         const nftListPage = new NftListPage(driver);
@@ -68,20 +39,6 @@ describe('Remove NFT', function () {
         // Check the success remove NFT toaster is displayed and the NFT is removed from the NFT tab
         await nftListPage.checkSuccessRemoveNftMessageIsDisplayed();
         await nftListPage.checkNoNftInfoIsDisplayed();
-
-        // Check if event was emitted
-        const events = await getEventPayloads(driver, mockedEndpoints);
-        const nftRemovedProperties = events[0].properties;
-        assert.equal(
-          nftRemovedProperties.token_contract_address,
-          contractAddress,
-        );
-        assert.equal(nftRemovedProperties.tokenId, '1');
-        assert.equal(nftRemovedProperties.asset_type, 'NFT');
-        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
-        assert.equal(nftRemovedProperties.token_standard, 'ERC721');
-        assert.equal(nftRemovedProperties.isSuccessful, true);
-        assert.equal(nftRemovedProperties.chain_id, CHAIN_IDS.LOCALHOST);
       },
     );
   });

test/integration/nfts/nfts.test.tsx

@@ -1,9 +1,5 @@
 import { act, screen, waitFor } from '@testing-library/react';
 import nock from 'nock';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../shared/constants/metametrics';
 import * as backgroundConnection from '../../../ui/store/background-connection';
 import { integrationTestRender } from '../../lib/render-helpers';
 import mockMetaMaskState from '../data/integration-init-state.json';
@@ -97,28 +93,6 @@ describe('NFTs list', () => {
     await waitForElementByText('MUNK #1 Mainnet');
     await waitForElementByText('MUNK #1 Chain 137');
     await waitForElementByText('MUNK #1 Chain 5');
-
-    let nftScreenOpenedMetricsEvent;
-
-    await waitFor(() => {
-      nftScreenOpenedMetricsEvent =
-        mockedBackgroundConnection.submitRequestToBackground.mock.calls?.find(
-          (call) =>
-            call[0] === 'trackMetaMetricsEvent' &&
-            call[1]?.[0].category === MetaMetricsEventCategory.Home,
-        );
-
-      expect(nftScreenOpenedMetricsEvent?.[0]).toBe('trackMetaMetricsEvent');
-
-      expect(nftScreenOpenedMetricsEvent?.[1]).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            category: MetaMetricsEventCategory.Home,
-            event: MetaMetricsEventName.NftScreenOpened,
-          }),
-        ]),
-      );
-    });
   });
 
   it('filters the nfts list for the current network', async () => {

ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.test.tsx

@@ -5,11 +5,6 @@ import { AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS } from '@metamask/multichai
 import type { NetworkConfiguration } from '@metamask/network-controller';
 import { fireEvent } from '../../../../../../test/jest';
 import { renderWithProvider } from '../../../../../../test/lib/render-helpers-navigate';
-import { MetaMetricsContext } from '../../../../../contexts/metametrics';
-import {
-  MetaMetricsEventCategory,
-  MetaMetricsEventName,
-} from '../../../../../../shared/constants/metametrics';
 import mockState from '../../../../../../test/data/mock-state.json';
 import * as actions from '../../../../../store/actions';
 import { SECURITY_ROUTE } from '../../../../../helpers/constants/routes';
@@ -59,40 +54,6 @@ const createMockState = () => ({
   },
 });
 
-describe('AssetListControlBar', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should fire metrics event when refresh button is clicked', async () => {
-    const state = createMockState();
-    const store = configureMockStore([thunk])(state);
-
-    const mockTrackEvent = jest.fn();
-
-    const { findByTestId } = renderWithProvider(
-      <MetaMetricsContext.Provider value={mockTrackEvent}>
-        <AssetListControlBar showTokensLinks />
-      </MetaMetricsContext.Provider>,
-      store,
-    );
-
-    const importButton = await findByTestId(
-      'asset-list-control-bar-action-button',
-    );
-    importButton.click();
-
-    const refreshListItem = await findByTestId('refreshList__button');
-    refreshListItem.click();
-
-    expect(mockTrackEvent).toHaveBeenCalledTimes(1);
-    expect(mockTrackEvent).toHaveBeenCalledWith({
-      category: MetaMetricsEventCategory.Tokens,
-      event: MetaMetricsEventName.TokenListRefreshed,
-    });
-  });
-});
-
 describe('NFTs options', () => {
   afterEach(() => {
     jest.clearAllMocks();

ui/components/app/assets/asset-list/asset-list-control-bar/asset-list-control-bar.tsx

@@ -276,10 +276,6 @@ const AssetListControlBar = ({
   const handleRefresh = () => {
     dispatch(detectTokens(Object.keys(enabledNetworksByNamespace)));
     closePopover();
-    trackEvent({
-      category: MetaMetricsEventCategory.Tokens,
-      event: MetaMetricsEventName.TokenListRefreshed,
-    });
   };
 
   const onEnableAutoDetect = () => {