From 165bc1c0dfd6461ade174a3c94983815ed80e6d1 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 14:36:14 +0700
Subject: [PATCH 01/45] update fluxc

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ce02a55b13e..bb926db336c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -86,7 +86,7 @@ stripe-terminal = '3.7.1'
 tinder-statemachine = '0.2.0'
 wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
-wordpress-fluxc = 'trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e'
+wordpress-fluxc = 'trunk-242d0b6392f790dcb19f3a52bfa87138f9cc8127'
 wordpress-login = '1.19.0'
 wordpress-libaddressinput = '0.0.2'
 wordpress-mediapicker = '0.3.1'

From 88b462c048a6da3e33f8121d01d64338e08579f6 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 14:46:46 +0700
Subject: [PATCH 02/45] Start event handling for when update status menu item
 is tapped.

---
 .../android/ui/orders/list/OrderListFragment.kt        | 10 +++++++++-
 .../android/ui/orders/list/OrderListViewModel.kt       |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index b2794d2b095..4f6ea8fa206 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -604,6 +604,10 @@ class OrderListFragment :
                 is OrderListViewModel.OrderListEvent.RetryLoadingOrders -> refreshOrders()
                 is OrderListViewModel.OrderListEvent.OpenOrderCreationWithSimplePaymentsMigration ->
                     openOrderCreationFragment(indicateSimplePaymentsMigration = true)
+                is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
+                    showBulkUpdateStatusDialog(event.orderIds)
+                }
+
                 else -> event.isHandled = false
             }
         }
@@ -700,6 +704,10 @@ class OrderListFragment :
         }
     }
 
+    private fun showBulkUpdateStatusDialog(productsIds: List<Long>) {
+        TODO()
+    }
+
     private fun handleListState(orderListState: OrderListViewModel.ViewState.OrderListState) {
         when (orderListState) {
             OrderListViewModel.ViewState.OrderListState.Selecting -> {
@@ -1145,7 +1153,7 @@ class OrderListFragment :
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_orderlist_update_status -> {
-                // todo: implement bulk update status
+                viewModel.onBulkUpdateStatusClicked(tracker?.selection?.toList().orEmpty())
                 true
             }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 1f64d19e0d2..6ac0d650927 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -916,6 +916,10 @@ class OrderListViewModel @Inject constructor(
         )
     }
 
+    fun onBulkUpdateStatusClicked(orderIds: List<Long>) {
+        triggerEvent(OrderListEvent.ShowUpdateStatusDialog(orderIds))
+    }
+
     sealed class OrderListEvent : Event() {
         data class ShowErrorSnack(@StringRes val messageRes: Int) : OrderListEvent()
         object ShowOrderFilters : OrderListEvent()
@@ -950,6 +954,8 @@ class OrderListViewModel @Inject constructor(
         data object RetryLoadingOrders : OrderListEvent()
 
         data object OpenOrderCreationWithSimplePaymentsMigration : OrderListEvent()
+
+        data class ShowUpdateStatusDialog(val orderIds: List<Long>) : OrderListEvent()
     }
 
     @Parcelize

From 1ad498cb1e9c4915f32d879af16a03f4ad9ee0b9 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 15:21:12 +0700
Subject: [PATCH 03/45] Add logic to display the order status selector dialog

---
 .../ui/orders/list/OrderListFragment.kt       | 17 ++++++--
 .../ui/orders/list/OrderListViewModel.kt      | 40 +++++++++++++++++--
 .../main/res/navigation/nav_graph_main.xml    | 19 +++++++++
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 4f6ea8fa206..e48549ad222 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -49,6 +49,7 @@ import com.woocommerce.android.extensions.windowSizeClass
 import com.woocommerce.android.model.FeatureFeedbackSettings
 import com.woocommerce.android.model.FeatureFeedbackSettings.Feature.SIMPLE_PAYMENTS_AND_ORDER_CREATION
 import com.woocommerce.android.model.FeatureFeedbackSettings.FeedbackState
+import com.woocommerce.android.model.Order
 import com.woocommerce.android.support.help.HelpOrigin
 import com.woocommerce.android.support.requests.SupportRequestFormActivity
 import com.woocommerce.android.tools.SelectedSite
@@ -605,7 +606,7 @@ class OrderListFragment :
                 is OrderListViewModel.OrderListEvent.OpenOrderCreationWithSimplePaymentsMigration ->
                     openOrderCreationFragment(indicateSimplePaymentsMigration = true)
                 is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
-                    showBulkUpdateStatusDialog(event.orderIds)
+                    showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
 
                 else -> event.isHandled = false
@@ -704,8 +705,16 @@ class OrderListFragment :
         }
     }
 
-    private fun showBulkUpdateStatusDialog(productsIds: List<Long>) {
-        TODO()
+    private fun showBulkUpdateStatusDialog(
+        currentStatus: String,
+        orderStatusList: Array<Order.OrderStatus>
+    ) {
+        findNavController().navigateSafely(
+            OrderListFragmentDirections.actionOrderListFragmentToOrdersListStatusSelectorDialog(
+                currentStatus,
+                orderStatusList
+            )
+        )
     }
 
     private fun handleListState(orderListState: OrderListViewModel.ViewState.OrderListState) {
@@ -1153,7 +1162,7 @@ class OrderListFragment :
     override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_orderlist_update_status -> {
-                viewModel.onBulkUpdateStatusClicked(tracker?.selection?.toList().orEmpty())
+                viewModel.onBulkUpdateStatusClicked()
                 true
             }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 6ac0d650927..3a2ace741c3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -32,7 +32,9 @@ import com.woocommerce.android.extensions.NotificationReceivedEvent
 import com.woocommerce.android.extensions.WindowSizeClass
 import com.woocommerce.android.extensions.filter
 import com.woocommerce.android.extensions.filterNotNull
+import com.woocommerce.android.extensions.runWithContext
 import com.woocommerce.android.model.FeatureFeedbackSettings
+import com.woocommerce.android.model.Order
 import com.woocommerce.android.model.RequestResult.SUCCESS
 import com.woocommerce.android.network.ConnectionChangeReceiver.ConnectionChangeEvent
 import com.woocommerce.android.notifications.NotificationChannelType
@@ -916,8 +918,19 @@ class OrderListViewModel @Inject constructor(
         )
     }
 
-    fun onBulkUpdateStatusClicked(orderIds: List<Long>) {
-        triggerEvent(OrderListEvent.ShowUpdateStatusDialog(orderIds))
+    fun onBulkUpdateStatusClicked() {
+        launch(dispatchers.io) {
+            orderDetailRepository
+                .getOrderStatusOptions().toTypedArray()
+                .runWithContext(dispatchers.main) {
+                    triggerEvent(
+                        OrderListEvent.ShowUpdateStatusDialog(
+                            currentStatus = "", // Intentionally set as empty string to show no status selected
+                            orderStatusList = it
+                        )
+                    )
+                }
+        }
     }
 
     sealed class OrderListEvent : Event() {
@@ -955,7 +968,28 @@ class OrderListViewModel @Inject constructor(
 
         data object OpenOrderCreationWithSimplePaymentsMigration : OrderListEvent()
 
-        data class ShowUpdateStatusDialog(val orderIds: List<Long>) : OrderListEvent()
+        data class ShowUpdateStatusDialog(
+            val currentStatus: String,
+            val orderStatusList: Array<Order.OrderStatus>
+        ) : OrderListEvent() {
+            override fun equals(other: Any?): Boolean {
+                if (this === other) return true
+                if (javaClass != other?.javaClass) return false
+
+                other as ShowUpdateStatusDialog
+
+                if (currentStatus != other.currentStatus) return false
+                if (!orderStatusList.contentEquals(other.orderStatusList)) return false
+
+                return true
+            }
+
+            override fun hashCode(): Int {
+                var result = currentStatus.hashCode()
+                result = 31 * result + orderStatusList.contentHashCode()
+                return result
+            }
+        }
     }
 
     @Parcelize
diff --git a/WooCommerce/src/main/res/navigation/nav_graph_main.xml b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
index 82fe1dfdc84..f76e6a8f752 100644
--- a/WooCommerce/src/main/res/navigation/nav_graph_main.xml
+++ b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
@@ -156,6 +156,14 @@
         <action
             android:id="@+id/action_orderListFragment_to_orderConnectivityToolFragment"
             app:destination="@id/orderConnectivityToolFragment" />
+        <action
+            android:id="@+id/action_orderListFragment_to_ordersListStatusSelectorDialog"
+            app:destination="@id/ordersListStatusSelectorDialog"
+            app:enterAnim="@anim/activity_fade_in"
+            app:exitAnim="@null"
+            app:popEnterAnim="@null"
+            app:popExitAnim="@anim/activity_fade_out" />
+
     </fragment>
     <fragment
         android:id="@+id/barcodeScanningFragment"
@@ -873,4 +881,15 @@
     <action
         android:id="@+id/action_global_blazeCampaignDetailWebViewFragment"
         app:destination="@id/blazeCampaignDetailWebViewFragment" />
+    <dialog
+        android:id="@+id/ordersListStatusSelectorDialog"
+        android:name="com.woocommerce.android.ui.orders.details.OrderStatusSelectorDialog">
+        <argument
+            android:name="currentStatus"
+            app:argType="string"
+            app:nullable="false" />
+        <argument
+            android:name="orderStatusList"
+            app:argType="com.woocommerce.android.model.Order$OrderStatus[]" />
+    </dialog>
 </navigation>

From 7d61ae37ebefb0f2d1e246a34f1636ea5864b8bc Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 15:33:04 +0700
Subject: [PATCH 04/45] Start handling result from order status selector

---
 .../android/ui/orders/list/OrderListFragment.kt           | 8 ++++++++
 .../android/ui/orders/list/OrderListViewModel.kt          | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index e48549ad222..4c9daf3da42 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -41,6 +41,7 @@ import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_ORDER_ID
 import com.woocommerce.android.analytics.AnalyticsTracker.Companion.KEY_START_PAYMENT_FLOW
 import com.woocommerce.android.databinding.FragmentOrderListBinding
 import com.woocommerce.android.extensions.WindowSizeClass
+import com.woocommerce.android.extensions.handleDialogResult
 import com.woocommerce.android.extensions.handleResult
 import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.extensions.pinFabAboveBottomNavigationBar
@@ -70,6 +71,7 @@ import com.woocommerce.android.ui.orders.OrdersCommunicationViewModel
 import com.woocommerce.android.ui.orders.creation.CodeScannerStatus
 import com.woocommerce.android.ui.orders.creation.GoogleBarcodeFormatMapper.BarcodeFormat
 import com.woocommerce.android.ui.orders.creation.OrderCreateEditViewModel
+import com.woocommerce.android.ui.orders.details.OrderStatusSelectorDialog
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowErrorSnack
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowOrderFilters
 import com.woocommerce.android.ui.products.MutableMultipleSelectionPredicate
@@ -811,6 +813,12 @@ class OrderListFragment :
                 openSpecificOrder(it, true)
             }
         }
+        handleDialogResult<OrderStatusUpdateSource>(
+            key = OrderStatusSelectorDialog.KEY_ORDER_STATUS_RESULT,
+            entryId = R.id.orders,
+        ) {
+            viewModel.onBulkOrderStatusChanged(Order.Status.fromValue(it.newStatus))
+        }
     }
 
     private fun showOrderFilters() {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 3a2ace741c3..4e9966f03c2 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -933,6 +933,10 @@ class OrderListViewModel @Inject constructor(
         }
     }
 
+    fun onBulkOrderStatusChanged(newStatus: Order.Status) {
+        TODO() // Do API call
+    }
+
     sealed class OrderListEvent : Event() {
         data class ShowErrorSnack(@StringRes val messageRes: Int) : OrderListEvent()
         object ShowOrderFilters : OrderListEvent()

From 0bc0fd0e1f11f8d8885bfb0163bf574c3056ba25 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 15:48:34 +0700
Subject: [PATCH 05/45] Start status order update handling in view model and
 repository

---
 .../ui/orders/list/OrderListFragment.kt       |  5 ++++-
 .../ui/orders/list/OrderListRepository.kt     |  4 ++++
 .../ui/orders/list/OrderListViewModel.kt      | 20 +++++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 4c9daf3da42..020dbcbe903 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -817,7 +817,10 @@ class OrderListFragment :
             key = OrderStatusSelectorDialog.KEY_ORDER_STATUS_RESULT,
             entryId = R.id.orders,
         ) {
-            viewModel.onBulkOrderStatusChanged(Order.Status.fromValue(it.newStatus))
+            viewModel.onBulkOrderStatusChanged(
+                orderIds = tracker?.selection?.toList() ?: emptyList(),
+                newStatus = Order.Status.fromValue(it.newStatus)
+            )
         }
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index 6eeac878046..7082825d7ec 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -177,4 +177,8 @@ class OrderListRepository @Inject constructor(
             continuationOrderStatus.continueWith(RequestResult.SUCCESS)
         }
     }
