From 36c1127567d74b6776d2752e581c3be67df92924 Mon Sep 17 00:00:00 2001
From: iamgabrielma <gabrielmaldonado.art@gmail.com>
Date: Mon, 22 May 2023 10:29:03 +0800
Subject: [PATCH 1/2] Update OrderList scan button to trailing position

---
 .../ViewRelated/Orders/OrdersRootViewController.swift        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
index 4164dcecd81..8665db8552a 100644
--- a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
+++ b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
@@ -314,10 +314,11 @@ private extension OrdersRootViewController {
             createAddOrderItem(),
             createSearchBarButtonItem()
         ]
+        navigationItem.rightBarButtonItems = buttons
+
         if featureFlagService.isFeatureFlagEnabled(.addProductToOrderViaSKUScanner) {
-            buttons.insert(createAddOrderByProductScanningButtonItem(), at: 1)
+            navigationItem.leftBarButtonItem = createAddOrderByProductScanningButtonItem()
         }
-        navigationItem.rightBarButtonItems = buttons
     }
 
     func configureFiltersBar() {

From 2125ee93934e83b22a9fde63c67f9a0b3fd2edc6 Mon Sep 17 00:00:00 2001
From: iamgabrielma <gabrielmaldonado.art@gmail.com>
Date: Mon, 22 May 2023 12:55:11 +0800
Subject: [PATCH 2/2] Remove unused var declaration

---
 .../Orders/OrdersRootViewController.swift           | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
index 8665db8552a..d1a391216d0 100644
--- a/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
+++ b/WooCommerce/Classes/ViewRelated/Orders/OrdersRootViewController.swift
@@ -305,20 +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] = [
-            createAddOrderItem(),
-            createSearchBarButtonItem()
-        ]
-        navigationItem.rightBarButtonItems = buttons
-
         if featureFlagService.isFeatureFlagEnabled(.addProductToOrderViaSKUScanner) {
             navigationItem.leftBarButtonItem = createAddOrderByProductScanningButtonItem()
         }
+
+        navigationItem.rightBarButtonItems = [
+            createAddOrderItem(),
+            createSearchBarButtonItem()
+        ]
     }
 
     func configureFiltersBar() {