feat: cp-13.12.0 only use build feature flag for sidepanel

app/manifest/v3/_base.json

@@ -88,8 +88,7 @@
     "webRequest",
     "offscreen",
     "identity",
-    "sidePanel",
-    "contextMenus"
+    "sidePanel"
   ],
   "sandbox": {
     "pages": ["snaps/index.html"]

app/scripts/background.js

@@ -55,7 +55,6 @@ import {
   CorruptionHandler,
   hasVault,
 } from './lib/state-corruption/state-corruption-recovery';
-import { initSidePanelContextMenu } from './lib/sidepanel-context-menu';
 import {
   backedUpStateKeys,
   PersistenceManager,
@@ -183,7 +182,6 @@ const PHISHING_WARNING_PAGE_TIMEOUT = ONE_SECOND_IN_MILLISECONDS;
 
 lazyListener.once('runtime', 'onInstalled').then((details) => {
   handleOnInstalled(details);
-  handleSidePanelContextMenu();
 });
 
 /**
@@ -1663,15 +1661,6 @@ function onInstall() {
   }
 }
 
-/**
- * Handles the onInstalled event for sidepanel context menu creation.
- * This is registered via lazyListener to catch the event at module load time.
- */
-async function handleSidePanelContextMenu() {
-  await isInitialized;
-  await initSidePanelContextMenu(controller);
-}
-
 /**
  * Trigger actions that should happen only when an update is available
  */
@@ -1749,18 +1738,6 @@ const initSidePanelBehavior = async () => {
         openPanelOnActionClick: useSidePanelAsDefault,
       });
     }
-
-    // Setup remote feature flag listener to update sidepanel preferences
-    controller?.controllerMessenger?.subscribe(
-      'RemoteFeatureFlagController:stateChange',
-      (state) => {
-        const extensionUxSidepanel =
-          state?.remoteFeatureFlags?.extensionUxSidepanel;
-        if (extensionUxSidepanel === false) {
-          controller?.preferencesController?.setUseSidePanelAsDefault(false);
-        }
-      },
-    );
   } catch (error) {
     console.error('Error setting side panel behavior:', error);
   }

builds.yml

@@ -69,7 +69,7 @@ buildTypes:
       - REJECT_INVALID_SNAPS_PLATFORM_VERSION: true
       - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/10.2.3/index.html
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
-      - IS_SIDEPANEL: false
+      - IS_SIDEPANEL: true
       - EXTENSION_UX_PNA25: true
       # for seedless onboarding (social login)
       - GOOGLE_BETA_CLIENT_ID
@@ -140,7 +140,7 @@ buildTypes:
       - SEGMENT_WRITE_KEY_REF: SEGMENT_FLASK_WRITE_KEY
       - ACCOUNT_SNAPS_DIRECTORY_URL: https://metamask.github.io/snaps-directory-staging/main/account-management
       - EIP_4337_ENTRYPOINT: '0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789'
-      - IS_SIDEPANEL: false
+      - IS_SIDEPANEL: true
       - EXTENSION_UX_PNA25: true
       # for seedless onboarding (social login)
       - GOOGLE_FLASK_CLIENT_ID
@@ -467,3 +467,4 @@ env:
 
   # PNA25 (Privacy Notice)
   - EXTENSION_UX_PNA25: true
+  - IS_SIDEPANEL: true

test/e2e/dist/vault-decryption-chrome.spec.ts

