Merge branch 'main' into fix/evaluateCohortEligibility

Author: chaitanyapotti

app/scripts/background.js

@@ -23,9 +23,7 @@ import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_NOTIFICATION,
   ENVIRONMENT_TYPE_FULLSCREEN,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   ENVIRONMENT_TYPE_SIDEPANEL,
-  ///: END:ONLY_INCLUDE_IF
   PLATFORM_FIREFOX,
   MESSAGE_TYPE,
 } from '../../shared/constants/app';
@@ -153,9 +151,7 @@ const isFirefox = getPlatform() === PLATFORM_FIREFOX;
 let openPopupCount = 0;
 let notificationIsOpen = false;
 let uiIsTriggering = false;
-///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
 let sidePanelIsOpen = false;
-///: END:ONLY_INCLUDE_IF
 const openMetamaskTabsIDs = {};
 const requestAccountTabIds = {};
 let controller;
@@ -1169,9 +1165,7 @@ export function setupController(
       openPopupCount > 0 ||
       Boolean(Object.keys(openMetamaskTabsIDs).length) ||
       notificationIsOpen ||
-      ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
       sidePanelIsOpen ||
-      ///: END:ONLY_INCLUDE_IF
       false
     );
   };
@@ -1259,7 +1253,6 @@ export function setupController(
         });
       }
 
-      ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
       if (processName === ENVIRONMENT_TYPE_SIDEPANEL) {
         sidePanelIsOpen = true;
         finished(portStream, () => {
@@ -1269,7 +1262,6 @@ export function setupController(
           onCloseEnvironmentInstances(isClientOpen, ENVIRONMENT_TYPE_SIDEPANEL);
         });
       }
-      ///: END:ONLY_INCLUDE_IF
 
       if (processName === ENVIRONMENT_TYPE_NOTIFICATION) {
         notificationIsOpen = true;
@@ -1615,9 +1607,7 @@ async function triggerUi() {
     !uiIsTriggering &&
     (isVivaldi || openPopupCount === 0) &&
     !currentlyActiveMetamaskTab &&
-    ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
     !sidePanelIsOpen &&
-    ///: END:ONLY_INCLUDE_IF
     true
   ) {
     uiIsTriggering = true;
@@ -1682,7 +1672,6 @@ function onInstall() {
     platform.openExtensionInBrowser();
   }
 }
-///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
 // Only register sidepanel context menu for browsers that support it (Chrome/Edge/Brave)
 // and when the feature flag is enabled
 if (
@@ -1704,7 +1693,6 @@ if (
     }
   });
 }
-///: END:ONLY_INCLUDE_IF
 
 // // On first install, open a new tab with MetaMask
 // async function onInstall() {
@@ -1786,7 +1774,6 @@ function onNavigateToTab() {
   });
 }
 
-///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
 // Sidepanel-specific functionality
 // Set initial side panel behavior based on user preference
 const initSidePanelBehavior = async () => {
@@ -1974,7 +1961,6 @@ browser.tabs.onUpdated.addListener(async (tabId) => {
 
   return {};
 });
-///: END:ONLY_INCLUDE_IF
 
 function setupSentryGetStateGlobal(store) {
   global.stateHooks.getSentryAppState = function () {

app/scripts/controllers/preferences-controller.ts

@@ -114,7 +114,7 @@ export type Preferences = {
     sortCallback: string;
   };
   useNativeCurrencyAsPrimaryCurrency: boolean;
-  useSidePanelAsDefault?: boolean; // Only available in build-experimental
+  useSidePanelAsDefault?: boolean;
 };
 
 // Omitting properties that already exist in the PreferencesState, as part of the preferences property.
@@ -222,9 +222,7 @@ export const getDefaultPreferencesControllerState =
         sortCallback: 'stringNumeric',
       },
       useNativeCurrencyAsPrimaryCurrency: true,
-      ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
       useSidePanelAsDefault: false,
-      ///: END:ONLY_INCLUDE_IF
     },
     securityAlertsEnabled: true,
     selectedAddress: '',

app/scripts/lib/util.ts

@@ -14,9 +14,7 @@ import {
   ENVIRONMENT_TYPE_BACKGROUND,
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_NOTIFICATION,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   ENVIRONMENT_TYPE_SIDEPANEL,
-  ///: END:ONLY_INCLUDE_IF
   ENVIRONMENT_TYPE_POPUP,
   PLATFORM_BRAVE,
   PLATFORM_CHROME,
@@ -40,12 +38,9 @@ const getEnvironmentTypeMemo = memoize((url) => {
     return ENVIRONMENT_TYPE_FULLSCREEN;
   } else if (parsedUrl.pathname === '/notification.html') {
     return ENVIRONMENT_TYPE_NOTIFICATION;
-  }
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
-  else if (parsedUrl.pathname === '/sidepanel.html') {
+  } else if (parsedUrl.pathname === '/sidepanel.html') {
     return ENVIRONMENT_TYPE_SIDEPANEL;
   }
-  ///: END:ONLY_INCLUDE_IF
   return ENVIRONMENT_TYPE_BACKGROUND;
 });
 

app/scripts/ui.js

