Remove Products M2 feature flag check from ProductFormBottomSheetListSelectorCommand because the bottom sheet is behind a M2 feature flag.

Author: jaclync

WooCommerce/Classes/ViewRelated/Products/Edit Product/BottomSheetListSelector/ProductFormBottomSheetListSelectorCommand.swift

@@ -13,18 +13,18 @@ final class ProductFormBottomSheetListSelectorCommand: BottomSheetListSelectorCo
     private let onSelection: (ProductFormBottomSheetAction) -> Void
 
     init(product: Product,
-         isEditProductsRelease2Enabled: Bool,
-         isEditProductsRelease3Enabled: Bool, onSelection: @escaping (ProductFormBottomSheetAction) -> Void) {
+         isEditProductsRelease3Enabled: Bool,
+         onSelection: @escaping (ProductFormBottomSheetAction) -> Void) {
         self.onSelection = onSelection
 
         let shouldShowShippingSettingsRow = product.isShippingEnabled
-        let shouldShowBriefDescriptionRow = isEditProductsRelease2Enabled
         let shouldShowCategoriesRow = isEditProductsRelease3Enabled
         let actions: [ProductFormBottomSheetAction?] = [
             .editInventorySettings,
             shouldShowShippingSettingsRow ? .editShippingSettings: nil,
             shouldShowCategoriesRow ? .editCategories: nil,
-            shouldShowBriefDescriptionRow ? .editBriefDescription: nil]
+            .editBriefDescription
+        ]
         self.data = actions.compactMap({ $0 })
     }
 

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

@@ -188,10 +188,8 @@ private extension ProductFormViewController {
     func moreDetailsButtonTapped(button: UIButton) {
         let title = NSLocalizedString("Add more details", comment: "")
         let viewProperties = BottomSheetListSelectorViewProperties(title: title)
-        let isEditProductsRelease2Enabled = featureFlagService.isFeatureFlagEnabled(.editProductsRelease2)
         let isEditProductsRelease3Enabled = featureFlagService.isFeatureFlagEnabled(.editProductsRelease3)
         let dataSource = ProductFormBottomSheetListSelectorCommand(product: product,
-                                                                   isEditProductsRelease2Enabled: isEditProductsRelease2Enabled,
                                                                    isEditProductsRelease3Enabled: isEditProductsRelease3Enabled) { [weak self] action in
                                                                     self?.dismiss(animated: true) { [weak self] in
                                                                         switch action {