Remove support for usesUnifiedFeedback subfeature flag

quanganhdo · quanganhdo · commit 83fa6ee3f3b7 · 2025-01-06T15:10:22.000+07:00
diff --git a/Core/ios-config.json b/Core/ios-config.json
@@ -6161,10 +6161,6 @@
                 "allowPurchase": {
                     "state": "enabled"
                 },
-                "useUnifiedFeedback": {
-                    "state": "enabled",
-                    "minSupportedVersion": "7.136.0"
-                },
                 "setAccessTokenCookieForSubscriptionDomains": {
                     "state": "disabled",
                     "rollout": {
diff --git a/DuckDuckGo/NetworkProtectionRootView.swift b/DuckDuckGo/NetworkProtectionRootView.swift
@@ -30,13 +30,12 @@ struct NetworkProtectionRootView: View {
         let subscriptionManager = AppDependencyProvider.shared.subscriptionManager
         let accountManager = AppDependencyProvider.shared.subscriptionManager.accountManager
         let locationListRepository = NetworkProtectionLocationListCompositeRepository(accountManager: accountManager)
-        let usesUnifiedFeedbackForm = accountManager.isUserAuthenticated
         statusViewModel = NetworkProtectionStatusViewModel(tunnelController: AppDependencyProvider.shared.networkProtectionTunnelController,
                                                            settings: AppDependencyProvider.shared.vpnSettings,
                                                            statusObserver: AppDependencyProvider.shared.connectionObserver,
                                                            serverInfoObserver: AppDependencyProvider.shared.serverInfoObserver,
                                                            locationListRepository: locationListRepository,
-                                                           usesUnifiedFeedbackForm: usesUnifiedFeedbackForm,
+                                                           enablesUnifiedFeedbackForm: accountManager.isUserAuthenticated,
                                                            subscriptionManager: subscriptionManager)
     }
 
diff --git a/DuckDuckGo/NetworkProtectionStatusView.swift b/DuckDuckGo/NetworkProtectionStatusView.swift
@@ -293,7 +293,7 @@ struct NetworkProtectionStatusView: View {
                 .daxBodyRegular()
                 .foregroundColor(.init(designSystemColor: .textPrimary))
 
-            if statusModel.usesUnifiedFeedbackForm {
+            if statusModel.enablesUnifiedFeedbackForm {
                 NavigationLink(UserText.subscriptionFeedback, destination: UnifiedFeedbackRootView(viewModel: viewModel))
                     .daxBodyRegular()
                     .foregroundColor(.init(designSystemColor: .textPrimary))
diff --git a/DuckDuckGo/NetworkProtectionStatusViewModel.swift b/DuckDuckGo/NetworkProtectionStatusViewModel.swift
@@ -177,7 +177,7 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
 
     @Published public var animationsOn: Bool = false
 
-    public let usesUnifiedFeedbackForm: Bool
+    public let enablesUnifiedFeedbackForm: Bool
     public let subscriptionManager: SubscriptionManager
 
     public init(tunnelController: (TunnelController & TunnelSessionProvider),
@@ -186,14 +186,14 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
                 serverInfoObserver: ConnectionServerInfoObserver,
                 errorObserver: ConnectionErrorObserver = ConnectionErrorObserverThroughSession(),
                 locationListRepository: NetworkProtectionLocationListRepository,
-                usesUnifiedFeedbackForm: Bool,
+                enablesUnifiedFeedbackForm: Bool,
                 subscriptionManager: SubscriptionManager) {
         self.tunnelController = tunnelController
         self.settings = settings
         self.statusObserver = statusObserver
         self.serverInfoObserver = serverInfoObserver
         self.errorObserver = errorObserver
-        self.usesUnifiedFeedbackForm = usesUnifiedFeedbackForm
+        self.enablesUnifiedFeedbackForm = enablesUnifiedFeedbackForm
         self.subscriptionManager = subscriptionManager
 
         statusMessage = Self.message(for: statusObserver.recentValue)
diff --git a/DuckDuckGo/SettingsOthersView.swift b/DuckDuckGo/SettingsOthersView.swift
@@ -34,7 +34,7 @@ struct SettingsOthersView: View {
             }
 
             // Share Feedback
-            if viewModel.usesUnifiedFeedbackForm {
+            if viewModel.enablesUnifiedFeedbackForm {
                 let formViewModel = UnifiedFeedbackFormViewModel(subscriptionManager: viewModel.subscriptionManager,
                                                                  apiService: DefaultAPIService(),
                                                                  vpnMetadataCollector: DefaultVPNMetadataCollector(),
diff --git a/DuckDuckGo/SettingsViewModel.swift b/DuckDuckGo/SettingsViewModel.swift
@@ -400,8 +400,8 @@ final class SettingsViewModel: ObservableObject {
         legacyViewProvider.syncService.authState != .inactive ? .on : .off
     }
 
-    var usesUnifiedFeedbackForm: Bool {
-        subscriptionManager.accountManager.isUserAuthenticated && subscriptionFeatureAvailability.usesUnifiedFeedbackForm
+    var enablesUnifiedFeedbackForm: Bool {
+        subscriptionManager.accountManager.isUserAuthenticated
     }
 
     // MARK: Default Init
diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionSettingsViewModel.swift
@@ -67,14 +67,14 @@ final class SubscriptionSettingsViewModel: ObservableObject {
     // Read only View State - Should only be modified from the VM
     @Published private(set) var state: State
 
-    public let usesUnifiedFeedbackForm: Bool
+    public let enablesUnifiedFeedbackForm: Bool
 
     init(subscriptionManager: SubscriptionManager = AppDependencyProvider.shared.subscriptionManager) {
         self.subscriptionManager = subscriptionManager
         let subscriptionFAQURL = subscriptionManager.url(for: .faq)
         let learnMoreURL = subscriptionFAQURL.appendingPathComponent("adding-email")
         self.state = State(faqURL: subscriptionFAQURL, learnMoreURL: learnMoreURL)
-        self.usesUnifiedFeedbackForm = subscriptionManager.accountManager.isUserAuthenticated
+        self.enablesUnifiedFeedbackForm = subscriptionManager.accountManager.isUserAuthenticated
 
         setupNotificationObservers()
     }
diff --git a/DuckDuckGo/Subscription/Views/SubscriptionSettingsView.swift b/DuckDuckGo/Subscription/Views/SubscriptionSettingsView.swift
@@ -201,7 +201,7 @@ struct SubscriptionSettingsView: View {
     }
 
     @ViewBuilder var helpSection: some View {
-        if viewModel.usesUnifiedFeedbackForm {
+        if viewModel.enablesUnifiedFeedbackForm {
             Section {
                 faqButton
                 supportButton
diff --git a/DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift b/DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift
@@ -54,7 +54,7 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {
                                                      statusObserver: statusObserver,
                                                      serverInfoObserver: serverInfoObserver,
                                                      locationListRepository: MockNetworkProtectionLocationListRepository(),
-                                                     usesUnifiedFeedbackForm: false,
+                                                     enablesUnifiedFeedbackForm: false,
                                                      subscriptionManager: subscriptionManager)
     }
 
diff --git a/DuckDuckGoTests/Subscription/SubscriptionFeatureAvailabilityMock.swift b/DuckDuckGoTests/Subscription/SubscriptionFeatureAvailabilityMock.swift
@@ -22,17 +22,15 @@ import Foundation
 
 public final class SubscriptionFeatureAvailabilityMock: SubscriptionFeatureAvailability {
     static var enabled: SubscriptionFeatureAvailabilityMock {
-        return SubscriptionFeatureAvailabilityMock(isFeatureAvailable: true, isSubscriptionPurchaseAllowed: true, usesUnifiedFeedbackForm: true)
+        return SubscriptionFeatureAvailabilityMock(isFeatureAvailable: true, isSubscriptionPurchaseAllowed: true)
     }
 
     public var isFeatureAvailable: Bool
     public var isSubscriptionPurchaseAllowed: Bool
-    public var usesUnifiedFeedbackForm: Bool
 
-    public init(isFeatureAvailable: Bool, isSubscriptionPurchaseAllowed: Bool, usesUnifiedFeedbackForm: Bool) {
+    public init(isFeatureAvailable: Bool, isSubscriptionPurchaseAllowed: Bool) {
         self.isFeatureAvailable = isFeatureAvailable
         self.isSubscriptionPurchaseAllowed = isSubscriptionPurchaseAllowed
-        self.usesUnifiedFeedbackForm = usesUnifiedFeedbackForm
     }
 
 }
diff --git a/DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift b/DuckDuckGoTests/Subscription/SubscriptionPagesUseSubscriptionFeatureTests.swift
@@ -319,8 +319,7 @@ final class SubscriptionPagesUseSubscriptionFeatureTests: XCTestCase {
         // Given
         let subscriptionFeatureAvailabilityWithoutPurchaseAllowed = SubscriptionFeatureAvailabilityMock(
             isFeatureAvailable: true,
-            isSubscriptionPurchaseAllowed: false,
-            usesUnifiedFeedbackForm: true
+            isSubscriptionPurchaseAllowed: false
         )
 
         feature = SubscriptionPagesUseSubscriptionFeature(subscriptionManager: subscriptionManager,

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct SettingsOthersView: View {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// Share Feedback`
`37`		`- if viewModel.usesUnifiedFeedbackForm {`
	`37`	`+ if viewModel.enablesUnifiedFeedbackForm {`
`38`	`38`	`let formViewModel = UnifiedFeedbackFormViewModel(subscriptionManager: viewModel.subscriptionManager,`
`39`	`39`	`apiService: DefaultAPIService(),`
`40`	`40`	`vpnMetadataCollector: DefaultVPNMetadataCollector(),`
Original file line number	Diff line number	Diff line change
`@@ -400,8 +400,8 @@ final class SettingsViewModel: ObservableObject {`
`400`	`400`	`legacyViewProvider.syncService.authState != .inactive ? .on : .off`
`401`	`401`	`}`
`402`	`402`
`403`		`- var usesUnifiedFeedbackForm: Bool {`
`404`		`- subscriptionManager.accountManager.isUserAuthenticated && subscriptionFeatureAvailability.usesUnifiedFeedbackForm`
	`403`	`+ var enablesUnifiedFeedbackForm: Bool {`
	`404`	`+ subscriptionManager.accountManager.isUserAuthenticated`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`// MARK: Default Init`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ struct SubscriptionSettingsView: View {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`@ViewBuilder var helpSection: some View {`
`204`		`- if viewModel.usesUnifiedFeedbackForm {`
	`204`	`+ if viewModel.enablesUnifiedFeedbackForm {`
`205`	`205`	`Section {`
`206`	`206`	`faqButton`
`207`	`207`	`supportButton`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {`
`54`	`54`	`statusObserver: statusObserver,`
`55`	`55`	`serverInfoObserver: serverInfoObserver,`
`56`	`56`	`locationListRepository: MockNetworkProtectionLocationListRepository(),`
`57`		`- usesUnifiedFeedbackForm: false,`
	`57`	`+ enablesUnifiedFeedbackForm: false,`
`58`	`58`	`subscriptionManager: subscriptionManager)`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,15 @@ import Foundation`
`22`	`22`
`23`	`23`	`public final class SubscriptionFeatureAvailabilityMock: SubscriptionFeatureAvailability {`
`24`	`24`	`static var enabled: SubscriptionFeatureAvailabilityMock {`
`25`		`- return SubscriptionFeatureAvailabilityMock(isFeatureAvailable: true, isSubscriptionPurchaseAllowed: true, usesUnifiedFeedbackForm: true)`
	`25`	`+ return SubscriptionFeatureAvailabilityMock(isFeatureAvailable: true, isSubscriptionPurchaseAllowed: true)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public var isFeatureAvailable: Bool`
`29`	`29`	`public var isSubscriptionPurchaseAllowed: Bool`
`30`		`- public var usesUnifiedFeedbackForm: Bool`
`31`	`30`
`32`		`- public init(isFeatureAvailable: Bool, isSubscriptionPurchaseAllowed: Bool, usesUnifiedFeedbackForm: Bool) {`
	`31`	`+ public init(isFeatureAvailable: Bool, isSubscriptionPurchaseAllowed: Bool) {`
`33`	`32`	`self.isFeatureAvailable = isFeatureAvailable`
`34`	`33`	`self.isSubscriptionPurchaseAllowed = isSubscriptionPurchaseAllowed`
`35`		`- self.usesUnifiedFeedbackForm = usesUnifiedFeedbackForm`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`}`