Skip to content

@W-19454052 feat: summarize shipping options section if default option available and selected #3335

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

Closed
sf-henry-semaganda wants to merge 4 commits into from
Closed

@W-19454052 feat: summarize shipping options section if default option available and selected #3335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4ec10e
summarize if default option available and selected
sf-henry-semaganda Sep 18, 2025
3d2d780
update lint
sf-henry-semaganda Sep 22, 2025
caaf4fb
fix loading state
sf-henry-semaganda Sep 22, 2025
8d9dc23
fix loading test
sf-henry-semaganda Sep 22, 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
7 changes: 6 additions & 1 deletion packages/template-retail-react-app/app/pages/checkout/partials/shipping-methods.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@ export default function ShippingMethods() {
const hasValidShippingInfo =
deliveryShipments.length > 0 && deliveryShipments.every((s) => s.shippingAddress)

// Check if any shipments are missing shipping methods
const hasMissingShippingMethods = deliveryShipments.some(
(s) => !s.shippingMethod || !s.shippingMethod.id
)

const isFormValid =
form.formState.isValid ||
deliveryShipments.every((s) => s.shippingMethod && s.shippingMethod.id)
Expand Down Expand Up @@ -265,7 +270,7 @@ export default function ShippingMethods() {
defaultMessage: 'Shipping & Gift Options',
id: 'shipping_options.title.shipping_gift_options'
})}
editing={step === STEPS.SHIPPING_OPTIONS}
editing={step === STEPS.SHIPPING_OPTIONS && hasMissingShippingMethods}
isLoading={form.formState.isSubmitting}
disabled={!hasValidShippingInfo}
onEdit={() => goToStep(STEPS.SHIPPING_OPTIONS)}
Expand Down
7 changes: 7 additions & 0 deletions packages/template-retail-react-app/app/pages/checkout/partials/shipping-methods.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,13 @@ describe('ShippingMethods', () => {
})

test('should show loading spinner for shipping methods when shipping methods are loading', async () => {
mockUseCurrentBasket.mockReturnValue({
data: null,
derivedData: {
totalShippingCost: undefined
},
isLoading: true
})
mockUseShippingMethodsForShipment.mockReturnValue({
data: null,
isLoading: true
Expand Down
Loading