fix: reversed the implementation of the reviews notification badge count in the hub menu due to an issue described in a comment.

Author: pmusolino

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenu.swift

@@ -30,8 +30,12 @@ struct HubMenu: View {
 
                 LazyVGrid(columns: gridItemLayout, spacing: Constants.itemSpacing) {
                     ForEach(viewModel.menuElements, id: \.self) { menu in
-                        let badgeCount = menu == .reviews ? viewModel.reviewsNotificationBadgeCount : 0
-                        HubMenuElement(image: menu.icon, imageColor: menu.iconColor, text: menu.title, badge: badgeCount, onTapGesture: {
+                        // Currently the badge is always zero, because we are not handling push notifications count
+                        // correctly due to the first behavior described here p91TBi-66O:
+                        // AppDelegate’s `application(_:didReceiveRemoteNotification:fetchCompletionHandler:)`
+                        // can be called twice for the same push notification when receiving it
+                        // and tapping on it to open the app. This means that some push notifications are incrementing the badge number by 2, and some by 1.
+                        HubMenuElement(image: menu.icon, imageColor: menu.iconColor, text: menu.title, badge: 0, onTapGesture: {
                             switch menu {
                             case .woocommerceAdmin:
                                 ServiceLocator.analytics.track(.hubMenuOptionTapped, withProperties: [Constants.option: "admin_menu"])

WooCommerce/Classes/ViewRelated/Hub Menu/HubMenuViewModel.swift

@@ -43,8 +43,6 @@ final class HubMenuViewModel: ObservableObject {
 
     @Published var showingReviewDetail = false
 
-    @Published var reviewsNotificationBadgeCount = 0
-
     private var productReviewFromNoteParcel: ProductReviewFromNoteParcel?
 
     private var storePickerCoordinator: StorePickerCoordinator?
@@ -59,8 +57,6 @@ final class HubMenuViewModel: ObservableObject {
             menuElements.append(.coupons)
         }
         observeSiteForUIUpdates()
-        startListeningToReviewsBadgeUpdates()
-        loadReviewsNotificationCountAndUpdateBadge()
     }
 
     /// Present the `StorePickerViewController` using the `StorePickerCoordinator`, passing the navigation controller from the entry point.
@@ -87,38 +83,12 @@ final class HubMenuViewModel: ObservableObject {
     }
 
     private func observeSiteForUIUpdates() {
-        ServiceLocator.stores.site.sink { [weak self] site in
-            self?.loadReviewsNotificationCountAndUpdateBadge()
+        ServiceLocator.stores.site.sink { site in
+            // This will be useful in the future for updating some info of the screen depending on the store site info
         }.store(in: &cancellables)
     }
 }
 
-// MARK: - Hub Menu Badges Updates
-//
-private extension HubMenuViewModel {
-
-    /// Setup: KVO Hooks.
-    ///
-    func startListeningToReviewsBadgeUpdates() {
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(loadReviewsNotificationCountAndUpdateBadge),
-                                               name: .reviewsBadgeReloadRequired,
-                                               object: nil)
-    }
-
-    @objc func loadReviewsNotificationCountAndUpdateBadge() {
-        let stores: StoresManager = ServiceLocator.stores
-        guard let siteID = stores.sessionManager.defaultStoreID else {
-            return
-        }
-
-        let action = NotificationCountAction.load(siteID: siteID, type: .kind(.comment)) { [weak self] count in
-            self?.reviewsNotificationBadgeCount = count
-        }
-        stores.dispatch(action)
-    }
-}
-
 extension HubMenuViewModel {
     enum Menu: CaseIterable {
         case woocommerceAdmin