Merge branch 't/team404/sfp-on-pwa' of https://github.com/SalesforceCommerceCloud/pwa-kit into t/team404/sfp-on-pwa

merging

Author: amittapalli

packages/commerce-sdk-react/package-lock.json

@@ -330,7 +330,7 @@ const defaultProps = {
 }
 
 // --- Shared test helpers (reused across describes) ---
-const flush = () => new Promise((r) => setImmediate(r))
+const flush = () => new Promise((r) => setTimeout(r, 0))
 
 async function renderAndGetConfig(props = {}) {
     const prepareBasket = props.prepareBasket ?? jest.fn().mockResolvedValue(makeBasket('basket-1'))

packages/template-retail-react-app/app/components/sf-payments-express-buttons/index.test.js

@@ -26,7 +26,6 @@ import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-cur
 import {useCurrency} from '@salesforce/retail-react-app/app/hooks/use-currency'
 import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout/util/checkout-context'
 import {usePaymentConfiguration} from '@salesforce/commerce-sdk-react'
-import {useShopperConfiguration} from '@salesforce/retail-react-app/app/hooks/use-shopper-configuration'
 import {useSFPaymentsCountry} from '@salesforce/retail-react-app/app/hooks/use-sf-payments-country'
 import {
     STATUS_SUCCESS,
@@ -95,7 +94,7 @@ const SFPaymentsSheet = forwardRef((props, ref) => {
         }
     })
 
-    const zoneId = useShopperConfiguration('zoneId')
+    const zoneId = paymentConfig?.zoneId
     const cardCaptureAutomatic = useAutomaticCapture()
     const futureUsageOffSession = useFutureUsageOffSession()