Make privacy banner not dismissable via WordPress UI tooling (#9830)

Author: mokagio

Podfile

@@ -90,7 +90,7 @@ target 'WooCommerce' do
 
   wordpress_shared
 
-  pod 'WordPressUI', '~> 1.12.5'
+  pod 'WordPressUI', '~> 1.13-beta'
   # pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''
 
   aztec

Podfile.lock

@@ -54,7 +54,7 @@ PODS:
     - WordPressShared (~> 2.0-beta)
     - wpxmlrpc (~> 0.10)
   - WordPressShared (2.1.0)
-  - WordPressUI (1.12.5)
+  - WordPressUI (1.13.0)
   - Wormholy (1.6.6)
   - WPMediaPicker (1.8.1)
   - wpxmlrpc (0.10.0)
@@ -85,7 +85,7 @@ DEPENDENCIES:
   - WordPress-Editor-iOS (~> 1.11.0)
   - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`)
   - WordPressShared (~> 2.1)
-  - WordPressUI (~> 1.12.5)
+  - WordPressUI (~> 1.13-beta)
   - Wormholy (~> 1.6.6)
   - WPMediaPicker (~> 1.8.1)
   - ZendeskSupportSDK (~> 6.0)
@@ -161,7 +161,7 @@ SPEC CHECKSUMS:
   WordPressAuthenticator: 8a27a3c61ca0d740df66f260902aa2ca8528c61b
   WordPressKit: b65a51863982d8166897bea8b753f1fc51732aad
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
-  WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
+  WordPressUI: 9951bdade87c8c64b50535aaed2a53a11d0c52ee
   Wormholy: 09da0b876f9276031fd47383627cb75e194fc068
   WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f
   wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
@@ -173,6 +173,6 @@ SPEC CHECKSUMS:
   ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06
   ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393
 
-PODFILE CHECKSUM: 7ef16ee777d45b27a6ea41073fce0a707bda17a7
+PODFILE CHECKSUM: 08c354d1c2b7fcbef3508c1931f343661f463f8e
 
 COCOAPODS: 1.11.3

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

@@ -100,15 +100,3 @@ 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)
-    }
-}

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

@@ -43,6 +43,11 @@ extension PrivacyBannerViewController: DrawerPresentable {
     var expandedHeight: DrawerHeight {
         return .contentHeight(bannerIntrinsicHeight)
     }
+
+    // We want the user to dimiss this only by completing the flow, not by tapping, dragging, or collapsing.
+    var allowsDragToDismiss: Bool { false }
+    var allowsTapToDismiss: Bool { false }
+    var allowsUserTransition: Bool { false }
 }
 
 /// Banner View for the privacy settings.