Fix crash after splitting shipments

irfano · irfano · commit 0eeffcaae8ed · 2025-09-01T13:03:59.000+03:00
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt
@@ -818,14 +818,13 @@ class WooShippingLabelCreationViewModel @Inject constructor(
     }
 
     fun onShipmentSplit(newShipments: List<ShipmentUIModel>) {
-        shipments.value = newShipments
         if (selectedShipmentIndex >= newShipments.size) {
             uiState.update {
                 it.copy(selectedIndex = it.selectedIndex.coerceAtMost(newShipments.size - 1))
             }
-        } else {
-            resetWeight(selectedShipmentIndex)
         }
+        shipments.value = newShipments
+        resetWeight(selectedShipmentIndex)
     }
 
     fun onShippingLabelRefunded(labelId: Long) {

Original file line number	Diff line number	Diff line change
`@@ -818,14 +818,13 @@ class WooShippingLabelCreationViewModel @Inject constructor(`
`818`	`818`	`}`
`819`	`819`
`820`	`820`	`fun onShipmentSplit(newShipments: List<ShipmentUIModel>) {`
`821`		`- shipments.value = newShipments`
`822`	`821`	`if (selectedShipmentIndex >= newShipments.size) {`
`823`	`822`	`uiState.update {`
`824`	`823`	`it.copy(selectedIndex = it.selectedIndex.coerceAtMost(newShipments.size - 1))`
`825`	`824`	`}`
`826`		`- } else {`
`827`		`- resetWeight(selectedShipmentIndex)`
`828`	`825`	`}`
	`826`	`+ shipments.value = newShipments`
	`827`	`+ resetWeight(selectedShipmentIndex)`
`829`	`828`	`}`
`830`	`829`
`831`	`830`	`fun onShippingLabelRefunded(labelId: Long) {`