diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift index 4164dcecd81..d1a391216d0 100644 --- a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift +++ b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift @@ -305,19 +305,19 @@ private extension OrdersRootViewController { } /// Sets navigation buttons. - /// Search: Is always present. /// Scan: Present when `.addProductToOrderViaSKUScanner` flag is enabled + /// Search: Always present. /// Add: Always present. /// func configureNavigationButtons() { - var buttons: [UIBarButtonItem] = [ + if featureFlagService.isFeatureFlagEnabled(.addProductToOrderViaSKUScanner) { + navigationItem.leftBarButtonItem = createAddOrderByProductScanningButtonItem() + } + + navigationItem.rightBarButtonItems = [ createAddOrderItem(), createSearchBarButtonItem() ] - if featureFlagService.isFeatureFlagEnabled(.addProductToOrderViaSKUScanner) { - buttons.insert(createAddOrderByProductScanningButtonItem(), at: 1) - } - navigationItem.rightBarButtonItems = buttons } func configureFiltersBar() {