Merge pull request wordpress-mobile#21069 from wordpress-mobile/task/…

…21058-compliance-popup-wordpress [EU/US Compliance] Show popover for EU users in WordPress
jeff4a501 · Jul 12, 2023 · c815bfd · c815bfd
2 parents 43c933b + f668fce
commit c815bfd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/BlogDashboardViewController.swift
@@ -14,7 +14,6 @@ final class BlogDashboardViewController: UIViewController {
         BlogDashboardViewModel(viewController: self, blog: blog)
     }()
 
-    private var complianceCoordinator: CompliancePopoverCoordinator?
 
     lazy var collectionView: DynamicHeightCollectionView = {
         let collectionView = DynamicHeightCollectionView(frame: .zero, collectionViewLayout: createLayout())
@@ -81,9 +80,6 @@ final class BlogDashboardViewController: UIViewController {
         startAlertTimer()
 
         WPAnalytics.track(.mySiteDashboardShown)
-
-        complianceCoordinator = CompliancePopoverCoordinator(viewController: self)
-        complianceCoordinator?.presentIfNeeded()
     }
 
     override func viewWillDisappear(_ animated: Bool) {

diff --git a/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift b/WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift
@@ -91,6 +91,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
     var willDisplayPostSignupFlow: Bool = false
 
     private var createButtonCoordinator: CreateButtonCoordinator?
+    private var complianceCoordinator: CompliancePopoverCoordinator?
 
     private let meScenePresenter: ScenePresenter
     private let blogService: BlogService
@@ -208,6 +209,9 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
 
         createFABIfNeeded()
         fetchPrompt(for: blog)
+
+        complianceCoordinator = CompliancePopoverCoordinator(viewController: self)
+        complianceCoordinator?.presentIfNeeded()
     }
 
     override func viewDidLayoutSubviews() {

diff --git a/WordPress/Classes/ViewRelated/EEUUSCompliance/CompliancePopoverCoordinator.swift b/WordPress/Classes/ViewRelated/EEUUSCompliance/CompliancePopoverCoordinator.swift
@@ -17,7 +17,7 @@ final class CompliancePopoverCoordinator: CompliancePopoverCoordinatorProtocol {
     }
 
     func presentIfNeeded() {
-        guard FeatureFlag.compliancePopover.enabled else {
+        guard FeatureFlag.compliancePopover.enabled, !defaults.didShowCompliancePopup else {
             return
         }
         complianceService.getIPCountryCode { [weak self] result in