combine trackers blocked and ads blocked on NTP

close brave/brave-browser#5273
brave · Jul 23, 2019 · 3cf2621 · 3cf2621
1 parent 9258a23
commit 3cf2621
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -114,8 +114,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
                                                            localized_strings = {
     {
       std::string("newtab"), {
-        { "adsBlocked", IDS_BRAVE_NEW_TAB_TOTAL_ADS_BLOCKED },
-        { "trackersBlocked", IDS_BRAVE_NEW_TAB_TOTAL_TRACKERS_BLOCKED },
+        { "adsTrackersBlocked", IDS_BRAVE_NEW_TAB_TOTAL_ADS_TRACKERS_BLOCKED },
         { "httpsUpgraded", IDS_BRAVE_NEW_TAB_TOTAL_HTTPS_UPGRADES },
         { "estimatedTimeSaved", IDS_BRAVE_NEW_TAB_TOTAL_TIME_SAVED },
         { "thumbRemoved", IDS_BRAVE_NEW_TAB_THUMB_REMOVED },

diff --git a/components/brave_new_tab_ui/components/default/stats/style.ts b/components/brave_new_tab_ui/components/default/stats/style.ts
@@ -35,10 +35,7 @@ export const StyledStatsItem = styled<{}, 'li'>('li')`
     color: #FB542B;
   }
   &:nth-child(2) {
-    color: #B02FFB;
-  }
-  &:nth-child(3) {
-    color: #4C54D2;
+    color: #A0A5EB;
   }
   &:last-child {
     color: #FFFFFF;

diff --git a/components/brave_new_tab_ui/containers/newTab/stats.tsx b/components/brave_new_tab_ui/containers/newTab/stats.tsx
@@ -62,21 +62,16 @@ class Stats extends React.Component<Props, {}> {
   }
 
   render () {
-    const trackedBlockersCount = this.trackedBlockersCount.toLocaleString()
-    const adblockCount = this.adblockCount.toLocaleString()
+    const trackedBlockersCount = (this.trackedBlockersCount + this.adblockCount).toLocaleString()
     const httpsUpgradedCount = this.httpsUpgradedCount.toLocaleString()
     const timeSaved = this.estimatedTimeSaved
 
     return (
       <StatsContainer>
         <StatsItem
-          description={getLocale('trackersBlocked')}
+          description={getLocale('adsTrackersBlocked')}
           counter={trackedBlockersCount}
         />
-        <StatsItem
-          description={getLocale('adsBlocked')}
-          counter={adblockCount}
-        />
         <StatsItem
           description={getLocale('httpsUpgraded')}
           counter={httpsUpgradedCount}

diff --git a/components/brave_new_tab_ui/stories/default/stats.tsx b/components/brave_new_tab_ui/stories/default/stats.tsx
@@ -14,8 +14,7 @@ class Stats extends React.PureComponent<{}, {}> {
   render () {
     return (
       <StatsContainer>
-        <StatsItem counter='42' description={getLocale('trackersBlocked')} />
-        <StatsItem counter='105' description={getLocale('adsBlocked')} />
+        <StatsItem counter='42' description={getLocale('adsTrackersBlocked')} />
         <StatsItem counter='0' description={getLocale('httpsUpgrades')} />
         <StatsItem counter='5' text={getLocale('minutes')} description={getLocale('estimatedTimeSaved')} />
       </StatsContainer>

diff --git a/components/brave_new_tab_ui/stories/fakeLocale.ts b/components/brave_new_tab_ui/stories/fakeLocale.ts
@@ -4,8 +4,7 @@
 
 const locale: any = {
   // stats
-  trackersBlocked: 'Trackers Blocked',
-  adsBlocked: 'Ads Blocked',
+  adsTrackersBlocked: 'Ads and Trackers Blocked',
   httpsUpgrades: 'HTTPS Upgrades',
   estimatedTimeSaved: 'Estimated Time Saved',
   minutes: 'minutes',

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -118,8 +118,7 @@
   <release seq="1">
     <messages fallback_to_english="true">
       <!-- WebUI newtab resources -->
-      <message name="IDS_BRAVE_NEW_TAB_TOTAL_ADS_BLOCKED" desc="total number of ads blocked">Ads Blocked</message>
-      <message name="IDS_BRAVE_NEW_TAB_TOTAL_TRACKERS_BLOCKED" desc="total number of trackers blocked">Trackers Blocked</message>
+      <message name="IDS_BRAVE_NEW_TAB_TOTAL_ADS_TRACKERS_BLOCKED" desc="total number of ads and trackers blocked">Ads and Trackers Blocked</message>
       <message name="IDS_BRAVE_NEW_TAB_TOTAL_HTTPS_UPGRADES" desc="total number of HTTPS upgrades">HTTPS Upgrades</message>
       <message name="IDS_BRAVE_NEW_TAB_TOTAL_TIME_SAVED" desc="total time saved from blocking ads and trackers">Estimated Time Saved</message>
       <message name="IDS_BRAVE_NEW_TAB_THUMB_REMOVED" desc="Shown when a thumbnail is removed from the new tab page">Top site removed.</message>