+
+    fun bulkUpdateOrderStatus(orderIds: List<Long>, newStatus: Order.Status) {
+        TODO()
+    }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 4e9966f03c2..da65bb96c14 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -17,6 +17,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.paging.PagedList
 import com.google.android.material.snackbar.Snackbar
 import com.woocommerce.android.AppPrefsWrapper
+import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.FeedbackPrefs
 import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent
@@ -60,6 +61,7 @@ import com.woocommerce.android.util.CoroutineDispatchers
 import com.woocommerce.android.util.DateUtils
 import com.woocommerce.android.util.ThrottleLiveData
 import com.woocommerce.android.util.WooLog
+import com.woocommerce.android.util.WooLog.T.ORDERS
 import com.woocommerce.android.viewmodel.LiveDataDelegate
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
 import com.woocommerce.android.viewmodel.ResourceProvider
@@ -933,8 +935,22 @@ class OrderListViewModel @Inject constructor(
         }
     }
 
-    fun onBulkOrderStatusChanged(newStatus: Order.Status) {
-        TODO() // Do API call
+    fun onBulkOrderStatusChanged(orderIds: List<Long>, newStatus: Order.Status) {
+        if (orderIds.isEmpty()) {
+            val errorMessage = "Trying to bulk update order status but order Ids list is empty"
+            if (BuildConfig.DEBUG) {
+                throw IllegalStateException(errorMessage)
+            } else {
+                WooLog.e(ORDERS, errorMessage)
+            }
+        } else {
+            launch {
+                orderListRepository.bulkUpdateOrderStatus(
+                    orderIds = orderIds,
+                    newStatus = newStatus
+                )
+            }
+        }
     }
 
     sealed class OrderListEvent : Event() {

From d314d562727d673761b1d6464e9efe0b72eb37cd Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 16:07:28 +0700
Subject: [PATCH 06/45] Connect repository and viewmodel for bulk updating
 order status

---
 .../ui/orders/list/OrderListRepository.kt        | 16 ++++++++++++++--
 .../android/ui/orders/list/OrderListViewModel.kt |  7 ++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index 7082825d7ec..7bb3dc65e17 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -178,7 +178,19 @@ class OrderListRepository @Inject constructor(
         }
     }
 
-    fun bulkUpdateOrderStatus(orderIds: List<Long>, newStatus: Order.Status) {
-        TODO()
+    suspend fun bulkUpdateOrderStatus(orderIds: List<Long>, newStatus: Order.Status): Result<Unit> {
+        val result = orderStore.batchUpdateOrdersStatus(
+            site = selectedSite.get(),
+            orderIds = orderIds,
+            newStatus = WCOrderStatusModel(statusKey = newStatus.value)
+        )
+
+        // todo update temporary handling
+        return if (result.isError) {
+            WooLog.e(ORDERS, "Error bulk updating order status: ${result.error.message}")
+            Result.failure(WooException(result.error))
+        } else {
+            Result.success(Unit)
+        }
     }
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index da65bb96c14..bcc2764af18 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -944,12 +944,17 @@ class OrderListViewModel @Inject constructor(
                 WooLog.e(ORDERS, errorMessage)
             }
         } else {
+            // todo show loading state
             launch {
-                orderListRepository.bulkUpdateOrderStatus(
+                val result = orderListRepository.bulkUpdateOrderStatus(
                     orderIds = orderIds,
                     newStatus = newStatus
                 )
+
+                // todo show success/error snackbar
+                // todo make sure order list is refreshed
             }
+            // todo remove loading state, remove multi selection state
         }
     }
 

From 65e431dd812c7540e12f288caedd15e405d283d0 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Wed, 18 Dec 2024 16:17:19 +0700
Subject: [PATCH 07/45] Add generic result handling.

---
 .../android/ui/orders/list/OrderListFragment.kt           | 2 ++
 .../android/ui/orders/list/OrderListViewModel.kt          | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 020dbcbe903..0f68c6062a3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -611,6 +611,8 @@ class OrderListFragment :
                     showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
 
+                is MultiLiveEvent.Event.ShowSnackbar -> uiMessageResolver.showSnack(event.message)
+
                 else -> event.isHandled = false
             }
         }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index bcc2764af18..2c806776c19 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -951,7 +951,13 @@ class OrderListViewModel @Inject constructor(
                     newStatus = newStatus
                 )
 
-                // todo show success/error snackbar
+                // todo add proper handling for success and failure state
+                if (result.isFailure) {
+                    triggerEvent(Event.ShowSnackbar(R.string.error_generic))
+                } else {
+                    triggerEvent(Event.ShowSnackbar(R.string.order_status_updated))
+                }
+
                 // todo make sure order list is refreshed
             }
             // todo remove loading state, remove multi selection state

From 7d20139fd27745914d5278cf8ee1caff157076e3 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 20 Dec 2024 08:24:38 +0700
Subject: [PATCH 08/45] Reload after getting successful result, and exit
 selection mode whether success or fails.

---
 .../android/ui/orders/list/OrderListViewModel.kt            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 2c806776c19..a86a0b29041 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -955,12 +955,12 @@ class OrderListViewModel @Inject constructor(
                 if (result.isFailure) {
                     triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                 } else {
+                    fetchOrdersAndOrderDependencies()
                     triggerEvent(Event.ShowSnackbar(R.string.order_status_updated))
                 }
-
-                // todo make sure order list is refreshed
+                exitSelectionMode()
             }
-            // todo remove loading state, remove multi selection state
+            // todo remove loading state
         }
     }
 

From 6d91065a47ec2472a3555e2802cdca4c161521c2 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 13:40:34 +0700
Subject: [PATCH 09/45] Refactor status selector dialog to disable "Apply"
 button if no item is selected, which can happen on bulk order update.

---
 .../orders/details/OrderStatusSelectorDialog.kt   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
index aa452839e41..a374fefa6cd 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
@@ -38,11 +38,16 @@ class OrderStatusSelectorDialog : DialogFragment() {
 
         val selectedIndex = getCurrentOrderStatusIndex()
 
-        return MaterialAlertDialogBuilder(requireActivity())
+        val dialog = MaterialAlertDialogBuilder(requireActivity())
             .setTitle(resources.getString(R.string.orderstatus_select_status))
             .setCancelable(true)
-            .setSingleChoiceItems(orderStatusList.map { it.label }.toTypedArray(), selectedIndex) { _, which ->
+            .setSingleChoiceItems(orderStatusList.map { it.label }.toTypedArray(), selectedIndex) { dialog, which ->
                 selectedOrderStatus = orderStatusList[which].statusKey
+
+                // Casting to `AlertDialog` as `MaterialAlertDialogBuilder` creates it.
+                (dialog as? androidx.appcompat.app.AlertDialog)?.getButton(Dialog.BUTTON_POSITIVE)?.isEnabled =
+                    selectedOrderStatus.isNotEmpty()
+
                 AnalyticsTracker.track(
                     AnalyticsEvent.FILTER_ORDERS_BY_STATUS_DIALOG_OPTION_SELECTED,
                     mapOf("status" to selectedOrderStatus)
@@ -68,6 +73,12 @@ class OrderStatusSelectorDialog : DialogFragment() {
                 dialog.dismiss()
             }
             .create()
+
+        dialog.setOnShowListener {
+            dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled = selectedOrderStatus.isNotEmpty()
+        }
+
+        return dialog
     }
 
     override fun onResume() {

From c021d6b497b9d27dcac022762eea3126dd1821e3 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 14:10:51 +0700
Subject: [PATCH 10/45] Add proper success message for bulk update order
 status.

---
 .../woocommerce/android/ui/orders/list/OrderListViewModel.kt   | 3 +--
 WooCommerce/src/main/res/values/strings.xml                    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index a86a0b29041..55e07fdece6 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -951,12 +951,11 @@ class OrderListViewModel @Inject constructor(
                     newStatus = newStatus
                 )
 
-                // todo add proper handling for success and failure state
                 if (result.isFailure) {
                     triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                 } else {
                     fetchOrdersAndOrderDependencies()
-                    triggerEvent(Event.ShowSnackbar(R.string.order_status_updated))
+                    triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
                 }
                 exitSelectionMode()
             }
diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
index f4648c0bf3f..34b31747b8a 100644
--- a/WooCommerce/src/main/res/values/strings.xml
+++ b/WooCommerce/src/main/res/values/strings.xml
@@ -605,6 +605,7 @@
     <string name="orderlist_selection_count">%d orders selected</string>
     <string name="orderlist_selection_count_single">%d order selected</string>
     <string name="orderlist_selection_menu_update_status">Update status</string>
+    <string name="orderlist_bulk_update_status_updated">Status updated!</string>
 
     <!--
          Simple Payments

From 83ff03b8d027327eb66316dbd01487b33a8dabc9 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 15:31:13 +0700
Subject: [PATCH 11/45] Add loading state for bulk updating that's in progress.

---
 .../android/ui/orders/list/OrderListFragment.kt          | 9 +++++++++
 .../android/ui/orders/list/OrderListViewModel.kt         | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 0f68c6062a3..cbc64c020c5 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -107,6 +107,7 @@ class OrderListFragment :
         private const val TABLET_PORTRAIT_WIDTH_RATIO = 0.40f
         private const val LAST_WINDOW_SIZE_WAS_LARGER_THAN_COMPACT = "last_window_size_was_larger_than_compact"
         private const val HANDLER_DELAY = 200L
+        private const val TOP_OFFSET_PROGRESS_WITH_ACTION_MODE = 200
     }
 
     @Inject
@@ -240,6 +241,10 @@ class OrderListFragment :
                 refreshOrders()
             }
         }
+        // When Action Mode bar appears, the progress bar can be covered up by it, so we're pushing it down
+        // to make sure it stays visible.
+        binding.listPaneContainer.setProgressViewOffset(false, 0, TOP_OFFSET_PROGRESS_WITH_ACTION_MODE)
+
 
         initObservers()
         initializeResultHandlers()
