Bug 1757830 - Land strings and assets for ECO Global Rollout H1 2022 r=pdahiya,flod

Convert 100% en-* rollout strings to fluent and expose for testing. Differential Revision: https://phabricator.services.mozilla.com/D140114
2022-03-03 18:20:58 +00:00 · 2022-03-03 18:20:58 +00:00 · 5b7d65b7d8
--- a/browser/components/newtab/data/content/assets/remote/mountain.svg
+++ b/browser/components/newtab/data/content/assets/remote/mountain.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="115" height="89" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M86.676 83.103c15.377 0 27.842-12.465 27.842-27.842 0-15.376-12.465-27.842-27.842-27.842-15.377 0-27.842 12.466-27.842 27.842 0 15.377 12.465 27.842 27.842 27.842z" fill="#FFEA80"/>
+  <path d="M84.457 41.839l-25.25 43.159a2.59 2.59 0 002.232 3.898h50.484a2.589 2.589 0 002.591-2.6 2.594 2.594 0 00-.354-1.298L88.914 41.84a2.586 2.586 0 00-4.457 0z" fill="#7542E5"/>
+  <path d="M114.16 85.031L95.432 52.967l-4.084 4.084-4.653-4.657-4.656 4.657-4.085-4.085L59.21 85.03a2.591 2.591 0 002.233 3.904h50.48a2.59 2.59 0 002.236-3.904z" fill="#7542E5"/>
+  <path d="M86.68 52.394l3.923 3.922a1.037 1.037 0 001.465 0l3.34-3.34-6.493-11.142a2.587 2.587 0 00-4.467 0l-6.509 11.132 3.34 3.34a1.037 1.037 0 001.466 0l3.936-3.912z" fill="#B48EFF"/>
+  <path d="M41.036 17.67L.368 85.014a2.586 2.586 0 002.3 3.893h81.346a2.586 2.586 0 002.295-3.893L45.636 17.67a2.706 2.706 0 00-4.6 0z" fill="#AB71FF"/>
+  <path d="M56.329 35.373L45.635 17.671a2.706 2.706 0 00-4.594 0L30.347 35.373l-.954 1.58 5.56 7.635a1.032 1.032 0 001.67 0l6.68-9.214 6.704 9.214a1.03 1.03 0 001.67 0l5.583-7.663-.931-1.551z" fill="#D9BFFF"/>
+  <path d="M41.086 1.131v14.41a1.13 1.13 0 001.13 1.131h26.507a1.12 1.12 0 001.044-.697 1.14 1.14 0 00-.242-1.236l-6.409-6.403 6.39-6.404c.322-.325.417-.811.243-1.235A1.135 1.135 0 0068.723 0H42.216c-.624 0-1.13.507-1.13 1.131z" fill="#FFA266"/>
+</svg>
--- a/browser/components/newtab/data/content/assets/remote/umbrella.png
+++ b/browser/components/newtab/data/content/assets/remote/umbrella.png
--- a/browser/components/newtab/jar.mn
+++ b/browser/components/newtab/jar.mn
@ -26,9 +26,6 @@ browser.jar:
 * res/activity-stream/data/content/abouthomecache/page.html.template (./data/content/abouthomecache/page.html.template)
 * res/activity-stream/data/content/abouthomecache/script.js.template (./data/content/abouthomecache/script.js.template)
  content/activity-stream/data/content/assets/  (./data/content/assets/*)
-#ifdef XP_WIN
-  content/activity-stream/data/content/assets/remote  (./data/content/windows-assets/*)
-#endif
  content/activity-stream/data/content/tippytop/ (./data/content/tippytop/*)
  res/activity-stream/data/content/activity-stream.bundle.js (./data/content/activity-stream.bundle.js)
  res/activity-stream/data/content/newtab-render.js (./data/content/newtab-render.js)
--- a/browser/components/newtab/lib/PanelTestProvider.jsm
+++ b/browser/components/newtab/lib/PanelTestProvider.jsm
@ -313,6 +313,108 @@ const MESSAGES = () => [
    frequency: { lifetime: 3 },
    trigger: { id: "defaultBrowserCheck" },
  },
+  {
+    id: "BETTER_INTERNET_GLOBAL_ROLLOUT",
+    groups: ["eco"],
+    content: {
+      template: "logo-and-content",
+      logo: {
+        imageURL:
+          "chrome://activity-stream/content/data/content/assets/remote/mountain.svg",
+        size: "115px",
+      },
+      body: {
+        title: {
+          label: {
+            string_id: "spotlight-better-internet-header",
+          },
+          size: "24px",
+        },
+        text: {
+          label: {
+            string_id: "spotlight-better-internet-body",
+          },
+          size: "16px",
+        },
+        primary: {
+          label: {
+            string_id: "spotlight-pin-primary-button",
+          },
+          action: {
+            type: "PIN_FIREFOX_TO_TASKBAR",
+          },
+        },
+        secondary: {
+          label: {
+            string_id: "spotlight-pin-secondary-button",
+          },
+          action: {
+            type: "CANCEL",
+          },
+        },
+      },
+    },
+    trigger: {
+      id: "defaultBrowserCheck",
+    },
+    template: "spotlight",
+    frequency: {
+      lifetime: 1,
+    },
+    targeting:
+      "userMonthlyActivity|length >= 1 && userMonthlyActivity|length <= 6 && doesAppNeedPin",
+  },
+  {
+    id: "PEACE_OF_MIND_GLOBAL_ROLLOUT",
+    groups: ["eco"],
+    content: {
+      template: "logo-and-content",
+      logo: {
+        imageURL:
+          "chrome://activity-stream/content/data/content/assets/remote/umbrella.png",
+        size: "115px",
+      },
+      body: {
+        title: {
+          label: {
+            string_id: "spotlight-peace-mind-header",
+          },
+          size: "24px",
+        },
+        text: {
+          label: {
+            string_id: "spotlight-peace-mind-body",
+          },
+          size: "16px",
+        },
+        primary: {
+          label: {
+            string_id: "spotlight-pin-primary-button",
+          },
+          action: {
+            type: "PIN_FIREFOX_TO_TASKBAR",
+          },
+        },
+        secondary: {
+          label: {
+            string_id: "spotlight-pin-secondary-button",
+          },
+          action: {
+            type: "CANCEL",
+          },
+        },
+      },
+    },
+    trigger: {
+      id: "defaultBrowserCheck",
+    },
+    template: "spotlight",
+    frequency: {
+      lifetime: 1,
+    },
+    targeting:
+      "userMonthlyActivity|length >= 7 && userMonthlyActivity|length <= 13 && doesAppNeedPin",
+  },
  {
    id: "MULTISTAGE_SPOTLIGHT_MESSAGE",
    groups: ["panel-test-provider"],
--- a/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js
+++ b/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js
@ -12,7 +12,7 @@ describe("PanelTestProvider", () => {
  it("should have correct number of messages", () => {
    // Careful: when changing this number make sure that new messages also go
    // through schema verifications.
-    assert.lengthOf(messages, 13);
+    assert.lengthOf(messages, 15);
  });
  it("should be a valid message", () => {
    const updateMessages = messages.filter(
--- a/browser/locales/en-US/browser/newtab/asrouter.ftl
+++ b/browser/locales/en-US/browser/newtab/asrouter.ftl
@ -164,3 +164,15 @@ spotlight-total-cookie-protection-body = Total Cookie Protection stops trackers
 spotlight-total-cookie-protection-expanded = { -brand-short-name } builds a fence around cookies, limiting them to the site you’re on so trackers can’t use them to follow you. With early access, you’ll help optimize this feature so we can keep building a better web for everyone.
 spotlight-total-cookie-protection-primary-button = Turn on Total Cookie Protection
 spotlight-total-cookie-protection-secondary-button = Not now
+
+## Emotive Continuous Onboarding
+
+spotlight-better-internet-header = A better internet starts with you
+spotlight-better-internet-body = When you use { -brand-short-name}, you’re voting for an open and accessible internet that’s better for everyone.
+spotlight-peace-mind-header = We’ve got you covered
+spotlight-peace-mind-body = Every month, { -brand-short-name } blocks an average of over 3,000 trackers per user. Because nothing, especially privacy nuisances like trackers, should stand between you and the good internet.
+spotlight-pin-primary-button = { PLATFORM() ->
+    [macos] Keep in Dock
+   *[other] Pin to taskbar
+}
+spotlight-pin-secondary-button = Not now