Feat/zipcode soft refresh query allowlist

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Replace the full-page reload after zipcode / pickup / shipping-method session writes with a targeted soft refresh that refetches only the segment-dependent storefront queries (resetting search pagination to the first page through render-runtime), updates the fulfillment selection optimistically with rollback on a failed session write, closes the shipping-method modal, and falls back to `location.reload()` when Apollo is unavailable.
+
 ## [1.1.4] - 2026-06-11
 
 ### Deprecated

react/ShippingMethodSelector.tsx

@@ -28,10 +28,12 @@ function ShippingMethodSelector({
     submitErrorMessage,
     areThereUnavailableCartItems,
     shippingMethodModalRequestId,
+    fulfillmentSelectionAppliedId,
   } = useDeliveryPromiseState()
 
   const dispatch = useDeliveryPromiseDispatch()
   const lastHandledShippingMethodModalRequestId = useRef(0)
+  const lastHandledFulfillmentSelectionAppliedId = useRef(0)
 
   useEffect(() => {
     dispatch({
@@ -71,6 +73,22 @@ function ShippingMethodSelector({
     shippingMethodModalRequestId,
   ])
 
+  // Close the modal once a fulfillment selection is applied. The old reload
+  // tore the modal down for free; with the soft refresh the tree stays alive.
+  useEffect(() => {
+    if (
+      fulfillmentSelectionAppliedId <=
+      lastHandledFulfillmentSelectionAppliedId.current
+    ) {
+      return
+    }
+
+    lastHandledFulfillmentSelectionAppliedId.current =
+      fulfillmentSelectionAppliedId
+
+    setIsShippingMethodModalOpen(false)
+  }, [fulfillmentSelectionAppliedId])
+
   const onSubmit = (zipcode: string, reload?: boolean) => {
     dispatch({
       type: 'UPDATE_ZIPCODE',

react/__tests__/ShippingMethodSelector.test.tsx

@@ -16,11 +16,14 @@ jest.mock('../components/ShippingMethodModal/ShippingMethodSelector', () => ({
   default: () => <div data-testid="shipping-method-control" />,
 }))
 
-let lastShippingMethodModalProps: { nonDismissibleModal?: boolean } = {}
+let lastShippingMethodModalProps: {
+  nonDismissibleModal?: boolean
+  isOpen?: boolean
+} = {}
 
 jest.mock('../components/ShippingMethodModal', () => ({
   __esModule: true,
-  default: (props: { nonDismissibleModal?: boolean }) => {
+  default: (props: { nonDismissibleModal?: boolean; isOpen?: boolean }) => {
     lastShippingMethodModalProps = props
 
     return <div data-testid="shipping-method-modal" />
@@ -39,6 +42,7 @@ const baseState = {
   submitErrorMessage: undefined,
   areThereUnavailableCartItems: false,
   shippingMethodModalRequestId: 0,
+  fulfillmentSelectionAppliedId: 0,
 }
 
 describe('ShippingMethodSelector', () => {
@@ -91,4 +95,28 @@ describe('ShippingMethodSelector', () => {
 
     expect(container.firstChild).toBeNull()
   })
+
+  it('closes the shipping-method modal when a fulfillment selection is applied', () => {
+    // A modal-open request opens the modal (mirrors a sibling block / click).
+    mockUseDeliveryPromiseState.mockReturnValue({
+      ...baseState,
+      shippingMethodModalRequestId: 1,
+    })
+
+    const { rerender } = render(<ShippingMethodSelector />)
+
+    expect(lastShippingMethodModalProps.isOpen).toBe(true)
+
+    // A selection is applied (delivery/pickup) → the modal must close even
+    // though there is no page reload to tear it down.
+    mockUseDeliveryPromiseState.mockReturnValue({
+      ...baseState,
+      shippingMethodModalRequestId: 1,
+      fulfillmentSelectionAppliedId: 1,
+    })
+
+    rerender(<ShippingMethodSelector />)
+
+    expect(lastShippingMethodModalProps.isOpen).toBe(false)
+  })
 })