[Shipping Labels Revamp] Update purchase screen with HAZMAT data #13847

ThomazFB · 2025-03-26T15:07:49Z

Summary

Fix issue #13841 by updating the Purchased screen with the Hazmat data.

The Hazmat was already defined within the UI, but it wasn't carrying any data from the Creation form. To fix this, this PR updates the data wiring between the Creation form and Purchased screen to contain the selected Hazmat category.

Also, it updates the Hazmat card inside the Purchased screen to follow the Figma designs.

Screen Capture

Hazmat.purchased.screen.mp4

How to Test

Open the Shipping Label creation form
Select a Hazmat category
Create the label
Verify that the Purchased screen correctly displays the selected Hazmat category

Update release notes:

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

…screen

…lay the selected HAZMAT category

wpmobilebot · 2025-03-26T15:12:40Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`b2944cf`
	Direct Download	`woocommerce-wear-prototype-build-pr13847-b2944cf.apk`

wpmobilebot · 2025-03-26T15:23:31Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`b2944cf`
	Direct Download	`woocommerce-prototype-build-pr13847-b2944cf.apk`

codecov-commenter · 2025-04-02T02:50:52Z

Codecov Report

Attention: Patch coverage is 5.71429% with 66 lines in your changes missing coverage. Please review.

Project coverage is 38.29%. Comparing base (ed48b9f) to head (b2944cf).
Report is 31 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...d/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt	0.00%	66 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #13847      +/-   ##
============================================
- Coverage     38.31%   38.29%   -0.03%     
  Complexity     9357     9357              
============================================
  Files          2088     2089       +1     
  Lines        115379   115448      +69     
  Branches      14743    14769      +26     
============================================
+ Hits          44206    44209       +3     
- Misses        67147    67213      +66     
  Partials       4026     4026

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

… Purchase screen composable

ThomazFB · 2025-04-02T04:20:58Z

@irfano @atorresveiga during this PR progress, I've noticed that the Purchased screen contains a code repetition of the Purchased composable. One of them is used solely for Preview purposes. This can be verified by comparing the code of the WooShippingLabelPurchasedWithBottomSheetScreen and WooShippingLabelPurchasedScreen composables.

I understand the reasoning for the preview-only code, but this is causing a lot of confusion during development. More than once, I ran an entire Label purchase flow for tests and then noticed that I only updated the Preview composable, not the real one.

I'm inclined to refactor this in a separate PR so that the WooShippingLabelPurchasedWithBottomSheetScreen reuses the WooShippingLabelPurchasedScreen internally, so we remove this duplication. What do you folks think?

…ckable mode

dangermattic · 2025-04-02T10:53:06Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

...rce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt

+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Icon


...rce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt

+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme


...rce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt

+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface


...rce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/hazmat/HazmatCard.kt

+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text


irfano

I verified the Hazmat selection on the purchased screen. LGTM! 👍🏻

irfano · 2025-04-07T16:20:32Z

I'm inclined to refactor this in a separate PR so that the WooShippingLabelPurchasedWithBottomSheetScreen reuses the WooShippingLabelPurchasedScreen internally, so we remove this duplication. What do you folks think?

This makes sense, and we can do it in a separate PR. Opened an issue: WOOMOB-266

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationScreen.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt

ThomazFB added 3 commits March 26, 2025 12:04

Update the PurchasedShippingLabelData with the Hazmat selection field

5953d00

Wire the Hazmat selection from the Creation screen into the Purchase …

00a5ce3

…screen

Update the HazmatCard in WooShippingLabelPurchasedScreen to also disp…

f158a9c

…lay the selected HAZMAT category

ThomazFB added type: task An internally driven task. feature: shipping labels Related to creating, ordering, or printing shipping labels. labels Mar 26, 2025

ThomazFB added this to the 22.1 milestone Mar 26, 2025

ThomazFB linked an issue Mar 26, 2025 that may be closed by this pull request

[Hazmat] Update Purchase screen Hazmat section #13841

Closed

ThomazFB changed the title ~~Issue/update purchase screen hazmat data~~ [Shipping Labels Revamp] Update purchase screen with HAZMAT data Mar 26, 2025

