From 99625dbd059a007a67ab9b1ad502e7fa9908fe3c Mon Sep 17 00:00:00 2001
From: Alejo <alejandro.torres.veiga@automattic.com>
Date: Sat, 4 Jan 2025 12:37:47 -0300
Subject: [PATCH] solve conflicts

---
 .../WooShippingLabelPackageCreationViewModel.kt        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 331e1b52279..3a0fd59c767 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
@@ -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)
+                )
+            )
         }
     }