Fix: return nil for itemToDisplay if view count is also nil

The default view count 0 was being supplied to itemToDisplay, which was causing .social to be returned when it should have been returning nil.
wordpress-mobile · Oct 15, 2021 · b4fb243 · b4fb243
1 parent c887490
commit b4fb243
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsTableViewController.swift
@@ -211,7 +211,7 @@ private extension SiteStatsInsightsTableViewController {
     }
 
     func loadPinnedCards() {
-        let viewsCount = insightsStore.getAllTimeStats()?.viewsCount ?? 0
+        let viewsCount = insightsStore.getAllTimeStats()?.viewsCount
         switch pinnedItemStore?.itemToDisplay(for: viewsCount) {
         case .none:
             insightsToShow = insightsToShow.filter { $0 != .growAudience || $0 != .customize }

diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsInsightsViewModel.swift
@@ -39,7 +39,7 @@ class SiteStatsInsightsViewModel: Observable {
         self.insightsToShow = insightsToShow
         self.insightsStore = insightsStore
         self.pinnedItemStore = pinnedItemStore
-        let viewsCount = insightsStore.getAllTimeStats()?.viewsCount ?? 0
+        let viewsCount = insightsStore.getAllTimeStats()?.viewsCount
         self.itemToDisplay = pinnedItemStore?.itemToDisplay(for: viewsCount)
 
         insightsChangeReceipt = self.insightsStore.onChange { [weak self] in

diff --git a/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsPinnedItemStore.swift b/WordPress/Classes/ViewRelated/Stats/Insights/SiteStatsPinnedItemStore.swift
@@ -16,7 +16,11 @@ final class SiteStatsPinnedItemStore {
         self.siteId = siteId
     }
 
-    func itemToDisplay(for siteViewsCount: Int) -> SiteStatsPinnable? {
+    func itemToDisplay(for siteViewsCount: Int?) -> SiteStatsPinnable? {
+        guard let siteViewsCount = siteViewsCount else {
+            return nil
+        }
+
         if siteViewsCount < lowSiteViewsCountTreshold {
             return nudgeToDisplay ?? customizeToDisplay
         } else {