Remove FXIOS-6745 [v123] Remove .wallpaperOnboardingSheet feature flag (

#18062)
mozilla-mobile · Jan 9, 2024 · 5b9594d · 5b9594d
1 parent 0754384
commit 5b9594d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 34 deletions.
diff --git a/firefox-ios/Client/FeatureFlags/NimbusFlaggableFeature.swift b/firefox-ios/Client/FeatureFlags/NimbusFlaggableFeature.swift
@@ -32,7 +32,6 @@ enum NimbusFeatureFlagID: String, CaseIterable {
     case shareSheetChanges
     case shareToolbarChanges
     case tabTrayRefactor
-    case wallpaperOnboardingSheet
     case zoomFeature
 }
 
@@ -81,7 +80,6 @@ struct NimbusFlaggableFeature: HasNimbusSearchBar {
                 .shareSheetChanges,
                 .shareToolbarChanges,
                 .tabTrayRefactor,
-                .wallpaperOnboardingSheet,
                 .zoomFeature:
             return nil
         }

diff --git a/firefox-ios/Client/Frontend/Home/Wallpapers/v1/Interface/WallpaperManager.swift b/firefox-ios/Client/Frontend/Home/Wallpapers/v1/Interface/WallpaperManager.swift
@@ -71,9 +71,7 @@ class WallpaperManager: WallpaperManagerInterface, FeatureFlaggable {
 
         guard cfrsHaveBeenShown,
               hasEnoughThumbnailsToShow,
-              !userDefaults.bool(forKey: PrefsKeys.Wallpapers.OnboardingSeenKey),
-              featureFlags.isFeatureEnabled(.wallpaperOnboardingSheet,
-                                            checking: .buildOnly)
+              !userDefaults.bool(forKey: PrefsKeys.Wallpapers.OnboardingSeenKey)
         else { return false }
 
         return true

diff --git a/firefox-ios/Client/Frontend/Home/Wallpapers/v1/Utilities/WallpaperMigrationUtility.swift b/firefox-ios/Client/Frontend/Home/Wallpapers/v1/Utilities/WallpaperMigrationUtility.swift
@@ -106,8 +106,4 @@ struct WallpaperMigrationUtility {
     private func markMetadataMigrationComplete() {
         userDefaults.set(true, forKey: metadataMigration)
     }
-
-    private func markLegacyAssetMigrationComplete() {
-        userDefaults.set(true, forKey: metadataMigration)
-    }
 }
diff --git a/firefox-ios/Client/Nimbus/NimbusFeatureFlagLayer.swift b/firefox-ios/Client/Nimbus/NimbusFeatureFlagLayer.swift
@@ -66,9 +66,6 @@ final class NimbusFeatureFlagLayer {
         case .tabTrayRefactor:
             return checkTabTrayRefactorFeature(from: nimbus)
 
-        case .wallpaperOnboardingSheet:
-            return checkNimbusForWallpaperOnboarding(using: nimbus)
-
         case .zoomFeature:
             return checkZoomFeature(from: nimbus)
         }
@@ -137,10 +134,6 @@ final class NimbusFeatureFlagLayer {
         return status
     }
 
-    private func checkNimbusForWallpaperOnboarding(using nimbus: FxNimbus) -> Bool {
-        return nimbus.features.wallpaperFeature.value().onboardingSheet
-    }
-
     private func checkQRCodeCoordinatorRefactorFeature(from nimbus: FxNimbus) -> Bool {
         return nimbus.features.qrCodeCoordinatorRefactor.value().enabled
     }

diff --git a/firefox-ios/nimbus-features/wallpaperFeature.yaml b/firefox-ios/nimbus-features/wallpaperFeature.yaml
diff --git a/firefox-ios/nimbus.fml.yaml b/firefox-ios/nimbus.fml.yaml
@@ -31,5 +31,4 @@ include:
   - nimbus-features/spotlightSearchFeature.yaml
   - nimbus-features/tabTrayFeature.yaml
   - nimbus-features/tabTrayRefactorFeature.yaml
-  - nimbus-features/wallpaperFeature.yaml
   - nimbus-features/zoomFeature.yaml