close bottom sheets before navigating back

woocommerce · Jan 12, 2025 · a7f1592 · a7f1592
1 parent 4cdfcea
commit a7f1592
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/.../com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt b/.../com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt
@@ -445,8 +445,19 @@ class WooShippingLabelCreationViewModel @Inject constructor(
         customWeight = input
     }
 
-    fun onNavigateBack() {
-        triggerEvent(Event.Exit)
+    fun onNavigateBack(): Boolean {
+        val state = uiState.value
+        return when {
+            state.isAddressSelectionExpanded -> {
+                uiState.update { it.copy(isAddressSelectionExpanded = false) }
+                false
+            }
+            state.isShipmentDetailsExpanded -> {
+                uiState.update { it.copy(isShipmentDetailsExpanded = false) }
+                false
+            }
+            else -> true
+        }
     }
 
     data object StartPackageSelection : Event()