Dismiss Analytics view when a notice is set

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubView.swift

@@ -109,9 +109,10 @@ struct AnalyticsHubView: View {
         .edgesIgnoringSafeArea(.horizontal)
         .task {
             await viewModel.updateData()
-            if viewModel.errorSelectingTimeRange {
-                dismissWithNotice(notice)
-            }
+        }
+        .onReceive(viewModel.$notice) { notice in
+            guard let notice else { return }
+            dismissWithNotice(notice)
         }
     }
 }

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModel.swift

@@ -47,15 +47,11 @@ final class AnalyticsHubViewModel: ObservableObject {
     ///
     @Published var timeRangeCard: AnalyticsTimeRangeCardViewModel
 
-    /// Defines the current notice that should be shown.
+    /// Defines a notice that should be shown after the view is dismissed.
     /// Defaults to `nil`.
     ///
     @Published var notice: Notice?
 
-    /// Whether selecting a time range failed
-    ///
-    @Published private(set) var errorSelectingTimeRange: Bool = false
-
     // MARK: Private data
 
     /// Order stats for the current selected time period
@@ -82,7 +78,6 @@ final class AnalyticsHubViewModel: ObservableObject {
             try await retrieveOrderStats()
         } catch is AnalyticsHubTimeRangeSelection.TimeRangeGeneratorError {
             notice = Notice(title: Localization.timeRangeGeneratorError, feedbackType: .error)
-            errorSelectingTimeRange = true
             DDLogWarn("⚠️ Error selecting analytics time range: \(timeRangeSelectionType.description)")
         } catch {
             switchToErrorState()