Bug 1590504 - About welcome modal variant with Start Here and Meet the rest of Firefox UI r=Mardak

Differential Revision: https://phabricator.services.mozilla.com/D50123

--HG--
extra : moz-landing-system : lando

browser/app/profile/firefox.js

@@ -1337,7 +1337,7 @@ pref("browser.newtabpage.activity-stream.discoverystream.spocs-endpoint", "");
   pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", false);
 #endif
 
-pref("trailhead.firstrun.branches", "join-supercharge");
+pref("trailhead.firstrun.branches", "");
 
 // The pref that controls if the What's New panel is enabled.
 pref("browser.messaging-system.whatsNewPanel.enabled", true);

browser/components/newtab/lib/ASRouter.jsm

@@ -67,6 +67,7 @@ const TRAILHEAD_CONFIG = {
       ["modal_variant_a"],
       ["modal_variant_b"],
       ["modal_variant_c"],
+      ["modal_variant_f"],
       ["full_page_d"],
       ["full_page_e"],
     ],

browser/components/newtab/lib/OnboardingMessageProvider.jsm

@@ -172,6 +172,16 @@ const ONBOARDING_MESSAGES = () => [
       title: { string_id: "onboarding-welcome-modal-privacy-body" },
     },
   },
+  {
+    id: "TRAILHEAD_9",
+    targeting: "trailheadInterrupt == 'modal_variant_f'",
+    utm_term: "trailhead-modal_variant_f",
+    ...TRAILHEAD_ONBOARDING_TEMPLATE,
+    content: {
+      ...JOIN_CONTENT,
+      form: TRAILHEAD_MODAL_VARIANT_CONTENT.form,
+    },
+  },
   {
     id: "FULL_PAGE_1",
     targeting: "trailheadInterrupt == 'full_page_d'",

browser/components/newtab/test/browser/browser_aboutwelcome.js

@@ -102,6 +102,18 @@ add_task(async function test_trailhead_branches() {
     ]
   );
 
+  await test_trailhead_branch(
+    "modal_variant_f-supercharge",
+    // Expected selectors:
+    [
+      ".trailhead.joinCohort",
+      "h3[data-l10n-id=onboarding-welcome-form-header]",
+      "p[data-l10n-id=onboarding-benefit-products-text]",
+      "p[data-l10n-id=onboarding-benefit-knowledge-text]",
+      "p[data-l10n-id=onboarding-benefit-privacy-text]",
+    ]
+  );
+
   await test_trailhead_branch(
     "full_page_d-supercharge",
     // Expected selectors: