Hide PrivacyPro when using App Store and no products are found

duckduckgo · Mar 22, 2024 · 028f34f · 028f34f
1 parent e37ba00
commit 028f34f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -337,9 +337,14 @@ final class MoreOptionsMenu: NSMenu {
         var items: [NSMenuItem] = []
 
 #if SUBSCRIPTION
-
-
         let subscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability()
+
+        if subscriptionFeatureAvailability.isFeatureAvailable {
+            switch (SubscriptionPurchaseEnvironment.current, SubscriptionPurchaseEnvironment.canPurchase) {
+            case (.appStore, false): return []
+            default: break
+            }
+        }
 #endif
 
 #if NETWORK_PROTECTION
@@ -437,6 +442,11 @@ final class MoreOptionsMenu: NSMenu {
 
 #if SUBSCRIPTION
     private func makeInactiveSubscriptionItems() -> [NSMenuItem] {
+        switch (SubscriptionPurchaseEnvironment.current, SubscriptionPurchaseEnvironment.canPurchase) {
+        case (.appStore, false): return []
+        default: break
+        }
+
         let privacyProItem = NSMenuItem(title: UserText.subscriptionOptionsMenuItem,
                                         action: #selector(openSubscriptionPurchasePage(_:)),
                                         keyEquivalent: "")

diff --git a/DuckDuckGo/Preferences/Model/PreferencesSection.swift b/DuckDuckGo/Preferences/Model/PreferencesSection.swift
@@ -61,8 +61,12 @@ struct PreferencesSection: Hashable, Identifiable {
 
 #if SUBSCRIPTION
         if DefaultSubscriptionFeatureAvailability().isFeatureAvailable {
-            let subscriptionPanes: [PreferencePaneIdentifier] = [.subscription]
-            sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
+            switch (SubscriptionPurchaseEnvironment.current, SubscriptionPurchaseEnvironment.canPurchase) {
+            case (.appStore, false): break
+            default:
+                let subscriptionPanes: [PreferencePaneIdentifier] = [.subscription]
+                sections.insert(.init(id: .privacyPro, panes: subscriptionPanes), at: 1)
+            }
         }
 #endif