Release build 8.20.0 [ci release]

Author: shakyShane

CHANGELOG.txt

@@ -1 +1,5 @@
-- Add query param color=white to  (#1662)
+- ntp: fixed the empty state of activity widget when trackers are present (#1677)
+- Update YouTube feature description for ad blocking experiment (#1674)
+- Skip Duck Player step when ad blocking is enabled (#1673)
+- build(deps-dev): bump jasmine from 5.6.0 to 5.7.1 (#1666)
+- Onboarding: Send set*() messages to native apps when step is skipped (#1648)

Sources/ContentScopeScripts/dist/pages/new-tab/dist/index.js

@@ -20148,8 +20148,8 @@
     );
     const [formatter] = h2(() => new Intl.NumberFormat());
     const adBlocking = useAdBlocking();
-    const none = itemCount === 0;
-    const someItems = itemCount > 0;
+    const none = itemCount === 0 && trackerCount === 0;
+    const some = itemCount > 0 || trackerCount > 0;
     const trackerCountFormatted = formatter.format(trackerCount);
     let allTimeString;
     if (trackerCount === 1) {
@@ -20165,7 +20165,7 @@
       },
       /* @__PURE__ */ g("span", { className: PrivacyStats_default.headingIcon }, /* @__PURE__ */ g("img", { src: adBlocking ? "./icons/shield-green.svg" : "./icons/shield.svg", alt: "Privacy Shield" })),
       none && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, t4("activity_noRecent_title")),
-      someItems && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, /* @__PURE__ */ g(Trans, { str: allTimeString, values: { count: trackerCountFormatted } })),
+      some && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, /* @__PURE__ */ g(Trans, { str: allTimeString, values: { count: trackerCountFormatted } })),
       canExpand && /* @__PURE__ */ g("span", { className: PrivacyStats_default.widgetExpander }, /* @__PURE__ */ g(
         ShowHideButtonCircle,
         {
@@ -20178,8 +20178,8 @@
           label: expansion === "expanded" ? t4("stats_hideLabel") : t4("stats_toggleLabel")
         }
       )),
-      itemCount === 0 && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, { [PrivacyStats_default.indented]: !adBlocking }) }, adBlocking ? t4("activity_noRecentAdsAndTrackers_subtitle") : t4("activity_noRecent_subtitle")),
-      itemCount > 0 && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, PrivacyStats_default.indented, { [PrivacyStats_default.uppercase]: !adBlocking }) }, t4("stats_feedCountBlockedPeriod"))
+      none && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, { [PrivacyStats_default.indented]: !adBlocking }) }, adBlocking ? t4("activity_noRecentAdsAndTrackers_subtitle") : t4("activity_noRecent_subtitle")),
+      some && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, PrivacyStats_default.indented, { [PrivacyStats_default.uppercase]: !adBlocking }) }, t4("stats_feedCountBlockedPeriod"))
     );
   }
   var import_classnames5;
@@ -29594,6 +29594,9 @@
     },
     "activity.noTrackers": {
       factory: () => /* @__PURE__ */ g(Activity, { expansion: "expanded", itemCount: 20, trackerCount: 0, toggle: noop("toggle"), batched: false }, /* @__PURE__ */ g(Mock, { size: 1 }, /* @__PURE__ */ g(ActivityBody, { canBurn: false, visibility: "visible" })))
+    },
+    "activity.noActivity.someTrackers": {
+      factory: () => /* @__PURE__ */ g(Activity, { expansion: "collapsed", itemCount: 0, trackerCount: 56, toggle: noop("toggle"), batched: false }, /* @__PURE__ */ g(Mock, { size: 0 }, /* @__PURE__ */ g(ActivityBody, { canBurn: false, visibility: "visible" })))
     }
   };
   function Mock({ children, size }) {

Sources/ContentScopeScripts/dist/pages/onboarding/dist/index.js

@@ -285,14 +285,6 @@
     "title": "No targeted ads. No targeted recommendations. Just your video.",
     "note": "Subtitle for a page that shows the benefits of using the Duck Player feature to watch YouTube videos more privately."
   },
-  "duckPlayer_alt_title": {
-    "title": "Watch YouTube privately with Duck Player",
-    "note": "Alternative title for Duck Player step when YouTube ad blocking is also offered."
-  },
-  "duckPlayer_alt_subtitle": {
-    "title": "Watching videos in Duck Player won't influence your YouTube recommendations.",
-    "note": "Alternative subtitle for Duck Player step when YouTube ad blocking is also offered."
-  },
   "customize_title_v3": {
     "title": "Let’s customize a few things…",
     "note": "Title for a page that allows the user to customize specific settings in the DuckDuckGo browser."
@@ -401,6 +393,10 @@
     "title": "Play YouTube without targeted ads",
     "note": "The description of a browser privacy feature in the comparison table."
   },
+  "comparison_youtubeAdFree": {
+    "title": "Watch YouTube ad-free",
+    "note": "The description of a browser privacy feature in the comparison table when ad-blocking is enabled."
+  },
   "comparison_fullSupport": {
     "title": "Significant protection",
     "note": "The level of protection offered by a browser on a specific feature in the comparison table."

Sources/ContentScopeScripts/dist/pages/onboarding/locales/en/onboarding.json

@@ -20153,8 +20153,8 @@
     );
     const [formatter] = h2(() => new Intl.NumberFormat());
     const adBlocking = useAdBlocking();
