Skip to content

[Shipping labels] Improve the error message for empty shipping rates list #14433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [*] Shipping Labels: Fix layout issue with address status indicator [https://github.com/woocommerce/woocommerce-android/pull/14437]
- [*] Shipping Labels: Updated shipments tab layout [https://github.com/woocommerce/woocommerce-android/pull/14448]
- [*] Shipping Labels: Add a message for purchased shipments to the Split Shipments screen [https://github.com/woocommerce/woocommerce-android/pull/14455]
- [*] Shipping Labels: Improved the error message for empty shipping rates list [https://github.com/woocommerce/woocommerce-android/pull/14433]

23.0
-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import com.woocommerce.android.ui.orders.wooshippinglabels.purchased.ObserveShip
import com.woocommerce.android.ui.orders.wooshippinglabels.purchased.printing.FetchShippingLabelFile
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.datasource.WooShippingRateModel
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.domain.GetShippingRates
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.domain.NoAvailableRatesException
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.ui.CarrierUI
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.ui.ShippingRateOption
import com.woocommerce.android.ui.orders.wooshippinglabels.rates.ui.ShippingRateUI
Expand Down Expand Up @@ -636,7 +637,13 @@ class WooShippingLabelCreationViewModel @Inject constructor(
trackShippingRatesLoading(isSuccess = true)
},
onFailure = { exception ->
updateState(ShippingRatesState.Error)
val errorMessage = if (exception is NoAvailableRatesException) {
exception.messageResId
} else {
R.string.woo_shipping_labels_package_creation_shipping_rates_loading_error
}

updateState(ShippingRatesState.Error(errorMessage))
trackShippingRatesLoading(isSuccess = false, error = exception.message)
}
)
Expand Down Expand Up @@ -1231,7 +1238,7 @@ class WooShippingLabelCreationViewModel @Inject constructor(
val missingDescription: Int
) : ShippingRatesState()

data object Error : ShippingRatesState()
data class Error(@StringRes val message: Int) : ShippingRatesState()

data class Loading(
val selectedRatesSortOrder: ShippingSortOption
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
Expand All @@ -30,7 +31,8 @@ fun ErrorMessageWithButton(
Column(
modifier = modifier
.fillMaxSize()
.background(MaterialTheme.colors.surface),
.background(MaterialTheme.colors.surface)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(24.dp, Alignment.CenterVertically)
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.woocommerce.android.ui.orders.wooshippinglabels.rates.domain

import androidx.annotation.StringRes
import com.woocommerce.android.R
import com.woocommerce.android.model.Address
import com.woocommerce.android.ui.orders.shippinglabels.creation.ShippingLabelHazmatCategory
import com.woocommerce.android.ui.orders.wooshippinglabels.customs.CustomsData
Expand Down Expand Up @@ -36,7 +38,13 @@ class GetShippingRates @Inject constructor(
).fold(
onSuccess = { ratesResponse ->
if (ratesResponse.isEmpty()) {
Result.failure(Exception("no_rates_available"))
val message = if (hazmatSelection == null) {
R.string.woo_shipping_labels_package_creation_shipping_rates_empty
} else {
R.string.woo_shipping_labels_package_creation_shipping_rates_empty_with_hazmat
}

Result.failure(NoAvailableRatesException(message))
} else {
try {
val mappedRates = shippingMapper(ratesResponse, currencyCode)
Expand All @@ -51,3 +59,5 @@ class GetShippingRates @Inject constructor(
}
)
}

class NoAvailableRatesException(@StringRes val messageResId: Int) : Exception("No available rates")
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.sizeIn
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.woocommerce.android.R
import com.woocommerce.android.ui.orders.wooshippinglabels.WooShippingLabelCreationViewModel
import com.woocommerce.android.ui.orders.wooshippinglabels.packages.components.ErrorMessageWithButton

Expand All @@ -32,8 +31,8 @@ internal fun ShippingRatesSection(
)
}

WooShippingLabelCreationViewModel.ShippingRatesState.Error -> ErrorMessageWithButton(
message = R.string.woo_shipping_labels_package_creation_shipping_rates_loading_error,
is WooShippingLabelCreationViewModel.ShippingRatesState.Error -> ErrorMessageWithButton(
message = shippingRatesState.message,
modifier = Modifier.sizeIn(minHeight = 300.dp),
onRetryClick = { onRefreshShippingRates() }
)
Expand Down
2 changes: 2 additions & 0 deletions WooCommerce/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4626,6 +4626,8 @@
<string name="woo_shipping_labels_package_creation_carrier_loading_error">We are unable to load carrier packages.</string>
<string name="woo_shipping_labels_package_creation_saved_loading_error">We are unable to load saved packages.</string>
<string name="woo_shipping_labels_package_creation_shipping_rates_loading_error">We are unable to load shipping rates.</string>
<string name="woo_shipping_labels_package_creation_shipping_rates_empty">We couldn\'t find a shipping service for the combination of the selected package and the total shipment weight. Please adjust your input and try again.</string>
<string name="woo_shipping_labels_package_creation_shipping_rates_empty_with_hazmat">We couldn\'t find a shipping service for the combination of the selected HAZMAT category, the selected package and the total shipment weight. Please adjust your input and try again.</string>
<string name="woo_shipping_labels_package_creation_starred">Star this item</string>
<string name="woo_shipping_labels_package_creation_unstarred">Unstar this item</string>
<string name="woo_shipping_labels_shipping_rates_missing_destination">Add a destination address to get shipping rates</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,6 @@ class GetShippingRatesTest : BaseUnitTest() {
)

assertTrue(result.isFailure)
assertTrue(result.exceptionOrNull() is NoAvailableRatesException)
}
}