ThomazFB added 3 commits March 27, 2025 19:56

Update HazmatSelectionCard text color for better dark mode support

ebab577

Add the Hazmat selection into the Purchased screen preview

9a3f236

Fix WooShippingLabelCreationViewModelTest

a676fd9

Base automatically changed from issue/add-hazmat-category-edit-option to trunk March 31, 2025 09:01

ThomazFB mentioned this pull request Mar 31, 2025

Fix color issue on the shipping label success screen #13874

Merged

4 tasks

ThomazFB added 3 commits April 1, 2025 23:01

Merge branch 'trunk' into issue/update-purchase-screen-hazmat-data

7da8cfa

Adjust the HazmatCard padding to fit with the component reuse

6ea5374

Fix lint issues

8696630

Replicate the changes affecting only the Preview code into the actual…

f7219db

… Purchase screen composable

ThomazFB marked this pull request as ready for review April 2, 2025 04:15

ThomazFB requested review from atorresveiga and irfano April 2, 2025 04:21

ThomazFB added 6 commits April 2, 2025 06:55

Update the HazmatCard to allow a non-clickable mode

86b62c8

Adjust the Hazmat card inside the Purchased screen due to the non-cli…

6567f43

…ckable mode

Extract the HazmatCard into a dedicated component code due to the reuse

79f9261

Overhaul the HazmatCard padding instructions

2031d7c

Adjust the Screens using the HazmatCard to set the expected padding

c3e05f4

Add Previews for the HazmatCard

b80ff2d

ThomazFB added 2 commits April 2, 2025 07:36

Add Previews for the HazmatCard

4940ec4

Adjust clickable selection area for HazmatCard

02a6468

github-advanced-security bot found potential problems Apr 2, 2025

View reviewed changes

irfano modified the milestones: 22.1, 22.2 Apr 4, 2025

irfano self-assigned this Apr 4, 2025

Refactor hazmat selection retrieval in WooShippingLabelCreationViewModel

324b8d1

irfano approved these changes Apr 7, 2025

View reviewed changes

irfano enabled auto-merge April 7, 2025 16:20

irfano force-pushed the issue/update-purchase-screen-hazmat-data branch from df4e6cb to b2944cf Compare April 7, 2025 16:41

irfano merged commit f0bd46f into trunk Apr 7, 2025
17 checks passed

irfano deleted the issue/update-purchase-screen-hazmat-data branch April 7, 2025 17:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Shipping Labels Revamp] Update purchase screen with HAZMAT data #13847

[Shipping Labels Revamp] Update purchase screen with HAZMAT data #13847

Uh oh!

ThomazFB commented Mar 26, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 26, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 26, 2025 •

edited

Loading

Uh oh!

codecov-commenter commented Apr 2, 2025 •

edited

Loading

Uh oh!

ThomazFB commented Apr 2, 2025 •

edited

Loading

Uh oh!

dangermattic commented Apr 2, 2025 •

edited

Loading

Uh oh!

Check warning

Check warning

Check warning

Check warning

irfano left a comment •

edited

Loading

Uh oh!

irfano commented Apr 7, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

[Shipping Labels Revamp] Update purchase screen with HAZMAT data #13847

[Shipping Labels Revamp] Update purchase screen with HAZMAT data #13847

Uh oh!

Conversation

ThomazFB commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Screen Capture

How to Test

Reviewer (or Author, in the case of optional code reviews):

Uh oh!

wpmobilebot commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-commenter commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ThomazFB commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dangermattic commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

irfano left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

irfano commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ThomazFB commented Mar 26, 2025 •

edited

Loading

wpmobilebot commented Mar 26, 2025 •

edited

Loading

wpmobilebot commented Mar 26, 2025 •

edited

Loading

codecov-commenter commented Apr 2, 2025 •

edited

Loading

ThomazFB commented Apr 2, 2025 •

edited

Loading

dangermattic commented Apr 2, 2025 •

edited

Loading

irfano left a comment •

edited

Loading

irfano commented Apr 7, 2025 •

edited

Loading