Refactor FXIOS-12703 [Homepage Redesign - Stories] Unify section removal under stories flag (backport #27806) (#27827)

mergify[bot] · Foxbolts · web-flow · commit e47e85bc6cb9 · 2025-07-08T13:45:34.000-04:00
* Refactor FXIOS-12703 [Homepage Redesign - Stories] Unify section removal under stories flag (#27806) (cherry picked from commit 9df533e) Co-authored-by: Foxbolts <foxbolts3@gmail.com>
diff --git a/firefox-ios/Client/FeatureFlags/NimbusFlaggableFeature.swift b/firefox-ios/Client/FeatureFlags/NimbusFlaggableFeature.swift
@@ -21,10 +21,7 @@ enum NimbusFeatureFlagID: String, CaseIterable {
     case feltPrivacyFeltDeletion
     case feltPrivacySimplifiedUI
     case firefoxSuggestFeature
-    case hntBookmarksSection
     case hntContentFeedRefresh
-    case hntCusomizationSection
-    case hntJumpBackInSection
     case hntSponsoredShortcuts
     case hntTopSitesVisualRefresh
     case homepageRebuild
@@ -123,10 +120,6 @@ struct NimbusFlaggableFeature: HasNimbusSearchBar {
             return FlagKeys.SearchBarPosition
         case .firefoxSuggestFeature:
             return FlagKeys.FirefoxSuggest
-        case .hntBookmarksSection:
-            return FlagKeys.BookmarksSection
-        case .hntJumpBackInSection:
-            return FlagKeys.JumpBackInSection
         case .hntSponsoredShortcuts:
             return FlagKeys.SponsoredShortcuts
         case .inactiveTabs:
@@ -146,7 +139,6 @@ struct NimbusFlaggableFeature: HasNimbusSearchBar {
                 .feltPrivacyFeltDeletion,
                 .feltPrivacySimplifiedUI,
                 .hntContentFeedRefresh,
-                .hntCusomizationSection,
                 .hntTopSitesVisualRefresh,
                 .homepageRebuild,
                 .homepageRedesign,
diff --git a/firefox-ios/Client/Frontend/Home/Bookmarks/BookmarksViewModel.swift b/firefox-ios/Client/Frontend/Home/Bookmarks/BookmarksViewModel.swift
@@ -111,7 +111,7 @@ extension BookmarksViewModel: HomepageViewModelProtocol, FeatureFlaggable {
     }
 
     var isEnabled: Bool {
-        return featureFlags.isFeatureEnabled(.hntBookmarksSection, checking: .userOnly)
+        return !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)
     }
 
     var hasData: Bool {
diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/Bookmark/BookmarksSectionState.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/Bookmark/BookmarksSectionState.swift
@@ -21,8 +21,8 @@ struct BookmarksSectionState: StateType, Equatable, Hashable {
     )
 
     init(profile: Profile = AppContainer.shared.resolve(), windowUUID: WindowUUID) {
-        let shouldShowSection = LegacyFeatureFlagsManager.shared.isFeatureEnabled(.hntBookmarksSection,
-                                                                                  checking: .userOnly)
+        let shouldShowSection = !LegacyFeatureFlagsManager.shared.isFeatureEnabled(.homepageStoriesRedesign,
+                                                                                   checking: .buildOnly)
         self.init(
             windowUUID: windowUUID,
             bookmarks: [],
diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageDiffableDataSource.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageDiffableDataSource.swift
@@ -119,7 +119,7 @@ final class HomepageDiffableDataSource:
             snapshot.appendItems(stories, toSection: .pocket(textColor))
         }
 
-        if featureFlags.isFeatureEnabled(.hntCusomizationSection, checking: .buildOnly) {
+        if !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly) {
             snapshot.appendSections([.customizeHomepage])
             snapshot.appendItems([.customizeHomepage], toSection: .customizeHomepage)
         }
diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/JumpBackIn/JumpBackInSectionState.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/JumpBackIn/JumpBackInSectionState.swift
@@ -27,8 +27,8 @@ struct JumpBackInSectionState: StateType, Equatable, Hashable {
         windowUUID: WindowUUID
     ) {
         // TODO: FXIOS-11412 / 11226 - Move profile dependency and show section also based on feature flags
-        let shouldShowSection = LegacyFeatureFlagsManager.shared.isFeatureEnabled(.hntJumpBackInSection,
-                                                                                  checking: .userOnly)
+        let shouldShowSection = !LegacyFeatureFlagsManager.shared.isFeatureEnabled(.homepageStoriesRedesign,
+                                                                                   checking: .buildOnly)
         self.init(
             windowUUID: windowUUID,
             jumpBackInTabs: [],
diff --git a/firefox-ios/Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift b/firefox-ios/Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift
@@ -307,7 +307,7 @@ extension JumpBackInViewModel: HomepageViewModelProtocol {
     }
 
     var isEnabled: Bool {
-        let isEnabled = featureFlags.isFeatureEnabled(.hntJumpBackInSection, checking: .userOnly)
+        let isEnabled = !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)
         return !isPrivate && isEnabled
     }
 
diff --git a/firefox-ios/Client/Frontend/Settings/HomepageSettings/HomePageSettingViewController.swift b/firefox-ios/Client/Frontend/Settings/HomepageSettings/HomePageSettingViewController.swift
@@ -128,7 +128,7 @@ class HomePageSettingViewController: SettingsTableViewController, FeatureFlaggab
                 prefs: profile.prefs,
                 theme: themeManager.getCurrentTheme(for: windowUUID),
                 prefKey: PrefsKeys.FeatureFlags.JumpBackInSection,
-                defaultValue: featureFlags.isFeatureEnabled(.hntJumpBackInSection, checking: .userOnly),
+                defaultValue: !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly),
                 titleText: .Settings.Homepage.CustomizeFirefoxHome.JumpBackIn
             ) { value in
                 store.dispatchLegacy(
@@ -145,7 +145,7 @@ class HomePageSettingViewController: SettingsTableViewController, FeatureFlaggab
                 prefs: profile.prefs,
                 theme: themeManager.getCurrentTheme(for: windowUUID),
                 prefKey: PrefsKeys.FeatureFlags.BookmarksSection,
-                defaultValue: featureFlags.isFeatureEnabled(.hntBookmarksSection, checking: .userOnly),
+                defaultValue: !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly),
                 titleText: .Settings.Homepage.CustomizeFirefoxHome.Bookmarks
             ) { value in
                 store.dispatchLegacy(
diff --git a/firefox-ios/Client/Nimbus/NimbusFeatureFlagLayer.swift b/firefox-ios/Client/Nimbus/NimbusFeatureFlagLayer.swift
@@ -41,18 +41,9 @@ final class NimbusFeatureFlagLayer {
         case .feltPrivacySimplifiedUI, .feltPrivacyFeltDeletion:
             return checkFeltPrivacyFeature(for: featureID, from: nimbus)
 
-        case .hntBookmarksSection:
-            return checkHNTBookmarksSectionFeature(from: nimbus)
-
         case .hntContentFeedRefresh:
             return checkHNTContentFeedRefreshFeature(from: nimbus)
 
-        case .hntCusomizationSection:
-            return checkHNTCustomizationSectionFeature(from: nimbus)
-
-        case .hntJumpBackInSection:
-             return checkHNTJumpBackInSectionFeature(from: nimbus)
-
         case .hntSponsoredShortcuts:
             return checkHNTSponsoredShortcutsFeature(from: nimbus)
 
@@ -206,22 +197,10 @@ final class NimbusFeatureFlagLayer {
         }
     }
 
-    private func checkHNTBookmarksSectionFeature(from nimbus: FxNimbus) -> Bool {
-        return nimbus.features.hntBookmarksSectionFeature.value().enabled
-    }
-
     private func checkHNTContentFeedRefreshFeature(from nimbus: FxNimbus) -> Bool {
         return nimbus.features.hntContentFeedCleanupFeature.value().enabled
     }
 
-    private func checkHNTCustomizationSectionFeature(from nimbus: FxNimbus) -> Bool {
-        return nimbus.features.hntCustomizationSectionFeature.value().enabled
-    }
-
-    private func checkHNTJumpBackInSectionFeature(from nimbus: FxNimbus) -> Bool {
-        return nimbus.features.hntJumpBackInSectionFeature.value().enabled
-    }
-
     private func checkHNTSponsoredShortcutsFeature(from nimbus: FxNimbus) -> Bool {
         return nimbus.features.hntSponsoredShortcutsFeature.value().enabled
     }
diff --git a/firefox-ios/Client/Telemetry/TelemetryWrapper.swift b/firefox-ios/Client/Telemetry/TelemetryWrapper.swift
@@ -305,10 +305,10 @@ class TelemetryWrapper: TelemetryWrapperProtocol, FeatureFlaggable {
         }
 
         // Homepage section preferences
-        let isJumpBackInEnabled = featureFlags.isFeatureEnabled(.hntJumpBackInSection, checking: .userOnly)
+        let isJumpBackInEnabled = !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)
         GleanMetrics.Preferences.jumpBackIn.set(isJumpBackInEnabled)
 
-        let isBookmarksEnabled = featureFlags.isFeatureEnabled(.hntBookmarksSection, checking: .userOnly)
+        let isBookmarksEnabled = !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)
         GleanMetrics.Preferences.recentlySaved.set(isBookmarksEnabled)
 
         let isFeatureEnabled = prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.ASPocketStories) ?? true
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/HomepageDiffableDataSourceTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/HomepageDiffableDataSourceTests.swift
@@ -35,7 +35,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
 
     // MARK: - applyInitialSnapshot
     func test_updateSnapshot_hasCorrectData() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
 
         dataSource.updateSnapshot(
@@ -90,7 +90,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
     }
 
     func test_updateSnapshot_withValidState_returnTopSites() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
 
         let state = HomepageState.reducer(
@@ -123,7 +123,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
     }
 
     func test_updateSnapshot_withValidState_returnPocketStories() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
 
         let state = HomepageState.reducer(
@@ -147,7 +147,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
     }
 
     func test_updateSnapshot_withValidState_returnMessageCard() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
         let configuration = MessageCardConfiguration(
             title: "Example Title",
@@ -177,7 +177,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
     }
 
     func test_updateSnapshot_withValidState_returnBookmarks() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
 
         let state = HomepageState.reducer(
@@ -207,7 +207,7 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
     }
 
     func test_updateSnapshot_withValidState_returnJumpBackInSection() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
         let dataSource = try XCTUnwrap(diffableDataSource)
 
         let state = HomepageState.reducer(
@@ -230,8 +230,8 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
         XCTAssertEqual(snapshot.sectionIdentifiers, expectedSections)
     }
 
-    func test_cusomizationSectionFlagEnabled_returnsExpectedSections() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: true)
+    func test_customizationSectionShown_returnsExpectedSections() throws {
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
 
         let dataSource = try XCTUnwrap(diffableDataSource)
         let state = HomepageState(windowUUID: .XCTestDefaultUUID)
@@ -243,8 +243,8 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
         XCTAssertEqual(snapshot.sectionIdentifiers, expectedSections)
     }
 
-    func test_customizationSectionFlagDisabled_returnsExpectedSections() throws {
-        setupNimbusHNTCustomizationSectionTesting(isEnabled: false)
+    func test_customizationSectionHidden_returnsExpectedSections() throws {
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: true)
 
         let dataSource = try XCTUnwrap(diffableDataSource)
         let state = HomepageState(windowUUID: .XCTestDefaultUUID)
@@ -294,10 +294,10 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
         return tab
     }
 
-    private func setupNimbusHNTCustomizationSectionTesting(isEnabled: Bool) {
-        FxNimbus.shared.features.hntCustomizationSectionFeature.with { _, _ in
-            return HntCustomizationSectionFeature(
-                enabled: isEnabled
+    private func setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: Bool) {
+        FxNimbus.shared.features.homepageRedesignFeature.with { _, _ in
+            return HomepageRedesignFeature(
+                storiesRedesign: storiesRedesignEnabled
             )
         }
     }
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/Redux/BookmarksSectionStateTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/Redux/BookmarksSectionStateTests.swift
@@ -102,56 +102,20 @@ final class BookmarksSectionStateTests: XCTestCase {
         XCTAssertFalse(newState.shouldShowSection)
     }
 
-    func test_sectionFlagEnabled_withoutUserPref_returnsExpectedState() {
-        setupNimbusHNTBookmarksSectionTesting(isEnabled: true)
+    func test_sectionShown_returnsExpectedState() {
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: false)
 
         let initialState = createSubject()
         XCTAssertTrue(initialState.shouldShowSection)
     }
 
-    func test_sectionFlagDisabled_withoutUserPref_returnsExpectedState() {
-        setupNimbusHNTBookmarksSectionTesting(isEnabled: false)
+    func test_sectionHidden_returnsExpectedState() {
+        setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: true)
 
         let initialState = createSubject()
         XCTAssertFalse(initialState.shouldShowSection)
     }
 
-    func test_sectionFlagEnabled_withUserPref_returnsExpectedState() {
-        setupNimbusHNTBookmarksSectionTesting(isEnabled: true)
-
-        let initialState = createSubject()
-        let reducer = bookmarksSectionReducer()
-
-        // Updates the bookmarks section user pref
-        let newState = reducer(
-            initialState,
-            BookmarksAction(
-                isEnabled: false,
-                windowUUID: .XCTestDefaultUUID,
-                actionType: BookmarksActionType.toggleShowSectionSetting
-            )
-        )
-        XCTAssertFalse(newState.shouldShowSection)
-    }
-
-    func test_sectionFlagDisabled_withUserPref_returnsExpectedState() {
-        setupNimbusHNTBookmarksSectionTesting(isEnabled: false)
-
-        let initialState = createSubject()
-        let reducer = bookmarksSectionReducer()
-
-        // Updates the bookmarks section user pref
-        let newState = reducer(
-            initialState,
-            BookmarksAction(
-                isEnabled: true,
-                windowUUID: .XCTestDefaultUUID,
-                actionType: BookmarksActionType.toggleShowSectionSetting
-            )
-        )
-        XCTAssertTrue(newState.shouldShowSection)
-    }
-
     // MARK: - Private
     private func createSubject() -> BookmarksSectionState {
         return BookmarksSectionState(windowUUID: .XCTestDefaultUUID)
@@ -161,10 +125,10 @@ final class BookmarksSectionStateTests: XCTestCase {
         return BookmarksSectionState.reducer
     }
 
-    private func setupNimbusHNTBookmarksSectionTesting(isEnabled: Bool) {
-        FxNimbus.shared.features.hntBookmarksSectionFeature.with { _, _ in
-            return HntBookmarksSectionFeature(
-                enabled: isEnabled
+    private func setupNimbusHomepageRedesignTesting(storiesRedesignEnabled: Bool) {
+        FxNimbus.shared.features.homepageRedesignFeature.with { _, _ in
+            return HomepageRedesignFeature(
+                storiesRedesign: storiesRedesignEnabled
             )
         }
     }
diff --git a/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/Redux/JumpBackInSectionStateTests.swift b/firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage Rebuild/Redux/JumpBackInSectionStateTests.swift
diff --git a/firefox-ios/nimbus-features/hntBookmarksSectionFeature.yaml b/firefox-ios/nimbus-features/hntBookmarksSectionFeature.yaml
diff --git a/firefox-ios/nimbus-features/hntCustomizationSectionFeature.yaml b/firefox-ios/nimbus-features/hntCustomizationSectionFeature.yaml
diff --git a/firefox-ios/nimbus-features/hntJumpBackInSectionFeature.yaml b/firefox-ios/nimbus-features/hntJumpBackInSectionFeature.yaml
diff --git a/firefox-ios/nimbus.fml.yaml b/firefox-ios/nimbus.fml.yaml

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ extension BookmarksViewModel: HomepageViewModelProtocol, FeatureFlaggable {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`var isEnabled: Bool {`
`114`		`- return featureFlags.isFeatureEnabled(.hntBookmarksSection, checking: .userOnly)`
	`114`	`+ return !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`var hasData: Bool {`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ final class HomepageDiffableDataSource:`
`119`	`119`	`snapshot.appendItems(stories, toSection: .pocket(textColor))`
`120`	`120`	`}`
`121`	`121`
`122`		`- if featureFlags.isFeatureEnabled(.hntCusomizationSection, checking: .buildOnly) {`
	`122`	`+ if !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly) {`
`123`	`123`	`snapshot.appendSections([.customizeHomepage])`
`124`	`124`	`snapshot.appendItems([.customizeHomepage], toSection: .customizeHomepage)`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ extension JumpBackInViewModel: HomepageViewModelProtocol {`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`var isEnabled: Bool {`
`310`		`- let isEnabled = featureFlags.isFeatureEnabled(.hntJumpBackInSection, checking: .userOnly)`
	`310`	`+ let isEnabled = !featureFlags.isFeatureEnabled(.homepageStoriesRedesign, checking: .buildOnly)`
`311`	`311`	`return !isPrivate && isEnabled`
`312`	`312`	`}`
`313`	`313`