Merge pull request #9815 from woocommerce/issue/9811-prevent-banner-from-dismiss

[Privacy Choices] Prevent banner from being dismissed

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerPresenter.swift

@@ -67,6 +67,7 @@ final class PrivacyBannerPresenter {
         })
 
         let bottomSheetViewController = BottomSheetViewController(childViewController: privacyBanner)
+        bottomSheetViewController.isModalInPresentation = true
         bottomSheetViewController.show(from: viewController)
 
         analytics.track(event: .PrivacyChoicesBanner.bannerPresented())
@@ -99,3 +100,15 @@ extension PrivacyBannerPresenter {
         static let retry = NSLocalizedString("Retry", comment: "Retry title on the notice action button")
     }
 }
+
+extension BottomSheetViewController {
+    /// Temporary hack to prevent the `PrivacyBannerViewController` to be dismissed.
+    /// This should be changed once https://github.com/wordpress-mobile/WordPressUI-iOS/pull/126 is merged.
+    ///
+    public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
+        if children.first is PrivacyBannerViewController {
+            return
+        }
+        super.dismiss(animated: flag, completion: completion)
+    }
+}