Skip to content

Commit 9980e57

Browse files
W-21356212: Lint fixes
1 parent af73a08 commit 9980e57

File tree

5 files changed

+36
-11
lines changed

5 files changed

+36
-11
lines changed

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-payment.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ import {
1616
Divider
1717
} from '@salesforce/retail-react-app/app/components/shared/ui'
1818
import {useToast} from '@salesforce/retail-react-app/app/hooks/use-toast'
19-
import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
19+
import {
20+
useShopperBasketsV2Mutation as useShopperBasketsMutation,
21+
useCustomerType
22+
} from '@salesforce/commerce-sdk-react'
2023
import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
2124
import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-current-customer'
2225
import {useCheckoutAutoSelect} from '@salesforce/retail-react-app/app/hooks/use-checkout-auto-select'

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-payment.test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-curre
1212
import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-current-customer'
1313
import {useToast} from '@salesforce/retail-react-app/app/hooks/use-toast'
1414
import {useCurrency} from '@salesforce/retail-react-app/app/hooks/use-currency'
15-
import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
15+
import {
16+
useShopperBasketsV2Mutation as useShopperBasketsMutation,
17+
useCustomerType
18+
} from '@salesforce/commerce-sdk-react'
1619
import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context'
1720
import Payment from '@salesforce/retail-react-app/app/pages/checkout-one-click/partials/one-click-payment'
1821
import {CurrencyProvider} from '@salesforce/retail-react-app/app/contexts'

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-pickup-address.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ import StoreDisplay from '@salesforce/retail-react-app/app/components/store-disp
1818
// Hooks
1919
import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context'
2020
import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
21-
import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useStores} from '@salesforce/commerce-sdk-react'
21+
import {
22+
useShopperBasketsV2Mutation as useShopperBasketsMutation,
23+
useStores
24+
} from '@salesforce/commerce-sdk-react'
2225
import {isPickupShipment} from '@salesforce/retail-react-app/app/utils/shipment-utils'
2326

2427
const PickupAddress = () => {

packages/template-retail-react-app/app/pages/checkout/partials/sf-payments-sheet.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ const SFPaymentsSheet = forwardRef((props, ref) => {
297297

298298
const orderStripeGatewayProperties =
299299
orderPaymentInstrument?.paymentReference?.gatewayProperties?.stripe || {}
300-
const setupFutureUsage =
301-
orderStripeGatewayProperties?.setupFutureUsage
300+
const setupFutureUsage = orderStripeGatewayProperties?.setupFutureUsage
302301
if (setupFutureUsage) {
303302
paymentIntent.setup_future_usage = setupFutureUsage
304303
}
@@ -535,9 +534,10 @@ const SFPaymentsSheet = forwardRef((props, ref) => {
535534
)
536535

537536
useEffect(() => {
538-
// Mount SFP only when all required data and DOM are ready.
537+
// Mount SFP only when all required data and DOM are ready; otherwise skip or wait for a later run.
538+
539539
if (isCustomerDataLoading) return // Wait for savedPaymentMethods data to load for registered users
540-
if (checkoutComponent.current) return // Skip if already mounted (cleanup runs when deps change)
540+
if (checkoutComponent.current) return // Skip if Componenet Already mounted
541541
if (!sfp) return // Skip if SFP SDK not loaded yet
542542
if (!metadata) return // Skip if SFP metadata not available yet
543543
if (!containerElementRef.current) return // Skip if Payment container ref not attached to DOM yet

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,28 +1929,44 @@ describe('sf-payments-utils', () => {
19291929
test('returns card for googlepay with Stripe gateway', () => {
19301930
const paymentMethods = [{paymentMethodType: 'googlepay', accountId: 'acct_123'}]
19311931
const paymentMethodSetAccounts = [{vendor: 'Stripe', accountId: 'acct_123'}]
1932-
const result = getExpressPaymentMethodType('googlepay', paymentMethods, paymentMethodSetAccounts)
1932+
const result = getExpressPaymentMethodType(
1933+
'googlepay',
1934+
paymentMethods,
1935+
paymentMethodSetAccounts
1936+
)
19331937
expect(result).toBe('card')
19341938
})
19351939

19361940
test('returns googlepay for googlepay with Adyen gateway', () => {
19371941
const paymentMethods = [{paymentMethodType: 'googlepay', accountId: 'adyen_acct'}]
19381942
const paymentMethodSetAccounts = [{vendor: 'Adyen', accountId: 'adyen_acct'}]
1939-
const result = getExpressPaymentMethodType('googlepay', paymentMethods, paymentMethodSetAccounts)
1943+
const result = getExpressPaymentMethodType(
1944+
'googlepay',
1945+
paymentMethods,
1946+
paymentMethodSetAccounts
1947+
)
19401948
expect(result).toBe('googlepay')
19411949
})
19421950

19431951
test('returns card for applepay with Stripe gateway', () => {
19441952
const paymentMethods = [{paymentMethodType: 'applepay', accountId: 'acct_123'}]
19451953
const paymentMethodSetAccounts = [{vendor: 'Stripe', accountId: 'acct_123'}]
1946-
const result = getExpressPaymentMethodType('applepay', paymentMethods, paymentMethodSetAccounts)
1954+
const result = getExpressPaymentMethodType(
1955+
'applepay',
1956+
paymentMethods,
1957+
paymentMethodSetAccounts
1958+
)
19471959
expect(result).toBe('card')
19481960
})
19491961

19501962
test('returns type unchanged for non-mapped types', () => {
19511963
const paymentMethods = [{paymentMethodType: 'paypal', accountId: 'acct_123'}]
19521964
const paymentMethodSetAccounts = [{vendor: 'Stripe', accountId: 'acct_123'}]
1953-
const result = getExpressPaymentMethodType('paypal', paymentMethods, paymentMethodSetAccounts)
1965+
const result = getExpressPaymentMethodType(
1966+
'paypal',
1967+
paymentMethods,
1968+
paymentMethodSetAccounts
1969+
)
19541970
expect(result).toBe('paypal')
19551971
})
19561972
})

0 commit comments

Comments
 (0)