Merge pull request #7676 from woocommerce/issue/7605-remove-appleIDAccDeletion-feature-flag

Remove `appleIDAccountDeletion` feature flag

Author: iamgabrielma

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -19,8 +19,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .shippingLabelsOnboardingM1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .appleIDAccountDeletion:
-            return true
         case .newToWooCommerceLinkInLoginPrologue:
             return true
         case .loginPrologueOnboarding:

Experiments/Experiments/FeatureFlag.swift

@@ -42,10 +42,6 @@ public enum FeatureFlag: Int {
     ///
     case consolidatedCardReaderManuals
 
-    /// Apple ID account deletion
-    ///
-    case appleIDAccountDeletion
-
     /// Showing a "New to WooCommerce" link in the login prologue screen
     ///
     case newToWooCommerceLinkInLoginPrologue

WooCommerce/Classes/Authentication/Epilogue/StorePickerViewController.swift

@@ -637,7 +637,6 @@ extension StorePickerViewController: UITableViewDataSource {
             hideActionButton()
             let cell = tableView.dequeueReusableCell(EmptyStoresTableViewCell.self, for: indexPath)
             let isRemoveAppleIDAccessButtonVisible = appleIDCredentialChecker.hasAppleUserID()
-            && featureFlagService.isFeatureFlagEnabled(.appleIDAccountDeletion)
             cell.updateRemoveAppleIDAccessButtonVisibility(isVisible: isRemoveAppleIDAccessButtonVisible)
             if isRemoveAppleIDAccessButtonVisible {
                 cell.onCloseAccountButtonTapped = { [weak self] in

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

@@ -272,7 +272,7 @@ private extension SettingsViewModel {
 
         // Remove Apple ID Access
         let removeAppleIDAccessSection: Section? = {
-            guard appleIDCredentialChecker.hasAppleUserID(), featureFlagService.isFeatureFlagEnabled(.appleIDAccountDeletion) else {
+            guard appleIDCredentialChecker.hasAppleUserID() else {
                 return nil
             }
             return Section(title: nil,

WooCommerce/WooCommerceTests/Mocks/MockFeatureFlagService.swift

@@ -6,20 +6,17 @@ struct MockFeatureFlagService: FeatureFlagService {
     private let isSplitViewInOrdersTabOn: Bool
     private let isUpdateOrderOptimisticallyOn: Bool
     private let shippingLabelsOnboardingM1: Bool
-    private let isAppleIDAccountDeletionEnabled: Bool
     private let isLoginPrologueOnboardingEnabled: Bool
 
     init(isInboxOn: Bool = false,
          isSplitViewInOrdersTabOn: Bool = false,
          isUpdateOrderOptimisticallyOn: Bool = false,
          shippingLabelsOnboardingM1: Bool = false,
-         isAppleIDAccountDeletionEnabled: Bool = false,
          isLoginPrologueOnboardingEnabled: Bool = false) {
         self.isInboxOn = isInboxOn
         self.isSplitViewInOrdersTabOn = isSplitViewInOrdersTabOn
         self.isUpdateOrderOptimisticallyOn = isUpdateOrderOptimisticallyOn
         self.shippingLabelsOnboardingM1 = shippingLabelsOnboardingM1
-        self.isAppleIDAccountDeletionEnabled = isAppleIDAccountDeletionEnabled
         self.isLoginPrologueOnboardingEnabled = isLoginPrologueOnboardingEnabled
     }
 
@@ -33,8 +30,6 @@ struct MockFeatureFlagService: FeatureFlagService {
             return isUpdateOrderOptimisticallyOn
         case .shippingLabelsOnboardingM1:
             return shippingLabelsOnboardingM1
-        case .appleIDAccountDeletion:
-            return isAppleIDAccountDeletionEnabled
         case .loginPrologueOnboarding:
             return isLoginPrologueOnboardingEnabled
         default:

WooCommerce/WooCommerceTests/ViewRelated/Settings/SettingsViewModelTests.swift

@@ -140,11 +140,9 @@ final class SettingsViewModelTests: XCTestCase {
 
     func test_removeAppleIDAccess_section_is_shown_when_user_apple_id_exists() {
         // Given
-        let featureFlagService = MockFeatureFlagService(isAppleIDAccountDeletionEnabled: true)
         let appleIDCredentialChecker = MockAppleIDCredentialChecker(hasAppleUserID: true)
         let viewModel = SettingsViewModel(stores: stores,
                                           storageManager: storageManager,
-                                          featureFlagService: featureFlagService,
                                           appleIDCredentialChecker: appleIDCredentialChecker)
 
         // When
@@ -156,27 +154,9 @@ final class SettingsViewModelTests: XCTestCase {
 
     func test_removeAppleIDAccess_section_is_not_shown_when_user_apple_id_does_not_exist() {
         // Given
-        let featureFlagService = MockFeatureFlagService(isAppleIDAccountDeletionEnabled: true)
         let appleIDCredentialChecker = MockAppleIDCredentialChecker(hasAppleUserID: false)
         let viewModel = SettingsViewModel(stores: stores,
                                           storageManager: storageManager,
-                                          featureFlagService: featureFlagService,
-                                          appleIDCredentialChecker: appleIDCredentialChecker)
-
-        // When
-        viewModel.onViewDidLoad()
-
-        // Then
-        XCTAssertFalse(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.removeAppleIDAccess) })
-    }
-
-    func test_removeAppleIDAccess_section_is_not_shown_when_user_apple_id_exists_but_feature_flag_disabled() {
-        // Given
-        let featureFlagService = MockFeatureFlagService(isAppleIDAccountDeletionEnabled: false)
-        let appleIDCredentialChecker = MockAppleIDCredentialChecker(hasAppleUserID: true)
-        let viewModel = SettingsViewModel(stores: stores,
-                                          storageManager: storageManager,
-                                          featureFlagService: featureFlagService,
                                           appleIDCredentialChecker: appleIDCredentialChecker)
 
         // When