@@ -40,9 +40,7 @@ import launchMetaMaskUi, {
 import {
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_POPUP,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   ENVIRONMENT_TYPE_SIDEPANEL,
-  ///: END:ONLY_INCLUDE_IF
   PLATFORM_FIREFOX,
 } from '../../shared/constants/app';
 import { isManifestV3 } from '../../shared/modules/mv3.utils';
@@ -284,22 +282,13 @@ async function queryCurrentActiveTab(windowType) {
   }
 
   // Only popup queries the active tab
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   // Sidepanel uses appActiveTab from tab listeners instead
   if (
     windowType !== ENVIRONMENT_TYPE_POPUP &&
     windowType !== ENVIRONMENT_TYPE_SIDEPANEL
   ) {
     return {};
   }
-  ///: END:ONLY_INCLUDE_IF
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  // Only popup queries the active tab
-  // Dialog/notification windows get their origin from approval metadata
-  if (windowType !== ENVIRONMENT_TYPE_POPUP) {
-    return {};
-  }
-  ///: END:ONLY_INCLUDE_IF
 
   const tabs = await browser.tabs
     .query({ active: true, currentWindow: true })

builds.yml

@@ -17,7 +17,6 @@ buildTypes:
     id: 10
     features:
       - build-main
-      - build-experimental
       - keyring-snaps
       - multi-srp
       - multichain
@@ -51,7 +50,6 @@ buildTypes:
     id: 11
     features:
       - build-beta
-      - build-experimental
       - keyring-snaps
       - multichain
       - bitcoin
@@ -121,7 +119,6 @@ buildTypes:
     # will not be removed
     features:
       - build-flask
-      - build-experimental
       - keyring-snaps
       - bitcoin
       - tron

development/build/scripts.js

@@ -758,15 +758,13 @@ function createFactoredBuild({
               applyLavaMoat,
               scripts,
             });
-            ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
             renderHtmlFile({
               htmlName: 'sidepanel',
               browserPlatforms,
               applyLavaMoat,
               shouldIncludeSnow,
               scripts,
             });
-            ///: END:ONLY_INCLUDE_IF
             renderHtmlFile({
               htmlName: 'notification',
               browserPlatforms,

shared/constants/metametrics.ts

@@ -941,9 +941,7 @@ export enum MetaMetricsEventName {
   ExtensionPinned = 'Extension Pinned',
   // Extension Port Stream
   PortStreamChunked = 'Port Stream Chunked',
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   ViewportSwitched = 'Viewport Switched',
-  ///: END:ONLY_INCLUDE_IF
   // Shield
   ShieldEntryModal = 'Shield Entry Modal',
   ShieldSubscriptionRequest = 'Shield Subscription Request',

test/e2e/tests/settings/terms-of-use.spec.ts

@@ -18,6 +18,10 @@ describe('Terms of use', function (this: Suite) {
       },
       async ({ driver }) => {
         await loginWithoutBalanceValidation(driver);
+
+        // Delay click to mitigate flakiness
+        await driver.delay(1_000);
+
         // accept updated terms of use
         const updateTermsOfUseModal = new TermsOfUseUpdateModal(driver);
         await updateTermsOfUseModal.checkPageIsLoaded();

ui/components/multichain/app-header/app-header.js

@@ -29,9 +29,7 @@ import { toggleNetworkMenu } from '../../../store/actions';
 import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import {
   ENVIRONMENT_TYPE_POPUP,
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   ENVIRONMENT_TYPE_SIDEPANEL,
-  ///: END:ONLY_INCLUDE_IF
 } from '../../../../shared/constants/app';
 import { getIsUnlocked } from '../../../ducks/metamask/metamask';
 import { SEND_STAGES, getSendStage } from '../../../ducks/send';
@@ -58,9 +56,7 @@ export const AppHeader = ({ location }) => {
 
   const environmentType = getEnvironmentType();
   const popupStatus = environmentType === ENVIRONMENT_TYPE_POPUP;
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   const isSidepanel = environmentType === ENVIRONMENT_TYPE_SIDEPANEL;
-  ///: END:ONLY_INCLUDE_IF
 
   // Disable the network and account pickers if the user is in
   // a critical flow
@@ -128,12 +124,7 @@ export const AppHeader = ({ location }) => {
 
   return (
     <>
-      {isUnlocked &&
-      !popupStatus &&
-      ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
-      !isSidepanel &&
-      ///: END:ONLY_INCLUDE_IF
-      true ? (
+      {isUnlocked && !popupStatus && !isSidepanel && true ? (
         <MultichainMetaFoxLogo />
       ) : null}
       <AppHeaderContainer isUnlocked={isUnlocked} popupStatus={popupStatus}>

ui/index.js

@@ -19,9 +19,7 @@ import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_SIDEPANEL,
 } from '../shared/constants/app';
-///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
 import { getBrowserName } from '../shared/modules/browser-runtime.utils';
-///: END:ONLY_INCLUDE_IF
 import { COPY_OPTIONS } from '../shared/constants/copy';
 import { switchDirection } from '../shared/lib/switch-direction';
 import { setupLocale } from '../shared/lib/error-utils';
@@ -247,7 +245,6 @@ async function startApp(metamaskState, opts) {
 async function runInitialActions(store) {
   const initialState = store.getState();
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-experimental)
   // Update browser environment with accurate browser detection from UI
   // This corrects the initial detection from background which can't detect Brave
   try {
@@ -263,7 +260,6 @@ async function runInitialActions(store) {
   } catch (error) {
     log.error('Failed to get browser name:', error);
   }
-  ///: END:ONLY_INCLUDE_IF
 
   // This block autoswitches chains based on the last chain used
   // for a given dapp, when there are no pending confimrations