Merge pull request #2286 from woocommerce/issue/2284-m3-feature-off

jaclync · web-flow · commit 4220aa2efb8e · 2020-05-15T08:49:01.000+08:00
Fix the potential empty more details bottom sheet when Products M3 feature flag is off
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift
@@ -287,7 +287,9 @@ private extension ProductFormViewController {
             return
         }
 
-        let moreDetailsActions: [ProductFormBottomSheetAction] = [.editInventorySettings, .editShippingSettings, .editCategories, .editBriefDescription]
+        let moreDetailsActions: [ProductFormBottomSheetAction] = isEditProductsRelease3Enabled ?
+            [.editInventorySettings, .editShippingSettings, .editCategories, .editBriefDescription]:
+            [.editInventorySettings, .editShippingSettings, .editBriefDescription]
         let hasVisibleActions = moreDetailsActions.map({ $0.isVisible(product: product) }).contains(true)
         moreDetailsContainerView.isHidden = hasVisibleActions == false
     }

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,9 @@ private extension ProductFormViewController {`
`287`	`287`	`return`
`288`	`288`	`}`
`289`	`289`
`290`		`- let moreDetailsActions: [ProductFormBottomSheetAction] = [.editInventorySettings, .editShippingSettings, .editCategories, .editBriefDescription]`
	`290`	`+ let moreDetailsActions: [ProductFormBottomSheetAction] = isEditProductsRelease3Enabled ?`
	`291`	`+ [.editInventorySettings, .editShippingSettings, .editCategories, .editBriefDescription]:`
	`292`	`+ [.editInventorySettings, .editShippingSettings, .editBriefDescription]`
`291`	`293`	`let hasVisibleActions = moreDetailsActions.map({ $0.isVisible(product: product) }).contains(true)`
`292`	`294`	`moreDetailsContainerView.isHidden = hasVisibleActions == false`
`293`	`295`	`}`