swaps NTP HTTPS upgrades stat for bandwidth saved

brave · May 4, 2020 · 571a15e · 571a15e
1 parent bcda739
commit 571a15e
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 15 deletions.
diff --git a/browser/ui/webui/brave_new_tab_message_handler.cc b/browser/ui/webui/brave_new_tab_message_handler.cc
@@ -52,9 +52,6 @@ base::DictionaryValue GetStatsDictionary(PrefService* prefs) {
   stats_data.SetInteger(
     "javascriptBlockedStat",
     prefs->GetUint64(kJavascriptBlocked));
-  stats_data.SetInteger(
-    "httpsUpgradesStat",
-    prefs->GetUint64(kHttpsUpgrades));
   stats_data.SetInteger(
     "fingerprintingBlockedStat",
     prefs->GetUint64(kFingerprintingBlocked));

diff --git a/components/brave_new_tab_ui/api/stats.ts b/components/brave_new_tab_ui/api/stats.ts
@@ -13,8 +13,8 @@
 export type Stats = {
   adsBlockedStat: number,
   javascriptBlockedStat: number,
-  httpsUpgradesStat: number,
-  fingerprintingBlockedStat: number
+  fingerprintingBlockedStat: number,
+  bandwidthSavedStat: number
 }
 
 type StatsUpdatedHandler = (statsData: Stats) => void

diff --git a/components/brave_new_tab_ui/containers/newTab/stats.tsx b/components/brave_new_tab_ui/containers/newTab/stats.tsx
@@ -21,8 +21,37 @@ class Stats extends React.Component<Props, {}> {
     return this.props.stats.adsBlockedStat || 0
   }
 
-  get httpsUpgradedCount () {
-    return this.props.stats.httpsUpgradesStat || 0
+  get estimatedBandwidthSaved () {
+    const estimatedBWSaved = this.props.stats.bandwidthSavedStat
+    if (estimatedBWSaved) {
+      const bytes = estimatedBWSaved < 1024
+      const kilobytes = estimatedBWSaved < 1024 * 1024
+      const megabytes = estimatedBWSaved < 1024 * 1024 * 1024
+
+      let counter
+      let id
+      if (bytes) {
+        counter = estimatedBWSaved
+        id = 'B'
+      } else if (kilobytes) {
+        counter = (estimatedBWSaved / 1024).toFixed(0)
+        id = 'KB'
+      } else if (megabytes) {
+        counter = (estimatedBWSaved / 1024 / 1024).toFixed(1)
+        id = 'MB'
+      } else {
+        counter = (estimatedBWSaved / 1024 / 1024 / 1024).toFixed(2)
+        id = 'GB'
+      }
+
+      return {
+        id,
+        value: counter,
+        args: JSON.stringify({ value: counter })
+      }
+    } else {
+      return false
+    }
   }
 
   get estimatedTimeSaved () {
@@ -59,19 +88,22 @@ class Stats extends React.Component<Props, {}> {
 
   render () {
     const trackedBlockersCount = this.adblockCount.toLocaleString()
-    const httpsUpgradedCount = this.httpsUpgradedCount.toLocaleString()
     const timeSaved = this.estimatedTimeSaved
+    const bandwidthSaved = this.estimatedBandwidthSaved
 
     return (
       <StatsContainer>
         <StatsItem
           description={getLocale('adsTrackersBlocked')}
           counter={trackedBlockersCount}
         />
-        <StatsItem
-          description={getLocale('httpsUpgraded')}
-          counter={httpsUpgradedCount}
-        />
+        {bandwidthSaved &&
+          <StatsItem
+            counter={bandwidthSaved.value}
+            text={getLocale(bandwidthSaved.id)}
+            description={getLocale('estimatedBandwidthSaved')}
+          />
+        }
         <StatsItem
           counter={timeSaved.value}
           text={getLocale(timeSaved.id)}

diff --git a/components/brave_new_tab_ui/storage/new_tab_storage.ts b/components/brave_new_tab_ui/storage/new_tab_storage.ts
@@ -28,7 +28,7 @@ export const defaultState: NewTab.State = {
   stats: {
     adsBlockedStat: 0,
     javascriptBlockedStat: 0,
-    httpsUpgradesStat: 0,
+    bandwidthSavedStat: 0,
     fingerprintingBlockedStat: 0
   },
   rewardsState: {

diff --git a/components/definitions/newTab.d.ts b/components/definitions/newTab.d.ts
@@ -59,7 +59,7 @@ declare namespace NewTab {
   export interface Stats {
     adsBlockedStat: number
     javascriptBlockedStat: number
-    httpsUpgradesStat: number
+    bandwidthSavedStat: number
     fingerprintingBlockedStat: number
   }
 

diff --git a/components/test/testData.ts b/components/test/testData.ts
@@ -54,7 +54,7 @@ export const newTabInitialState: NewTab.ApplicationState = {
     stats: {
       adsBlockedStat: 0,
       javascriptBlockedStat: 0,
-      httpsUpgradesStat: 0,
+      bandwidthSavedStat: 0,
       fingerprintingBlockedStat: 0
     }
   }