[MBL-1439] Remove 'Block Users' Feature Flag (#2059)

* remove flag * Update testRemoteConfigFeatureFlagToolsViewController.1.png
kickstarter · May 15, 2024 · 2d7d832 · 2d7d832
1 parent 761a562
commit 2d7d832
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 39 deletions.
diff --git a/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewController.swift b/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewController.swift
@@ -199,7 +199,6 @@ final class CommentRepliesViewController: UITableViewController, MessageBannerVi
 
   private func handleCommentCellHeaderTapped(in cell: UITableViewCell, _ author: Comment.Author) {
     guard
-      featureBlockUsersEnabled(),
       let currentUser = AppEnvironment.current.currentUser,
       String(currentUser.id) != author.id,
       !author.isBlocked

diff --git a/Kickstarter-iOS/Features/Comments/Controllers/CommentsViewController.swift b/Kickstarter-iOS/Features/Comments/Controllers/CommentsViewController.swift
@@ -271,7 +271,6 @@ extension CommentsViewController {
 extension CommentsViewController: CommentCellDelegate {
   func commentCellDidTapHeader(_ cell: CommentCell, _ author: Comment.Author) {
     guard
-      featureBlockUsersEnabled(),
       let currentUser = AppEnvironment.current.currentUser,
       String(currentUser.id) != author.id,
       !author.isBlocked

diff --git a/Kickstarter-iOS/Features/Comments/Views/Cells/CommentCell.swift b/Kickstarter-iOS/Features/Comments/Views/Cells/CommentCell.swift
@@ -141,9 +141,7 @@ final class CommentCell: UITableViewCell, ValueCell {
     self.viewRepliesView.isAccessibilityElement = true
     self.viewRepliesView.accessibilityTraits.insert(.button)
     self.commentCellHeaderStackView.isAccessibilityElement = true
-    if featureBlockUsersEnabled() {
-      self.commentCellHeaderStackView.accessibilityTraits.insert(.button)
-    }
+    self.commentCellHeaderStackView.accessibilityTraits.insert(.button)
     self.commentCellHeaderStackView.postTimeLabel.isAccessibilityElement = true
     self.bodyTextView.isAccessibilityElement = true
   }

diff --git a/Kickstarter-iOS/Features/Comments/Views/Cells/RootCommentCell.swift b/Kickstarter-iOS/Features/Comments/Views/Cells/RootCommentCell.swift
@@ -112,9 +112,7 @@ final class RootCommentCell: UITableViewCell, ValueCell {
       self.bodyTextView
     ]
     self.commentCellHeaderStackView.isAccessibilityElement = true
-    if featureBlockUsersEnabled() {
-      self.commentCellHeaderStackView.accessibilityTraits.insert(.button)
-    }
+    self.commentCellHeaderStackView.accessibilityTraits.insert(.button)
     self.commentCellHeaderStackView.postTimeLabel.isAccessibilityElement = true
     self.bodyTextView.isAccessibilityElement = true
   }

diff --git a/Kickstarter-iOS/Features/Messages/Controller/MessagesViewController.swift b/Kickstarter-iOS/Features/Messages/Controller/MessagesViewController.swift
@@ -225,7 +225,6 @@ extension MessagesViewController: BackingCellDelegate {
 extension MessagesViewController: MessageCellDelegate {
   func messageCellDidTapHeader(_ cell: MessageCell, _ user: User) {
     guard
-      featureBlockUsersEnabled(),
       let currentUser = AppEnvironment.current.currentUser,
       currentUser != user,
       !user.isBlocked

diff --git a/Kickstarter-iOS/Features/Messages/Views/Cells/MessageCell.swift b/Kickstarter-iOS/Features/Messages/Views/Cells/MessageCell.swift
@@ -37,9 +37,7 @@ internal final class MessageCell: UITableViewCell, ValueCell {
 
   private func configureAccessibilityElements() {
     self.participantStackView.isAccessibilityElement = true
-    if featureBlockUsersEnabled() {
-      self.participantStackView.accessibilityTraits.insert(.button)
-    }
+    self.participantStackView.accessibilityTraits.insert(.button)
     self.timestampLabel.isAccessibilityElement = true
     self.bodyTextView.isAccessibilityElement = true
     self.isAccessibilityElement = false

diff --git a/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift b/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift
@@ -992,7 +992,6 @@ extension ProjectPageViewController: ProjectPamphletMainCellDelegate {
     goToCreatorForProject project: Project
   ) {
     guard
-      featureBlockUsersEnabled(),
       let currentUser = AppEnvironment.current.currentUser,
       currentUser != project.creator,
       !project.creator.isBlocked

diff --git a/...agToolsViewControllerTests/testRemoteConfigFeatureFlagToolsViewController.1.png b/...agToolsViewControllerTests/testRemoteConfigFeatureFlagToolsViewController.1.png
diff --git a/Library/RemoteConfig/RemoteConfigFeature+Helpers.swift b/Library/RemoteConfig/RemoteConfigFeature+Helpers.swift
@@ -13,10 +13,6 @@ private func featureEnabled(feature: RemoteConfigFeature, defaultValue: Bool = f
   return defaultValue
 }
 
-public func featureBlockUsersEnabled() -> Bool {
-  return featureEnabled(feature: .blockUsersEnabled)
-}
-
 public func featureConsentManagementDialogEnabled() -> Bool {
   return featureEnabled(feature: .consentManagementDialogEnabled)
 }

diff --git a/Library/RemoteConfig/RemoteConfigFeature+HelpersTests.swift b/Library/RemoteConfig/RemoteConfigFeature+HelpersTests.swift
@@ -27,22 +27,6 @@ final class RemoteConfigFeatureHelpersTests: TestCase {
     }
   }
 
-  func testBlockUsers_RemoteConfig_FeatureFlag_False() {
-    self
-      .assert(
-        featureFlagIsFalse: featureBlockUsersEnabled,
-        whenRemoteConfigFeatureIsFalse: .blockUsersEnabled
-      )
-  }
-
-  func testBlockUsers_RemoteConfig_FeatureFlag_True() {
-    self
-      .assert(
-        featureFlagIsTrue: featureBlockUsersEnabled,
-        whenRemoteConfigFeatureIsTrue: .blockUsersEnabled
-      )
-  }
-
   func testConsentManagementDialog_RemoteConfig_FeatureFlag_False() {
     self
       .assert(

diff --git a/Library/RemoteConfig/RemoteConfigFeature.swift b/Library/RemoteConfig/RemoteConfigFeature.swift
@@ -1,7 +1,6 @@
 import Foundation
 
 public enum RemoteConfigFeature: String, CaseIterable {
-  case blockUsersEnabled = "block_users"
   case consentManagementDialogEnabled = "consent_management_dialog"
   case darkModeEnabled = "dark_mode"
   case facebookLoginInterstitialEnabled = "facebook_interstitial"
@@ -14,7 +13,6 @@ public enum RemoteConfigFeature: String, CaseIterable {
 extension RemoteConfigFeature: CustomStringConvertible {
   public var description: String {
     switch self {
-    case .blockUsersEnabled: return "Block Users"
     case .consentManagementDialogEnabled: return "Consent Management Dialog"
     case .darkModeEnabled: return "Dark Mode"
     case .facebookLoginInterstitialEnabled: return "Facebook Login Interstitial"

diff --git a/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModel.swift b/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModel.swift
@@ -85,8 +85,6 @@ public final class RemoteConfigFeatureFlagToolsViewModel: RemoteConfigFeatureFla
 
 private func isFeatureEnabled(_ feature: RemoteConfigFeature) -> Bool {
   switch feature {
-  case .blockUsersEnabled:
-    return featureBlockUsersEnabled()
   case .consentManagementDialogEnabled:
     return featureConsentManagementDialogEnabled()
   case .darkModeEnabled:

diff --git a/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModelTests.swift b/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModelTests.swift
@@ -86,7 +86,7 @@ final class RemoteConfigFlagToolsViewModelTests: TestCase {
   func testUpdateUserDefaultsWithFeatures_ReloadWithData_UserDefaultsIsUpdated() {
     let mockRemoteConfigClient = MockRemoteConfigClient()
       |> \.features .~ [
-        RemoteConfigFeature.blockUsersEnabled.rawValue: false
+        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: false
       ]
 
     withEnvironment(remoteConfigClient: mockRemoteConfigClient, userDefaults: userDefaults) {
@@ -112,7 +112,7 @@ final class RemoteConfigFlagToolsViewModelTests: TestCase {
         userDefaults
           .dictionary(forKey: "com.kickstarter.KeyValueStoreType.remoteConfigFeatureFlags") as? [String: Bool],
         [
-          RemoteConfigFeature.blockUsersEnabled.rawValue: true
+          RemoteConfigFeature.consentManagementDialogEnabled.rawValue: true
         ]
       )
     }