Merge pull request #6963 from woocommerce/fix/1810-review-notification

Attempt to fix review details not shown after tapping a push notification

Author: jaclync

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

@@ -21,8 +21,8 @@ struct HubMenu: View {
     ///
     private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
 
-    init(siteID: Int64, navigationController: UINavigationController? = nil) {
-        viewModel = HubMenuViewModel(siteID: siteID, navigationController: navigationController)
+    init(viewModel: HubMenuViewModel) {
+        self.viewModel = viewModel
     }
 
     var body: some View {
@@ -111,10 +111,6 @@ struct HubMenu: View {
         }
     }
 
-    func pushReviewDetailsView(using parcel: ProductReviewFromNoteParcel) {
-        viewModel.showReviewDetails(using: parcel)
-    }
-
     /// Reset state to make the menu items tappable
     private func enableMenuItemTaps() {
         shouldDisableItemTaps = false
@@ -213,17 +209,17 @@ struct HubMenu: View {
 
 struct HubMenu_Previews: PreviewProvider {
     static var previews: some View {
-        HubMenu(siteID: 123)
+        HubMenu(viewModel: .init(siteID: 123))
             .environment(\.colorScheme, .light)
 
-        HubMenu(siteID: 123)
+        HubMenu(viewModel: .init(siteID: 123))
             .environment(\.colorScheme, .dark)
 
-        HubMenu(siteID: 123)
+        HubMenu(viewModel: .init(siteID: 123))
             .previewLayout(.fixed(width: 312, height: 528))
             .environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge)
 
-        HubMenu(siteID: 123)
+        HubMenu(viewModel: .init(siteID: 123))
             .previewLayout(.fixed(width: 1024, height: 768))
     }
 }

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

@@ -20,14 +20,14 @@ final class HubMenuCoordinator: Coordinator {
 
     private var notificationsSubscription: AnyCancellable?
 
-    private let willPresentReviewDetailsFromPushNotification: () -> Void
+    private let willPresentReviewDetailsFromPushNotification: () async -> Void
 
     init(navigationController: UINavigationController,
          pushNotificationsManager: PushNotesManager = ServiceLocator.pushNotesManager,
          storesManager: StoresManager = ServiceLocator.stores,
          noticePresenter: NoticePresenter = ServiceLocator.noticePresenter,
          switchStoreUseCase: SwitchStoreUseCaseProtocol,
-         willPresentReviewDetailsFromPushNotification: @escaping () -> Void) {
+         willPresentReviewDetailsFromPushNotification: @escaping () async -> Void) {
 
         self.pushNotificationsManager = pushNotificationsManager
         self.storesManager = storesManager
@@ -37,7 +37,7 @@ final class HubMenuCoordinator: Coordinator {
         self.navigationController = navigationController
     }
 
-    convenience init(navigationController: UINavigationController, willPresentReviewDetailsFromPushNotification: @escaping () -> Void) {
+    convenience init(navigationController: UINavigationController, willPresentReviewDetailsFromPushNotification: @escaping () async -> Void) {
         let storesManager = ServiceLocator.stores
         self.init(navigationController: navigationController,
                   storesManager: storesManager,
@@ -94,13 +94,15 @@ final class HubMenuCoordinator: Coordinator {
                         return
                     }
 
-                    self.willPresentReviewDetailsFromPushNotification()
-                    self.pushReviewDetailsViewController(using: parcel)
+                    Task { @MainActor in
+                        await self.willPresentReviewDetailsFromPushNotification()
+                        self.pushReviewDetailsViewController(using: parcel)
 
-                    if siteChanged {
-                        let presenter = SwitchStoreNoticePresenter(siteID: Int64(siteID),
-                                                                   noticePresenter: self.noticePresenter)
-                        presenter.presentStoreSwitchedNoticeWhenSiteIsAvailable(configuration: .switchingStores)
+                        if siteChanged {
+                            let presenter = SwitchStoreNoticePresenter(siteID: Int64(siteID),
+                                                                       noticePresenter: self.noticePresenter)
+                            presenter.presentStoreSwitchedNoticeWhenSiteIsAvailable(configuration: .switchingStores)
+                        }
                     }
                 }
             }

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

@@ -4,9 +4,11 @@ import Yosemite
 
 /// Displays a grid view of all available menu in the "Menu" tab (eg. View Store, Reviews, Coupons, etc...)
 final class HubMenuViewController: UIHostingController<HubMenu> {
+    private let viewModel: HubMenuViewModel
 
     init(siteID: Int64, navigationController: UINavigationController?) {
-        super.init(rootView: HubMenu(siteID: siteID, navigationController: navigationController))
+        self.viewModel = HubMenuViewModel(siteID: siteID, navigationController: navigationController)
+        super.init(rootView: HubMenu(viewModel: viewModel))
         configureTabBarItem()
     }
 
@@ -17,7 +19,7 @@ final class HubMenuViewController: UIHostingController<HubMenu> {
     /// Present the specific Review Details View from a push notification
     ///
     func pushReviewDetailsViewController(using parcel: ProductReviewFromNoteParcel) {
-        rootView.pushReviewDetailsView(using: parcel)
+        viewModel.showReviewDetails(using: parcel)
     }
 }
 

WooCommerce/Classes/ViewRelated/MainTabBarController.swift

@@ -481,7 +481,11 @@ private extension MainTabBarController {
     func createHubMenuTabCoordinator() -> HubMenuCoordinator {
         HubMenuCoordinator(navigationController: hubMenuNavigationController,
                            willPresentReviewDetailsFromPushNotification: { [weak self] in
-            self?.navigateTo(.hubMenu)
+            await withCheckedContinuation { [weak self] continuation in
+                self?.navigateTo(.hubMenu) {
+                    continuation.resume(returning: ())
+                }
+            }
         })
     }
 }