Merge branch 'main' into brindy/easier-page-zoom

# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGoTests/MockFeatureFlagger.swift
duckduckgo · Nov 14, 2024 · de126b3 · de126b3
2 parents d2f6ab4 + 3feecaf
commit de126b3
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 60 deletions.
diff --git a/Core/FeatureFlag.swift b/Core/FeatureFlag.swift
@@ -55,7 +55,11 @@ public enum FeatureFlag: String {
     case networkProtectionEnforceRoutes
 }
 
-extension FeatureFlag: FeatureFlagSourceProviding {
+extension FeatureFlag: FeatureFlagDescribing {
+    public var supportsLocalOverriding: Bool {
+        false
+    }
+
     public var source: FeatureFlagSource {
         switch self {
         case .debugMenu:
@@ -120,6 +124,6 @@ extension FeatureFlag: FeatureFlagSourceProviding {
 
 extension FeatureFlagger {
     public func isFeatureOn(_ featureFlag: FeatureFlag) -> Bool {
-        return isFeatureOn(forProvider: featureFlag)
+        return isFeatureOn(for: featureFlag)
     }
 }