Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix: delivery method sheet opening every non-Internal method as Internal

Damian Legawiec5a31b9d230f8
diff --git a/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx b/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
index 42e20fdec1..f2df8bc553 100644
--- a/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
+++ b/packages/dashboard/src/components/spree/shipping/delivery-method-form.tsx
@@ -544,10 +544,22 @@ function ProvidersCard({
// harmless (blank resolves to Internal) but the shown and saved values
// disagreed. Seed it once the default is known, leaving a touched field or
// a loaded record alone.
+ //
+ // Check the live value as well as the render-time `rateProvider`: when the
+ // sheet resets the form from a loaded record, this effect runs from a
+ // render that still saw the field blank, and trusting that snapshot alone
+ // seeded the default over the record's own provider — every freight or
+ // carrier method opened as Internal.
const defaultRateProvider = rateProviders?.default ?? ''
const rateProviderDirty = !!form.formState.dirtyFields.rate_provider
useEffect(() => {
- if (!defaultRateProvider || rateProvider || rateProviderDirty) return
+ if (
+ !defaultRateProvider ||
+ rateProvider ||
+ form.getValues('rate_provider') ||
+ rateProviderDirty
+ )
+ return
form.setValue('rate_provider', defaultRateProvider)
}, [defaultRateProvider, rateProvider, rateProviderDirty, form])