Remove checks for order creation experimental toggle

Author: rachelmcr

WooCommerce/Classes/ViewRelated/Orders/Order Creation/FlowCoordinator/AddOrderCoordinator.swift

@@ -6,7 +6,6 @@ final class AddOrderCoordinator: Coordinator {
     var navigationController: UINavigationController
 
     private let siteID: Int64
-    private let isOrderCreationEnabled: Bool
     private let sourceBarButtonItem: UIBarButtonItem?
     private let sourceView: UIView?
 
@@ -15,22 +14,18 @@ final class AddOrderCoordinator: Coordinator {
     var onOrderCreated: (Order) -> Void = { _ in }
 
     init(siteID: Int64,
-         isOrderCreationEnabled: Bool,
          sourceBarButtonItem: UIBarButtonItem,
          sourceNavigationController: UINavigationController) {
         self.siteID = siteID
-        self.isOrderCreationEnabled = isOrderCreationEnabled
         self.sourceBarButtonItem = sourceBarButtonItem
         self.sourceView = nil
         self.navigationController = sourceNavigationController
     }
 
     init(siteID: Int64,
-         isOrderCreationEnabled: Bool,
          sourceView: UIView,
          sourceNavigationController: UINavigationController) {
         self.siteID = siteID
-        self.isOrderCreationEnabled = isOrderCreationEnabled
         self.sourceBarButtonItem = nil
         self.sourceView = sourceView
         self.navigationController = sourceNavigationController
@@ -41,11 +36,7 @@ final class AddOrderCoordinator: Coordinator {
     }
 
     func start() {
-        if isOrderCreationEnabled {
-            presentOrderTypeBottomSheet()
-        } else {
-            presentOrderCreationFlow(bottomSheetOrderType: .simple)
-        }
+        presentOrderTypeBottomSheet()
     }
 }
 

WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift

@@ -54,10 +54,6 @@ final class OrdersRootViewController: UIViewController {
         }
     }
 
-    /// Stores status for order creation availability.
-    ///
-    private var isOrderCreationEnabled: Bool = false
-
     private let storageManager: StorageManagerType
 
     /// Used for looking up the `OrderStatus` to show in the `Order Filters`.
@@ -97,6 +93,7 @@ final class OrdersRootViewController: UIViewController {
         super.viewDidLoad()
         configureTitle()
         configureView()
+        configureNavigationButtons()
         configureFiltersBar()
         configureChildViewController()
 
@@ -112,9 +109,6 @@ final class OrdersRootViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        // Needed in ViewWillAppear because this View Controller is never recreated.
-        fetchExperimentalTogglesAndConfigureNavigationButtons()
-
         ServiceLocator.pushNotesManager.resetBadgeCount(type: .storeOrder)
     }
 
@@ -207,9 +201,9 @@ private extension OrdersRootViewController {
     /// Search: Is always present.
     /// Add: Always present.
     ///
-    func configureNavigationButtons(isOrderCreationExperimentalToggleEnabled: Bool) {
+    func configureNavigationButtons() {
         let buttons: [UIBarButtonItem] = [
-            createAddOrderItem(isOrderCreationEnabled: isOrderCreationExperimentalToggleEnabled),
+            createAddOrderItem(),
             createSearchBarButtonItem()
         ]
         navigationItem.rightBarButtonItems = buttons
@@ -244,24 +238,6 @@ private extension OrdersRootViewController {
         ordersViewController.didMove(toParent: self)
     }
 
-    /// Fetches the latest values of order-related experimental feature toggles and re configures navigation buttons.
-    ///
-    func fetchExperimentalTogglesAndConfigureNavigationButtons() {
-        let group = DispatchGroup()
-        var isOrderCreationEnabled = false
-
-        group.enter()
-        let orderCreationAction = AppSettingsAction.loadOrderCreationSwitchState { result in
-            isOrderCreationEnabled = (try? result.get()) ?? false
-            group.leave()
-        }
-        ServiceLocator.stores.dispatch(orderCreationAction)
-
-        group.notify(queue: .main) { [weak self] in
-            self?.configureNavigationButtons(isOrderCreationExperimentalToggleEnabled: isOrderCreationEnabled)
-        }
-    }
-
     /// Connect hooks on `ResultsController` and query cached data.
     /// This is useful for stay up to date with the remote statuses, resetting the filters if one of the local status filters was deleted remotely.
     ///
@@ -354,22 +330,14 @@ private extension OrdersRootViewController {
 
     /// Create a `UIBarButtonItem` to be used as a way to create a new order.
     ///
-    func createAddOrderItem(isOrderCreationEnabled: Bool) -> UIBarButtonItem {
-        self.isOrderCreationEnabled = isOrderCreationEnabled
-
+    func createAddOrderItem() -> UIBarButtonItem {
         let button = UIBarButtonItem(image: .plusBarButtonItemImage,
                                      style: .plain,
                                      target: self,
                                      action: #selector(presentOrderCreationFlow(sender:)))
         button.accessibilityTraits = .button
-
-        if isOrderCreationEnabled {
-            button.accessibilityLabel = NSLocalizedString("Choose new order type", comment: "Opens action sheet to choose a type of a new order")
-            button.accessibilityIdentifier = "new-order-type-sheet-button"
-        } else {
-            button.accessibilityLabel = NSLocalizedString("Add simple payments order", comment: "Navigates to a screen to create a simple payments order")
-            button.accessibilityIdentifier = "simple-payments-add-button"
-        }
+        button.accessibilityLabel = NSLocalizedString("Choose new order type", comment: "Opens action sheet to choose a type of a new order")
+        button.accessibilityIdentifier = "new-order-type-sheet-button"
         return button
     }
 
@@ -381,7 +349,6 @@ private extension OrdersRootViewController {
         }
 
         let coordinatingController = AddOrderCoordinator(siteID: siteID,
-                                                         isOrderCreationEnabled: isOrderCreationEnabled,
                                                          sourceBarButtonItem: sender,
                                                          sourceNavigationController: navigationController)
         coordinatingController.onOrderCreated = { [weak self] order in

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/AddOrderCoordinatorTests.swift

@@ -30,9 +30,9 @@ final class AddOrderCoordinatorTests: XCTestCase {
         super.tearDown()
     }
 
-    func test_it_presents_bottom_sheet_when_all_types_are_available() throws {
+    func test_it_presents_bottom_sheet_on_start() throws {
         // Given
-        let coordinator = makeAddProductCoordinator(isOrderCreationEnabled: true)
+        let coordinator = makeAddProductCoordinator()
 
         // When
         coordinator.start()
@@ -43,26 +43,12 @@ final class AddOrderCoordinatorTests: XCTestCase {
         // Then
         assertThat(coordinator.navigationController.presentedViewController, isAnInstanceOf: BottomSheetViewController.self)
     }
-
-    func test_it_opens_simple_payments_when_its_only_available_type() throws {
-        // Given
-        let coordinator = makeAddProductCoordinator(isOrderCreationEnabled: false)
-
-        // When
-        coordinator.start()
-
-        // Then
-        let presentedNC = coordinator.navigationController.presentedViewController as? UINavigationController
-        assertThat(presentedNC, isAnInstanceOf: WooNavigationController.self)
-        assertThat(presentedNC?.topViewController, isAnInstanceOf: SimplePaymentsAmountHostingController.self)
-    }
 }
 
 private extension AddOrderCoordinatorTests {
-    func makeAddProductCoordinator(isOrderCreationEnabled: Bool) -> AddOrderCoordinator {
+    func makeAddProductCoordinator() -> AddOrderCoordinator {
         let sourceView = UIView()
         return AddOrderCoordinator(siteID: 100,
-                                   isOrderCreationEnabled: isOrderCreationEnabled,
                                    sourceView: sourceView,
                                    sourceNavigationController: navigationController)
     }