Update Loading and Error visibilities

woocommerce · Jan 2, 2025 · 5029816 · 5029816
1 parent 9e09365
commit 5029816
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/...e/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationFragment.kt b/...e/android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationFragment.kt
@@ -85,7 +85,7 @@ class WooShippingLabelPackageCreationFragment : BaseFragment() {
             progressDialog = CustomProgressDialog.show(
                 title = getString(R.string.loading),
                 message = getString(R.string.please_wait)
-            )
+            ).also { it.show(parentFragmentManager, CustomProgressDialog.TAG) }
         } else {
             progressDialog?.dismiss()
             progressDialog = null
@@ -98,15 +98,10 @@ class WooShippingLabelPackageCreationFragment : BaseFragment() {
             titleId = R.string.woo_shipping_labels_package_creation_error_title,
             messageId = R.string.woo_shipping_labels_package_creation_error_message,
             positiveButtonId = R.string.woo_shipping_labels_package_creation_error_proceed,
-            neutralButtonId = R.string.woo_shipping_labels_package_creation_error_retry,
-            negativeButtonId = R.string.woo_shipping_labels_package_creation_error_cancel,
+            neutralButtonId = R.string.woo_shipping_labels_package_creation_error_cancel,
             posBtnAction = { _, _ ->
                 viewModel.onAddCustomPackageClick(savePackageAsTemplate = false)
-            },
-            neutBtAction = { _, _ ->
-                viewModel.onAddCustomPackageClick(savePackageAsTemplate = true)
             }
-
         )
     }
 

diff --git a/.../android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt b/.../android/ui/orders/wooshippinglabels/packages/WooShippingLabelPackageCreationViewModel.kt
@@ -196,6 +196,7 @@ class WooShippingLabelPackageCreationViewModel @Inject constructor(
                 ?.let { sendCustomPackageToStore(it, customPackage) }
                 ?.fold(
                     onSuccess = {
+                        triggerEvent(ShowLoadingDialog(false))
                         triggerEvent(PackageSelected(customPackage.toPackageData()))
                     },
                     onFailure = {

diff --git a/WooCommerce/src/main/res/values/strings.xml b/WooCommerce/src/main/res/values/strings.xml
@@ -4448,9 +4448,8 @@
     <string name="woo_shipping_labels_package_creation_box_type">Box</string>
     <string name="woo_shipping_labels_package_creation_envelope_type">Envelope</string>
     <string name="woo_shipping_labels_package_creation_error_title">We couldn\'t save the package as template</string>
-    <string name="woo_shipping_labels_package_creation_error_message">Do you want to proceed without saving as a template?</string>
+    <string name="woo_shipping_labels_package_creation_error_message">Do you want to proceed without saving it?</string>
     <string name="woo_shipping_labels_package_creation_error_proceed">Proceed</string>
-    <string name="woo_shipping_labels_package_creation_error_retry">Retry</string>
     <string name="woo_shipping_labels_package_creation_error_cancel">Cancel</string>
     <string name="email_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this email address.</string>
 </resources>