Skip to content

[Shipping Labels] Update the disabled button text on the package selection screen #14558

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 8, 2025
Merged

[Shipping Labels] Update the disabled button text on the package selection screen #14558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed9a53e
Update text of Add Package button on Custom screen
irfano Sep 3, 2025
92ba883
Update text of Add Package button on the Carrier screen
irfano Sep 3, 2025
0217a56
Update "Add package" button text on the Saved screen
irfano Sep 3, 2025
1043861
Update release notes for package selection screen
irfano Sep 3, 2025
10992d7
Merge branch 'trunk' into issue/WOOMOB-12-update-disabled-state-text-…
irfano Sep 4, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- [*] Add more filter options to orders filters sales channel [https://github.com/woocommerce/woocommerce-android/pull/14546]
- [*] Automatically populate the weight field in the create shipment flow [https://github.com/woocommerce/woocommerce-android/pull/14525]
- [*] [Shipping Labels] Fixed displaying incorrect hazardous material option for purchased labels [https://github.com/woocommerce/woocommerce-android/pull/14571]
- [*] Shipping Labels: Updated the disabled button text on the package selection screen [https://github.com/woocommerce/woocommerce-android/pull/14558]

23.1
-----
Expand Down
10 changes: 9 additions & 1 deletion ...mmerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCarrierPackageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,15 @@ fun WooShippingCarrierPackageScreen(
enabled = isAddPackageEnabled,
onClick = onAddPackageClick
) {
Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
Text(
stringResource(
id = if (isAddPackageEnabled) {
Copy link
Contributor Author

@irfano irfano Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a simple UI logic, I made the change here instead of in the ViewModel.

Copy link
Contributor

@JorgeMucientes JorgeMucientes Sep 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure about this. Adding it at screen level means we'll need to replicate this if()else{} 3 times instead of having this logic once at viewmodel level. However, I checked current implementation and adding this change at viewmodel level will involve a bigger refactor than I expected. So I'm good with leaving this as proposed 👍🏼

R.string.woo_shipping_labels_package_creation_add_package
} else {
R.string.shipping_label_select_package_button
}
)
)
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion ...ommerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingCustomPackageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,15 @@ fun WooShippingCustomPackageCreationScreen(
enabled = isAddPackageEnabled,
onClick = { onAddPackageClick(isSaveAsTemplateChecked) }
) {
Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
Text(
stringResource(
id = if (isAddPackageEnabled) {
R.string.woo_shipping_labels_package_creation_add_package
} else {
R.string.woo_shipping_labels_package_creation_add_package_details
}
)
)
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion ...commerce/android/ui/orders/wooshippinglabels/packages/ui/WooShippingSavedPackageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,15 @@ fun WooShippingSavedPackageScreen(
enabled = isAddPackageEnabled,
onClick = onAddPackageClick
) {
Text(stringResource(id = R.string.woo_shipping_labels_package_creation_add_package))
Text(
stringResource(
id = if (isAddPackageEnabled) {
R.string.woo_shipping_labels_package_creation_add_package
} else {
R.string.shipping_label_select_package_button
}
)
)
}
}
}
Expand Down
1 change: 1 addition & 0 deletions WooCommerce/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4655,6 +4655,7 @@
<string name="woo_shipping_labels_package_creation_invalid_dimension">Package dimensions should all be larger than 0.</string>
<string name="woo_shipping_labels_package_creation_save_package_option">Save this as a new package template</string>
<string name="woo_shipping_labels_package_creation_add_package">Add Package</string>
<string name="woo_shipping_labels_package_creation_add_package_details">Add Package Details</string>
<string name="woo_shipping_labels_package_creation_empty_button">Create a custom package</string>
<string name="woo_shipping_labels_package_creation_empty_carrier_message">No carrier information found</string>
<string name="woo_shipping_labels_package_creation_empty_saved_message">No saved packages yet</string>
Expand Down
Loading