Merge branch 'task/19447-phase-1' into task/19447-analytics

Author: hassaanelgarem

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

@@ -88,7 +88,7 @@ class JetpackFeaturesRemovalCoordinator {
     /// - Parameters:
     ///   - source: The source that triggers the display of the overlay.
     ///   - viewController: View controller where the overlay should be presented in.
-    static func presentOverlay(from source: OverlaySource, in viewController: UIViewController) {
+    static func presentOverlayIfNeeded(from source: OverlaySource, in viewController: UIViewController) {
         let phase = generalPhase()
         let frequencyConfig = phase.frequencyConfig
         let viewModel = JetpackFullscreenOverlayGeneralViewModel(phase: phase, source: source)

WordPress/Classes/ViewRelated/Jetpack/Branding/Fullscreen Overlay/JetpackFullscreenOverlayGeneralViewModel.swift

@@ -204,7 +204,7 @@ private extension JetpackFullscreenOverlayGeneralViewModel {
                                                      value: "Follow any site with the Jetpack app",
                                                      comment: "Title of a screen displayed when the user accesses the Reader screen from the WordPress app. The screen showcases the Jetpack app.")
                 static let subtitle = NSLocalizedString("jetpack.fullscreen.overlay.phaseOne.reader.subtitle",
-                                                     value: "Switch to the Jetpack app to find, fillow, and like all your favorite sites and posts with Reader.",
+                                                     value: "Switch to the Jetpack app to find, follow, and like all your favorite sites and posts with Reader.",
                                                      comment: "Subtitle of a screen displayed when the user accesses the Reader screen from the WordPress app. The screen showcases the Jetpack app.")
             }
 

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift

@@ -180,7 +180,7 @@ class NotificationsViewController: UIViewController, UIViewControllerRestoration
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        JetpackFeaturesRemovalCoordinator.presentOverlay(from: .notifications, in: self)
+        JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(from: .notifications, in: self)
 
         syncNotificationsWithModeratedComments()
         setupInlinePrompt()

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -347,7 +347,7 @@ import Combine
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        JetpackFeaturesRemovalCoordinator.presentOverlay(from: .reader, in: self)
+        JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(from: .reader, in: self)
 
         syncIfAppropriate()
     }

WordPress/Classes/ViewRelated/Stats/SiteStatsDashboardViewController.swift

@@ -96,7 +96,7 @@ class SiteStatsDashboardViewController: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        JetpackFeaturesRemovalCoordinator.presentOverlay(from: .stats, in: self)
+        JetpackFeaturesRemovalCoordinator.presentOverlayIfNeeded(from: .stats, in: self)
     }
 
     func configureInsightsTableView() {