feat(payment): PAYPAL-4935 updates after review

Author: bc-nick

packages/core/src/cart/cart-action-creator.spec.ts

@@ -40,7 +40,7 @@ describe('CartActionCreator', () => {
             .pipe(toArray())
             .toPromise();
 
-        expect(cartRequestSender.loadCart).toHaveBeenCalledWith(cart.id, undefined, undefined);
+        expect(cartRequestSender.loadCart).toHaveBeenCalledWith(cart.id, undefined);
 
         expect(actions).toEqual(
             expect.arrayContaining([
@@ -64,7 +64,7 @@ describe('CartActionCreator', () => {
             .pipe(catchError(errorHandler), toArray())
             .toPromise();
 
-        expect(cartRequestSender.loadCart).toHaveBeenCalledWith(cart.id, undefined, undefined);
+        expect(cartRequestSender.loadCart).toHaveBeenCalledWith(cart.id, undefined);
 
         expect(actions).toEqual(
             expect.arrayContaining([

packages/core/src/cart/cart-action-creator.ts

@@ -18,15 +18,12 @@ export default class CartActionCreator {
         cartId: string,
         options?: RequestOptions & ActionOptions,
     ): ThunkAction<LoadCartAction, InternalCheckoutSelectors> {
-        return (store) => {
+        return () => {
             return new Observable((observer: Observer<LoadCartAction>) => {
-                const state = store.getState();
-                const host = state.config.getHost();
-
                 observer.next(createAction(CartActionType.LoadCartRequested, undefined));
 
                 this._cartRequestSender
-                    .loadCart(cartId, host, options)
+                    .loadCart(cartId, options)
                     .then((response) => {
                         observer.next(
                             createAction(CartActionType.LoadCartSucceeded, response.body),

packages/core/src/cart/cart-request-sender.spec.ts

@@ -81,7 +81,6 @@ describe('CartRequestSender', () => {
 
     describe('#loadCart', () => {
         const cartId = '123123';
-        const host = 'https://test.com';
 
         beforeEach(() => {
             headlessResponse = getResponse(getHeadlessCartResponse());
@@ -92,17 +91,7 @@ describe('CartRequestSender', () => {
         it('get headless cart', async () => {
             await cartRequestSender.loadCart(cartId);
 
-            expect(requestSender.get).toHaveBeenCalledWith('/cart-information', {
-                params: {
-                    cartId,
-                },
-            });
-        });
-
-        it('get headless cart with host url', async () => {
-            await cartRequestSender.loadCart(cartId, host);
-
-            expect(requestSender.get).toHaveBeenCalledWith('https://test.com/cart-information', {
+            expect(requestSender.get).toHaveBeenCalledWith('api/wallet-buttons/cart-information', {
                 params: {
                     cartId,
                 },

packages/core/src/cart/cart-request-sender.ts

@@ -22,13 +22,8 @@ export default class CartRequestSender {
         return this._requestSender.post(url, { body, headers, timeout });
     }
 
-    async loadCart(
-        cartId: string,
-        host?: string,
-        options?: RequestOptions,
-    ): Promise<Response<Cart | undefined>> {
-        const path = 'cart-information';
-        const url = host ? `${host}/${path}` : `/${path}`;
+    async loadCart(cartId: string, options?: RequestOptions): Promise<Response<Cart | undefined>> {
+        const path = 'api/wallet-buttons/cart-information';
 
         const requestOptions: RequestOptions = {
             ...options,
@@ -37,7 +32,7 @@ export default class CartRequestSender {
             },
         };
 
-        const response = await this._requestSender.get<HeadlessCartRequestResponse>(url, {
+        const response = await this._requestSender.get<HeadlessCartRequestResponse>(path, {
             ...requestOptions,
         });
 

packages/core/src/cart/headless-cart/headless-cart.ts

@@ -41,7 +41,6 @@ export interface HeadlessLineItem {
     url: string;
     variantEntityId: number;
     selectedOptions: Array<{
-        __typename: string;
         value: string;
         valueEntityId: number;
         entityId: number;

packages/core/src/cart/headless-cart/mocks/headless-cart.mock.ts

@@ -36,7 +36,6 @@ export function headlessLineItem(): HeadlessLineItem {
             {
                 name: 'n',
                 entityId: 1,
-                __typename: 'CartSelectedMultipleChoiceOption',
                 value: 'v',
                 valueEntityId: 3,
             },