Skip to content

feat(checkout): CHECKOUT-9468 Set state field correctly #2591

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 1 commit into from
Sep 23, 2025
Merged

feat(checkout): CHECKOUT-9468 Set state field correctly #2591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions packages/core/src/app/shipping/SingleShippingForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from '@bigcommerce/checkout-sdk';
import { type FormikProps } from 'formik';
import { debounce, isEqual, noop } from 'lodash';
import React, { useEffect, useRef, useState } from 'react';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { lazy, object } from 'yup';

import { withLanguage, type WithLanguageProps } from '@bigcommerce/checkout/locale';
Expand Down Expand Up @@ -108,6 +108,12 @@ const SingleShippingForm: React.FC<
const [isUpdatingShippingData, setIsUpdatingShippingData] = useState(false);
const [hasRequestedShippingOptions, setHasRequestedShippingOptions] = useState(false);

const stateOrProvinceCodeFormField = useMemo(() => {
return getFields(
values.shippingAddress?.countryCode,
).find(({ name }) => name === 'stateOrProvinceCode');
}, [getFields, values.shippingAddress?.countryCode]);

const debouncedUpdateAddressRef = useRef<any>();

useEffect(() => {
Expand All @@ -131,23 +137,30 @@ const SingleShippingForm: React.FC<
},
shippingAutosaveDelay,
);

return () => {
debouncedUpdateAddressRef.current?.cancel();
};
}, []);

const stateOrProvinceCodeFormField = getFields(
values.shippingAddress?.countryCode,
).find(({ name }) => name === 'stateOrProvinceCode');

useEffect(() => {
// Workaround for a bug found during manual testing:
// When the shipping step first loads, the `stateOrProvinceCode` field may not be there.
// It later appears with an empty value if the selected country has states/provinces.
// To address this, we manually set `stateOrProvinceCode` in Formik.
if (
stateOrProvinceCodeFormField &&
shippingAddress?.stateOrProvinceCode &&
!values.shippingAddress?.stateOrProvinceCode
) {
setFieldValue('shippingAddress.stateOrProvinceCode', shippingAddress.stateOrProvinceCode);
}
}, [
stateOrProvinceCodeFormField,
shippingAddress?.stateOrProvinceCode,
values.shippingAddress?.stateOrProvinceCode,
]);

return () => {
debouncedUpdateAddressRef.current?.cancel();
};
}, []);

useEffect(() => {
if (shippingFormRenderTimestamp) {
Expand Down