solve conflicts

woocommerce · Jan 4, 2025 · 99625db · 99625db
1 parent fdf7bab
commit 99625db
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.../android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt b/.../android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt
@@ -203,13 +203,19 @@ class WooShippingLabelPackageCreationViewModel @Inject constructor(
                 ?.fold(
                     onSuccess = {
                         triggerEvent(ShowLoadingDialog(false))
-                        triggerEvent(PackageSelected(customPackage.toPackageData()))
+                        triggerEvent(
+                            PackageSelected(customPackage.toPackageData(dimensionUnit = storeOptions.dimensionUnit))
+                        )
                     },
                     onFailure = {
                         triggerEvent(ShowLoadingDialog(false))
                         triggerEvent(ShowTemplateCreationErrorDialog)
                     }
-                ) ?: triggerEvent(PackageSelected(customPackage.toPackageData()))
+                ) ?: triggerEvent(
+                PackageSelected(
+                    customPackage.toPackageData(dimensionUnit = storeOptions.dimensionUnit)
+                )
+            )
         }
     }