Skip to content

Commit acd79e0

Browse files
amittapalliamittapalli
committed
W-21354759 address linting
1 parent e22fe12 commit acd79e0

File tree

8 files changed

+48
-35
lines changed

8 files changed

+48
-35
lines changed

‎packages/template-retail-react-app/app/components/forms/useAddressFields.jsx‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -289,18 +289,23 @@ export default function useAddressFields({
289289
label: formatMessage(countryCode === 'CA' ? messages.province : messages.state),
290290
defaultValue: '',
291291
type: countryCode === 'US' || countryCode === 'CA' ? 'select' : 'text',
292-
options: countryCode === 'US' || countryCode === 'CA'
293-
? [{value: '', label: ''}, ...(countryCode === 'CA' ? provinceOptions : stateOptions)]
294-
: undefined,
292+
options:
293+
countryCode === 'US' || countryCode === 'CA'
294+
? [
295+
{value: '', label: ''},
296+
...(countryCode === 'CA' ? provinceOptions : stateOptions)
297+
]
298+
: undefined,
295299
rules: {
296-
required: countryCode === 'CA'
297-
? 'Please select your province.'
298-
: countryCode === 'US'
300+
required:
301+
countryCode === 'CA'
302+
? 'Please select your province.'
303+
: countryCode === 'US'
299304
? formatMessage({
300-
defaultMessage: 'Please select your state.',
301-
id: 'use_address_fields.error.please_select_your_state_or_province',
302-
description: 'Error message for a blank state (US-specific checkout)'
303-
})
305+
defaultMessage: 'Please select your state.',
306+
id: 'use_address_fields.error.please_select_your_state_or_province',
307+
description: 'Error message for a blank state (US-specific checkout)'
308+
})
304309
: false
305310
},
306311
error: errors[`${prefix}stateCode`],
@@ -313,13 +318,15 @@ export default function useAddressFields({
313318
type: 'text',
314319
autoComplete: 'postal-code',
315320
rules: {
316-
required: countryCode === 'CA'
317-
? 'Please enter your postal code.'
318-
: countryCode === 'US'
321+
required:
322+
countryCode === 'CA'
323+
? 'Please enter your postal code.'
324+
: countryCode === 'US'
319325
? formatMessage({
320326
defaultMessage: 'Please enter your zip code.',
321327
id: 'use_address_fields.error.please_enter_your_postal_or_zip',
322-
description: 'Error message for a blank zip code (US-specific checkout)'
328+
description:
329+
'Error message for a blank zip code (US-specific checkout)'
323330
})
324331
: formatMessage({
325332
defaultMessage: 'Please enter your postal code.',

‎packages/template-retail-react-app/app/components/sf-payments-express-buttons/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const SFPaymentsExpressButtons = ({
7676
const {data: paymentConfig} = usePaymentConfiguration({
7777
parameters: {
7878
currency: paymentCurrency,
79-
countryCode: paymentCountryCode || fallbackCountryCode || 'US'
79+
countryCode: paymentCountryCode || fallbackCountryCode || 'US'
8080
//,zoneId: "stripeUSTest" //if you need to test with a different zone
8181
}
8282
})

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ export const useCurrentBasket = ({id = ''} = {}) => {
2222
const storeLocatorEnabled = getConfig()?.app?.storeLocatorEnabled ?? STORE_LOCATOR_IS_ENABLED
2323
const customerId = useCustomerId()
2424
const {confirmingBasket} = useSFPayments()
25-
const {
26-
data: basketsData,
27-
...restOfQuery
28-
} = useCustomerBaskets(
25+
const {data: basketsData, ...restOfQuery} = useCustomerBaskets(
2926
{parameters: {customerId}},
3027
{
3128
enabled: !!customerId && !isServer

‎packages/template-retail-react-app/app/hooks/use-sf-payments-country.test.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -485,52 +485,52 @@ describe('useSFPaymentsCountry', () => {
485485
test('falls back to locale country when server detection fails', async () => {
486486
mockUseMultiSite.mockReturnValue({locale: {id: 'de-DE'}})
487487
mockFetch.mockResolvedValue({ok: false, status: 500})
488-
488+
489489
renderWithQueryClient(<TestComponent />)
490-
490+
491491
await waitFor(() => {
492492
expect(screen.getByTestId('country-code').textContent).toBe('DE')
493493
})
494494
})
495-
495+
496496
test('server country takes priority over locale country', async () => {
497497
mockUseMultiSite.mockReturnValue({locale: {id: 'de-DE'}})
498498
mockFetch.mockResolvedValue({
499499
ok: true,
500500
json: async () => ({countryCode: 'GB'})
501501
})
502-
502+
503503
renderWithQueryClient(<TestComponent />)
504-
504+
505505
await waitFor(() => {
506506
expect(screen.getByTestId('country-code').textContent).toBe('GB')
507507
})
508508
})
509-
509+
510510
test('returns null when both server and locale are unavailable', async () => {
511511
mockUseMultiSite.mockReturnValue({locale: {}})
512512
mockFetch.mockResolvedValue({ok: false, status: 500})
513-
513+
514514
renderWithQueryClient(<TestComponent />)
515-
515+
516516
await waitFor(() => {
517517
expect(screen.getByTestId('country-code').textContent).toBe('null')
518518
})
519519
})
520-
520+
521521
test('derives country from various locale formats', async () => {
522522
mockFetch.mockResolvedValue({ok: false, status: 500})
523-
523+
524524
const cases = [
525525
{locale: 'fr-FR', expected: 'FR'},
526526
{locale: 'ja-JP', expected: 'JP'},
527527
{locale: 'zh-CN', expected: 'CN'}
528528
]
529-
529+
530530
for (const {locale, expected} of cases) {
531531
mockUseMultiSite.mockReturnValue({locale: {id: locale}})
532532
const {unmount} = renderWithQueryClient(<TestComponent />)
533-
533+
534534
await waitFor(() => {
535535
expect(screen.getByTestId('country-code').textContent).toBe(expected)
536536
})

‎packages/template-retail-react-app/app/hooks/use-sf-payments.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const useSFPayments = () => {
9696

9797
/**
9898
* Custom hook to check if Salesforce Payments is enabled
99-
* //?? true means: if the config is missing, default to "don't block it"
99+
* //?? true means: if the config is missing, default to "don't block it"
100100
* and let the API decide. The local config only matters when someone explicitly sets it to false.
101101
* @returns {boolean} True if Salesforce Payments is enabled, false otherwise
102102
*/

‎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 = () => {

0 commit comments

Comments
 (0)