Add missing v1-v2 converstion updates for checkout-one-click

Author: amittapalli

packages/commerce-sdk-react/src/hooks/ShopperCustomers/index.test.ts

@@ -20,7 +20,6 @@ describe('Shopper Customers hooks', () => {
             'getExternalProfile', // TODO: Implement when the endpoint exits closed beta
             'getPublicProductListItems', // TODO: Implement when the endpoint exits closed beta
             'registerExternalProfile', // TODO: Implement when the endpoint exits closed beta
-            'updateCustomerPaymentInstrument' // TODO: Implement when needed
         ])
     })
     test('all mutations have cache update logic', () => {

packages/commerce-sdk-react/src/hooks/ShopperOrders/index.test.ts

@@ -16,7 +16,7 @@ describe('Shopper Orders hooks', () => {
         const unimplemented = getUnimplementedEndpoints(ShopperOrders, queries, mutations)
         // If this test fails: create a new query hook, add the endpoint to the mutations enum,
         // or add it to the `expected` array with a comment explaining "TODO" or "never" (and why).
-        expect(unimplemented).toEqual(['failOrder', 'guestOrderLookup'])
+        expect(unimplemented).toEqual(['guestOrderLookup'])
     })
     test('all mutations have cache update logic', () => {
         // unimplemented = value in mutations enum, but no method in cache update matrix

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

@@ -21,7 +21,7 @@ import {
 import {FormattedMessage, useIntl} from 'react-intl'
 import {useForm} from 'react-hook-form'
 import {
-    useShopperBasketsMutation,
+    useShopperBasketsV2Mutation as useShopperBasketsMutation,
     useShopperOrdersMutation,
     useShopperCustomersMutation,
     ShopperBasketsMutations,

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

@@ -60,7 +60,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
         useAuthHelper: () => ({
             mutateAsync: mockUseAuthHelper
         }),
-        useShopperBasketsMutation: (mutation) => {
+        useShopperBasketsV2Mutation: (mutation) => {
             if (mutation === 'removeItemFromBasket') {
                 return {
                     mutateAsync: (_, {onSuccess} = {}) => {
@@ -69,7 +69,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
                     }
                 }
             }
-            return originalModule.useShopperBasketsMutation(mutation)
+            return originalModule.useShopperBasketsV2Mutation(mutation)
         },
         useShopperCustomersMutation: (mutation) => {
             if (mutation === 'createCustomerPaymentInstrument') {

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

@@ -45,7 +45,7 @@ import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-curre
 import {
     AuthHelpers,
     useAuthHelper,
-    useShopperBasketsMutation,
+    useShopperBasketsV2Mutation as useShopperBasketsMutation,
     useCustomerType,
     useShopperCustomersMutation
 } from '@salesforce/commerce-sdk-react'

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

@@ -34,7 +34,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
         useAuthHelper: jest
             .fn()
             .mockImplementation((helperType) => mockAuthHelperFunctions[helperType]),
-        useShopperBasketsMutation: jest.fn().mockImplementation((mutationType) => {
+        useShopperBasketsV2Mutation: jest.fn().mockImplementation((mutationType) => {
             if (mutationType === 'updateCustomerForBasket') return mockUpdateCustomerForBasket
             if (mutationType === 'transferBasket') return mockTransferBasket
             if (mutationType === 'updateBillingAddressForBasket')

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

@@ -16,7 +16,7 @@ import {
     Divider
 } from '@salesforce/retail-react-app/app/components/shared/ui'
 import {useToast} from '@salesforce/retail-react-app/app/hooks/use-toast'
-import {useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
+import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
 import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
 import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-current-customer'
 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

@@ -12,7 +12,7 @@ import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-curre
 import {useCurrentCustomer} from '@salesforce/retail-react-app/app/hooks/use-current-customer'
 import {useToast} from '@salesforce/retail-react-app/app/hooks/use-toast'
 import {useCurrency} from '@salesforce/retail-react-app/app/hooks/use-currency'
-import {useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
+import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useCustomerType} from '@salesforce/commerce-sdk-react'
 import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context'
 import Payment from '@salesforce/retail-react-app/app/pages/checkout-one-click/partials/one-click-payment'
 import {CurrencyProvider} from '@salesforce/retail-react-app/app/contexts'
@@ -60,7 +60,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
     const original = jest.requireActual('@salesforce/commerce-sdk-react')
     return {
         ...original,
-        useShopperBasketsMutation: jest.fn(),
+        useShopperBasketsV2Mutation: jest.fn(),
         useAuthHelper: jest.fn(() => ({mutateAsync: jest.fn()})),
         useUsid: () => ({getUsidWhenReady: jest.fn().mockResolvedValue('usid-123')}),
         useCustomerType: jest.fn(() => ({isGuest: true, isRegistered: false})),

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

@@ -18,7 +18,7 @@ import StoreDisplay from '@salesforce/retail-react-app/app/components/store-disp
 // Hooks
 import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout-one-click/util/checkout-context'
 import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
-import {useShopperBasketsMutation, useStores} from '@salesforce/commerce-sdk-react'
+import {useShopperBasketsV2Mutation as useShopperBasketsMutation, useStores} from '@salesforce/commerce-sdk-react'
 import {isPickupShipment} from '@salesforce/retail-react-app/app/utils/shipment-utils'
 
 const PickupAddress = () => {

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

@@ -15,7 +15,7 @@ jest.mock('@salesforce/commerce-sdk-react', () => {
     const originalModule = jest.requireActual('@salesforce/commerce-sdk-react')
     return {
         ...originalModule,
-        useShopperBasketsMutation: () => ({
+        useShopperBasketsV2Mutation: () => ({
             mutateAsync: mockMutateAsync
         }),
         useStores: () => ({