W-21411273, W-21434212: Addressing comments

Author: rasbhat

packages/template-retail-react-app/app/hooks/use-current-customer.js

@@ -10,15 +10,19 @@ import {useCustomer, useCustomerId, useCustomerType} from '@salesforce/commerce-
 /**
  * A hook that returns the current customer.
  * @param {Array<string>} [expand] - Optional array of fields to expand in the customer query
+ * @param {Object} [queryOptions] - Optional React Query options
  */
-export const useCurrentCustomer = (expand) => {
+export const useCurrentCustomer = (expand, queryOptions = {}) => {
     const customerId = useCustomerId()
     const {isRegistered, isGuest, customerType} = useCustomerType()
     const parameters = {
         customerId,
         ...(expand && {expand})
     }
-    const query = useCustomer({parameters}, {enabled: !!customerId && isRegistered})
+    const query = useCustomer(
+        {parameters},
+        {enabled: !!customerId && isRegistered, ...queryOptions}
+    )
     const value = {
         ...query,
         data: {

packages/template-retail-react-app/app/pages/checkout/partials/sf-payments-sheet.events.test.js

@@ -425,9 +425,8 @@ describe('SFPaymentsSheet - SDK Event Handler Tests', () => {
         const updateCall = mockUpdatePaymentInstrument.mock.calls[0]
         const requestBody = updateCall[0].body
 
-        expect(
-            requestBody.paymentReferenceRequest.gatewayProperties?.stripe?.setupFutureUsage
-        ).toBeUndefined()
+        expect(requestBody.paymentReferenceRequest.gateway).toBeUndefined()
+        expect(requestBody.paymentReferenceRequest.gatewayProperties).toBeUndefined()
     })
 
     test('handlePaymentButtonApprove includes required fields for PaymentsCustomer record creation', async () => {
@@ -452,9 +451,9 @@ describe('SFPaymentsSheet - SDK Event Handler Tests', () => {
         expect(requestParams.orderNo).toBe('ORDER123')
         expect(requestParams.paymentInstrumentId).toBe('PI123')
         expect(requestBody.paymentReferenceRequest.gateway).toBe('stripe')
-        expect(requestBody.paymentReferenceRequest.gatewayProperties.stripe.setupFutureUsage).toBe(
-            'on_session'
-        )
+        expect(requestBody.paymentReferenceRequest.gatewayProperties.stripe).toEqual({
+            setupFutureUsage: 'on_session'
+        })
         expect(requestBody.paymentReferenceRequest.paymentMethodType).toBe('card')
     })
 

packages/template-retail-react-app/app/utils/sf-payments-utils.js

@@ -250,17 +250,13 @@ export const createPaymentInstrumentBody = ({
         }
     }
 
-    if (!isPostRequest && gateway === PAYMENT_GATEWAYS.STRIPE) {
-        const setupFutureUsage = storePaymentMethod
-            ? futureUsageOffSession
-                ? SETUP_FUTURE_USAGE.OFF_SESSION
-                : SETUP_FUTURE_USAGE.ON_SESSION
-            : null
+    if (!isPostRequest && gateway === PAYMENT_GATEWAYS.STRIPE && storePaymentMethod) {
+        const setupFutureUsage = futureUsageOffSession
+            ? SETUP_FUTURE_USAGE.OFF_SESSION
+            : SETUP_FUTURE_USAGE.ON_SESSION
         paymentReferenceRequest.gateway = PAYMENT_GATEWAYS.STRIPE
         paymentReferenceRequest.gatewayProperties = {
-            stripe: {
-                ...(setupFutureUsage && {setupFutureUsage})
-            }
+            stripe: {setupFutureUsage}
         }
     }
 

packages/template-retail-react-app/app/utils/sf-payments-utils.test.js

@@ -1300,7 +1300,7 @@ describe('sf-payments-utils', () => {
             })
         })
 
-        test('includes Stripe gateway with empty stripe props when storePaymentMethod is false (no setupFutureUsage)', () => {
+        test('does not include Stripe gateway or gatewayProperties when storePaymentMethod is false (no setupFutureUsage)', () => {
             const paymentMethods = [{paymentMethodType: 'card', accountId: 'acct_123'}]
             const paymentMethodSetAccounts = [{vendor: 'Stripe', accountId: 'acct_123'}]
             const result = createPaymentInstrumentBody({
@@ -1314,8 +1314,8 @@ describe('sf-payments-utils', () => {
                 paymentMethodSetAccounts
             })
 
-            expect(result.paymentReferenceRequest.gateway).toBe('stripe')
-            expect(result.paymentReferenceRequest.gatewayProperties.stripe).toEqual({})
+            expect(result.paymentReferenceRequest.gateway).toBeUndefined()
+            expect(result.paymentReferenceRequest.gatewayProperties).toBeUndefined()
         })
 
         test('does not include shippingPreference when null', () => {