-    const none = itemCount === 0;
-    const someItems = itemCount > 0;
+    const none = itemCount === 0 && trackerCount === 0;
+    const some = itemCount > 0 || trackerCount > 0;
     const trackerCountFormatted = formatter.format(trackerCount);
     let allTimeString;
     if (trackerCount === 1) {
@@ -20170,7 +20170,7 @@
       },
       /* @__PURE__ */ g("span", { className: PrivacyStats_default.headingIcon }, /* @__PURE__ */ g("img", { src: adBlocking ? "./icons/shield-green.svg" : "./icons/shield.svg", alt: "Privacy Shield" })),
       none && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, t4("activity_noRecent_title")),
-      someItems && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, /* @__PURE__ */ g(Trans, { str: allTimeString, values: { count: trackerCountFormatted } })),
+      some && /* @__PURE__ */ g("h2", { className: PrivacyStats_default.title }, /* @__PURE__ */ g(Trans, { str: allTimeString, values: { count: trackerCountFormatted } })),
       canExpand && /* @__PURE__ */ g("span", { className: PrivacyStats_default.widgetExpander }, /* @__PURE__ */ g(
         ShowHideButtonCircle,
         {
@@ -20183,8 +20183,8 @@
           label: expansion === "expanded" ? t4("stats_hideLabel") : t4("stats_toggleLabel")
         }
       )),
-      itemCount === 0 && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, { [PrivacyStats_default.indented]: !adBlocking }) }, adBlocking ? t4("activity_noRecentAdsAndTrackers_subtitle") : t4("activity_noRecent_subtitle")),
-      itemCount > 0 && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, PrivacyStats_default.indented, { [PrivacyStats_default.uppercase]: !adBlocking }) }, t4("stats_feedCountBlockedPeriod"))
+      none && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, { [PrivacyStats_default.indented]: !adBlocking }) }, adBlocking ? t4("activity_noRecentAdsAndTrackers_subtitle") : t4("activity_noRecent_subtitle")),
+      some && /* @__PURE__ */ g("p", { className: (0, import_classnames5.default)(PrivacyStats_default.subtitle, PrivacyStats_default.indented, { [PrivacyStats_default.uppercase]: !adBlocking }) }, t4("stats_feedCountBlockedPeriod"))
     );
   }
   var import_classnames5;
@@ -29732,6 +29732,23 @@
         }
       ]
     },
+    singleWithTrackers: {
+      activity: [
+        {
+          favicon: { src: "selco-icon.png" },
+          url: "https://example.com",
+          title: "example.com",
+          etldPlusOne: "example.com",
+          favorite: false,
+          trackersFound: true,
+          trackingStatus: {
+            trackerCompanies: [{ displayName: "Google" }, { displayName: "Facebook" }, { displayName: "Amazon" }],
+            totalCount: 56
+          },
+          history: []
+        }
+      ]
+    },
     few: {
       activity: [
         {
@@ -29876,6 +29893,17 @@
           _msg
         );
         switch (msg.method) {
+          case "activity_removeItem": {
+            const oldCount = dataset.activity.reduce((acc, item) => acc + item.trackingStatus.totalCount, 0);
+            dataset.activity = dataset.activity.filter((x4) => x4.url !== msg.params.url);
+            const patchParams = toPatch(dataset.activity);
+            patchParams.totalTrackersBlocked = oldCount;
+            setTimeout(() => {
+              const cb = subs.get("activity_onDataPatch");
+              cb(patchParams);
+            }, 0);
+            break;
+          }
           default: {
             console.warn("unhandled notification", msg);
           }
@@ -29895,6 +29923,9 @@
         if (sub2 === "activity_onDataUpdate") {
           subs.set("activity_onDataUpdate", cb);
         }
+        if (sub2 === "activity_onDataPatch") {
+          subs.set("activity_onDataPatch", cb);
+        }
         if (sub2 === "activity_onDataUpdate" && url.searchParams.has("flood")) {
           let count = 0;
           const int = setInterval(() => {
@@ -30144,6 +30175,9 @@
     },
     "activity.noTrackers": {
       factory: () => /* @__PURE__ */ g(Activity, { expansion: "expanded", itemCount: 20, trackerCount: 0, toggle: noop("toggle"), batched: false }, /* @__PURE__ */ g(Mock, { size: 1 }, /* @__PURE__ */ g(ActivityBody, { canBurn: false, visibility: "visible" })))
+    },
+    "activity.noActivity.someTrackers": {
+      factory: () => /* @__PURE__ */ g(Activity, { expansion: "collapsed", itemCount: 0, trackerCount: 56, toggle: noop("toggle"), batched: false }, /* @__PURE__ */ g(Mock, { size: 0 }, /* @__PURE__ */ g(ActivityBody, { canBurn: false, visibility: "visible" })))
     }
   };
   function Mock({ children, size }) {