duckduckgo · samsymons · Oct 17, 2024 · Oct 16, 2024 · Oct 16, 2024 · Oct 17, 2024
diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -87,6 +87,7 @@ import os.log
     private var autofillPixelReporter: AutofillPixelReporter?
     private var autofillUsageMonitor = AutofillUsageMonitor()
 
+    private(set) var subscriptionFeatureAvailability: SubscriptionFeatureAvailability!
     var privacyProDataReporter: PrivacyProDataReporting!
 
     // MARK: lifecycle
@@ -302,6 +303,10 @@ import os.log
         )
         remoteMessagingClient.registerBackgroundRefreshTaskHandler()
 
+        subscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability(
+            privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
+            purchasePlatform: .appStore)
+
         homePageConfiguration = HomePageConfiguration(variantManager: AppDependencyProvider.shared.variantManager,
                                                       remoteMessagingClient: remoteMessagingClient,
                                                       privacyProDataReporter: privacyProDataReporter)
@@ -336,7 +341,8 @@ import os.log
                                           variantManager: variantManager,
                                           contextualOnboardingPresenter: contextualOnboardingPresenter,
                                           contextualOnboardingLogic: daxDialogs,
-                                          contextualOnboardingPixelReporter: onboardingPixelReporter)
+                                          contextualOnboardingPixelReporter: onboardingPixelReporter,
+                                          subscriptionFeatureAvailability: subscriptionFeatureAvailability)
 
             main.loadViewIfNeeded()
             syncErrorHandler.alertPresenter = main

