Merge pull request #8012 from woocommerce/issue/7916-refresh-jitms

[Just In Time Messages] Refresh JITMs

Author: joshheald

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewController.swift

@@ -293,10 +293,13 @@ private extension DashboardViewController {
     }
 
     private func openWebView(viewModel: WebViewSheetViewModel) {
-        let cardReaderWebview = WebViewSheet(viewModel: viewModel) { [weak self] in
-            self?.dismiss(animated: true)
+        let webViewSheet = WebViewSheet(viewModel: viewModel) { [weak self] in
+            guard let self = self else { return }
+            self.dismiss(animated: true)
+            self.viewModel.syncAnnouncements(for: self.siteID)
         }
-        let hostingController = UIHostingController(rootView: cardReaderWebview)
+        let hostingController = UIHostingController(rootView: webViewSheet)
+        hostingController.presentationController?.delegate = self
         present(hostingController, animated: true, completion: nil)
     }
 
@@ -383,12 +386,21 @@ private extension DashboardViewController {
     }
 }
 
+// MARK: - Delegate conformance
 extension DashboardViewController: DashboardUIScrollDelegate {
     func dashboardUIScrollViewDidScroll(_ scrollView: UIScrollView) {
         hiddenScrollView.updateFromScrollViewDidScrollEventForLargeTitleWorkaround(scrollView)
     }
 }
 
+extension DashboardViewController: UIAdaptivePresentationControllerDelegate {
+    func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+        if presentationController.presentedViewController is UIHostingController<WebViewSheet> {
+            viewModel.syncAnnouncements(for: siteID)
+        }
+    }
+}
+
 // MARK: - Updates
 //
 private extension DashboardViewController {
@@ -497,6 +509,7 @@ private extension DashboardViewController {
 
     func pullToRefresh() async {
         ServiceLocator.analytics.track(.dashboardPulledToRefresh)
+        viewModel.syncAnnouncements(for: siteID)
         await reloadDashboardUIStatsVersion(forced: true)
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/DashboardViewModel.swift

@@ -111,11 +111,7 @@ final class DashboardViewModel {
     ///
     func syncAnnouncements(for siteID: Int64) {
         syncProductsOnboarding(for: siteID) { [weak self] in
-            // For now, products onboarding takes precedence over Just In Time Messages, so we can stop if there is an onboarding announcement to display.
-            // This should be revisited when either onboarding or JITMs are expanded. See: pe5pgL-11B-p2
-            guard let self, self.announcementViewModel == nil else { return }
-
-            self.syncJustInTimeMessages(for: siteID)
+            self?.syncJustInTimeMessages(for: siteID)
         }
     }
 
@@ -134,6 +130,11 @@ final class DashboardViewModel {
                             MainTabBarController.presentAddProductFlow()
                         })
                         self?.announcementViewModel = viewModel
+                        // For now, products onboarding takes precedence over Just In Time Messages,
+                        // so we can stop if there is an onboarding announcement to display.
+                        // This should be revisited when either onboarding or JITMs are expanded. See:
+                        // pe5pgL-11B-p2
+                        return
                     }
                 }
                 onCompletion()
@@ -160,6 +161,7 @@ final class DashboardViewModel {
                 switch result {
                 case let .success(messages):
                     guard let message = messages.first else {
+                        self.announcementViewModel = nil
                         return
                     }
                     self.analytics.track(event:

WooCommerce/WooCommerceTests/ViewRelated/Dashboard/DashboardViewModelTests.swift

@@ -235,4 +235,21 @@ final class DashboardViewModelTests: XCTestCase {
         assertEqual("Networking.DotcomError", properties["error_domain"] as? String)
         assertEqual("Dotcom Invalid REST Route", properties["error_description"] as? String)
     }
+
+    func test_when_no_messages_are_received_existing_messages_are_removed() {
+        // Given
+        prepareStoresToShowJustInTimeMessage(.success([]))
+
+        let viewModel = DashboardViewModel(stores: stores, analytics: analytics)
+        viewModel.announcementViewModel = JustInTimeMessageAnnouncementCardViewModel(
+            justInTimeMessage: .fake(),
+            screenName: "my_store",
+            siteID: sampleSiteID)
+
+        // When
+        viewModel.syncAnnouncements(for: sampleSiteID)
+
+        // Then
+        XCTAssertNil(viewModel.announcementViewModel)
+    }
 }