@@ -703,6 +708,10 @@ class OrderListFragment :
             new.isBottomNavBarVisible.takeIfNotEqualTo(old?.isBottomNavBarVisible) { isBottomNavBarVisible ->
                 showBottomNavBar(isVisible = isBottomNavBarVisible)
             }
+            new.isBulkUpdating.takeIfNotEqualTo(old?.isBulkUpdating) { isBulkUpdating ->
+                // Instead of recreating a new progress bar, re-use the progress bar in the SwipeRefreshLayout
+                binding.listPaneContainer.isRefreshing = isBulkUpdating
+            }
         }
         viewModel.lastUpdateOrdersList.observe(viewLifecycleOwner) { lastUpdate ->
             binding.orderFiltersCard.updateLastUpdate(lastUpdate)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 55e07fdece6..feb977c9aa8 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -944,13 +944,17 @@ class OrderListViewModel @Inject constructor(
                 WooLog.e(ORDERS, errorMessage)
             }
         } else {
-            // todo show loading state
+            viewState = viewState.copy(isBulkUpdating = true)
             launch {
                 val result = orderListRepository.bulkUpdateOrderStatus(
                     orderIds = orderIds,
                     newStatus = newStatus
                 )
 
+                // Remove refreshing state early, because the fetch after successful result will show another
+                // loading state.
+                viewState = viewState.copy(isBulkUpdating = false)
+
                 if (result.isFailure) {
                     triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                 } else {
@@ -959,7 +963,6 @@ class OrderListViewModel @Inject constructor(
                 }
                 exitSelectionMode()
             }
-            // todo remove loading state
         }
     }
 
@@ -1033,6 +1036,7 @@ class OrderListViewModel @Inject constructor(
         val shouldDisplayTroubleshootingBanner: Boolean = false,
         val orderListState: OrderListState? = null,
         val isSearching: Boolean = false,
+        val isBulkUpdating: Boolean = false,
         val selectionCount: Int? = null
     ) : Parcelable {
         @IgnoredOnParcel

From 7a67cb5aa75c6a36df0b531e4e7128c69720cab7 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 16:03:37 +0700
Subject: [PATCH 12/45] Add better handling for returning success and error
 cases in bulk updating order status.

---
 .../ui/orders/list/OrderListRepository.kt     | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index 7bb3dc65e17..69fcc026f4e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -40,6 +40,9 @@ class OrderListRepository @Inject constructor(
     companion object {
         private const val TAG = "OrderListRepository"
         private const val ORDER_STATUS_TRASH = "trash"
+        private const val BULK_UPDATE_ORDER_STATUS_ALL_FAILED = "Unable to update any orders. Please try again."
+        private const val BULK_UPDATE_ORDER_NOTHING_UPDATED = "No orders were updated. Please try again."
+        private const val BULK_UPDATE_ORDER_NO_RESPONSE = "No response received. Please try again."
     }
 
     private var isFetchingOrderStatusOptions = false
@@ -185,12 +188,39 @@ class OrderListRepository @Inject constructor(
             newStatus = WCOrderStatusModel(statusKey = newStatus.value)
         )
 
-        // todo update temporary handling
         return if (result.isError) {
             WooLog.e(ORDERS, "Error bulk updating order status: ${result.error.message}")
             Result.failure(WooException(result.error))
         } else {
-            Result.success(Unit)
+            result.model?.let {
+                logBulkOrderUpdateResults(it)
+
+                // We want to return success if at least one order was updated.
+                // However, if:
+                // - there's no updated orders but there are failed orders, return failure
+                // - there's no updated orders and no failed orders, return failure
+                when {
+                    it.failedOrders.isNotEmpty() && it.updatedOrders.isEmpty() ->
+                        Result.failure(Exception(BULK_UPDATE_ORDER_STATUS_ALL_FAILED))
+
+                    it.failedOrders.isEmpty() && it.updatedOrders.isEmpty() ->
+                        Result.failure(Exception(BULK_UPDATE_ORDER_NOTHING_UPDATED))
+
+                    else -> Result.success(Unit)
+                }
+            } ?: Result.failure(Exception(BULK_UPDATE_ORDER_NO_RESPONSE))
+        }
+    }
+
+    private fun logBulkOrderUpdateResults(model: WCOrderStore.UpdateOrdersStatusResult) {
+        if (model.updatedOrders.isNotEmpty()) {
+            WooLog.i(ORDERS, "Successfully updated ${model.updatedOrders.size} orders")
+        }
+        if (model.failedOrders.isNotEmpty()) {
+            model.failedOrders.forEach { failed ->
+                WooLog.e(ORDERS, "Failed to update order ${failed.id}: " +
+                    "[Code: ${failed.errorCode}, Status: ${failed.errorStatus}] ${failed.errorMessage}")
+            }
         }
     }
 }

From 57f7a738a2ec1e128f070567167436bbe54c15e2 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 16:48:59 +0700
Subject: [PATCH 13/45] Allow and add custom positive button label on order
 status selector

---
 .../android/ui/orders/details/OrderStatusSelectorDialog.kt  | 6 +++++-
 .../woocommerce/android/ui/orders/list/OrderListFragment.kt | 3 ++-
 WooCommerce/src/main/res/navigation/nav_graph_main.xml      | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