diff --git a/DuckDuckGo/AppDependencyProvider.swift b/DuckDuckGo/AppDependencyProvider.swift
@@ -41,7 +41,6 @@ protocol DependencyProvider {
     var configurationManager: ConfigurationManager { get }
     var configurationStore: ConfigurationStore { get }
     var userBehaviorMonitor: UserBehaviorMonitor { get }
-    var subscriptionFeatureAvailability: SubscriptionFeatureAvailability { get }
     var subscriptionManager: SubscriptionManager { get }
     var accountManager: AccountManager { get }
     var vpnFeatureVisibility: DefaultNetworkProtectionVisibility { get }
@@ -75,10 +74,6 @@ final class AppDependencyProvider: DependencyProvider {
 
     let userBehaviorMonitor = UserBehaviorMonitor()
 
-    let subscriptionFeatureAvailability: SubscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability(
-        privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
-        purchasePlatform: .appStore)
-
     // Subscription
     let subscriptionManager: SubscriptionManager
     var accountManager: AccountManager {
@@ -125,9 +120,6 @@ final class AppDependencyProvider: DependencyProvider {
 
         self.subscriptionManager = subscriptionManager
 
-        let subscriptionFeatureAvailability: SubscriptionFeatureAvailability = DefaultSubscriptionFeatureAvailability(
-            privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager,
-            purchasePlatform: .appStore)
         let accessTokenProvider: () -> String? = {
             return { accountManager.accessToken }
         }()

diff --git a/DuckDuckGo/MainViewController+Segues.swift b/DuckDuckGo/MainViewController+Segues.swift
@@ -307,6 +307,7 @@ extension MainViewController {
 
         let settingsViewModel = SettingsViewModel(legacyViewProvider: legacyViewProvider,
                                                   subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
+                                                  subscriptionFeatureAvailability: subscriptionFeatureAvailability,
                                                   deepLink: deepLinkTarget,
                                                   historyManager: historyManager,
                                                   syncPausedStateManager: syncPausedStateManager,

diff --git a/DuckDuckGo/MainViewController.swift b/DuckDuckGo/MainViewController.swift
@@ -125,6 +125,7 @@ class MainViewController: UIViewController {
     private var vpnCancellables = Set<AnyCancellable>()
     private var feedbackCancellable: AnyCancellable?
 
+    let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     let privacyProDataReporter: PrivacyProDataReporting
 
     private lazy var featureFlagger = AppDependencyProvider.shared.featureFlagger
@@ -195,7 +196,8 @@ class MainViewController: UIViewController {
         contextualOnboardingLogic: ContextualOnboardingLogic,
         contextualOnboardingPixelReporter: OnboardingPixelReporting,
         tutorialSettings: TutorialSettings = DefaultTutorialSettings(),
-        statisticsStore: StatisticsStore = StatisticsUserDefaults()
+        statisticsStore: StatisticsStore = StatisticsUserDefaults(),
+        subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     ) {
         self.bookmarksDatabase = bookmarksDatabase
         self.bookmarksDatabaseCleaner = bookmarksDatabaseCleaner
@@ -226,6 +228,7 @@ class MainViewController: UIViewController {
         self.contextualOnboardingLogic = contextualOnboardingLogic
         self.contextualOnboardingPixelReporter = contextualOnboardingPixelReporter
         self.statisticsStore = statisticsStore
+        self.subscriptionFeatureAvailability = subscriptionFeatureAvailability
 
         super.init(nibName: nil, bundle: nil)
 

diff --git a/DuckDuckGo/NetworkProtectionRootView.swift b/DuckDuckGo/NetworkProtectionRootView.swift
@@ -28,9 +28,8 @@ struct NetworkProtectionRootView: View {
 
     init() {
         let accountManager = AppDependencyProvider.shared.subscriptionManager.accountManager
-        let subscriptionFeatureAvailability = AppDependencyProvider.shared.subscriptionFeatureAvailability
         let locationListRepository = NetworkProtectionLocationListCompositeRepository(accountManager: accountManager)
-        let usesUnifiedFeedbackForm = accountManager.isUserAuthenticated && subscriptionFeatureAvailability.usesUnifiedFeedbackForm
+        let usesUnifiedFeedbackForm = accountManager.isUserAuthenticated // && subscriptionFeatureAvailability.usesUnifiedFeedbackForm
         statusViewModel = NetworkProtectionStatusViewModel(tunnelController: AppDependencyProvider.shared.networkProtectionTunnelController,
                                                            settings: AppDependencyProvider.shared.vpnSettings,
                                                            statusObserver: AppDependencyProvider.shared.connectionObserver,

diff --git a/DuckDuckGo/SettingsRootView.swift b/DuckDuckGo/SettingsRootView.swift
@@ -116,12 +116,14 @@ struct SettingsRootView: View {
             SubscriptionContainerViewFactory.makeSubscribeFlow(origin: origin,
                                                                navigationCoordinator: subscriptionNavigationCoordinator,
                                                                subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
+                                                               subscriptionFeatureAvailability: viewModel.subscriptionFeatureAvailability,
                                                                privacyProDataReporter: viewModel.privacyProDataReporter)
             .environmentObject(subscriptionNavigationCoordinator)
 
         case .restoreFlow:
             SubscriptionContainerViewFactory.makeEmailFlow(navigationCoordinator: subscriptionNavigationCoordinator,
                                                            subscriptionManager: AppDependencyProvider.shared.subscriptionManager,
+                                                           subscriptionFeatureAvailability: viewModel.subscriptionFeatureAvailability,
                                                            onDisappear: {})
         case .duckPlayer:
             SettingsDuckPlayerView().environmentObject(viewModel)

diff --git a/DuckDuckGo/SettingsSubscriptionView.swift b/DuckDuckGo/SettingsSubscriptionView.swift
@@ -34,7 +34,8 @@ struct SettingsSubscriptionView: View {
         static let privacyPolicyURL = URL(string: "https://duckduckgo.com/pro/privacy-terms")!
     }
 
-    @EnvironmentObject var viewModel: SettingsViewModel
+    @EnvironmentObject var settingsViewModel: SettingsViewModel
+    @EnvironmentObject var subscriptionSettingsViewModel: SubscriptionSettingsViewModel
     @EnvironmentObject var subscriptionNavigationCoordinator: SubscriptionNavigationCoordinator
     @State var isShowingDBP = false
     @State var isShowingITP = false
@@ -46,7 +47,8 @@ struct SettingsSubscriptionView: View {
 
     var subscriptionRestoreView: some View {
         SubscriptionContainerViewFactory.makeRestoreFlow(navigationCoordinator: subscriptionNavigationCoordinator,
-                                                                           subscriptionManager: subscriptionManager)
+                                                         subscriptionManager: subscriptionManager,
+                                                         subscriptionFeatureAvailability: settingsViewModel.subscriptionFeatureAvailability)
     }
 
     private var manageSubscriptionView: some View {
@@ -117,7 +119,8 @@ struct SettingsSubscriptionView: View {
 
         // Renew Subscription (Expired)
         let settingsView = SubscriptionSettingsView(configuration: .expired,
-                                                    settingsViewModel: viewModel,
+                                                    subscriptionSettingsViewModel: subscriptionSettingsViewModel,
+                                                    settingsViewModel: settingsViewModel,
                                                     viewPlans: {
             subscriptionNavigationCoordinator.shouldPushSubscriptionWebView = true
         })
@@ -138,7 +141,8 @@ struct SettingsSubscriptionView: View {
 
         // Renew Subscription (Expired)
         let settingsView = SubscriptionSettingsView(configuration: .activating,
-                                                    settingsViewModel: viewModel,
+                                                    subscriptionSettingsViewModel: subscriptionSettingsViewModel,
+                                                    settingsViewModel: settingsViewModel,
                                                     viewPlans: {
             subscriptionNavigationCoordinator.shouldPushSubscriptionWebView = true
         })
@@ -155,17 +159,17 @@ struct SettingsSubscriptionView: View {
     @ViewBuilder
     private var subscriptionDetailsView: some View {
 
-        if viewModel.state.subscription.entitlements.contains(.networkProtection) {
+        if settingsViewModel.state.subscription.entitlements.contains(.networkProtection) {
             NavigationLink(destination: NetworkProtectionRootView(), isActive: $isShowingVPN) {
                 SettingsCellView(
                     label: UserText.settingsPProVPNTitle,
                     image: Image("SettingsPrivacyProVPN"),
-                    statusIndicator: StatusIndicatorView(status: viewModel.state.networkProtectionConnected ? .on : .off)
+                    statusIndicator: StatusIndicatorView(status: settingsViewModel.state.networkProtectionConnected ? .on : .off)
                 )
             }
         }
 
-        if viewModel.state.subscription.entitlements.contains(.dataBrokerProtection) {
+        if settingsViewModel.state.subscription.entitlements.contains(.dataBrokerProtection) {
             NavigationLink(destination: SubscriptionPIRView(), isActive: $isShowingDBP) {
                 SettingsCellView(
                     label: UserText.settingsPProDBPTitle,
@@ -175,7 +179,7 @@ struct SettingsSubscriptionView: View {
             }
         }
 
-        if viewModel.state.subscription.entitlements.contains(.identityTheftRestoration) {
+        if settingsViewModel.state.subscription.entitlements.contains(.identityTheftRestoration) {
             NavigationLink(
                 destination: SubscriptionITPView(),
                 isActive: $isShowingITP) {
@@ -189,7 +193,8 @@ struct SettingsSubscriptionView: View {
 
         NavigationLink(
             destination: SubscriptionSettingsView(configuration: .subscribed,
-                                                  settingsViewModel: viewModel)
+                                                  subscriptionSettingsViewModel: subscriptionSettingsViewModel,
+                                                  settingsViewModel: settingsViewModel)
                 .environmentObject(subscriptionNavigationCoordinator)
         ) {
             SettingsCustomCell(content: { manageSubscriptionView })
@@ -200,9 +205,9 @@ struct SettingsSubscriptionView: View {
         Group {
             if isShowingPrivacyPro {
 
-                let isSignedIn = viewModel.state.subscription.isSignedIn
-                let hasActiveSubscription = viewModel.state.subscription.hasActiveSubscription
-                let hasNoEntitlements = viewModel.state.subscription.entitlements.isEmpty
+                let isSignedIn = settingsViewModel.state.subscription.isSignedIn
+                let hasActiveSubscription = settingsViewModel.state.subscription.hasActiveSubscription
+                let hasNoEntitlements = settingsViewModel.state.subscription.entitlements.isEmpty
 
                 let footerLink = Link(UserText.settingsPProSectionFooter,
                                       destination: ViewConstants.privacyPolicyURL)
@@ -239,7 +244,7 @@ struct SettingsSubscriptionView: View {
                 }
             }
         }
-        .onReceive(viewModel.$state) { state in
+        .onReceive(settingsViewModel.$state) { state in
             isShowingPrivacyPro = state.subscription.enabled && (state.subscription.isSignedIn || state.subscription.canPurchase)
         }
     }

diff --git a/DuckDuckGo/SettingsViewModel.swift b/DuckDuckGo/SettingsViewModel.swift
@@ -39,13 +39,13 @@ final class SettingsViewModel: ObservableObject {
     private var legacyViewProvider: SettingsLegacyViewProvider
     private lazy var versionProvider: AppVersion = AppVersion.shared
     private let voiceSearchHelper: VoiceSearchHelperProtocol
-    private let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     private let syncPausedStateManager: any SyncPausedStateManaging
     var emailManager: EmailManager { EmailManager() }
     private let historyManager: HistoryManaging
     let privacyProDataReporter: PrivacyProDataReporting?
     // Subscription Dependencies
     private let subscriptionManager: SubscriptionManager
+    let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     private var subscriptionSignOutObserver: Any?
     var duckPlayerContingencyHandler: DuckPlayerContingencyHandler {
         DefaultDuckPlayerContingencyHandler(privacyConfigurationManager: ContentBlocking.shared.privacyConfigurationManager)
@@ -362,7 +362,7 @@ final class SettingsViewModel: ObservableObject {
     init(state: SettingsState? = nil,
          legacyViewProvider: SettingsLegacyViewProvider,
          subscriptionManager: SubscriptionManager,
-         subscriptionFeatureAvailability: SubscriptionFeatureAvailability = AppDependencyProvider.shared.subscriptionFeatureAvailability,
+         subscriptionFeatureAvailability: SubscriptionFeatureAvailability,
          voiceSearchHelper: VoiceSearchHelperProtocol = AppDependencyProvider.shared.voiceSearchHelper,
          variantManager: VariantManager = AppDependencyProvider.shared.variantManager,
          deepLink: SettingsDeepLinkSection? = nil,
@@ -706,7 +706,7 @@ extension SettingsViewModel {
         }
 
         // Update visibility based on Feature flag
-        state.subscription.enabled = AppDependencyProvider.shared.subscriptionFeatureAvailability.isFeatureAvailable
+        state.subscription.enabled = subscriptionFeatureAvailability.isFeatureAvailable
 
         // Update if can purchase based on App Store product availability
         state.subscription.canPurchase = subscriptionManager.canPurchase

diff --git a/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift b/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
@@ -90,19 +90,22 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
 
     private let subscriptionAttributionOrigin: String?
     private let subscriptionManager: SubscriptionManager
+    private let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     private var accountManager: AccountManager { subscriptionManager.accountManager }
     private let appStorePurchaseFlow: AppStorePurchaseFlow
     private let appStoreRestoreFlow: AppStoreRestoreFlow
     private let appStoreAccountManagementFlow: AppStoreAccountManagementFlow
     private let privacyProDataReporter: PrivacyProDataReporting?
 
     init(subscriptionManager: SubscriptionManager,
+         subscriptionFeatureAvailability: SubscriptionFeatureAvailability,
          subscriptionAttributionOrigin: String?,
          appStorePurchaseFlow: AppStorePurchaseFlow,
          appStoreRestoreFlow: AppStoreRestoreFlow,
          appStoreAccountManagementFlow: AppStoreAccountManagementFlow,
          privacyProDataReporter: PrivacyProDataReporting? = nil) {
         self.subscriptionManager = subscriptionManager
+        self.subscriptionFeatureAvailability = subscriptionFeatureAvailability
         self.appStorePurchaseFlow = appStorePurchaseFlow
         self.appStoreRestoreFlow = appStoreRestoreFlow
         self.appStoreAccountManagementFlow = appStoreAccountManagementFlow
@@ -200,7 +203,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature, ObservableObjec
     func getSubscriptionOptions(params: Any, original: WKScriptMessage) async -> Encodable? {
         resetSubscriptionFlow()
         if let subscriptionOptions = await subscriptionManager.storePurchaseManager().subscriptionOptions() {
-            if AppDependencyProvider.shared.subscriptionFeatureAvailability.isSubscriptionPurchaseAllowed {
+            if subscriptionFeatureAvailability.isSubscriptionPurchaseAllowed {
                 return subscriptionOptions
             } else {
                 return SubscriptionOptions.empty

diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift
@@ -28,6 +28,7 @@ import BrowserServicesKit
 final class SubscriptionSettingsViewModel: ObservableObject {
 
     private let subscriptionManager: SubscriptionManager
+    private let subscriptionFeatureAvailability: SubscriptionFeatureAvailability
     private var signOutObserver: Any?
 
     private var externalAllowedDomains = ["stripe.com"]
@@ -70,8 +71,9 @@ final class SubscriptionSettingsViewModel: ObservableObject {
     public let usesUnifiedFeedbackForm: Bool
 
     init(subscriptionManager: SubscriptionManager = AppDependencyProvider.shared.subscriptionManager,
-         subscriptionFeatureAvailability: SubscriptionFeatureAvailability = AppDependencyProvider.shared.subscriptionFeatureAvailability) {
+         subscriptionFeatureAvailability: SubscriptionFeatureAvailability) {
         self.subscriptionManager = subscriptionManager
+        self.subscriptionFeatureAvailability = subscriptionFeatureAvailability
         let subscriptionFAQURL = subscriptionManager.url(for: .faq)
         let learnMoreURL = subscriptionFAQURL.appendingPathComponent("adding-email")
         self.state = State(faqURL: subscriptionFAQURL, learnMoreURL: learnMoreURL)