@@ -172,6 +172,7 @@ describe('Vault Decryptor Page', function () {
     await withFixtures(
       {
         disableServerMochaToBackground: true,
+        ignoredConsoleErrors: ['GL Context was lost'],
         title: this.test?.fullTitle(),
       },
       async ({ driver }) => {
@@ -190,6 +191,11 @@ describe('Vault Decryptor Page', function () {
         // close popover if any (Announcements etc..)
         await closePopoverIfPresent(driver);
 
+        // Ensure we're on the main extension window after onboarding
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
         // go to privacy settings page
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();
@@ -234,6 +240,7 @@ describe('Vault Decryptor Page', function () {
     await withFixtures(
       {
         disableServerMochaToBackground: true,
+        ignoredConsoleErrors: ['GL Context was lost'],
         title: this.test?.fullTitle(),
       },
       async ({ driver }) => {
@@ -253,6 +260,11 @@ describe('Vault Decryptor Page', function () {
         // close popover if any (Announcements etc..)
         await closePopoverIfPresent(driver);
 
+        // Ensure we're on the main extension window after onboarding
+        await driver.switchToWindowWithTitle(
+          WINDOW_TITLES.ExtensionInFullScreenView,
+        );
+
         // go to privacy settings page
         const homePage = new HomePage(driver);
         await homePage.checkPageIsLoaded();

test/e2e/helpers.js

@@ -801,6 +801,39 @@ async function initBundler(
 
 const sentryRegEx = /^https:\/\/sentry\.io\/api\/\d+\/envelope/gu;
 
+/**
+ * Check if sidepanel is enabled by examining the manifest at runtime.
+ * Only works on Chrome-based browsers (Firefox doesn't support sidepanel).
+ *
+ * @param {Driver} driver - The WebDriver instance
+ * @returns {Promise<boolean>} True if sidepanel permission is present in manifest
+ */
+async function isSidePanelEnabled(driver) {
+  try {
+    const manifest = await driver.executeScript(`
+      try {
+        if (typeof chrome !== 'undefined' && chrome.runtime && chrome.runtime.getManifest) {
+          return chrome.runtime.getManifest();
+        }
+        return null;
+      } catch (e) {
+        return null;
+      }
+    `);
+
+    const hasSidepanel = Boolean(manifest?.permissions?.includes('sidePanel'));
+
+    // Log for debugging
+    console.log(`Sidepanel check: ${hasSidepanel ? 'enabled' : 'disabled'}`);
+
+    return hasSidepanel;
+  } catch (error) {
+    // Chrome API not accessible (e.g., LavaMoat scuttling mode, Firefox)
+    console.log('Sidepanel check failed:', error.message);
+    return false;
+  }
+}
+
 module.exports = {
   DAPP_HOST_ADDRESS,
   DAPP_URL,
@@ -833,4 +866,5 @@ module.exports = {
   clickNestedButton,
   sentryRegEx,
   createWebSocketConnection,
+  isSidePanelEnabled,
 };

test/e2e/page-objects/flows/onboarding.flow.ts

@@ -8,39 +8,63 @@ import StartOnboardingPage from '../pages/onboarding/start-onboarding-page';
 import SecureWalletPage from '../pages/onboarding/secure-wallet-page';
 import OnboardingCompletePage from '../pages/onboarding/onboarding-complete-page';
 import OnboardingPrivacySettingsPage from '../pages/onboarding/onboarding-privacy-settings-page';
-import { WALLET_PASSWORD } from '../../helpers';
+import { WALLET_PASSWORD, isSidePanelEnabled } from '../../helpers';
 import { E2E_SRP } from '../../fixtures/default-fixture';
 import HomePage from '../pages/home/homepage';
 import LoginPage from '../pages/login-page';
 import TermsOfUseUpdateModal from '../pages/dialog/terms-of-use-update-modal';
 
 /**
  * Helper function to handle post-onboarding navigation for sidepanel builds.
- * When sidepanel is enabled, clicking "Done" doesn't navigate the current window,
- * so we need to manually navigate to home.html.
+ * When sidepanel is enabled, clicking "Done" opens the home page in the sidepanel,
+ * but the main window remains on the onboarding completion page.
+ * This function navigates the current window to the actual home page.
  * Note: Sidepanel is only supported on Chrome-based browsers, not Firefox.
  *
  * @param driver - The WebDriver instance
  */
 export const handleSidepanelPostOnboarding = async (
   driver: Driver,
 ): Promise<void> => {
-  // Check if sidepanel is enabled via build configuration
-  // AND we're not running on Firefox (which doesn't support sidepanel)
-  const isSidepanelEnabled =
-    process.env.IS_SIDEPANEL === 'true' &&
-    process.env.SELENIUM_BROWSER !== Browser.FIREFOX;
-
-  if (isSidepanelEnabled) {
-    // Give the onboarding completion time to process (needed for sidepanel)
-    await driver.delay(2000);
-
-    // Navigate directly to home page in current window
-    // With sidepanel enabled, this ensures we load home page in the test window
-    await driver.driver.get(`${driver.extensionUrl}/home.html`);
-
-    // Wait for the home page to fully load
-    await driver.waitForSelector('[data-testid="account-menu-icon"]');
+  // Only run on Chrome-based browsers (Firefox doesn't support sidepanel)
+  if (process.env.SELENIUM_BROWSER === Browser.FIREFOX) {
+    return;
+  }
+
+  try {
+    const hasSidepanel = await isSidePanelEnabled(driver);
+
+    // Skip if sidepanel is not enabled
+    if (!hasSidepanel) {
+      return;
+    }
+
+    const currentUrl = await driver.getCurrentUrl();
+
+    // Only navigate if still on the completion page
+    // Avoid duplicate navigation if already on home page
+    if (currentUrl.includes('#onboarding/completion')) {
+      await driver.driver.get(`${driver.extensionUrl}/home.html`);
+    } else if (currentUrl.includes('/home.html')) {
+      // Already on home page, skip navigation
+      return;
+    } else {
+      await driver.driver.get(`${driver.extensionUrl}/home.html`);
+    }
+
+    // Wait for home page to be ready
+    await driver.waitForMultipleSelectors([
+      '[data-testid="eth-overview-send"]', // send button
+      '[data-testid="account-overview__activity-tab"]', // activity tab
+      '[data-testid="account-overview__asset-tab"]', // tokens tab
+    ]);
+  } catch (error) {
+    // If sidepanel handling fails, continue without it
+    // The test may still work if the main window navigated correctly
+    console.log(
+      'Sidepanel handling skipped or failed:',
+      error instanceof Error ? error.message : String(error),
+    );
   }
 };