index a374fefa6cd..3379733bd68 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
@@ -21,6 +21,7 @@ class OrderStatusSelectorDialog : DialogFragment() {
     companion object {
         const val KEY_ORDER_STATUS_RESULT = "key_order_status_result"
         private const val REFUNDED_ID: String = "refunded"
+        private const val KEY_POSITIVE_BUTTON_LABEL = "positiveButtonLabel"
     }
 
     private val navArgs: OrderStatusSelectorDialogArgs by navArgs()
@@ -38,6 +39,9 @@ class OrderStatusSelectorDialog : DialogFragment() {
 
         val selectedIndex = getCurrentOrderStatusIndex()
 
+        val positiveButtonLabel =
+            requireArguments().getInt(KEY_POSITIVE_BUTTON_LABEL).takeIf { it != 0 } ?: R.string.apply
+
         val dialog = MaterialAlertDialogBuilder(requireActivity())
             .setTitle(resources.getString(R.string.orderstatus_select_status))
             .setCancelable(true)
@@ -53,7 +57,7 @@ class OrderStatusSelectorDialog : DialogFragment() {
                     mapOf("status" to selectedOrderStatus)
                 )
             }
-            .setPositiveButton(R.string.apply) { _, _ ->
+            .setPositiveButton(positiveButtonLabel) { _, _ ->
                 val newSelectedIndex = getCurrentOrderStatusIndex()
                 if (newSelectedIndex != selectedIndex) {
                     AnalyticsTracker.track(
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 235edc83cfc..f9f2e2075d3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -728,7 +728,8 @@ class OrderListFragment :
         findNavController().navigateSafely(
             OrderListFragmentDirections.actionOrderListFragmentToOrdersListStatusSelectorDialog(
                 currentStatus,
-                orderStatusList
+                orderStatusList,
+                R.string.dialog_ok
             )
         )
     }
diff --git a/WooCommerce/src/main/res/navigation/nav_graph_main.xml b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
index f76e6a8f752..92727701704 100644
--- a/WooCommerce/src/main/res/navigation/nav_graph_main.xml
+++ b/WooCommerce/src/main/res/navigation/nav_graph_main.xml
@@ -891,5 +891,8 @@
         <argument
             android:name="orderStatusList"
             app:argType="com.woocommerce.android.model.Order$OrderStatus[]" />
+        <argument
+            android:name="positiveButtonLabel"
+            app:argType="integer" />
     </dialog>
 </navigation>

From 680e64065e873e41a78b2909bb176af59093e653 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 16:49:49 +0700
Subject: [PATCH 14/45] Detekt fixes

---
 .../android/ui/orders/list/OrderListFragment.kt            | 1 -
 .../android/ui/orders/list/OrderListRepository.kt          | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index f9f2e2075d3..98b1c3c313f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -245,7 +245,6 @@ class OrderListFragment :
         // to make sure it stays visible.
         binding.listPaneContainer.setProgressViewOffset(false, 0, TOP_OFFSET_PROGRESS_WITH_ACTION_MODE)
 
-
         initObservers()
         initializeResultHandlers()
         adjustUiForDeviceType(savedInstanceState)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index 69fcc026f4e..cc7bc8ae222 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -218,8 +218,11 @@ class OrderListRepository @Inject constructor(
         }
         if (model.failedOrders.isNotEmpty()) {
             model.failedOrders.forEach { failed ->
-                WooLog.e(ORDERS, "Failed to update order ${failed.id}: " +
-                    "[Code: ${failed.errorCode}, Status: ${failed.errorStatus}] ${failed.errorMessage}")
+                WooLog.e(
+                    ORDERS,
+                    "Failed to update order ${failed.id}: " +
+                        "[Code: ${failed.errorCode}, Status: ${failed.errorStatus}] ${failed.errorMessage}"
+                )
             }
         }
     }

From 16a2e32fd1d4be63c9032c891529ed33e7c9819a Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 24 Dec 2024 17:18:52 +0700
Subject: [PATCH 15/45] Refactor navigation to Order Status Selector Dialog to
 always require positive button label.

---
 .../com/woocommerce/android/ui/orders/OrderNavigator.kt     | 3 ++-
 .../ui/orders/creation/OrderCreateEditFormFragment.kt       | 3 ++-
 .../android/ui/orders/details/OrderStatusSelectorDialog.kt  | 6 +-----
 .../src/main/res/navigation/nav_graph_order_creations.xml   | 3 +++
 WooCommerce/src/main/res/navigation/nav_graph_orders.xml    | 3 +++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderNavigator.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderNavigator.kt
index bcc5851a278..c7530523a40 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderNavigator.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderNavigator.kt
@@ -46,7 +46,8 @@ class OrderNavigator @Inject constructor() {
                 val action = OrderDetailFragmentDirections
                     .actionOrderDetailFragmentToOrderStatusSelectorDialog(
                         currentStatus = target.currentStatus,
-                        orderStatusList = target.orderStatusList
+                        orderStatusList = target.orderStatusList,
+                        positiveButtonLabel = R.string.apply
                     )
                 fragment.findNavController().navigateSafely(action)
             }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
index dd73b61bdb1..f3c466a5f1a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
@@ -1173,7 +1173,8 @@ class OrderCreateEditFormFragment :
                 OrderCreateEditFormFragmentDirections
                     .actionOrderCreationFragmentToOrderStatusSelectorDialog(
                         currentStatus = event.currentStatus,
-                        orderStatusList = event.orderStatusList
+                        orderStatusList = event.orderStatusList,
+                        positiveButtonLabel = R.string.apply
                     ).let { findNavController().navigateSafely(it) }
 
             is ShowSnackbar -> uiMessageResolver.showSnack(event.message)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
index 3379733bd68..5d12111288a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderStatusSelectorDialog.kt
@@ -21,7 +21,6 @@ class OrderStatusSelectorDialog : DialogFragment() {
     companion object {
         const val KEY_ORDER_STATUS_RESULT = "key_order_status_result"
         private const val REFUNDED_ID: String = "refunded"
-        private const val KEY_POSITIVE_BUTTON_LABEL = "positiveButtonLabel"
     }
 
     private val navArgs: OrderStatusSelectorDialogArgs by navArgs()
@@ -39,9 +38,6 @@ class OrderStatusSelectorDialog : DialogFragment() {
 
         val selectedIndex = getCurrentOrderStatusIndex()
 
-        val positiveButtonLabel =
-            requireArguments().getInt(KEY_POSITIVE_BUTTON_LABEL).takeIf { it != 0 } ?: R.string.apply
-
         val dialog = MaterialAlertDialogBuilder(requireActivity())
             .setTitle(resources.getString(R.string.orderstatus_select_status))
             .setCancelable(true)
@@ -57,7 +53,7 @@ class OrderStatusSelectorDialog : DialogFragment() {
                     mapOf("status" to selectedOrderStatus)
                 )
             }
-            .setPositiveButton(positiveButtonLabel) { _, _ ->
+            .setPositiveButton(navArgs.positiveButtonLabel) { _, _ ->
                 val newSelectedIndex = getCurrentOrderStatusIndex()
                 if (newSelectedIndex != selectedIndex) {
                     AnalyticsTracker.track(
diff --git a/WooCommerce/src/main/res/navigation/nav_graph_order_creations.xml b/WooCommerce/src/main/res/navigation/nav_graph_order_creations.xml
index ea4c8ca374f..9eb7ee0d44b 100644
--- a/WooCommerce/src/main/res/navigation/nav_graph_order_creations.xml
+++ b/WooCommerce/src/main/res/navigation/nav_graph_order_creations.xml
@@ -195,6 +195,9 @@
         <argument
             android:name="orderStatusList"
             app:argType="com.woocommerce.android.model.Order$OrderStatus[]" />
+        <argument
+            android:name="positiveButtonLabel"
+            app:argType="integer" />
     </dialog>
     <fragment
         android:id="@+id/customAmountsDialog"
diff --git a/WooCommerce/src/main/res/navigation/nav_graph_orders.xml b/WooCommerce/src/main/res/navigation/nav_graph_orders.xml
index ff5ab9de7db..b8c87c9fd12 100644
--- a/WooCommerce/src/main/res/navigation/nav_graph_orders.xml
+++ b/WooCommerce/src/main/res/navigation/nav_graph_orders.xml
@@ -319,6 +319,9 @@
         <argument
             android:name="orderStatusList"
             app:argType="com.woocommerce.android.model.Order$OrderStatus[]" />
+        <argument
+            android:name="positiveButtonLabel"
+            app:argType="integer" />
     </dialog>
     <fragment
         android:id="@+id/printShippingLabelInfoFragment"

From a04fb27aa2f707019a704d9bd8992fbe7d446f30 Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Wed, 25 Dec 2024 12:43:31 +0100
Subject: [PATCH 16/45] Pass the allowPassword argument to the magic link
 screen

To make sure the password fallback button is hidden when the account is passwordless
---
 .../kotlin/com/woocommerce/android/ui/login/LoginActivity.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index bdab0a2843d..0821ac46a22 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
@@ -451,7 +451,7 @@ class LoginActivity :
     }
 
     override fun showMagicLinkSentScreen(email: String?, allowPassword: Boolean) {
-        val loginMagicLinkSentFragment = LoginMagicLinkSentImprovedFragment.newInstance(email, true)
+        val loginMagicLinkSentFragment = LoginMagicLinkSentImprovedFragment.newInstance(email, allowPassword)
         changeFragment(loginMagicLinkSentFragment, true, LoginMagicLinkSentImprovedFragment.TAG, false)
     }
 

From 6bade3d59aa7218ff694e313506b5123485efe5c Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 27 Dec 2024 10:35:04 +0700
Subject: [PATCH 17/45] Add networkStatus check at the beginning of bulk
 updating function.

---
 .../ui/orders/list/OrderListViewModel.kt      | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index e607b997149..bfd3c0ca465 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -938,33 +938,37 @@ class OrderListViewModel @Inject constructor(
     }
 
     fun onBulkOrderStatusChanged(orderIds: List<Long>, newStatus: Order.Status) {
-        if (orderIds.isEmpty()) {
-            val errorMessage = "Trying to bulk update order status but order Ids list is empty"
-            if (BuildConfig.DEBUG) {
-                throw IllegalStateException(errorMessage)
+        if (networkStatus.isConnected()) {
+            if (orderIds.isEmpty()) {
+                val errorMessage = "Trying to bulk update order status but order Ids list is empty"
+                if (BuildConfig.DEBUG) {
+                    throw IllegalStateException(errorMessage)
+                } else {
+                    WooLog.e(ORDERS, errorMessage)
+                }
             } else {
-                WooLog.e(ORDERS, errorMessage)
-            }
-        } else {
-            viewState = viewState.copy(isBulkUpdating = true)
-            launch {
-                val result = orderListRepository.bulkUpdateOrderStatus(
-                    orderIds = orderIds,
-                    newStatus = newStatus
-                )
+                viewState = viewState.copy(isBulkUpdating = true)
+                launch {
+                    val result = orderListRepository.bulkUpdateOrderStatus(
+                        orderIds = orderIds,
+                        newStatus = newStatus
+                    )
 
-                // Remove refreshing state early, because the fetch after successful result will show another
-                // loading state.
-                viewState = viewState.copy(isBulkUpdating = false)
+                    // Remove refreshing state early, because the fetch after successful result will show another
+                    // loading state.
+                    viewState = viewState.copy(isBulkUpdating = false)
 
-                if (result.isFailure) {
-                    triggerEvent(Event.ShowSnackbar(R.string.error_generic))
-                } else {
-                    fetchOrdersAndOrderDependencies()
-                    triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                    if (result.isFailure) {
+                        triggerEvent(Event.ShowSnackbar(R.string.error_generic))
+                    } else {
+                        fetchOrdersAndOrderDependencies()
+                        triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                    }
+                    exitSelectionMode()
                 }
-                exitSelectionMode()
             }
+        } else {
+            triggerEvent(Event.ShowSnackbar(R.string.offline_error))
         }
     }
 

From 991bdcf9d4e70a8726979ba85e45be10ee7a4776 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 27 Dec 2024 10:38:25 +0700
Subject: [PATCH 18/45] Remove non-user facing messages.

---
 .../android/ui/orders/list/OrderListRepository.kt           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
index cc7bc8ae222..7f01a8b7449 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListRepository.kt
@@ -40,9 +40,9 @@ class OrderListRepository @Inject constructor(
     companion object {
         private const val TAG = "OrderListRepository"
         private const val ORDER_STATUS_TRASH = "trash"
-        private const val BULK_UPDATE_ORDER_STATUS_ALL_FAILED = "Unable to update any orders. Please try again."
-        private const val BULK_UPDATE_ORDER_NOTHING_UPDATED = "No orders were updated. Please try again."
-        private const val BULK_UPDATE_ORDER_NO_RESPONSE = "No response received. Please try again."
+        private const val BULK_UPDATE_ORDER_STATUS_ALL_FAILED = "Unable to update any orders."
+        private const val BULK_UPDATE_ORDER_NOTHING_UPDATED = "No orders were updated."
+        private const val BULK_UPDATE_ORDER_NO_RESPONSE = "No response received."
     }
 
     private var isFetchingOrderStatusOptions = false

From 450b3e6d23d16a97567cc8f2d7cf772c1f85b9de Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 27 Dec 2024 11:08:25 +0700
Subject: [PATCH 19/45] Refactor when success snackbar and exiting selection
 mode should happen.

---
 .../android/ui/orders/list/OrderListViewModel.kt     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index bfd3c0ca465..8ceeeef774b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -328,13 +328,14 @@ class OrderListViewModel @Inject constructor(
      * Refresh the active order list with fresh data from the API as well as refresh order status
      * options and payment gateways if the network is available.
      */
-    fun fetchOrdersAndOrderDependencies() {
+    fun fetchOrdersAndOrderDependencies(onComplete: (() -> Unit)? = null) {
         if (networkStatus.isConnected()) {
             viewState = viewState.copy(isErrorFetchingDataBannerVisible = false)
             launch(dispatchers.main) {
                 activePagedListWrapper?.fetchFirstPage()
                 fetchOrderStatusOptions()
                 fetchPaymentGateways()
+                onComplete?.invoke()
             }
         } else {
             viewState = viewState.copy(isRefreshPending = true, isErrorFetchingDataBannerVisible = false)
@@ -961,15 +962,18 @@ class OrderListViewModel @Inject constructor(
                     if (result.isFailure) {
                         triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                     } else {
-                        fetchOrdersAndOrderDependencies()
-                        triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                        fetchOrdersAndOrderDependencies(
+                            onComplete = {
+                                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                            }
+                        )
                     }
-                    exitSelectionMode()
                 }
             }
         } else {
             triggerEvent(Event.ShowSnackbar(R.string.offline_error))
         }
+        exitSelectionMode()
     }
 
     sealed class OrderListEvent : Event() {

From cd25f31e73b481553fc14f968b8819a5e6b14c85 Mon Sep 17 00:00:00 2001
From: ThomazFB <thomazfcortez@gmail.com>
Date: Fri, 27 Dec 2024 18:06:39 -0300
Subject: [PATCH 20/45] Introduce StoreOptionsDAO

---
 .../wooshippinglabels/packages/datasource/PackageDAOs.kt  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/PackageDAOs.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/PackageDAOs.kt
index 8dac306da6d..f9061832442 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/PackageDAOs.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/PackageDAOs.kt
@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.orders.wooshippinglabels.packages.datasource
 
 data class StorePackagesDAO(
+    val storeOptions: StoreOptionsDAO,
     val savedPackages: List<PackageDAO>,
     val carrierPackages: Map<CarrierType, CarrierDAO>
 )
@@ -25,6 +26,13 @@ data class CarrierPackageGroupDAO(
     val packages: List<PackageDAO>
 )
 
+data class StoreOptionsDAO(
+    val currencySymbol: String,
+    val dimensionUnit: String,
+    val weightUnit: String,
+    val originCountry: String
+)
+
 enum class CarrierType {
     USPS,
     DHL

From 08e2ff0c83b937ab591b64a720ba6ea1aee90042 Mon Sep 17 00:00:00 2001
From: ThomazFB <thomazfcortez@gmail.com>
Date: Fri, 27 Dec 2024 18:06:54 -0300
Subject: [PATCH 21/45] Map Package response storeOptions DTO to respective DAO

---
 .../packages/datasource/WooShippingLabelPackageMapper.kt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageMapper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageMapper.kt
index 14d6b23ac0b..fb6911020da 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageMapper.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageMapper.kt
@@ -13,8 +13,10 @@ import javax.inject.Inject
 class WooShippingLabelPackageMapper @Inject constructor() {
     operator fun invoke(response: PackageResponse): StorePackagesDAO {
         val savedPackagesResponse = response.packages?.saved?.custom ?: emptyList()
+        val storeOptionsResponse = response.storeOptions ?: PackageStoreOptionsDTO()
 
         return StorePackagesDAO(
+            storeOptions = mapStoreOptions(storeOptionsResponse),
             savedPackages = mapSavedPackages(savedPackagesResponse, response.storeOptions),
             carrierPackages = mapCarrierPackages(response.packages?.predefined, response.storeOptions)
         )
@@ -95,4 +97,11 @@ class WooShippingLabelPackageMapper @Inject constructor() {
             )
         } ?: emptyList()
     )
+
+    private fun mapStoreOptions(optionsDTO: PackageStoreOptionsDTO) = StoreOptionsDAO(
+        currencySymbol = optionsDTO.currencySymbol.orEmpty(),
+        dimensionUnit = optionsDTO.dimensionUnit.orEmpty(),
+        weightUnit = optionsDTO.weightUnit.orEmpty(),
+        originCountry = optionsDTO.originCountry.orEmpty()
+    )
 }

From a316ad3dde5bf2327677a5f488118ce5ab46bd33 Mon Sep 17 00:00:00 2001
From: ThomazFB <thomazfcortez@gmail.com>
Date: Fri, 27 Dec 2024 18:30:01 -0300
Subject: [PATCH 22/45] Map StoreOptionsDAO into StoreOptionsForPackages
 through FetchPredefinedPackagesFromStore use case

---
 .../datasource/FetchPredefinedPackagesFromStore.kt     | 10 ++++++++++
 .../orders/wooshippinglabels/packages/ui/UIModels.kt   | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStore.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStore.kt
index 949d2f935cd..0e130faa1eb 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStore.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStore.kt
@@ -5,6 +5,7 @@ import com.woocommerce.android.ui.orders.wooshippinglabels.packages.WooShippingL
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.Carrier
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.CarrierPackageGroup
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.PackageData
+import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.StoreOptionsForPackages
 import javax.inject.Inject
 
 class FetchPredefinedPackagesFromStore @Inject constructor(
@@ -19,6 +20,7 @@ class FetchPredefinedPackagesFromStore @Inject constructor(
             ?: return PredefinedPackagesState.Error
 
         return PredefinedPackagesState.Data(
+            storeOptions = storePackages.storeOptions.toStoreOptionsForPackages(),
             savedPackages = storePackages.filterSavedData(),
             carrierPackages = storePackages.filterCarrierData()
         )
@@ -50,6 +52,14 @@ class FetchPredefinedPackagesFromStore @Inject constructor(
             .let { Carrier.DHL to it }
     )
 
+    private fun StoreOptionsDAO.toStoreOptionsForPackages() =
+        StoreOptionsForPackages(
+            currencySymbol = currencySymbol,
+            dimensionUnit = dimensionUnit,
+            weightUnit = weightUnit,
+            originCountry = originCountry
+        )
+
     private fun Map<CarrierType, CarrierDAO>.parseCarrierData(
         carrierType: CarrierType
     ) = get(carrierType)?.let {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
index 04df804ba86..119a0813bab 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
@@ -84,7 +84,7 @@ data class CustomPackageCreationData(
             return name.isNotNullOrEmpty() && weight.isNotNullOrEmpty()
         }
 
-    fun toPackageData(dimensionUnit: String = "cm") = PackageData(
+    fun toPackageData(dimensionUnit: String) = PackageData(
         id = "custom_package",
         name = name.orEmpty(),
         dimensions = "$length x $width x $height",
@@ -137,3 +137,11 @@ data class StorePredefinedPackages(
     val carrierPackages: Map<Carrier, List<CarrierPackageGroup>>,
     val savedPackages: List<PackageData>
 ) : Parcelable
+
+@Parcelize
+data class StoreOptionsForPackages(
+    val currencySymbol: String,
+    val dimensionUnit: String,
+    val weightUnit: String,
+    val originCountry: String
+) : Parcelable

From f553768616f1ae1aec080bcc77834aa4dbd31ded Mon Sep 17 00:00:00 2001
From: ThomazFB <thomazfcortez@gmail.com>
Date: Fri, 27 Dec 2024 18:33:34 -0300
Subject: [PATCH 23/45] Configure store options dimension units into the Custom
 package creation

---
 .../WooShippingLabelPackageCreationViewModel.kt     | 13 ++++++++++---
 .../wooshippinglabels/packages/ui/UIModels.kt       | 11 ++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt
index 158ae224dab..44039515e08 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt
@@ -13,6 +13,7 @@ import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.Carrier
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.CarrierPackageGroup
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.CustomPackageCreationData
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.PackageData
+import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.StoreOptionsForPackages
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ResourceProvider
 import com.woocommerce.android.viewmodel.ScopedViewModel
@@ -39,6 +40,11 @@ class WooShippingLabelPackageCreationViewModel @Inject constructor(
     )
     val viewState = _viewState.asLiveData()
 
+    private val storeOptions: StoreOptionsForPackages
+        get() = _viewState.value.predefinedPackagesData
+            ?.storeOptions
+            ?: StoreOptionsForPackages.DEFAULT
+
     private val pageTabs
         get() = listOf(
             PageTab(
@@ -110,7 +116,7 @@ class WooShippingLabelPackageCreationViewModel @Inject constructor(
             ?.takeIf { savePackageAsTemplate }
             ?.let { customPackage.submitToStore(it) }
 
-        customPackage.toPackageData()
+        customPackage.toPackageData(dimensionUnit = storeOptions.dimensionUnit)
             .let { triggerEvent(PackageSelected(it)) }
     }
 
@@ -221,8 +227,9 @@ class WooShippingLabelPackageCreationViewModel @Inject constructor(
         data object Error : PredefinedPackagesState()
         data object Waiting : PredefinedPackagesState()
         data class Data(
-            val savedPackages: List<PackageData> = emptyList(),
-            val carrierPackages: Map<Carrier, List<CarrierPackageGroup>> = emptyMap()
+            val storeOptions: StoreOptionsForPackages,
+            val savedPackages: List<PackageData>,
+            val carrierPackages: Map<Carrier, List<CarrierPackageGroup>>
         ) : PredefinedPackagesState() {
             val hasCarrierSelection: Boolean
                 get() = carrierPackages.values.flatten().find { group ->
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
index 119a0813bab..32d5ce5b1da 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/UIModels.kt
@@ -144,4 +144,13 @@ data class StoreOptionsForPackages(
     val dimensionUnit: String,
     val weightUnit: String,
     val originCountry: String
-) : Parcelable
+) : Parcelable {
+    companion object {
+        val DEFAULT = StoreOptionsForPackages(
+            currencySymbol = "USD",
+            dimensionUnit = "cm",
+            weightUnit = "kg",
+            originCountry = "US"
+        )
+    }
+}

From d521af96f002b6016d1f63d80d9ea20d4a249450 Mon Sep 17 00:00:00 2001
From: ThomazFB <thomazfcortez@gmail.com>
Date: Fri, 27 Dec 2024 18:37:51 -0300
Subject: [PATCH 24/45] Adjust unit tests with required storeOptions parameters

---
 .../WooShippingLabelPackageCreationViewModelTest.kt         | 6 +++++-
 .../datasource/FetchPredefinedPackagesFromStoreTest.kt      | 6 ++++++
 .../datasource/WooShippingLabelPackageRepositoryTest.kt     | 6 ++++++
 .../packages/ui/CustomPackageCreationDataTest.kt            | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModelTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModelTest.kt
index 10dfe3e6678..c70187ef038 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModelTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModelTest.kt
@@ -14,6 +14,7 @@ import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.Carrier
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.CarrierPackageGroup
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.CustomPackageCreationData
 import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.PackageData
+import com.woocommerce.android.ui.orders.wooshippinglabels.packages.ui.StoreOptionsForPackages
 import com.woocommerce.android.viewmodel.BaseUnitTest
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ResourceProvider
@@ -88,7 +89,7 @@ class WooShippingLabelPackageCreationViewModelTest : BaseUnitTest() {
         sut.onAddCustomPackageClick(savePackageAsTemplate = false)
 
         verify(packageRepository, times(0)).createCustomPackage(any(), any())
-        assertThat(lastEvent).isEqualTo(PackageSelected(customPackageData.toPackageData()))
+        assertThat(lastEvent).isEqualTo(PackageSelected(customPackageData.toPackageData("cm")))
     }
 
     @Test
@@ -189,6 +190,7 @@ class WooShippingLabelPackageCreationViewModelTest : BaseUnitTest() {
         )
         whenever(fetchPredefinedPackages()).thenReturn(
             PredefinedPackagesState.Data(
+                storeOptions = StoreOptionsForPackages.DEFAULT,
                 carrierPackages = emptyMap(),
                 savedPackages = listOf(package1, package2)
             )
@@ -240,6 +242,7 @@ class WooShippingLabelPackageCreationViewModelTest : BaseUnitTest() {
         )
         whenever(fetchPredefinedPackages()).thenReturn(
             PredefinedPackagesState.Data(
+                storeOptions = StoreOptionsForPackages.DEFAULT,
                 carrierPackages = carrierPackages,
                 savedPackages = emptyList()
             )
@@ -322,6 +325,7 @@ class WooShippingLabelPackageCreationViewModelTest : BaseUnitTest() {
         )
         whenever(fetchPredefinedPackages()).thenReturn(
             PredefinedPackagesState.Data(
+                storeOptions = StoreOptionsForPackages.DEFAULT,
                 carrierPackages = carrierPackages,
                 savedPackages = emptyList()
             )
diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStoreTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStoreTest.kt
index 6529b08b721..c1b75cc7632 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStoreTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/FetchPredefinedPackagesFromStoreTest.kt
@@ -96,6 +96,12 @@ class FetchPredefinedPackagesFromStoreTest : BaseUnitTest() {
     }
 
     private fun generatePackagesData() = StorePackagesDAO(
+        storeOptions = StoreOptionsDAO(
+            currencySymbol = "$",
+            dimensionUnit = "cm",
+            weightUnit = "kg",
+            originCountry = "US"
+        ),
         savedPackages = listOf(
             PackageDAO(
                 id = "1",
diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageRepositoryTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageRepositoryTest.kt
index be057e3fc93..f8ddc4e8973 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageRepositoryTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/datasource/WooShippingLabelPackageRepositoryTest.kt
@@ -34,6 +34,12 @@ class WooShippingLabelPackageRepositoryTest : BaseUnitTest() {
     @Test
     fun `fetchAllStorePackages returns WooResult with result`() = testBlocking {
         val storePackagesDAO = StorePackagesDAO(
+            storeOptions = StoreOptionsDAO(
+                currencySymbol = "",
+                dimensionUnit = "",
+                weightUnit = "",
+                originCountry = ""
+            ),
             savedPackages = listOf(),
             carrierPackages = mapOf()
         )
diff --git a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/CustomPackageCreationDataTest.kt b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/CustomPackageCreationDataTest.kt
index e011b4d93c3..1c311e0a799 100644
--- a/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/CustomPackageCreationDataTest.kt
+++ b/WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/packages/ui/CustomPackageCreationDataTest.kt
@@ -72,7 +72,7 @@ class CustomPackageCreationDataTest {
             saveAsTemplate = false
         )
 
-        val packageData = data.toPackageData()
+        val packageData = data.toPackageData("cm")
 
         assertThat(packageData.name).isEqualTo("")
         assertThat(packageData.dimensions).isEqualTo("10 x 10 x 10")
@@ -90,7 +90,7 @@ class CustomPackageCreationDataTest {
             saveAsTemplate = false
         )
 
-        val packageData = data.toPackageData()
+        val packageData = data.toPackageData("cm")
 
         assertThat(packageData.name).isEqualTo("")
         assertThat(packageData.dimensions).isEqualTo("10 x 10 x 10")

From 423f8ad1a9eb7979adf00c47f855894422ceaa8a Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:25:08 +0700
Subject: [PATCH 25/45] Add bulk update order related tracking events

---
 .../com/woocommerce/android/analytics/AnalyticsEvent.kt     | 6 ++++++
 .../com/woocommerce/android/analytics/AnalyticsTracker.kt   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt
index 91c81185377..9e3cf43110c 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt
@@ -215,6 +215,12 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     FILTER_ORDERS_BY_STATUS_DIALOG_OPTION_SELECTED,
     ORDER_FILTER_LIST_CLEAR_MENU_BUTTON_TAPPED,
 
+    ORDERS_LIST_BULK_UPDATE_SELECTION_ENABLED,
+    ORDERS_LIST_BULK_UPDATE_REQUESTED,
+    ORDERS_LIST_BULK_UPDATE_CONFIRMED,
+    ORDERS_LIST_BULK_UPDATE_SUCCESS,
+    ORDERS_LIST_BULK_UPDATE_FAILURE,
+
     // -- Payments
     PAYMENTS_FLOW_ORDER_COLLECT_PAYMENT_TAPPED,
     PAYMENTS_FLOW_COMPLETED,
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt
index 4b4661f6b3d..d7cb4e10714 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsTracker.kt
@@ -258,6 +258,8 @@ class AnalyticsTracker private constructor(
         const val VALUE_SORT_DATE_ASC = "date,ascending"
         const val VALUE_SORT_DATE_DESC = "date,descending"
 
+        const val KEY_SELECTED_ORDERS_COUNT = "selected_orders_count"
+
         const val VALUE_API_SUCCESS = "success"
         const val VALUE_API_FAILED = "failed"
         const val VALUE_SHIPMENT_TRACK = "track"

From 8c1b99c0f328aa7a9292f279db265940db4a3833 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:27:54 +0700
Subject: [PATCH 26/45] Track when multiple selection mode is activated

---
 .../com/woocommerce/android/ui/orders/list/OrderListViewModel.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 8ceeeef774b..b977d5a8d38 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -908,6 +908,7 @@ class OrderListViewModel @Inject constructor(
     }
 
     private fun enterSelectionMode(count: Int) {
+        analyticsTracker.track(AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_SELECTION_ENABLED)
         viewState = viewState.copy(
             orderListState = ViewState.OrderListState.Selecting,
             selectionCount = count,

From 2542ecdcbf0e087f9573a3a97208f9133ac52381 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:34:23 +0700
Subject: [PATCH 27/45] =?UTF-8?q?Add=20bulk=20order=20update=20tracking=20?=
 =?UTF-8?q?on=20=E2=80=9CUpdate=20Status=E2=80=9D=20option=20tap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/ui/orders/list/OrderListViewModel.kt          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index b977d5a8d38..fe574a47ed7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -925,6 +925,14 @@ class OrderListViewModel @Inject constructor(
     }
 
     fun onBulkUpdateStatusClicked() {
+        analyticsTracker.track(
+            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_REQUESTED,
+            mapOf(
+                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+                AnalyticsTracker.KEY_SELECTED_ORDERS_COUNT to viewState.selectionCount
+            )
+        )
+
         launch(dispatchers.io) {
             orderDetailRepository
                 .getOrderStatusOptions().toTypedArray()

From d951b7fb77ab3d8eda75bf99d4ec75dffcd1e6ce Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:38:48 +0700
Subject: [PATCH 28/45] =?UTF-8?q?Add=20bulk=20order=20update=20tracking=20?=
 =?UTF-8?q?on=20=E2=80=9CUpdate=20Status=E2=80=9D=20confirmation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/ui/orders/list/OrderListViewModel.kt          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index fe574a47ed7..4d879f20baa 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -957,6 +957,14 @@ class OrderListViewModel @Inject constructor(
                     WooLog.e(ORDERS, errorMessage)
                 }
             } else {
+                analyticsTracker.track(
+                    AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_CONFIRMED,
+                    mapOf(
+                        AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+                        AnalyticsTracker.KEY_SELECTED_ORDERS_COUNT to viewState.selectionCount
+                    )
+                )
+
                 viewState = viewState.copy(isBulkUpdating = true)
                 launch {
                     val result = orderListRepository.bulkUpdateOrderStatus(

From 0e178f73d2873dfb69dbf68fab96a245e224c093 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:40:30 +0700
Subject: [PATCH 29/45] Add bulk order update tracking on update success and
 failure.

---
 .../android/ui/orders/list/OrderListViewModel.kt    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 4d879f20baa..fe96b83cb80 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -977,10 +977,23 @@ class OrderListViewModel @Inject constructor(
                     viewState = viewState.copy(isBulkUpdating = false)
 
                     if (result.isFailure) {
+                        analyticsTracker.track(
+                            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_FAILURE,
+                            mapOf(
+                                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+                            )
+                        )
                         triggerEvent(Event.ShowSnackbar(R.string.error_generic))
+
                     } else {
                         fetchOrdersAndOrderDependencies(
                             onComplete = {
+                                analyticsTracker.track(
+                                    AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_SUCCESS,
+                                    mapOf(
+                                        AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+                                    )
+                                )
                                 triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
                             }
                         )

From 55da2841982949e3c871411b506902580982c813 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Mon, 30 Dec 2024 10:54:37 +0700
Subject: [PATCH 30/45] Add more possible cases for tracking failure.

---
 .../ui/orders/list/OrderListViewModel.kt      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index fe96b83cb80..0a385876846 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -951,6 +951,7 @@ class OrderListViewModel @Inject constructor(
         if (networkStatus.isConnected()) {
             if (orderIds.isEmpty()) {
                 val errorMessage = "Trying to bulk update order status but order Ids list is empty"
+                trackBulkOrderUpdateFailure()
                 if (BuildConfig.DEBUG) {
                     throw IllegalStateException(errorMessage)
                 } else {
@@ -977,14 +978,8 @@ class OrderListViewModel @Inject constructor(
                     viewState = viewState.copy(isBulkUpdating = false)
 
                     if (result.isFailure) {
-                        analyticsTracker.track(
-                            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_FAILURE,
-                            mapOf(
-                                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
-                            )
-                        )
+                        trackBulkOrderUpdateFailure()
                         triggerEvent(Event.ShowSnackbar(R.string.error_generic))
-
                     } else {
                         fetchOrdersAndOrderDependencies(
                             onComplete = {
@@ -1001,11 +996,21 @@ class OrderListViewModel @Inject constructor(
                 }
             }
         } else {
+            trackBulkOrderUpdateFailure()
             triggerEvent(Event.ShowSnackbar(R.string.offline_error))
         }
         exitSelectionMode()
     }
 
+    private fun trackBulkOrderUpdateFailure() {
+        analyticsTracker.track(
+            AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_FAILURE,
+            mapOf(
+                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
+            )
+        )
+    }
+
     sealed class OrderListEvent : Event() {
         data class ShowErrorSnack(@StringRes val messageRes: Int) : OrderListEvent()
         object ShowOrderFilters : OrderListEvent()

From fb4a9596dde2e6ca44f8c224bdfac9e5da92b210 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 13:28:33 +0700
Subject: [PATCH 31/45] Refactor the way bulk order success snack is shown.

---
 .../ui/orders/list/OrderListViewModel.kt      | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 8ceeeef774b..11f2a8530c0 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -76,6 +76,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import org.greenrobot.eventbus.ThreadMode.MAIN
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor
@@ -85,6 +86,7 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
 import org.wordpress.android.fluxc.store.ListStore
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.PARSE_ERROR
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.TIMEOUT_ERROR
+import org.wordpress.android.fluxc.store.ListStore.OnListChanged
 import org.wordpress.android.fluxc.store.WCOrderStore
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderSummariesFetched
 import java.util.Locale
@@ -222,6 +224,8 @@ class OrderListViewModel @Inject constructor(
 
     fun isSelecting() = viewState.orderListState == ViewState.OrderListState.Selecting
 
+    private var isQueueingBulkUpdateSuccessMessage = false
+
     init {
         lifecycleRegistry.currentState = Lifecycle.State.CREATED
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
@@ -328,14 +332,13 @@ class OrderListViewModel @Inject constructor(
      * Refresh the active order list with fresh data from the API as well as refresh order status
      * options and payment gateways if the network is available.
      */
-    fun fetchOrdersAndOrderDependencies(onComplete: (() -> Unit)? = null) {
+    fun fetchOrdersAndOrderDependencies() {
         if (networkStatus.isConnected()) {
             viewState = viewState.copy(isErrorFetchingDataBannerVisible = false)
             launch(dispatchers.main) {
                 activePagedListWrapper?.fetchFirstPage()
                 fetchOrderStatusOptions()
                 fetchPaymentGateways()
-                onComplete?.invoke()
             }
         } else {
             viewState = viewState.copy(isRefreshPending = true, isErrorFetchingDataBannerVisible = false)
@@ -651,6 +654,15 @@ class OrderListViewModel @Inject constructor(
         }
     }
 
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = MAIN)
+    fun onOrderListFetched(event: OnListChanged) {
+        if (event.isError.not() && isQueueingBulkUpdateSuccessMessage) {
+            triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+            isQueueingBulkUpdateSuccessMessage = false
+        }
+    }
+
     fun onFiltersButtonTapped() {
         AnalyticsTracker.track(AnalyticsEvent.ORDERS_LIST_VIEW_FILTER_OPTIONS_TAPPED)
         triggerEvent(ShowOrderFilters)
@@ -962,11 +974,8 @@ class OrderListViewModel @Inject constructor(
                     if (result.isFailure) {
                         triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                     } else {
-                        fetchOrdersAndOrderDependencies(
-                            onComplete = {
-                                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
-                            }
-                        )
+                        isQueueingBulkUpdateSuccessMessage = true
+                        fetchOrdersAndOrderDependencies()
                     }
                 }
             }

From 9bd7660ba4234906aa293c8024254622de1f0ad1 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 13:38:17 +0700
Subject: [PATCH 32/45] Add a bit of delay before snackbar.

---
 .../android/ui/orders/list/OrderListViewModel.kt         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 11f2a8530c0..5d7a0d6bcd3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -69,6 +69,7 @@ import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.navArgs
 import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -658,8 +659,12 @@ class OrderListViewModel @Inject constructor(
     @Subscribe(threadMode = MAIN)
     fun onOrderListFetched(event: OnListChanged) {
         if (event.isError.not() && isQueueingBulkUpdateSuccessMessage) {
-            triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
-            isQueueingBulkUpdateSuccessMessage = false
+            launch {
+                @Suppress("MagicNumber")
+                delay(1000) // To let the UI update the new order statuses before showing the Snackbar
+                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+                isQueueingBulkUpdateSuccessMessage = false
+            }
         }
     }
 

From 4d5448342532273a0375f9760ab6215473a8f214 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 14:21:24 +0700
Subject: [PATCH 33/45] Remove unused import

---
 .../com/woocommerce/android/ui/orders/list/OrderListViewModel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 5d7a0d6bcd3..83cc7d8f05e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -77,7 +77,6 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 import org.greenrobot.eventbus.ThreadMode.MAIN
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.WCOrderListDescriptor

From 3cc0672411c124a00566d19b746a2267dbabfae0 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 16:14:49 +0700
Subject: [PATCH 34/45] First attempt at bulk order status configuration change
 persistence.

---
 .../android/ui/orders/list/OrderListFragment.kt   | 15 +++++++++++++++
 .../android/ui/orders/list/OrderListViewModel.kt  |  7 +++++++
 2 files changed, 22 insertions(+)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 98b1c3c313f..3c32d131817 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -406,6 +406,18 @@ class OrderListFragment :
                 outState.putBoolean(LAST_WINDOW_SIZE_WAS_LARGER_THAN_COMPACT, true)
             }
         }
+        tracker?.onSaveInstanceState(outState)
+    }
+
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        tracker?.run {
+            onRestoreInstanceState(savedInstanceState)
+            if (hasSelection()) {
+                viewModel.onRestoreSelection(selection.toList())
+            }
+        }
+
+        super.onViewStateRestored(savedInstanceState)
     }
 
     override fun onDestroyView() {
@@ -414,6 +426,8 @@ class OrderListFragment :
         searchView = null
         orderListMenu = null
         searchMenuItem = null
+        tracker = null
+        actionMode = null
         super.onDestroyView()
         _binding = null
     }
@@ -614,6 +628,7 @@ class OrderListFragment :
                 is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
                     showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
+                is OrderListViewModel.OrderListEvent.SelectOrders -> tracker?.setItemsSelected(event.ordersIds, true)
 
                 is MultiLiveEvent.Event.ShowSnackbar -> uiMessageResolver.showSnack(event.message)
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 83cc7d8f05e..89a51ab0420 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -55,6 +55,7 @@ import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptor
 import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptorWithFiltersAndSearchQuery
 import com.woocommerce.android.ui.orders.filters.domain.ShouldShowCreateTestOrderScreen
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.RetryLoadingOrders
+import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.SelectOrders
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowErrorSnack
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowOrderFilters
 import com.woocommerce.android.util.CoroutineDispatchers
@@ -989,6 +990,10 @@ class OrderListViewModel @Inject constructor(
         exitSelectionMode()
     }
 
+    fun onRestoreSelection(selectedOrdersIds: List<Long>) {
+        triggerEvent(SelectOrders(selectedOrdersIds))
+    }
+
     sealed class OrderListEvent : Event() {
         data class ShowErrorSnack(@StringRes val messageRes: Int) : OrderListEvent()
         object ShowOrderFilters : OrderListEvent()
@@ -1046,6 +1051,8 @@ class OrderListViewModel @Inject constructor(
                 return result
             }
         }
+
+        data class SelectOrders(val ordersIds: List<Long>) : OrderListEvent()
     }
 
     @Parcelize

From 1650997e9a3716f9fb93757017b6e15e6c4f9d16 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 19:11:32 +0700
Subject: [PATCH 35/45] Delete unneeded class

---
 .../android/ui/orders/DefaultOrderListItemLookup.kt      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/DefaultOrderListItemLookup.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/DefaultOrderListItemLookup.kt
index d1b04ccd209..51e469c0632 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/DefaultOrderListItemLookup.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/DefaultOrderListItemLookup.kt
@@ -30,12 +30,3 @@ class DefaultOrderItemDetailsLookup(
     override fun getPosition() = position
     override fun getSelectionKey() = orderId
 }
-
-class SelectableOrderItemDetailsLookup(
-    private val position: Int,
-    private val orderId: Long
-) : ItemDetailsLookup.ItemDetails<Long>() {
-    override fun getPosition() = position
-    override fun getSelectionKey() = orderId
-    override fun inSelectionHotspot(e: MotionEvent) = true
-}

From d3184964977a41d4b1308e4237a614b49949dc3d Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 19:34:22 +0700
Subject: [PATCH 36/45] Simplify restoring selected items.

---
 .../android/ui/orders/list/OrderListFragment.kt            | 3 +--
 .../android/ui/orders/list/OrderListViewModel.kt           | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 3c32d131817..a8ea68a8401 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -413,7 +413,7 @@ class OrderListFragment :
         tracker?.run {
             onRestoreInstanceState(savedInstanceState)
             if (hasSelection()) {
-                viewModel.onRestoreSelection(selection.toList())
+                setItemsSelected(selection.toList(), true)
             }
         }
 
@@ -628,7 +628,6 @@ class OrderListFragment :
                 is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
                     showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
-                is OrderListViewModel.OrderListEvent.SelectOrders -> tracker?.setItemsSelected(event.ordersIds, true)
 
                 is MultiLiveEvent.Event.ShowSnackbar -> uiMessageResolver.showSnack(event.message)
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 89a51ab0420..83cc7d8f05e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -55,7 +55,6 @@ import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptor
 import com.woocommerce.android.ui.orders.filters.domain.GetWCOrderListDescriptorWithFiltersAndSearchQuery
 import com.woocommerce.android.ui.orders.filters.domain.ShouldShowCreateTestOrderScreen
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.RetryLoadingOrders
-import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.SelectOrders
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowErrorSnack
 import com.woocommerce.android.ui.orders.list.OrderListViewModel.OrderListEvent.ShowOrderFilters
 import com.woocommerce.android.util.CoroutineDispatchers
@@ -990,10 +989,6 @@ class OrderListViewModel @Inject constructor(
         exitSelectionMode()
     }
 
-    fun onRestoreSelection(selectedOrdersIds: List<Long>) {
-        triggerEvent(SelectOrders(selectedOrdersIds))
-    }
-
     sealed class OrderListEvent : Event() {
         data class ShowErrorSnack(@StringRes val messageRes: Int) : OrderListEvent()
         object ShowOrderFilters : OrderListEvent()
@@ -1051,8 +1046,6 @@ class OrderListViewModel @Inject constructor(
                 return result
             }
         }
-
-        data class SelectOrders(val ordersIds: List<Long>) : OrderListEvent()
     }
 
     @Parcelize

From 56847fd3b7630c1f7ec41afdb3f1bd28f8e1d2aa Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 19:50:38 +0700
Subject: [PATCH 37/45] Refactor to avoid notifyDataSetChanged, as it also
 resets the selection state.

---
 .../woocommerce/android/ui/orders/list/OrderListAdapter.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
index 5eee41474ed..9fb99a760b5 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
@@ -126,7 +126,11 @@ class OrderListAdapter(
     fun setOrderStatusOptions(orderStatusOptions: Map<String, WCOrderStatusModel>) {
         if (orderStatusOptions.keys != activeOrderStatusMap.keys) {
             this.activeOrderStatusMap = orderStatusOptions
-            notifyDataSetChanged()
+            for (position in 0 until itemCount) {
+                if (getItem(position) is OrderListItemUI) {
+                    notifyItemChanged(position)
+                }
+            }
         }
     }
 

From 2eea9e089641d9814fd199970a53629e2a9e3774 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Tue, 31 Dec 2024 20:43:47 +0700
Subject: [PATCH 38/45] Simplify as onRestoreInstanceState alone automatically
 restores selection

---
 .../woocommerce/android/ui/orders/list/OrderListFragment.kt    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index a8ea68a8401..2e355b7b328 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -412,9 +412,6 @@ class OrderListFragment :
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
         tracker?.run {
             onRestoreInstanceState(savedInstanceState)
-            if (hasSelection()) {
-                setItemsSelected(selection.toList(), true)
-            }
         }
 
         super.onViewStateRestored(savedInstanceState)

From 9a76a8ec84934189c3ddf792ffb0efc2850bd3a3 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Thu, 2 Jan 2025 12:57:28 +0100
Subject: [PATCH 39/45] First attempt to fix loosing selecting state when
 loading next page

---
 .../android/ui/orders/OrderSelectionItemKeyProvider.kt    | 8 ++------
 .../android/ui/orders/list/OrderListAdapter.kt            | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderSelectionItemKeyProvider.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderSelectionItemKeyProvider.kt
index b776f59bedb..f332adcac4f 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderSelectionItemKeyProvider.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderSelectionItemKeyProvider.kt
@@ -17,10 +17,6 @@ class OrderSelectionItemKeyProvider(private val recyclerView: RecyclerView) :
         }
     }
 
-    override fun getPosition(key: Long): Int {
-        return (recyclerView.adapter as? OrderListAdapter)?.currentList
-            ?.indexOfFirst { item ->
-                item is OrderListItemUIType.OrderListItemUI && item.orderId == key
-            } ?: RecyclerView.NO_POSITION
-    }
+    override fun getPosition(key: Long): Int =
+        (recyclerView.adapter as? OrderListAdapter)?.orderIdAndPosition[key] ?: RecyclerView.NO_POSITION
 }
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
index 9fb99a760b5..84847cdf08b 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
@@ -38,6 +38,7 @@ class OrderListAdapter(
     var activeOrderStatusMap: Map<String, WCOrderStatusModel> = emptyMap()
     var allOrderIds: List<Long> = listOf()
     var tracker: SelectionTracker<Long>? = null
+    val orderIdAndPosition = mutableMapOf<Long, Int>()
 
     override fun getItemViewType(position: Int): Int {
         return when (getItem(position)) {
@@ -97,6 +98,7 @@ class OrderListAdapter(
                     allOrderIds,
                     isActivated = tracker?.isSelected(item.orderId) ?: false
                 )
+                orderIdAndPosition[item.orderId] = position
             }
             is SectionHeaderViewHolder -> {
                 if (BuildConfig.DEBUG && item !is SectionHeader) {

From c68abf6e8ca160627a09975dfbd518eef321bafb Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Thu, 2 Jan 2025 19:32:54 +0700
Subject: [PATCH 40/45] Save and restore `orderIdAndPosition` to survive
 configuration change, using viewModel as its storage.

---
 .../android/ui/orders/list/OrderListAdapter.kt            | 2 +-
 .../android/ui/orders/list/OrderListFragment.kt           | 8 ++++++++
 .../android/ui/orders/list/OrderListViewModel.kt          | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
index 84847cdf08b..3bf8a0ce850 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
@@ -38,7 +38,7 @@ class OrderListAdapter(
     var activeOrderStatusMap: Map<String, WCOrderStatusModel> = emptyMap()
     var allOrderIds: List<Long> = listOf()
     var tracker: SelectionTracker<Long>? = null
-    val orderIdAndPosition = mutableMapOf<Long, Int>()
+    var orderIdAndPosition = mutableMapOf<Long, Int>()
 
     override fun getItemViewType(position: Int): Int {
         return when (getItem(position)) {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 2e355b7b328..065d04b275e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -407,11 +407,19 @@ class OrderListFragment :
             }
         }
         tracker?.onSaveInstanceState(outState)
+        viewModel.orderIdAndPositionBackup =
+            ((binding.orderListView.ordersList.adapter as? OrderListAdapter)?.orderIdAndPosition
+                ?: emptyMap()) as MutableMap<Long, Int>
     }
 
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
         tracker?.run {
             onRestoreInstanceState(savedInstanceState)
+            (binding.orderListView.ordersList.adapter as? OrderListAdapter)?.orderIdAndPosition =
+                viewModel.orderIdAndPositionBackup
+            if (hasSelection()) {
+                setItemsSelected(selection.toList(), true)
+            }
         }
 
         super.onViewStateRestored(savedInstanceState)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 83cc7d8f05e..b4a7c91c40d 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -182,6 +182,8 @@ class OrderListViewModel @Inject constructor(
 
     val orderId: LiveData<Long> = savedState.getLiveData<Long>("orderId")
 
+    var orderIdAndPositionBackup = mutableMapOf<Long, Int>()
+
     private val _emptyViewType: ThrottleLiveData<EmptyViewType?> by lazy {
         ThrottleLiveData(
             offset = EMPTY_VIEW_THROTTLE,

From 8b9df9b89c15398bb90fe4b93d80cc7255ca907c Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Thu, 2 Jan 2025 21:03:32 +0700
Subject: [PATCH 41/45] Edge case fix where if moving from portrait to
 landscape to portait again, show list panel if on bulk selection mode.

---
 .../woocommerce/android/ui/orders/list/OrderListFragment.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 065d04b275e..61ab259671a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -356,7 +356,11 @@ class OrderListFragment :
 
     private fun adjustLayoutForNonTablet(savedInstanceState: Bundle?) {
         if (wasLastWindowSizeLargerThanCompact(savedInstanceState)) {
-            displayDetailPaneOnly()
+            if (viewModel.isSelecting()) {
+                displayListPaneOnly()
+            } else {
+                displayDetailPaneOnly()
+            }
         } else {
             displayListPaneOnly()
         }

From 9b952435f0ce4ed29f32596a4c996f7a3fc8a6dc Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Thu, 2 Jan 2025 16:02:50 +0100
Subject: [PATCH 42/45] Fix keeping of the selection when rotating the device

---
 .../ui/orders/list/OrderListAdapter.kt        | 25 +++++++++++++++++++
 .../ui/orders/list/OrderListFragment.kt       | 19 --------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
index 3bf8a0ce850..8e54f1bf0a3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListAdapter.kt
@@ -25,6 +25,7 @@ import com.woocommerce.android.ui.orders.list.OrderListItemUIType.SectionHeader
 import com.woocommerce.android.util.CurrencyFormatter
 import com.woocommerce.android.widgets.tags.TagView
 import org.wordpress.android.fluxc.model.WCOrderStatusModel
+
 class OrderListAdapter(
     val listener: OrderListListener,
     val currencyFormatter: CurrencyFormatter
@@ -62,10 +63,12 @@ class OrderListAdapter(
                     )
                 )
             }
+
             VIEW_TYPE_LOADING -> {
                 val view = inflater.inflate(R.layout.skeleton_order_list_item_auto, parent, false)
                 LoadingViewHolder(view)
             }
+
             VIEW_TYPE_SECTION_HEADER -> {
                 SectionHeaderViewHolder(
                     OrderListHeaderBinding.inflate(
@@ -75,6 +78,7 @@ class OrderListAdapter(
                     )
                 )
             }
+
             else -> {
                 // Fail fast if a new view type is added so we can handle it
                 throw IllegalStateException("The view type '$viewType' needs to be handled")
@@ -100,6 +104,7 @@ class OrderListAdapter(
                 )
                 orderIdAndPosition[item.orderId] = position
             }
+
             is SectionHeaderViewHolder -> {
                 if (BuildConfig.DEBUG && item !is SectionHeader) {
                     error(
@@ -109,6 +114,7 @@ class OrderListAdapter(
                 }
                 holder.onBind((item as SectionHeader))
             }
+
             else -> {}
         }
     }
@@ -190,6 +196,7 @@ class OrderListAdapter(
                         viewBinding.root.context.getColor(R.color.color_item_selected)
                     )
                 }
+
                 else -> {
                     viewBinding.orderItemLayout.setBackgroundColor(Color.TRANSPARENT)
                 }
@@ -215,6 +222,7 @@ class OrderListAdapter(
             extras[SwipeToComplete.OLD_STATUS] = orderItemUI.status
 
             this.itemView.setOnClickListener {
+                if (shouldPreventDetailNavigation(orderId)) return@setOnClickListener
                 listener.openOrderDetail(
                     orderId = orderItemUI.orderId,
                     allOrderIds = allOrderIds,
@@ -224,6 +232,23 @@ class OrderListAdapter(
             }
         }
 
+        //  Some edge cases in order selection mode, like tapping the screen with 4 fingers or using TalkBack,
+        //  cause the order's onClick listener to gain focus over the selection tracker.
+        //  This quick fix will prevent the app from entering an unexpected status when the app is in selection mode.
+        private fun shouldPreventDetailNavigation(orderId: Long): Boolean {
+            if (tracker?.selection?.size() != 0) {
+                tracker?.let { selectionTracker ->
+                    if (selectionTracker.isSelected(orderId)) {
+                        selectionTracker.deselect(orderId)
+                    } else {
+                        selectionTracker.select(orderId)
+                    }
+                }
+                return true
+            }
+            return false
+        }
+
         /**
          * Converts the order status label into an [OrderStatusTag], creates the associated [TagView],
          * and add it to the holder. No need to trim the label text since this is done in [OrderStatusTag]
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 61ab259671a..5b80af9052e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -916,23 +916,6 @@ class OrderListFragment :
         binding.orderListView.submitPagedList(pagedListData)
     }
 
-    //  Some edge cases in order selection mode, like tapping the screen with 4 fingers or using TalkBack,
-    //  cause the order's onClick listener to gain focus over the selection tracker.
-    //  This quick fix will prevent the app from entering an unexpected status when the app is in selection mode.
-    private fun shouldPreventDetailNavigation(orderId: Long): Boolean {
-        if (viewModel.isSelecting()) {
-            tracker?.let { selectionTracker ->
-                if (selectionTracker.isSelected(orderId)) {
-                    selectionTracker.deselect(orderId)
-                } else {
-                    selectionTracker.select(orderId)
-                }
-            }
-            return true
-        }
-        return false
-    }
-
     override fun openOrderDetail(
         orderId: Long,
         allOrderIds: List<Long>,
@@ -940,8 +923,6 @@ class OrderListFragment :
         sharedView: View?,
         startPaymentsFlow: Boolean,
     ) {
-        if (shouldPreventDetailNavigation(orderId)) return
-
         viewModel.trackOrderClickEvent(
             orderId,
             orderStatus,

From 5639575814e37988a427cea7bfb95dd93e77e698 Mon Sep 17 00:00:00 2001
From: jorgemucientesfayos <jorge.mucientes@automattic.com>
Date: Thu, 2 Jan 2025 17:55:13 +0100
Subject: [PATCH 43/45] Fix detekt long line issue

---
 .../android/ui/orders/list/OrderListFragment.kt            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
index 5b80af9052e..b9705b75ae7 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -412,8 +412,8 @@ class OrderListFragment :
         }
         tracker?.onSaveInstanceState(outState)
         viewModel.orderIdAndPositionBackup =
-            ((binding.orderListView.ordersList.adapter as? OrderListAdapter)?.orderIdAndPosition
-                ?: emptyMap()) as MutableMap<Long, Int>
+            ((binding.orderListView.ordersList.adapter as? OrderListAdapter)?.orderIdAndPosition ?: emptyMap())
+                as MutableMap<Long, Int>
     }
 
     override fun onViewStateRestored(savedInstanceState: Bundle?) {
@@ -631,9 +631,11 @@ class OrderListFragment :
                     actionText = event.actionText,
                     action = event.action
                 )
+
                 is OrderListViewModel.OrderListEvent.RetryLoadingOrders -> refreshOrders()
                 is OrderListViewModel.OrderListEvent.OpenOrderCreationWithSimplePaymentsMigration ->
                     openOrderCreationFragment(indicateSimplePaymentsMigration = true)
+
                 is OrderListViewModel.OrderListEvent.ShowUpdateStatusDialog -> {
                     showBulkUpdateStatusDialog(event.currentStatus, event.orderStatusList)
                 }
@@ -650,6 +652,7 @@ class OrderListFragment :
                     viewModel.trashOrder(event.orderId)
                     selectedOrder.selectOrder(-1L)
                 }
+
                 else -> event.isHandled = false
             }
         }

From afbf9ba153de54cc8408bbd1396c4348343f47cd Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 3 Jan 2025 14:21:33 +0700
Subject: [PATCH 44/45] Improve way to refresh data and display success message
 after successful update.

---
 .../ui/orders/list/OrderListViewModel.kt      | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index 83cc7d8f05e..927ec1c10af 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -69,7 +69,6 @@ import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.navArgs
 import com.woocommerce.android.widgets.WCEmptyView.EmptyViewType
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
@@ -86,9 +85,9 @@ import org.wordpress.android.fluxc.network.rest.wpcom.wc.order.CoreOrderStatus
 import org.wordpress.android.fluxc.store.ListStore
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.PARSE_ERROR
 import org.wordpress.android.fluxc.store.ListStore.ListErrorType.TIMEOUT_ERROR
-import org.wordpress.android.fluxc.store.ListStore.OnListChanged
 import org.wordpress.android.fluxc.store.WCOrderStore
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderSummariesFetched
+import org.wordpress.android.mediapicker.util.distinct
 import java.util.Locale
 import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
@@ -459,6 +458,7 @@ class OrderListViewModel @Inject constructor(
         listenToEmptyViewStateLiveData(pagedListWrapper)
 
         _pagedListData.addSource(pagedListWrapper.data) { pagedList ->
+            viewState = viewState.copy(isBulkUpdating = false)
             pagedList?.let {
                 displayOrdersBannerOrJitm()
                 _pagedListData.value = it
@@ -474,6 +474,14 @@ class OrderListViewModel @Inject constructor(
             _isLoadingMore.value = it
         }
 
+        // Observe status changes in the data
+        pagedListWrapper.data.distinct().observe(this) {
+            if (isQueueingBulkUpdateSuccessMessage) {
+                isQueueingBulkUpdateSuccessMessage = false
+                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
+            }
+        }
+
         pagedListWrapper.listError
             .filter { !dismissListErrors }
             .filterNotNull()
@@ -654,19 +662,6 @@ class OrderListViewModel @Inject constructor(
         }
     }
 
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = MAIN)
-    fun onOrderListFetched(event: OnListChanged) {
-        if (event.isError.not() && isQueueingBulkUpdateSuccessMessage) {
-            launch {
-                @Suppress("MagicNumber")
-                delay(1000) // To let the UI update the new order statuses before showing the Snackbar
-                triggerEvent(Event.ShowSnackbar(R.string.orderlist_bulk_update_status_updated))
-                isQueueingBulkUpdateSuccessMessage = false
-            }
-        }
-    }
-
     fun onFiltersButtonTapped() {
         AnalyticsTracker.track(AnalyticsEvent.ORDERS_LIST_VIEW_FILTER_OPTIONS_TAPPED)
         triggerEvent(ShowOrderFilters)
@@ -971,15 +966,12 @@ class OrderListViewModel @Inject constructor(
                         newStatus = newStatus
                     )
 
-                    // Remove refreshing state early, because the fetch after successful result will show another
-                    // loading state.
-                    viewState = viewState.copy(isBulkUpdating = false)
-
                     if (result.isFailure) {
+                        viewState = viewState.copy(isBulkUpdating = false)
                         triggerEvent(Event.ShowSnackbar(R.string.error_generic))
                     } else {
                         isQueueingBulkUpdateSuccessMessage = true
-                        fetchOrdersAndOrderDependencies()
+                        ordersPagedListWrapper?.fetchFirstPage()
                     }
                 }
             }

From 45f444dcef5a9e8e0c3303fcb043b5c697e51df7 Mon Sep 17 00:00:00 2001
From: Hafiz Rahman <hfzrhmn@gmail.com>
Date: Fri, 3 Jan 2025 18:04:46 +0700
Subject: [PATCH 45/45] Indentation fix

---
 .../woocommerce/android/ui/orders/list/OrderListViewModel.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
index ab282df8cde..ec5acf4d9a3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -995,9 +995,9 @@ class OrderListViewModel @Inject constructor(
                         analyticsTracker.track(
                             AnalyticsEvent.ORDERS_LIST_BULK_UPDATE_SUCCESS,
                             mapOf(
-                                    AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
-                                )
+                                AnalyticsTracker.KEY_PROPERTY to AnalyticsTracker.VALUE_STATUS,
                             )
+                        )
                     }
                 }
             }