From c9a6103ae11e25242cfb245a61079b227f7ba84e Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Fri, 12 May 2023 15:25:57 +0800
Subject: [PATCH 001/122] CXSPA-3391: Change sortType from unit to account to
 keep consistent with the column name (#17409)

---
 feature-libs/asm/assets/translations/en/asm.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 041bf1e7ff0..13024163904 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -82,8 +82,8 @@ export const asm = {
         byDateDesc: 'Date (Desc)',
         byOrderDateAsc: 'Order date (Asc)',
         byOrderDateDesc: 'Order date (Desc)',
-        byUnit: 'Unit (Asc)',
-        byUnitDesc: 'Unit (Desc)',
+        byUnit: 'Account (Asc)',
+        byUnitDesc: 'Account (Desc)',
       },
       page: {
         page: 'Page {{count}}',

From cc9485d97bc2a2f8e1f5a72f82350a31610f2084 Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Mon, 15 May 2023 09:32:42 +0200
Subject: [PATCH 002/122] feat: show message on configurator conflicts resolved
  (#17404)

Refers to CXSPA-3293
---
 .../translations/en/configurator-common.ts    |  1 +
 .../form/configurator-form.component.html     | 16 +--
 .../form/configurator-form.component.spec.ts  | 98 ++++++++++++++++++-
 .../form/configurator-form.component.ts       | 89 ++++++++++++++++-
 ...duct-configurator-vc-interactive.e2e.cy.ts | 34 +++++++
 .../helpers/product-configurator-vc.ts        |  8 ++
 6 files changed, 232 insertions(+), 14 deletions(-)

diff --git a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
index 1a64dfce843..e6922faed9c 100644
--- a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
+++ b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
@@ -18,6 +18,7 @@ export const configurator = {
       resolveConflicts: 'Resolve Conflicts',
       conflictWarning: 'Conflict must be resolved to continue',
       updateMessage: 'The configuration is being updated in the background',
+      conflictsResolved: 'Conflicts have been resolved',
       showMore: 'show more',
       showLess: 'show less',
       items: '{{count}} item',
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.html b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.html
index 9bfc3a3ed2e..860a8de543b 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.html
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.html
@@ -1,12 +1,14 @@
 <ng-container *ngIf="configuration$ | async as configuration; else ghostForm">
   <ng-container *ngIf="!isDialogActive(configuration); else ghostForm">
-    <cx-configurator-group
-      [group]="currentGroup$ | async"
-      [owner]="configuration.owner"
-      [isNavigationToGroupEnabled]="isNavigationToGroupEnabled(configuration)"
-    >
-    </cx-configurator-group
-  ></ng-container>
+    <ng-container *ngIf="currentGroup$ | async as group">
+      <cx-configurator-group
+        [group]="group"
+        [owner]="configuration.owner"
+        [isNavigationToGroupEnabled]="isNavigationToGroupEnabled(configuration)"
+      >
+      </cx-configurator-group>
+    </ng-container>
+  </ng-container>
 </ng-container>
 
 <ng-template #ghostForm>
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
index ad58025b9a5..27e0189ad19 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.spec.ts
@@ -9,7 +9,12 @@ import {
 import { ReactiveFormsModule } from '@angular/forms';
 import { RouterState } from '@angular/router';
 import { NgSelectModule } from '@ng-select/ng-select';
-import { I18nTestingModule, RoutingService } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  GlobalMessageService,
+  I18nTestingModule,
+  RoutingService,
+} from '@spartacus/core';
 import {
   CommonConfigurator,
   ConfiguratorModelUtils,
@@ -88,6 +93,7 @@ let configurationCreateObservable: Observable<Configurator.Configuration> =
   EMPTY;
 let currentGroupObservable: Observable<string> = EMPTY;
 let isConfigurationLoadingObservable: Observable<boolean> = EMPTY;
+let testVersion: string;
 
 class MockRoutingService {
   getRouterState(): Observable<RouterState> {
@@ -162,6 +168,16 @@ class MockLaunchDialogService {
   openDialogAndSubscribe() {}
 }
 
+class MockGlobalMessageService {
+  add(): void {}
+}
+
+class MockFeatureConfigService {
+  isLevel(version: string): boolean {
+    return version === testVersion;
+  }
+}
+
 function checkConfigurationObs(
   routerMarbels: string,
   configurationServiceMarbels: string,
@@ -241,6 +257,7 @@ function mockRouterStateWithQueryParams(queryParams: {}): Observable<RouterState
 }
 
 let configuratorCommonsService: ConfiguratorCommonsService;
+let globalMessageService: GlobalMessageService;
 let configuratorGroupsService: ConfiguratorGroupsService;
 let launchDialogService: LaunchDialogService;
 let fixture: ComponentFixture<ConfiguratorFormComponent>;
@@ -263,7 +280,8 @@ describe('ConfigurationFormComponent', () => {
             provide: RoutingService,
             useClass: MockRoutingService,
           },
-
+          { provide: GlobalMessageService, useClass: MockGlobalMessageService },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
           {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
@@ -324,6 +342,12 @@ describe('ConfigurationFormComponent', () => {
       'checkConflictSolverDialog'
     ).and.callThrough();
 
+    globalMessageService = TestBed.inject(
+      GlobalMessageService as Type<GlobalMessageService>
+    );
+    spyOn(globalMessageService, 'add').and.callThrough();
+    testVersion = '6.1';
+
     isConfigurationLoadingObservable = of(false);
 
     configExpertModeService = TestBed.inject(
@@ -546,4 +570,74 @@ describe('ConfigurationFormComponent', () => {
       expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
     }));
   });
+
+  describe('listenForConflictResolution()', () => {
+    it('should raise message in case a conflict has been resolved', () => {
+      hasConfigurationConflictsObservable = of(true, false);
+      createComponentWithData();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(1);
+    });
+
+    it('should not raise a message in case the configuration has no issues (as we skipped the first submission)', () => {
+      hasConfigurationConflictsObservable = of(false);
+      createComponentWithData();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(0);
+    });
+
+    it('should only emit on status changes', () => {
+      hasConfigurationConflictsObservable = of(
+        true,
+        true,
+        true,
+        false,
+        false,
+        false
+      );
+      createComponentWithData();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(1);
+    });
+
+    it('should emit on every status change from conflicting to non-conflicting', () => {
+      hasConfigurationConflictsObservable = of(
+        false,
+        true,
+        false,
+        true,
+        false,
+        true,
+        false
+      );
+      createComponentWithData();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(3);
+    });
+  });
+
+  describe('displayConflictResolvedMessage()', () => {
+    it('should call global message service', () => {
+      createComponentWithoutData();
+      component['displayConflictResolvedMessage']();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(1);
+    });
+
+    it('should handle non availability of global message service', () => {
+      createComponentWithoutData();
+      component['globalMessageService'] = undefined;
+      component['displayConflictResolvedMessage']();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(0);
+    });
+
+    it('should not call global message service if target version is not matched', () => {
+      createComponentWithoutData();
+      testVersion = '6.2';
+      component['displayConflictResolvedMessage']();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(0);
+    });
+
+    it('should handle non availability of feature config service', () => {
+      createComponentWithoutData();
+      component['featureConfigservice'] = undefined;
+      component['displayConflictResolvedMessage']();
+      expect(globalMessageService.add).toHaveBeenCalledTimes(0);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
index f18cd3a7edc..decdf9fec60 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
@@ -4,25 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+  Optional,
+} from '@angular/core';
 import {
   ConfiguratorRouter,
   ConfiguratorRouterExtractorService,
 } from '@spartacus/product-configurator/common';
 import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
-import { Observable } from 'rxjs';
-import { delay, filter, switchMap, take } from 'rxjs/operators';
+import { Observable, Subscription } from 'rxjs';
+import {
+  delay,
+  distinctUntilChanged,
+  filter,
+  skip,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
 import { ConfiguratorGroupsService } from '../../core/facade/configurator-groups.service';
 import { Configurator } from '../../core/model/configurator.model';
 import { ConfiguratorExpertModeService } from '../../core/services/configurator-expert-mode.service';
+import {
+  FeatureConfigService,
+  GlobalMessageService,
+  GlobalMessageType,
+} from '@spartacus/core';
 
 @Component({
   selector: 'cx-configurator-form',
   templateUrl: './configurator-form.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class ConfiguratorFormComponent implements OnInit {
+export class ConfiguratorFormComponent implements OnInit, OnDestroy {
+  protected subscription = new Subscription();
+
   routerData$: Observable<ConfiguratorRouter.Data> =
     this.configRouterExtractorService.extractRouterData();
 
@@ -45,16 +65,75 @@ export class ConfiguratorFormComponent implements OnInit {
       this.configuratorGroupsService.getCurrentGroup(routerData.owner)
     )
   );
+  // TODO (CXSPA-3392): make globalMessageService a required dependency
+  constructor(
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configRouterExtractorService: ConfiguratorRouterExtractorService,
+    configExpertModeService: ConfiguratorExpertModeService,
+    launchDialogService: LaunchDialogService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfigService: FeatureConfigService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    globalMessageService: GlobalMessageService
+  );
+
+  /**
+   * @deprecated since 6.1
+   */
+  constructor(
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configRouterExtractorService: ConfiguratorRouterExtractorService,
+    configExpertModeService: ConfiguratorExpertModeService,
+    launchDialogService: LaunchDialogService
+  );
 
   constructor(
     protected configuratorCommonsService: ConfiguratorCommonsService,
     protected configuratorGroupsService: ConfiguratorGroupsService,
     protected configRouterExtractorService: ConfiguratorRouterExtractorService,
     protected configExpertModeService: ConfiguratorExpertModeService,
-    protected launchDialogService: LaunchDialogService
+    protected launchDialogService: LaunchDialogService,
+    // TODO:(CXSPA-3392) for next major release remove feature config service
+    @Optional() protected featureConfigservice?: FeatureConfigService,
+    @Optional() protected globalMessageService?: GlobalMessageService
   ) {}
 
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+
+  protected listenForConflictResolution(): void {
+    this.subscription.add(
+      this.routerData$
+        .pipe(
+          switchMap((routerData) =>
+            this.configuratorCommonsService.hasConflicts(routerData.owner)
+          ),
+          distinctUntilChanged(), // we are interested only in status changes
+          skip(1), // we skip the very first emission to avoid the change fron undefined -> no conflicts
+          filter((hasConflicts) => !hasConflicts)
+        )
+        .subscribe(() => this.displayConflictResolvedMessage())
+    );
+  }
+
+  protected displayConflictResolvedMessage(): void {
+    if (
+      this.globalMessageService &&
+      (this.featureConfigservice?.isLevel('6.1') ?? false)
+    ) {
+      this.globalMessageService.add(
+        { key: 'configurator.header.conflictsResolved' },
+        GlobalMessageType.MSG_TYPE_CONFIRMATION
+      );
+    }
+  }
+
   ngOnInit(): void {
+    this.listenForConflictResolution();
+
     this.routerData$
       .pipe(
         switchMap((routerData) => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
index 562422024e2..ae4e2e9618f 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
@@ -498,5 +498,39 @@ context('Product Configuration', () => {
         );
       }
     });
+    it('should display a success message on conflict resolution (CXSPA-2374)', () => {
+      configurationVc.goToConfigurationPage(
+        electronicsShop,
+        testProductMultiLevel
+      );
+      configurationVc.registerConfigurationUpdateRoute();
+      configurationVc.clickOnNextBtnAndWait(PROJECTOR);
+      configurationVc.selectAttributeAndWait(
+        PROJECTOR_TYPE,
+        radioGroup,
+        PROJECTOR_LCD,
+        commerceRelease.isPricingEnabled
+      );
+      configurationVc.clickOnPreviousBtnAndWait(GENERAL);
+      configurationVc.clickOnGroupAndWait(3);
+
+      configurationVc.selectConflictingValueAndWait(
+        GAMING_CONSOLE,
+        radioGroup,
+        GAMING_CONSOLE_YES,
+        1,
+        commerceRelease.isPricingEnabled
+      );
+      configurationVc.checkGlobalMessageNotDisplayed();
+      configurationVc.deselectConflictingValueAndWait(
+        GAMING_CONSOLE,
+        radioGroup,
+        GAMING_CONSOLE_NO,
+        commerceRelease.isPricingEnabled
+      );
+      configurationVc.checkGlobalMessageContains(
+        `Conflicts have been resolved`
+      );
+    });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
index 1a7f2773680..cf2265cc940 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
@@ -135,6 +135,14 @@ export function checkGlobalMessageNotDisplayed(): void {
   cy.get('cx-global-message').should('not.be.visible');
 }
 
+/**
+ * Verifies whether the global message is displayed and contains a text
+ * @param {string} text - We expect this text to appear in the global message
+ */
+export function checkGlobalMessageContains(text: string): void {
+  cy.get('cx-global-message').should('contain', text);
+}
+
 /**
  * Clicks on 'Add to Cart' button in catalog list.
  */

From 831462cf3980c425a06dfc503c3f2e46bdc84c51 Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Mon, 15 May 2023 17:17:47 +0800
Subject: [PATCH 003/122] CXSPA-3385: Add e2e test for b2b for customer list
 (#17403)

---
 .../_customer-selection.component.scss        |  6 +++
 .../vendor/asm/b2b/customer-list.e2e.cy.ts    |  3 +-
 .../cypress/helpers/asm.ts                    | 37 ++++++++++++++++
 .../cypress/support/cart.commands.ts          | 43 ++++++++++++++++++-
 .../cypress/support/utils/cart.ts             | 28 ++++++++++++
 5 files changed, 115 insertions(+), 2 deletions(-)

diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
index 00f7129a8b7..e719f336d9b 100644
--- a/feature-libs/asm/styles/components/_customer-selection.component.scss
+++ b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -13,6 +13,12 @@
       margin: 0 0 15px;
       min-width: auto;
 
+      @include forVersion(6.1) {
+        cx-form-errors p {
+          color: #db0002;
+        }
+      }
+
       .input-contaier {
         display: flex;
         .icon-wrapper {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
index 017b396c1f2..fd013d5dab6 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
@@ -20,13 +20,14 @@ context('Assisted Service Module', () => {
     Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
   });
   describe('ASM Customer list', () => {
-    it('checking custom list features', () => {
+    it('checking custom list features (CXSPA-1595)', () => {
       cy.cxConfig({
         context: {
           baseSite: ['powertools-spa'],
           currency: ['USD'],
         },
       });
+      asm.addCartForB2BCustomer();
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 70009dbf91a..67ea358bd26 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -25,6 +25,14 @@ import {
 } from './navigation';
 import { generateMail, randomString } from './user';
 
+export function addCartForB2BCustomer(): void {
+  const productCode = '1979039';
+  cy.login('gi.sun@pronto-hw.com', 'pw4all').then(() => {
+    const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
+    cy.addProductToB2BCart(productCode, 1, auth.token.access_token);
+  });
+}
+
 export function listenForAuthenticationRequest(): string {
   return interceptPost(
     'csAgentAuthentication',
@@ -253,6 +261,35 @@ export function asmB2bCustomerLists(): void {
   cy.get('cx-customer-list table').contains('Account');
   cy.get('cx-customer-list button.cx-asm-customer-list-btn-cancel').click();
   cy.get('cx-customer-list').should('not.exist');
+
+  cy.log('--> start emulation by click cart');
+  asm.asmOpenCustomerList();
+  cy.get('cx-customer-list ng-select.customer-list-selector').then(
+    (selects) => {
+      let select = selects[0];
+      cy.wrap(select)
+        .click()
+        .get('ng-dropdown-panel')
+        .get('.ng-option')
+        .eq(1)
+        .then((item) => {
+          cy.wrap(item).click();
+          cy.wait(customerSearchRequestAlias)
+            .its('response.statusCode')
+            .should('eq', 200);
+        });
+    }
+  );
+
+  cy.get('cx-customer-list table')
+    .contains('tbody tr', 'Gi Sun')
+    .closest('tbody tr')
+    .find('td:nth-child(5)')
+    .then(($cart) => {
+      cy.wrap($cart).click();
+      cy.get('cx-customer-list').should('not.exist');
+      cy.get('cx-add-to-saved-cart').should('exist');
+    });
 }
 
 export function asmB2bCustomerListPagination(): void {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/cart.commands.ts b/projects/storefrontapp-e2e-cypress/cypress/support/cart.commands.ts
index e2b4999099c..3dea7a6568e 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/cart.commands.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/cart.commands.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { addToCart, createCart } from './utils/cart';
+import { addProductToB2BCart, addToCart, createCart } from './utils/cart';
 
 declare namespace Cypress {
   interface Chainable {
@@ -17,6 +17,20 @@ declare namespace Cypress {
         ```
        */
     addToCart: (itemId: string, quantity: string, accessToken: string) => void;
+
+    /**
+       * Creates a new cart and adds items to B2B Cart
+       * @memberof Cypress.Chainable
+       * @example
+        ```
+        cy.addProductToB2BCart(productCode, quantity, accessToken)
+        ```
+       */
+    addProductToB2BCart: (
+      itemId: string,
+      quantity: string,
+      accessToken: string
+    ) => void;
   }
 }
 
@@ -44,3 +58,30 @@ Cypress.Commands.add(
     });
   }
 );
+
+Cypress.Commands.add(
+  'addProductToB2BCart',
+  (productCode: string, quantity: string, accessToken: string) => {
+    createCart(accessToken).then((response) => {
+      const cartId = response.body.code;
+      addProductToB2BCart(cartId, productCode, quantity, accessToken).then(
+        () => {
+          Cypress.log({
+            name: 'addToCart',
+            displayName: 'Add to B2B cart',
+            message: [`🛒 Product(s) added to cart`],
+            consoleProps: () => {
+              return {
+                'Cart ID': cartId,
+                'Product code': productCode,
+                Quantity: quantity,
+              };
+            },
+          });
+
+          cy.wrap(cartId);
+        }
+      );
+    });
+  }
+);
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts b/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
index 2c9b18423aa..a47e5d6f244 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
@@ -47,3 +47,31 @@ export function addToCart(
     },
   });
 }
+
+export function addProductToB2BCart(
+  cartCode: string,
+  productCode: string,
+  quantity: string,
+  accessToken: string
+) {
+  const addToCartUrl = `${Cypress.env('API_URL')}/${Cypress.env(
+    'OCC_PREFIX'
+  )}/${Cypress.env('BASE_SITE')}/orgUsers/current/carts/${cartCode}/entries/`;
+  return cy.request({
+    method: 'POST',
+    url: addToCartUrl,
+    body: {
+      orderEntries: [
+        {
+          product: {
+            code: productCode,
+          },
+          quantity: quantity,
+        },
+      ],
+    },
+    headers: {
+      Authorization: `bearer ${accessToken}`,
+    },
+  });
+}

From 65e6e2ad530580248eef72164fb24625902661fa Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Tue, 16 May 2023 13:29:07 +0800
Subject: [PATCH 004/122] =?UTF-8?q?CXSPA-3095:=20Adjust=20the=20icon=20in?=
 =?UTF-8?q?=20the=20alert=20message=20strip=20component=20to=20t=E2=80=A6?=
 =?UTF-8?q?=20(#17415)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 feature-libs/asm/assets/translations/en/asm.ts    |  1 +
 .../customer-list/customer-list.component.html    | 15 +++++++++++----
 .../_asm-create-customer-form.component.scss      | 11 ++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 13024163904..caa5897b675 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -91,6 +91,7 @@ export const asm = {
         next: 'Next',
       },
       noOfCustomers: '{{count}} Customers',
+      oneCustomer: '1 Customer',
       noCustomers: 'There are currently no customers in this customer list.',
       noLists:
         'There are currently no customer lists available. Contact your system administrator.',
diff --git a/feature-libs/asm/components/customer-list/customer-list.component.html b/feature-libs/asm/components/customer-list/customer-list.component.html
index e57aec543cf..3ba825e3664 100644
--- a/feature-libs/asm/components/customer-list/customer-list.component.html
+++ b/feature-libs/asm/components/customer-list/customer-list.component.html
@@ -439,10 +439,17 @@ <h2 id="asm-customer-list-title" class="title modal-title">
 </ng-template>
 
 <ng-template #total let-customerSearchPage="customerSearchPage">
-  <span class="cx-total"
-    >{{ customerSearchPage?.pagination?.totalResults }}
-    {{ 'asm.customers' | cxTranslate }}</span
-  >
+  <span class="cx-total" *ngIf="customerSearchPage?.pagination?.totalResults">
+    <ng-container *ngIf="customerSearchPage?.pagination?.totalResults > 1">
+      {{
+        'asm.customerList.noOfCustomers'
+          | cxTranslate: { count: customerSearchPage?.pagination?.totalResults }
+      }}
+    </ng-container>
+    <ng-container *ngIf="customerSearchPage?.pagination?.totalResults === 1">
+      {{ 'asm.customerList.oneCustomer' | cxTranslate }}
+    </ng-container>
+  </span>
 </ng-template>
 
 <ng-template #sort>
diff --git a/feature-libs/asm/styles/components/_asm-create-customer-form.component.scss b/feature-libs/asm/styles/components/_asm-create-customer-form.component.scss
index db3561d1427..aa01009d7a6 100644
--- a/feature-libs/asm/styles/components/_asm-create-customer-form.component.scss
+++ b/feature-libs/asm/styles/components/_asm-create-customer-form.component.scss
@@ -10,6 +10,8 @@
       max-width: 100%;
 
       .cx-message-header {
+        padding: 0.25rem 1rem;
+        min-height: auto;
         padding-inline-end: 1rem;
         font-size: 14px;
         font-family: '72';
@@ -17,10 +19,17 @@
         font-weight: 400;
         line-height: 16px;
         text-align: start;
+        .cx-message-icon {
+          align-self: flex-start;
+        }
+        .cx-message-text {
+          padding: 0.25rem 0;
+        }
       }
     }
     .close {
-      align-self: center;
+      align-self: flex-start;
+      padding: 0.25rem 0;
       margin-inline-start: auto;
       position: unset;
       color: #0064d8;

From ec2c50ca687f5defd63b49e2d41ebb632efe3a56 Mon Sep 17 00:00:00 2001
From: niehuayang <126219214+niehuayang@users.noreply.github.com>
Date: Tue, 16 May 2023 16:59:02 +0800
Subject: [PATCH 005/122] chore: Improve ASM Create New Customer and Add
 cumulus traceability (#17376)

Closes:
https://jira.tools.sap/browse/CXSPA-2934 ( Improve ASM to show Create Account in drop list without accessibility issue );
https://jira.tools.sap/browse/CXSPA-3312 ( Develop automated accessibility tests for ASM Create Account )
https://jira.tools.sap/browse/CXSPA-3147 ( Accessibility issues for ASM Create New Customer UI )
https://jira.tools.sap/browse/CXSPA-3381 ( After ASM account is created successfully, redirect to homepage )
https://jira.tools.sap/browse/CXSPA-3347, https://jira.tools.sap/browse/CXSPA-3308 ( Add cumulus traceability to ASM new feature)
---
 .../asm/assets/translations/en/asm.ts         |  2 +-
 .../asm-create-customer-form.component.ts     |  2 +-
 .../asm-main-ui/asm-main-ui.component.ts      |  1 +
 .../customer-selection.component.html         | 72 ++++++++++++-------
 .../customer-selection.component.spec.ts      | 30 ++++++--
 .../customer-selection.component.ts           |  1 +
 .../_customer-selection.component.scss        | 18 ++++-
 ...b2b-customer-list-tabbling-order.e2e.cy.ts |  2 +-
 .../accessibility/tabbing-order.e2e.asm.cy.ts | 11 ++-
 .../vendor/asm/b2b/customer-list.e2e.cy.ts    |  2 +-
 .../asm/b2c/create-customer.e2e-flaky.cy.ts   |  6 +-
 .../accessibility/tabbing-order.config.ts     | 22 ++++++
 .../accessibility/tabbing-order/asm.ts        | 16 +++++
 .../cypress/helpers/asm.ts                    |  4 +-
 14 files changed, 143 insertions(+), 46 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index caa5897b675..344a6eeba2f 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -34,7 +34,7 @@ export const asm = {
       },
       submit: 'Start Session',
       noMatch: 'No customer found.',
-      noMatchResult: 'This account cannot be found. ',
+      noMatchResult: 'This account cannot be found.',
       createCustomer: 'Create New Customer',
     },
     createCustomerForm: {
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
index 72419faa69c..322ab17fb28 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
@@ -42,7 +42,7 @@ export class AsmCreateCustomerFormComponent {
   focusConfig: FocusConfig = {
     trap: true,
     block: true,
-    autofocus: 'button',
+    autofocus: true,
     focusOnEscape: true,
   };
 
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index 02dd4564511..39c95856f06 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -123,6 +123,7 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
                 customerId: result.customerId,
               });
               this.showCreateCustomerSuccessfullyAlert = true;
+              this.routingService.go('/');
             }
             if (
               'actionType' in result &&
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.html b/feature-libs/asm/components/customer-selection/customer-selection.component.html
index dcbb260d3b7..3b3f6392da7 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.html
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.html
@@ -39,35 +39,55 @@
     <span class="result-name">{{ result.name }}</span>
     <span class="result-id">{{ result.uid }}</span>
   </button>
-  <button
-    #searchResultItem
-    (click)="closeResults($event)"
-    (keydown.enter)="closeResults($event)"
-    (keydown.escape)="closeResults($event)"
-    (keydown.arrowright)="focusInputText($event)"
-    (keydown.arrowleft)="focusInputText($event)"
-    (keydown.home)="focusInputText($event)"
-    (keydown.end)="focusInputText($event)"
-    [class.active]="activeFocusedButtonIndex === 0"
-    [attr.aria-selected]="activeFocusedButtonIndex === 0"
-    *ngIf="
-      !(searchResultsLoading$ | async) &&
-      searchTerm.value.length >= 3 &&
-      !!results.entries &&
-      results.entries.length <= 0
-    "
-  >
-    <!-- TODO:(CXSPA-3090) for next major release remove feature level -->
-    <ng-container *cxFeatureLevel="'!6.1'">
+
+  <!-- TODO:(CXSPA-3090) for next major release remove feature level -->
+  <ng-container *cxFeatureLevel="'!6.1'">
+    <button
+      #searchResultItem
+      (click)="closeResults($event)"
+      (keydown.enter)="closeResults($event)"
+      (keydown.escape)="closeResults($event)"
+      (keydown.arrowright)="focusInputText($event)"
+      (keydown.arrowleft)="focusInputText($event)"
+      (keydown.home)="focusInputText($event)"
+      (keydown.end)="focusInputText($event)"
+      [class.active]="activeFocusedButtonIndex === 0"
+      [attr.aria-selected]="activeFocusedButtonIndex === 0"
+      *ngIf="
+        !(searchResultsLoading$ | async) &&
+        searchTerm.value.length >= 3 &&
+        !!results.entries &&
+        results.entries.length <= 0
+      "
+    >
       {{ 'asm.customerSearch.noMatch' | cxTranslate }}
-    </ng-container>
-    <ng-container *cxFeatureLevel="'6.1'">
+    </button>
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.1'">
+    <button
+      #searchResultItem
+      (click)="createCustomer()"
+      (keydown.enter)="createCustomer()"
+      (keydown.escape)="closeResults($event)"
+      (keydown.arrowright)="focusInputText($event)"
+      (keydown.arrowleft)="focusInputText($event)"
+      (keydown.home)="focusInputText($event)"
+      (keydown.end)="focusInputText($event)"
+      [class.active]="activeFocusedButtonIndex === 0"
+      [attr.aria-selected]="activeFocusedButtonIndex === 0"
+      *ngIf="
+        !(searchResultsLoading$ | async) &&
+        searchTerm.value.length >= 3 &&
+        !!results.entries &&
+        results.entries.length <= 0
+      "
+    >
       {{ 'asm.customerSearch.noMatchResult' | cxTranslate }}
-      <a #createCustomerLink class="link" (click)="createCustomer()">{{
+      <span #createCustomerLink class="linkStyleLabel">{{
         'asm.customerSearch.createCustomer' | cxTranslate
-      }}</a>
-    </ng-container>
-  </button>
+      }}</span>
+    </button>
+  </ng-container>
 </div>
 
 <div class="asm-results" *ngIf="searchResultsLoading$ | async">
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
index b936f2828ab..e2d9124df93 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
@@ -10,7 +10,13 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { AsmService } from '@spartacus/asm/core';
 import { AsmConfig, CustomerSearchPage } from '@spartacus/asm/root';
-import { GlobalMessageService, I18nTestingModule, User } from '@spartacus/core';
+import {
+  FeaturesConfig,
+  FeaturesConfigModule,
+  GlobalMessageService,
+  I18nTestingModule,
+  User,
+} from '@spartacus/core';
 import {
   DirectionMode,
   DirectionService,
@@ -111,7 +117,12 @@ describe('CustomerSelectionComponent', () => {
       customerSearchResultsLoading = new BehaviorSubject<boolean>(false);
 
       TestBed.configureTestingModule({
-        imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule],
+        imports: [
+          ReactiveFormsModule,
+          I18nTestingModule,
+          FormErrorsModule,
+          FeaturesConfigModule,
+        ],
         declarations: [CustomerSelectionComponent],
         providers: [
           { provide: AsmService, useClass: MockAsmService },
@@ -122,6 +133,12 @@ describe('CustomerSelectionComponent', () => {
             useClass: MockDirectionService,
           },
           { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '*' },
+            },
+          },
         ],
       }).compileComponents();
 
@@ -215,7 +232,7 @@ describe('CustomerSelectionComponent', () => {
     expect(asmService.customerSearchReset).toHaveBeenCalled();
   });
 
-  it('should display no results message when no results are found', () => {
+  it('should display customer registration message if no result was found', () => {
     spyOn(asmService, 'customerSearch').and.callFake(() => {
       customerSearchResults.next({ entries: [] });
       customerSearchResultsLoading.next(false);
@@ -226,10 +243,11 @@ describe('CustomerSelectionComponent', () => {
     );
     fixture.detectChanges();
     expect(el.queryAll(By.css('div.asm-results button')).length).toEqual(1);
-    // TODO(CXSPA-2935): Refactor customer lookup in ASM to get rid of buttons in drop list
-    el.query(By.css('div.asm-results button')).nativeElement.dispatchEvent(
-      new MouseEvent('click')
+    const createAccountButton = el.query(By.css('div.asm-results button'));
+    expect(createAccountButton.nativeElement.innerText).toEqual(
+      'asm.customerSearch.noMatchResult asm.customerSearch.createCustomer'
     );
+    createAccountButton.nativeElement.dispatchEvent(new MouseEvent('click'));
     expect(asmService.customerSearchReset).toHaveBeenCalled();
   });
 
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.ts b/feature-libs/asm/components/customer-selection/customer-selection.component.ts
index 4d033b856e7..e5fb610c8b8 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.ts
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.ts
@@ -252,6 +252,7 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy {
   }
 
   createCustomer(): void {
+    this.asmService.customerSearchReset();
     this.launchDialogService?.openDialogAndSubscribe(
       LAUNCH_CALLER.ASM_CREATE_CUSTOMER_FORM,
       this.createCustomerLink
diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
index e719f336d9b..5f131c8d870 100644
--- a/feature-libs/asm/styles/components/_customer-selection.component.scss
+++ b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -82,16 +82,24 @@
     position: absolute;
     line-height: 1.5rem;
     left: 2rem;
-    top: 4rem;
     z-index: 11;
     box-shadow: 0 5px 20px 0 #d9d9d9, 0 2px 8px 0 #ededed;
     background-color: #fff;
     border-radius: 4px;
-    width: 100%;
     max-width: 50vw;
     max-height: 70vh;
     overflow-y: auto;
 
+    @include forVersion(1, 6) {
+      top: 4rem;
+      width: 100%;
+    }
+
+    @include forVersion(6.1) {
+      top: 3.3rem;
+      width: 33%;
+    }
+
     @media (max-width: 1200px) {
       max-width: calc(100% - 4rem);
     }
@@ -151,7 +159,11 @@
       }
 
       @include forVersion(6.1) {
-        a {
+        .linkStyleLabel {
+          font-family: '72';
+          font-weight: 600;
+          font-size: 13px;
+          padding-inline-start: 8px;
           color: #0064d9;
         }
       }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
index 99fe79a15d0..c5f036d494c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
@@ -20,7 +20,7 @@ context('Tabbing order for ASM B2b Customer List', () => {
   });
 
   describe('ASM', () => {
-    it('should allow to navigate with tab key for customer List', () => {
+    it('should allow to navigate with tab key for customer List (CXSPA-2722)', () => {
       cy.cxConfig({
         context: {
           baseSite: ['powertools-spa'],
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
index 083a0eb72d1..31552db9c05 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
@@ -5,7 +5,10 @@
  */
 
 import { tabbingOrderConfig as config } from '../../helpers/accessibility/tabbing-order.config';
-import { asmTabbingOrderWithCustomerList } from '../../helpers/accessibility/tabbing-order/asm';
+import {
+  asmTabbingOrderWithCreateCustomerForm,
+  asmTabbingOrderWithCustomerList,
+} from '../../helpers/accessibility/tabbing-order/asm';
 
 describe('Tabbing order for ASM', () => {
   before(() => {
@@ -13,8 +16,12 @@ describe('Tabbing order for ASM', () => {
   });
 
   context('ASM', () => {
-    it('should allow to navigate with tab key for customer List', () => {
+    it('should allow to navigate with tab key for customer List （CXSPA-1595）', () => {
       asmTabbingOrderWithCustomerList(config.asmWithCustomerLists, 'asagent');
     });
+
+    it('should allow to navigate with tab key for create customer form (CXSPA-1594)', () => {
+      asmTabbingOrderWithCreateCustomerForm(config.asmWithCreateCustomerForm);
+    });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
index fd013d5dab6..0200339bc44 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
@@ -20,7 +20,7 @@ context('Assisted Service Module', () => {
     Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
   });
   describe('ASM Customer list', () => {
-    it('checking custom list features (CXSPA-1595)', () => {
+    it('checking custom list features (CXSPA-2722)', () => {
       cy.cxConfig({
         context: {
           baseSite: ['powertools-spa'],
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts
index e2c644cd533..c91f143da79 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts
@@ -16,7 +16,7 @@ context('Assisted Service Module', () => {
   });
 
   describe('Create Customer', () => {
-    it('should be able to create a new customer by agent click button', () => {
+    it('should be able to create a new customer by agent click button (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
       checkout.visitHomePage('asm=true');
 
@@ -126,7 +126,7 @@ context('Assisted Service Module', () => {
   });
 
   describe('Failed to Create Customer', () => {
-    it('should display validation errors if form is empty', () => {
+    it('should display validation errors if form is empty (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
@@ -150,7 +150,7 @@ context('Assisted Service Module', () => {
 
       asm.agentSignOut();
     });
-    it('should be not able to create a new customer with dupcated email by agent', () => {
+    it('should be not able to create a new customer with dupcated email by agent (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
index d5aa5a7a810..e1c56232c84 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
@@ -2392,4 +2392,26 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
       value: 'Cancel',
     },
   ],
+  asmWithCreateCustomerForm: [
+    {
+      type: TabbingOrderTypes.GENERIC_BUTTON,
+    },
+    {
+      type: TabbingOrderTypes.GENERIC_INPUT,
+    },
+    {
+      type: TabbingOrderTypes.GENERIC_INPUT,
+    },
+    {
+      type: TabbingOrderTypes.GENERIC_INPUT,
+    },
+    {
+      type: TabbingOrderTypes.BUTTON,
+      value: 'Create',
+    },
+    {
+      type: TabbingOrderTypes.GENERIC_BUTTON,
+      value: 'Cancel',
+    },
+  ],
 };
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
index a4a7f526aab..b20b27783c3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
@@ -10,6 +10,7 @@ import * as asm from '../../../helpers/asm';
 
 const containerSelector = 'cx-asm-main-ui';
 const containerSelectorForCustomerLists = 'cx-customer-list';
+const containerSelectorForCreateCustomerForm = 'cx-asm-create-customer-form';
 
 export function asmTabbingOrderNotLoggedIn(config: TabElement[]) {
   cy.visit('/?asm=true');
@@ -64,3 +65,18 @@ export function asmTabbingOrderWithCustomerList(
 
   verifyTabbingOrder(containerSelectorForCustomerLists, config);
 }
+
+export function asmTabbingOrderWithCreateCustomerForm(config: TabElement[]) {
+  cy.visit('/?asm=true');
+  asm.agentLogin('asagent', 'pw4all');
+
+  cy.get('cx-asm-main-ui div.cx-asm-customer-list a').click();
+  cy.get('cx-customer-list').should('exist');
+  cy.get('cx-customer-list h2').should('exist');
+
+  cy.get('cx-customer-list div.cx-dialog-header button').click();
+  cy.get('cx-asm-create-customer-form').should('exist');
+  cy.get('cx-asm-create-customer-form form').should('exist');
+
+  verifyTabbingOrder(containerSelectorForCreateCustomerForm, config);
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 67ea358bd26..c9245b87c57 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -622,8 +622,8 @@ export function asmOpenCreateCustomerDialogOnCustomerSelectionDropdown(): void {
     .its('response.statusCode')
     .should('eq', 200);
 
-  cy.get('cx-customer-selection div.asm-results a').should('exist');
-  cy.get('cx-customer-selection div.asm-results a').click();
+  cy.get('cx-customer-selection div.asm-results button').should('exist');
+  cy.get('cx-customer-selection div.asm-results button').click();
   cy.get('cx-asm-create-customer-form').should('exist');
   cy.get('cx-asm-create-customer-form form').should('exist');
 }

From 89e27d24879440d312d4be2786d49a8f11fa8530 Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Wed, 17 May 2023 13:54:05 +0800
Subject: [PATCH 006/122] refactor: hide customer list table during loading new
 page (#17416)

---
 .../components/customer-list/customer-list.component.html  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/feature-libs/asm/components/customer-list/customer-list.component.html b/feature-libs/asm/components/customer-list/customer-list.component.html
index 3ba825e3664..8ff64c4f616 100644
--- a/feature-libs/asm/components/customer-list/customer-list.component.html
+++ b/feature-libs/asm/components/customer-list/customer-list.component.html
@@ -89,7 +89,12 @@ <h2 id="asm-customer-list-title" class="title modal-title">
             </div>
             <cx-spinner *ngIf="customerSearchLoading$ | async"></cx-spinner>
             <div *ngIf="customerSearchPage$ | async as customerSearchPage">
-              <table id="asm-cusomer-list-table" role="table" class="table">
+              <table
+                id="asm-cusomer-list-table"
+                role="table"
+                class="table"
+                *ngIf="loaded"
+              >
                 <caption class="cx-visually-hidden">
                   {{
                     'asm.customerList.title' | cxTranslate

From 29549e6986bcd60667f9954f2a835f05fef4e77c Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Wed, 17 May 2023 15:56:49 +0800
Subject: [PATCH 007/122] fix: Improve cypress for asm customer list (#17420)

Co-authored-by: Yifeng Luo <yifeng.luo@sap.com>
---
 .../vendor/asm/b2b/customer-list.e2e.cy.ts    |  5 +-
 .../asm/b2c/customer-list.e2e-flaky.cy.ts     | 32 ++------
 .../cypress/helpers/asm.ts                    | 79 ++++++++++++++++---
 3 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
index 0200339bc44..9d41d80216f 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
@@ -20,14 +20,15 @@ context('Assisted Service Module', () => {
     Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
   });
   describe('ASM Customer list', () => {
-    it('checking custom list features (CXSPA-2722)', () => {
+    it('checking custom list features (CXSPA-1595)', () => {
       cy.cxConfig({
         context: {
           baseSite: ['powertools-spa'],
           currency: ['USD'],
         },
       });
-      asm.addCartForB2BCustomer();
+      const productCode = '1979039';
+      asm.addProductToB2BCart('gi.sun@pronto-hw.com', 'pw4all', productCode);
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts
index df5e32fc271..a8c1489e3bc 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts
@@ -15,32 +15,12 @@ context('Assisted Service Module', () => {
   });
 
   describe('ASM Customer list', () => {
-    const productCode = '479742';
-    it('Should be able to checkout a b2c order via API (CXSPA-1595)', function () {
-      cy.login('aaron.customer@hybris.com', 'pw4all').then(() => {
-        const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
-        console.info(auth);
-        cy.addToCart(productCode, 1, auth.token.access_token).then((cartId) => {
-          cy.requireDeliveryAddressAdded(
-            getSampleUser().address,
-            auth.token,
-            cartId
-          );
-          cy.requireDeliveryMethodSelected(auth.token, cartId);
-          cy.requirePaymentMethodAdded(cartId);
-          cy.requirePlacedOrder(auth.token, cartId);
-        });
-      });
-    });
-
-    it('Should be able to create a b2c cart via API (CXSPA-1595)', function () {
-      cy.login('aaron.customer@hybris.com', 'pw4all').then(() => {
-        const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
-        cy.addToCart(productCode, 1, auth.token.access_token);
-      });
-    });
-
-    it('checking custom list features', () => {
+    it('checking custom list features (CXSPA-1595)', () => {
+      const custom = 'aaron.customer@hybris.com';
+      const pwd = 'pw4all';
+      const productCode = '479742';
+      asm.placeOrderForB2CCustomer(custom, pwd, productCode);
+      asm.addProductToB2CCart(custom, pwd, productCode);
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index c9245b87c57..c3d1113ed85 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -10,7 +10,7 @@ import * as checkout from '../helpers/checkout-flow';
 import { fillShippingAddress } from '../helpers/checkout-forms';
 import * as consent from '../helpers/consent-management';
 import * as profile from '../helpers/update-profile';
-import { SampleUser } from '../sample-data/checkout-flow';
+import { getSampleUser, SampleUser } from '../sample-data/checkout-flow';
 import {
   interceptGet,
   interceptPatch,
@@ -25,9 +25,47 @@ import {
 } from './navigation';
 import { generateMail, randomString } from './user';
 
-export function addCartForB2BCustomer(): void {
-  const productCode = '1979039';
-  cy.login('gi.sun@pronto-hw.com', 'pw4all').then(() => {
+const asmForB2CCustomer = 'aaron.customer@hybris.com';
+const asmForB2BCustomer = 'Gi Sun';
+
+export function placeOrderForB2CCustomer(
+  customer: string,
+  pwd: string,
+  productCode: string
+): void {
+  cy.login(customer, pwd).then(() => {
+    const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
+    console.info(auth);
+    cy.addToCart(productCode, 1, auth.token.access_token).then((cartId) => {
+      cy.requireDeliveryAddressAdded(
+        getSampleUser().address,
+        auth.token,
+        cartId
+      );
+      cy.requireDeliveryMethodSelected(auth.token, cartId);
+      cy.requirePaymentMethodAdded(cartId);
+      cy.requirePlacedOrder(auth.token, cartId);
+    });
+  });
+}
+
+export function addProductToB2CCart(
+  customer: string,
+  pwd: string,
+  productCode: string
+): void {
+  cy.login(customer, pwd).then(() => {
+    const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
+    cy.addToCart(productCode, 1, auth.token.access_token);
+  });
+}
+
+export function addProductToB2BCart(
+  customer: string,
+  pwd: string,
+  productCode: string
+): void {
+  cy.login(customer, pwd).then(() => {
     const auth = JSON.parse(localStorage.getItem('spartacus⚿⚿auth'));
     cy.addProductToB2BCart(productCode, 1, auth.token.access_token);
   });
@@ -212,12 +250,21 @@ export function asmCustomerLists(): void {
 
   cy.log('--> start emulation by click order');
   asm.asmOpenCustomerList();
-  cy.get('cx-customer-list')
-    .find('.cx-btn-cell')
-    .filter('[aria-label="Order"]')
-    .then(($rows) => {
-      expect($rows.length).to.eq(5);
-      cy.wrap($rows[0]).click();
+  cy.get('cx-customer-list .cx-header-actions .search-wrapper input')
+    .should('exist')
+    .should('not.be.disabled')
+    .type(`${asmForB2CCustomer}{enter}`);
+
+  cy.wait(customerSearchRequestAlias)
+    .its('response.statusCode')
+    .should('eq', 200);
+
+  cy.get('cx-customer-list table')
+    .contains('tbody tr', asmForB2CCustomer)
+    .closest('tbody tr')
+    .find('td:nth-child(6)')
+    .then(($order) => {
+      cy.wrap($order).click();
       cy.get('cx-customer-list').should('not.exist');
       cy.get('cx-order-history').should('exist');
     });
@@ -281,8 +328,18 @@ export function asmB2bCustomerLists(): void {
     }
   );
 
+  cy.log('--> click cart to jump to the cart view page.');
+  cy.get('cx-customer-list .cx-header-actions .search-wrapper input')
+    .should('exist')
+    .should('not.be.disabled')
+    .type(`${asmForB2BCustomer}{enter}`);
+
+  cy.wait(customerSearchRequestAlias)
+    .its('response.statusCode')
+    .should('eq', 200);
+
   cy.get('cx-customer-list table')
-    .contains('tbody tr', 'Gi Sun')
+    .contains('tbody tr', asmForB2BCustomer)
     .closest('tbody tr')
     .find('td:nth-child(5)')
     .then(($cart) => {

From 0e405fd47c9f29561f15282ee1cfe02f5edefbd8 Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Wed, 17 May 2023 10:32:08 +0200
Subject: [PATCH 008/122] chore: fix strict issues in templates in configurator
 common endpoint (#17411)

---
 ...ator-cart-entry-bundle-info.component.html | 20 ++++++-------
 ...onfigurator-cart-entry-info.component.html | 23 +++++++-------
 ...gurator-issues-notification.component.html | 24 +++++++--------
 .../configure-cart-entry.component.spec.ts    | 30 ++++++++++++-------
 4 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.component.html b/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.component.html
index 8bfabc5d4ff..78e773c4d49 100644
--- a/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.component.html
+++ b/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.component.html
@@ -49,16 +49,14 @@
         </div>
       </div>
     </ng-container>
-    <cx-configure-cart-entry
-      *ngIf="
-        (shouldShowButton$ | async) &&
-          orderEntry?.product?.configurable &&
-          quantityControl$ | async as quantityControl
-      "
-      [cartEntry]="orderEntry"
-      [readOnly]="readonly$ | async"
-      [msgBanner]="false"
-      [disabled]="quantityControl.disabled"
-    ></cx-configure-cart-entry>
+    <ng-container *ngIf="quantityControl$ | async as quantityControl">
+      <cx-configure-cart-entry
+        *ngIf="(shouldShowButton$ | async) && orderEntry?.product?.configurable"
+        [cartEntry]="orderEntry"
+        [readOnly]="(readonly$ | async) ?? true"
+        [msgBanner]="false"
+        [disabled]="quantityControl.disabled"
+      ></cx-configure-cart-entry
+    ></ng-container>
   </ng-container>
 </ng-container>
diff --git a/feature-libs/product-configurator/common/components/configurator-cart-entry-info/configurator-cart-entry-info.component.html b/feature-libs/product-configurator/common/components/configurator-cart-entry-info/configurator-cart-entry-info.component.html
index 9c3f8e7c646..45abbe83a46 100644
--- a/feature-libs/product-configurator/common/components/configurator-cart-entry-info/configurator-cart-entry-info.component.html
+++ b/feature-libs/product-configurator/common/components/configurator-cart-entry-info/configurator-cart-entry-info.component.html
@@ -2,7 +2,7 @@
   <ng-container *ngIf="isAttributeBasedConfigurator(orderEntry)">
     <ng-container *ngIf="hasStatus(orderEntry)">
       <span
-        *ngIf="orderEntry.configurationInfos.length > 0"
+        *ngIf="orderEntry.configurationInfos?.length ?? 0 > 0"
         class="cx-intro cx-visually-hidden"
       >
         {{ 'configurator.a11y.cartEntryInfoIntro' | cxTranslate }}
@@ -33,17 +33,14 @@
         </div>
       </div>
     </ng-container>
-
-    <cx-configure-cart-entry
-      *ngIf="
-        (shouldShowButton$ | async) &&
-          orderEntry?.product?.configurable &&
-          quantityControl$ | async as quantityControl
-      "
-      [cartEntry]="orderEntry"
-      [readOnly]="readonly$ | async"
-      [msgBanner]="false"
-      [disabled]="quantityControl.disabled"
-    ></cx-configure-cart-entry>
+    <ng-container *ngIf="quantityControl$ | async as quantityControl">
+      <cx-configure-cart-entry
+        *ngIf="(shouldShowButton$ | async) && orderEntry?.product?.configurable"
+        [cartEntry]="orderEntry"
+        [readOnly]="(readonly$ | async) ?? true"
+        [msgBanner]="false"
+        [disabled]="quantityControl.disabled"
+      ></cx-configure-cart-entry
+    ></ng-container>
   </ng-container>
 </ng-container>
diff --git a/feature-libs/product-configurator/common/components/configurator-issues-notification/configurator-issues-notification.component.html b/feature-libs/product-configurator/common/components/configurator-issues-notification/configurator-issues-notification.component.html
index 228ed46e18b..c11806a7921 100644
--- a/feature-libs/product-configurator/common/components/configurator-issues-notification/configurator-issues-notification.component.html
+++ b/feature-libs/product-configurator/common/components/configurator-issues-notification/configurator-issues-notification.component.html
@@ -6,18 +6,18 @@
         'configurator.notificationBanner.numberOfIssues'
           | cxTranslate: { count: getNumberOfIssues(orderEntry) }
       }}
-      <cx-configure-cart-entry
-        class="cx-error-msg-action"
-        *ngIf="
-          (shouldShowButton$ | async) &&
-            orderEntry?.product?.configurable &&
-            quantityControl$ | async as quantityControl
-        "
-        [cartEntry]="orderEntry"
-        [readOnly]="readonly$ | async"
-        [msgBanner]="true"
-        [disabled]="quantityControl.disabled"
-      ></cx-configure-cart-entry>
+      <ng-container *ngIf="quantityControl$ | async as quantityControl">
+        <cx-configure-cart-entry
+          class="cx-error-msg-action"
+          *ngIf="
+            (shouldShowButton$ | async) && orderEntry?.product?.configurable
+          "
+          [cartEntry]="orderEntry"
+          [readOnly]="(readonly$ | async) ?? true"
+          [msgBanner]="true"
+          [disabled]="quantityControl.disabled"
+        ></cx-configure-cart-entry
+      ></ng-container>
     </div>
   </ng-container>
 </ng-container>
diff --git a/feature-libs/product-configurator/common/components/configure-cart-entry/configure-cart-entry.component.spec.ts b/feature-libs/product-configurator/common/components/configure-cart-entry/configure-cart-entry.component.spec.ts
index cd2f9a5c1b3..0b5b768d8d0 100644
--- a/feature-libs/product-configurator/common/components/configure-cart-entry/configure-cart-entry.component.spec.ts
+++ b/feature-libs/product-configurator/common/components/configure-cart-entry/configure-cart-entry.component.spec.ts
@@ -59,14 +59,22 @@ describe('ConfigureCartEntryComponent', () => {
     );
   });
 
-  it('should find correct entity key for cart entry', () => {
-    component.cartEntry = { entryNumber: 0 };
-    expect(component.getEntityKey()).toBe('0');
-  });
+  describe('getEntityKey', () => {
+    it('should find correct entity key for cart entry', () => {
+      component.cartEntry = { entryNumber: 0 };
+      expect(component.getEntityKey()).toBe('0');
+    });
+
+    it('should throw error if entry number not present in entry', () => {
+      component.cartEntry = {};
+      expect(() => component.getEntityKey()).toThrowError();
+    });
 
-  it('should throw error if entry number not present in entry', () => {
-    component.cartEntry = {};
-    expect(() => component.getEntityKey()).toThrowError();
+    it('should take order code into account in case entry is from order', () => {
+      const orderCode = '01008765';
+      component.cartEntry = { entryNumber: 0, orderCode: orderCode };
+      expect(component.getEntityKey()).toBe(orderCode + '+0');
+    });
   });
 
   it('should compile correct route for cart entry', () => {
@@ -86,9 +94,11 @@ describe('ConfigureCartEntryComponent', () => {
     expect(component.getRoute()).toBe('configureOverview' + configuratorType);
   });
 
-  it('should compile displayOnly method', () => {
-    component.readOnly = true;
-    expect(component.getDisplayOnly()).toBe(true);
+  describe('getDisplayOnly', () => {
+    it('should derive result from component if available', () => {
+      component.readOnly = true;
+      expect(component.getDisplayOnly()).toBe(true);
+    });
   });
 
   it("should return 'false' for disabled when readOnly true", () => {

From 463b6cd0ed5a0c5503785883329ccc001ecfc584 Mon Sep 17 00:00:00 2001
From: SebastianHamilton <sebastian.hamilton@sap.com>
Date: Wed, 17 May 2023 17:11:26 +0200
Subject: [PATCH 009/122] bugfix/CXCDS-7997: Fix flaky e2e tests for SPA
 (#17422)

---
 .../profile-tag-push-events.service.ts        |  8 +--
 .../profile-tag/default-events.core-e2e.cy.ts | 50 ++++++++++++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/integration-libs/cds/src/profiletag/services/profile-tag-push-events.service.ts b/integration-libs/cds/src/profiletag/services/profile-tag-push-events.service.ts
index 330137af65a..32ad1720eb7 100644
--- a/integration-libs/cds/src/profiletag/services/profile-tag-push-events.service.ts
+++ b/integration-libs/cds/src/profiletag/services/profile-tag-push-events.service.ts
@@ -148,9 +148,11 @@ export class ProfileTagPushEventsService {
               currentCategoryPage.categoryCode &&
             previousRoute.navigation.semanticRoute ===
               currentRoute.navigation.semanticRoute
-          ); // A true means that this item is not unique, so this is hard to wrap your head around.
-          // What we are saying, is that if the categoryCode is the same AND the last emitted semantic route is the same
-          // then this is a duplicate (I.E. via a facet change). In other words, no other page type was visited, and we are on the same categorycode
+          );
+          // A true means that this item is not unique, so this is hard to wrap your head around.
+          // What we are saying, is that if the category code is the same AND the last emitted semantic route is the
+          // same then this is a duplicate (i.e. via a facet change). In other words, no other page type was visited,
+          // and we are on the same category code.
         }
       ),
       map(
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cds/profile-tag/default-events.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cds/profile-tag/default-events.core-e2e.cy.ts
index a7d549ae155..b810b4ea1df 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cds/profile-tag/default-events.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cds/profile-tag/default-events.core-e2e.cy.ts
@@ -313,26 +313,37 @@ describe('Profile-tag events', () => {
     });
   });
 
-  it('should send 2 Category Views event when going to a Category, going to a different page type, and then back to the same category', () => {
+  it('should send 2 Category View events when going to a Category, going to a different page type, and then back to the same category', () => {
     cy.intercept({ method: 'GET', path: `**/products/search**` }).as(
       'lastRequest'
     );
-    createProductQuery(QUERY_ALIAS.CAMERA, 'camera', 12);
     cy.get('cx-category-navigation cx-generic-link a')
       .contains('Cameras')
       .click({ force: true });
     cy.location('pathname', { timeout: 10000 }).should('include', `c/575`);
-    cy.wait('@lastRequest');
-    cy.window().should((win) => {
-      expect(
-        profileTagHelper.eventCount(
-          win,
-          profileTagHelper.EventNames.CATEGORY_PAGE_VIEWED
-        )
-      ).to.equal(1);
+    cy.wait('@lastRequest').then(() => {
+      cy.window().should((win) => {
+        expect(
+          profileTagHelper.eventCount(
+            win,
+            profileTagHelper.EventNames.CATEGORY_PAGE_VIEWED
+          )
+        ).to.equal(1);
+      });
     });
+
+    createProductQuery(QUERY_ALIAS.CAMERA, 'camera', 12);
     cy.get('cx-searchbox input').type('camera{enter}');
-    cy.wait(`@${QUERY_ALIAS.CAMERA}`);
+    cy.wait(`@${QUERY_ALIAS.CAMERA}`).then(() => {
+      cy.window().should((win: any) => {
+        expect(
+          profileTagHelper.eventCount(
+            win,
+            profileTagHelper.EventNames.KEYWORD_SEARCH
+          )
+        ).to.equal(1);
+      });
+    });
 
     cy.intercept({ method: 'GET', path: `**/products/search**` }).as(
       'lastRequest2'
@@ -341,14 +352,15 @@ describe('Profile-tag events', () => {
       .contains('Cameras')
       .click({ force: true });
     cy.location('pathname', { timeout: 10000 }).should('include', `c/575`);
-    cy.wait('@lastRequest2');
-    cy.window().should((win2) => {
-      expect(
-        profileTagHelper.eventCount(
-          win2,
-          profileTagHelper.EventNames.CATEGORY_PAGE_VIEWED
-        )
-      ).to.equal(2);
+    cy.wait('@lastRequest2').then(() => {
+      cy.window().should((win: any) => {
+        expect(
+          profileTagHelper.eventCount(
+            win,
+            profileTagHelper.EventNames.CATEGORY_PAGE_VIEWED
+          )
+        ).to.equal(2);
+      });
     });
   });
 

From 115459626cfe0e91105654748efbfa5d45dc727b Mon Sep 17 00:00:00 2001
From: Sam Garland <52560012+sam-garland@users.noreply.github.com>
Date: Thu, 18 May 2023 15:03:12 +1200
Subject: [PATCH 010/122] fix: expose missing services in public API (#17369)

---
 .../components/visual-picking/visual-picking-tab/index.ts   | 1 +
 .../visual-picking-tab/product-filter/index.ts              | 1 +
 .../visual-picking/visual-picking-tab/product-list/index.ts | 2 ++
 .../toolbar/visual-viewer-animation-slider/index.ts         | 1 +
 integration-libs/epd-visualization/package.json             | 2 +-
 .../root/testing/epd-visualization-test-config.ts           | 2 +-
 .../add-epd-visualization/__snapshots__/index_spec.ts.snap  | 6 +++---
 package-lock.json                                           | 4 ++--
 package.json                                                | 2 +-
 projects/schematics/src/dependencies.json                   | 2 +-
 .../lib-configs/integration-libs/epd-schematics-config.ts   | 2 +-
 .../epd-visualization/epd-visualization-feature.module.ts   | 2 +-
 12 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/index.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/index.ts
index c9a23a14a26..a27f8bc3b70 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/index.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/index.ts
@@ -8,3 +8,4 @@ export * from './product-filter/index';
 export * from './product-list/index';
 export * from './visual-picking-tab.component';
 export * from './visual-picking-tab.module';
+export * from './visual-picking-tab.service';
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-filter/index.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-filter/index.ts
index d72f555cffe..b4833ebf749 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-filter/index.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-filter/index.ts
@@ -6,3 +6,4 @@
 
 export * from './visual-picking-product-filter.component';
 export * from './visual-picking-product-filter.module';
+export * from './visual-picking-product-filter.service';
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/index.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/index.ts
index faeb23c5920..89ff5f5b97f 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/index.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/index.ts
@@ -6,5 +6,7 @@
 
 export * from './compact-add-to-cart/index';
 export * from './model/index';
+export * from './paged-list/index';
 export * from './visual-picking-product-list.component';
 export * from './visual-picking-product-list.module';
+export * from './visual-picking-product-list.service';
diff --git a/integration-libs/epd-visualization/components/visual-viewer/toolbar/visual-viewer-animation-slider/index.ts b/integration-libs/epd-visualization/components/visual-viewer/toolbar/visual-viewer-animation-slider/index.ts
index b6c733b5440..605c2abbda0 100644
--- a/integration-libs/epd-visualization/components/visual-viewer/toolbar/visual-viewer-animation-slider/index.ts
+++ b/integration-libs/epd-visualization/components/visual-viewer/toolbar/visual-viewer-animation-slider/index.ts
@@ -6,3 +6,4 @@
 
 export * from './visual-viewer-animation-slider.component';
 export * from './visual-viewer-animation-slider.module';
+export * from './visual-viewer-animation-slider.service';
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 9e897c0ff3c..3a5d5919187 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -37,7 +37,7 @@
     "@angular/core": "^15.2.4",
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@sapui5/ts-types-esm": "1.108.5",
+    "@sapui5/ts-types-esm": "1.108.14",
     "@spartacus/cart": "5.0.0",
     "@spartacus/core": "5.0.0",
     "@spartacus/schematics": "5.0.0",
diff --git a/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts b/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
index 4927baf05bf..9ae2ced1fef 100644
--- a/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
+++ b/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
@@ -15,7 +15,7 @@ export function getTestConfig(): EpdVisualizationConfig {
       },
       ui5: {
         bootstrapUrl:
-          'https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js',
+          'https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js',
       },
     },
   };
diff --git a/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap b/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
index 189acb3d51e..c3cf97a731b 100644
--- a/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
+++ b/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
@@ -22,7 +22,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule } from "@spartacus/e
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js"
+        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
       },
 
       apis: {
@@ -58,7 +58,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule } from "@spartacus/e
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js"
+        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
       },
 
       apis: {
@@ -100,7 +100,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule, EPD_VISUALIZATION_F
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js"
+        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
       },
 
       apis: {
diff --git a/package-lock.json b/package-lock.json
index a00fe27474d..0093e2d1672 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
         "@nrwl/eslint-plugin-nx": "^15.9.2",
         "@nrwl/jest": "^15.9.2",
         "@nrwl/workspace": "15.9.2",
-        "@sapui5/ts-types-esm": "1.108.5",
+        "@sapui5/ts-types-esm": "1.108.14",
         "@schematics/angular": "^15.2.4",
         "@types/express": "^4.17.17",
         "@types/fs-extra": "^11.0.1",
@@ -5847,7 +5847,7 @@
       }
     },
     "node_modules/@sapui5/ts-types-esm": {
-      "version": "1.108.5",
+      "version": "1.108.14",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
diff --git a/package.json b/package.json
index 4f452af6c29..d8093886125 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "@nrwl/eslint-plugin-nx": "^15.9.2",
     "@nrwl/jest": "^15.9.2",
     "@nrwl/workspace": "15.9.2",
-    "@sapui5/ts-types-esm": "1.108.5",
+    "@sapui5/ts-types-esm": "1.108.14",
     "@schematics/angular": "^15.2.4",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 016130d90f0..48413d084bb 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -307,7 +307,7 @@
     "@angular/core": "^15.2.4",
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@sapui5/ts-types-esm": "1.108.5",
+    "@sapui5/ts-types-esm": "1.108.14",
     "@spartacus/cart": "5.0.0",
     "@spartacus/core": "5.0.0",
     "@spartacus/schematics": "5.0.0",
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
index 3c498ff553b..b8e6de53fc3 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
@@ -75,7 +75,7 @@ function buildCdsConfig(
       content: `<${EPD_VISUALIZATION_CONFIG}>{
         epdVisualization: {
           ui5: {
-            bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js"
+            bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
           },
 
           apis: {
diff --git a/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
index 445c4f7c33c..9c246c62d90 100644
--- a/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
@@ -25,7 +25,7 @@ const epdVisualizationConfig: EpdVisualizationConfig = {
 
     ui5: {
       bootstrapUrl:
-        'https://sapui5.hana.ondemand.com/1.108.5/resources/sap-ui-core.js',
+        'https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js',
     },
   },
 };

From 9f9b9befd44a7fe6924c418bdb507db4765eb976 Mon Sep 17 00:00:00 2001
From: Matthew <43279967+gladius-mtl@users.noreply.github.com>
Date: Fri, 19 May 2023 12:43:37 -0400
Subject: [PATCH 011/122] Add missing image to self publishing libs doc
 (#17434)

---
 docs/assets/github-branch-selector.png      | Bin 0 -> 96001 bytes
 docs/self-publishing-spartacus-libraries.md |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 docs/assets/github-branch-selector.png

diff --git a/docs/assets/github-branch-selector.png b/docs/assets/github-branch-selector.png
new file mode 100644
index 0000000000000000000000000000000000000000..88545b95b4d219cc0d41e384133e16d1663076d3
GIT binary patch
literal 96001
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

literal 0
HcmV?d00001

diff --git a/docs/self-publishing-spartacus-libraries.md b/docs/self-publishing-spartacus-libraries.md
index f6d0462ce4a..d8679751204 100644
--- a/docs/self-publishing-spartacus-libraries.md
+++ b/docs/self-publishing-spartacus-libraries.md
@@ -37,7 +37,7 @@ For more information about using Verdaccio or another registry software, see the
 
 1. Use the branch or tag name to check out the branch of the required release version.
 
-    For example, the following command checks out the first code-frozen 5.0.0 release, which is in branch `5.0.0-CF1`:
+    For example, the following command checks out the first code-frozen 5.0.0 release, which is in branch `release/5.0.0-CF1`:
 
     ```bash
     git checkout release/5.0.0-CF1
@@ -49,7 +49,7 @@ For more information about using Verdaccio or another registry software, see the
 
     **Note:** You can use the dropdown menu for switching branches in the top left of the main page of the [Spartacus GitHub repository](https://github.com/SAP/spartacus) to see which releases are available. Click on **develop**, enter `release/5` in the search field that appears in the dropdown menu, and you will see all of the available releases for version 5.0.0 and newer, as shown in the following example:
 
-    ![GitHub Branch Selector]({{ site.baseurl }}/assets/images/github-branch-selector.png)
+    ![GitHub Branch Selector](./assets/github-branch-selector.png)
 
 1. Run the following command to install packages and then build the libraries:
 

From 208a90164d05775feeb3f876f9759efd2674781d Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Mon, 22 May 2023 08:28:22 +0200
Subject: [PATCH 012/122] chore: improve comment / configurator addToCart
 (#17424)

---
 .../configurator-add-to-cart-button.component.ts         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
index 0d679b6cbab..76c84abbee4 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
@@ -250,12 +250,11 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     // configuration for the same cart entry number stored already.
     // (Cart entries might have been deleted)
     // Needs to happen only if we are on configuration page, navigation to
-    // cart will anyhow delete
-    // we do not clean up the product bound configuration yet, as existing
+    // cart will anyhow delete.
+    // We do not clean up the product bound configuration yet, as existing
     // observables would instantly trigger a re-create.
-    // Cleaning up this obsolete product bound configuration will only happen
-    // when a new config form requests a new observable for a product bound
-    // configuration
+    // Cleaning up this obsolete product bound configuration (with link to the cart) will
+    // only happen on leaving the configurator pages, see ConfiguratorRouterListener
     if (!isOverview) {
       this.configuratorCommonsService.removeConfiguration(nextOwner);
     }

From 509095364c416f0c35f1786f3441f2c1a8b00d7f Mon Sep 17 00:00:00 2001
From: evy-yang01 <evy.yang@sap.com>
Date: Mon, 22 May 2023 15:53:36 +0800
Subject: [PATCH 013/122] CXSPA-3478: fix display incomplete by account sorting
 in b2bCustomerList dialog (#17427)

---
 .../asm/styles/components/_customer-list.component.scss        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/feature-libs/asm/styles/components/_customer-list.component.scss b/feature-libs/asm/styles/components/_customer-list.component.scss
index bbe5796176e..b5e3b045b95 100644
--- a/feature-libs/asm/styles/components/_customer-list.component.scss
+++ b/feature-libs/asm/styles/components/_customer-list.component.scss
@@ -412,5 +412,8 @@ $sapFioriContent_LabelColor: #6a6d70;
         box-shadow: none;
       }
     }
+    .ng-dropdown-panel {
+      width: auto;
+    }
   }
 }

From 5693aac411b8c0e8567a66124df82a2f89344327 Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Tue, 23 May 2023 14:31:11 +0200
Subject: [PATCH 014/122] fix: delay configurator update message (#17438)

fixes CXSPA-3480
---
 ...figurator-update-message.component.spec.ts | 26 +++++++++++++++----
 .../configurator-update-message.component.ts  | 17 +++++++++---
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.spec.ts b/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.spec.ts
index aacd17f4a6b..ee9106a3ba6 100644
--- a/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.spec.ts
@@ -31,7 +31,7 @@ const owner: CommonConfigurator.Owner =
   ConfigurationTestData.productConfiguration.owner;
 
 let hasPendingChanges = false;
-let waitingTime = 1000;
+let waitingTime: number | undefined = 1000;
 
 class MockConfiguratorCommonsService {
   hasPendingChanges(): Observable<boolean> {
@@ -108,7 +108,7 @@ describe('ConfigurationUpdateMessageComponent', () => {
     );
   });
 
-  it('should show update banner if pending changes is true', fakeAsync(() => {
+  it('should show update banner after delay time if pending changes is true', fakeAsync(() => {
     //Should be hidden first
     expect(htmlElem.querySelectorAll('div.cx-update-msg.visible').length).toBe(
       0
@@ -126,14 +126,14 @@ describe('ConfigurationUpdateMessageComponent', () => {
     expect(htmlElem.querySelectorAll('div').length).toBe(2);
   }));
 
-  it('should consider the configured timeout', fakeAsync(() => {
+  it('should show update banner after default delay time if pending changes is true and no delay time configured', fakeAsync(() => {
     //Should be hidden first
     expect(htmlElem.querySelectorAll('div.cx-update-msg.visible').length).toBe(
       0
     );
     hasPendingChanges = true;
-    waitingTime = 100;
     fixture.detectChanges();
+    waitingTime = undefined;
 
     //Should appear after a bit
     tick(2000);
@@ -142,7 +142,23 @@ describe('ConfigurationUpdateMessageComponent', () => {
     expect(htmlElem.querySelectorAll('div.cx-update-msg.visible').length).toBe(
       1
     );
+  }));
 
-    expect(htmlElem.querySelectorAll('div').length).toBe(2);
+  it('should not show update banner if pending changes is true but delay time not reached', fakeAsync(() => {
+    //Should be hidden first
+    expect(htmlElem.querySelectorAll('div.cx-update-msg.visible').length).toBe(
+      0
+    );
+    hasPendingChanges = true;
+    fixture.detectChanges();
+
+    //Wait a bit, but don't reach delay time
+    tick(500);
+
+    fixture.detectChanges();
+    expect(htmlElem.querySelectorAll('div.cx-update-msg.visible').length).toBe(
+      0
+    );
+    tick(1000);
   }));
 });
diff --git a/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.ts b/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.ts
index b52fa37bc29..eb3acdd2d90 100644
--- a/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/update-message/configurator-update-message.component.ts
@@ -6,8 +6,8 @@
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ConfiguratorRouterExtractorService } from '@spartacus/product-configurator/common';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, switchMap } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { delay, distinctUntilChanged, switchMap } from 'rxjs/operators';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
 import { ConfiguratorMessageConfig } from '../config/configurator-message.config';
 
@@ -23,7 +23,18 @@ export class ConfiguratorUpdateMessageComponent {
       switchMap((routerData) =>
         this.configuratorCommonsService.hasPendingChanges(routerData.owner)
       ),
-      distinctUntilChanged() // avoid subsequent emissions of the same value from the source observable
+      distinctUntilChanged(), // avoid subsequent emissions of the same value from the source observable
+      switchMap(
+        (isLoading) =>
+          isLoading
+            ? of(isLoading).pipe(
+                delay(
+                  this.config.productConfigurator?.updateConfigurationMessage
+                    ?.waitingTime || 1000
+                )
+              ) // delay information if it is loading
+            : of(isLoading) // inform immediately if it's not loading anymore
+      )
     );
 
   constructor(

From df90df172c4bb602770ed50d9cfb5b14b948242d Mon Sep 17 00:00:00 2001
From: Eric Polesky <eric.polesky@sap.com>
Date: Tue, 23 May 2023 11:45:42 -0400
Subject: [PATCH 015/122] fix: command service error cancels queued or
 in-progress requests (#17419)

CXSPA-3403

The way in which a command instance's errors were handled resulted in any queued or in-progress executions being dropped when the process stream was recovered and re-opened.  This only applies to the Queue and Parallel strategy.  This commit prevents the process stream from being closed on error, preserving the transient state, and allowing any queued or in-progress executions to operate as expected.
---
 .../command-query/command.service.spec.ts     | 171 +++++++++++++++++-
 .../src/util/command-query/command.service.ts |  26 ++-
 2 files changed, 188 insertions(+), 9 deletions(-)

diff --git a/projects/core/src/util/command-query/command.service.spec.ts b/projects/core/src/util/command-query/command.service.spec.ts
index 90f73880228..310660783e1 100644
--- a/projects/core/src/util/command-query/command.service.spec.ts
+++ b/projects/core/src/util/command-query/command.service.spec.ts
@@ -1,14 +1,33 @@
 import { TestBed } from '@angular/core/testing';
 
-import { EMPTY, of } from 'rxjs';
-import { Command, CommandService } from './command.service';
+import { EMPTY, Observable, PartialObserver, Subject, of } from 'rxjs';
+import { Command, CommandService, CommandStrategy } from './command.service';
+
+/** Utility function to create a full observer filled with spies and optional overrides */
+function createObserverSpy<T>(
+  name: string,
+  observerOverrides?: PartialObserver<T>
+): jasmine.SpyObj<PartialObserver<T>> {
+  return jasmine.createSpyObj(name, {
+    next: () => {},
+    error: () => {},
+    complete: () => {},
+    ...observerOverrides,
+  });
+}
 
 describe('CommandService', () => {
   let service: CommandService;
 
+  let request1: Subject<string>;
+  let request2: Subject<string>;
+
   beforeEach(() => {
     TestBed.configureTestingModule({});
     service = TestBed.inject(CommandService);
+
+    request1 = new Subject<string>();
+    request2 = new Subject<string>();
   });
 
   it('should be created', () => {
@@ -44,5 +63,153 @@ describe('CommandService', () => {
         done();
       });
     });
+
+    describe('CommandStrategy.Queue', () => {
+      let queueCommand: Command<Observable<string>, string>;
+      let observer1: jasmine.SpyObj<PartialObserver<string>>;
+      let observer2: jasmine.SpyObj<PartialObserver<string>>;
+
+      beforeEach(() => {
+        // use argument as command request
+        queueCommand = service.create((obs) => obs, {
+          strategy: CommandStrategy.Queue,
+        });
+
+        spyOn(request1, 'subscribe').and.callThrough();
+        spyOn(request2, 'subscribe').and.callThrough();
+
+        observer1 = createObserverSpy('observer1');
+        observer2 = createObserverSpy('observer2');
+      });
+
+      it('should queue subsequent requests when the preceding request is in-progress', () => {
+        queueCommand.execute(request1);
+        queueCommand.execute(request2);
+
+        expect(request1.subscribe).toHaveBeenCalled();
+        expect(request2.subscribe).not.toHaveBeenCalled();
+      });
+
+      it('should queue requests as the default method', () => {
+        queueCommand = service.create((obs) => obs);
+        queueCommand.execute(request1);
+        queueCommand.execute(request2);
+
+        expect(request1.subscribe).toHaveBeenCalled();
+        expect(request2.subscribe).not.toHaveBeenCalled();
+      });
+
+      it('should initiate subsequent request when the preceding request completes', () => {
+        const expected = 'value1';
+        queueCommand.execute(request1).subscribe(observer1);
+        queueCommand.execute(request2);
+
+        request1.next(expected);
+        request1.complete();
+
+        expect(observer1.next).toHaveBeenCalledWith(expected);
+        expect(observer1.complete).toHaveBeenCalled();
+        expect(request2.subscribe).toHaveBeenCalled();
+      });
+
+      it('should initiate subsequent request when the preceding queued request errors', () => {
+        const expectedError = 'error1';
+        const expected = 'value2';
+        queueCommand.execute(request1).subscribe(observer1);
+        queueCommand.execute(request2).subscribe(observer2);
+
+        request1.error(expectedError);
+        request2.next(expected);
+        request2.complete();
+
+        expect(observer1.error).toHaveBeenCalledWith(expectedError);
+        expect(observer2.next).toHaveBeenCalledWith(expected);
+        expect(observer2.complete).toHaveBeenCalled();
+      });
+    });
+
+    describe('CommandStrategy.Parallel', () => {
+      let paralleCommand: Command<Observable<string>, string>;
+
+      beforeEach(() => {
+        // use argument as command request
+        paralleCommand = service.create((obs) => obs, {
+          strategy: CommandStrategy.Parallel,
+        });
+        spyOn(request1, 'subscribe').and.callThrough();
+        spyOn(request2, 'subscribe').and.callThrough();
+      });
+
+      it('should initiate requests in parallel', () => {
+        paralleCommand.execute(request1);
+        paralleCommand.execute(request2);
+
+        expect(request1.subscribe).toHaveBeenCalled();
+        expect(request2.subscribe).toHaveBeenCalled();
+      });
+
+      it('should not allow errors in one request to interfere with other requests', () => {
+        let expected = 'result2';
+        let expectedError = 'error1';
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        paralleCommand.execute(request1).subscribe(observer1);
+        paralleCommand.execute(request2).subscribe(observer2);
+
+        request1.error(expectedError);
+        request2.next(expected);
+        request2.complete();
+
+        expect(observer1.next).not.toHaveBeenCalled();
+        expect(observer1.error).toHaveBeenCalledWith(expectedError);
+        expect(observer2.next).toHaveBeenCalledWith(expected);
+        expect(observer2.complete).toHaveBeenCalled();
+      });
+    });
+
+    describe('CommandStrategy.CancelPrevious', () => {
+      let cancelPrevCommand: Command<Observable<string>, string>;
+
+      beforeEach(() => {
+        // use argument as command request
+        cancelPrevCommand = service.create((obs) => obs, {
+          strategy: CommandStrategy.CancelPrevious,
+        });
+        spyOn(request1, 'unsubscribe').and.callThrough();
+      });
+
+      it('should cancel in-progress requests', () => {
+        const observer1 = createObserverSpy('observer1');
+        cancelPrevCommand.execute(request1).subscribe(observer1);
+
+        cancelPrevCommand.execute(request2).subscribe();
+        request1.next('next');
+
+        expect(observer1.next).not.toHaveBeenCalled();
+        expect(observer1.error).not.toHaveBeenCalled();
+        expect(observer1.complete).toHaveBeenCalled();
+      });
+    });
+
+    describe('CommandStrategy.ErrorPrevious', () => {
+      let errorPrevCommand: Command<Observable<string>, string>;
+
+      beforeEach(() => {
+        // use argument as command request
+        errorPrevCommand = service.create((obs) => obs, {
+          strategy: CommandStrategy.ErrorPrevious,
+        });
+      });
+
+      it('should error in-progress requests', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        errorPrevCommand.execute(request1).subscribe(observer1);
+
+        errorPrevCommand.execute(request2).subscribe(observer2);
+
+        expect(observer1.error).toHaveBeenCalledWith(jasmine.any(Error));
+      });
+    });
   });
 });
diff --git a/projects/core/src/util/command-query/command.service.ts b/projects/core/src/util/command-query/command.service.ts
index 4b4928ea993..17cf1fe5019 100644
--- a/projects/core/src/util/command-query/command.service.ts
+++ b/projects/core/src/util/command-query/command.service.ts
@@ -5,8 +5,16 @@
  */
 
 import { Injectable, OnDestroy } from '@angular/core';
-import { Observable, ReplaySubject, Subject, Subscription, zip } from 'rxjs';
 import {
+  EMPTY,
+  Observable,
+  ReplaySubject,
+  Subject,
+  Subscription,
+  zip,
+} from 'rxjs';
+import {
+  catchError,
   concatMap,
   finalize,
   mergeMap,
@@ -68,9 +76,11 @@ export class CommandService implements OnDestroy {
       case CommandStrategy.Parallel:
         process$ = zip(commands$, results$).pipe(
           mergeMap(([cmd, notifier$]) =>
-            commandFactory(cmd).pipe(tap(notifier$))
-          ),
-          retry()
+            commandFactory(cmd).pipe(
+              tap(notifier$),
+              catchError(() => EMPTY)
+            )
+          )
         );
         break;
 
@@ -78,9 +88,11 @@ export class CommandService implements OnDestroy {
       default:
         process$ = zip(commands$, results$).pipe(
           concatMap(([cmd, notifier$]) =>
-            commandFactory(cmd).pipe(tap(notifier$))
-          ),
-          retry()
+            commandFactory(cmd).pipe(
+              tap(notifier$),
+              catchError(() => EMPTY)
+            )
+          )
         );
         break;
     }

From b4e53e28e1884121b788cde012158d510a409300 Mon Sep 17 00:00:00 2001
From: pla <plabadie@users.noreply.github.com>
Date: Tue, 23 May 2023 17:17:30 -0400
Subject: [PATCH 016/122] chore: Improve breaking change tool readme doc.
 (#17360)

CXSPA-3307
---
 tools/breaking-changes/readme.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/breaking-changes/readme.md b/tools/breaking-changes/readme.md
index 91493373559..133f7da2c03 100644
--- a/tools/breaking-changes/readme.md
+++ b/tools/breaking-changes/readme.md
@@ -42,9 +42,14 @@ Run `npm run compare`.  This compares both ./src/*/public-api.json files to crea
 
 Note: Some of the doc/schematics generators below read from the manual input files as well as the breaking change file.
 Thes input files should be present:
-- tools/breaking-changes/data/*_0/breaking-changes.json (created by comparing the API between 2 versions)
-- docs/migration/*_0/deleted-api.json (developer manual input)
-- docs/migration/*_0/deleted-renamed-api-members.json (developer manual input)
+- tools/breaking-changes/data/*_0/breaking-changes.json   (created by comparing the API between 2 versions)
+- docs/migration/*_0/migration-comments-api-elements.json (structured manual doc input for top level api elements, mainly for deleted ones.)
+- docs/migration/*_0/migration-comments-members.json      (structured manual doc input for deleted or renamed class members)
+- docs/migration/*_0/renamed-api-mappings.json            (structured manual doc input for renamed public api elements)
+
+The 6.0 migration files can be taken as a template or en example: https://github.com/SAP/spartacus/tree/release/6.0.x/docs/migration/6_0
+
+The full documentation about those files can be found here: https://wiki.one.int.sap/wiki/x/9WSWtQ
 
 `gen-const` : generates the array of migration data for the constructor migration schematic in `projects/schematics/src/migrations/*_0/constructor-deprecations`
 

From 712ab7c750e9ec95a20a0627a9c8616c9923df33 Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Wed, 24 May 2023 07:34:10 +0200
Subject: [PATCH 017/122] feat: Add quantity stepper next to add-to-cart button
 (#17418)

Add quantity stepper next to add-to-cart button to increase or decrease a number of a configuration product directly in the configuration.

Closes CXSPA-3193
---
 .../translations/en/configurator-common.ts    |   3 +
 ...igurator-add-to-cart-button.component.html | 109 +++++--
 ...rator-add-to-cart-button.component.spec.ts | 307 +++++++++++++++++-
 ...nfigurator-add-to-cart-button.component.ts | 136 +++++++-
 .../configurator-add-to-cart-button.module.ts |  16 +-
 .../configurator-price-summary.component.html |   7 +-
 ...nfigurator-price-summary.component.spec.ts |   6 +-
 .../configurator-price-summary.module.ts      |  15 +-
 .../facade/configurator-cart.service.spec.ts  |  86 ++++-
 .../core/facade/configurator-cart.service.ts  |  41 ++-
 .../configurator-router.listener.spec.ts      |  39 ++-
 .../routing/configurator-router.listener.ts   |  26 +-
 .../configurator-quantity.service.spec.ts     |  33 ++
 .../services/configurator-quantity.service.ts |  36 ++
 .../rulebased/core/services/index.ts          |   1 +
 .../_configurator-add-to-cart-button.scss     |  44 +++
 ...oduct-configurator-vc-cart.e2e-flaky.cy.ts |  22 ++
 .../helpers/product-configurator-cart.ts      |  54 ++-
 .../product-configurator-overview-vc.ts       |  15 +
 .../helpers/product-configurator-vc.ts        |   3 +-
 .../cypress/helpers/product-configurator.ts   |  57 ++++
 .../misc/icon/fontawesome-icon.config.ts      |   2 +
 .../cms-components/misc/icon/icon.model.ts    |   2 +
 23 files changed, 1010 insertions(+), 50 deletions(-)
 create mode 100644 feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.spec.ts
 create mode 100644 feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.ts

diff --git a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
index e6922faed9c..8c36f097879 100644
--- a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
+++ b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
@@ -91,14 +91,17 @@ export const configurator = {
       basePrice: 'Base Price',
       selectedOptions: 'Selected Options',
       totalPrice: 'Total',
+      totalPricePerItem: 'Total per Item',
     },
     addToCart: {
       button: 'Add to Cart',
       buttonAfterAddToCart: 'Continue to Cart',
       buttonUpdateCart: 'Done',
       buttonDisplayOnly: 'Done',
+      buttonClose: 'Close',
       confirmation: 'Configuration has been added to the cart',
       confirmationUpdate: 'Cart has been updated with configuration',
+      quantity: 'Qty',
     },
     overviewForm: {
       noAttributeHeader: 'No Results',
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
index bf1bf13df12..081c5b0898d 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
@@ -1,32 +1,97 @@
 <ng-container *ngIf="container$ | async as container">
   <ng-container *ngIf="!container.routerData.displayOnly; else displayOnly">
     <div class="cx-add-to-cart-btn-container">
-      <button
-        class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
-        (click)="onAddToCart(container.configuration, container.routerData)"
-        [attr.aria-label]="
-          (getButtonResourceKey(container.routerData, container.configuration)
-            | cxTranslate) +
-          ' ' +
-          ('configurator.a11y.addToCartPrices'
-            | cxTranslate: extractConfigPrices(container.configuration))
-        "
-      >
-        {{
-          getButtonResourceKey(container.routerData, container.configuration)
-            | cxTranslate
-        }}
-      </button>
+      <ng-container *cxFeatureLevel="'!6.1'">
+        <button
+          class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
+          (click)="onAddToCart(container.configuration, container.routerData)"
+          [attr.aria-label]="
+            (getButtonResourceKey(container.routerData, container.configuration)
+              | cxTranslate) +
+            ' ' +
+            ('configurator.a11y.addToCartPrices'
+              | cxTranslate: extractConfigPrices(container.configuration))
+          "
+        >
+          {{
+            getButtonResourceKey(container.routerData, container.configuration)
+              | cxTranslate
+          }}
+        </button>
+      </ng-container>
+      <ng-container *cxFeatureLevel="'6.1'">
+        <div class="cx-quantity-add-to-cart-container">
+          <div class="cx-quantity-add-to-cart-row">
+            <div class="cx-quantity">
+              <ng-container *ngIf="!isCartEntry(container.routerData)">
+                <label>{{
+                  'configurator.addToCart.quantity' | cxTranslate
+                }}</label>
+                <cx-item-counter [control]="quantityControl"></cx-item-counter>
+              </ng-container>
+
+              <ng-container *ngIf="isCartEntry(container.routerData)">
+                <label
+                  >{{ 'configurator.addToCart.quantity' | cxTranslate }}:</label
+                >
+                <div class="cx-quantity-value">
+                  {{
+                    getCartEntryQuantity(container.routerData.owner.id) | async
+                  }}
+                </div>
+              </ng-container>
+            </div>
+            <button
+              class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
+              (click)="
+                onAddToCart(container.configuration, container.routerData)
+              "
+              [attr.aria-label]="
+                (getButtonResourceKey(
+                  container.routerData,
+                  container.configuration
+                ) | cxTranslate) +
+                ' ' +
+                ('configurator.a11y.addToCartPrices'
+                  | cxTranslate: extractConfigPrices(container.configuration))
+              "
+              title="{{
+                getButtonResourceKey(
+                  container.routerData,
+                  container.configuration
+                ) | cxTranslate
+              }}"
+            >
+              <cx-icon
+                [type]="
+                  getIconType(container.routerData, container.configuration)
+                "
+              ></cx-icon>
+            </button>
+          </div>
+        </div>
+      </ng-container>
     </div>
   </ng-container>
   <ng-template #displayOnly>
     <div class="cx-display-only-btn-container">
-      <button
-        class="cx-btn btn btn-block btn-primary cx-display-only-btn"
-        (click)="leaveConfigurationOverview()"
-      >
-        {{ 'configurator.addToCart.buttonDisplayOnly' | cxTranslate }}
-      </button>
+      <ng-container *cxFeatureLevel="'!6.1'">
+        <button
+          class="cx-btn btn btn-block btn-primary cx-display-only-btn"
+          (click)="leaveConfigurationOverview()"
+        >
+          {{ 'configurator.addToCart.buttonDisplayOnly' | cxTranslate }}
+        </button>
+      </ng-container>
+      <ng-container *cxFeatureLevel="'6.1'">
+        <button
+          class="cx-btn btn btn-block btn-secondary cx-display-only-btn"
+          (click)="leaveConfigurationOverview()"
+          title="{{ 'configurator.addToCart.buttonClose' | cxTranslate }}"
+        >
+          {{ 'configurator.addToCart.buttonClose' | cxTranslate }}
+        </button>
+      </ng-container>
     </div>
   </ng-template>
 </ng-container>
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
index 1c9f50c493e..768cf64ec6a 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Type } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, Type } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import {
   GlobalMessageService,
@@ -14,7 +14,7 @@ import {
   ConfiguratorRouterExtractorService,
   ConfiguratorType,
 } from '@spartacus/product-configurator/common';
-import { IntersectionService } from '@spartacus/storefront';
+import { ICON_TYPE, IntersectionService } from '@spartacus/storefront';
 import { Observable, of } from 'rxjs';
 import { delay, take } from 'rxjs/operators';
 import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
@@ -25,9 +25,15 @@ import { Configurator } from '../../core/model/configurator.model';
 import * as ConfigurationTestData from '../../testing/configurator-test-data';
 import { ConfiguratorStorefrontUtilsService } from '../service';
 import { ConfiguratorAddToCartButtonComponent } from './configurator-add-to-cart-button.component';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
+import { OrderEntry } from '@spartacus/cart/base/root';
+import { UntypedFormControl } from '@angular/forms';
+import { ConfiguratorQuantityService } from '../../core/services/configurator-quantity.service';
 
 const CART_ENTRY_KEY = '001+1';
 const ORDER_ENTRY_KEY = '001+1';
+const QUANTITY = 99;
+const QUANTITY_CHANGED = 7;
 
 const configuratorType = ConfiguratorType.VARIANT;
 
@@ -68,6 +74,26 @@ const mockOrder: Order = {
   code: '1',
 };
 
+@Component({
+  selector: 'cx-icon',
+  template: '',
+})
+class MockCxIconComponent {
+  @Input() type: ICON_TYPE;
+}
+
+@Component({
+  template: '',
+  selector: 'cx-item-counter',
+})
+class MockItemCounterComponent {
+  @Input() min: number;
+  @Input() max: number;
+  @Input() step: any;
+  @Input() control: any;
+  @Input() allowZero: boolean;
+}
+
 let component: ConfiguratorAddToCartButtonComponent;
 let fixture: ComponentFixture<ConfiguratorAddToCartButtonComponent>;
 let htmlElem: HTMLElement;
@@ -75,13 +101,16 @@ let routerStateObservable: Observable<any>;
 let productConfigurationObservable: Observable<any>;
 let pendingChangesObservable: Observable<any>;
 let elementMock: { style: any };
+let orderEntryObservable: Observable<any>;
 
 function initialize() {
   routerStateObservable = of(mockRouterState);
   productConfigurationObservable = of(mockProductConfiguration);
+  orderEntryObservable = of(mockOrderEntry);
   fixture = TestBed.createComponent(ConfiguratorAddToCartButtonComponent);
   component = fixture.componentInstance;
   htmlElem = fixture.nativeElement;
+  component.quantityControl = new UntypedFormControl(1);
   fixture.detectChanges();
 }
 
@@ -89,20 +118,37 @@ class MockGlobalMessageService {
   add(): void {}
 }
 
+class MockConfiguratorQuantityService {
+  getQuantity(): Observable<number> {
+    return of(QUANTITY);
+  }
+  setQuantity(): void {}
+}
+
 class MockConfiguratorCommonsService {
   getConfiguration(): Observable<Configurator.Configuration> {
     return productConfigurationObservable;
   }
+
   removeConfiguration() {}
+
   removeUiState() {}
+
   hasPendingChanges() {
     return pendingChangesObservable;
   }
 }
 
+const mockOrderEntry: OrderEntry = { orderCode: '123' };
+
 class MockConfiguratorCartService {
   updateCartEntry() {}
+
   addToCart() {}
+
+  getEntry() {
+    return orderEntryObservable;
+  }
 }
 
 class MockConfiguratorGroupsService {
@@ -117,6 +163,7 @@ class MockCommonConfiguratorUtilsService {
 
 class MockOrderHistoryFacade implements Partial<OrderHistoryFacade> {
   loadOrderDetails() {}
+
   getOrderDetails(): Observable<Order> {
     return of(mockOrder);
   }
@@ -180,6 +227,7 @@ function setRouterTestDataReadOnlyOrder() {
   mockRouterData.owner.type = CommonConfigurator.OwnerType.ORDER_ENTRY;
   mockRouterData.owner.id = ORDER_ENTRY_KEY;
   mockRouterData.pageType = ConfiguratorRouter.PageType.OVERVIEW;
+  mockRouterData.displayOnly = true;
 }
 
 function performAddToCartOnOverview() {
@@ -220,6 +268,7 @@ function performUpdateOnOV() {
   ensureCartBoundAndOnOverview();
   component.onAddToCart(mockProductConfiguration, mockRouterData);
 }
+
 const ROUTE_CONFIGURATION = 'configureCPQCONFIGURATOR';
 const mockRouterState: any = {
   state: {
@@ -231,12 +280,15 @@ const mockRouterState: any = {
     queryParams: {},
   },
 };
+
 class MockRoutingService {
   getRouterState(): Observable<RouterState> {
     return routerStateObservable;
   }
+
   go() {}
 }
+
 class MockConfiguratorAddToCartButtonComponent {
   goToOrderDetails() {}
 }
@@ -245,19 +297,30 @@ describe('ConfigAddToCartButtonComponent', () => {
   let routingService: RoutingService;
   let globalMessageService: GlobalMessageService;
   let configuratorCommonsService: ConfiguratorCommonsService;
+  let configuratorCartService: ConfiguratorCartService;
   let configuratorGroupsService: ConfiguratorGroupsService;
   let configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService;
   let intersectionService: IntersectionService;
+  let configuratorQuantityService: ConfiguratorQuantityService;
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [I18nTestingModule],
-        declarations: [ConfiguratorAddToCartButtonComponent],
+        declarations: [
+          ConfiguratorAddToCartButtonComponent,
+          MockItemCounterComponent,
+          MockCxIconComponent,
+          MockFeatureLevelDirective,
+        ],
         providers: [
           {
             provide: RoutingService,
             useClass: MockRoutingService,
           },
+          {
+            provide: ConfiguratorQuantityService,
+            useClass: MockConfiguratorQuantityService,
+          },
           {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
@@ -317,31 +380,105 @@ describe('ConfigAddToCartButtonComponent', () => {
     configuratorCommonsService = TestBed.inject(
       ConfiguratorCommonsService as Type<ConfiguratorCommonsService>
     );
+
     globalMessageService = TestBed.inject(
       GlobalMessageService as Type<GlobalMessageService>
     );
+
+    configuratorQuantityService = TestBed.inject(
+      ConfiguratorQuantityService as Type<ConfiguratorQuantityService>
+    );
+
     configuratorGroupsService = TestBed.inject(
       ConfiguratorGroupsService as Type<ConfiguratorGroupsService>
     );
+
     configuratorStorefrontUtilsService = TestBed.inject(
       ConfiguratorStorefrontUtilsService as Type<ConfiguratorStorefrontUtilsService>
     );
+
     intersectionService = TestBed.inject(
       IntersectionService as Type<IntersectionService>
     );
+
     spyOn(configuratorGroupsService, 'setGroupStatusVisited').and.callThrough();
     spyOn(routingService, 'go').and.callThrough();
     spyOn(globalMessageService, 'add').and.callThrough();
     spyOn(configuratorCommonsService, 'removeConfiguration').and.callThrough();
+    spyOn(configuratorQuantityService, 'setQuantity').and.callThrough();
+    configuratorCartService = TestBed.inject(
+      ConfiguratorCartService as Type<ConfiguratorCartService>
+    );
+    spyOn(configuratorCartService, 'getEntry').and.callThrough();
     spyOn(configuratorStorefrontUtilsService, 'getElement').and.returnValue(
       elementMock as unknown as HTMLElement
     );
     spyOn(configuratorStorefrontUtilsService, 'changeStyling').and.stub();
   });
 
-  it('should create', () => {
+  afterEach(() => {
+    fixture.destroy();
+    mockRouterData.displayOnly = false;
+  });
+
+  it('should create cart-btn-container', () => {
     initialize();
     expect(component).toBeTruthy();
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      '.cx-add-to-cart-btn-container'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      '.cx-quantity-add-to-cart-container'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      '.cx-quantity'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      'button.cx-add-to-cart-btn'
+    );
+  });
+
+  it('should create display-only-btn-container', () => {
+    setRouterTestDataReadOnlyOrder();
+    initialize();
+    expect(component).toBeTruthy();
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      '.cx-display-only-btn-container'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      'button.btn-secondary.cx-display-only-btn'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementToContainText(
+      expect,
+      htmlElem,
+      'button.btn-secondary.cx-display-only-btn',
+      'configurator.addToCart.buttonClose'
+    );
+
+    CommonConfiguratorTestUtilsService.expectElementToHaveAttributeWithValue(
+      expect,
+      htmlElem,
+      'button.btn-secondary.cx-display-only-btn',
+      'title',
+      'configurator.addToCart.buttonClose'
+    );
   });
 
   it('should render button that is not disabled in case there are no pending changes', () => {
@@ -365,6 +502,54 @@ describe('ConfigAddToCartButtonComponent', () => {
     }
   });
 
+  describe('ngOnInit', () => {
+    it('should set quantity that was retrieved from quantity service', () => {
+      initialize();
+      expect(component.quantityControl.value).toBe(QUANTITY);
+    });
+
+    it('should not set quantity in case quantity service not available', () => {
+      initialize();
+      component.quantityControl.setValue(QUANTITY_CHANGED);
+      component['configuratorQuantityService'] = undefined;
+      component.ngOnInit();
+      expect(component.quantityControl.value).toBe(QUANTITY_CHANGED);
+    });
+  });
+
+  describe('quantityChange', () => {
+    it('should push current quantity to qty service', () => {
+      initialize();
+      component.quantityControl.setValue(QUANTITY_CHANGED);
+      expect(configuratorQuantityService.setQuantity).toHaveBeenCalledWith(
+        QUANTITY_CHANGED
+      );
+    });
+
+    it('should cope with qty service not being available', () => {
+      initialize();
+      component['configuratorQuantityService'] = undefined;
+      component.quantityControl.setValue(QUANTITY_CHANGED);
+      expect(configuratorQuantityService.setQuantity).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  describe('getCartEntryQuantity', () => {
+    it('should return one because quantity is undefined for order entry', () => {
+      component.getCartEntryQuantity('PRODUCT_CODE').subscribe((quantity) => {
+        expect(quantity).toBe(1);
+      });
+    });
+
+    it('should return quantity for order entry', () => {
+      mockOrderEntry.quantity = 20;
+      initialize();
+      component.getCartEntryQuantity('PRODUCT_CODE').subscribe((quantity) => {
+        expect(quantity).toBe(20);
+      });
+    });
+  });
+
   describe('onAddToCart', () => {
     it('should navigate to OV in case configuration is cart bound and we are on product config page', () => {
       mockRouterData.pageType = ConfiguratorRouter.PageType.CONFIGURATION;
@@ -527,6 +712,7 @@ describe('ConfigAddToCartButtonComponent', () => {
       });
     });
   });
+
   describe('Floating button', () => {
     it('should make button sticky', (done) => {
       spyOn(intersectionService, 'isIntersecting').and.returnValue(of(true));
@@ -558,6 +744,7 @@ describe('ConfigAddToCartButtonComponent', () => {
       });
     });
   });
+
   describe('Accessibility', () => {
     it('should return base price, selected option price and total price', () => {
       let result = {
@@ -668,4 +855,116 @@ describe('ConfigAddToCartButtonComponent', () => {
       );
     });
   });
+
+  describe('getButtonResourceKey', () => {
+    let routerData: ConfiguratorRouter.Data;
+    let config: Configurator.Configuration;
+
+    function prepareTestData(
+      isOwnerCartEntry: boolean,
+      isCartEntryUpdateRequired: boolean
+    ) {
+      routerData = {
+        pageType: ConfiguratorRouter.PageType.CONFIGURATION,
+        isOwnerCartEntry: isOwnerCartEntry,
+        owner: mockOwner,
+      };
+
+      config = structuredClone(mockProductConfiguration);
+      config.isCartEntryUpdateRequired = isCartEntryUpdateRequired;
+    }
+
+    it('should return configurator.addToCart.buttonUpdateCart', () => {
+      prepareTestData(true, true);
+      expect(component.getButtonResourceKey(routerData, config)).toBe(
+        'configurator.addToCart.buttonUpdateCart'
+      );
+    });
+
+    it('should return configurator.addToCart.buttonAfterAddToCart', () => {
+      prepareTestData(true, false);
+      expect(component.getButtonResourceKey(routerData, config)).toBe(
+        'configurator.addToCart.buttonAfterAddToCart'
+      );
+    });
+
+    it('should return configurator.addToCart.button', () => {
+      prepareTestData(false, false);
+
+      expect(component.getButtonResourceKey(routerData, config)).toBe(
+        'configurator.addToCart.button'
+      );
+    });
+  });
+
+  describe('getIconType', () => {
+    let routerData: ConfiguratorRouter.Data;
+    let config: Configurator.Configuration;
+
+    function prepareTestData(
+      isOwnerCartEntry: boolean,
+      isCartEntryUpdateRequired: boolean
+    ) {
+      routerData = {
+        pageType: ConfiguratorRouter.PageType.CONFIGURATION,
+        isOwnerCartEntry: isOwnerCartEntry,
+        owner: mockOwner,
+      };
+
+      config = structuredClone(mockProductConfiguration);
+      config.isCartEntryUpdateRequired = isCartEntryUpdateRequired;
+    }
+
+    it('should return CART', () => {
+      prepareTestData(true, true);
+      expect(component.getIconType(routerData, config)).toBe(
+        component.iconType.CART
+      );
+    });
+
+    it('should return CART_ARROW_DOWN', () => {
+      prepareTestData(true, false);
+      expect(component.getIconType(routerData, config)).toBe(
+        component.iconType.CART_ARROW_DOWN
+      );
+    });
+
+    it('should return CART_PLUS', () => {
+      prepareTestData(false, false);
+      expect(component.getIconType(routerData, config)).toBe(
+        component.iconType.CART_PLUS
+      );
+    });
+  });
+
+  describe('isCartEntry', () => {
+    it("should return 'false' because isOwnerCartEntry is undefined", () => {
+      const routerData: ConfiguratorRouter.Data = {
+        pageType: ConfiguratorRouter.PageType.CONFIGURATION,
+        owner: mockOwner,
+      };
+
+      expect(component.isCartEntry(routerData)).toBe(false);
+    });
+
+    it("should return 'false' because it is not a cart entry", () => {
+      const routerData: ConfiguratorRouter.Data = {
+        pageType: ConfiguratorRouter.PageType.CONFIGURATION,
+        owner: mockOwner,
+        isOwnerCartEntry: false,
+      };
+
+      expect(component.isCartEntry(routerData)).toBe(false);
+    });
+
+    it("should return 'true' because it is a cart entry", () => {
+      const routerData: ConfiguratorRouter.Data = {
+        pageType: ConfiguratorRouter.PageType.OVERVIEW,
+        owner: mockOwner,
+        isOwnerCartEntry: true,
+      };
+
+      expect(component.isCartEntry(routerData)).toBe(true);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
index 76c84abbee4..c2567565af9 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
@@ -9,12 +9,14 @@ import {
   Component,
   OnDestroy,
   OnInit,
+  Optional,
 } from '@angular/core';
 import {
   GlobalMessageService,
   GlobalMessageType,
   RoutingService,
 } from '@spartacus/core';
+import { ICON_TYPE } from '@spartacus/storefront';
 import { Order, OrderHistoryFacade } from '@spartacus/order/root';
 import {
   CommonConfigurator,
@@ -28,12 +30,21 @@ import {
   IntersectionService,
 } from '@spartacus/storefront';
 import { Observable, of, Subscription } from 'rxjs';
-import { delay, filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  delay,
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 import { ConfiguratorCartService } from '../../core/facade/configurator-cart.service';
 import { ConfiguratorCommonsService } from '../../core/facade/configurator-commons.service';
 import { ConfiguratorGroupsService } from '../../core/facade/configurator-groups.service';
 import { Configurator } from '../../core/model/configurator.model';
 import { ConfiguratorStorefrontUtilsService } from '../service/configurator-storefront-utils.service';
+import { UntypedFormControl } from '@angular/forms';
+import { ConfiguratorQuantityService } from '../../core/services/configurator-quantity.service';
 
 const CX_SELECTOR = 'cx-configurator-add-to-cart-button';
 
@@ -44,6 +55,8 @@ const CX_SELECTOR = 'cx-configurator-add-to-cart-button';
 })
 export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
   protected subscription = new Subscription();
+  quantityControl = new UntypedFormControl(1);
+  iconType = ICON_TYPE;
 
   container$: Observable<{
     routerData: ConfiguratorRouter.Data;
@@ -70,6 +83,38 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     )
   );
 
+  // TODO (CXSPA-3392): make configuratorQuantityService a required dependency
+  constructor(
+    routingService: RoutingService,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorCartService: ConfiguratorCartService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configRouterExtractorService: ConfiguratorRouterExtractorService,
+    globalMessageService: GlobalMessageService,
+    orderHistoryFacade: OrderHistoryFacade,
+    commonConfiguratorUtilsService: CommonConfiguratorUtilsService,
+    configUtils: ConfiguratorStorefrontUtilsService,
+    intersectionService: IntersectionService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorQuantityService: ConfiguratorQuantityService
+  );
+
+  /**
+   * @deprecated since 6.1
+   */
+  constructor(
+    routingService: RoutingService,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorCartService: ConfiguratorCartService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configRouterExtractorService: ConfiguratorRouterExtractorService,
+    globalMessageService: GlobalMessageService,
+    orderHistoryFacade: OrderHistoryFacade,
+    commonConfiguratorUtilsService: CommonConfiguratorUtilsService,
+    configUtils: ConfiguratorStorefrontUtilsService,
+    intersectionService: IntersectionService
+  );
+
   constructor(
     protected routingService: RoutingService,
     protected configuratorCommonsService: ConfiguratorCommonsService,
@@ -80,10 +125,46 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     protected orderHistoryFacade: OrderHistoryFacade,
     protected commonConfiguratorUtilsService: CommonConfiguratorUtilsService,
     protected configUtils: ConfiguratorStorefrontUtilsService,
-    protected intersectionService: IntersectionService
+    protected intersectionService: IntersectionService,
+    @Optional()
+    protected configuratorQuantityService?: ConfiguratorQuantityService
   ) {}
+
   ngOnInit(): void {
     this.makeAddToCartButtonSticky();
+
+    if (this.configuratorQuantityService) {
+      this.configuratorQuantityService
+        .getQuantity()
+        .pipe(take(1))
+        .subscribe((quantity) => {
+          this.quantityControl.setValue(quantity);
+        });
+    }
+
+    this.subscription.add(
+      this.quantityControl.valueChanges
+        .pipe(distinctUntilChanged())
+        .subscribe(() =>
+          this.configuratorQuantityService?.setQuantity(
+            this.quantityControl.value
+          )
+        )
+    );
+  }
+
+  /**
+   * Retrieves a quantity for a cart entry.
+   *
+   * @param {string} entryNumber - Entry number
+   * @returns {number} - Quantity
+   */
+  getCartEntryQuantity(entryNumber: string): Observable<number> {
+    return this.configuratorCartService.getEntry(entryNumber).pipe(
+      map((entry) => {
+        return entry?.quantity ? entry?.quantity : 1;
+      })
+    );
   }
 
   protected navigateToCart(): void {
@@ -138,7 +219,8 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
 
   /**
    * Decides on the resource key for the button. Depending on the business process (owner of the configuration) and the
-   * need for a cart update, the text will differ
+   * need for a cart update, the text will differ.
+   *
    * @param {ConfiguratorRouter.Data} routerData - Reflects the current router state
    * @param {Configurator.Configuration} configuration - Configuration
    * @returns {string} The resource key that controls the button description
@@ -162,6 +244,43 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Retrieves an icon type depending on the business process (owner of the configuration) and the
+   * need for a cart update. The icon will differ.
+   *
+   * @param {ConfiguratorRouter.Data} routerData - Reflects the current router state
+   * @param {Configurator.Configuration} configuration - Configuration
+   * @returns {ICON_TYPE} Icon type that determines an icon that will be displayed on the button
+   */
+  getIconType(
+    routerData: ConfiguratorRouter.Data,
+    configuration: Configurator.Configuration
+  ): ICON_TYPE {
+    if (
+      routerData.isOwnerCartEntry &&
+      configuration.isCartEntryUpdateRequired
+    ) {
+      return this.iconType.CART;
+    } else if (
+      routerData.isOwnerCartEntry &&
+      !configuration.isCartEntryUpdateRequired
+    ) {
+      return this.iconType.CART_ARROW_DOWN;
+    } else {
+      return this.iconType.CART_PLUS;
+    }
+  }
+
+  /**
+   * Verifies whether it is a cart entry.
+   *
+   * @param {ConfiguratorRouter.Data} routerData - Reflects the current router state
+   * @returns {boolean} - 'true' if it is a cart entry, otherwise 'false'
+   */
+  isCartEntry(routerData: ConfiguratorRouter.Data): boolean {
+    return routerData.isOwnerCartEntry ? routerData.isOwnerCartEntry : false;
+  }
+
   /**
    * Triggers action and navigation, both depending on the context. Might result in an addToCart, updateCartEntry,
    * just a cart navigation or a browser back navigation
@@ -211,10 +330,12 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     configuratorType: string,
     isOverview: boolean
   ) {
+    const quantity = this.quantityControl.value;
     this.configuratorCartService.addToCart(
       owner.id,
       configuration.configId,
-      owner
+      owner,
+      quantity
     );
 
     this.configuratorCommonsService
@@ -226,7 +347,7 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
         take(1)
       )
       .subscribe((configWithNextOwner) => {
-        //See preceeding filter operator: configWithNextOwner.nextOwner is always defined here
+        //See preceding filter operator: configWithNextOwner.nextOwner is always defined here
         this.navigateForProductBound(
           configWithNextOwner,
           configuratorType,
@@ -352,7 +473,9 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
         .pipe(
           take(1),
           delay(0),
-          map(() => this.configUtils.getElement('.cx-price-summary-container')),
+          map(() =>
+            this.configUtils.getElement('cx-configurator-price-summary')
+          ),
           switchMap((priceSummary) =>
             priceSummary
               ? this.intersectionService.isIntersecting(priceSummary, options)
@@ -369,6 +492,7 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
         })
     );
   }
+
   ngOnDestroy(): void {
     this.subscription.unsubscribe();
   }
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.module.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.module.ts
index 612e8f7ffc2..b13badf2592 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.module.ts
@@ -6,11 +6,23 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
+import { IconModule, ItemCounterModule } from '@spartacus/storefront';
 import { ConfiguratorAddToCartButtonComponent } from './configurator-add-to-cart-button.component';
 
 @NgModule({
-  imports: [CommonModule, I18nModule],
+  imports: [
+    CommonModule,
+    I18nModule,
+    ItemCounterModule,
+    IconModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
diff --git a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.html b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.html
index 12f8cb6cce6..deb0bc828a3 100644
--- a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.html
+++ b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.html
@@ -22,7 +22,12 @@
         </ng-container>
         <div class="cx-summary-row cx-total-price">
           <div class="cx-label">
-            {{ 'configurator.priceSummary.totalPrice' | cxTranslate }}:
+            <ng-container *cxFeatureLevel="'!6.1'">
+              {{ 'configurator.priceSummary.totalPrice' | cxTranslate }}:
+            </ng-container>
+            <ng-container *cxFeatureLevel="'6.1'">
+              {{ 'configurator.priceSummary.totalPricePerItem' | cxTranslate }}:
+            </ng-container>
           </div>
           <div class="cx-amount">
             {{ configuration?.priceSummary?.currentTotal?.formattedValue }}
diff --git a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.spec.ts b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.spec.ts
index 259c3d01b8b..e18815e5908 100644
--- a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.component.spec.ts
@@ -15,6 +15,7 @@ import { Configurator } from '../../core/model/configurator.model';
 import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
 import { ConfiguratorPriceSummaryComponent } from './configurator-price-summary.component';
 import { CommonConfiguratorTestUtilsService } from '../../../common/testing/common-configurator-test-utils.service';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 
 const PRODUCT_CODE = 'CONF_LAPTOP';
 
@@ -81,7 +82,10 @@ describe('ConfigPriceSummaryComponent', () => {
       routerStateObservable = of(mockRouterState);
       TestBed.configureTestingModule({
         imports: [I18nTestingModule],
-        declarations: [ConfiguratorPriceSummaryComponent],
+        declarations: [
+          ConfiguratorPriceSummaryComponent,
+          MockFeatureLevelDirective,
+        ],
         providers: [
           {
             provide: ConfiguratorCommonsService,
diff --git a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.module.ts b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.module.ts
index 9d85e59685e..bf20019fecb 100644
--- a/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/price-summary/configurator-price-summary.module.ts
@@ -7,11 +7,22 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  I18nModule,
+  provideDefaultConfig,
+  FeaturesConfigModule,
+} from '@spartacus/core';
 import { ConfiguratorPriceSummaryComponent } from './configurator-price-summary.component';
 
 @NgModule({
-  imports: [FormsModule, ReactiveFormsModule, CommonModule, I18nModule],
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    CommonModule,
+    I18nModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.spec.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.spec.ts
index c56af43d17a..2fa17f13aca 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.spec.ts
@@ -50,16 +50,19 @@ const cart: Cart = {
   user: { uid: OCC_USER_ID_ANONYMOUS },
   entries: [
     {
+      entryNumber: 1,
       statusSummaryList: [
         { status: OrderEntryStatus.Success, numberOfIssues: 1 },
       ],
     },
     {
+      entryNumber: 2,
       statusSummaryList: [
         { status: OrderEntryStatus.Error, numberOfIssues: 0 },
       ],
     },
     {
+      entryNumber: 3,
       statusSummaryList: [{ status: OrderEntryStatus.Info, numberOfIssues: 3 }],
     },
   ],
@@ -321,8 +324,9 @@ describe('ConfiguratorCartService', () => {
       );
     });
   });
+
   describe('addToCart', () => {
-    it('should get cart, create addToCartParameters and call addToCart action', () => {
+    it('should get cart, create addToCartParameters and call addToCart action without setting quantity', () => {
       const addToCartParams: Configurator.AddToCartParameters = {
         cartId: CART_GUID,
         userId: OCC_USER_ID_ANONYMOUS,
@@ -340,7 +344,27 @@ describe('ConfiguratorCartService', () => {
         new ConfiguratorActions.AddToCart(addToCartParams)
       );
     });
+
+    it('should get cart, create addToCartParameters and call addToCart action with setting quantity', () => {
+      const addToCartParams: Configurator.AddToCartParameters = {
+        cartId: CART_GUID,
+        userId: OCC_USER_ID_ANONYMOUS,
+        productCode: PRODUCT_CODE,
+        quantity: 100,
+        configId: CONFIG_ID,
+        owner: OWNER_PRODUCT,
+      };
+
+      spyOn(store, 'dispatch').and.callThrough();
+
+      serviceUnderTest.addToCart(PRODUCT_CODE, CONFIG_ID, OWNER_PRODUCT, 100);
+
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new ConfiguratorActions.AddToCart(addToCartParams)
+      );
+    });
   });
+
   describe('updateCartEntry', () => {
     it('should create updateParameters and call updateCartEntry action', () => {
       const params: Configurator.UpdateConfigurationForCartEntryParameters = {
@@ -405,6 +429,66 @@ describe('ConfiguratorCartService', () => {
     });
   });
 
+  describe('getEntry', () => {
+    it('should return undefined because a list of entries is undefined', () => {
+      const cartEmpty: Cart = {
+        ...cart,
+        entries: undefined,
+      };
+
+      cartObs = cold('y', {
+        y: cartEmpty,
+      });
+
+      expect(serviceUnderTest.getEntry('4')).toBeObservable(
+        cold('a', { a: undefined })
+      );
+    });
+
+    it('should return undefined because a list of entries is empty', () => {
+      const cartEmpty: Cart = {
+        ...cart,
+        entries: [],
+      };
+
+      cartObs = cold('y', {
+        y: cartEmpty,
+      });
+
+      expect(serviceUnderTest.getEntry('4')).toBeObservable(
+        cold('a', { a: undefined })
+      );
+    });
+
+    it('should return an empty list of entries because the list of entries does not contain a searched entry', () => {
+      const newestCart: Cart = {
+        ...cart,
+      };
+
+      cartObs = cold('y', {
+        y: newestCart,
+      });
+
+      expect(serviceUnderTest.getEntry('5')).toBeObservable(
+        cold('a', { a: undefined })
+      );
+    });
+
+    it('should return a searched entry', () => {
+      const newestCart: Cart = {
+        ...cart,
+      };
+
+      cartObs = cold('y', {
+        y: newestCart,
+      });
+
+      expect(serviceUnderTest.getEntry('2')).toBeObservable(
+        cold('a', { a: newestCart.entries ? newestCart.entries[1] : {} })
+      );
+    });
+  });
+
   describe('removeCartBoundConfigurations', () => {
     it('should fire respective action', () => {
       spyOn(store, 'dispatch').and.callThrough();
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.ts
index 9f02e574f45..dcaffe025a1 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-cart.service.ts
@@ -6,7 +6,7 @@
 
 import { Injectable } from '@angular/core';
 import { select, Store } from '@ngrx/store';
-import { ActiveCartFacade } from '@spartacus/cart/base/root';
+import { ActiveCartFacade, OrderEntry } from '@spartacus/cart/base/root';
 import { CheckoutQueryFacade } from '@spartacus/checkout/base/root';
 import {
   OCC_USER_ID_CURRENT,
@@ -37,7 +37,8 @@ export class ConfiguratorCartService {
   ) {}
 
   /**
-   * Reads a configuratiom that is attached to a cart entry, dispatching the respective action
+   * Reads a configuration that is attached to a cart entry, dispatching the respective action.
+   *
    * @param owner Configuration owner
    * @returns Observable of product configurations
    */
@@ -100,8 +101,10 @@ export class ConfiguratorCartService {
       )
     );
   }
+
   /**
-   * Reads a configuratiom that is attached to an order entry, dispatching the respective action
+   * Reads a configuration that is attached to an order entry, dispatching the respective action.
+   *
    * @param owner Configuration owner
    * @returns Observable of product configurations
    */
@@ -152,12 +155,14 @@ export class ConfiguratorCartService {
    *
    * @param productCode - Product code
    * @param configId - Configuration ID
-   * @param owner Configuration owner
+   * @param owner - Configuration owner
+   * @param quantity - Quantity
    */
   addToCart(
     productCode: string,
     configId: string,
-    owner: CommonConfigurator.Owner
+    owner: CommonConfigurator.Owner,
+    quantity?: number
   ): void {
     this.activeCartService
       .requireLoadedCart()
@@ -171,7 +176,7 @@ export class ConfiguratorCartService {
               userId: userId,
               cartId: this.commonConfigUtilsService.getCartId(cart),
               productCode: productCode,
-              quantity: 1,
+              quantity: quantity ?? 1,
               configId: configId,
               owner: owner,
             };
@@ -212,8 +217,10 @@ export class ConfiguratorCartService {
           });
       });
   }
+
   /**
    * Can be used to check if the active cart has any product configuration issues.
+   *
    * @returns True if and only if there is at least one cart entry with product configuration issues
    */
   activeCartHasIssues(): Observable<boolean> {
@@ -232,6 +239,28 @@ export class ConfiguratorCartService {
     );
   }
 
+  /**
+   * Retrieves cart entry by a cart entry number.
+   *
+   * @param {string} entryNumber - Entry number
+   * @returns {Observable<OrderEntry | undefined>} - Cart entry
+   */
+  getEntry(entryNumber: string): Observable<OrderEntry | undefined> {
+    return this.activeCartService.requireLoadedCart().pipe(
+      map((cart) => {
+        return cart.entries ? cart.entries : [];
+      }),
+      map((entries) => {
+        const filteredEntries = entries.filter(
+          (entry) => entry.entryNumber?.toString() === entryNumber
+        );
+        return filteredEntries
+          ? filteredEntries[filteredEntries.length - 1]
+          : undefined;
+      })
+    );
+  }
+
   /**
    * Remove all configurations that are linked to cart entries
    */
diff --git a/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.spec.ts b/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.spec.ts
index 7d82b1b21e5..d01b2db473e 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.spec.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.spec.ts
@@ -1,10 +1,12 @@
 import { Type } from '@angular/core';
 import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterState, RoutingService } from '@spartacus/core';
-import { Observable, of } from 'rxjs';
+import { Observable, Subscription, of } from 'rxjs';
 import { ConfiguratorCartService } from '../configurator-cart.service';
 import { ConfiguratorRouterListener } from './configurator-router.listener';
+import { ConfiguratorQuantityService } from '../../services/configurator-quantity.service';
 
+const QUANTITY = 99;
 class MockConfiguratorCartService {
   removeCartBoundConfigurations() {}
 }
@@ -46,6 +48,13 @@ class MockRoutingService {
   }
 }
 
+class MockConfiguratorQuantityService {
+  getQuantity(): Observable<number> {
+    return of(QUANTITY);
+  }
+  setQuantity(): void {}
+}
+
 let mockConfiguratorCartService: MockConfiguratorCartService =
   new MockConfiguratorCartService();
 
@@ -53,6 +62,7 @@ let mockRoutingService: MockRoutingService = new MockRoutingService();
 
 describe('ConfiguratorRouterListener', () => {
   let configuratorCartService: ConfiguratorCartService;
+  let configuratorQuantityService: ConfiguratorQuantityService;
 
   beforeEach(
     waitForAsync(() => {
@@ -66,6 +76,10 @@ describe('ConfiguratorRouterListener', () => {
             provide: RoutingService,
             useValue: mockRoutingService,
           },
+          {
+            provide: ConfiguratorQuantityService,
+            useClass: MockConfiguratorQuantityService,
+          },
         ],
       }).compileComponents();
     })
@@ -74,11 +88,15 @@ describe('ConfiguratorRouterListener', () => {
     configuratorCartService = TestBed.inject(
       ConfiguratorCartService as Type<ConfiguratorCartService>
     );
+    configuratorQuantityService = TestBed.inject(
+      ConfiguratorQuantityService as Type<ConfiguratorQuantityService>
+    );
 
     spyOn(
       configuratorCartService,
       'removeCartBoundConfigurations'
     ).and.callThrough();
+    spyOn(configuratorQuantityService, 'setQuantity').and.callThrough();
   });
 
   describe('observeRouterChanges', () => {
@@ -111,5 +129,24 @@ describe('ConfiguratorRouterListener', () => {
         configuratorCartService.removeCartBoundConfigurations
       ).toHaveBeenCalledTimes(0);
     });
+
+    it('should reset quantity if quantity service available', () => {
+      routerState = routerStateCartRoute;
+      TestBed.inject(
+        ConfiguratorRouterListener as Type<ConfiguratorRouterListener>
+      );
+      expect(configuratorQuantityService.setQuantity).toHaveBeenCalledWith(1);
+    });
+  });
+
+  describe('ngOnDestroy', () => {
+    it('should unsubscribe subscription', () => {
+      const classUnderTest = TestBed.inject(
+        ConfiguratorRouterListener as Type<ConfiguratorRouterListener>
+      );
+      const spyUnsubscribe = spyOn(Subscription.prototype, 'unsubscribe');
+      classUnderTest.ngOnDestroy();
+      expect(spyUnsubscribe).toHaveBeenCalled();
+    });
   });
 });
diff --git a/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.ts b/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.ts
index 60b3187eb31..e509ad0b163 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/routing/configurator-router.listener.ts
@@ -4,17 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, Optional } from '@angular/core';
 import { RoutingService } from '@spartacus/core';
 import { Subscription } from 'rxjs';
 import { ConfiguratorCartService } from '../configurator-cart.service';
+import { ConfiguratorQuantityService } from '../../services/configurator-quantity.service';
 
 @Injectable({ providedIn: 'root' })
 export class ConfiguratorRouterListener implements OnDestroy {
   protected subscription = new Subscription();
+
+  // TODO (CXSPA-3392): make configuratorQuantityService a required dependency
+  constructor(
+    configuratorCartService: ConfiguratorCartService,
+    routingService: RoutingService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorQuantityService: ConfiguratorQuantityService
+  );
+
+  /**
+   * @deprecated since 6.1
+   */
+  constructor(
+    configuratorCartService: ConfiguratorCartService,
+    routingService: RoutingService
+  );
   constructor(
     protected configuratorCartService: ConfiguratorCartService,
-    protected routingService: RoutingService
+    protected routingService: RoutingService,
+    @Optional()
+    protected configuratorQuantityService?: ConfiguratorQuantityService
   ) {
     this.observeRouterChanges();
   }
@@ -24,6 +43,9 @@ export class ConfiguratorRouterListener implements OnDestroy {
       this.routingService.getRouterState().subscribe((routerState) => {
         if (!this.isConfiguratorRelatedRoute(routerState.state.semanticRoute)) {
           this.configuratorCartService.removeCartBoundConfigurations();
+          if (this.configuratorQuantityService) {
+            this.configuratorQuantityService.setQuantity(1);
+          }
         }
       })
     );
diff --git a/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.spec.ts b/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.spec.ts
new file mode 100644
index 00000000000..dc23ebf7484
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.spec.ts
@@ -0,0 +1,33 @@
+import { TestBed } from '@angular/core/testing';
+import { take } from 'rxjs/operators';
+import { ConfiguratorQuantityService } from './configurator-quantity.service';
+import { cold } from 'jasmine-marbles';
+
+describe('ConfiguratorQuantityService', () => {
+  let classUnderTest: ConfiguratorQuantityService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [ConfiguratorQuantityService],
+    });
+    classUnderTest = TestBed.inject(ConfiguratorQuantityService);
+  });
+
+  describe('getQuantity', () => {
+    it('should not emit anything until it will be initialized from outside', () => {
+      expect(classUnderTest.getQuantity()).toBeObservable(cold(''));
+    });
+
+    it('should return value that was set with setQuantity', (done) => {
+      const result = 100;
+      classUnderTest.setQuantity(result);
+      classUnderTest
+        .getQuantity()
+        .pipe(take(1))
+        .subscribe((quantity) => {
+          expect(quantity).toBe(result);
+          done();
+        });
+    });
+  });
+});
diff --git a/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.ts b/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.ts
new file mode 100644
index 00000000000..c3fbff61db9
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/core/services/configurator-quantity.service.ts
@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { Observable, ReplaySubject } from 'rxjs';
+
+/**
+ * To implement custom solution provide your own implementation and customize services that use ConfiguratorQuantityService
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class ConfiguratorQuantityService {
+  private _quantity: Observable<number> = new ReplaySubject<number>(1);
+
+  /**
+   * Sets the configuration quantity.
+   *
+   * @param quantity
+   */
+  public setQuantity(quantity: number): void {
+    (this._quantity as ReplaySubject<number>).next(quantity);
+  }
+
+  /**
+   * Retrieves the configuration quantity.
+   *
+   * @returns {Observable<number>} - Configuration quantity.
+   */
+  public getQuantity(): Observable<number> {
+    return this._quantity;
+  }
+}
diff --git a/feature-libs/product-configurator/rulebased/core/services/index.ts b/feature-libs/product-configurator/rulebased/core/services/index.ts
index 3d1f09b346f..21238038c30 100644
--- a/feature-libs/product-configurator/rulebased/core/services/index.ts
+++ b/feature-libs/product-configurator/rulebased/core/services/index.ts
@@ -5,3 +5,4 @@
  */
 
 export * from './configurator-expert-mode.service';
+export * from './configurator-quantity.service';
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
index 115f4508854..3a3d1a35793 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
@@ -17,4 +17,48 @@
       @include cx-configurator-footer-container-item();
     }
   }
+
+  @include forVersion(6.1) {
+    .cx-add-to-cart-btn-container {
+      .cx-quantity-add-to-cart-container {
+        @include media-breakpoint-down(sm) {
+          inline-size: 100%;
+        }
+
+        inline-size: 40%;
+        padding-inline-start: 16px;
+
+        @include media-breakpoint-down(sm) {
+          padding-inline-start: 0px;
+        }
+
+        .cx-quantity-add-to-cart-row {
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+
+          .cx-quantity {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            padding-inline-end: 10px;
+
+            label {
+              padding-inline-end: 5px;
+              font-weight: var(--cx-font-weight-semi);
+              margin-block-end: 0px;
+            }
+
+            cx-item-counter {
+              background-color: var(--cx-color-inverse);
+            }
+          }
+        }
+      }
+
+      button.cx-add-to-cart-btn {
+        inline-size: 45%;
+      }
+    }
+  }
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
index aee5affe81c..890f2d6a447 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
@@ -103,6 +103,28 @@ context('Product Configuration', () => {
       cart.verifyCartNotEmpty();
       configurationCart.clickOnEditConfigurationLink(0);
     });
+
+    it('should be able to to add more than one piece of a configured product in the cart via a quantity stepper next to the add-to-cart button (CXSPA-3193)', () => {
+      clickAllowAllFromBanner();
+      configurationVc.goToConfigurationPage(
+        electronicsShop,
+        testProductMultiLevel
+      );
+      configuration.checkQuantityStepper(1);
+      configuration.increaseQuantity();
+      configuration.increaseQuantity();
+      configuration.decreaseQuantity();
+      configuration.enterQuantityValue(10);
+      configurationVc.clickAddToCartBtn();
+      configurationOverviewVc.checkQuantity(10);
+      configurationVc.goToCart(electronicsShop);
+      configurationCart.checkQuantityStepper(0, 10);
+      configurationCart.increaseQuantity(0);
+      configurationCart.increaseQuantity(0);
+      configurationCart.decreaseQuantity(0);
+      configurationCart.clickOnEditConfigurationLink(0);
+      configuration.checkQuantity(11);
+    });
   });
 
   describe('Conflict Solver', () => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart.ts
index 7dc06fb8d76..5f06f54188a 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cart.ts
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+const cartItemQuantityStepperSelector = '.cx-value cx-item-counter';
+
 /**
  * Clicks on the 'Edit Configuration' link in cart for a certain cart item.
  *
@@ -14,9 +16,12 @@ export function clickOnEditConfigurationLink(cartItemIndex: number): void {
     .eq(cartItemIndex)
     .find('cx-configure-cart-entry')
     .as('aElement');
+
   cy.get('@aElement')
     .find('a:contains("Edit")')
-    .click()
+    .click({
+      force: true,
+    })
     .then(() => {
       cy.location('pathname').should('contain', '/cartEntry/entityKey/');
     });
@@ -77,3 +82,50 @@ export function defineOrderNumberAlias(): void {
       cy.wrap(orderNumber).as('orderNumber');
     });
 }
+
+/**
+ * Verifies whether a quantity value that has entered into the quantity stepper is equal to the expected value.
+ *
+ * @param {number} cartItemIndex - Index of cart item
+ * @param {number} quantity - Quantity value
+ */
+export function checkQuantityStepper(cartItemIndex: number, quantity: number) {
+  cy.get('cx-cart-item-list .cx-item-list-row')
+    .eq(cartItemIndex)
+    .find('.cx-quantity')
+    .as('aElement');
+
+  cy.get('@aElement')
+    .find(cartItemQuantityStepperSelector + ' input')
+    .should('have.value', quantity.toString());
+}
+
+function changeQuantityValue(cartItemIndex: number, sign: string) {
+  cy.get('cx-cart-item-list .cx-item-list-row')
+    .eq(cartItemIndex)
+    .find('.cx-quantity')
+    .as('aElement');
+
+  cy.get('@aElement')
+    .find(cartItemQuantityStepperSelector + ' button')
+    .contains(sign)
+    .click();
+}
+
+/**
+ * Increase a quantity value of the quantity stepper.
+ *
+ * @param {number} cartItemIndex - Index of cart item
+ */
+export function increaseQuantity(cartItemIndex: number) {
+  changeQuantityValue(cartItemIndex, '+');
+}
+
+/**
+ * Decrease a quantity value of the quantity stepper.
+ *
+ * @param {number} cartItemIndex - Index of cart item
+ */
+export function decreaseQuantity(cartItemIndex: number) {
+  changeQuantityValue(cartItemIndex, '-');
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
index aa04e998c58..4cc6b88bd5e 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
@@ -12,6 +12,9 @@ const resolveIssuesLinkSelector =
 const resolveConflictsLinkSelector =
   'cx-configurator-overview-notification-banner #cx-configurator-overview-conflict-msg button.cx-action-link';
 
+const addToCartQuantitySelector =
+  '.cx-add-to-cart-btn-container .cx-quantity-value';
+
 /**
  * Navigates to the configured product overview page.
  *
@@ -232,6 +235,7 @@ export function checkNumberOfMenuEntriesDisplayed(num: number) {
 
 /**
  * Clicks on the menu item with the given index. Does not wait, but returns immediately.
+ *
  * @param {number} index index of the menu item
  */
 export function clickMenuItem(index: number) {
@@ -253,3 +257,14 @@ export function checkViewPortScrolledToGroup(groupIdx: number) {
         .and.to.be.below(1);
     });
 }
+
+/**
+ * Verifies whether a quantity value that has been entered into the quantity stepper is equal to the expected value.
+ *
+ * @param expectedValue
+ */
+export function checkQuantity(expectedValue: number) {
+  cy.get(addToCartQuantitySelector).then((elem) => {
+    expect(elem.text().trim()).to.equal(expectedValue.toString());
+  });
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
index cf2265cc940..7f7b51e7ee0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
@@ -6,7 +6,8 @@
 
 import * as configuration from './product-configurator';
 
-const addToCartButtonSelector = 'cx-configurator-add-to-cart-button button';
+const addToCartButtonSelector =
+  'cx-configurator-add-to-cart-button button.cx-add-to-cart-btn';
 
 const conflictDetectedMsgSelector = '.cx-conflict-msg';
 const conflictHeaderGroupSelector =
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
index 824d76f9899..134200e1b45 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
@@ -15,6 +15,11 @@ const nextBtnSelector =
 const previousBtnSelector =
   'cx-configurator-previous-next-buttons button:contains("Previous")';
 
+const quantityStepperSelector =
+  '.cx-add-to-cart-btn-container .cx-quantity cx-item-counter';
+
+const quantitySelector = '.cx-add-to-cart-btn-container .cx-quantity-value';
+
 /**
  * ui types
  */
@@ -584,3 +589,55 @@ export function clickExitConfigurationBtn(): void {
       cy.location('pathname').should('not.contain', '/configure/');
     });
 }
+
+/**
+ * Verifies whether a quantity value that is entered into the quantity stepper is equal to the expected value.
+ *
+ * @param {number} expectedValue - expected quantity value
+ */
+export function checkQuantityStepper(expectedValue: number) {
+  cy.get(quantityStepperSelector + ' input').should(
+    'have.value',
+    expectedValue.toString()
+  );
+}
+
+/**
+ * Verifies whether a quantity value that has been entered into the quantity stepper is equal to the expected value.
+ *
+ * @param {number} expectedValue - expected quantity value
+ */
+export function checkQuantity(expectedValue: number) {
+  cy.get(quantitySelector).then((elem) => {
+    expect(elem.text().trim()).to.equal(expectedValue.toString());
+  });
+}
+
+function changeQuantityValue(sign: string) {
+  cy.get(quantityStepperSelector + ' button')
+    .contains(sign)
+    .click();
+}
+
+/**
+ * Increase a quantity value of the quantity stepper.
+ */
+export function increaseQuantity() {
+  changeQuantityValue('+');
+}
+
+/**
+ * Decrease a quantity value of the quantity stepper.
+ */
+export function decreaseQuantity() {
+  changeQuantityValue('-');
+}
+
+/**
+ * Enter a new quantity value into the quantity stepper.
+ */
+export function enterQuantityValue(quantity: number) {
+  cy.get(quantityStepperSelector + ' input').type(
+    `{selectall}${quantity.toString()}{enter}`
+  );
+}
diff --git a/projects/storefrontlib/cms-components/misc/icon/fontawesome-icon.config.ts b/projects/storefrontlib/cms-components/misc/icon/fontawesome-icon.config.ts
index e38e65ee9f7..1aefcb53e1d 100644
--- a/projects/storefrontlib/cms-components/misc/icon/fontawesome-icon.config.ts
+++ b/projects/storefrontlib/cms-components/misc/icon/fontawesome-icon.config.ts
@@ -17,6 +17,8 @@ export const fontawesomeIconConfig: IconConfig = {
       CARET_RIGHT: 'fas fa-angle-right',
       CARET_UP: 'fas fa-angle-up',
       CART: 'fas fa-shopping-cart',
+      CART_PLUS: 'fas fa-cart-plus',
+      CART_ARROW_DOWN: 'fas fa-cart-arrow-down',
       CHECK: 'fas fa-check',
       CIRCLE: 'fas fa-circle',
       CLIPBOARD_LIST: 'fas fa-clipboard-list',
diff --git a/projects/storefrontlib/cms-components/misc/icon/icon.model.ts b/projects/storefrontlib/cms-components/misc/icon/icon.model.ts
index 822e8ee4bc8..175d46a404f 100644
--- a/projects/storefrontlib/cms-components/misc/icon/icon.model.ts
+++ b/projects/storefrontlib/cms-components/misc/icon/icon.model.ts
@@ -17,6 +17,8 @@ export enum ICON_TYPE {
   CARET_RIGHT = 'CARET_RIGHT',
   CARET_UP = 'CARET_UP',
   CART = 'CART',
+  CART_PLUS = 'CART_PLUS',
+  CART_ARROW_DOWN = 'CART_ARROW_DOWN',
   CHECK = 'CHECK',
   CIRCLE = 'CIRCLE',
   CLIPBOARD_LIST = 'CLIPBOARD_LIST',

From c225420eb1ed029dcac65b496d6df59d5e5a7b5d Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Wed, 24 May 2023 10:09:52 +0200
Subject: [PATCH 018/122] test: Fix failing cypress tabbing test (#17443)

Fix failing cypress tabbing test

Closes CXSPA-3500
---
 .../cypress/helpers/accessibility/tabbing-order.config.ts   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
index e1c56232c84..788657b15cc 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
@@ -204,8 +204,9 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
       value: 'Next',
       type: TabbingOrderTypes.BUTTON,
     },
+    { type: TabbingOrderTypes.GENERIC_INPUT },
+    { value: '+', type: TabbingOrderTypes.BUTTON },
     {
-      value: 'Add to Cart',
       type: TabbingOrderTypes.BUTTON,
     },
   ],
@@ -235,8 +236,9 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
       value: 'Basics',
       type: TabbingOrderTypes.LINK,
     },
+    { type: TabbingOrderTypes.GENERIC_INPUT },
+    { value: '+', type: TabbingOrderTypes.BUTTON },
     {
-      value: 'Add to Cart',
       type: TabbingOrderTypes.BUTTON,
     },
   ],

From 606829724688b562d252e4676fa611aaeb347cab Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Wed, 24 May 2023 11:02:12 +0200
Subject: [PATCH 019/122] refactor: strict mode for configurator templates
 (#17417)

---
 ...onfigurator-attribute-composition.model.ts |  2 +-
 ...configurator-attribute-header.component.ts |  2 +-
 ...ator-attribute-product-card.component.html | 35 ++++-------
 ...r-attribute-product-card.component.spec.ts | 15 +++++
 ...urator-attribute-product-card.component.ts |  8 +++
 ...igurator-attribute-quantity.component.html |  4 +-
 ...figurator-attribute-base.component.spec.ts | 19 ++++++
 .../configurator-attribute-base.component.ts  | 10 +++
 ...ttribute-multi-selection-base.component.ts |  2 +-
 ...te-single-selection-base.component.spec.ts |  9 +--
 ...tribute-single-selection-base.component.ts | 12 ++--
 ...igurator-attribute-checkbox.component.html | 26 ++++----
 ...rator-attribute-checkbox.component.spec.ts | 11 ++++
 ...nfigurator-attribute-checkbox.component.ts | 29 +++++----
 ...bute-multi-selection-bundle.component.html |  4 +-
 ...ibute-multi-selection-image.component.html |  8 +--
 ...tribute-multi-selection-image.component.ts |  2 +-
 ...e-selection-bundle-dropdown.component.html |  2 +-
 ...ute-single-selection-bundle.component.html |  2 +-
 ...bute-single-selection-image.component.html |  8 +--
 ...e-single-selection-image.component.spec.ts | 15 +++++
 ...ribute-single-selection-image.component.ts | 12 ++--
 ...conflict-and-error-messages.component.html | 12 ++--
 ...ator-conflict-solver-dialog.component.html | 17 +++---
 .../form/configurator-form.component.ts       |  2 +-
 .../configurator-group-menu.component.html    |  6 +-
 .../configurator-group-menu.component.spec.ts | 17 ++++++
 .../configurator-group-menu.component.ts      | 16 +++++
 .../group/configurator-group.component.html   | 61 ++++++++++---------
 .../configurator-group.component.spec.ts      |  4 +-
 .../group/configurator-group.component.ts     |  2 +-
 ...ator-overview-filter-button.component.html | 23 ++++---
 ...r-overview-filter-button.component.spec.ts | 11 +++-
 ...urator-overview-filter-button.component.ts | 21 +++++++
 .../configurator-overview-form.component.html |  2 +-
 ...nfigurator-overview-sidebar.component.html | 14 ++++-
 ...gurator-overview-sidebar.component.spec.ts |  8 +++
 ...configurator-overview-sidebar.component.ts | 23 +++++++
 ...rator-previous-next-buttons.component.html |  2 +-
 ...or-previous-next-buttons.component.spec.ts |  6 +-
 ...nfigurator-variant-carousel.component.html |  4 +-
 .../product-configurator/tsconfig.lib.json    |  2 +-
 42 files changed, 341 insertions(+), 149 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.model.ts b/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.model.ts
index 7395cf801a6..ae2f75363d7 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.model.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.model.ts
@@ -16,5 +16,5 @@ export class ConfiguratorAttributeCompositionContext {
   group: Configurator.Group;
   language: string;
   expMode: boolean;
-  isNavigationToGroupEnabled: boolean;
+  isNavigationToGroupEnabled?: boolean;
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
index 3aa63bf463b..63258d7cf07 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
@@ -59,7 +59,7 @@ export class ConfiguratorAttributeHeaderComponent
       Configurator.GroupType.ATTRIBUTE_GROUP;
     this.expMode = attributeComponentContext.expMode;
     this.isNavigationToGroupEnabled =
-      attributeComponentContext.isNavigationToGroupEnabled;
+      attributeComponentContext.isNavigationToGroupEnabled ?? false;
   }
 
   ngOnInit(): void {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
index 4aa930b248f..3215dc24f7c 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.html
@@ -8,14 +8,14 @@
       'configurator.a11y.itemOfAttribute'
         | cxTranslate
           : {
-              attribute: productCardOptions?.attributeLabel
+              attribute: productCardOptions.attributeLabel
             }
     "
   >
     <div class="cx-product-card-rows">
       <div class="cx-product-card-imgs">
         <cx-media
-          [container]="product?.images?.PRIMARY"
+          [container]="product.images?.PRIMARY"
           format="product"
           aria-hidden="true"
         ></cx-media>
@@ -32,8 +32,8 @@
           {{ product.code }}
         </div>
         <cx-configurator-show-more
-          *ngIf="product?.description"
-          [text]="product?.description"
+          *ngIf="product.description && product.code"
+          [text]="product.description"
           [textSize]="45"
           [productName]="product.code"
         ></cx-configurator-show-more>
@@ -74,7 +74,7 @@
               [cxFocus]="focusConfig"
               [attr.aria-label]="getAriaLabelMultiSelected(product)"
               [attr.aria-describedby]="
-                createAttributeUiKey('label', productCardOptions?.attributeName)
+                createAttributeUiKey('label', attributeName)
               "
             >
               {{ 'configurator.button.remove' | cxTranslate }}
@@ -85,15 +85,12 @@
                 class="btn btn-primary"
                 (click)="onHandleSelect()"
                 [disabled]="
-                  productCardOptions?.disableAllButtons || (loading$ | async)
+                  productCardOptions.disableAllButtons || (loading$ | async)
                 "
                 [cxFocus]="focusConfig"
                 [attr.aria-label]="getAriaLabelMultiUnselected(product)"
                 [attr.aria-describedby]="
-                  createAttributeUiKey(
-                    'label',
-                    productCardOptions?.attributeName
-                  )
+                  createAttributeUiKey('label', attributeName)
                 "
               >
                 {{ 'configurator.button.add' | cxTranslate }}
@@ -106,7 +103,7 @@
               class="btn btn-primary"
               (click)="onHandleSelect()"
               [disabled]="
-                productCardOptions?.disableAllButtons || (loading$ | async)
+                productCardOptions.disableAllButtons || (loading$ | async)
               "
               *ngIf="
                 !productCardOptions?.productBoundValue?.selected;
@@ -115,7 +112,7 @@
               [cxFocus]="focusConfig"
               [attr.aria-label]="getAriaLabelSingleUnselected(product)"
               [attr.aria-describedby]="
-                createAttributeUiKey('label', productCardOptions?.attributeName)
+                createAttributeUiKey('label', attributeName)
               "
             >
               {{ 'configurator.button.select' | cxTranslate }}
@@ -133,15 +130,12 @@
                   class="btn btn-secondary"
                   (click)="onHandleDeselect()"
                   [disabled]="
-                    productCardOptions?.hideRemoveButton || (loading$ | async)
+                    productCardOptions.hideRemoveButton || (loading$ | async)
                   "
                   [cxFocus]="focusConfig"
                   [attr.aria-label]="getAriaLabelSingleSelected(product)"
                   [attr.aria-describedby]="
-                    createAttributeUiKey(
-                      'label',
-                      productCardOptions?.attributeName
-                    )
+                    createAttributeUiKey('label', attributeName)
                   "
                 >
                   {{ 'configurator.button.deselect' | cxTranslate }}
@@ -165,12 +159,7 @@
         aria-live="assertive"
         aria-atomic="true"
         role="alert"
-        id="{{
-          createAttributeUiKey(
-            'attribute-msg',
-            productCardOptions?.attributeName
-          )
-        }}"
+        id="{{ createAttributeUiKey('attribute-msg', attributeName) }}"
       >
         <cx-icon class="deselection-error-symbol" type="ERROR"></cx-icon>
         {{ 'configurator.attribute.deselectionNotPossible' | cxTranslate }}
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
index 286513021c8..059ea1874cd 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
@@ -250,6 +250,21 @@ describe('ConfiguratorAttributeProductCardComponent', () => {
     expect(loadingState[2]).toBe(false); // loading done
   });
 
+  describe('getAttributeName', () => {
+    it('should return attribute name if present', () => {
+      expect(component.attributeName).toBe(
+        component.productCardOptions.attributeName
+      );
+    });
+
+    it('should fall back to attribute ID in case name is not present', () => {
+      component.productCardOptions.attributeName = undefined;
+      expect(component.attributeName).toBe(
+        component.productCardOptions.attributeId.toString()
+      );
+    });
+  });
+
   describe('Buttons constellation', () => {
     it('should button be enabled when card actions are disabled and card is no selected', () => {
       const button = fixture.debugElement.query(
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
index d6ad37c97e1..781ea5af8b2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
@@ -110,6 +110,14 @@ export class ConfiguratorAttributeProductCardComponent
       false
     );
   }
+  //TODO(CXSPA-3392) for next major: turn ConfiguratorAttributeProductCardComponentOptions#attributeName
+  //into a required field and get rid of this method, use this.productCardOptions.attributeName instead
+  get attributeName(): string {
+    const attributeName = this.productCardOptions.attributeName;
+    return attributeName
+      ? attributeName
+      : this.productCardOptions.attributeId.toString();
+  }
 
   get focusConfig(): FocusConfig {
     const focusConfig = {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/quantity/configurator-attribute-quantity.component.html b/feature-libs/product-configurator/rulebased/components/attribute/quantity/configurator-attribute-quantity.component.html
index 981edd0fed8..ef9f86003d6 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/quantity/configurator-attribute-quantity.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/quantity/configurator-attribute-quantity.component.html
@@ -1,8 +1,8 @@
 <div class="cx-quantity">
   <label>{{ 'configurator.attribute.quantity' | cxTranslate }}</label>
   <cx-item-counter
-    [allowZero]="quantityOptions?.allowZero"
+    [allowZero]="quantityOptions.allowZero ?? false"
     [control]="quantity"
-    [min]="quantityOptions?.allowZero ? 0 : 1"
+    [min]="quantityOptions.allowZero ? 0 : 1"
   ></cx-item-counter>
 </div>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
index eb0c990792b..799c84842d5 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
@@ -108,6 +108,25 @@ describe('ConfigUIKeyGeneratorService', () => {
     });
   });
 
+  describe('getImage', () => {
+    const image: Configurator.Image = { url: 'url' };
+    const value: Configurator.Value = { valueCode: 'val', images: [image] };
+
+    it('should return first image if present', () => {
+      expect(classUnderTest.getImage(value)).toBe(image);
+    });
+
+    it('should return undefined in case no images present on value', () => {
+      value.images = undefined;
+      expect(classUnderTest.getImage(value)).toBeUndefined();
+    });
+
+    it('should return undefined in case empty image array present on value', () => {
+      value.images = [];
+      expect(classUnderTest.getImage(value)).toBeUndefined();
+    });
+  });
+
   it('should generate focus id for attribute value', () => {
     expect(classUnderTest.createFocusId('attrCode', 'valueCode')).toBe(
       'attrCode--valueCode--focus'
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
index aab6854532c..c0862878417 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
@@ -162,6 +162,16 @@ export class ConfiguratorAttributeBaseComponent {
     return title;
   }
 
+  /**
+   * Fetches the first image for a given value
+   * @param value Value
+   * @returns Image
+   */
+  getImage(value: Configurator.Value): Configurator.Image | undefined {
+    const images = value.images;
+    return images ? images[0] : undefined;
+  }
+
   protected getValuePrice(value: Configurator.Value | undefined): string {
     if (value?.valuePrice?.value && !value.selected) {
       if (value.valuePrice.value < 0) {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-multi-selection-base.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-multi-selection-base.component.ts
index 61abdaa4425..c9ce078a183 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-multi-selection-base.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-multi-selection-base.component.ts
@@ -134,7 +134,7 @@ export abstract class ConfiguratorAttributeMultiSelectionBaseComponent extends C
    */
   extractValuePriceFormulaParameters(
     value: Configurator.Value
-  ): ConfiguratorPriceComponentOptions | undefined {
+  ): ConfiguratorPriceComponentOptions {
     return {
       quantity: value.quantity,
       price: value.valuePrice,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
index 66a59684cdf..03ffc9d76b2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
@@ -379,10 +379,11 @@ describe('ConfiguratorAttributeSingleSelectionBaseComponent', () => {
   });
 
   describe('extractValuePriceFormulaParameters', () => {
-    it('should return `undefined`', () => {
-      expect(
-        component.extractValuePriceFormulaParameters(undefined)
-      ).toBeUndefined();
+    it('should return empty result for undefined input', () => {
+      expect(component.extractValuePriceFormulaParameters(undefined)).toEqual({
+        price: undefined,
+        isLightedUp: false,
+      });
     });
 
     it('should return price formula parameters', () => {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
index 61c9b750423..ed2a6c0163b 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
@@ -174,13 +174,11 @@ export abstract class ConfiguratorAttributeSingleSelectionBaseComponent extends
    */
   extractValuePriceFormulaParameters(
     value?: Configurator.Value
-  ): ConfiguratorPriceComponentOptions | undefined {
-    if (value) {
-      return {
-        price: value.valuePrice,
-        isLightedUp: value.selected,
-      };
-    }
+  ): ConfiguratorPriceComponentOptions {
+    return {
+      price: value?.valuePrice,
+      isLightedUp: value ? value.selected : false,
+    };
   }
 
   protected getSelectedValuePrice(): Configurator.PriceDetails | undefined {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.html
index 87e5d4d3c48..2f9028aeda6 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.html
@@ -8,32 +8,32 @@
             id="{{
               createAttributeValueIdForConfigurator(
                 attribute,
-                attribute?.values[0].valueCode
+                attributeValue.valueCode
               )
             }}"
             type="checkbox"
             class="form-check-input"
-            [value]="attribute?.values[0].valueCode"
+            [value]="attributeValue.valueCode"
             [cxFocus]="{
-              key: attribute.name + '-' + attribute?.values[0].name
+              key: attribute.name + '-' + attributeValue.name
             }"
             (change)="onSelect()"
             [formControl]="attributeCheckBoxForm"
             name="{{ createAttributeIdForConfigurator(attribute) }}"
             [attr.aria-label]="
-              attribute?.values[0].valuePrice &&
-              attribute?.values[0].valuePrice?.value !== 0
+              attributeValue.valuePrice &&
+              attributeValue.valuePrice?.value !== 0
                 ? ('configurator.a11y.valueOfAttributeFullWithPrice'
                   | cxTranslate
                     : {
-                        value: attribute?.values[0].valueDisplay,
+                        value: attributeValue.valueDisplay,
                         attribute: attribute.label,
-                        price: attribute?.values[0].valuePrice.formattedValue
+                        price: attributeValue.valuePrice.formattedValue
                       })
                 : ('configurator.a11y.valueOfAttributeFull'
                   | cxTranslate
                     : {
-                        value: attribute?.values[0].valueDisplay,
+                        value: attributeValue.valueDisplay,
                         attribute: attribute.label
                       })
             "
@@ -48,13 +48,13 @@
               createValueUiKey(
                 'label',
                 attribute.name,
-                attribute?.values[0].valueCode
+                attributeValue.valueCode
               )
             }}"
             for="{{
               createAttributeValueIdForConfigurator(
                 attribute,
-                attribute?.values[0].valueCode
+                attributeValue.valueCode
               )
             }}"
             aria-hidden="true"
@@ -62,15 +62,15 @@
             >{{
               getLabel(
                 expMode,
-                attribute?.values[0].valueDisplay,
-                attribute?.values[0].valueCode
+                attributeValue.valueDisplay,
+                attributeValue.valueCode
               )
             }}</label
           >
         </div>
         <div class="cx-value-price">
           <cx-configurator-price
-            [formula]="extractValuePriceFormulaParameters(attribute?.values[0])"
+            [formula]="extractValuePriceFormulaParameters(attributeValue)"
           ></cx-configurator-price>
         </div>
       </div>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.spec.ts
index 3bbcbab66bb..a5df5d7aa74 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.spec.ts
@@ -105,6 +105,17 @@ describe('ConfigAttributeCheckBoxComponent', () => {
     expect(component.attributeCheckBoxForm.value).toBeFalsy();
   });
 
+  describe('getValueFromAttribute', () => {
+    it('should find value in case values present on attribute', () => {
+      expect(component['getValueFromAttribute']()).toBe(value1);
+    });
+
+    it('should return empty value if no values are present', () => {
+      component.attribute.values = undefined;
+      expect(component['getValueFromAttribute']()).toEqual({ valueCode: '' });
+    });
+  });
+
   it('should select and deselect a checkbox value', () => {
     const checkboxId =
       '#cx-configurator--checkBox--' +
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.ts
index 8aa67448bdd..9c63fb71b57 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox/configurator-attribute-checkbox.component.ts
@@ -25,6 +25,7 @@ export class ConfiguratorAttributeCheckBoxComponent
   group: string;
   ownerKey: string;
   expMode: boolean;
+  attributeValue: Configurator.Value;
 
   attributeCheckBoxForm = new UntypedFormControl('');
 
@@ -41,6 +42,7 @@ export class ConfiguratorAttributeCheckBoxComponent
 
   ngOnInit() {
     this.attributeCheckBoxForm.setValue(this.attribute.selectedSingleValue);
+    this.attributeValue = this.getValueFromAttribute();
   }
 
   /**
@@ -59,19 +61,24 @@ export class ConfiguratorAttributeCheckBoxComponent
     );
   }
 
+  protected getValueFromAttribute(): Configurator.Value {
+    //we can assume that for this component, value is always present
+    //otherwise attribute type would not be correct,
+    //could only happen in exceptional cases, on wrong modifications e.g.
+    return this.attribute.values ? this.attribute.values[0] : { valueCode: '' };
+  }
+
   protected assembleSingleValue(): Configurator.Value[] {
     const localAssembledValues: Configurator.Value[] = [];
-    const value = this.attribute.values ? this.attribute.values[0] : undefined;
-    //we can assume that for this component, value is always present
-    if (value) {
-      const localAttributeValue: Configurator.Value = {
-        valueCode: value.valueCode,
-      };
+    const value = this.getValueFromAttribute();
+
+    const localAttributeValue: Configurator.Value = {
+      valueCode: value.valueCode,
+    };
 
-      localAttributeValue.name = value.name;
-      localAttributeValue.selected = this.attributeCheckBoxForm.value;
-      localAssembledValues.push(localAttributeValue);
-    }
+    localAttributeValue.name = value.name;
+    localAttributeValue.selected = this.attributeCheckBoxForm.value;
+    localAssembledValues.push(localAttributeValue);
 
     return localAssembledValues;
   }
@@ -85,7 +92,7 @@ export class ConfiguratorAttributeCheckBoxComponent
    */
   extractValuePriceFormulaParameters(
     value: Configurator.Value
-  ): ConfiguratorPriceComponentOptions | undefined {
+  ): ConfiguratorPriceComponentOptions {
     return {
       quantity: value.quantity,
       price: value.valuePrice,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-bundle/configurator-attribute-multi-selection-bundle.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-bundle/configurator-attribute-multi-selection-bundle.component.html
index e4e97ff1441..04ab91b56d4 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-bundle/configurator-attribute-multi-selection-bundle.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-bundle/configurator-attribute-multi-selection-bundle.component.html
@@ -17,9 +17,7 @@
   </div>
 
   <cx-configurator-attribute-product-card
-    id="{{
-      createAttributeValueIdForConfigurator(attribute, value?.valueCode)
-    }}"
+    id="{{ createAttributeValueIdForConfigurator(attribute, value.valueCode) }}"
     (handleDeselect)="onDeselect($event)"
     (handleQuantity)="onChangeValueQuantity($event)"
     (handleSelect)="onSelect($event)"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
index bd57ecb06fb..1c5f4edf4eb 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.html
@@ -43,12 +43,12 @@
         class="form-check-label"
       >
         <img
-          *ngIf="value.images[0]"
+          *ngIf="getImage(value) as image"
           class="cx-img"
-          src="{{ value.images[0].url }}"
-          alt="{{ value.images[0].altText }}"
+          src="{{ image?.url }}"
+          alt="{{ image?.altText }}"
         />
-        <div *ngIf="!value.images[0]" class="cx-img-dummy"></div>
+        <div *ngIf="!getImage(value)" class="cx-img-dummy"></div>
         {{ getLabel(expMode, value.valueDisplay, value.valueCode) }}
         <cx-configurator-price
           [formula]="extractValuePriceFormulaParameters(value)"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
index b55aed9c31b..ebbe298e046 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/multi-selection-image/configurator-attribute-multi-selection-image.component.ts
@@ -82,7 +82,7 @@ export class ConfiguratorAttributeMultiSelectionImageComponent
 
   extractValuePriceFormulaParameters(
     value: Configurator.Value
-  ): ConfiguratorPriceComponentOptions | undefined {
+  ): ConfiguratorPriceComponentOptions {
     return {
       quantity: value.quantity,
       price: value.valuePrice,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
index 696f003d187..cb416caf1db 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
@@ -35,7 +35,7 @@
               : {
                   value: item.valueDisplay,
                   attribute: attribute.label,
-                  price: item.valuePriceTotal.formattedValue
+                  price: item.valuePriceTotal?.formattedValue ?? 0
                 })
           : ('configurator.a11y.selectedValueOfAttributeFull'
             | cxTranslate
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle/configurator-attribute-single-selection-bundle.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle/configurator-attribute-single-selection-bundle.component.html
index 9bd78b0754b..343ef4ac8f4 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle/configurator-attribute-single-selection-bundle.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle/configurator-attribute-single-selection-bundle.component.html
@@ -14,7 +14,7 @@
   </div>
 
   <cx-configurator-attribute-product-card
-    [id]="createAttributeValueIdForConfigurator(attribute, value?.valueCode)"
+    [id]="createAttributeValueIdForConfigurator(attribute, value.valueCode)"
     (handleDeselect)="onSelect('')"
     (handleSelect)="onSelect($event)"
     *ngFor="let value of attribute?.values; let i = index"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
index a3507764544..6350e10417e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.html
@@ -57,12 +57,12 @@
         class="form-check-label form-radio-label"
       >
         <img
-          *ngIf="value.images[0]"
+          *ngIf="getImage(value)"
           class="cx-img"
-          src="{{ value.images[0].url }}"
-          alt="{{ value.images[0].altText }}"
+          src="{{ getImage(value)?.url }}"
+          alt="{{ getImage(value)?.altText }}"
         />
-        <div *ngIf="!value.images[0]" class="cx-img-dummy"></div>
+        <div *ngIf="!getImage(value)" class="cx-img-dummy"></div>
         {{ getLabel(expMode, value.valueDisplay, value.valueCode) }}
         <cx-configurator-price
           [formula]="extractValuePriceFormulaParameters(value)"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
index 398654653aa..b30534af0c9 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.spec.ts
@@ -150,6 +150,21 @@ describe('ConfigAttributeSingleSelectionImageComponent', () => {
     expect(component.attributeRadioButtonForm.value).toEqual(value3.valueCode);
   });
 
+  describe('extractValuePriceFormulaParameters', () => {
+    it('should take over attributes from value if present', () => {
+      const parameters = component.extractValuePriceFormulaParameters(value1);
+      expect(parameters.price).toBe(value1.valuePrice);
+      expect(parameters.isLightedUp).toBe(value1.selected);
+    });
+
+    it('should create empty parameters if value is not present', () => {
+      const parameters =
+        component.extractValuePriceFormulaParameters(undefined);
+      expect(parameters.price).toBeUndefined();
+      expect(parameters.isLightedUp).toBe(false);
+    });
+  });
+
   it('should select another single selection image value', () => {
     spyOn(
       component['configuratorCommonsService'],
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.ts
index f94b176c360..2e92adf1501 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-image/configurator-attribute-single-selection-image.component.ts
@@ -59,12 +59,10 @@ export class ConfiguratorAttributeSingleSelectionImageComponent
 
   extractValuePriceFormulaParameters(
     value?: Configurator.Value
-  ): ConfiguratorPriceComponentOptions | undefined {
-    if (value) {
-      return {
-        price: value.valuePrice,
-        isLightedUp: value.selected,
-      };
-    }
+  ): ConfiguratorPriceComponentOptions {
+    return {
+      price: value?.valuePrice,
+      isLightedUp: value ? value.selected : false,
+    };
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/configurator-conflict-and-error-messages/configurator-conflict-and-error-messages.component.html b/feature-libs/product-configurator/rulebased/components/configurator-conflict-and-error-messages/configurator-conflict-and-error-messages.component.html
index 2043fe67b91..0c70484e746 100644
--- a/feature-libs/product-configurator/rulebased/components/configurator-conflict-and-error-messages/configurator-conflict-and-error-messages.component.html
+++ b/feature-libs/product-configurator/rulebased/components/configurator-conflict-and-error-messages/configurator-conflict-and-error-messages.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="configuration$ | async as configuration">
-  <ng-container *ngIf="configuration?.warningMessages?.length > 0">
+  <ng-container *ngIf="(configuration?.warningMessages?.length ?? 0) > 0">
     <div
       aria-live="assertive"
       aria-atomic="true"
@@ -10,13 +10,13 @@
       </span>
       <span
         class="cx-warning-text"
-        *ngIf="configuration?.warningMessages?.length > 1"
+        *ngIf="(configuration?.warningMessages?.length ?? 0) > 1"
       >
         {{ 'configurator.header.multipleWarnings' | cxTranslate }}</span
       >
       <button
         (click)="toggleWarnings()"
-        *ngIf="configuration?.warningMessages?.length > 1"
+        *ngIf="(configuration?.warningMessages?.length ?? 0) > 1"
         class="cx-warning-toggle"
         [attr.aria-expanded]="showWarnings"
       >
@@ -46,7 +46,7 @@
       </div>
     </div>
   </ng-container>
-  <ng-container *ngIf="configuration?.errorMessages?.length > 0">
+  <ng-container *ngIf="(configuration?.errorMessages?.length ?? 0) > 0">
     <div
       aria-live="assertive"
       aria-atomic="true"
@@ -58,13 +58,13 @@
       </span>
       <span
         class="cx-error-text"
-        *ngIf="configuration?.errorMessages?.length > 1"
+        *ngIf="(configuration?.errorMessages?.length ?? 0) > 1"
       >
         {{ 'configurator.header.multipleErrors' | cxTranslate }}</span
       >
       <button
         (click)="toggleErrors()"
-        *ngIf="configuration?.errorMessages?.length > 1"
+        *ngIf="(configuration?.errorMessages?.length ?? 0) > 1"
         class="cx-error-toggle"
         [attr.aria-expanded]="showErrors"
       >
diff --git a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
index 926477d9e7a..ebf4fbcd422 100644
--- a/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
+++ b/feature-libs/product-configurator/rulebased/components/conflict-solver-dialog/configurator-conflict-solver-dialog.component.html
@@ -35,14 +35,15 @@
         <cx-icon [type]="iconTypes.ERROR"></cx-icon>
         {{ 'configurator.header.conflictWarning' | cxTranslate }}
       </div>
-      <ng-container *ngIf="conflictGroup$ | async as conflictGroup">
-        <cx-configurator-group
-          [group]="conflictGroup"
-          [owner]="(routerData$ | async)?.owner"
-          [isNavigationToGroupEnabled]="false"
-        >
-        </cx-configurator-group>
-      </ng-container>
+      <ng-container *ngIf="routerData$ | async as routerData">
+        <ng-container *ngIf="conflictGroup$ | async as conflictGroup">
+          <cx-configurator-group
+            [group]="conflictGroup"
+            [owner]="routerData.owner"
+            [isNavigationToGroupEnabled]="false"
+          >
+          </cx-configurator-group> </ng-container
+      ></ng-container>
     </div>
   </div>
 </div>
diff --git a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
index decdf9fec60..cbf7f1ab1c0 100644
--- a/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/form/configurator-form.component.ts
@@ -65,7 +65,7 @@ export class ConfiguratorFormComponent implements OnInit, OnDestroy {
       this.configuratorGroupsService.getCurrentGroup(routerData.owner)
     )
   );
-  // TODO (CXSPA-3392): make globalMessageService a required dependency
+  // TODO(CXSPA-3392): make globalMessageService a required dependency
   constructor(
     configuratorCommonsService: ConfiguratorCommonsService,
     configuratorGroupsService: ConfiguratorGroupsService,
diff --git a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.html b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.html
index ee7b2862e58..2b6d08b44d2 100644
--- a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.html
+++ b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.html
@@ -18,7 +18,7 @@
                 role="tab"
                 [attr.aria-selected]="false"
                 [attr.aria-label]="
-                  isConflictGroupType(parentGroup.groupType)
+                  isConflictGroupTypeAllowingUndefined(parentGroup.groupType)
                     ? ('configurator.a11y.conflictBack' | cxTranslate)
                     : ('configurator.a11y.groupBack' | cxTranslate)
                 "
@@ -47,7 +47,9 @@
                 }}"
                 role="tab"
                 [class.DISABLED]="!group.configurable"
-                [class.cx-menu-conflict]="isConflictGroupType(group.groupType)"
+                [class.cx-menu-conflict]="
+                  isConflictGroupTypeAllowingUndefined(group.groupType)
+                "
                 [class.active]="isGroupSelected(group.id, currentGroup.id)"
                 [class.disable]="!group.configurable"
                 [attr.aria-describedby]="
diff --git a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.spec.ts b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.spec.ts
index 03747ccf546..bf64c3211f8 100644
--- a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.spec.ts
@@ -1654,4 +1654,21 @@ describe('ConfigurationGroupMenuComponent', () => {
         });
     });
   });
+
+  describe('isConflictGroupTypeAllowingUndefined', () => {
+    it('should know conflict group ', () => {
+      isConflictGroupType = true;
+      expect(
+        component.isConflictGroupTypeAllowingUndefined(
+          Configurator.GroupType.CONFLICT_HEADER_GROUP
+        )
+      ).toBe(true);
+    });
+
+    it('should return false for undefined input', () => {
+      expect(component.isConflictGroupTypeAllowingUndefined(undefined)).toBe(
+        false
+      );
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.ts b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.ts
index fa8efcd2c40..d1987d3a104 100644
--- a/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/group-menu/configurator-group-menu.component.ts
@@ -271,6 +271,22 @@ export class ConfiguratorGroupMenuComponent {
     return this.configuratorGroupsService.isConflictGroupType(groupType);
   }
 
+  //TODO(CXSPA-3392) get rid of this method in next major. Change signature of
+  //isConflictGroupType to allow undefined, and use this method instead
+  /**
+   * Verifies whether the current group is conflict one but allows for undefined input
+   *
+   * @param {Configurator.GroupType} groupType - Group type
+   * @return {boolean} - 'True' if the current group is conflict one, otherwise 'false'.
+   */
+  isConflictGroupTypeAllowingUndefined(
+    groupType: Configurator.GroupType | undefined
+  ): boolean {
+    return groupType
+      ? this.configuratorGroupsService.isConflictGroupType(groupType)
+      : false;
+  }
+
   /**
    * Returns true if group is conflict header group.
    *
diff --git a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.html b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.html
index dfca8ec6cdb..b58e31ad61c 100644
--- a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.html
+++ b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.html
@@ -17,35 +17,40 @@
       ></cx-configurator-conflict-suggestion>
     </ng-container>
 
-    <div
-      [cxConfiguratorAttributeComponent]="{
-        componentKey: 'Header',
-        attribute: attribute,
-        owner: owner,
-        group: group,
-        expMode: expMode | async,
-        isNavigationToGroupEnabled: isNavigationToGroupEnabled
-      }"
-    ></div>
+    <ng-container *ngIf="activeLanguage$ | async as activeLanguage">
+      <div
+        [cxConfiguratorAttributeComponent]="{
+          componentKey: 'Header',
+          attribute: attribute,
+          owner: owner,
+          group: group,
+          language: activeLanguage,
+          expMode: (expMode | async) ?? false,
+          isNavigationToGroupEnabled: isNavigationToGroupEnabled
+        }"
+      ></div>
 
-    <div
-      [cxConfiguratorAttributeComponent]="{
-        componentKey: getComponentKey(attribute),
-        attribute: attribute,
-        owner: owner,
-        group: group,
-        language: activeLanguage$ | async,
-        expMode: expMode | async
-      }"
-    ></div>
+      <div
+        [cxConfiguratorAttributeComponent]="{
+          componentKey: getComponentKey(attribute),
+          attribute: attribute,
+          owner: owner,
+          group: group,
+          language: activeLanguage,
+          expMode: (expMode | async) ?? false
+        }"
+      ></div>
 
-    <div
-      [cxConfiguratorAttributeComponent]="{
-        componentKey: 'Footer',
-        attribute: attribute,
-        owner: owner,
-        group: group
-      }"
-    ></div>
+      <div
+        [cxConfiguratorAttributeComponent]="{
+          componentKey: 'Footer',
+          attribute: attribute,
+          owner: owner,
+          group: group,
+          language: activeLanguage,
+          expMode: (expMode | async) ?? false
+        }"
+      ></div>
+    </ng-container>
   </div>
 </div>
diff --git a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.spec.ts b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.spec.ts
index a2a20fcc319..9a83eb80903 100644
--- a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.spec.ts
@@ -191,7 +191,9 @@ class MockConfiguratorExpertModeService {
 
   setExpModeActive(): void {}
 
-  getExpModeActive() {}
+  getExpModeActive() {
+    return of(false);
+  }
 }
 
 const product: Product = {
diff --git a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.ts b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.ts
index b4ad6bdf3e2..37d9e3c2283 100644
--- a/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/group/configurator-group.component.ts
@@ -91,7 +91,7 @@ export class ConfiguratorGroupComponent {
    *
    * @returns {Observable<boolean> | undefined } - 'True' if the expert mode is active, otherwise 'false'.
    */
-  get expMode(): Observable<boolean> | undefined {
+  get expMode(): Observable<boolean> {
     return this.configExpertModeService.getExpModeActive();
   }
 
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.html b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.html
index 1dbbca87dff..4e718cc687c 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.html
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.html
@@ -1,25 +1,34 @@
-<ng-container *ngIf="config$ | async as config; else ghostFilterButton">
+<ng-container
+  *ngIf="
+    configurationWithOv$ | async as configurationWithOv;
+    else ghostFilterButton
+  "
+>
   <button
     #filterButton
     class="btn btn-secondary cx-config-filter-button"
     tabindex="0"
-    (click)="openFilterModal(config)"
+    (click)="openFilterModal(configurationWithOv)"
     title="{{
-      (getNumFilters(config.overview) > 0
+      (getNumFilters(configurationWithOv.overview) > 0
         ? 'configurator.a11y.filterOverviewWithCount'
         : 'configurator.a11y.filterOverview'
-      ) | cxTranslate: { numAppliedFilters: getNumFilters(config.overview) }
+      )
+        | cxTranslate
+          : { numAppliedFilters: getNumFilters(configurationWithOv.overview) }
     }}"
   >
     {{
-      (getNumFilters(config.overview) > 0
+      (getNumFilters(configurationWithOv.overview) > 0
         ? 'configurator.button.filterOverviewWithCount'
         : 'configurator.button.filterOverview'
-      ) | cxTranslate: { numAppliedFilters: getNumFilters(config.overview) }
+      )
+        | cxTranslate
+          : { numAppliedFilters: getNumFilters(configurationWithOv.overview) }
     }}
   </button>
   <cx-configurator-overview-filter-bar
-    [config]="config"
+    [config]="configurationWithOv"
   ></cx-configurator-overview-filter-bar>
 </ng-container>
 
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.spec.ts b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.spec.ts
index e05cf3df664..0c3e0815e68 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.spec.ts
@@ -39,7 +39,9 @@ function asSpy(f: any) {
 function initTestData() {
   ovConfig = structuredClone({
     ...ConfiguratorTestUtils.createConfiguration(configId, owner),
-    overview: ConfigurationTestData.productConfiguration.overview,
+    overview: ConfigurationTestData.productConfiguration.overview
+      ? ConfigurationTestData.productConfiguration.overview
+      : { configId: '', productCode: '' },
   });
   ovConfig.overview.possibleGroups = structuredClone(ovConfig.overview.groups);
 }
@@ -107,6 +109,13 @@ describe('ConfigurationOverviewFilterButtonComponent', () => {
       expect(component).toBeDefined();
     });
 
+    it('should support obsolete observable that we keep until next major for compatibility reasons', (done) => {
+      component.config$.subscribe((config) => {
+        expect(config.configId).toBe(configId);
+        done();
+      });
+    });
+
     it('should open filter modal on request', () => {
       fixture.debugElement
         .query(By.css('.cx-config-filter-button'))
diff --git a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.ts b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.ts
index d1637c06780..725a497ba31 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-filter-button/configurator-overview-filter-button.component.ts
@@ -26,6 +26,10 @@ export class ConfiguratorOverviewFilterButtonComponent {
   @ViewChild('filterButton') filterButton: ElementRef;
   @HostBinding('class.ghost') ghostStyle = true;
 
+  //TODO(CXSPA-3392) remove this member in next major, it is not used
+  /**
+   * @deprecated since 6.1. Use configurationWithOv$ instead
+   */
   config$: Observable<Configurator.Configuration> =
     this.configRouterExtractorService.extractRouterData().pipe(
       switchMap((routerData) =>
@@ -43,6 +47,23 @@ export class ConfiguratorOverviewFilterButtonComponent {
       })
     );
 
+  configurationWithOv$: Observable<Configurator.ConfigurationWithOverview> =
+    this.configRouterExtractorService.extractRouterData().pipe(
+      switchMap((routerData) =>
+        this.configuratorCommonsService.getConfiguration(routerData.owner)
+      ),
+      // filter 'strict null check safe'
+      filter(
+        (configuration) => configuration.overview != null
+      ) as OperatorFunction<
+        Configurator.Configuration,
+        Configurator.ConfigurationWithOverview
+      >,
+      tap(() => {
+        this.ghostStyle = false;
+      })
+    );
+
   /**
    * get the number of filters currently applied to the overview page
    *
diff --git a/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.html b/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.html
index cff27865fa3..43d8c646a88 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.html
+++ b/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.html
@@ -4,7 +4,7 @@
       *ngTemplateOutlet="
         groups;
         context: {
-          overviewGroups: configuration.overview.groups,
+          overviewGroups: configuration.overview?.groups,
           level: 1,
           idPrefix: ''
         }
diff --git a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.html b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.html
index 3fabe58ae0b..a858b0f2280 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.html
+++ b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.html
@@ -1,4 +1,6 @@
-<ng-container *ngIf="config$ | async as config; else ghostSidebar">
+<ng-container
+  *ngIf="configurationWithOv$ | async as configurationWithOv; else ghostSidebar"
+>
   <div class="cx-menu-bar" role="tablist">
     <button
       role="tab"
@@ -18,10 +20,16 @@
     </button>
   </div>
 
-  <cx-configurator-overview-filter *ngIf="showFilter" [config]="config">
+  <cx-configurator-overview-filter
+    *ngIf="showFilter"
+    [config]="configurationWithOv"
+  >
   </cx-configurator-overview-filter>
 
-  <cx-configurator-overview-menu *ngIf="!showFilter" [config]="config">
+  <cx-configurator-overview-menu
+    *ngIf="!showFilter"
+    [config]="configurationWithOv"
+  >
   </cx-configurator-overview-menu>
 </ng-container>
 
diff --git a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.spec.ts b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.spec.ts
index 558ecfbeb75..b3f683bd3f3 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.spec.ts
@@ -121,6 +121,14 @@ describe('ConfiguratorOverviewSidebarComponent', () => {
     expect(component).toBeDefined();
   });
 
+  it('should support obsolete observable that we keep until next major for compatibility reasons', (done) => {
+    initTestComponent();
+    component.config$.subscribe((config) => {
+      expect(config.configId).toBe(CONFIG_ID);
+      done();
+    });
+  });
+
   it('should render overview menu component by default', () => {
     initTestComponent();
     CommonConfiguratorTestUtilsService.expectElementPresent(
diff --git a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.ts b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.ts
index 09b91dbb4db..22434707a6d 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-sidebar/configurator-overview-sidebar.component.ts
@@ -26,6 +26,10 @@ export class ConfiguratorOverviewSidebarComponent {
     protected configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService
   ) {}
 
+  //TODO(CXSPA-3392) remove this member in next major, it is not used
+  /**
+   * @deprecated since 6.1. Use configurationWithOv$ instead
+   */
   config$: Observable<Configurator.Configuration> =
     this.configRouterExtractorService.extractRouterData().pipe(
       switchMap((routerData) =>
@@ -45,6 +49,25 @@ export class ConfiguratorOverviewSidebarComponent {
       })
     );
 
+  configurationWithOv$: Observable<Configurator.ConfigurationWithOverview> =
+    this.configRouterExtractorService.extractRouterData().pipe(
+      switchMap((routerData) =>
+        this.configuratorCommonsService.getConfiguration(routerData.owner)
+      ),
+      // filter 'strict null check safe'
+      filter(
+        (configuration) => configuration.overview != null
+      ) as OperatorFunction<
+        Configurator.Configuration,
+        Configurator.ConfigurationWithOverview
+      >,
+      tap((data) => {
+        if (data) {
+          this.ghostStyle = false;
+        }
+      })
+    );
+
   /**
    * Triggers display of the filter view in the overview sidebar
    */
diff --git a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
index 71323513292..fc43361b3e8 100644
--- a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
+++ b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="configuration$ | async as configuration">
-  <ng-container *ngIf="configuration?.groups?.length > 1">
+  <ng-container *ngIf="configuration.groups.length > 1">
     <button
       class="btn btn-block btn-secondary cx-previous"
       [disabled]="isFirstGroup(configuration.owner) | async"
diff --git a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
index fc54cd548dd..a24f373eef7 100644
--- a/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/previous-next-buttons/configurator-previous-next-buttons.component.spec.ts
@@ -55,7 +55,7 @@ const groups: Configurator.Group = {
   subGroups: [],
 };
 
-const configWithoutGroups: Configurator.Configuration = {
+const configWithSingleGroup: Configurator.Configuration = {
   ...ConfiguratorTestUtils.createConfiguration(
     'CONFIG_ID',
     ConfiguratorModelUtils.createOwner(
@@ -170,9 +170,9 @@ describe('ConfigPreviousNextButtonsComponent', () => {
     expect(classUnderTest).toBeTruthy();
   });
 
-  it("should not display 'previous' & 'next' buttons", () => {
+  it("should not display 'previous' & 'next' buttons in case configuration contains one group", () => {
     spyOn(configuratorCommonsService, 'getConfiguration').and.returnValue(
-      of(configWithoutGroups)
+      of(configWithSingleGroup)
     );
     fixture = TestBed.createComponent(ConfiguratorPreviousNextButtonsComponent);
     classUnderTest = fixture.componentInstance;
diff --git a/feature-libs/product-configurator/rulebased/components/variant-carousel/configurator-variant-carousel.component.html b/feature-libs/product-configurator/rulebased/components/variant-carousel/configurator-variant-carousel.component.html
index 403c79c9908..f10d5d5e2cb 100644
--- a/feature-libs/product-configurator/rulebased/components/variant-carousel/configurator-variant-carousel.component.html
+++ b/feature-libs/product-configurator/rulebased/components/variant-carousel/configurator-variant-carousel.component.html
@@ -1,4 +1,6 @@
-<ng-container *ngIf="(items$ | async)?.length > 0 && (items$ | async) as items">
+<ng-container
+  *ngIf="((items$ | async)?.length ?? 0) > 0 && (items$ | async) as items"
+>
   <div class="cx-variant-carousel-container">
     <cx-carousel
       role="region"
diff --git a/feature-libs/product-configurator/tsconfig.lib.json b/feature-libs/product-configurator/tsconfig.lib.json
index ea0c30b91b5..367e3b22560 100644
--- a/feature-libs/product-configurator/tsconfig.lib.json
+++ b/feature-libs/product-configurator/tsconfig.lib.json
@@ -116,7 +116,7 @@
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
     "enableResourceInlining": true,
-    "strictTemplates": false
+    "strictTemplates": true
   },
   "exclude": ["test.ts", "setup-jest.ts", "**/*.spec.ts"]
 }

From a5944c2c835ac3bc2011de4b5c0c1d5bd4e91831 Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Thu, 25 May 2023 18:50:37 +0530
Subject: [PATCH 020/122] Update cdc-register-component.service.spec.ts
 (#17448)

closes CXSPA-3501 and CXINT-2069
---
 .../cdc-register-component.service.spec.ts    | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts b/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
index 956fd23cab5..51905f57637 100644
--- a/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
+++ b/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
@@ -19,7 +19,7 @@ import {
   UserRegisterFacade,
   UserSignUp,
 } from '@spartacus/user/profile/root';
-import { Observable, of } from 'rxjs';
+import { Observable, of, throwError } from 'rxjs';
 import { CDCRegisterComponentService } from './cdc-register-component.service';
 import createSpy = jasmine.createSpy;
 
@@ -167,18 +167,23 @@ describe('CdcRegisterComponentService', () => {
     });
 
     it('should not do anything when CDC registration fails', (done) => {
-      cdcJsService.registerUserWithoutScreenSet =
-        createSpy().and.throwError('ERROR');
+      cdcJsService.registerUserWithoutScreenSet = createSpy().and.returnValue(
+        throwError('ERROR')
+      );
 
-      cdcUserRegisterService.register(userRegisterFormData).subscribe(() => {
-        expect(connector.register).not.toHaveBeenCalled();
-        expect(cdcJsService.registerUserWithoutScreenSet).toHaveBeenCalledWith({
-          titleCode: 'Mr.',
-          firstName: 'firstName',
-          lastName: 'lastName',
-          uid: 'uid',
-          password: 'password',
-        });
+      cdcUserRegisterService.register(userRegisterFormData).subscribe({
+        error: () => {
+          expect(connector.register).not.toHaveBeenCalled();
+          expect(
+            cdcJsService.registerUserWithoutScreenSet
+          ).toHaveBeenCalledWith({
+            titleCode: 'Mr.',
+            firstName: 'firstName',
+            lastName: 'lastName',
+            uid: 'uid',
+            password: 'password',
+          });
+        },
       });
       expect(cdcJsService.didLoad).toHaveBeenCalled();
       done();

From e761bafc0a7194479461661c7befe1e66657e59b Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Thu, 1 Jun 2023 08:54:25 +0200
Subject: [PATCH 021/122] fix: Review feedback - add quantity stepper next to
 add-to-cart button (#17476)

Review feedback: add quantity stepper next to add-to-cart button

Closes CXSPA-3193
---
 ...igurator-add-to-cart-button.component.html | 96 ++++++++++---------
 ...rator-add-to-cart-button.component.spec.ts | 64 -------------
 ...nfigurator-add-to-cart-button.component.ts | 41 --------
 .../_configurator-add-to-cart-button.scss     |  8 +-
 4 files changed, 55 insertions(+), 154 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
index 081c5b0898d..184fef23d81 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.html
@@ -20,56 +20,63 @@
         </button>
       </ng-container>
       <ng-container *cxFeatureLevel="'6.1'">
-        <div class="cx-quantity-add-to-cart-container">
-          <div class="cx-quantity-add-to-cart-row">
-            <div class="cx-quantity">
-              <ng-container *ngIf="!isCartEntry(container.routerData)">
+        <ng-container *ngIf="!isCartEntry(container.routerData)">
+          <div class="cx-quantity-add-to-cart-container">
+            <div class="cx-quantity-add-to-cart-row">
+              <div class="cx-quantity">
                 <label>{{
                   'configurator.addToCart.quantity' | cxTranslate
                 }}</label>
                 <cx-item-counter [control]="quantityControl"></cx-item-counter>
-              </ng-container>
-
-              <ng-container *ngIf="isCartEntry(container.routerData)">
-                <label
-                  >{{ 'configurator.addToCart.quantity' | cxTranslate }}:</label
-                >
-                <div class="cx-quantity-value">
-                  {{
-                    getCartEntryQuantity(container.routerData.owner.id) | async
-                  }}
-                </div>
-              </ng-container>
-            </div>
-            <button
-              class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
-              (click)="
-                onAddToCart(container.configuration, container.routerData)
-              "
-              [attr.aria-label]="
-                (getButtonResourceKey(
-                  container.routerData,
-                  container.configuration
-                ) | cxTranslate) +
-                ' ' +
-                ('configurator.a11y.addToCartPrices'
-                  | cxTranslate: extractConfigPrices(container.configuration))
-              "
-              title="{{
-                getButtonResourceKey(
-                  container.routerData,
-                  container.configuration
-                ) | cxTranslate
-              }}"
-            >
-              <cx-icon
-                [type]="
-                  getIconType(container.routerData, container.configuration)
+              </div>
+              <button
+                class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
+                (click)="
+                  onAddToCart(container.configuration, container.routerData)
+                "
+                [attr.aria-label]="
+                  (getButtonResourceKey(
+                    container.routerData,
+                    container.configuration
+                  ) | cxTranslate) +
+                  ' ' +
+                  ('configurator.a11y.addToCartPrices'
+                    | cxTranslate: extractConfigPrices(container.configuration))
                 "
-              ></cx-icon>
-            </button>
+                title="{{
+                  getButtonResourceKey(
+                    container.routerData,
+                    container.configuration
+                  ) | cxTranslate
+                }}"
+              >
+                <cx-icon [type]="iconType.CART_PLUS"></cx-icon>
+              </button>
+            </div>
           </div>
-        </div>
+        </ng-container>
+        <ng-container *ngIf="isCartEntry(container.routerData)">
+          <button
+            class="cx-btn btn btn-block btn-primary cx-add-to-cart-btn"
+            (click)="onAddToCart(container.configuration, container.routerData)"
+            [attr.aria-label]="
+              (getButtonResourceKey(
+                container.routerData,
+                container.configuration
+              ) | cxTranslate) +
+              ' ' +
+              ('configurator.a11y.addToCartPrices'
+                | cxTranslate: extractConfigPrices(container.configuration))
+            "
+          >
+            {{
+              getButtonResourceKey(
+                container.routerData,
+                container.configuration
+              ) | cxTranslate
+            }}
+          </button>
+        </ng-container>
       </ng-container>
     </div>
   </ng-container>
@@ -87,7 +94,6 @@
         <button
           class="cx-btn btn btn-block btn-secondary cx-display-only-btn"
           (click)="leaveConfigurationOverview()"
-          title="{{ 'configurator.addToCart.buttonClose' | cxTranslate }}"
         >
           {{ 'configurator.addToCart.buttonClose' | cxTranslate }}
         </button>
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
index 768cf64ec6a..722dae64121 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
@@ -471,14 +471,6 @@ describe('ConfigAddToCartButtonComponent', () => {
       'button.btn-secondary.cx-display-only-btn',
       'configurator.addToCart.buttonClose'
     );
-
-    CommonConfiguratorTestUtilsService.expectElementToHaveAttributeWithValue(
-      expect,
-      htmlElem,
-      'button.btn-secondary.cx-display-only-btn',
-      'title',
-      'configurator.addToCart.buttonClose'
-    );
   });
 
   it('should render button that is not disabled in case there are no pending changes', () => {
@@ -534,22 +526,6 @@ describe('ConfigAddToCartButtonComponent', () => {
     });
   });
 
-  describe('getCartEntryQuantity', () => {
-    it('should return one because quantity is undefined for order entry', () => {
-      component.getCartEntryQuantity('PRODUCT_CODE').subscribe((quantity) => {
-        expect(quantity).toBe(1);
-      });
-    });
-
-    it('should return quantity for order entry', () => {
-      mockOrderEntry.quantity = 20;
-      initialize();
-      component.getCartEntryQuantity('PRODUCT_CODE').subscribe((quantity) => {
-        expect(quantity).toBe(20);
-      });
-    });
-  });
-
   describe('onAddToCart', () => {
     it('should navigate to OV in case configuration is cart bound and we are on product config page', () => {
       mockRouterData.pageType = ConfiguratorRouter.PageType.CONFIGURATION;
@@ -897,46 +873,6 @@ describe('ConfigAddToCartButtonComponent', () => {
     });
   });
 
-  describe('getIconType', () => {
-    let routerData: ConfiguratorRouter.Data;
-    let config: Configurator.Configuration;
-
-    function prepareTestData(
-      isOwnerCartEntry: boolean,
-      isCartEntryUpdateRequired: boolean
-    ) {
-      routerData = {
-        pageType: ConfiguratorRouter.PageType.CONFIGURATION,
-        isOwnerCartEntry: isOwnerCartEntry,
-        owner: mockOwner,
-      };
-
-      config = structuredClone(mockProductConfiguration);
-      config.isCartEntryUpdateRequired = isCartEntryUpdateRequired;
-    }
-
-    it('should return CART', () => {
-      prepareTestData(true, true);
-      expect(component.getIconType(routerData, config)).toBe(
-        component.iconType.CART
-      );
-    });
-
-    it('should return CART_ARROW_DOWN', () => {
-      prepareTestData(true, false);
-      expect(component.getIconType(routerData, config)).toBe(
-        component.iconType.CART_ARROW_DOWN
-      );
-    });
-
-    it('should return CART_PLUS', () => {
-      prepareTestData(false, false);
-      expect(component.getIconType(routerData, config)).toBe(
-        component.iconType.CART_PLUS
-      );
-    });
-  });
-
   describe('isCartEntry', () => {
     it("should return 'false' because isOwnerCartEntry is undefined", () => {
       const routerData: ConfiguratorRouter.Data = {
diff --git a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
index c2567565af9..60ed4f20d1f 100644
--- a/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
@@ -153,20 +153,6 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     );
   }
 
-  /**
-   * Retrieves a quantity for a cart entry.
-   *
-   * @param {string} entryNumber - Entry number
-   * @returns {number} - Quantity
-   */
-  getCartEntryQuantity(entryNumber: string): Observable<number> {
-    return this.configuratorCartService.getEntry(entryNumber).pipe(
-      map((entry) => {
-        return entry?.quantity ? entry?.quantity : 1;
-      })
-    );
-  }
-
   protected navigateToCart(): void {
     this.routingService.go('cart');
   }
@@ -244,33 +230,6 @@ export class ConfiguratorAddToCartButtonComponent implements OnInit, OnDestroy {
     }
   }
 
-  /**
-   * Retrieves an icon type depending on the business process (owner of the configuration) and the
-   * need for a cart update. The icon will differ.
-   *
-   * @param {ConfiguratorRouter.Data} routerData - Reflects the current router state
-   * @param {Configurator.Configuration} configuration - Configuration
-   * @returns {ICON_TYPE} Icon type that determines an icon that will be displayed on the button
-   */
-  getIconType(
-    routerData: ConfiguratorRouter.Data,
-    configuration: Configurator.Configuration
-  ): ICON_TYPE {
-    if (
-      routerData.isOwnerCartEntry &&
-      configuration.isCartEntryUpdateRequired
-    ) {
-      return this.iconType.CART;
-    } else if (
-      routerData.isOwnerCartEntry &&
-      !configuration.isCartEntryUpdateRequired
-    ) {
-      return this.iconType.CART_ARROW_DOWN;
-    } else {
-      return this.iconType.CART_PLUS;
-    }
-  }
-
   /**
    * Verifies whether it is a cart entry.
    *
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
index 3a3d1a35793..c97ea9d7541 100644
--- a/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
+++ b/feature-libs/product-configurator/rulebased/styles/_configurator-add-to-cart-button.scss
@@ -53,11 +53,11 @@
               background-color: var(--cx-color-inverse);
             }
           }
-        }
-      }
 
-      button.cx-add-to-cart-btn {
-        inline-size: 45%;
+          button.cx-add-to-cart-btn {
+            inline-size: 45%;
+          }
+        }
       }
     }
   }

From fdaded2f4a68fedae407c701d03714a1af454460 Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Thu, 1 Jun 2023 10:00:08 +0200
Subject: [PATCH 022/122] fix: Failing cypress test: quantity stepper next to
 add-to-cart button (#17477)

Failing cypress test: quantity stepper next to add-to-cart button

Closes CXSPA-3193
---
 .../product-configurator-vc-cart.e2e-flaky.cy.ts   |  7 +++++--
 .../helpers/product-configurator-overview-vc.ts    | 10 +++-------
 .../cypress/helpers/product-configurator.ts        | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
index 890f2d6a447..5361db0d602 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
@@ -115,15 +115,18 @@ context('Product Configuration', () => {
       configuration.increaseQuantity();
       configuration.decreaseQuantity();
       configuration.enterQuantityValue(10);
+      configuration.checkQuantityStepper(10);
       configurationVc.clickAddToCartBtn();
-      configurationOverviewVc.checkQuantity(10);
+      configurationOverviewVc.checkQuantityNotDisplayed();
       configurationVc.goToCart(electronicsShop);
       configurationCart.checkQuantityStepper(0, 10);
       configurationCart.increaseQuantity(0);
       configurationCart.increaseQuantity(0);
       configurationCart.decreaseQuantity(0);
+      configurationCart.checkQuantityStepper(0, 11);
       configurationCart.clickOnEditConfigurationLink(0);
-      configuration.checkQuantity(11);
+      configuration.checkQuantityStepperNotDisplayed();
+      configuration.checkQuantityNotDisplayed();
     });
   });
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
index 4cc6b88bd5e..7bcae29c39f 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-overview-vc.ts
@@ -259,12 +259,8 @@ export function checkViewPortScrolledToGroup(groupIdx: number) {
 }
 
 /**
- * Verifies whether a quantity value that has been entered into the quantity stepper is equal to the expected value.
- *
- * @param expectedValue
+ * Verifies that quantity is not displayed.
  */
-export function checkQuantity(expectedValue: number) {
-  cy.get(addToCartQuantitySelector).then((elem) => {
-    expect(elem.text().trim()).to.equal(expectedValue.toString());
-  });
+export function checkQuantityNotDisplayed() {
+  cy.get(addToCartQuantitySelector).should('not.exist');
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
index 134200e1b45..9b8bdd932d0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
@@ -590,6 +590,20 @@ export function clickExitConfigurationBtn(): void {
     });
 }
 
+/**
+ * Verifies whether the quantity stepper is not displayed next to the add-to-cart button.
+ */
+export function checkQuantityStepperNotDisplayed() {
+  cy.get(quantityStepperSelector).should('not.exist');
+}
+
+/**
+ * Verifies that quantity is not displayed.
+ */
+export function checkQuantityNotDisplayed() {
+  cy.get(quantitySelector).should('not.exist');
+}
+
 /**
  * Verifies whether a quantity value that is entered into the quantity stepper is equal to the expected value.
  *

From 14cce0af28cf36e6d83a7a8638e1b436ead6ce6d Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Fri, 2 Jun 2023 08:59:22 +0200
Subject: [PATCH 023/122] fix: Set z-index property to a higher number for
 navigation header (#17475)

Set z-index property to a higher number for the navigation header to hide completely all elements behind the header when it is expanded

Closes CXSPA-3540
---
 .../storefrontstyles/scss/components/layout/header/_header.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/storefrontstyles/scss/components/layout/header/_header.scss b/projects/storefrontstyles/scss/components/layout/header/_header.scss
index 428ccccbabe..e4dc0183d8e 100644
--- a/projects/storefrontstyles/scss/components/layout/header/_header.scss
+++ b/projects/storefrontstyles/scss/components/layout/header/_header.scss
@@ -38,7 +38,7 @@ $space: 0.5rem;
     .navigation {
       position: absolute;
       width: 100%;
-      z-index: 3;
+      z-index: 20;
 
       @include media-breakpoint-down(md) {
         height: 100vh;

From dbc75a5bcf4f5dca69fb0a56c61229143c1b1217 Mon Sep 17 00:00:00 2001
From: KateChuen <45409515+KateChuen@users.noreply.github.com>
Date: Fri, 2 Jun 2023 15:32:26 -0400
Subject: [PATCH 024/122] CCV2 P5 Spartacus deploy test with webpack 5.76.0
 (#17470)

Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d8093886125..9842c6dbfc0 100644
--- a/package.json
+++ b/package.json
@@ -210,7 +210,7 @@
     "ts-morph": "^9.1.0",
     "ts-node": "^10.6.0",
     "typescript": "^4.8.2",
-    "webpack": "^5.76.1",
+    "webpack": "~5.76.1",
     "webpack-cli": "^4.10.0"
   },
   "overrides": {

From 43dda2611c335a88e75ee89b2d0b9a26f6e176db Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Tue, 6 Jun 2023 17:35:15 +0200
Subject: [PATCH 025/122] feat: better error handling for configurator
 intervals

TM base assistance done: https://jira.tools.sap/browse/CXSECUR2023-1653
---
 .../translations/en/configurator-common.ts    |   1 +
 ...tribute-numeric-input-field.component.html |  11 ++
 ...eric-input-field.component.service.spec.ts | 126 +++++++++++-
 ...e-numeric-input-field.component.service.ts | 183 +++++++++++++++---
 ...bute-numeric-input-field.component.spec.ts | 132 ++++++++++---
 ...attribute-numeric-input-field.component.ts | 123 ++++++++----
 6 files changed, 484 insertions(+), 92 deletions(-)

diff --git a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
index 8c36f097879..52bbbf9ecdd 100644
--- a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
+++ b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
@@ -58,6 +58,7 @@ export const configurator = {
       multiSelectRequiredMessage: 'Select one or more values',
       wrongNumericFormat:
         'Wrong format, this numerical attribute should be entered according to pattern {{pattern}}',
+      wrongIntervalFormat: 'Enter a value within the indicated boundaries',
       deselectionNotPossible:
         'Add a different product before removing this one',
       dropDownSelectMsg: 'Make a selection',
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
index b1f1091dbc8..b4e3306db01 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
@@ -37,3 +37,14 @@
       | cxTranslate: { pattern: numericFormatPattern }
   }}
 </div>
+<div
+  class="cx-validation-msg"
+  id="{{ createAttributeUiKey('attribute-msg', attribute.name) }}"
+  *ngIf="mustDisplayIntervalMessage()"
+  aria-live="assertive"
+  aria-atomic="true"
+  role="alert"
+>
+  <cx-icon [type]="iconType.WARNING"></cx-icon>
+  {{ 'configurator.attribute.wrongIntervalFormat' | cxTranslate }}
+</div>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.spec.ts
index 8252f11a7a9..cddcf95815d 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.spec.ts
@@ -303,8 +303,8 @@ describe('ConfigAttributeNumericInputFieldService', () => {
       let interval: ConfiguratorAttributeNumericInterval = {
         maxValue: 5,
         minValue: 5,
-        maxValueIncluded: false,
-        minValueIncluded: false,
+        maxValueIncluded: true,
+        minValueIncluded: true,
       };
       let value: Configurator.Value = {
         valueCode: '1',
@@ -329,4 +329,126 @@ describe('ConfigAttributeNumericInputFieldService', () => {
       expect(serviceUnderTest.getInterval(value)).toEqual(undefined);
     });
   });
+
+  describe('inputMatchesInterval', () => {
+    const locale = 'en';
+    const openInterval3To7: ConfiguratorAttributeNumericInterval = {
+      minValueIncluded: false,
+      maxValueIncluded: false,
+      minValue: 3,
+      maxValue: 7,
+    };
+    const closedInterval3To7: ConfiguratorAttributeNumericInterval = {
+      minValueIncluded: true,
+      maxValueIncluded: true,
+      minValue: 3,
+      maxValue: 7,
+    };
+    const openIndefiniteIntervalTo7: ConfiguratorAttributeNumericInterval = {
+      minValueIncluded: false,
+      maxValueIncluded: false,
+      maxValue: 7,
+    };
+    const closedIndefiniteIntervalFrom3: ConfiguratorAttributeNumericInterval =
+      { minValueIncluded: true, maxValueIncluded: true, minValue: 3 };
+
+    it('should assess input for open interval properly in case input is part of interval', () => {
+      const input = '5';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          openInterval3To7
+        )
+      ).toBe(true);
+    });
+
+    it('should assess input for open interval properly in case input is outside of interval', () => {
+      const input = '2';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          openInterval3To7
+        )
+      ).toBe(false);
+    });
+
+    it('should assess input for closed interval properly in case input is maximum value', () => {
+      const input = '7';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          closedInterval3To7
+        )
+      ).toBe(true);
+    });
+
+    it('should assess input for open indefinite interval properly in case input is maximum value', () => {
+      const input = '7';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          openIndefiniteIntervalTo7
+        )
+      ).toBe(false);
+    });
+
+    it('should assess input for closed indefinite interval properly in case input is minimum value', () => {
+      const input = '3';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          closedIndefiniteIntervalFrom3
+        )
+      ).toBe(true);
+    });
+
+    it('should assess input for closed indefinite interval properly in case input is part of interval', () => {
+      const input = '9,987,987,123';
+      expect(
+        serviceUnderTest['inputMatchesInterval'](
+          input,
+          locale,
+          closedIndefiniteIntervalFrom3
+        )
+      ).toBe(true);
+    });
+  });
+
+  describe('parseInput', () => {
+    const locale = 'en';
+
+    it('should ignore single group separator', () => {
+      const input = '5,998';
+      expect(serviceUnderTest['parseInput'](input, locale)).toBe(5998);
+    });
+
+    it('should ignore multiple group separators', () => {
+      const input = '5,998,2,3';
+      expect(serviceUnderTest['parseInput'](input, locale)).toBe(599823);
+    });
+
+    it('should handle decimal places properly', () => {
+      const input = '5,998.23';
+      expect(serviceUnderTest['parseInput'](input, locale)).toBe(5998.23);
+    });
+
+    it('should work with german locale', () => {
+      const input = '5.998,23';
+      expect(serviceUnderTest['parseInputForSeparators'](input, '.', ',')).toBe(
+        5998.23
+      );
+    });
+
+    it('should digest group separators included in the decimal part', () => {
+      const input = '9,2.3';
+      expect(serviceUnderTest['parseInputForSeparators'](input, '.', ',')).toBe(
+        9.23
+      );
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
index 12e4cb2f393..0fffaedb2b9 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
@@ -130,6 +130,7 @@ export class ConfiguratorAttributeNumericInputFieldService {
       minValueIncluded: false,
       maxValueIncluded: false,
     };
+
     if (!value || !value.name || value.selected) {
       return undefined;
     }
@@ -190,6 +191,8 @@ export class ConfiguratorAttributeNumericInputFieldService {
     ) {
       minVal = valueName;
       maxVal = valueName;
+      interval.maxValueIncluded = true;
+      interval.minValueIncluded = true;
     }
     return { minVal, maxVal };
   }
@@ -273,45 +276,171 @@ export class ConfiguratorAttributeNumericInputFieldService {
     return (control: AbstractControl): { [key: string]: any } | null => {
       const input: string = control.value;
       if (input) {
-        //allowed: only numbers and separators
-
-        const groupingSeparator = getLocaleNumberSymbol(
-          locale,
-          NumberSymbol.Group
-        );
-        const decimalSeparator = getLocaleNumberSymbol(
+        return this.getValidationErrorsNumericFormat(
+          input,
           locale,
-          NumberSymbol.Decimal
-        );
-        const expressionPrefix = negativeAllowed ? '^-?' : '^';
-        const expressionOnlyNumericalInput: RegExp = new RegExp(
-          expressionPrefix +
-            '[0123456789' +
-            groupingSeparator +
-            decimalSeparator +
-            ']*$'
+          numberDecimalPlaces,
+          numberTotalPlaces,
+          negativeAllowed
         );
+      }
+      return null;
+    };
+  }
 
-        if (!expressionOnlyNumericalInput.test(input)) {
-          return this.createValidationError(true);
-        }
-        return this.createValidationError(
-          this.performValidationAccordingToMetaData(
-            input,
-            groupingSeparator,
-            decimalSeparator,
-            numberTotalPlaces + (input.includes('-') ? 1 : 0),
-            numberDecimalPlaces
-          )
+  protected getValidationErrorsNumericFormat(
+    input: string,
+    locale: string,
+    numberDecimalPlaces: number,
+    numberTotalPlaces: number,
+    negativeAllowed: boolean
+  ): { [key: string]: any } | null {
+    //allowed: only numbers and separators
+
+    const groupingSeparator = getLocaleNumberSymbol(locale, NumberSymbol.Group);
+    const decimalSeparator = getLocaleNumberSymbol(
+      locale,
+      NumberSymbol.Decimal
+    );
+    const expressionPrefix = negativeAllowed ? '^-?' : '^';
+    const expressionOnlyNumericalInput: RegExp = new RegExp(
+      expressionPrefix +
+        '[0123456789' +
+        groupingSeparator +
+        decimalSeparator +
+        ']*$'
+    );
+
+    if (!expressionOnlyNumericalInput.test(input)) {
+      return this.createValidationError(true);
+    }
+    return this.createValidationError(
+      this.performValidationAccordingToMetaData(
+        input,
+        groupingSeparator,
+        decimalSeparator,
+        numberTotalPlaces + (input.includes('-') ? 1 : 0),
+        numberDecimalPlaces
+      )
+    );
+  }
+
+  /**
+   * Returns the interval validator for the input component that represents numeric input.
+   * It becomes active only if intervals are provided (they originate from the attribute's values),
+   * and matches the input with the list of intervals.
+   * It also becomes active only if the validation for the numeric format itself is fine, in order
+   * to avoid multiple validation messages.
+   *
+   * @param locale The locale
+   * @param numberDecimalPlaces Number of decimal places
+   * @param numberTotalPlaces  Total number of digits
+   * @param negativeAllowed: Do we allow negative input?
+   * @returns {ValidatorFn} The validator
+   */
+
+  getIntervalValidator(
+    locale: string,
+    numberDecimalPlaces: number,
+    numberTotalPlaces: number,
+    negativeAllowed: boolean,
+    intervals: ConfiguratorAttributeNumericInterval[],
+    currentValue?: string
+  ): ValidatorFn {
+    return (control: AbstractControl): { [key: string]: any } | null => {
+      const input: string = control.value;
+      if (
+        input &&
+        input !== currentValue && //this is to ensure that selected interval consisting of only one value will not lead to a validation error
+        // in the next roundtrip, when this value has been removed from the list of intervals
+        intervals.length !== 0 && // perform validation only if intervals exist
+        this.getValidationErrorsNumericFormat(
+          input,
+          locale,
+          numberDecimalPlaces,
+          numberTotalPlaces,
+          negativeAllowed
+        ) == null
+      ) {
+        return this.createIntervalValidationError(
+          !this.checkIfPartOfIntervals(input, locale, intervals)
         );
       }
       return null;
     };
   }
 
+  protected checkIfPartOfIntervals(
+    input: string,
+    locale: string,
+    intervals: ConfiguratorAttributeNumericInterval[]
+  ): boolean {
+    return (
+      intervals.find((interval) =>
+        this.inputMatchesInterval(input, locale, interval)
+      ) !== undefined
+    );
+  }
+
+  protected inputMatchesInterval(
+    input: string,
+    locale: string,
+    interval: ConfiguratorAttributeNumericInterval
+  ): boolean {
+    const inputNum: number = this.parseInput(input, locale);
+
+    let matchesLower: boolean = true;
+    if (interval.minValue) {
+      matchesLower = interval.minValueIncluded
+        ? interval.minValue <= inputNum
+        : interval.minValue < inputNum;
+    }
+
+    let matchesHigher: boolean = true;
+    if (interval.maxValue) {
+      matchesHigher = interval.maxValueIncluded
+        ? interval.maxValue >= inputNum
+        : interval.maxValue > inputNum;
+    }
+
+    return matchesLower && matchesHigher;
+  }
+
+  protected parseInput(input: string, locale: string): number {
+    const groupingSeparator = getLocaleNumberSymbol(locale, NumberSymbol.Group);
+    const decimalSeparator = getLocaleNumberSymbol(
+      locale,
+      NumberSymbol.Decimal
+    );
+    return this.parseInputForSeparators(
+      input,
+      groupingSeparator,
+      decimalSeparator
+    );
+  }
+
+  protected parseInputForSeparators(
+    input: string,
+    groupingSeparator: string,
+    decimalSeparator: string
+  ) {
+    const escapeString = '\\';
+    const search: RegExp = new RegExp(escapeString + groupingSeparator, 'g');
+    const normalizedInput = input
+      .replace(search, '')
+      .replace(decimalSeparator, '.');
+    return parseFloat(normalizedInput);
+  }
+
   protected createValidationError(
     isError: boolean
   ): { [key: string]: any } | null {
     return isError ? { wrongFormat: {} } : null;
   }
+
+  protected createIntervalValidationError(
+    isError: boolean
+  ): { [key: string]: any } | null {
+    return isError ? { intervalNotMet: {} } : null;
+  }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
index 3139ecbef74..0ef5f96c9f1 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
@@ -12,7 +12,11 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { I18nTestingModule, LanguageService } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  I18nTestingModule,
+  LanguageService,
+} from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { of } from 'rxjs';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
@@ -44,18 +48,36 @@ class MockCxIconComponent {
 }
 
 let DEBOUNCE_TIME: number;
+let testVersion: string;
 
 const userInput = '345.00';
 const NUMBER_DECIMAL_PLACES = 2;
+const ATTRIBUTE_NAME = 'attributeName';
+const VALUE_OUTSIDE_ALL_INTERVALS = '5';
 
 const attribute: Configurator.Attribute = {
-  name: 'attributeName',
-  label: 'attributeName',
+  name: ATTRIBUTE_NAME,
+  label: ATTRIBUTE_NAME,
+  uiType: Configurator.UiType.NUMERIC,
+  userInput: userInput,
+  numDecimalPlaces: NUMBER_DECIMAL_PLACES,
+  numTotalLength: 10,
+  negativeAllowed: false,
+};
+
+const attributeInterval: Configurator.Attribute = {
+  name: ATTRIBUTE_NAME,
+  label: ATTRIBUTE_NAME,
   uiType: Configurator.UiType.NUMERIC,
   userInput: userInput,
   numDecimalPlaces: NUMBER_DECIMAL_PLACES,
   numTotalLength: 10,
   negativeAllowed: false,
+  intervalInDomain: true,
+  values: [
+    { valueCode: 'a', name: '7 - 11' },
+    { valueCode: 'b', name: '17' },
+  ],
 };
 
 const attributeWoNumericalMetadata: Configurator.Attribute = {
@@ -81,6 +103,12 @@ class MockConfiguratorCommonsService {
   updateConfiguration(): void {}
 }
 
+class MockFeatureConfigService {
+  isLevel(version: string): boolean {
+    return version === testVersion;
+  }
+}
+
 describe('ConfigAttributeNumericInputFieldComponent', () => {
   let component: ConfiguratorAttributeNumericInputFieldComponent;
 
@@ -126,6 +154,7 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
           },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
         ],
       })
         .overrideComponent(ConfiguratorAttributeNumericInputFieldComponent, {
@@ -158,6 +187,8 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
       defaultConfiguratorUISettingsConfig.productConfigurator
         ?.updateDebounceTime?.input ?? component['FALLBACK_DEBOUNCE_TIME'];
 
+    testVersion = '6.2';
+
     spyOn(
       component['configuratorCommonsService'],
       'updateConfiguration'
@@ -175,6 +206,21 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
     checkForValidationMessage(component, fixture, htmlElem, isValid ? 0 : 1);
   }
 
+  function checkForIntervalValidity(
+    input: string,
+    numberOfValidationIssues: number
+  ) {
+    component.attribute = attributeInterval;
+    component.ngOnInit();
+    component.attributeInputForm.setValue(input);
+    checkForValidationMessage(
+      component,
+      fixture,
+      htmlElem,
+      numberOfValidationIssues
+    );
+  }
+
   it('should create', () => {
     expect(component).toBeTruthy();
   });
@@ -241,40 +287,70 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
     });
   });
 
-  it('should display a validation issue if alphanumeric characters occur', () => {
-    checkForValidity('122A23', false, false);
-  });
+  describe('Validation', () => {
+    it('should display an issue if alphanumeric characters occur', () => {
+      checkForValidity('122A23', false, false);
+    });
 
-  it('should display a validation issue if negative sign is included but not allowed to', () => {
-    checkForValidity('-122323', false, false);
-  });
+    it('should display an issue if negative sign is included but not allowed to', () => {
+      checkForValidity('-122323', false, false);
+    });
 
-  it('should display no validation issue if negative sign is included and allowed', () => {
-    checkForValidity('-122323', true, true);
-  });
+    it('should display no issue if negative sign is included and allowed', () => {
+      checkForValidity('-122323', true, true);
+    });
 
-  it('should display a validation issue if input is too long', () => {
-    checkForValidity('123456789.34', false, false);
-  });
+    it('should display an issue if input is too long', () => {
+      checkForValidity('123456789.34', false, false);
+    });
 
-  it('should display a validation issue if input is too long and negatives allowed', () => {
-    checkForValidity('123456789.34', true, false);
-  });
+    it('should display an issue if input is too long and negatives allowed', () => {
+      checkForValidity('123456789.34', true, false);
+    });
 
-  it('should display no validation issue if input length matches meta data exactly', () => {
-    checkForValidity('12345678.34', false, true);
-  });
+    it('should display an issue if input length matches meta data exactly', () => {
+      checkForValidity('12345678.34', false, true);
+    });
 
-  it('should display no validation issue if input length matches meta data exactly and negatives are allowed', () => {
-    checkForValidity('12345678.34', true, true);
-  });
+    it('should display an issue if input length matches meta data exactly and negatives are allowed', () => {
+      checkForValidity('12345678.34', true, true);
+    });
+
+    it('should display no issue for negative value if input length matches meta data exactly and negatives are allowed', () => {
+      checkForValidity('-12345678.34', true, true);
+    });
 
-  it('should display no validation issue for negative value if input length matches meta data exactly and negatives are allowed', () => {
-    checkForValidity('-12345678.34', true, true);
+    it('should display no issue for single minus if negatives are allowed', () => {
+      checkForValidity('-', true, true);
+    });
   });
 
-  it('should display no validation issue for single minus if negatives are allowed', () => {
-    checkForValidity('-', true, true);
+  describe('Interval validation', () => {
+    it('should display an issue if input does not match interval', () => {
+      checkForIntervalValidity(VALUE_OUTSIDE_ALL_INTERVALS, 1);
+    });
+
+    it('should display no issue if input does not match interval but we did not opt for the 6.2 release', () => {
+      testVersion = '6.1';
+      checkForIntervalValidity(VALUE_OUTSIDE_ALL_INTERVALS, 0);
+    });
+
+    it('should display no issue if input does not match interval but feature config service is not available', () => {
+      component['featureConfigservice'] = undefined;
+      checkForIntervalValidity(VALUE_OUTSIDE_ALL_INTERVALS, 0);
+    });
+
+    it('should display no issue if input in part of interval', () => {
+      checkForIntervalValidity('8', 0);
+    });
+
+    it('should display no issue if input matches interval (in case for single valued interval', () => {
+      checkForIntervalValidity('17', 0);
+    });
+
+    it('should display only one issue if input breaks both validations', () => {
+      checkForIntervalValidity('A', 1);
+    });
   });
 
   it('should not set control value in case the model attribute does not carry a value', () => {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
index 91f694d1a7d..7b329e2f5ff 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
@@ -11,9 +11,10 @@ import {
   isDevMode,
   OnDestroy,
   OnInit,
+  Optional,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-import { TranslationService } from '@spartacus/core';
+import { FeatureConfigService, TranslationService } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { timer } from 'rxjs';
@@ -48,12 +49,35 @@ export class ConfiguratorAttributeNumericInputFieldComponent
   intervals: ConfiguratorAttributeNumericInterval[] = [];
   language: string;
 
+  constructor(
+    configAttributeNumericInputFieldService: ConfiguratorAttributeNumericInputFieldService,
+    config: ConfiguratorUISettingsConfig,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfigService: FeatureConfigService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    configAttributeNumericInputFieldService: ConfiguratorAttributeNumericInputFieldService,
+    config: ConfiguratorUISettingsConfig,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
   constructor(
     protected configAttributeNumericInputFieldService: ConfiguratorAttributeNumericInputFieldService,
     protected config: ConfiguratorUISettingsConfig,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    // TODO:(CXSPA-3392) for next major release remove feature config service
+    @Optional() protected featureConfigservice?: FeatureConfigService
   ) {
     super(config, attributeComponentContext, configuratorCommonsService);
     this.language = attributeComponentContext.language;
@@ -70,7 +94,45 @@ export class ConfiguratorAttributeNumericInputFieldComponent
     return wrongFormat;
   }
 
+  /**
+   * Do we need to display a validation message concerning intervals
+   */
+  mustDisplayIntervalMessage(): boolean {
+    const intervalNotMet: boolean =
+      (this.attributeInputForm.dirty || this.attributeInputForm.touched) &&
+      this.attributeInputForm.errors?.intervalNotMet;
+    return intervalNotMet;
+  }
+
   ngOnInit() {
+    this.initializeValidation();
+
+    if (this.attribute.userInput) {
+      this.attributeInputForm.setValue(this.attribute.userInput);
+    }
+
+    if (
+      this.ownerType === CommonConfigurator.OwnerType.CART_ENTRY &&
+      this.attribute.required &&
+      this.attribute.incomplete &&
+      !this.attributeInputForm.value
+    ) {
+      this.attributeInputForm.markAsTouched();
+    }
+
+    this.sub = this.attributeInputForm.valueChanges
+      .pipe(
+        debounce(() =>
+          timer(
+            this.config.productConfigurator?.updateDebounceTime?.input ??
+              this.FALLBACK_DEBOUNCE_TIME
+          )
+        )
+      )
+      .subscribe(() => this.onChange());
+  }
+
+  protected initializeValidation() {
     //locales are available as 'languages' in the commerce backend
     this.locale = this.getInstalledLocale(this.language);
 
@@ -96,15 +158,36 @@ export class ConfiguratorAttributeNumericInputFieldComponent
         );
       }
     }
+    if (this.attribute.intervalInDomain) {
+      this.intervals =
+        this.configAttributeNumericInputFieldService.getIntervals(
+          this.attribute.values
+        );
+    }
 
-    this.attributeInputForm = new UntypedFormControl('', [
+    const numberFormatValidator =
       this.configAttributeNumericInputFieldService.getNumberFormatValidator(
         this.locale,
         numDecimalPlaces,
         numTotalLength,
         negativeAllowed
-      ),
-    ]);
+      );
+
+    const validatorArray = this.featureConfigservice?.isLevel('6.2')
+      ? [
+          numberFormatValidator,
+          this.configAttributeNumericInputFieldService.getIntervalValidator(
+            this.locale,
+            numDecimalPlaces,
+            numTotalLength,
+            negativeAllowed,
+            this.intervals,
+            this.attribute.userInput
+          ),
+        ]
+      : [numberFormatValidator];
+
+    this.attributeInputForm = new UntypedFormControl('', validatorArray);
 
     this.numericFormatPattern =
       this.configAttributeNumericInputFieldService.getPatternForValidationMessage(
@@ -113,36 +196,6 @@ export class ConfiguratorAttributeNumericInputFieldComponent
         negativeAllowed,
         this.locale
       );
-    if (this.attribute.userInput) {
-      this.attributeInputForm.setValue(this.attribute.userInput);
-    }
-
-    if (
-      this.ownerType === CommonConfigurator.OwnerType.CART_ENTRY &&
-      this.attribute.required &&
-      this.attribute.incomplete &&
-      !this.attributeInputForm.value
-    ) {
-      this.attributeInputForm.markAsTouched();
-    }
-
-    if (this.attribute.intervalInDomain) {
-      this.intervals =
-        this.configAttributeNumericInputFieldService.getIntervals(
-          this.attribute.values
-        );
-    }
-
-    this.sub = this.attributeInputForm.valueChanges
-      .pipe(
-        debounce(() =>
-          timer(
-            this.config.productConfigurator?.updateDebounceTime?.input ??
-              this.FALLBACK_DEBOUNCE_TIME
-          )
-        )
-      )
-      .subscribe(() => this.onChange());
   }
 
   ngOnDestroy() {

From 3fc7566a8d6fcf3e0ac4a9615fcbabe5a5b49656 Mon Sep 17 00:00:00 2001
From: Ulrich Stellmacher <ulrich.stellmacher@sap.com>
Date: Wed, 7 Jun 2023 13:26:16 +0200
Subject: [PATCH 026/122] fix: force creation of a new CPQ session if a new
 token is issued (CXSPA-3496) (#17488)

Once a CPQ session has been created with the business context from the token, this context can not be changed anymore. So if a new token is requested for a different customer we also new to ensure that a new CPQ session is created. Reusing any existing session may not work.
---
 .../cpq-configurator-rest.interceptor.spec.ts   | 17 ++++++++++-------
 .../cpq-configurator-rest.interceptor.ts        |  1 +
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.spec.ts b/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.spec.ts
index ba00da4e291..5b08c5346ec 100644
--- a/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.spec.ts
+++ b/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.spec.ts
@@ -202,7 +202,7 @@ describe('CpqConfiguratorRestInterceptor', () => {
       });
   });
 
-  it('should retry a CPQ request with fresh token on 403', (done) => {
+  it('should retry a CPQ request with fresh token and session on 403', (done) => {
     cpqAccessDataStack.push({
       accessToken: 'EXPIRED_TOKEN',
       endpoint: 'https://cpq',
@@ -211,6 +211,7 @@ describe('CpqConfiguratorRestInterceptor', () => {
     cpqResponseStack = [];
     cpqResponseStack.push(validCpqResponse); // second request should succeed
     cpqResponseStack.push(new HttpErrorResponse({ status: 403 })); // first error
+    interceptorUnderTest['cpqSessionId'] = '123';
     interceptorUnderTest
       .intercept(cpqRequest, mockedNextHandler)
       .subscribe(() => {
@@ -221,14 +222,16 @@ describe('CpqConfiguratorRestInterceptor', () => {
           cpqAccessStorageServiceMock.renewCpqAccessData
         ).toHaveBeenCalled();
         expect(mockedNextHandler.handle).toHaveBeenCalledTimes(2);
-        // last request with new token
-        expect(capturedRequestsStack.pop()?.headers.get('Authorization')).toBe(
-          'Bearer TOKEN'
-        );
-        // initial requests with expired token
-        expect(capturedRequestsStack.pop()?.headers.get('Authorization')).toBe(
+        // last request with new token and no session id to create fresh session
+        let lastReq = capturedRequestsStack.pop();
+        expect(lastReq?.headers.get('Authorization')).toBe('Bearer TOKEN');
+        expect(lastReq?.headers.get('x-cpq-session-id')).toBeNull();
+        let firstReq = capturedRequestsStack.pop();
+        // initial requests with expired token and existing session id
+        expect(firstReq?.headers.get('Authorization')).toBe(
           'Bearer EXPIRED_TOKEN'
         );
+        expect(firstReq?.headers.get('x-cpq-session-id')).toBe('123');
         done();
       });
   });
diff --git a/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.ts b/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.ts
index d30112ea63a..f03cab5bfb9 100644
--- a/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.ts
+++ b/feature-libs/product-configurator/rulebased/root/cpq/interceptor/cpq-configurator-rest.interceptor.ts
@@ -69,6 +69,7 @@ export class CpqConfiguratorRestInterceptor implements HttpInterceptor {
   ): Observable<HttpEvent<any>> {
     if (errorResponse instanceof HttpErrorResponse) {
       if (errorResponse.status === 403) {
+        this.cpqSessionId = null;
         this.cpqAccessStorageService.renewCpqAccessData();
         return this.cpqAccessStorageService.getCpqAccessData().pipe(
           take(1),

From 0f1eafab93866a3b85b80e3a3ae57efea1ce0aec Mon Sep 17 00:00:00 2001
From: Eric Polesky <eric.polesky@sap.com>
Date: Wed, 7 Jun 2023 10:43:20 -0400
Subject: [PATCH 027/122] chore: fix regression in command service error
 handling (#17462)

CXSPA-3535

The regression is that errors thrown by the commandFactory would not be caught and result in the processing stream closing.  Future command requests would not be processed.  The update wraps the commandFactory function to catch any thrown errors and pass them to the subscriber.  It additionally prevents the Error-previous strategy from overwriting any notified errors with the "Canceled by next command" error, an edge-case which would occur for synchronous commands only.

Upstream sync from 6.1.x
---
 .../cdc-register-component.service.ts         |  11 +-
 .../command-query/command.service.spec.ts     | 288 +++++++++++++++---
 .../src/util/command-query/command.service.ts |  32 +-
 3 files changed, 266 insertions(+), 65 deletions(-)

diff --git a/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts b/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
index e595cfa021b..3a4c1b6dd31 100644
--- a/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
+++ b/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
@@ -22,15 +22,18 @@ import {
   UserRegisterFacade,
   UserSignUp,
 } from '@spartacus/user/profile/root';
-import { merge, Observable, throwError } from 'rxjs';
+import { Observable, merge, throwError } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 
 @Injectable()
 export class CDCRegisterComponentService extends RegisterComponentService {
   protected registerCommand: Command<{ user: UserSignUp }, User> =
-    this.command.create(({ user }) =>
-      // Registering user through CDC Gigya SDK
-      this.cdcJSService.registerUserWithoutScreenSet(user)
+    this.command.create(
+      ({ user }) =>
+        // Registering user through CDC Gigya SDK
+        this.cdcJSService.registerUserWithoutScreenSet(
+          user
+        ) as unknown as Observable<User>
     );
 
   protected loadUserTokenFailed$: Observable<boolean> = this.eventService
diff --git a/projects/core/src/util/command-query/command.service.spec.ts b/projects/core/src/util/command-query/command.service.spec.ts
index 310660783e1..2fa77694163 100644
--- a/projects/core/src/util/command-query/command.service.spec.ts
+++ b/projects/core/src/util/command-query/command.service.spec.ts
@@ -1,19 +1,31 @@
 import { TestBed } from '@angular/core/testing';
 
-import { EMPTY, Observable, PartialObserver, Subject, of } from 'rxjs';
+import {
+  EMPTY,
+  NEVER,
+  Observable,
+  PartialObserver,
+  Subject,
+  of,
+  throwError,
+} from 'rxjs';
 import { Command, CommandService, CommandStrategy } from './command.service';
 
-/** Utility function to create a full observer filled with spies and optional overrides */
+/** Utility function to create a full observer filled with spies */
 function createObserverSpy<T>(
-  name: string,
-  observerOverrides?: PartialObserver<T>
+  name: string
 ): jasmine.SpyObj<PartialObserver<T>> {
-  return jasmine.createSpyObj(name, {
+  const mockObserver = jasmine.createSpyObj(name, {
     next: () => {},
     error: () => {},
     complete: () => {},
-    ...observerOverrides,
   });
+  // use default method
+  mockObserver.next.and.callThrough();
+  mockObserver.error.and.callThrough();
+  mockObserver.complete.and.callThrough();
+
+  return mockObserver;
 }
 
 describe('CommandService', () => {
@@ -34,45 +46,71 @@ describe('CommandService', () => {
     expect(service).toBeTruthy();
   });
 
-  it('create should return command', () => {
-    const command = service.create(() => EMPTY);
-    expect(command.execute).toBeDefined();
+  describe('create()', () => {
+    it('should return command', () => {
+      const command = service.create(() => EMPTY);
+      expect(command.execute).toBeDefined();
+    });
   });
 
-  describe('command', () => {
-    let command: Command<string, string>;
-    let commandExecutedTimes: number;
+  describe('command()', () => {
+    let mockRuntimeError: Error;
+    let faultyCommandFactoryControl: { shouldThrowError: boolean };
+    let faultyCommandFactory: jasmine.Spy<
+      (cmd: Observable<string>) => Observable<string>
+    >;
+    let commandFactory: jasmine.Spy<
+      (cmd: Observable<string>) => Observable<string>
+    >;
 
     beforeEach(() => {
-      commandExecutedTimes = 0;
-      command = service.create((input) => {
-        commandExecutedTimes++;
-        return of(input + commandExecutedTimes);
-      });
+      commandFactory = jasmine.createSpy('commandFactory', (cmd) => cmd);
+      commandFactory.and.callThrough();
+
+      faultyCommandFactoryControl = { shouldThrowError: true };
+      mockRuntimeError = new Error('mock runtime error');
+      mockRuntimeError.stack = undefined; // stack trace not relevant on a static error value
+      faultyCommandFactory = jasmine.createSpy(
+        'faultyCommandFactory',
+        (cmd) => {
+          if (faultyCommandFactoryControl.shouldThrowError) {
+            throw mockRuntimeError;
+          } else {
+            return cmd;
+          }
+        }
+      );
+      faultyCommandFactory.and.callThrough();
     });
 
     it('should execute command without subscription', () => {
-      expect(commandExecutedTimes).toBe(0);
-      command.execute('test');
-      expect(commandExecutedTimes).toBe(1);
+      let command = service.create(commandFactory);
+
+      expect(commandFactory).toHaveBeenCalledTimes(0);
+      command.execute(of('test'));
+      expect(commandFactory).toHaveBeenCalledTimes(1);
     });
 
-    it('should execute command and return result', (done) => {
-      command.execute('test').subscribe((result) => {
-        expect(result).toEqual('test1');
-        done();
+    it('should execute command and return result', () => {
+      let command = service.create(commandFactory);
+      const expected = 'test';
+      const input = of(expected);
+
+      command.execute(input).subscribe((result) => {
+        expect(result).toEqual(expected);
       });
     });
 
-    describe('CommandStrategy.Queue', () => {
+    describe('with CommandStrategy.Queue', () => {
       let queueCommand: Command<Observable<string>, string>;
+      const strategy = CommandStrategy.Queue;
       let observer1: jasmine.SpyObj<PartialObserver<string>>;
       let observer2: jasmine.SpyObj<PartialObserver<string>>;
 
       beforeEach(() => {
         // use argument as command request
-        queueCommand = service.create((obs) => obs, {
-          strategy: CommandStrategy.Queue,
+        queueCommand = service.create(commandFactory, {
+          strategy: strategy,
         });
 
         spyOn(request1, 'subscribe').and.callThrough();
@@ -82,6 +120,32 @@ describe('CommandService', () => {
         observer2 = createObserverSpy('observer2');
       });
 
+      it('should catch commandFactory errors and pass them to the notifier', () => {
+        queueCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+
+        queueCommand.execute(of('')).subscribe(observer1);
+
+        expect(observer1.error).toHaveBeenCalledWith(mockRuntimeError);
+      });
+
+      it('should continue processing other commands after a commandFactory error', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        queueCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+        const expected = '';
+        faultyCommandFactoryControl.shouldThrowError = true;
+
+        queueCommand.execute(NEVER).subscribe(observer1);
+        faultyCommandFactoryControl.shouldThrowError = false;
+        queueCommand.execute(of(expected)).subscribe(observer2);
+
+        expect(observer2.next).toHaveBeenCalledWith(expected);
+      });
+
       it('should queue subsequent requests when the preceding request is in-progress', () => {
         queueCommand.execute(request1);
         queueCommand.execute(request2);
@@ -90,8 +154,8 @@ describe('CommandService', () => {
         expect(request2.subscribe).not.toHaveBeenCalled();
       });
 
-      it('should queue requests as the default method', () => {
-        queueCommand = service.create((obs) => obs);
+      it('should queue requests as the default strategy', () => {
+        queueCommand = service.create(commandFactory);
         queueCommand.execute(request1);
         queueCommand.execute(request2);
 
@@ -128,52 +192,81 @@ describe('CommandService', () => {
       });
     });
 
-    describe('CommandStrategy.Parallel', () => {
-      let paralleCommand: Command<Observable<string>, string>;
+    describe('with CommandStrategy.Parallel', () => {
+      let parallelCommand: Command<Observable<string>, string>;
+      const strategy = CommandStrategy.Parallel;
 
       beforeEach(() => {
         // use argument as command request
-        paralleCommand = service.create((obs) => obs, {
-          strategy: CommandStrategy.Parallel,
+        parallelCommand = service.create(commandFactory, {
+          strategy: strategy,
         });
         spyOn(request1, 'subscribe').and.callThrough();
         spyOn(request2, 'subscribe').and.callThrough();
       });
 
+      it('should catch commandFactory errors and pass them to the notifier', () => {
+        const observer = createObserverSpy('observer');
+        parallelCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+
+        parallelCommand.execute(NEVER).subscribe(observer);
+
+        expect(observer.error).toHaveBeenCalledWith(mockRuntimeError);
+      });
+
+      it('should continue processing other commands after a commandFactory error', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        parallelCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+        const expected = 'expected value';
+        faultyCommandFactoryControl.shouldThrowError = true;
+
+        parallelCommand.execute(NEVER).subscribe(observer1);
+        faultyCommandFactoryControl.shouldThrowError = false;
+        parallelCommand.execute(of(expected)).subscribe(observer2);
+
+        expect(observer2.next).toHaveBeenCalledWith(expected);
+      });
+
       it('should initiate requests in parallel', () => {
-        paralleCommand.execute(request1);
-        paralleCommand.execute(request2);
+        parallelCommand.execute(request1);
+        parallelCommand.execute(request2);
 
         expect(request1.subscribe).toHaveBeenCalled();
         expect(request2.subscribe).toHaveBeenCalled();
       });
 
-      it('should not allow errors in one request to interfere with other requests', () => {
-        let expected = 'result2';
+      it('should not allow an error in one request to interfere with other in-progress requests', () => {
+        let expectedValue = 'result2';
         let expectedError = 'error1';
         const observer1 = createObserverSpy('observer1');
         const observer2 = createObserverSpy('observer2');
-        paralleCommand.execute(request1).subscribe(observer1);
-        paralleCommand.execute(request2).subscribe(observer2);
+        parallelCommand.execute(request1).subscribe(observer1);
+        parallelCommand.execute(request2).subscribe(observer2);
 
         request1.error(expectedError);
-        request2.next(expected);
+        request2.next(expectedValue);
         request2.complete();
 
         expect(observer1.next).not.toHaveBeenCalled();
         expect(observer1.error).toHaveBeenCalledWith(expectedError);
-        expect(observer2.next).toHaveBeenCalledWith(expected);
+        expect(observer2.next).toHaveBeenCalledWith(expectedValue);
         expect(observer2.complete).toHaveBeenCalled();
       });
     });
 
-    describe('CommandStrategy.CancelPrevious', () => {
+    describe('with CommandStrategy.CancelPrevious', () => {
       let cancelPrevCommand: Command<Observable<string>, string>;
+      const strategy = CommandStrategy.CancelPrevious;
 
       beforeEach(() => {
         // use argument as command request
-        cancelPrevCommand = service.create((obs) => obs, {
-          strategy: CommandStrategy.CancelPrevious,
+        cancelPrevCommand = service.create(commandFactory, {
+          strategy: strategy,
         });
         spyOn(request1, 'unsubscribe').and.callThrough();
       });
@@ -189,26 +282,125 @@ describe('CommandService', () => {
         expect(observer1.error).not.toHaveBeenCalled();
         expect(observer1.complete).toHaveBeenCalled();
       });
+
+      it('should catch commandFactory errors and pass them to the notifier', () => {
+        const observer = createObserverSpy('observer');
+        cancelPrevCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+
+        cancelPrevCommand.execute(NEVER).subscribe(observer);
+
+        expect(observer.error).toHaveBeenCalledWith(mockRuntimeError);
+      });
+
+      it('should continue processing other commands after a commandFactory error', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        cancelPrevCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+        const expected = '';
+        faultyCommandFactoryControl.shouldThrowError = true;
+
+        cancelPrevCommand.execute(NEVER).subscribe(observer1);
+        faultyCommandFactoryControl.shouldThrowError = false;
+        cancelPrevCommand.execute(of(expected)).subscribe(observer2);
+
+        expect(observer2.next).toHaveBeenCalledWith(expected);
+      });
     });
 
-    describe('CommandStrategy.ErrorPrevious', () => {
+    describe('with CommandStrategy.ErrorPrevious', () => {
       let errorPrevCommand: Command<Observable<string>, string>;
+      const strategy = CommandStrategy.ErrorPrevious;
 
       beforeEach(() => {
         // use argument as command request
         errorPrevCommand = service.create((obs) => obs, {
-          strategy: CommandStrategy.ErrorPrevious,
+          strategy: strategy,
         });
       });
 
-      it('should error in-progress requests', () => {
+      it('should mirror the command request notifications to the subscriber', () => {
+        const observer = createObserverSpy('observer1');
+        const expected = 'expected value';
+
+        errorPrevCommand.execute(request1).subscribe(observer);
+        request1.next(expected);
+        request1.complete();
+
+        expect(observer.next).toHaveBeenCalledWith(expected);
+        expect(observer.error).not.toHaveBeenCalled();
+        expect(observer.complete).toHaveBeenCalled();
+      });
+
+      it('should error in-progress requests when new request comes in', () => {
+        let actual: Error | undefined;
         const observer1 = createObserverSpy('observer1');
+        (observer1.error as jasmine.Spy).and.callFake(
+          (result) => (actual = result)
+        );
         const observer2 = createObserverSpy('observer2');
-        errorPrevCommand.execute(request1).subscribe(observer1);
 
+        errorPrevCommand.execute(request1).subscribe(observer1);
         errorPrevCommand.execute(request2).subscribe(observer2);
 
+        request1.next('r1');
+        request1.complete();
+
         expect(observer1.error).toHaveBeenCalledWith(jasmine.any(Error));
+        expect(actual?.message).toEqual('Canceled by next command');
+      });
+
+      it('should not error completed requests', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+
+        errorPrevCommand.execute(request1).subscribe(observer1);
+        request1.complete();
+
+        errorPrevCommand.execute(request2).subscribe(observer2);
+
+        expect(observer1.error).not.toHaveBeenCalled();
+      });
+
+      it("should mirror the commandFactory observable's error notifications to the subscriber", () => {
+        const observer = createObserverSpy('observer');
+        const mockRequestError = new Error('request error');
+
+        errorPrevCommand
+          .execute(throwError(mockRequestError))
+          .subscribe(observer);
+
+        expect(observer.error).toHaveBeenCalledWith(mockRequestError);
+      });
+
+      it('should catch errors thrown by commandFactory and pass them to the subscriber', () => {
+        const observer = createObserverSpy('observer');
+        errorPrevCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+
+        errorPrevCommand.execute(NEVER).subscribe(observer);
+
+        expect(observer.error).toHaveBeenCalledWith(mockRuntimeError);
+      });
+
+      it('should continue processing other commands after a commandFactory error', () => {
+        const observer1 = createObserverSpy('observer1');
+        const observer2 = createObserverSpy('observer2');
+        errorPrevCommand = service.create(faultyCommandFactory, {
+          strategy: strategy,
+        });
+        const expected = '';
+        faultyCommandFactoryControl.shouldThrowError = true;
+
+        errorPrevCommand.execute(NEVER).subscribe(observer1);
+        faultyCommandFactoryControl.shouldThrowError = false;
+        errorPrevCommand.execute(of(expected)).subscribe(observer2);
+
+        expect(observer2.next).toHaveBeenCalledWith(expected);
       });
     });
   });
diff --git a/projects/core/src/util/command-query/command.service.ts b/projects/core/src/util/command-query/command.service.ts
index 17cf1fe5019..a0b473d9d0f 100644
--- a/projects/core/src/util/command-query/command.service.ts
+++ b/projects/core/src/util/command-query/command.service.ts
@@ -11,6 +11,7 @@ import {
   ReplaySubject,
   Subject,
   Subscription,
+  defer,
   zip,
 } from 'rxjs';
 import {
@@ -18,7 +19,6 @@ import {
   concatMap,
   finalize,
   mergeMap,
-  retry,
   switchMap,
   tap,
 } from 'rxjs/operators';
@@ -47,36 +47,42 @@ export class CommandService implements OnDestroy {
   }
 
   create<PARAMS = undefined, RESULT = unknown>(
-    commandFactory: (command: PARAMS) => Observable<any>,
+    commandFactory: (command: PARAMS) => Observable<RESULT>,
     options?: { strategy?: CommandStrategy }
   ): Command<PARAMS, RESULT> {
     const commands$ = new Subject<PARAMS>();
     const results$ = new Subject<ReplaySubject<RESULT>>();
 
-    let process$: Observable<any>;
+    let process$: Observable<unknown>;
 
     switch (options?.strategy) {
       case CommandStrategy.CancelPrevious:
       case CommandStrategy.ErrorPrevious:
         process$ = zip(commands$, results$).pipe(
           switchMap(([cmd, notifier$]) =>
-            commandFactory(cmd).pipe(
+            defer(() => commandFactory(cmd)).pipe(
               tap(notifier$),
-              finalize(() =>
-                options.strategy === CommandStrategy.CancelPrevious
-                  ? notifier$.complete()
-                  : notifier$.error(new Error('Canceled by next command'))
-              )
+              catchError(() => EMPTY),
+              finalize(() => {
+                // do not overwrite existing existing ending state
+                if (!notifier$.closed && !notifier$.hasError) {
+                  // command has not ended yet, so close notifier$ according to strategy
+                  if (options.strategy === CommandStrategy.ErrorPrevious) {
+                    notifier$.error(new Error('Canceled by next command'));
+                  } else {
+                    notifier$.complete();
+                  }
+                }
+              })
             )
-          ),
-          retry()
+          )
         );
         break;
 
       case CommandStrategy.Parallel:
         process$ = zip(commands$, results$).pipe(
           mergeMap(([cmd, notifier$]) =>
-            commandFactory(cmd).pipe(
+            defer(() => commandFactory(cmd)).pipe(
               tap(notifier$),
               catchError(() => EMPTY)
             )
@@ -88,7 +94,7 @@ export class CommandService implements OnDestroy {
       default:
         process$ = zip(commands$, results$).pipe(
           concatMap(([cmd, notifier$]) =>
-            commandFactory(cmd).pipe(
+            defer(() => commandFactory(cmd)).pipe(
               tap(notifier$),
               catchError(() => EMPTY)
             )

From 031873fc734ba68e0d8b8aebf6b5511d111ad64a Mon Sep 17 00:00:00 2001
From: Ulrich Stellmacher <ulrich.stellmacher@sap.com>
Date: Mon, 12 Jun 2023 10:46:13 +0200
Subject: [PATCH 028/122] fix: sonar findings (CXSPA-3575) (#17495)

---
 ...gurator-attribute-numeric-input-field.component.service.ts | 4 ++--
 .../overview-form/configurator-overview-form.component.ts     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
index 0fffaedb2b9..7d3eefcac86 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
@@ -45,8 +45,8 @@ export class ConfiguratorAttributeNumericInputFieldService {
     numberTotalPlaces: number,
     numberDecimalPlaces: number
   ): boolean {
-    const escape = '\\';
-    const search: RegExp = new RegExp(escape + groupingSeparator, 'g');
+    const regexEscape = '\\';
+    const search: RegExp = new RegExp(regexEscape + groupingSeparator, 'g');
     const woGrouping = input.replace(search, '');
     const splitParts = woGrouping.split(decimalSeparator);
 
diff --git a/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.ts b/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.ts
index 47d24f9aeb2..4f30fc6f9de 100644
--- a/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/overview-form/configurator-overview-form.component.ts
@@ -67,8 +67,8 @@ export class ConfiguratorOverviewFormComponent {
   ): boolean {
     if (groups) {
       let hasAttributes =
-        groups.find((group) =>
-          group.attributes ? group.attributes.length : 0 > 0
+        groups.find(
+          (group) => (group.attributes ? group.attributes.length : 0) > 0
         ) !== undefined;
       if (!hasAttributes) {
         hasAttributes =

From ea85e276c8499bd3332123d06d136820076763c6 Mon Sep 17 00:00:00 2001
From: Hak Woo Kim <kimhakwoo@hotmail.com>
Date: Mon, 12 Jun 2023 14:27:19 -0400
Subject: [PATCH 029/122] fix: reset quantity when product changes in PDP
 (#17509)

Co-authored-by: Hakwoo Kim <hakwoo.kim@sap.com>
---
 .../base/components/add-to-cart/add-to-cart.component.spec.ts | 4 ++++
 .../cart/base/components/add-to-cart/add-to-cart.component.ts | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.spec.ts b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.spec.ts
index bab8eb16626..b7eefbea622 100644
--- a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.spec.ts
+++ b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.spec.ts
@@ -234,12 +234,16 @@ describe('AddToCartComponent', () => {
         addToCartComponent.ngOnInit();
         expect(addToCartComponent.productCode).toEqual(mockProduct.code);
         addToCartComponent.quantity = 5;
+        addToCartComponent.addToCartForm.controls['quantity'].setValue(5);
 
         //Product 2
         currentProduct.next(mockProduct2);
         expect(addToCartComponent.productCode).toEqual(mockProduct2.code);
         //Quantity is expected to be reset to 1 since it is a new product page
         expect(addToCartComponent.quantity).toEqual(1);
+        expect(addToCartComponent.addToCartForm.get('quantity')?.value).toEqual(
+          1
+        );
       });
 
       it('should disable input when the product has no stock', () => {
diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
index f46717bbf22..ff6fb1761fe 100644
--- a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
+++ b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
@@ -110,6 +110,9 @@ export class AddToCartComponent implements OnInit, OnDestroy {
 
   protected setStockInfo(product: Product): void {
     this.quantity = 1;
+
+    this.addToCartForm.controls['quantity'].setValue(1);
+
     this.hasStock = Boolean(product.stock?.stockLevelStatus !== 'outOfStock');
 
     this.inventoryThreshold = product.stock?.isValueRounded ?? false;

From 5fa8c6bb6b563234aef79670b2faab26341668b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jun 2023 17:30:18 -0400
Subject: [PATCH 030/122] chore(deps): bump socket.io-parser from 4.2.2 to
 4.2.4 (#17500)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0093e2d1672..66ea259b7e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -123,7 +123,7 @@
         "ts-morph": "^9.1.0",
         "ts-node": "^10.6.0",
         "typescript": "^4.8.2",
-        "webpack": "^5.76.1",
+        "webpack": "~5.76.1",
         "webpack-cli": "^4.10.0"
       },
       "engines": {
@@ -19921,9 +19921,10 @@
       }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.2",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.1"

From 05c3ff76c061569627cee5ee36301e836550808b Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Wed, 14 Jun 2023 11:35:01 +0800
Subject: [PATCH 031/122] fix: Ensure 'Create New Customer' button appearing on
 customer list page (#17503)

---
 .../asm/styles/components/_customer-list.component.scss        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/feature-libs/asm/styles/components/_customer-list.component.scss b/feature-libs/asm/styles/components/_customer-list.component.scss
index b5e3b045b95..09bb0885303 100644
--- a/feature-libs/asm/styles/components/_customer-list.component.scss
+++ b/feature-libs/asm/styles/components/_customer-list.component.scss
@@ -155,6 +155,9 @@ $sapFioriContent_LabelColor: #6a6d70;
       padding-bottom: 0;
     }
     max-height: calc(100vh - 260px);
+    @include media-breakpoint-down(xs) {
+      max-height: calc(100vh - 470px);
+    }
     overflow-y: auto;
   }
 

From 4c7f69b9076b66899f2dd8c614f93689ed590150 Mon Sep 17 00:00:00 2001
From: Scar Ai <38693320+scarai-sap@users.noreply.github.com>
Date: Wed, 14 Jun 2023 13:40:06 +0800
Subject: [PATCH 032/122] fix/enable-asm-header-by-default (#17510)

---
 feature-libs/asm/root/config/default-asm-config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/feature-libs/asm/root/config/default-asm-config.ts b/feature-libs/asm/root/config/default-asm-config.ts
index 5e26eeb8011..92ea4c01422 100644
--- a/feature-libs/asm/root/config/default-asm-config.ts
+++ b/feature-libs/asm/root/config/default-asm-config.ts
@@ -63,5 +63,8 @@ export const defaultAsmConfig: AsmConfig = {
         },
       ],
     },
+    userIdHttpHeader: {
+      enable: true,
+    },
   },
 };

From 9cf5b480f0ac12187d7d6c61f4e0080173d650d9 Mon Sep 17 00:00:00 2001
From: Ulrich Stellmacher <ulrich.stellmacher@sap.com>
Date: Wed, 14 Jun 2023 14:01:46 +0200
Subject: [PATCH 033/122] fix: empty configurator attribute value can be
 submitted [CXSPA-3630] (#17508)

 For required attribute
---
 ...rator-attribute-input-field.component.html | 78 +++++++++++++------
 ...or-attribute-input-field.component.spec.ts | 35 ++++++++-
 ...gurator-attribute-input-field.component.ts | 10 +++
 ...nfigurator-attribute-input-field.module.ts |  7 +-
 ...tribute-numeric-input-field.component.html | 64 ++++++++++-----
 ...e-numeric-input-field.component.service.ts |  4 +-
 ...bute-numeric-input-field.component.spec.ts | 16 +++-
 ...or-attribute-numeric-input-field.module.ts |  7 +-
 8 files changed, 166 insertions(+), 55 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
index c1cf486acf9..ed3caaf9f32 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
@@ -1,27 +1,55 @@
 <div id="{{ createAttributeIdForConfigurator(attribute) }}" class="form-group">
-  <input
-    [formControl]="attributeInputForm"
-    [required]="isRequired"
-    class="form-control"
-    attr.required="{{ attribute.required }}"
-    maxlength="{{ attribute.maxlength }}"
-    [attr.aria-label]="
-      attribute.userInput === undefined || attribute.userInput.length === 0
-        ? ('configurator.a11y.valueOfAttributeBlank'
-          | cxTranslate
-            : {
-                attribute: attribute.label
-              })
-        : ('configurator.a11y.valueOfAttributeFull'
-          | cxTranslate
-            : {
-                value: attribute.userInput,
-                attribute: attribute.label
-              })
-    "
-    [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
-    [cxFocus]="{
-      key: createAttributeIdForConfigurator(attribute)
-    }"
-  />
+  <ng-container *cxFeatureLevel="'!6.2'">
+    <input
+      [formControl]="attributeInputForm"
+      [required]="isRequired"
+      class="form-control"
+      attr.required="{{ attribute.required }}"
+      maxlength="{{ attribute.maxlength }}"
+      [attr.aria-label]="
+        isUserInputEmpty
+          ? ('configurator.a11y.valueOfAttributeBlank'
+            | cxTranslate
+              : {
+                  attribute: attribute.label
+                })
+          : ('configurator.a11y.valueOfAttributeFull'
+            | cxTranslate
+              : {
+                  value: attribute.userInput,
+                  attribute: attribute.label
+                })
+      "
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
+      [cxFocus]="{
+        key: createAttributeIdForConfigurator(attribute)
+      }"
+    />
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.2'">
+    <input
+      [formControl]="attributeInputForm"
+      class="form-control"
+      [class.ng-invalid]="isRequired && isUserInputEmpty"
+      maxlength="{{ attribute.maxlength }}"
+      [attr.aria-label]="
+        isUserInputEmpty
+          ? ('configurator.a11y.valueOfAttributeBlank'
+            | cxTranslate
+              : {
+                  attribute: attribute.label
+                })
+          : ('configurator.a11y.valueOfAttributeFull'
+            | cxTranslate
+              : {
+                  value: attribute.userInput,
+                  attribute: attribute.label
+                })
+      "
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
+      [cxFocus]="{
+        key: createAttributeIdForConfigurator(attribute)
+      }"
+    />
+  </ng-container>
 </div>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
index aff7a8fb016..0da10aa7430 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
@@ -8,7 +8,11 @@ import {
 } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { I18nTestingModule } from '@spartacus/core';
+import {
+  FeaturesConfig,
+  FeaturesConfigModule,
+  I18nTestingModule,
+} from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
 import { Configurator } from '../../../../core/model/configurator.model';
@@ -46,7 +50,7 @@ describe('ConfigAttributeInputFieldComponent', () => {
           ConfiguratorAttributeInputFieldComponent,
           MockFocusDirective,
         ],
-        imports: [ReactiveFormsModule, I18nTestingModule],
+        imports: [ReactiveFormsModule, I18nTestingModule, FeaturesConfigModule],
         providers: [
           {
             provide: ConfiguratorUISettingsConfig,
@@ -60,6 +64,12 @@ describe('ConfigAttributeInputFieldComponent', () => {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
           },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '*' },
+            },
+          },
         ],
       })
         .overrideComponent(ConfiguratorAttributeInputFieldComponent, {
@@ -118,6 +128,10 @@ describe('ConfigAttributeInputFieldComponent', () => {
     expect(styleClasses).toContain('ng-invalid');
   });
 
+  it('should not consider empty required input field as invalid, despite that it will be marked as error on the UI, so that engine is still called', () => {
+    expect(component.attributeInputForm.valid).toBe(true);
+  });
+
   it('should set form as touched on init', () => {
     expect(component.attributeInputForm.touched).toEqual(true);
   });
@@ -277,4 +291,21 @@ describe('ConfigAttributeInputFieldComponent', () => {
       expect(component.isRequired).toBe(false);
     });
   });
+
+  describe('isUserInputEmpty', () => {
+    it('should return false if a value is present', () => {
+      component.attribute.userInput = 'abc';
+      expect(component.isUserInputEmpty).toBe(false);
+    });
+
+    it('should return true if the user input only contains blanks', () => {
+      component.attribute.userInput = '  ';
+      expect(component.isUserInputEmpty).toBe(true);
+    });
+
+    it('should return true if there is no user input', () => {
+      component.attribute.userInput = undefined;
+      expect(component.isUserInputEmpty).toBe(true);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
index 0dcb84679f5..324aeadf271 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
@@ -98,6 +98,16 @@ export class ConfiguratorAttributeInputFieldComponent
     }
   }
 
+  /**
+   * Verifies if the user input has a non-blank value.
+   * @returns {boolean} - 'True' if the user input is undefined, empty or contains only blanks, otherwise 'false'.
+   */
+  get isUserInputEmpty(): boolean {
+    return (
+      !this.attribute.userInput || this.attribute.userInput.trim().length === 0
+    );
+  }
+
   /**
    * Checks if the component needs to be marked as required.
    * This is never the case if it is used as sub component for an attribute type which allows an additional value
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.module.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.module.ts
index f5d6b6998f9..e2aeb60d4d5 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.module.ts
@@ -7,7 +7,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { KeyboardFocusModule } from '@spartacus/storefront';
 import { ConfiguratorAttributeCompositionConfig } from '../../composition/configurator-attribute-composition.config';
 import { ConfiguratorAttributeInputFieldComponent } from './configurator-attribute-input-field.component';
@@ -19,6 +23,7 @@ import { ConfiguratorAttributeInputFieldComponent } from './configurator-attribu
     ReactiveFormsModule,
     CommonModule,
     I18nModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<ConfiguratorAttributeCompositionConfig>{
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
index b4e3306db01..f6fc0f0867f 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
@@ -2,26 +2,50 @@
   this.getHelpTextForInterval()
 }}</label>
 <div id="{{ createAttributeIdForConfigurator(attribute) }}" class="form-group">
-  <input
-    [formControl]="attributeInputForm"
-    [required]="isRequired"
-    class="form-control"
-    [attr.aria-describedby]="
-      mustDisplayValidationMessage()
-        ? createAttributeUiKey('label', attribute.name) +
-          ' ' +
-          createAttributeUiKey('attribute-msg', attribute.name)
-        : createAttributeUiKey('label', attribute.name)
-    "
-    attr.role="{{ attribute.dataType }}"
-    attr.required="{{ attribute.required }}"
-    (change)="onChange()"
-    maxlength="{{ attribute.maxlength }}"
-    [attr.aria-label]="getAriaLabelComplete()"
-    [cxFocus]="{
-      key: createAttributeIdForConfigurator(attribute)
-    }"
-  />
+  <ng-container *cxFeatureLevel="'!6.2'">
+    <input
+      [formControl]="attributeInputForm"
+      [required]="isRequired"
+      class="form-control"
+      [attr.aria-describedby]="
+        mustDisplayValidationMessage()
+          ? createAttributeUiKey('label', attribute.name) +
+            ' ' +
+            createAttributeUiKey('attribute-msg', attribute.name)
+          : createAttributeUiKey('label', attribute.name)
+      "
+      attr.role="{{ attribute.dataType }}"
+      attr.required="{{ attribute.required }}"
+      (change)="onChange()"
+      maxlength="{{ attribute.maxlength }}"
+      [attr.aria-label]="getAriaLabelComplete()"
+      [cxFocus]="{
+        key: createAttributeIdForConfigurator(attribute)
+      }"
+    />
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.2'">
+    <input
+      [formControl]="attributeInputForm"
+      [class.ng-invalid]="isRequired && isUserInputEmpty"
+      class="form-control"
+      [attr.aria-describedby]="
+        mustDisplayValidationMessage()
+          ? createAttributeUiKey('label', attribute.name) +
+            ' ' +
+            createAttributeUiKey('attribute-msg', attribute.name)
+          : createAttributeUiKey('label', attribute.name)
+      "
+      attr.role="{{ attribute.dataType }}"
+      attr.required="{{ attribute.required }}"
+      (change)="onChange()"
+      maxlength="{{ attribute.maxlength }}"
+      [attr.aria-label]="getAriaLabelComplete()"
+      [cxFocus]="{
+        key: createAttributeIdForConfigurator(attribute)
+      }"
+    />
+  </ng-container>
 </div>
 <div
   class="cx-validation-msg"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
index 7d3eefcac86..8765820743e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
@@ -274,7 +274,7 @@ export class ConfiguratorAttributeNumericInputFieldService {
     negativeAllowed: boolean
   ): ValidatorFn {
     return (control: AbstractControl): { [key: string]: any } | null => {
-      const input: string = control.value;
+      const input = control.value?.trim();
       if (input) {
         return this.getValidationErrorsNumericFormat(
           input,
@@ -348,7 +348,7 @@ export class ConfiguratorAttributeNumericInputFieldService {
     currentValue?: string
   ): ValidatorFn {
     return (control: AbstractControl): { [key: string]: any } | null => {
-      const input: string = control.value;
+      const input = control.value?.trim();
       if (
         input &&
         input !== currentValue && //this is to ensure that selected interval consisting of only one value will not lead to a validation error
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
index 0ef5f96c9f1..60e81588aa1 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
@@ -14,23 +14,24 @@ import {
 import { ReactiveFormsModule } from '@angular/forms';
 import {
   FeatureConfigService,
+  FeaturesConfigModule,
   I18nTestingModule,
   LanguageService,
 } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { of } from 'rxjs';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
+import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { Configurator } from '../../../../core/model/configurator.model';
+import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
 import { ConfiguratorUISettingsConfig } from '../../../config/configurator-ui-settings.config';
 import { defaultConfiguratorUISettingsConfig } from '../../../config/default-configurator-ui-settings.config';
+import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorAttributeNumericInputFieldComponent } from './configurator-attribute-numeric-input-field.component';
 import {
   ConfiguratorAttributeNumericInputFieldService,
   ConfiguratorAttributeNumericInterval,
 } from './configurator-attribute-numeric-input-field.component.service';
-import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
-import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
-import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 
 @Directive({
   selector: '[cxFocus]',
@@ -139,7 +140,7 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
           MockFocusDirective,
           MockCxIconComponent,
         ],
-        imports: [ReactiveFormsModule, I18nTestingModule],
+        imports: [ReactiveFormsModule, I18nTestingModule, FeaturesConfigModule],
         providers: [
           { provide: LanguageService, useValue: mockLanguageService },
           {
@@ -225,6 +226,12 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
     expect(component).toBeTruthy();
   });
 
+  it('should not consider empty required input field as invalid, despite that it will be marked as error on the UI, so that engine is still called', () => {
+    component.attribute.required = true;
+    fixture.detectChanges();
+    expect(component.attributeInputForm.valid).toBe(true);
+  });
+
   describe('ngOnInit', () => {
     const attributeEmpty: Configurator.Attribute = {
       name: 'Required',
@@ -451,6 +458,7 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
       component.attribute.userInput = '123';
       fixture.detectChanges();
       component.ngOnInit();
+      htmlElem = fixture.debugElement.nativeElement;
       tick(DEBOUNCE_TIME);
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.module.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.module.ts
index 61083da75af..d1e25b9e80b 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.module.ts
@@ -7,7 +7,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule, KeyboardFocusModule } from '@spartacus/storefront';
 import { ConfiguratorAttributeCompositionConfig } from '../../composition/configurator-attribute-composition.config';
 import { ConfiguratorAttributeNumericInputFieldComponent } from './configurator-attribute-numeric-input-field.component';
@@ -20,6 +24,7 @@ import { ConfiguratorAttributeNumericInputFieldComponent } from './configurator-
     CommonModule,
     I18nModule,
     IconModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<ConfiguratorAttributeCompositionConfig>{

From b0d0aa4b0c3c9cf77e53c600d2cc41e8d9937e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Wed, 14 Jun 2023 21:34:17 +0200
Subject: [PATCH 034/122] feat: CXSPA-2251 Contextual logs in SSR (#17512)

It's an end to the chaos of interlaced messages in Kibrana/OpenSearch, coming from multiple parallel server-side-renderings and NodeJS pods. Gone are the days of sifting through a disorganized mess with no additional context or structure in your messages. In the past, identifying the origin of a log/warn/error could be a blind guessing game, relying on approximate timestamps and frustrating trial and error. And no more unreadable error stacktraces splitted each line into a separate log entry in Kibana/OpenSearch.

With this new feature, your logs are now well structured, presented in JSON format with clear message and context fields including the request url, request uuid (randomly generated for each request) and request timeReceived. Kibana/OpenSearch intelligently interprets these fields and presents them in separate columns, enabling effortless filtering and searching. And that's not all! Multi-line error stacktraces are now elegantly consolidated into a single line log entries, streamlining your troubleshooting process.

Recommendation for customers: How to enable the feature:

enable logger: true in SsrOptimizationOptions in your server.ts
import ErrorHandlingModule.forRoot() in your app (e.g. app.module.ts)
Architectural details:

Introduced LoggerService to replace the global console object.
Replaced almost all uses of console object in our libraries with the LoggerService wrapper.
In the browser, LoggerService works just like console - under the hood it forwards its arguments to the global console object
In SSR (ExpressJS), LoggerService is over-provided by ExpressLoggerService, which adds context of an Express request to the message. Instead of forwarding it to the console, it passes the log to a concrete logger, which can be injected from the ExpressJS app via the injection token EXPRESS_SERVER_LOGGER
OptimizedSsrEngine provides a concrete logger via the injection token EXPRESS_SERVER_LOGGER
For backward-compatibility, by default the LegacyExpressServerLogger is provided, which logs messages as before: via console and as a plain string without any additional context
When customer explicitly passes the option logger: true of SsrOptimizationOptions, it instructs the OptimizedSsrEngine to provide the DefaultExpressServerLogger (which will be a real default since a new major release) that forwards logs as a structured JSON to the console and moreover adds a useful context of the current Express request to the JSON log.
alternatively, customers can pass to the property logger of SsrOptimizationOptions any custom concrete logger class (matching the interface ExpressServerLogger). So they can enrich the context of the logger to match their needs (e.g. attach a value of some http header to each log). Moreover, the option to configure a custom logger class also allows to forward logs to some 3rd party logger library (e.g. Pino or Winston) instead of the console object.
Customers have to import ErrorHandlingModule.forRoot() manually (until next major release):

For backward-comparibility, in this minor release by default, all unhandled exceptions in your Angular SSR app are still logged as a plain string without any additional context. Why: Customers might have already provided a custom ErrorHandler in their apps to handle errors. We would like to provide our custom Angular Errorhandler that would forward error messages to our LoggerService. But this could potentially over-provide custom ErrorHandler already provided by customers, which would be a breaking change. So we plan to provide our custom ErrorHandler only in a future major release.
To enable a rich JSON context for error messages, customers need to import manually our new ErrorHandlingModule.forRoot() from @spartacus/core in the app (which under the hood provides our custom `ErrorHandler). This requires a deliberate manual import from customers, so it's not a breaking change.
In a future major release, ErrorHandlingModule.forRoot() will be imported by default as part of our core module BaseCoreModule, so customers no longer will need to import it separately manually.

closes CXSPA-2251

Co-authored-by: Krzysztof Platis <platonn.git@gmail.com>
---
 .eslintrc.json                                |   3 +-
 .../ng-express-engine-decorator.spec.ts       |  32 ++++-
 core-libs/setup/ssr/logger/index.ts           |   8 ++
 .../default-express-server-logger.spec.ts     | 113 ++++++++++++++++
 .../loggers/default-express-server-logger.ts  |  68 ++++++++++
 .../logger/loggers/express-server-logger.ts   |  25 ++++
 core-libs/setup/ssr/logger/loggers/index.ts   |   9 ++
 .../loggers/legacy-server-logger.spec.ts      |  49 +++++++
 .../logger/loggers/legacy-server-logger.ts    |  41 ++++++
 .../services/express-logger.service.spec.ts   |  85 ++++++++++++
 .../logger/services/express-logger.service.ts |  55 ++++++++
 core-libs/setup/ssr/logger/services/index.ts  |   9 ++
 .../prerendering-logger.service.spec.ts       |  57 +++++++++
 .../services/prerendering-logger.service.ts   |  34 +++++
 .../server-logger-service-factory.spec.ts     |  51 ++++++++
 .../services/server-logger-service-factory.ts |  17 +++
 .../optimized-ssr-engine.spec.ts              | 115 ++++++++++++++---
 .../optimized-engine/optimized-ssr-engine.ts  | 121 +++++++++++++++---
 .../ssr-optimization-options.ts               |  17 +++
 .../setup/ssr/providers/ssr-providers.ts      |  12 +-
 core-libs/setup/ssr/public_api.ts             |   1 +
 .../asm/core/store/effects/customer.effect.ts |  14 +-
 .../asm/occ/adapters/occ-asm.adapter.ts       |  25 +++-
 .../product-import-info.service.spec.ts       |   7 +-
 .../services/product-import-info.service.ts   |   6 +-
 .../core/store/effects/cart-entry.effect.ts   |  15 ++-
 .../core/store/effects/cart-voucher.effect.ts |  11 +-
 .../base/core/store/effects/cart.effect.ts    |  21 +--
 .../adapters/occ-cart-validation.adapter.ts   |  11 +-
 .../quick-order-order-entries.context.spec.ts |   8 +-
 .../quick-order-order-entries.context.ts      |  27 ++--
 .../core/store/effects/saved-cart.effect.ts   |  17 ++-
 .../core/store/effects/wish-list.effect.ts    |  21 +--
 .../checkout-b2b-steps-set.guard.spec.ts      |   7 +-
 .../guards/checkout-b2b-steps-set.guard.ts    |  10 +-
 .../occ-checkout-cost-center.adapter.ts       |   9 +-
 .../occ-checkout-payment-type.adapter.ts      |  25 ++--
 .../guards/checkout-steps-set.guard.ts        |   7 +-
 .../occ-checkout-delivery-address.adapter.ts  |  25 ++--
 .../occ-checkout-delivery-modes.adapter.ts    |  17 ++-
 .../adapters/occ-checkout-payment.adapter.ts  |  35 +++--
 .../base/occ/adapters/occ-checkout.adapter.ts |  15 ++-
 .../occ-customer-ticketing.adapter.ts         |  39 ++++--
 .../effects/consignment-tracking.effect.ts    |   8 +-
 .../store/effects/order-details.effect.ts     |  17 ++-
 .../effects/order-return-request.effect.ts    |  14 +-
 .../order/core/store/effects/orders.effect.ts |  16 ++-
 .../replenishment-order-details.effect.ts     |   9 +-
 .../effects/replenishment-orders.effect.ts    |   8 +-
 .../order/occ/adapters/occ-order.adapter.ts   |  19 ++-
 .../occ/adapters/occ-reorder-order.adapter.ts |  11 +-
 ...c-scheduled-replenishment-order.adapter.ts |  15 ++-
 .../adapters/occ-account-summary.adapter.ts   |  15 ++-
 .../core/store/effects/b2b-user.effect.ts     |  37 +++---
 .../core/store/effects/budget.effect.ts       |  21 ++-
 .../core/store/effects/cost-center.effect.ts  |  23 ++--
 .../core/store/effects/org-unit.effect.ts     |  39 +++---
 .../core/store/effects/permission.effect.ts   |  19 +--
 .../core/store/effects/user-group.effect.ts   |  33 ++---
 .../store/effects/order-approval.effect.ts    |  15 ++-
 .../core/store/effects/unit-order.effect.ts   |  14 +-
 .../adapters/occ-user-registration.adapter.ts |  13 +-
 .../store/effects/pickup-location.effect.ts   |   8 +-
 .../core/store/effects/stock.effect.ts        |  12 +-
 .../adapters/occ-pickup-location.adapter.ts   |  11 +-
 .../occ/adapters/occ-stock.adapter.ts         |  17 ++-
 ...igurator-cart-entry-bundle-info.service.ts |   7 +-
 ...gurator-attribute-composition.directive.ts |   6 +-
 ...configurator-attribute-header.component.ts |   8 +-
 ...rator-attribute-checkbox-list.component.ts |  10 +-
 ...attribute-numeric-input-field.component.ts |  17 ++-
 ...ator-attribute-read-only.component.spec.ts |   5 +-
 .../configurator-storefront-utils.service.ts  |   8 +-
 .../facade/configurator-commons.service.ts    |  11 +-
 .../effects/configurator-basic.effect.ts      |  22 ++--
 .../state/effects/configurator-cart.effect.ts |  16 ++-
 .../effects/configurator-variant.effect.ts    |   8 +-
 ...q-configurator-normalizer-utils.service.ts |   7 +-
 .../rest/cpq-configurator-endpoint.service.ts |   8 +-
 .../effects/configurator-textfield.effect.ts  |  16 ++-
 .../occ/adapters/occ-future-stock.adapter.ts  |  19 ++-
 .../qualtrics-loader.service.ts               |   7 +-
 .../qualtrics-loader/qualtrics.component.ts   |   7 +-
 .../service/google-map-renderer.service.ts    |   8 +-
 .../core/store/effects/find-stores.effect.ts  |  12 +-
 .../store/effects/view-all-stores.effect.ts   |  12 +-
 .../personalization-context.service.ts        |  13 +-
 .../occ-personalization-id.interceptor.ts     |   8 +-
 .../occ-personalization-time.interceptor.ts   |   8 +-
 .../tracking/tms/core/services/tms.service.ts |  21 ++-
 .../occ/adapters/occ-user-account.adapter.ts  |   7 +-
 .../occ/adapters/occ-user-profile.adapter.ts  |  51 ++++++--
 .../store/effects/cdc-user-token.effect.ts    |   7 +-
 .../services/profiletag-event.service.ts      |  21 ++-
 .../paged-list/paged-list.component.spec.ts   |  11 +-
 .../paged-list/paged-list.component.ts        |   8 +-
 .../adapters/storage-v1/storage-v1.adapter.ts |  16 ++-
 .../visualization-v1.adapter.ts               |  14 +-
 .../generate-translations-properties-2-ts.ts  |   1 +
 .../assets/generate-translations-ts-2-json.ts |   2 +
 .../generate-translations-ts-2-properties.ts  |   1 +
 projects/core/public_api.ts                   |  22 ++--
 .../effects/anonymous-consents.effect.ts      |  12 +-
 .../store/effects/client-token.effect.ts      |   7 +-
 projects/core/src/base-core.module.ts         |   3 +
 .../cms/store/effects/components.effect.ts    |   9 +-
 .../effects/navigation-entry-item.effect.ts   |   7 +-
 .../core/src/cms/store/effects/page.effect.ts |   7 +-
 .../config-initializer.service.spec.ts        |  22 +++-
 .../config-initializer.service.ts             |   9 +-
 .../config-validator.module.ts                |  10 +-
 .../config-validator/config-validator.spec.ts |  21 +--
 .../config-validator/config-validator.ts      |   8 +-
 .../src/error-handling/cx-error-handler.ts    |  17 +++
 .../error-handling/error-handling.module.ts   |  23 ++++
 projects/core/src/error-handling/index.ts     |   8 ++
 projects/core/src/event/event.service.ts      |  16 ++-
 .../unknown-error/unknown-error.handler.ts    |  11 +-
 .../http-timeout.interceptor.spec.ts          |  13 +-
 .../http-timeout/http-timeout.interceptor.ts  |   9 +-
 projects/core/src/i18n/date.pipe.ts           |   7 +-
 .../src/i18n/i18next/i18next-initializer.ts   |   9 +-
 .../i18next-logger-plugin.spec.ts             |  46 +++++++
 .../i18next-plugins/i18next-logger-plugin.ts  |  40 ++++++
 .../i18next/i18next-translation.service.ts    |   7 +-
 projects/core/src/i18n/numeric.pipe.ts        |   7 +-
 projects/core/src/i18n/translate.pipe.spec.ts |  28 ++--
 projects/core/src/i18n/translate.pipe.ts      |   6 +-
 .../i18n/translation-chunk.service.spec.ts    |  55 ++++----
 .../src/i18n/translation-chunk.service.ts     |   8 +-
 .../src/lazy-loading/lazy-loading.module.ts   |   8 +-
 .../src/lazy-loading/lazy-modules.service.ts  |  14 +-
 projects/core/src/logger/index.ts             |   7 +
 .../core/src/logger/logger.service.spec.ts    |  37 ++++++
 projects/core/src/logger/logger.service.ts    |  39 ++++++
 .../src/occ/services/occ-endpoints.service.ts |   7 +-
 .../store/effects/product-search.effect.ts    |   9 +-
 .../product/store/effects/product.effect.ts   |   9 +-
 .../configurable-routes.service.ts            |  13 +-
 .../routing-config.service.ts                 |   9 +-
 .../services/site-context-params.service.ts   |  11 +-
 .../store/effects/base-site.effect.ts         |  11 +-
 .../store/effects/currencies.effect.ts        |   7 +-
 .../store/effects/languages.effect.ts         |   7 +-
 .../processes-loader.reducer.ts               |   1 +
 .../store/effects/billing-countries.effect.ts |   7 +-
 .../store/effects/customer-coupon.effect.ts   |  13 +-
 .../effects/delivery-countries.effect.ts      |   7 +-
 .../effects/notification-preference.effect.ts |   9 +-
 .../store/effects/payment-methods.effect.ts   |  15 ++-
 .../store/effects/product-interests.effect.ts |  11 +-
 .../src/user/store/effects/regions.effect.ts  |  11 +-
 .../store/effects/user-addresses.effect.ts    |  17 ++-
 .../store/effects/user-consents.effect.ts     |  17 ++-
 .../store/effects/user-cost-center.effect.ts  |   7 +-
 .../java-reg-exp-converter.spec.ts            |  13 +-
 .../java-reg-exp-converter.ts                 |   7 +-
 .../src/util/normalize-http-error.spec.ts     |  26 ++++
 .../core/src/util/normalize-http-error.ts     |  13 +-
 projects/schematics/.eslintrc.json            |  10 +-
 projects/storefrontapp/server.ts              |   8 +-
 projects/storefrontapp/src/app/app.module.ts  |   4 +-
 .../spartacus/spartacus-features.module.ts    |   4 +-
 projects/storefrontapp/src/main.ts            |   5 +
 .../component-handler.service.spec.ts         |   5 +-
 .../services/component-handler.service.ts     |  11 +-
 .../page/page-layout/page-layout.service.ts   |  12 +-
 .../services/cms-components.service.ts        |   6 +-
 .../services/inline-render.strategy.ts        |  10 +-
 .../services/launch-dialog.service.ts         |   9 +-
 .../carousel/carousel.component.spec.ts       |   7 +-
 .../components/carousel/carousel.component.ts |   6 +-
 .../components/table/table.service.spec.ts    |   7 +-
 .../shared/components/table/table.service.ts  |   7 +-
 174 files changed, 2364 insertions(+), 647 deletions(-)
 create mode 100644 core-libs/setup/ssr/logger/index.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/express-server-logger.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/index.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts
 create mode 100644 core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts
 create mode 100644 core-libs/setup/ssr/logger/services/express-logger.service.spec.ts
 create mode 100644 core-libs/setup/ssr/logger/services/express-logger.service.ts
 create mode 100644 core-libs/setup/ssr/logger/services/index.ts
 create mode 100644 core-libs/setup/ssr/logger/services/prerendering-logger.service.spec.ts
 create mode 100644 core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
 create mode 100644 core-libs/setup/ssr/logger/services/server-logger-service-factory.spec.ts
 create mode 100644 core-libs/setup/ssr/logger/services/server-logger-service-factory.ts
 create mode 100644 projects/core/src/error-handling/cx-error-handler.ts
 create mode 100644 projects/core/src/error-handling/error-handling.module.ts
 create mode 100644 projects/core/src/error-handling/index.ts
 create mode 100644 projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
 create mode 100644 projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.ts
 create mode 100644 projects/core/src/logger/index.ts
 create mode 100644 projects/core/src/logger/logger.service.spec.ts
 create mode 100644 projects/core/src/logger/logger.service.ts

diff --git a/.eslintrc.json b/.eslintrc.json
index b4018eca7cc..80159ca4656 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -93,7 +93,8 @@
               }
             ]
           }
-        ]
+        ],
+        "no-console": "error"
       }
     },
     {
diff --git a/core-libs/setup/ssr/engine-decorator/ng-express-engine-decorator.spec.ts b/core-libs/setup/ssr/engine-decorator/ng-express-engine-decorator.spec.ts
index 1542a6a0b4e..ac2cb1281a1 100644
--- a/core-libs/setup/ssr/engine-decorator/ng-express-engine-decorator.spec.ts
+++ b/core-libs/setup/ssr/engine-decorator/ng-express-engine-decorator.spec.ts
@@ -1,16 +1,19 @@
 import { NgSetupOptions, RenderOptions } from '@nguniversal/express-engine';
 import { SERVER_REQUEST_URL } from '@spartacus/core';
+import { EXPRESS_SERVER_LOGGER, LegacyExpressServerLogger } from '../logger';
 import {
-  decorateExpressEngine,
   NgExpressEngine,
   NgExpressEngineDecorator,
   NgExpressEngineInstance,
+  decorateExpressEngine,
 } from './ng-express-engine-decorator';
 
 jest.mock('fs', () => ({
   readFileSync: () => '',
 }));
 
+jest.spyOn(console, 'log').mockImplementation(() => {});
+
 describe('NgExpressEngineDecorator', () => {
   describe('get', () => {
     let originalEngine: NgExpressEngine;
@@ -100,9 +103,10 @@ describe('decorateExpressEngine', () => {
         get: jest.fn(() => 'site.com'),
         app,
         connection: {},
-      },
-      res: <Partial<Response>>{
-        set: jest.fn(() => {}),
+        res: <Partial<Response>>{
+          set: jest.fn(() => {}),
+          locals: {},
+        },
       },
     } as any;
 
@@ -184,7 +188,15 @@ describe('decorateExpressEngine', () => {
     it(`should pass parameters to the original engine instance`, () => {
       expect(originalEngineInstance).toHaveBeenCalledWith(
         mockPath,
-        mockOptions,
+        {
+          ...mockOptions,
+          providers: [
+            {
+              provide: EXPRESS_SERVER_LOGGER,
+              useValue: new LegacyExpressServerLogger(),
+            },
+          ],
+        },
         expect.any(Function)
       );
     });
@@ -252,7 +264,15 @@ describe('decorateExpressEngine', () => {
     it(`should pass parameters to the original engine instance`, () => {
       expect(originalEngineInstance).toHaveBeenCalledWith(
         mockPath,
-        mockOptions,
+        {
+          ...mockOptions,
+          providers: [
+            {
+              provide: EXPRESS_SERVER_LOGGER,
+              useValue: new LegacyExpressServerLogger(),
+            },
+          ],
+        },
         expect.any(Function)
       );
     });
diff --git a/core-libs/setup/ssr/logger/index.ts b/core-libs/setup/ssr/logger/index.ts
new file mode 100644
index 00000000000..025449a0835
--- /dev/null
+++ b/core-libs/setup/ssr/logger/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './loggers';
+export * from './services';
diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
new file mode 100644
index 00000000000..b81197b9e1c
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
@@ -0,0 +1,113 @@
+import { Request } from 'express';
+import { DefaultExpressServerLogger } from './default-express-server-logger';
+import { ExpressServerLoggerContext } from './express-server-logger';
+
+describe('DefaultExpressServerLogger', () => {
+  let logger: DefaultExpressServerLogger;
+
+  beforeEach(() => {
+    logger = new DefaultExpressServerLogger();
+    jest.useFakeTimers().setSystemTime(new Date('2023-05-26'));
+  });
+
+  describe('logging', () => {
+    it('should be defined', () => {
+      expect(logger).toBeDefined();
+    });
+
+    it('should log message', () => {
+      const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
+
+      logger.log('test', { request: {} as Request });
+
+      expect(logSpy).toHaveBeenCalledWith(
+        logger['createLogMessage']('test', { request: {} as Request })
+      );
+    });
+
+    it('should warn message', () => {
+      const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+      logger.warn('test', { request: {} as Request });
+
+      expect(warnSpy).toHaveBeenCalledWith(
+        logger['createLogMessage']('test', { request: {} as Request })
+      );
+    });
+
+    it('should error message', () => {
+      const errorSpy = jest
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+
+      logger.error('test', { request: {} as Request });
+
+      expect(errorSpy).toHaveBeenCalledWith(
+        logger['createLogMessage']('test', { request: {} as Request })
+      );
+    });
+
+    it('should info message', () => {
+      const infoSpy = jest.spyOn(console, 'info').mockImplementation(() => {});
+
+      logger.info('test', { request: {} as Request });
+
+      expect(infoSpy).toHaveBeenCalledWith(
+        logger['createLogMessage']('test', { request: {} as Request })
+      );
+    });
+
+    it('should debug message', () => {
+      const debugSpy = jest
+        .spyOn(console, 'debug')
+        .mockImplementation(() => {});
+
+      logger.debug('test', { request: {} as Request });
+
+      expect(debugSpy).toHaveBeenCalledWith(
+        logger['createLogMessage']('test', { request: {} as Request })
+      );
+    });
+  });
+
+  describe('create log message', () => {
+    it('should return message without request', () => {
+      const logMessage = logger['createLogMessage'](
+        'test',
+        {} as ExpressServerLoggerContext
+      );
+
+      expect(logMessage).not.toContain('request');
+    });
+
+    it('should return message with request', () => {
+      const logMessage = logger['createLogMessage']('test', {
+        request: {} as Request,
+      });
+
+      expect(logMessage).toContain('request');
+    });
+  });
+
+  describe('map request', () => {
+    it('should return mapped request', () => {
+      const request = {
+        originalUrl: 'test',
+        res: {
+          locals: {
+            cx: {
+              request: { uuid: 'test', timeReceived: new Date() },
+            },
+          },
+        },
+      } as any;
+
+      const mappedRequest = logger['mapRequest'](request);
+
+      expect(mappedRequest).toEqual({
+        url: 'test',
+        ...request.res.locals.cx.request,
+      });
+    });
+  });
+});
diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
new file mode 100644
index 00000000000..ce6359d8e87
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Request } from 'express';
+import {
+  ExpressServerLogger,
+  ExpressServerLoggerContext,
+} from './express-server-logger';
+
+/**
+ *
+ * Default logger used in SSR (ExpressJS) to enhance logs visible e.g. in monitoring tools e.g. Kibana.
+ * It outputs a JSON with properties "message" and "context",
+ * which contains a "timestamp" and details of the "request" ("url", "uuid", "timeReceived")
+ */
+export class DefaultExpressServerLogger implements ExpressServerLogger {
+  log(message: string, context: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.log(this.createLogMessage(message, context));
+  }
+  warn(message: string, context: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.warn(this.createLogMessage(message, context));
+  }
+  error(message: string, context: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.error(this.createLogMessage(message, context));
+  }
+  info(message: string, context: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.info(this.createLogMessage(message, context));
+  }
+  debug(message: string, context: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.debug(this.createLogMessage(message, context));
+  }
+
+  protected createLogMessage(
+    message: string,
+    context: ExpressServerLoggerContext
+  ): string {
+    const timestamp = new Date().toISOString();
+    const object = {
+      message,
+      context: {
+        timestamp,
+        ...context,
+      },
+    };
+    if (context.request) {
+      Object.assign(object.context, {
+        request: this.mapRequest(context.request),
+      });
+    }
+
+    return JSON.stringify(object);
+  }
+
+  protected mapRequest(request: Request): Record<string, any> {
+    return {
+      url: request.originalUrl,
+      ...request.res?.locals.cx.request,
+    };
+  }
+}
diff --git a/core-libs/setup/ssr/logger/loggers/express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
new file mode 100644
index 00000000000..2c59386308c
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { InjectionToken } from '@angular/core';
+import { Request } from 'express';
+
+export interface ExpressServerLoggerContext {
+  request: Request;
+  [_key: string]: any;
+}
+
+export interface ExpressServerLogger {
+  log(message: string, context: ExpressServerLoggerContext): void;
+  warn(message: string, context: ExpressServerLoggerContext): void;
+  error(message: string, context: ExpressServerLoggerContext): void;
+  info(message: string, context: ExpressServerLoggerContext): void;
+  debug(message: string, context: ExpressServerLoggerContext): void;
+}
+
+export const EXPRESS_SERVER_LOGGER = new InjectionToken<ExpressServerLogger>(
+  'EXPRESS_SERVER_LOGGER'
+);
diff --git a/core-libs/setup/ssr/logger/loggers/index.ts b/core-libs/setup/ssr/logger/loggers/index.ts
new file mode 100644
index 00000000000..eb6e18dfe33
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './default-express-server-logger';
+export * from './express-server-logger';
+export * from './legacy-server-logger';
diff --git a/core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts b/core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts
new file mode 100644
index 00000000000..adcfe6b876e
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts
@@ -0,0 +1,49 @@
+import { LegacyExpressServerLogger } from './legacy-server-logger';
+
+describe('LegacyExpressServerLogger', () => {
+  const logger = new LegacyExpressServerLogger();
+
+  describe('log', () => {
+    const message = 'test';
+
+    it('should log message', () => {
+      const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
+
+      logger.log(message);
+
+      expect(logSpy).toHaveBeenCalledWith(message);
+    });
+    it('should warn message', () => {
+      const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+      logger.warn(message);
+
+      expect(warnSpy).toHaveBeenCalledWith(message);
+    });
+    it('should error message', () => {
+      const errorSpy = jest
+        .spyOn(console, 'error')
+        .mockImplementation(() => {});
+
+      logger.error(message);
+
+      expect(errorSpy).toHaveBeenCalledWith(message);
+    });
+    it('should info message', () => {
+      const infoSpy = jest.spyOn(console, 'info').mockImplementation(() => {});
+
+      logger.info(message);
+
+      expect(infoSpy).toHaveBeenCalledWith(message);
+    });
+    it('should debug message', () => {
+      const debugSpy = jest
+        .spyOn(console, 'debug')
+        .mockImplementation(() => {});
+
+      logger.debug(message);
+
+      expect(debugSpy).toHaveBeenCalledWith(message);
+    });
+  });
+});
diff --git a/core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts b/core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts
new file mode 100644
index 00000000000..4afc3c5f7a8
--- /dev/null
+++ b/core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  ExpressServerLogger,
+  ExpressServerLoggerContext,
+} from './express-server-logger';
+
+/**
+ * @deprecated since 6.2, will be removed in a new major version, as contextual logging will be enabled by default.
+ * Default implementation of `ExpressServerLogger` that just delegates log messages to the native `console` object without providing any context.
+ * It's used when contextual logging is disabled.
+ *
+ *
+ */
+//CXSPA-3680 - remove this class in 7.0
+export class LegacyExpressServerLogger implements ExpressServerLogger {
+  log(message: string, _context?: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.log(message);
+  }
+  warn(message: string, _context?: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.warn(message);
+  }
+  error(message: string, _context?: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.error(message);
+  }
+  info(message: string, _context?: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.info(message);
+  }
+  debug(message: string, _context?: ExpressServerLoggerContext): void {
+    /* eslint-disable-next-line no-console */
+    console.debug(message);
+  }
+}
diff --git a/core-libs/setup/ssr/logger/services/express-logger.service.spec.ts b/core-libs/setup/ssr/logger/services/express-logger.service.spec.ts
new file mode 100644
index 00000000000..0b5de4c6b76
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/express-logger.service.spec.ts
@@ -0,0 +1,85 @@
+import { TestBed } from '@angular/core/testing';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { Request } from 'express';
+import { EXPRESS_SERVER_LOGGER, ExpressServerLogger } from '../loggers';
+import { ExpressLoggerService } from './express-logger.service';
+
+const mockRequest: Partial<Request> = { url: 'test/url' };
+
+class MockServerLogger implements ExpressServerLogger {
+  log = jest.fn();
+  warn = jest.fn();
+  error = jest.fn();
+  info = jest.fn();
+  debug = jest.fn();
+}
+
+describe('ExpressLoggerService', () => {
+  let request: Request;
+  let logger: ExpressServerLogger;
+  let loggerService: ExpressLoggerService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ExpressLoggerService,
+        { provide: REQUEST, useValue: mockRequest },
+        { provide: EXPRESS_SERVER_LOGGER, useClass: MockServerLogger },
+      ],
+    });
+
+    request = TestBed.inject(REQUEST);
+    logger = TestBed.inject(EXPRESS_SERVER_LOGGER);
+    loggerService = TestBed.inject(ExpressLoggerService);
+  });
+
+  describe('log', () => {
+    it('should log', () => {
+      const log = jest.spyOn(logger, 'log');
+
+      loggerService.log('test');
+
+      expect(log).toHaveBeenCalledWith('test', { request });
+    });
+
+    it('should warn', () => {
+      const warn = jest.spyOn(logger, 'warn');
+
+      loggerService.warn('test');
+
+      expect(warn).toHaveBeenCalledWith('test', { request });
+    });
+
+    it('should error', () => {
+      const error = jest.spyOn(logger, 'error');
+
+      loggerService.error('test');
+
+      expect(error).toHaveBeenCalledWith('test', { request });
+    });
+
+    it('should info', () => {
+      const info = jest.spyOn(logger, 'info');
+
+      loggerService.info('test');
+
+      expect(info).toHaveBeenCalledWith('test', { request });
+    });
+
+    it('should debug', () => {
+      const debug = jest.spyOn(logger, 'debug');
+
+      loggerService.debug('test');
+
+      expect(debug).toHaveBeenCalledWith('test', { request });
+    });
+  });
+
+  describe('formatLogMessage', () => {
+    it('should format log message', () => {
+      const result = loggerService['formatLogMessage']('some %s', 'test');
+
+      expect(result).toEqual('some test');
+    });
+  });
+});
diff --git a/core-libs/setup/ssr/logger/services/express-logger.service.ts b/core-libs/setup/ssr/logger/services/express-logger.service.ts
new file mode 100644
index 00000000000..04fdcc60cff
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/express-logger.service.ts
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable, inject } from '@angular/core';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { LoggerService } from '@spartacus/core';
+import { formatWithOptions } from 'util';
+import { EXPRESS_SERVER_LOGGER } from '../loggers';
+
+@Injectable({ providedIn: 'root' })
+export class ExpressLoggerService implements LoggerService {
+  request = inject(REQUEST);
+  serverLogger = inject(EXPRESS_SERVER_LOGGER);
+
+  log(...args: Parameters<typeof console.log>): void {
+    this.serverLogger.log(this.formatLogMessage(...args), {
+      request: this.request,
+    });
+  }
+  warn(...args: Parameters<typeof console.warn>): void {
+    this.serverLogger.warn(this.formatLogMessage(...args), {
+      request: this.request,
+    });
+  }
+  error(...args: Parameters<typeof console.error>): void {
+    this.serverLogger.error(this.formatLogMessage(...args), {
+      request: this.request,
+    });
+  }
+  info(...args: Parameters<typeof console.info>): void {
+    this.serverLogger.info(this.formatLogMessage(...args), {
+      request: this.request,
+    });
+  }
+  debug(...args: Parameters<typeof console.debug>): void {
+    this.serverLogger.debug(this.formatLogMessage(...args), {
+      request: this.request,
+    });
+  }
+
+  protected formatLogMessage(message?: any, ...optionalParams: any[]): string {
+    /**
+     * built-in util function 'formatWithOptions' was used to not break provided message.
+     * That helps to present logs in moonitoring tools like Kibana in a proper way.
+     */
+    return formatWithOptions(
+      { breakLength: Infinity },
+      message,
+      ...optionalParams
+    );
+  }
+}
diff --git a/core-libs/setup/ssr/logger/services/index.ts b/core-libs/setup/ssr/logger/services/index.ts
new file mode 100644
index 00000000000..90a4c664bb5
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './express-logger.service';
+export * from './prerendering-logger.service';
+export * from './server-logger-service-factory';
diff --git a/core-libs/setup/ssr/logger/services/prerendering-logger.service.spec.ts b/core-libs/setup/ssr/logger/services/prerendering-logger.service.spec.ts
new file mode 100644
index 00000000000..d1b2e1b75f8
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/prerendering-logger.service.spec.ts
@@ -0,0 +1,57 @@
+import { TestBed } from '@angular/core/testing';
+import { ExpressLoggerService } from './express-logger.service';
+import { PrerenderingLoggerService } from './prerendering-logger.service';
+
+describe('PrerenderingLoggerService', () => {
+  let loggerService: PrerenderingLoggerService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [ExpressLoggerService],
+    });
+
+    loggerService = TestBed.inject(PrerenderingLoggerService);
+  });
+
+  describe('log', () => {
+    it('should log', () => {
+      const log = jest.spyOn(console, 'log').mockImplementation(() => {});
+
+      loggerService.log('test');
+
+      expect(log).toHaveBeenCalledWith('test');
+    });
+
+    it('should warn', () => {
+      const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+      loggerService.warn('test');
+
+      expect(warn).toHaveBeenCalledWith('test');
+    });
+
+    it('should error', () => {
+      const error = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+      loggerService.error('test');
+
+      expect(error).toHaveBeenCalledWith('test');
+    });
+
+    it('should info', () => {
+      const info = jest.spyOn(console, 'info').mockImplementation(() => {});
+
+      loggerService.info('test');
+
+      expect(info).toHaveBeenCalledWith('test');
+    });
+
+    it('should debug', () => {
+      const debug = jest.spyOn(console, 'debug').mockImplementation(() => {});
+
+      loggerService.debug('test');
+
+      expect(debug).toHaveBeenCalledWith('test');
+    });
+  });
+});
diff --git a/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts b/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
new file mode 100644
index 00000000000..2f5c6a9f1bc
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PrerenderingLoggerService extends LoggerService {
+  log(...args: Parameters<typeof console.log>): void {
+    /* eslint-disable-next-line no-console */
+    console.log(...args);
+  }
+  warn(...args: Parameters<typeof console.warn>): void {
+    /* eslint-disable-next-line no-console */
+    console.warn(...args);
+  }
+  error(...args: Parameters<typeof console.error>): void {
+    /* eslint-disable-next-line no-console */
+    console.error(...args);
+  }
+  info(...args: Parameters<typeof console.info>): void {
+    /* eslint-disable-next-line no-console */
+    console.info(...args);
+  }
+  debug(...args: Parameters<typeof console.debug>): void {
+    /* eslint-disable-next-line no-console */
+    console.debug(...args);
+  }
+}
diff --git a/core-libs/setup/ssr/logger/services/server-logger-service-factory.spec.ts b/core-libs/setup/ssr/logger/services/server-logger-service-factory.spec.ts
new file mode 100644
index 00000000000..01c32abd4ab
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/server-logger-service-factory.spec.ts
@@ -0,0 +1,51 @@
+import { TestBed } from '@angular/core/testing';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { LoggerService } from '@spartacus/core';
+import { EXPRESS_SERVER_LOGGER, ExpressServerLogger } from '../loggers';
+import { ExpressLoggerService } from './express-logger.service';
+import { PrerenderingLoggerService } from './prerendering-logger.service';
+import { serverLoggerServiceFactory } from './server-logger-service-factory';
+
+class MockExpressServerLogger implements ExpressServerLogger {
+  log = jest.fn();
+  warn = jest.fn();
+  error = jest.fn();
+  info = jest.fn();
+  debug = jest.fn();
+}
+
+describe('serverLoggerServiceFactory', () => {
+  it('should return ExpressLoggerService if REQUEST is available', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: REQUEST, useValue: {} },
+        {
+          provide: EXPRESS_SERVER_LOGGER,
+          useValue: new MockExpressServerLogger(),
+        },
+        {
+          provide: LoggerService,
+          useFactory: serverLoggerServiceFactory,
+        },
+      ],
+    });
+    expect(TestBed.inject(LoggerService)).toBeInstanceOf(ExpressLoggerService);
+  });
+  it('should return PrerenderingLoggerService if REQUEST is not available', () => {
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: EXPRESS_SERVER_LOGGER,
+          useValue: new MockExpressServerLogger(),
+        },
+        {
+          provide: LoggerService,
+          useFactory: serverLoggerServiceFactory,
+        },
+      ],
+    });
+    expect(TestBed.inject(LoggerService)).toBeInstanceOf(
+      PrerenderingLoggerService
+    );
+  });
+});
diff --git a/core-libs/setup/ssr/logger/services/server-logger-service-factory.ts b/core-libs/setup/ssr/logger/services/server-logger-service-factory.ts
new file mode 100644
index 00000000000..8e68364ef08
--- /dev/null
+++ b/core-libs/setup/ssr/logger/services/server-logger-service-factory.ts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { inject } from '@angular/core';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { ExpressLoggerService } from './express-logger.service';
+import { PrerenderingLoggerService } from './prerendering-logger.service';
+
+export const serverLoggerServiceFactory = () => {
+  const isExpress = inject(REQUEST, { optional: true }) !== null;
+  return isExpress
+    ? inject(ExpressLoggerService)
+    : inject(PrerenderingLoggerService);
+};
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
index bdc92d1fa7b..0abebd2beb4 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
@@ -1,15 +1,16 @@
 /// <reference types="jest" />
 
 import { fakeAsync, flush, tick } from '@angular/core/testing';
-import { Application, Request } from 'express';
+import { Application, Request, Response } from 'express';
 import { IncomingHttpHeaders } from 'http';
 import { Socket } from 'net';
 import { NgExpressEngineInstance } from '../engine-decorator/ng-express-engine-decorator';
+import { ExpressServerLogger, ExpressServerLoggerContext } from '../logger';
 import { OptimizedSsrEngine, SsrCallbackFn } from './optimized-ssr-engine';
 import {
-  defaultSsrOptimizationOptions,
   RenderingStrategy,
   SsrOptimizationOptions,
+  defaultSsrOptimizationOptions,
 } from './ssr-optimization-options';
 
 const defaultRenderTime = 100;
@@ -20,6 +21,12 @@ jest.mock('fs', () => ({
 }));
 const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation();
 
+class MockExpressServerLogger implements Partial<ExpressServerLogger> {
+  log(message: string, context: ExpressServerLoggerContext): void {
+    console.log(message, context);
+  }
+}
+
 /**
  * Helper class to easily create and test engine wrapper against mocked engine.
  *
@@ -88,9 +95,10 @@ class TestEngineRunner {
         },
         app,
         connection: <Partial<Socket>>{},
-      },
-      res: <Partial<Response>>{
-        set: (key: string, value: any) => (response[key] = value),
+        res: <Partial<Response>>{
+          set: (key: string, value: any) => (response[key] = value),
+          locals: {},
+        },
       },
     };
 
@@ -650,7 +658,8 @@ describe('OptimizedSsrEngine', () => {
       expect(engineRunner.renderCount).toEqual(0);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
         `Rendering of ${requestUrl} was not able to complete. This might cause memory leaks!`,
-        false
+        false,
+        { request: expect.objectContaining({ originalUrl: requestUrl }) }
       );
 
       tick(101);
@@ -674,7 +683,8 @@ describe('OptimizedSsrEngine', () => {
       expect(engineRunner.renderCount).toEqual(0);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
         `Rendering of ${requestUrl} was not able to complete. This might cause memory leaks!`,
-        false
+        false,
+        { request: expect.objectContaining({ originalUrl: requestUrl }) }
       );
 
       tick(50);
@@ -703,7 +713,9 @@ describe('OptimizedSsrEngine', () => {
       tick(1);
       // while the concurrency slot is busy rendering the first hanging request, the second request gets the CSR version
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
-        `CSR fallback: Concurrency limit exceeded (1)`
+        `CSR fallback: Concurrency limit exceeded (1)`,
+        true,
+        { request: expect.objectContaining({ originalUrl: csrRequest }) }
       );
       expect(engineRunner.renderCount).toEqual(0);
       expect(getCurrentConcurrency(engineRunner)).toEqual({
@@ -713,7 +725,8 @@ describe('OptimizedSsrEngine', () => {
       tick(maxRenderTime);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
         `Rendering of ${hangingRequest} was not able to complete. This might cause memory leaks!`,
-        false
+        false,
+        { request: expect.objectContaining({ originalUrl: hangingRequest }) }
       );
       expect(engineRunner.renderCount).toEqual(0);
 
@@ -721,7 +734,9 @@ describe('OptimizedSsrEngine', () => {
       engineRunner.request(ssrRequest);
       tick(1);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
-        `Rendering started (${ssrRequest})`
+        `Rendering started (${ssrRequest})`,
+        true,
+        { request: expect.objectContaining({ originalUrl: ssrRequest }) }
       );
       expect(getCurrentConcurrency(engineRunner)).toEqual({
         currentConcurrency: 1,
@@ -746,7 +761,8 @@ describe('OptimizedSsrEngine', () => {
       tick(fiveMinutes + 101);
       expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
         `Rendering of ${requestUrl} completed after the specified maxRenderTime, therefore it was ignored.`,
-        false
+        false,
+        { request: expect.objectContaining({ originalUrl: requestUrl }) }
       );
       expect(engineRunner.renders).toEqual(['']);
 
@@ -795,12 +811,16 @@ describe('OptimizedSsrEngine', () => {
         });
 
         tick(100);
+
         expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
-          `CSR fallback: rendering in progress (${requestUrl})`
+          `CSR fallback: rendering in progress (${requestUrl})`,
+          true,
+          { request: expect.objectContaining({ originalUrl: requestUrl }) }
         );
         expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
           `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${requestUrl}`,
-          false
+          false,
+          { request: expect.objectContaining({ originalUrl: requestUrl }) }
         );
         expect(engineRunner.renders).toEqual(['', '']);
 
@@ -826,7 +846,8 @@ describe('OptimizedSsrEngine', () => {
           tick(100);
           expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
             `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${requestUrl}`,
-            false
+            false,
+            { request: expect.objectContaining({ originalUrl: requestUrl }) }
           );
 
           tick(100);
@@ -952,7 +973,8 @@ describe('OptimizedSsrEngine', () => {
           tick(100);
           expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
             `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${requestUrl}`,
-            false
+            false,
+            { request: expect.objectContaining({ originalUrl: requestUrl }) }
           );
           expect(engineRunner.renders).toEqual(['']); // the first request fallback to CSR due to timeout
           expect(getCurrentConcurrency(engineRunner)).toEqual({
@@ -1082,7 +1104,8 @@ describe('OptimizedSsrEngine', () => {
           tick(maxRenderTime);
           expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
             `Rendering of ${hangingRequest} was not able to complete. This might cause memory leaks!`,
-            false
+            false,
+            { request: expect.objectContaining({ originalUrl: requestUrl }) }
           );
           expect(getCurrentConcurrency(engineRunner)).toEqual({
             currentConcurrency: 0,
@@ -1097,7 +1120,9 @@ describe('OptimizedSsrEngine', () => {
           engineRunner.request(ssrRequest);
           tick(1);
           expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
-            `Rendering started (${ssrRequest})`
+            `Rendering started (${ssrRequest})`,
+            true,
+            { request: expect.objectContaining({ originalUrl: ssrRequest }) }
           );
           expect(getCurrentConcurrency(engineRunner)).toEqual({
             currentConcurrency: 1,
@@ -1133,11 +1158,13 @@ describe('OptimizedSsrEngine', () => {
 
         expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
           `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${requestUrl}`,
-          false
+          false,
+          { request: expect.objectContaining({ originalUrl: requestUrl }) }
         );
         expect(engineRunner.optimizedSsrEngine['log']).toHaveBeenCalledWith(
           `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${differentUrl}`,
-          false
+          false,
+          { request: expect.objectContaining({ originalUrl: differentUrl }) }
         );
 
         expect(engineRunner.renderCount).toEqual(1);
@@ -1147,4 +1174,54 @@ describe('OptimizedSsrEngine', () => {
       }));
     });
   });
+
+  describe('logger option', () => {
+    it('should use ExpressServerLogger if logger is true', () => {
+      jest.useFakeTimers().setSystemTime(new Date('2023-05-26'));
+      new TestEngineRunner({
+        logger: true,
+      });
+      expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
+        [
+          "{"message":"[spartacus] SSR optimization engine initialized","context":{"timestamp":"2023-05-26T00:00:00.000Z","options":{"concurrency":10,"timeout":3000,"forcedSsrTimeout":60000,"maxRenderTime":300000,"reuseCurrentRendering":true,"debug":false,"logger":true}}}",
+        ]
+      `);
+    });
+    it('should use the provided logger', () => {
+      new TestEngineRunner({
+        logger: new MockExpressServerLogger() as ExpressServerLogger,
+      });
+      expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
+              [
+                "[spartacus] SSR optimization engine initialized",
+                {
+                  "options": {
+                    "concurrency": 10,
+                    "debug": false,
+                    "forcedSsrTimeout": 60000,
+                    "logger": "MockExpressServerLogger",
+                    "maxRenderTime": 300000,
+                    "reuseCurrentRendering": true,
+                    "timeout": 3000,
+                  },
+                },
+              ]
+            `);
+    });
+    it('should use the legacy server logger, if logger option not specified', () => {
+      new TestEngineRunner({});
+      expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
+              [
+                "[spartacus] SSR optimization engine initialized with the following options: {
+                "concurrency": 10,
+                "timeout": 3000,
+                "forcedSsrTimeout": 60000,
+                "maxRenderTime": 300000,
+                "reuseCurrentRendering": true,
+                "debug": false
+              }",
+              ]
+            `);
+    });
+  });
 });
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
index 3936118f341..714dba192aa 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
@@ -5,15 +5,23 @@
  */
 
 /* webpackIgnore: true */
+import { randomUUID } from 'crypto';
 import { Request, Response } from 'express';
 import * as fs from 'fs';
 import { NgExpressEngineInstance } from '../engine-decorator/ng-express-engine-decorator';
 import { getRequestUrl } from '../express-utils/express-request-url';
+import {
+  DefaultExpressServerLogger,
+  EXPRESS_SERVER_LOGGER,
+  ExpressServerLogger,
+  ExpressServerLoggerContext,
+  LegacyExpressServerLogger,
+} from '../logger';
 import { RenderingCache } from './rendering-cache';
 import {
-  defaultSsrOptimizationOptions,
   RenderingStrategy,
   SsrOptimizationOptions,
+  defaultSsrOptimizationOptions,
 } from './ssr-optimization-options';
 
 /**
@@ -39,6 +47,7 @@ export type SsrCallbackFn = (
 export class OptimizedSsrEngine {
   protected currentConcurrency = 0;
   protected renderingCache = new RenderingCache(this.ssrOptions);
+  private logger: ExpressServerLogger;
   private templateCache = new Map<string, string>();
 
   /**
@@ -68,6 +77,7 @@ export class OptimizedSsrEngine {
           ...ssrOptions,
         }
       : undefined;
+    this.logger = this.initLogger(this.ssrOptions);
     this.logOptions();
   }
 
@@ -80,14 +90,26 @@ export class OptimizedSsrEngine {
       if (typeof value === 'function') {
         return value.toString();
       }
+      if (this.isServerLogger(value)) {
+        return value.constructor.name;
+      }
       return value;
     };
 
     const stringifiedOptions = JSON.stringify(this.ssrOptions, replacer, 2);
-    this.log(
-      `[spartacus] SSR optimization engine initialized with the following options: ${stringifiedOptions}`,
-      false
-    );
+    // This check has been introduced to avoid breaking changes. Remove it in Spartacus version 7.0
+    const message = this.ssrOptions.logger
+      ? `[spartacus] SSR optimization engine initialized`
+      : `[spartacus] SSR optimization engine initialized with the following options: ${stringifiedOptions}`;
+    this.log(message, true, {
+      options: {
+        ...this.ssrOptions,
+        logger:
+          this.ssrOptions.logger === true
+            ? this.ssrOptions.logger
+            : this.ssrOptions.logger?.constructor?.name,
+      },
+    } as unknown as ExpressServerLoggerContext); //it expects ExpressServerLoggerContext, but the current logged message is printed a the start f the server and there is no request available yet.
   }
 
   /**
@@ -134,10 +156,16 @@ export class OptimizedSsrEngine {
       !this.ssrOptions?.reuseCurrentRendering;
 
     if (fallBack) {
-      this.log(`CSR fallback: rendering in progress (${request?.originalUrl})`);
+      this.log(
+        `CSR fallback: rendering in progress (${request?.originalUrl})`,
+        true,
+        { request }
+      );
     } else if (concurrencyLimitExceeded) {
       this.log(
-        `CSR fallback: Concurrency limit exceeded (${this.ssrOptions?.concurrency})`
+        `CSR fallback: Concurrency limit exceeded (${this.ssrOptions?.concurrency})`,
+        true,
+        { request }
       );
     }
 
@@ -233,11 +261,19 @@ export class OptimizedSsrEngine {
     options: any,
     callback: SsrCallbackFn
   ): void {
+    const requestContext = {
+      uuid: randomUUID(),
+      timeReceived: new Date().toISOString(),
+    };
+    options.req.res.locals = { cx: { request: requestContext } };
+
     const request: Request = options.req;
-    const response: Response = options.res || options.req.res;
+    const response: Response = options.req.res;
 
     if (this.returnCachedRender(request, callback)) {
-      this.log(`Render from cache (${request?.originalUrl})`);
+      this.log(`Render from cache (${request?.originalUrl})`, true, {
+        request,
+      });
       return;
     }
     if (!this.shouldRender(request)) {
@@ -254,12 +290,14 @@ export class OptimizedSsrEngine {
         this.fallbackToCsr(response, filePath, callback);
         this.log(
           `SSR rendering exceeded timeout ${timeout}, fallbacking to CSR for ${request?.originalUrl}`,
-          false
+          false,
+          { request }
         );
       }, timeout);
     } else {
       // Here we respond with the fallback to CSR, but we don't `return`.
       // We let the actual rendering task to happen in the background
+
       // to eventually store the rendered result in the cache.
       this.fallbackToCsr(response, filePath, callback);
     }
@@ -272,7 +310,9 @@ export class OptimizedSsrEngine {
         callback(err, html);
 
         this.log(
-          `Request is resolved with the SSR rendering result (${request?.originalUrl})`
+          `Request is resolved with the SSR rendering result (${request?.originalUrl})`,
+          true,
+          { request }
         );
 
         // store the render only if caching is enabled
@@ -295,9 +335,17 @@ export class OptimizedSsrEngine {
     });
   }
 
-  protected log(message: string, debug = true): void {
-    if (!debug || this.ssrOptions?.debug) {
-      console.log(message);
+  protected log(
+    message: string,
+    debug = true,
+    //CXSPA-3680 - in a new major, let's make this argument required
+    logMetadata?: ExpressServerLoggerContext
+  ): void {
+    if (debug || this.ssrOptions?.debug) {
+      this.logger.log(
+        message,
+        logMetadata || ({} as ExpressServerLoggerContext)
+      );
     }
   }
 
@@ -366,7 +414,9 @@ export class OptimizedSsrEngine {
     }
 
     this.log(
-      `Request is waiting for the SSR rendering to complete (${request?.originalUrl})`
+      `Request is waiting for the SSR rendering to complete (${request?.originalUrl})`,
+      true,
+      { request }
     );
   }
 
@@ -405,29 +455,62 @@ export class OptimizedSsrEngine {
         }
         this.log(
           `Rendering of ${request?.originalUrl} was not able to complete. This might cause memory leaks!`,
-          false
+          false,
+          { request }
         );
       }, this.ssrOptions?.maxRenderTime ?? 300000); // 300000ms == 5 minutes
 
-    this.log(`Rendering started (${request?.originalUrl})`);
+    this.log(`Rendering started (${request?.originalUrl})`, true, { request });
     this.renderingCache.setAsRendering(renderingKey);
     this.currentConcurrency++;
 
+    options = {
+      ...options,
+      providers: [
+        {
+          provide: EXPRESS_SERVER_LOGGER,
+          useValue: this.logger,
+        },
+      ],
+    };
+
     this.expressEngine(filePath, options, (err, html) => {
       if (!maxRenderTimeout) {
         // ignore this render's result because it exceeded maxRenderTimeout
         this.log(
           `Rendering of ${request.originalUrl} completed after the specified maxRenderTime, therefore it was ignored.`,
-          false
+          false,
+          { request }
         );
         return;
       }
       clearTimeout(maxRenderTimeout);
 
-      this.log(`Rendering completed (${request?.originalUrl})`);
+      this.log(`Rendering completed (${request?.originalUrl})`, true, {
+        request,
+      });
       this.currentConcurrency--;
 
       renderCallback(err, html);
     });
   }
+
+  //CXSPA-3680 - remove this method in 7.0
+  private initLogger(ssrOptions: SsrOptimizationOptions | undefined) {
+    if (ssrOptions?.logger === true) {
+      return new DefaultExpressServerLogger();
+    }
+    return ssrOptions?.logger || new LegacyExpressServerLogger();
+  }
+
+  private isServerLogger(logger: unknown): logger is ExpressServerLogger {
+    return (
+      logger instanceof Object &&
+      'log' in logger &&
+      'error' in logger &&
+      'warn' in logger &&
+      'info' in logger &&
+      'debug' in logger
+    );
+  }
 }
diff --git a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
index 4b5c3b437df..c63159bab8e 100644
--- a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
+++ b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
@@ -5,6 +5,7 @@
  */
 
 import { Request } from 'express';
+import { ExpressServerLogger } from '../logger';
 
 export interface SsrOptimizationOptions {
   /**
@@ -109,6 +110,20 @@ export interface SsrOptimizationOptions {
    * Enable detailed logs for troubleshooting problems
    */
   debug?: boolean;
+
+  /**
+   * Config for improving logged messages with context and JSON structure.
+   *
+   * It enhances the logs in SSR by adding context, including the request's details,
+   * and structuring them as JSON.
+   *
+   * The `logger` property is optional and accepts two values:
+   * - `true`:         Enables the default logger and enhances the logs.
+   * - `ExpressServerLogger`: Interprets the given `ExpressServerLogger` as a custom logger
+   *
+   * By default, the logger is disabled, meaning that logs in SSR are not enhanced.
+   */
+  logger?: true | ExpressServerLogger; //CXSPA-3680 - allow only providing ExpressServerLogger implementations
 }
 
 export enum RenderingStrategy {
@@ -124,4 +139,6 @@ export const defaultSsrOptimizationOptions: SsrOptimizationOptions = {
   maxRenderTime: 300_000,
   reuseCurrentRendering: true,
   debug: false,
+  //CXSPA-3680 - set ExpressServerLogger as default
+  //logger: new ExpressServerLogger(),
 };
diff --git a/core-libs/setup/ssr/providers/ssr-providers.ts b/core-libs/setup/ssr/providers/ssr-providers.ts
index eee50bbe50f..dc9ab599b6f 100644
--- a/core-libs/setup/ssr/providers/ssr-providers.ts
+++ b/core-libs/setup/ssr/providers/ssr-providers.ts
@@ -6,9 +6,14 @@
 
 import { StaticProvider } from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-import { SERVER_REQUEST_ORIGIN, SERVER_REQUEST_URL } from '@spartacus/core';
+import {
+  LoggerService,
+  SERVER_REQUEST_ORIGIN,
+  SERVER_REQUEST_URL,
+} from '@spartacus/core';
 import { getRequestOrigin } from '../express-utils/express-request-origin';
 import { getRequestUrl } from '../express-utils/express-request-url';
+import { serverLoggerServiceFactory } from '../logger';
 import { ServerOptions } from './model';
 import { serverRequestOriginFactory } from './server-request-origin';
 import { serverRequestUrlFactory } from './server-request-url';
@@ -26,9 +31,12 @@ export function provideServer(options?: ServerOptions): StaticProvider[] {
       provide: SERVER_REQUEST_URL,
       useFactory: serverRequestUrlFactory(options),
     },
+    {
+      provide: LoggerService,
+      useFactory: serverLoggerServiceFactory,
+    },
   ];
 }
-
 /**
  * Returns Spartacus providers to be passed to the Angular express engine (in SSR)
  *
diff --git a/core-libs/setup/ssr/public_api.ts b/core-libs/setup/ssr/public_api.ts
index 2144a48d3d8..8ff6d404323 100644
--- a/core-libs/setup/ssr/public_api.ts
+++ b/core-libs/setup/ssr/public_api.ts
@@ -5,5 +5,6 @@
  */
 
 export * from './engine-decorator/index';
+export * from './logger/index';
 export * from './optimized-engine/index';
 export * from './providers/index';
diff --git a/feature-libs/asm/core/store/effects/customer.effect.ts b/feature-libs/asm/core/store/effects/customer.effect.ts
index 4974ab3a276..6f24d6ec6ed 100644
--- a/feature-libs/asm/core/store/effects/customer.effect.ts
+++ b/feature-libs/asm/core/store/effects/customer.effect.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { CustomerSearchPage } from '@spartacus/asm/root';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 import { AsmConnector } from '../../connectors/asm.connector';
@@ -15,6 +15,8 @@ import { AsmActions } from '../actions/index';
 
 @Injectable()
 export class CustomerEffects {
+  protected logger = inject(LoggerService);
+
   customerSearch$: Observable<AsmActions.CustomerAction> = createEffect(() =>
     this.actions$.pipe(
       ofType(AsmActions.CUSTOMER_SEARCH),
@@ -25,7 +27,11 @@ export class CustomerEffects {
             return new AsmActions.CustomerSearchSuccess(customerSearchResults);
           }),
           catchError((error) =>
-            of(new AsmActions.CustomerSearchFail(normalizeHttpError(error)))
+            of(
+              new AsmActions.CustomerSearchFail(
+                normalizeHttpError(error, this.logger)
+              )
+            )
           )
         )
       )
@@ -47,7 +53,7 @@ export class CustomerEffects {
             catchError((error) =>
               of(
                 new AsmActions.CustomerListCustomersSearchFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/feature-libs/asm/occ/adapters/occ-asm.adapter.ts b/feature-libs/asm/occ/adapters/occ-asm.adapter.ts
index 8e44fd0e50a..7f2298da57a 100644
--- a/feature-libs/asm/occ/adapters/occ-asm.adapter.ts
+++ b/feature-libs/asm/occ/adapters/occ-asm.adapter.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   AsmAdapter,
   CUSTOMER_LISTS_NORMALIZER,
@@ -23,10 +23,11 @@ import {
   BaseSiteService,
   ConverterService,
   InterceptorUtil,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
-  User,
   USE_CUSTOMER_SUPPORT_AGENT_TOKEN,
+  User,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -35,6 +36,8 @@ import { catchError } from 'rxjs/operators';
 export class OccAsmAdapter implements AsmAdapter {
   private activeBaseSite: string;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpointsService: OccEndpointsService,
@@ -72,7 +75,7 @@ export class OccAsmAdapter implements AsmAdapter {
     );
 
     return this.http.get<CustomerListsPage>(url, { headers, params }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converterService.pipeable(CUSTOMER_LISTS_NORMALIZER)
     );
   }
@@ -120,7 +123,7 @@ export class OccAsmAdapter implements AsmAdapter {
     );
 
     return this.http.get<CustomerSearchPage>(url, { headers, params }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converterService.pipeable(CUSTOMER_SEARCH_PAGE_NORMALIZER)
     );
   }
@@ -147,7 +150,11 @@ export class OccAsmAdapter implements AsmAdapter {
 
     return this.http
       .post<void>(url, {}, { headers, params })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   createCustomer(user: CustomerRegistrationForm): Observable<User> {
@@ -167,6 +174,10 @@ export class OccAsmAdapter implements AsmAdapter {
     );
     return this.http
       .post<User>(url, user, { headers, params })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 }
diff --git a/feature-libs/cart/base/core/services/product-import-info.service.spec.ts b/feature-libs/cart/base/core/services/product-import-info.service.spec.ts
index 1a04eea6be5..0e050cff9ce 100644
--- a/feature-libs/cart/base/core/services/product-import-info.service.spec.ts
+++ b/feature-libs/cart/base/core/services/product-import-info.service.spec.ts
@@ -2,6 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { Action, ActionsSubject } from '@ngrx/store';
 import { CartActions } from '@spartacus/cart/base/core';
 import { ProductImportStatus } from '@spartacus/cart/base/root';
+import { LoggerService } from '@spartacus/core';
 import { Subject } from 'rxjs';
 import { ProductImportInfoService } from './product-import-info.service';
 
@@ -11,6 +12,7 @@ const mockUserId = 'current';
 
 describe('ProductImportInfoService', () => {
   let service: ProductImportInfoService;
+  let logger: LoggerService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -20,6 +22,7 @@ describe('ProductImportInfoService', () => {
       ],
     });
     service = TestBed.inject(ProductImportInfoService);
+    logger = TestBed.inject(LoggerService);
   });
 
   it('should be created', () => {
@@ -119,7 +122,7 @@ describe('ProductImportInfoService', () => {
     });
 
     it('should return unknown error action', () => {
-      spyOn(console, 'warn').and.stub();
+      spyOn(logger, 'warn');
       let result;
       const payload = {
         userId: mockUserId,
@@ -139,7 +142,7 @@ describe('ProductImportInfoService', () => {
         productCode: '693923',
         statusCode: ProductImportStatus.UNKNOWN_ERROR,
       });
-      expect(console.warn).toHaveBeenCalledWith(
+      expect(logger.warn).toHaveBeenCalledWith(
         'Unrecognized cart add entry action type while mapping messages',
         new CartActions.CartAddEntrySuccess(payload)
       );
diff --git a/feature-libs/cart/base/core/services/product-import-info.service.ts b/feature-libs/cart/base/core/services/product-import-info.service.ts
index ed2740bc970..c4e3373349b 100644
--- a/feature-libs/cart/base/core/services/product-import-info.service.ts
+++ b/feature-libs/cart/base/core/services/product-import-info.service.ts
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import { ofType } from '@ngrx/effects';
 import { ActionsSubject } from '@ngrx/store';
 import {
   ProductImportInfo,
   ProductImportStatus,
 } from '@spartacus/cart/base/root';
+import { LoggerService } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { CartActions } from '../store/actions';
@@ -19,6 +20,7 @@ import { CartActions } from '../store/actions';
   providedIn: 'root',
 })
 export class ProductImportInfoService {
+  protected logger = inject(LoggerService);
   protected constructor(protected actionsSubject: ActionsSubject) {}
 
   /**
@@ -79,7 +81,7 @@ export class ProductImportInfoService {
       }
     }
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         'Unrecognized cart add entry action type while mapping messages',
         action
       );
diff --git a/feature-libs/cart/base/core/store/effects/cart-entry.effect.ts b/feature-libs/cart/base/core/store/effects/cart-entry.effect.ts
index 6cec251c683..4912c0a4b76 100644
--- a/feature-libs/cart/base/core/store/effects/cart-entry.effect.ts
+++ b/feature-libs/cart/base/core/store/effects/cart-entry.effect.ts
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { CartModification } from '@spartacus/cart/base/root';
 import {
-  normalizeHttpError,
+  LoggerService,
   SiteContextActions,
+  normalizeHttpError,
   withdrawOn,
 } from '@spartacus/core';
-import { from, Observable } from 'rxjs';
+import { Observable, from } from 'rxjs';
 import { catchError, concatMap, map } from 'rxjs/operators';
 import { CartEntryConnector } from '../../connectors/entry/cart-entry.connector';
 import { CartActions } from '../actions/index';
@@ -26,6 +27,8 @@ export class CartEntryEffects {
     )
   );
 
+  protected logger = inject(LoggerService);
+
   addEntry$: Observable<
     | CartActions.CartAddEntrySuccess
     | CartActions.CartAddEntryFail
@@ -55,7 +58,7 @@ export class CartEntryEffects {
               from([
                 new CartActions.CartAddEntryFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new CartActions.LoadCart({
                   cartId: payload.cartId,
@@ -90,7 +93,7 @@ export class CartEntryEffects {
               from([
                 new CartActions.CartRemoveEntryFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new CartActions.LoadCart({
                   cartId: payload.cartId,
@@ -132,7 +135,7 @@ export class CartEntryEffects {
               from([
                 new CartActions.CartUpdateEntryFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new CartActions.LoadCart({
                   cartId: payload.cartId,
diff --git a/feature-libs/cart/base/core/store/effects/cart-voucher.effect.ts b/feature-libs/cart/base/core/store/effects/cart-voucher.effect.ts
index e85168b8fcd..00603009888 100644
--- a/feature-libs/cart/base/core/store/effects/cart-voucher.effect.ts
+++ b/feature-libs/cart/base/core/store/effects/cart-voucher.effect.ts
@@ -4,20 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   GlobalMessageService,
   GlobalMessageType,
+  LoggerService,
   normalizeHttpError,
 } from '@spartacus/core';
-import { from, Observable } from 'rxjs';
+import { Observable, from } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 import { CartVoucherConnector } from '../../connectors/voucher/cart-voucher.connector';
 import { CartActions } from '../actions/index';
 
 @Injectable()
 export class CartVoucherEffects {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private cartVoucherConnector: CartVoucherConnector,
@@ -50,7 +53,7 @@ export class CartVoucherEffects {
               from([
                 new CartActions.CartAddVoucherFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new CartActions.CartProcessesDecrement(payload.cartId),
                 new CartActions.LoadCart({
@@ -89,7 +92,7 @@ export class CartVoucherEffects {
             catchError((error) =>
               from([
                 new CartActions.CartRemoveVoucherFail({
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                   cartId: payload.cartId,
                   userId: payload.userId,
                   voucherId: payload.voucherId,
diff --git a/feature-libs/cart/base/core/store/effects/cart.effect.ts b/feature-libs/cart/base/core/store/effects/cart.effect.ts
index d5dd98b49c4..a81ca6989b1 100644
--- a/feature-libs/cart/base/core/store/effects/cart.effect.ts
+++ b/feature-libs/cart/base/core/store/effects/cart.effect.ts
@@ -4,18 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { select, Store } from '@ngrx/store';
+import { Store, select } from '@ngrx/store';
 import { Cart } from '@spartacus/cart/base/root';
 import {
-  isNotUndefined,
-  normalizeHttpError,
+  LoggerService,
   OCC_CART_ID_CURRENT,
   SiteContextActions,
+  isNotUndefined,
+  normalizeHttpError,
   withdrawOn,
 } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import {
   catchError,
   concatMap,
@@ -41,6 +42,8 @@ export class CartEffects {
     )
   );
 
+  protected logger = inject(LoggerService);
+
   loadCart$: Observable<
     | CartActions.LoadCartFail
     | CartActions.LoadCartSuccess
@@ -129,7 +132,7 @@ export class CartEffects {
     return of(
       new CartActions.LoadCartFail({
         ...payload,
-        error: normalizeHttpError(error),
+        error: normalizeHttpError(error, this.logger),
       })
     );
   }
@@ -174,7 +177,7 @@ export class CartEffects {
               of(
                 new CartActions.CreateCartFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 })
               )
             )
@@ -298,7 +301,7 @@ export class CartEffects {
               from([
                 new CartActions.AddEmailToCartFail({
                   ...payload,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new CartActions.LoadCart({
                   userId: payload.userId,
@@ -329,7 +332,7 @@ export class CartEffects {
             from([
               new CartActions.DeleteCartFail({
                 ...payload,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
               // Error might happen in higher backend layer and cart could still be removed.
               // When load fail with NotFound error then RemoveCart action will kick in and clear that cart in our state.
diff --git a/feature-libs/cart/base/occ/adapters/occ-cart-validation.adapter.ts b/feature-libs/cart/base/occ/adapters/occ-cart-validation.adapter.ts
index 870e7a5ce7e..67b03cfa82c 100644
--- a/feature-libs/cart/base/occ/adapters/occ-cart-validation.adapter.ts
+++ b/feature-libs/cart/base/occ/adapters/occ-cart-validation.adapter.ts
@@ -5,22 +5,25 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
-  CartValidationAdapter,
   CART_VALIDATION_NORMALIZER,
+  CartValidationAdapter,
 } from '@spartacus/cart/base/core';
 import { CartModificationList } from '@spartacus/cart/base/root';
 import {
   ConverterService,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccCartValidationAdapter implements CartValidationAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -33,7 +36,7 @@ export class OccCartValidationAdapter implements CartValidationAdapter {
     });
 
     return this.http.post<any>(url, null).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converter.pipeable(CART_VALIDATION_NORMALIZER)
     );
   }
diff --git a/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.spec.ts b/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.spec.ts
index b9bccdda2de..3d2e4642e78 100644
--- a/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.spec.ts
+++ b/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.spec.ts
@@ -5,7 +5,7 @@ import {
   ProductImportStatus,
 } from '@spartacus/cart/base/root';
 import { QuickOrderFacade } from '@spartacus/cart/quick-order/root';
-import { ProductConnector } from '@spartacus/core';
+import { LoggerService, ProductConnector } from '@spartacus/core';
 import { BehaviorSubject, EMPTY, of, throwError } from 'rxjs';
 import { QuickOrderOrderEntriesContext } from './quick-order-order-entries.context';
 import createSpy = jasmine.createSpy;
@@ -71,6 +71,7 @@ describe('QuickOrderOrderEntriesContext', () => {
   let service: QuickOrderOrderEntriesContext;
   let quickOrderFacade: QuickOrderFacade;
   let productConnector: ProductConnector;
+  let logger: LoggerService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -82,6 +83,7 @@ describe('QuickOrderOrderEntriesContext', () => {
     service = TestBed.inject(QuickOrderOrderEntriesContext);
     quickOrderFacade = TestBed.inject(QuickOrderFacade);
     productConnector = TestBed.inject(ProductConnector);
+    logger = TestBed.inject(LoggerService);
   });
 
   it('should be created', () => {
@@ -244,7 +246,7 @@ describe('QuickOrderOrderEntriesContext', () => {
         { productCode: unhandledItemErrorId, quantity: 1 },
       ];
       const results = [];
-      spyOn(console, 'warn').and.stub();
+      spyOn(logger, 'warn').and.stub();
 
       service
         .addEntries(unableToAddProductsData)
@@ -266,7 +268,7 @@ describe('QuickOrderOrderEntriesContext', () => {
           statusCode: ProductImportStatus.UNKNOWN_ERROR,
         },
       ]);
-      expect(console.warn).toHaveBeenCalledWith(
+      expect(logger.warn).toHaveBeenCalledWith(
         'Unrecognized cart add entry action type while mapping messages',
         {}
       );
diff --git a/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.ts b/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.ts
index 6e878e32a8c..5755e7d3ca3 100644
--- a/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.ts
+++ b/feature-libs/cart/quick-order/components/page-context/quick-order-order-entries.context.ts
@@ -5,17 +5,7 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable, isDevMode } from '@angular/core';
-import { merge, Observable, of } from 'rxjs';
-import {
-  catchError,
-  filter,
-  map,
-  mergeAll,
-  switchMap,
-  take,
-  tap,
-} from 'rxjs/operators';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import {
   AddOrderEntriesContext,
   GetOrderEntriesContext,
@@ -26,7 +16,17 @@ import {
   ProductImportStatus,
 } from '@spartacus/cart/base/root';
 import { QuickOrderFacade } from '@spartacus/cart/quick-order/root';
-import { Product, ProductConnector } from '@spartacus/core';
+import { LoggerService, Product, ProductConnector } from '@spartacus/core';
+import { Observable, merge, of } from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  mergeAll,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root',
@@ -35,6 +35,7 @@ export class QuickOrderOrderEntriesContext
   implements AddOrderEntriesContext, GetOrderEntriesContext
 {
   readonly type = OrderEntriesSource.QUICK_ORDER;
+  protected logger = inject(LoggerService);
 
   constructor(
     protected quickOrderService: QuickOrderFacade,
@@ -120,7 +121,7 @@ export class QuickOrderOrderEntriesContext
       };
     } else {
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           'Unrecognized cart add entry action type while mapping messages',
           response
         );
diff --git a/feature-libs/cart/saved-cart/core/store/effects/saved-cart.effect.ts b/feature-libs/cart/saved-cart/core/store/effects/saved-cart.effect.ts
index 87628d39279..ffa4435dbab 100644
--- a/feature-libs/cart/saved-cart/core/store/effects/saved-cart.effect.ts
+++ b/feature-libs/cart/saved-cart/core/store/effects/saved-cart.effect.ts
@@ -5,13 +5,14 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { CartActions, CartConnector } from '@spartacus/cart/base/core';
 import { ActiveCartFacade, Cart } from '@spartacus/cart/base/root';
 import {
   GlobalMessageService,
   GlobalMessageType,
+  LoggerService,
   normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
@@ -21,6 +22,8 @@ import { SavedCartActions } from '../actions/index';
 
 @Injectable()
 export class SavedCartEffects {
+  protected logger = inject(LoggerService);
+
   loadSavedCart$: Observable<
     | CartActions.LoadCartSuccess
     | SavedCartActions.LoadSavedCartFail
@@ -46,7 +49,7 @@ export class SavedCartEffects {
               new SavedCartActions.LoadSavedCartFail({
                 userId,
                 cartId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -75,7 +78,7 @@ export class SavedCartEffects {
             of(
               new SavedCartActions.LoadSavedCartsFail({
                 userId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -147,7 +150,7 @@ export class SavedCartEffects {
               new SavedCartActions.RestoreSavedCartFail({
                 userId,
                 cartId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -193,7 +196,7 @@ export class SavedCartEffects {
                   cartId,
                   saveCartName,
                   saveCartDescription,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 })
               )
             )
@@ -237,7 +240,7 @@ export class SavedCartEffects {
                   cartId,
                   saveCartName,
                   saveCartDescription,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 })
               )
             )
@@ -280,7 +283,7 @@ export class SavedCartEffects {
                   userId,
                   cartId,
                   saveCartName,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 })
               )
             )
diff --git a/feature-libs/cart/wish-list/core/store/effects/wish-list.effect.ts b/feature-libs/cart/wish-list/core/store/effects/wish-list.effect.ts
index 987843cf285..8d7558716db 100644
--- a/feature-libs/cart/wish-list/core/store/effects/wish-list.effect.ts
+++ b/feature-libs/cart/wish-list/core/store/effects/wish-list.effect.ts
@@ -4,25 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { Action, select, Store } from '@ngrx/store';
+import { Action, Store, select } from '@ngrx/store';
 import {
   CartActions,
   CartConnector,
-  getCartIdByUserId,
   MultiCartSelectors,
   StateWithMultiCart,
+  getCartIdByUserId,
 } from '@spartacus/cart/base/core';
 import { CartType } from '@spartacus/cart/base/root';
 import {
-  isNotUndefined,
-  normalizeHttpError,
+  LoggerService,
   SiteContextActions,
   StateUtils,
   UserIdService,
+  isNotUndefined,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { EMPTY, from, Observable } from 'rxjs';
+import { EMPTY, Observable, from } from 'rxjs';
 import {
   catchError,
   concatMap,
@@ -35,6 +36,8 @@ import { WishListActions } from '../actions';
 
 @Injectable()
 export class WishListEffects {
+  protected logger = inject(LoggerService);
+
   createWishList$: Observable<
     WishListActions.CreateWishListSuccess | WishListActions.CreateWishListFail
   > = createEffect(() =>
@@ -62,7 +65,7 @@ export class WishListEffects {
                   from([
                     new WishListActions.CreateWishListFail({
                       cartId: cart.code ?? '',
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     }),
                   ])
                 )
@@ -108,7 +111,7 @@ export class WishListEffects {
             from([
               new WishListActions.LoadWishListFail({
                 cartId: cartId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
             ])
           )
@@ -145,7 +148,7 @@ export class WishListEffects {
               from([
                 new WishListActions.LoadWishListFail({
                   cartId: wishListId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
               ])
             )
diff --git a/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.spec.ts b/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.spec.ts
index a3c4a6119b8..030dd5f8200 100644
--- a/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.spec.ts
+++ b/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.spec.ts
@@ -21,6 +21,7 @@ import {
 import {
   Address,
   CostCenter,
+  LoggerService,
   QueryState,
   RouteConfig,
   RoutingConfigService,
@@ -330,11 +331,15 @@ describe(`CheckoutB2BStepsSetGuard`, () => {
 
     describe('PAYMENT_DETAILS is not valid any more', () => {
       it('go to step3 (payment details), should return to checkout', (done) => {
-        spyOn(console, 'warn');
+        const logger = TestBed.inject(LoggerService);
+        spyOn(logger, 'warn');
         guard
           .canActivate(<any>{ url: ['checkout', 'route3'] })
           .subscribe((result) => {
             expect(result.toString()).toEqual('/checkout');
+            expect(logger.warn).toHaveBeenCalledWith(
+              `Missing step with route '/checkout/route3' in checkout configuration or this step is disabled.`
+            );
             done();
           });
       });
diff --git a/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.ts b/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.ts
index 24b8dcbe03f..9f6e2fc4753 100644
--- a/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.ts
+++ b/feature-libs/checkout/b2b/components/guards/checkout-b2b-steps-set.guard.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import {
   ActivatedRouteSnapshot,
   CanActivate,
@@ -27,8 +27,8 @@ import {
   CheckoutStep,
   CheckoutStepType,
 } from '@spartacus/checkout/base/root';
-import { RoutingConfigService } from '@spartacus/core';
-import { combineLatest, Observable, of } from 'rxjs';
+import { LoggerService, RoutingConfigService } from '@spartacus/core';
+import { Observable, combineLatest, of } from 'rxjs';
 import { filter, map, switchMap, take, tap } from 'rxjs/operators';
 
 @Injectable({
@@ -38,6 +38,8 @@ export class CheckoutB2BStepsSetGuard
   extends CheckoutStepsSetGuard
   implements CanActivate
 {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected checkoutStepService: CheckoutStepService,
     protected routingConfigService: RoutingConfigService,
@@ -92,7 +94,7 @@ export class CheckoutB2BStepsSetGuard
           return this.isB2BStepSet(steps[currentIndex - 1], isAccount);
         } else {
           if (isDevMode()) {
-            console.warn(
+            this.logger.warn(
               `Missing step with route '${currentRouteUrl}' in checkout configuration or this step is disabled.`
             );
           }
diff --git a/feature-libs/checkout/b2b/occ/adapters/occ-checkout-cost-center.adapter.ts b/feature-libs/checkout/b2b/occ/adapters/occ-checkout-cost-center.adapter.ts
index 465ca6a775c..b7223863530 100644
--- a/feature-libs/checkout/b2b/occ/adapters/occ-checkout-cost-center.adapter.ts
+++ b/feature-libs/checkout/b2b/occ/adapters/occ-checkout-cost-center.adapter.ts
@@ -5,13 +5,14 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Cart, CART_NORMALIZER } from '@spartacus/cart/base/root';
 import { CheckoutCostCenterAdapter } from '@spartacus/checkout/b2b/core';
 import {
   backOff,
   ConverterService,
   isJaloError,
+  LoggerService,
   normalizeHttpError,
   OccEndpointsService,
 } from '@spartacus/core';
@@ -20,6 +21,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccCheckoutCostCenterAdapter implements CheckoutCostCenterAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -34,7 +37,9 @@ export class OccCheckoutCostCenterAdapter implements CheckoutCostCenterAdapter {
     return this.http
       .put(this.getSetCartCostCenterEndpoint(userId, cartId, costCenterId), {})
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({ shouldRetry: isJaloError }),
         this.converter.pipeable(CART_NORMALIZER)
       );
diff --git a/feature-libs/checkout/b2b/occ/adapters/occ-checkout-payment-type.adapter.ts b/feature-libs/checkout/b2b/occ/adapters/occ-checkout-payment-type.adapter.ts
index 87203868bc9..204b7dbb7f4 100644
--- a/feature-libs/checkout/b2b/occ/adapters/occ-checkout-payment-type.adapter.ts
+++ b/feature-libs/checkout/b2b/occ/adapters/occ-checkout-payment-type.adapter.ts
@@ -5,20 +5,21 @@
  */
 
 import { HttpClient, HttpContext } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Cart, CART_NORMALIZER, PaymentType } from '@spartacus/cart/base/root';
+import { Injectable, inject } from '@angular/core';
+import { CART_NORMALIZER, Cart, PaymentType } from '@spartacus/cart/base/root';
 import {
-  CheckoutPaymentTypeAdapter,
   CHECKOUT_PAYMENT_TYPE_NORMALIZER,
+  CheckoutPaymentTypeAdapter,
 } from '@spartacus/checkout/b2b/core';
 import {
-  backOff,
   ConverterService,
-  isJaloError,
-  normalizeHttpError,
+  LoggerService,
+  OCC_HTTP_TOKEN,
   Occ,
   OccEndpointsService,
-  OCC_HTTP_TOKEN,
+  backOff,
+  isJaloError,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
@@ -27,6 +28,8 @@ import { catchError, map } from 'rxjs/operators';
 export class OccCheckoutPaymentTypeAdapter
   implements CheckoutPaymentTypeAdapter
 {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -41,7 +44,9 @@ export class OccCheckoutPaymentTypeAdapter
     return this.http
       .get<Occ.PaymentTypeList>(this.getPaymentTypesEndpoint(), { context })
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({ shouldRetry: isJaloError }),
         map((paymentTypeList) => paymentTypeList.paymentTypes ?? []),
         this.converter.pipeableMany(CHECKOUT_PAYMENT_TYPE_NORMALIZER)
@@ -69,7 +74,9 @@ export class OccCheckoutPaymentTypeAdapter
         {}
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({ shouldRetry: isJaloError }),
         this.converter.pipeable(CART_NORMALIZER)
       );
diff --git a/feature-libs/checkout/base/components/guards/checkout-steps-set.guard.ts b/feature-libs/checkout/base/components/guards/checkout-steps-set.guard.ts
index ade76f6d9ba..0e6b0d94ee3 100644
--- a/feature-libs/checkout/base/components/guards/checkout-steps-set.guard.ts
+++ b/feature-libs/checkout/base/components/guards/checkout-steps-set.guard.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode, OnDestroy } from '@angular/core';
+import { inject, Injectable, isDevMode, OnDestroy } from '@angular/core';
 import {
   ActivatedRouteSnapshot,
   CanActivate,
@@ -19,7 +19,7 @@ import {
   CheckoutStep,
   CheckoutStepType,
 } from '@spartacus/checkout/base/root';
-import { RoutingConfigService } from '@spartacus/core';
+import { LoggerService, RoutingConfigService } from '@spartacus/core';
 import { Observable, of, Subscription } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -35,6 +35,7 @@ import { CheckoutStepService } from '../services/checkout-step.service';
 })
 export class CheckoutStepsSetGuard implements CanActivate, OnDestroy {
   protected subscription: Subscription;
+  protected logger = inject(LoggerService);
 
   constructor(
     protected checkoutStepService: CheckoutStepService,
@@ -92,7 +93,7 @@ export class CheckoutStepsSetGuard implements CanActivate, OnDestroy {
           return this.isStepSet(steps[currentIndex - 1]);
         } else {
           if (isDevMode()) {
-            console.warn(
+            this.logger.warn(
               `Missing step with route '${currentRouteUrl}' in checkout configuration or this step is disabled.`
             );
           }
diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-address.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-address.adapter.ts
index a2fab4700e8..3c1ceffd497 100644
--- a/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-address.adapter.ts
+++ b/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-address.adapter.ts
@@ -5,18 +5,19 @@
  */
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { CheckoutDeliveryAddressAdapter } from '@spartacus/checkout/base/core';
 import {
-  Address,
   ADDRESS_NORMALIZER,
   ADDRESS_SERIALIZER,
-  backOff,
+  Address,
   ConverterService,
-  isJaloError,
-  normalizeHttpError,
+  LoggerService,
   Occ,
   OccEndpointsService,
+  backOff,
+  isJaloError,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -25,6 +26,8 @@ import { catchError } from 'rxjs/operators';
 export class OccCheckoutDeliveryAddressAdapter
   implements CheckoutDeliveryAddressAdapter
 {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -47,7 +50,9 @@ export class OccCheckoutDeliveryAddressAdapter
         }
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         }),
@@ -78,7 +83,9 @@ export class OccCheckoutDeliveryAddressAdapter
         {}
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
@@ -103,7 +110,9 @@ export class OccCheckoutDeliveryAddressAdapter
     return this.http
       .delete<unknown>(this.getRemoveDeliveryAddressEndpoint(userId, cartId))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-modes.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-modes.adapter.ts
index 22d812ac140..d10d7959a32 100644
--- a/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-modes.adapter.ts
+++ b/feature-libs/checkout/base/occ/adapters/occ-checkout-delivery-modes.adapter.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { DeliveryMode } from '@spartacus/cart/base/root';
 import {
   CheckoutDeliveryModesAdapter,
@@ -13,6 +13,7 @@ import {
 } from '@spartacus/checkout/base/core';
 import {
   ConverterService,
+  LoggerService,
   Occ,
   OccEndpointsService,
   backOff,
@@ -26,6 +27,8 @@ import { catchError, map } from 'rxjs/operators';
 export class OccCheckoutDeliveryModesAdapter
   implements CheckoutDeliveryModesAdapter
 {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -40,7 +43,9 @@ export class OccCheckoutDeliveryModesAdapter
     return this.http
       .put(this.getSetDeliveryModeEndpoint(userId, cartId, deliveryModeId), {})
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
@@ -68,7 +73,9 @@ export class OccCheckoutDeliveryModesAdapter
     return this.http
       .get<Occ.DeliveryModeList>(this.getDeliveryModesEndpoint(userId, cartId))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         }),
@@ -91,7 +98,9 @@ export class OccCheckoutDeliveryModesAdapter
     return this.http
       .delete<unknown>(this.getClearDeliveryModeEndpoint(userId, cartId))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts
index e71a66bf539..d7d6c13aec6 100644
--- a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts
+++ b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { CardType, PaymentDetails } from '@spartacus/cart/base/root';
 import {
   CheckoutPaymentAdapter,
@@ -13,20 +13,23 @@ import {
   PAYMENT_DETAILS_SERIALIZER,
 } from '@spartacus/checkout/base/core';
 import {
-  backOff,
   ConverterService,
   HttpParamsURIEncoder,
-  isJaloError,
-  normalizeHttpError,
+  LoggerService,
   Occ,
   OccEndpointsService,
   PAYMENT_DETAILS_NORMALIZER,
+  backOff,
+  isJaloError,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 
 @Injectable()
 export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -76,7 +79,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
               cartId,
               fromPaymentProvider
             ).pipe(
-              catchError((error) => throwError(normalizeHttpError(error))),
+              catchError((error) =>
+                throwError(normalizeHttpError(error, this.logger))
+              ),
               backOff({
                 shouldRetry: isJaloError,
               }),
@@ -99,7 +104,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
         {}
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
@@ -121,7 +128,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
     return this.http
       .get<Occ.CardTypeList>(this.getPaymentCardTypesEndpoint())
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         }),
@@ -141,7 +150,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
     return this.http
       .get(this.getPaymentProviderSubInfoEndpoint(userId, cartId))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
@@ -179,7 +190,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
         responseType: 'text',
       })
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
@@ -207,7 +220,9 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter {
         { headers }
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         })
diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout.adapter.ts
index 60b98a29b06..d5b7a94bcb7 100644
--- a/feature-libs/checkout/base/occ/adapters/occ-checkout.adapter.ts
+++ b/feature-libs/checkout/base/occ/adapters/occ-checkout.adapter.ts
@@ -5,24 +5,27 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
-  CheckoutAdapter,
   CHECKOUT_NORMALIZER,
+  CheckoutAdapter,
 } from '@spartacus/checkout/base/core';
 import { CheckoutState } from '@spartacus/checkout/base/root';
 import {
-  backOff,
   ConverterService,
+  LoggerService,
+  OccEndpointsService,
+  backOff,
   isJaloError,
   normalizeHttpError,
-  OccEndpointsService,
 } from '@spartacus/core';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccCheckoutAdapter implements CheckoutAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -36,7 +39,9 @@ export class OccCheckoutAdapter implements CheckoutAdapter {
     return this.http
       .get<CheckoutState>(this.getGetCheckoutDetailsEndpoint(userId, cartId))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         }),
diff --git a/feature-libs/customer-ticketing/occ/adapters/occ-customer-ticketing.adapter.ts b/feature-libs/customer-ticketing/occ/adapters/occ-customer-ticketing.adapter.ts
index bdbda0f9904..3a964290d74 100644
--- a/feature-libs/customer-ticketing/occ/adapters/occ-customer-ticketing.adapter.ts
+++ b/feature-libs/customer-ticketing/occ/adapters/occ-customer-ticketing.adapter.ts
@@ -5,14 +5,14 @@
  */
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   ConverterService,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import {
-  CustomerTicketingAdapter,
   CUSTOMER_TICKETING_ASSOCIATED_OBJECTS_NORMALIZER,
   CUSTOMER_TICKETING_CATEGORY_NORMALIZER,
   CUSTOMER_TICKETING_CREATE_NORMALIZER,
@@ -20,6 +20,7 @@ import {
   CUSTOMER_TICKETING_EVENT_NORMALIZER,
   CUSTOMER_TICKETING_FILE_NORMALIZER,
   CUSTOMER_TICKETING_LIST_NORMALIZER,
+  CustomerTicketingAdapter,
 } from '@spartacus/customer-ticketing/core';
 import {
   AssociatedObject,
@@ -36,6 +37,8 @@ import { catchError, map, tap } from 'rxjs/operators';
 
 @Injectable()
 export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -49,7 +52,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         this.getTicketAssociatedObjectsEndpoint(customerId)
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         map(
           (associatedObjectList) =>
             associatedObjectList.ticketAssociatedObjects ?? []
@@ -72,7 +77,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
     return this.http
       .get<CategoriesList>(this.getTicketCategoriesEndpoint())
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         map((categoryList) => categoryList.ticketCategories ?? []),
         this.converter.pipeableMany(CUSTOMER_TICKETING_CATEGORY_NORMALIZER)
       );
@@ -87,7 +94,7 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
       .get<TicketDetails>(this.getTicketEndpoint(customerId, ticketId))
       .pipe(
         catchError((errorResponse) => {
-          return throwError(normalizeHttpError(errorResponse));
+          return throwError(normalizeHttpError(errorResponse, this.logger));
         }),
         tap((ticket) => ticket.ticketEvents?.reverse()),
         this.converter.pipeable(CUSTOMER_TICKETING_DETAILS_NORMALIZER)
@@ -112,7 +119,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         headers: new HttpHeaders().set('Content-Type', 'application/json'),
       })
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(CUSTOMER_TICKETING_CREATE_NORMALIZER)
       );
   }
@@ -136,7 +145,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         this.getTicketsEndpoint(customerId, pageSize, currentPage, sort)
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(CUSTOMER_TICKETING_LIST_NORMALIZER)
       );
   }
@@ -173,7 +184,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         }
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(CUSTOMER_TICKETING_EVENT_NORMALIZER)
       );
   }
@@ -205,7 +218,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         formData
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(CUSTOMER_TICKETING_FILE_NORMALIZER)
       );
   }
@@ -244,7 +259,9 @@ export class OccCustomerTicketingAdapter implements CustomerTicketingAdapter {
         httpOptions
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(CUSTOMER_TICKETING_FILE_NORMALIZER)
       );
   }
diff --git a/feature-libs/order/core/store/effects/consignment-tracking.effect.ts b/feature-libs/order/core/store/effects/consignment-tracking.effect.ts
index 2401a5cb3e5..1ecd927c055 100644
--- a/feature-libs/order/core/store/effects/consignment-tracking.effect.ts
+++ b/feature-libs/order/core/store/effects/consignment-tracking.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { ConsignmentTracking } from '@spartacus/order/root';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -15,6 +15,8 @@ import { OrderActions } from '../actions/index';
 
 @Injectable()
 export class ConsignmentTrackingEffects {
+  protected logger = inject(LoggerService);
+
   loadConsignmentTracking$: Observable<OrderActions.ConsignmentTrackingAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -35,7 +37,7 @@ export class ConsignmentTrackingEffects {
               catchError((error) =>
                 of(
                   new OrderActions.LoadConsignmentTrackingFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/feature-libs/order/core/store/effects/order-details.effect.ts b/feature-libs/order/core/store/effects/order-details.effect.ts
index 9f250a42456..cc58a0a24c7 100644
--- a/feature-libs/order/core/store/effects/order-details.effect.ts
+++ b/feature-libs/order/core/store/effects/order-details.effect.ts
@@ -4,15 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import {
   GlobalMessageService,
   GlobalMessageType,
-  normalizeHttpError,
+  LoggerService,
   SiteContextActions,
   UserIdService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Order } from '@spartacus/order/root';
 import { EMPTY, Observable, of } from 'rxjs';
@@ -29,6 +30,8 @@ import { StateWithOrder } from '../order-state';
 
 @Injectable()
 export class OrderDetailsEffect {
+  protected logger = inject(LoggerService);
+
   loadOrderDetails$: Observable<OrderActions.OrderDetailsAction> = createEffect(
     () =>
       this.actions$.pipe(
@@ -44,7 +47,7 @@ export class OrderDetailsEffect {
               catchError((error) =>
                 of(
                   new OrderActions.LoadOrderDetailsFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -71,7 +74,9 @@ export class OrderDetailsEffect {
               );
 
               return of(
-                new OrderActions.CancelOrderFail(normalizeHttpError(error))
+                new OrderActions.CancelOrderFail(
+                  normalizeHttpError(error, this.logger)
+                )
               );
             })
           );
@@ -102,7 +107,9 @@ export class OrderDetailsEffect {
             }),
             catchError((error) =>
               of(
-                new OrderActions.LoadOrderDetailsFail(normalizeHttpError(error))
+                new OrderActions.LoadOrderDetailsFail(
+                  normalizeHttpError(error, this.logger)
+                )
               )
             )
           );
diff --git a/feature-libs/order/core/store/effects/order-return-request.effect.ts b/feature-libs/order/core/store/effects/order-return-request.effect.ts
index db759817fa5..aed69304fa3 100644
--- a/feature-libs/order/core/store/effects/order-return-request.effect.ts
+++ b/feature-libs/order/core/store/effects/order-return-request.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { ReturnRequest, ReturnRequestList } from '@spartacus/order/root';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -15,6 +15,8 @@ import { OrderActions } from '../actions/index';
 
 @Injectable()
 export class OrderReturnRequestEffect {
+  protected logger = inject(LoggerService);
+
   createReturnRequest$: Observable<OrderActions.OrderReturnRequestAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -33,7 +35,7 @@ export class OrderReturnRequestEffect {
               catchError((error) =>
                 of(
                   new OrderActions.CreateOrderReturnRequestFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -58,7 +60,7 @@ export class OrderReturnRequestEffect {
               catchError((error) =>
                 of(
                   new OrderActions.LoadOrderReturnRequestFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -84,7 +86,7 @@ export class OrderReturnRequestEffect {
               catchError((error) =>
                 of(
                   new OrderActions.CancelOrderReturnRequestFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -118,7 +120,7 @@ export class OrderReturnRequestEffect {
               catchError((error) =>
                 of(
                   new OrderActions.LoadOrderReturnRequestListFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/feature-libs/order/core/store/effects/orders.effect.ts b/feature-libs/order/core/store/effects/orders.effect.ts
index a4f3ffa79e5..40046f9911e 100644
--- a/feature-libs/order/core/store/effects/orders.effect.ts
+++ b/feature-libs/order/core/store/effects/orders.effect.ts
@@ -4,9 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError, SiteContextActions } from '@spartacus/core';
+import {
+  LoggerService,
+  SiteContextActions,
+  normalizeHttpError,
+} from '@spartacus/core';
 import { OrderHistoryList } from '@spartacus/order/root';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -18,6 +22,8 @@ import { OrderActions } from '../actions/index';
 
 @Injectable()
 export class OrdersEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private orderConnector: OrderHistoryConnector,
@@ -50,7 +56,11 @@ export class OrdersEffect {
               return new OrderActions.LoadUserOrdersSuccess(orders);
             }),
             catchError((error) =>
-              of(new OrderActions.LoadUserOrdersFail(normalizeHttpError(error)))
+              of(
+                new OrderActions.LoadUserOrdersFail(
+                  normalizeHttpError(error, this.logger)
+                )
+              )
             )
           );
         })
diff --git a/feature-libs/order/core/store/effects/replenishment-order-details.effect.ts b/feature-libs/order/core/store/effects/replenishment-order-details.effect.ts
index 96ac072b00f..64429bc17b6 100644
--- a/feature-libs/order/core/store/effects/replenishment-order-details.effect.ts
+++ b/feature-libs/order/core/store/effects/replenishment-order-details.effect.ts
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   GlobalMessageService,
   GlobalMessageType,
+  LoggerService,
   normalizeHttpError,
 } from '@spartacus/core';
 import { ReplenishmentOrder } from '@spartacus/order/root';
@@ -19,6 +20,8 @@ import { OrderActions } from '../actions/index';
 
 @Injectable()
 export class ReplenishmentOrderDetailsEffect {
+  protected logger = inject(LoggerService);
+
   loadReplenishmentOrderDetails$: Observable<OrderActions.ReplenishmentOrderDetailsAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -38,7 +41,7 @@ export class ReplenishmentOrderDetailsEffect {
               catchError((error) =>
                 of(
                   new OrderActions.LoadReplenishmentOrderDetailsFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -75,7 +78,7 @@ export class ReplenishmentOrderDetailsEffect {
 
                 return of(
                   new OrderActions.CancelReplenishmentOrderFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 );
               })
diff --git a/feature-libs/order/core/store/effects/replenishment-orders.effect.ts b/feature-libs/order/core/store/effects/replenishment-orders.effect.ts
index ec9b74a33ec..38f0bd2b405 100644
--- a/feature-libs/order/core/store/effects/replenishment-orders.effect.ts
+++ b/feature-libs/order/core/store/effects/replenishment-orders.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { ReplenishmentOrderList } from '@spartacus/order/root';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -15,6 +15,8 @@ import { OrderActions } from '../actions/index';
 
 @Injectable()
 export class ReplenishmentOrdersEffect {
+  protected logger = inject(LoggerService);
+
   loadUserReplenishmentOrders$: Observable<OrderActions.UserReplenishmentOrdersAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -39,7 +41,7 @@ export class ReplenishmentOrdersEffect {
               catchError((error) =>
                 of(
                   new OrderActions.LoadUserReplenishmentOrdersFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/feature-libs/order/occ/adapters/occ-order.adapter.ts b/feature-libs/order/occ/adapters/occ-order.adapter.ts
index 6bf27f2e1b6..07a13e370e2 100644
--- a/feature-libs/order/occ/adapters/occ-order.adapter.ts
+++ b/feature-libs/order/occ/adapters/occ-order.adapter.ts
@@ -5,25 +5,28 @@
  */
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
-  backOff,
   ConverterService,
   InterceptorUtil,
-  isJaloError,
-  normalizeHttpError,
+  LoggerService,
+  OCC_USER_ID_ANONYMOUS,
   Occ,
   OccEndpointsService,
-  OCC_USER_ID_ANONYMOUS,
   USE_CLIENT_TOKEN,
+  backOff,
+  isJaloError,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { OrderAdapter } from '@spartacus/order/core';
-import { Order, ORDER_NORMALIZER } from '@spartacus/order/root';
+import { ORDER_NORMALIZER, Order } from '@spartacus/order/root';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccOrderAdapter implements OrderAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -50,7 +53,9 @@ export class OccOrderAdapter implements OrderAdapter {
         { headers }
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({
           shouldRetry: isJaloError,
         }),
diff --git a/feature-libs/order/occ/adapters/occ-reorder-order.adapter.ts b/feature-libs/order/occ/adapters/occ-reorder-order.adapter.ts
index 2184adb8fb8..51625589b5f 100644
--- a/feature-libs/order/occ/adapters/occ-reorder-order.adapter.ts
+++ b/feature-libs/order/occ/adapters/occ-reorder-order.adapter.ts
@@ -5,12 +5,13 @@
  */
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { CartModificationList } from '@spartacus/cart/base/root';
 import {
   ConverterService,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { ReorderOrderAdapter } from '@spartacus/order/core';
 import { REORDER_ORDER_NORMALIZER } from '@spartacus/order/root';
@@ -19,6 +20,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccReorderOrderAdapter implements ReorderOrderAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -31,7 +34,9 @@ export class OccReorderOrderAdapter implements ReorderOrderAdapter {
     return this.http
       .post(this.getReorderOrderEndpoint(orderId, userId), {}, { headers })
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(REORDER_ORDER_NORMALIZER)
       );
   }
diff --git a/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.ts b/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.ts
index 8b93cbfe92b..539e171cc5a 100644
--- a/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.ts
+++ b/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.ts
@@ -5,19 +5,20 @@
  */
 
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
-  backOff,
   ConverterService,
+  LoggerService,
+  OccEndpointsService,
+  backOff,
   isJaloError,
   normalizeHttpError,
-  OccEndpointsService,
 } from '@spartacus/core';
 import { ScheduledReplenishmentOrderAdapter } from '@spartacus/order/core';
 import {
-  ReplenishmentOrder,
   REPLENISHMENT_ORDER_FORM_SERIALIZER,
   REPLENISHMENT_ORDER_NORMALIZER,
+  ReplenishmentOrder,
   ScheduleReplenishmentForm,
 } from '@spartacus/order/root';
 import { Observable, throwError } from 'rxjs';
@@ -27,6 +28,8 @@ import { catchError } from 'rxjs/operators';
 export class OccScheduledReplenishmentOrderAdapter
   implements ScheduledReplenishmentOrderAdapter
 {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -57,7 +60,9 @@ export class OccScheduledReplenishmentOrderAdapter
         { headers }
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         backOff({ shouldRetry: isJaloError }),
         this.converter.pipeable(REPLENISHMENT_ORDER_NORMALIZER)
       );
diff --git a/feature-libs/organization/account-summary/occ/adapters/occ-account-summary.adapter.ts b/feature-libs/organization/account-summary/occ/adapters/occ-account-summary.adapter.ts
index d7523dfc103..fa811f50ab8 100644
--- a/feature-libs/organization/account-summary/occ/adapters/occ-account-summary.adapter.ts
+++ b/feature-libs/organization/account-summary/occ/adapters/occ-account-summary.adapter.ts
@@ -5,16 +5,17 @@
  */
 
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   ConverterService,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import {
-  AccountSummaryAdapter,
   ACCOUNT_SUMMARY_DOCUMENT_NORMALIZER,
   ACCOUNT_SUMMARY_NORMALIZER,
+  AccountSummaryAdapter,
 } from '@spartacus/organization/account-summary/core';
 import {
   AccountSummaryDetails,
@@ -26,6 +27,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccAccountSummaryAdapter implements AccountSummaryAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -42,7 +45,7 @@ export class OccAccountSummaryAdapter implements AccountSummaryAdapter {
       )
       .pipe(
         catchError((error: HttpErrorResponse) =>
-          throwError(normalizeHttpError(error))
+          throwError(normalizeHttpError(error, this.logger))
         ),
         this.converter.pipeable(ACCOUNT_SUMMARY_NORMALIZER)
       );
@@ -59,7 +62,7 @@ export class OccAccountSummaryAdapter implements AccountSummaryAdapter {
       )
       .pipe(
         catchError((error: HttpErrorResponse) =>
-          throwError(normalizeHttpError(error))
+          throwError(normalizeHttpError(error, this.logger))
         ),
         this.converter.pipeable(ACCOUNT_SUMMARY_DOCUMENT_NORMALIZER)
       );
@@ -87,7 +90,7 @@ export class OccAccountSummaryAdapter implements AccountSummaryAdapter {
       )
       .pipe(
         catchError((error: HttpErrorResponse) =>
-          throwError(normalizeHttpError(error))
+          throwError(normalizeHttpError(error, this.logger))
         )
       );
   }
diff --git a/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts b/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
index 5b27f5414ae..4e4b2223f79 100644
--- a/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/b2b-user.effect.ts
@@ -5,22 +5,23 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   AuthActions,
   B2BUser,
   B2BUserRole,
   EntitiesModel,
-  normalizeHttpError,
+  LoggerService,
   RouterState,
   RoutingService,
   StateUtils,
   User,
   UserIdService,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { UserAccountFacade } from '@spartacus/user/account/root';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import {
   catchError,
   groupBy,
@@ -36,14 +37,16 @@ import { Permission } from '../../model/permission.model';
 import { UserGroup } from '../../model/user-group.model';
 import {
   B2BUserActions,
-  OrganizationActions,
   OrgUnitActions,
+  OrganizationActions,
   PermissionActions,
   UserGroupActions,
 } from '../actions/index';
 
 @Injectable()
 export class B2BUserEffects {
+  protected logger = inject(LoggerService);
+
   loadB2BUser$: Observable<
     B2BUserActions.LoadB2BUserSuccess | B2BUserActions.LoadB2BUserFail
   > = createEffect(() =>
@@ -59,7 +62,7 @@ export class B2BUserEffects {
             of(
               new B2BUserActions.LoadB2BUserFail({
                 orgCustomerId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -113,7 +116,7 @@ export class B2BUserEffects {
             from([
               new B2BUserActions.CreateB2BUserFail({
                 orgCustomerId: orgCustomer.customerId ?? '',
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
               new OrganizationActions.OrganizationClearData(),
             ])
@@ -158,7 +161,7 @@ export class B2BUserEffects {
               from([
                 new B2BUserActions.UpdateB2BUserFail({
                   orgCustomerId: orgCustomer.customerId ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -224,7 +227,7 @@ export class B2BUserEffects {
             of(
               new B2BUserActions.LoadB2BUsersFail({
                 params: payload.params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -273,7 +276,7 @@ export class B2BUserEffects {
                     new B2BUserActions.LoadB2BUserApproversFail({
                       orgCustomerId: payload.orgCustomerId,
                       params: payload.params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -324,7 +327,7 @@ export class B2BUserEffects {
                     new B2BUserActions.LoadB2BUserPermissionsFail({
                       orgCustomerId: payload.orgCustomerId,
                       params: payload.params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -375,7 +378,7 @@ export class B2BUserEffects {
                     new B2BUserActions.LoadB2BUserUserGroupsFail({
                       orgCustomerId: payload.orgCustomerId,
                       params: payload.params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -416,7 +419,7 @@ export class B2BUserEffects {
                 new B2BUserActions.AssignB2BUserApproverFail({
                   orgCustomerId: payload.orgCustomerId,
                   approverId: payload.approverId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -456,7 +459,7 @@ export class B2BUserEffects {
                 new B2BUserActions.UnassignB2BUserApproverFail({
                   orgCustomerId: payload.orgCustomerId,
                   approverId: payload.approverId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -494,7 +497,7 @@ export class B2BUserEffects {
                 new B2BUserActions.AssignB2BUserPermissionFail({
                   orgCustomerId: payload.orgCustomerId,
                   permissionId: payload.permissionId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -532,7 +535,7 @@ export class B2BUserEffects {
                 new B2BUserActions.UnassignB2BUserPermissionFail({
                   orgCustomerId: payload.orgCustomerId,
                   permissionId: payload.permissionId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -570,7 +573,7 @@ export class B2BUserEffects {
                 new B2BUserActions.AssignB2BUserUserGroupFail({
                   orgCustomerId: payload.orgCustomerId,
                   userGroupId: payload.userGroupId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -616,7 +619,7 @@ export class B2BUserEffects {
                 new B2BUserActions.UnassignB2BUserUserGroupFail({
                   orgCustomerId: payload.orgCustomerId,
                   userGroupId: payload.userGroupId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
diff --git a/feature-libs/organization/administration/core/store/effects/budget.effect.ts b/feature-libs/organization/administration/core/store/effects/budget.effect.ts
index fd6015ac8a9..05993fa3d24 100644
--- a/feature-libs/organization/administration/core/store/effects/budget.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/budget.effect.ts
@@ -5,10 +5,15 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { EntitiesModel, normalizeHttpError, StateUtils } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import {
+  EntitiesModel,
+  LoggerService,
+  StateUtils,
+  normalizeHttpError,
+} from '@spartacus/core';
+import { Observable, from, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 import { BudgetConnector } from '../../connectors/budget/budget.connector';
 import { Budget } from '../../model/budget.model';
@@ -16,6 +21,8 @@ import { BudgetActions, OrganizationActions } from '../actions/index';
 
 @Injectable()
 export class BudgetEffects {
+  protected logger = inject(LoggerService);
+
   loadBudget$: Observable<
     BudgetActions.LoadBudgetSuccess | BudgetActions.LoadBudgetFail
   > = createEffect(() =>
@@ -31,7 +38,7 @@ export class BudgetEffects {
             of(
               new BudgetActions.LoadBudgetFail({
                 budgetCode,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -67,7 +74,7 @@ export class BudgetEffects {
             of(
               new BudgetActions.LoadBudgetsFail({
                 params: payload.params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -94,7 +101,7 @@ export class BudgetEffects {
             from([
               new BudgetActions.CreateBudgetFail({
                 budgetCode: payload.budget.code ?? '',
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
               new OrganizationActions.OrganizationClearData(),
             ])
@@ -124,7 +131,7 @@ export class BudgetEffects {
               from([
                 new BudgetActions.UpdateBudgetFail({
                   budgetCode: payload.budget.code ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
diff --git a/feature-libs/organization/administration/core/store/effects/cost-center.effect.ts b/feature-libs/organization/administration/core/store/effects/cost-center.effect.ts
index ee7bc32ae43..92e816f53f0 100644
--- a/feature-libs/organization/administration/core/store/effects/cost-center.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/cost-center.effect.ts
@@ -5,15 +5,16 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   CostCenter,
   EntitiesModel,
-  normalizeHttpError,
+  LoggerService,
   StateUtils,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import { catchError, groupBy, map, mergeMap, switchMap } from 'rxjs/operators';
 import { CostCenterConnector } from '../../connectors/cost-center/cost-center.connector';
 import { Budget } from '../../model/budget.model';
@@ -25,6 +26,8 @@ import {
 
 @Injectable()
 export class CostCenterEffects {
+  protected logger = inject(LoggerService);
+
   loadCostCenter$: Observable<
     | CostCenterActions.LoadCostCenterSuccess
     | CostCenterActions.LoadCostCenterFail
@@ -41,7 +44,7 @@ export class CostCenterEffects {
             of(
               new CostCenterActions.LoadCostCenterFail({
                 costCenterCode,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -77,7 +80,7 @@ export class CostCenterEffects {
             of(
               new CostCenterActions.LoadCostCentersFail({
                 params: payload.params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -106,7 +109,7 @@ export class CostCenterEffects {
               from([
                 new CostCenterActions.CreateCostCenterFail({
                   costCenterCode: payload.costCenter.code ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -136,7 +139,7 @@ export class CostCenterEffects {
               from([
                 new CostCenterActions.UpdateCostCenterFail({
                   costCenterCode: payload.costCenter.code ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -182,7 +185,7 @@ export class CostCenterEffects {
                     new CostCenterActions.LoadAssignedBudgetsFail({
                       costCenterCode,
                       params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -216,7 +219,7 @@ export class CostCenterEffects {
               from([
                 new CostCenterActions.AssignBudgetFail({
                   budgetCode,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -249,7 +252,7 @@ export class CostCenterEffects {
               from([
                 new CostCenterActions.UnassignBudgetFail({
                   budgetCode,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
diff --git a/feature-libs/organization/administration/core/store/effects/org-unit.effect.ts b/feature-libs/organization/administration/core/store/effects/org-unit.effect.ts
index b1a0ccab5c4..67786e5e6a7 100644
--- a/feature-libs/organization/administration/core/store/effects/org-unit.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/org-unit.effect.ts
@@ -5,28 +5,31 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   B2BApprovalProcess,
   B2BUnit,
   B2BUser,
   EntitiesModel,
-  normalizeHttpError,
+  LoggerService,
   StateUtils,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import { catchError, groupBy, map, mergeMap, switchMap } from 'rxjs/operators';
 import { OrgUnitConnector } from '../../connectors/org-unit/org-unit.connector';
 import { B2BUnitNode } from '../../model/unit-node.model';
 import {
   B2BUserActions,
-  OrganizationActions,
   OrgUnitActions,
+  OrganizationActions,
 } from '../actions/index';
 
 @Injectable()
 export class OrgUnitEffects {
+  protected logger = inject(LoggerService);
+
   loadOrgUnit$: Observable<
     | OrgUnitActions.LoadOrgUnitSuccess
     | OrgUnitActions.LoadAddressSuccess
@@ -53,7 +56,7 @@ export class OrgUnitEffects {
             of(
               new OrgUnitActions.LoadOrgUnitFail({
                 orgUnitId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -77,7 +80,7 @@ export class OrgUnitEffects {
           catchError((error: HttpErrorResponse) =>
             of(
               new OrgUnitActions.LoadOrgUnitNodesFail({
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -104,7 +107,7 @@ export class OrgUnitEffects {
             from([
               new OrgUnitActions.CreateUnitFail({
                 unitCode: payload.unit.uid ?? '',
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
               new OrganizationActions.OrganizationClearData(),
             ])
@@ -135,7 +138,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.UpdateUnitFail({
                   unitCode: payload.unit.uid ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -160,7 +163,7 @@ export class OrgUnitEffects {
           catchError((error: HttpErrorResponse) =>
             of(
               new OrgUnitActions.LoadTreeFail({
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -185,7 +188,7 @@ export class OrgUnitEffects {
           catchError((error: HttpErrorResponse) =>
             of(
               new OrgUnitActions.LoadApprovalProcessesFail({
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -232,7 +235,7 @@ export class OrgUnitEffects {
                       orgUnitId,
                       roleId,
                       params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -263,7 +266,7 @@ export class OrgUnitEffects {
             of(
               new OrgUnitActions.AssignRoleFail({
                 orgCustomerId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -292,7 +295,7 @@ export class OrgUnitEffects {
             of(
               new OrgUnitActions.UnassignRoleFail({
                 orgCustomerId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -325,7 +328,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.AssignApproverFail({
                   orgCustomerId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -359,7 +362,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.UnassignApproverFail({
                   orgCustomerId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -390,7 +393,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.CreateAddressFail({
                   addressId: payload.address.id ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -422,7 +425,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.UpdateAddressFail({
                   addressId: address.id ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -454,7 +457,7 @@ export class OrgUnitEffects {
               from([
                 new OrgUnitActions.DeleteAddressFail({
                   addressId: payload.addressId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
diff --git a/feature-libs/organization/administration/core/store/effects/permission.effect.ts b/feature-libs/organization/administration/core/store/effects/permission.effect.ts
index 9a33d90a6a8..6f9be997c81 100644
--- a/feature-libs/organization/administration/core/store/effects/permission.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/permission.effect.ts
@@ -5,15 +5,16 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   EntitiesModel,
-  normalizeHttpError,
+  LoggerService,
   OrderApprovalPermissionType,
   StateUtils,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 import { PermissionConnector } from '../../connectors/permission/permission.connector';
 import { Permission } from '../../model/permission.model';
@@ -21,6 +22,8 @@ import { OrganizationActions, PermissionActions } from '../actions';
 
 @Injectable()
 export class PermissionEffects {
+  protected logger = inject(LoggerService);
+
   loadPermission$: Observable<
     | PermissionActions.LoadPermissionSuccess
     | PermissionActions.LoadPermissionFail
@@ -37,7 +40,7 @@ export class PermissionEffects {
             of(
               new PermissionActions.LoadPermissionFail({
                 permissionCode,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -73,7 +76,7 @@ export class PermissionEffects {
             of(
               new PermissionActions.LoadPermissionsFail({
                 params: payload.params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -102,7 +105,7 @@ export class PermissionEffects {
               from([
                 new PermissionActions.CreatePermissionFail({
                   permissionCode: payload.permission.code ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -132,7 +135,7 @@ export class PermissionEffects {
               from([
                 new PermissionActions.UpdatePermissionFail({
                   permissionCode: payload.permission.code ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -159,7 +162,7 @@ export class PermissionEffects {
           catchError((error: HttpErrorResponse) =>
             of(
               new PermissionActions.LoadPermissionTypesFail({
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
diff --git a/feature-libs/organization/administration/core/store/effects/user-group.effect.ts b/feature-libs/organization/administration/core/store/effects/user-group.effect.ts
index 8445509a03d..8ca9c8257ce 100644
--- a/feature-libs/organization/administration/core/store/effects/user-group.effect.ts
+++ b/feature-libs/organization/administration/core/store/effects/user-group.effect.ts
@@ -5,15 +5,16 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   B2BUser,
   EntitiesModel,
-  normalizeHttpError,
+  LoggerService,
   StateUtils,
+  normalizeHttpError,
 } from '@spartacus/core';
-import { from, Observable, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import { catchError, groupBy, map, mergeMap, switchMap } from 'rxjs/operators';
 import { UserGroupConnector } from '../../connectors/user-group/user-group.connector';
 import { Permission } from '../../model/permission.model';
@@ -27,6 +28,8 @@ import {
 
 @Injectable()
 export class UserGroupEffects {
+  protected logger = inject(LoggerService);
+
   loadUserGroup$: Observable<
     UserGroupActions.LoadUserGroupSuccess | UserGroupActions.LoadUserGroupFail
   > = createEffect(() =>
@@ -42,7 +45,7 @@ export class UserGroupEffects {
             of(
               new UserGroupActions.LoadUserGroupFail({
                 userGroupId,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -78,7 +81,7 @@ export class UserGroupEffects {
             of(
               new UserGroupActions.LoadUserGroupsFail({
                 params: payload.params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -127,7 +130,7 @@ export class UserGroupEffects {
                     new UserGroupActions.LoadPermissionsFail({
                       userGroupId: payload.userGroupId,
                       params: payload.params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -180,7 +183,7 @@ export class UserGroupEffects {
                     new UserGroupActions.LoadAvailableOrgCustomersFail({
                       userGroupId: payload.userGroupId,
                       params: payload.params,
-                      error: normalizeHttpError(error),
+                      error: normalizeHttpError(error, this.logger),
                     })
                   )
                 )
@@ -209,7 +212,7 @@ export class UserGroupEffects {
             from([
               new UserGroupActions.CreateUserGroupFail({
                 userGroupId: payload.userGroup.uid ?? '',
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
               new OrganizationActions.OrganizationClearData(),
             ])
@@ -240,7 +243,7 @@ export class UserGroupEffects {
               from([
                 new UserGroupActions.UpdateUserGroupFail({
                   userGroupId: payload.userGroup.uid ?? '',
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -270,7 +273,7 @@ export class UserGroupEffects {
               from([
                 new UserGroupActions.DeleteUserGroupFail({
                   userGroupId: payload.userGroupId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -308,7 +311,7 @@ export class UserGroupEffects {
                 new UserGroupActions.AssignPermissionFail({
                   userGroupId: payload.userGroupId,
                   permissionUid: payload.permissionUid,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -342,7 +345,7 @@ export class UserGroupEffects {
                 new UserGroupActions.AssignMemberFail({
                   userGroupId: payload.userGroupId,
                   customerId: payload.customerId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -380,7 +383,7 @@ export class UserGroupEffects {
                 new UserGroupActions.UnassignMemberFail({
                   userGroupId: payload.userGroupId,
                   customerId: payload.customerId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -418,7 +421,7 @@ export class UserGroupEffects {
                 new UserGroupActions.UnassignPermissionFail({
                   userGroupId: payload.userGroupId,
                   permissionUid: payload.permissionUid,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
@@ -450,7 +453,7 @@ export class UserGroupEffects {
               from([
                 new UserGroupActions.UnassignAllMembersFail({
                   userGroupId: payload.userGroupId,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
                 new OrganizationActions.OrganizationClearData(),
               ])
diff --git a/feature-libs/organization/order-approval/core/store/effects/order-approval.effect.ts b/feature-libs/organization/order-approval/core/store/effects/order-approval.effect.ts
index f84586f5eb8..89f2b4bf210 100644
--- a/feature-libs/organization/order-approval/core/store/effects/order-approval.effect.ts
+++ b/feature-libs/organization/order-approval/core/store/effects/order-approval.effect.ts
@@ -5,13 +5,14 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   EntitiesModel,
-  normalizeHttpError,
-  StateUtils,
+  LoggerService,
   OCC_USER_ID_ANONYMOUS,
+  StateUtils,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { catchError, filter, map, switchMap } from 'rxjs/operators';
@@ -21,6 +22,8 @@ import { OrderApprovalActions } from '../actions/index';
 
 @Injectable()
 export class OrderApprovalEffects {
+  protected logger = inject(LoggerService);
+
   loadOrderApproval$: Observable<
     | OrderApprovalActions.LoadOrderApprovalSuccess
     | OrderApprovalActions.LoadOrderApprovalFail
@@ -40,7 +43,7 @@ export class OrderApprovalEffects {
             of(
               new OrderApprovalActions.LoadOrderApprovalFail({
                 orderApprovalCode,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -77,7 +80,7 @@ export class OrderApprovalEffects {
             of(
               new OrderApprovalActions.LoadOrderApprovalsFail({
                 params: params,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               })
             )
           )
@@ -113,7 +116,7 @@ export class OrderApprovalEffects {
               of(
                 new OrderApprovalActions.MakeDecisionFail({
                   orderApprovalCode: orderApprovalCode,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 })
               )
             )
diff --git a/feature-libs/organization/unit-order/core/store/effects/unit-order.effect.ts b/feature-libs/organization/unit-order/core/store/effects/unit-order.effect.ts
index fd1cceb1158..aebcb163fd1 100644
--- a/feature-libs/organization/unit-order/core/store/effects/unit-order.effect.ts
+++ b/feature-libs/organization/unit-order/core/store/effects/unit-order.effect.ts
@@ -4,9 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError, SiteContextActions } from '@spartacus/core';
+import {
+  LoggerService,
+  SiteContextActions,
+  normalizeHttpError,
+} from '@spartacus/core';
 import { Order, OrderHistoryList } from '@spartacus/order/root';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -15,6 +19,8 @@ import { UnitOrderActions } from '../actions';
 
 @Injectable()
 export class UnitOrderEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private orderConnector: UnitOrderConnector
@@ -41,7 +47,7 @@ export class UnitOrderEffect {
               catchError((error) =>
                 of(
                   new UnitOrderActions.LoadUnitOrdersFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -75,7 +81,7 @@ export class UnitOrderEffect {
               catchError((error) =>
                 of(
                   new UnitOrderActions.LoadOrderDetailsFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/feature-libs/organization/user-registration/occ/adapters/occ-user-registration.adapter.ts b/feature-libs/organization/user-registration/occ/adapters/occ-user-registration.adapter.ts
index 7df0700767c..c0d2a94b29c 100644
--- a/feature-libs/organization/user-registration/occ/adapters/occ-user-registration.adapter.ts
+++ b/feature-libs/organization/user-registration/occ/adapters/occ-user-registration.adapter.ts
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable, inject } from '@angular/core';
 import {
   ConverterService,
   InterceptorUtil,
-  normalizeHttpError,
+  LoggerService,
   OccEndpointsService,
   USE_CLIENT_TOKEN,
+  normalizeHttpError,
 } from '@spartacus/core';
 import {
   ORGANIZATION_USER_REGISTRATION_SERIALIZER,
@@ -25,6 +26,8 @@ import { catchError } from 'rxjs/operators';
   providedIn: 'root',
 })
 export class OccUserRegistrationAdapter implements UserRegistrationAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -46,7 +49,11 @@ export class OccUserRegistrationAdapter implements UserRegistrationAdapter {
 
     return this.http
       .post<OrganizationUserRegistration>(url, userData, { headers })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   protected getOrganizationUserRegistrationEndpoint(): string {
diff --git a/feature-libs/pickup-in-store/core/store/effects/pickup-location.effect.ts b/feature-libs/pickup-in-store/core/store/effects/pickup-location.effect.ts
index edad494e7ce..6f073bfbd0c 100644
--- a/feature-libs/pickup-in-store/core/store/effects/pickup-location.effect.ts
+++ b/feature-libs/pickup-in-store/core/store/effects/pickup-location.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { of } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 import { PickupLocationConnector } from '../../connectors';
@@ -14,6 +14,8 @@ import * as PickupLocationActions from '../actions/pickup-location.action';
 
 @Injectable()
 export class PickupLocationEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private pickupLocationConnector: PickupLocationConnector
@@ -39,7 +41,7 @@ export class PickupLocationEffect {
           catchError((error) =>
             of(
               PickupLocationActions.SetStoreDetailsFailure({
-                payload: normalizeHttpError(error),
+                payload: normalizeHttpError(error, this.logger),
               })
             )
           )
diff --git a/feature-libs/pickup-in-store/core/store/effects/stock.effect.ts b/feature-libs/pickup-in-store/core/store/effects/stock.effect.ts
index f662b94ab64..7d78d26f436 100644
--- a/feature-libs/pickup-in-store/core/store/effects/stock.effect.ts
+++ b/feature-libs/pickup-in-store/core/store/effects/stock.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { of } from 'rxjs';
 import { catchError, concatMap, map, switchMap } from 'rxjs/operators';
 import { StockConnector } from '../../connectors/index';
@@ -14,6 +14,8 @@ import { StockLevelActions } from '../actions/index';
 
 @Injectable()
 export class StockEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private stockConnector: StockConnector
@@ -35,7 +37,11 @@ export class StockEffect {
               })
           ),
           catchError((error) =>
-            of(new StockLevelActions.StockLevelFail(normalizeHttpError(error)))
+            of(
+              new StockLevelActions.StockLevelFail(
+                normalizeHttpError(error, this.logger)
+              )
+            )
           )
         )
       )
diff --git a/feature-libs/pickup-in-store/occ/adapters/occ-pickup-location.adapter.ts b/feature-libs/pickup-in-store/occ/adapters/occ-pickup-location.adapter.ts
index 032e10d7081..aa58edac811 100644
--- a/feature-libs/pickup-in-store/occ/adapters/occ-pickup-location.adapter.ts
+++ b/feature-libs/pickup-in-store/occ/adapters/occ-pickup-location.adapter.ts
@@ -5,8 +5,9 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
+  LoggerService,
   normalizeHttpError,
   OccEndpointsService,
   PointOfService,
@@ -17,6 +18,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccPickupLocationAdapter implements PickupLocationAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpointsService: OccEndpointsService
@@ -32,6 +35,10 @@ export class OccPickupLocationAdapter implements PickupLocationAdapter {
           queryParams: { fields: 'FULL' },
         })
       )
-      .pipe(catchError((error: any) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error: any) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 }
diff --git a/feature-libs/pickup-in-store/occ/adapters/occ-stock.adapter.ts b/feature-libs/pickup-in-store/occ/adapters/occ-stock.adapter.ts
index 4a6dd5c9f55..e7dc6fefa93 100644
--- a/feature-libs/pickup-in-store/occ/adapters/occ-stock.adapter.ts
+++ b/feature-libs/pickup-in-store/occ/adapters/occ-stock.adapter.ts
@@ -5,8 +5,9 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
+  LoggerService,
   normalizeHttpError,
   OccEndpointsService,
   Stock,
@@ -22,6 +23,8 @@ import { catchError } from 'rxjs/operators';
  */
 @Injectable()
 export class OccStockAdapter implements StockAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpointsService: OccEndpointsService
@@ -40,7 +43,11 @@ export class OccStockAdapter implements StockAdapter {
           queryParams: { ...location, fields: 'FULL' },
         })
       )
-      .pipe(catchError((error: any) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error: any) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   loadStockLevelAtStore(
@@ -53,6 +60,10 @@ export class OccStockAdapter implements StockAdapter {
           urlParams: { productCode, storeName },
         })
       )
-      .pipe(catchError((error: any) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error: any) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 }
diff --git a/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts b/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts
index 94863238b1f..b4a0bf27134 100644
--- a/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts
+++ b/feature-libs/product-configurator/common/components/configurator-cart-entry-bundle-info/configurator-cart-entry-bundle-info.service.ts
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import { OrderEntry } from '@spartacus/cart/base/root';
+import { LoggerService } from '@spartacus/core';
 import {
   ConfigurationInfo,
   ConfigurationInfoFields,
@@ -18,6 +19,8 @@ import { LineItem } from './configurator-cart-entry-bundle-info.model';
  */
 @Injectable({ providedIn: 'root' })
 export class ConfiguratorCartEntryBundleInfoService {
+  protected logger = inject(LoggerService);
+
   /**
    * Retrieves the CPQ line items for an order entry
    *
@@ -174,7 +177,7 @@ export class ConfiguratorCartEntryBundleInfoService {
 
   protected logWarning(text: string): void {
     if (isDevMode()) {
-      console.warn(text);
+      this.logger.warn(text);
     }
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.directive.ts b/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.directive.ts
index 70f99c6426b..77b7d20cba9 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.directive.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/composition/configurator-attribute-composition.directive.ts
@@ -6,12 +6,14 @@
 
 import {
   Directive,
+  inject,
   Injector,
   Input,
   isDevMode,
   OnInit,
   ViewContainerRef,
 } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { ConfiguratorAttributeCompositionConfig } from './configurator-attribute-composition.config';
 import { ConfiguratorAttributeCompositionContext } from './configurator-attribute-composition.model';
 
@@ -22,6 +24,8 @@ export class ConfiguratorAttributeCompositionDirective implements OnInit {
   @Input('cxConfiguratorAttributeComponent')
   context: ConfiguratorAttributeCompositionContext;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected vcr: ViewContainerRef,
     protected configuratorAttributeCompositionConfig: ConfiguratorAttributeCompositionConfig
@@ -45,7 +49,7 @@ export class ConfiguratorAttributeCompositionDirective implements OnInit {
       });
     } else {
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           'No attribute type component available for: ' + componentKey
         );
       }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
index 63258d7cf07..4de8062a3b6 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
@@ -7,9 +7,11 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  inject,
   isDevMode,
   OnInit,
 } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable } from 'rxjs';
@@ -19,9 +21,9 @@ import {
   ConfiguratorGroupsService,
 } from '../../../core';
 import { Configurator } from '../../../core/model/configurator.model';
-import { ConfiguratorAttributeCompositionContext } from '../composition/configurator-attribute-composition.model';
 import { ConfiguratorUISettingsConfig } from '../../config/configurator-ui-settings.config';
 import { ConfiguratorStorefrontUtilsService } from '../../service/configurator-storefront-utils.service';
+import { ConfiguratorAttributeCompositionContext } from '../composition/configurator-attribute-composition.model';
 import { ConfiguratorAttributeBaseComponent } from '../types/base/configurator-attribute-base.component';
 
 @Component({
@@ -43,6 +45,8 @@ export class ConfiguratorAttributeHeaderComponent
   iconTypes = ICON_TYPE;
   showRequiredMessageForDomainAttribute$: Observable<boolean>;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected configUtils: ConfiguratorStorefrontUtilsService,
     protected configuratorCommonsService: ConfiguratorCommonsService,
@@ -238,7 +242,7 @@ export class ConfiguratorAttributeHeaderComponent
 
   protected logError(text: string): void {
     if (isDevMode()) {
-      console.error(text);
+      this.logger.error(text);
     }
   }
 
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox-list/configurator-attribute-checkbox-list.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox-list/configurator-attribute-checkbox-list.component.ts
index 19d2a8937b6..37199744ecf 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox-list/configurator-attribute-checkbox-list.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/checkbox-list/configurator-attribute-checkbox-list.component.ts
@@ -7,16 +7,18 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  inject,
   isDevMode,
   OnInit,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
+import { LoggerService } from '@spartacus/core';
+import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { Configurator } from '../../../../core/model/configurator.model';
-import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
+import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorAttributeQuantityService } from '../../quantity/configurator-attribute-quantity.service';
 import { ConfiguratorAttributeMultiSelectionBaseComponent } from '../base/configurator-attribute-multi-selection-base.component';
-import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 
 @Component({
   selector: 'cx-configurator-attribute-checkbox-list',
@@ -31,6 +33,8 @@ export class ConfiguratorAttributeCheckBoxListComponent
 
   group: string;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected configUtilsService: ConfiguratorStorefrontUtilsService,
     protected quantityService: ConfiguratorAttributeQuantityService,
@@ -104,7 +108,7 @@ export class ConfiguratorAttributeCheckBoxListComponent
 
     if (!value) {
       if (isDevMode()) {
-        console.warn('no value for event:', eventObject);
+        this.logger.warn('no value for event:', eventObject);
       }
 
       return;
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
index 7b329e2f5ff..211dbccd673 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
@@ -8,25 +8,30 @@ import { getLocaleId } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
+  inject,
   isDevMode,
   OnDestroy,
   OnInit,
   Optional,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-import { FeatureConfigService, TranslationService } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  LoggerService,
+  TranslationService,
+} from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { timer } from 'rxjs';
 import { debounce, take } from 'rxjs/operators';
-import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
+import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { ConfiguratorUISettingsConfig } from '../../../config/configurator-ui-settings.config';
+import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorAttributeInputFieldComponent } from '../input-field/configurator-attribute-input-field.component';
 import {
   ConfiguratorAttributeNumericInputFieldService,
   ConfiguratorAttributeNumericInterval,
 } from './configurator-attribute-numeric-input-field.component.service';
-import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 
 class DefaultSettings {
   numDecimalPlaces: number;
@@ -49,6 +54,8 @@ export class ConfiguratorAttributeNumericInputFieldComponent
   intervals: ConfiguratorAttributeNumericInterval[] = [];
   language: string;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     configAttributeNumericInputFieldService: ConfiguratorAttributeNumericInputFieldService,
     config: ConfiguratorUISettingsConfig,
@@ -153,7 +160,7 @@ export class ConfiguratorAttributeNumericInputFieldComponent
       numTotalLength = defaultSettings.numTotalLength;
       negativeAllowed = defaultSettings.negativeAllowed;
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           'Meta data for numeric attribute not present, falling back to defaults'
         );
       }
@@ -419,7 +426,7 @@ export class ConfiguratorAttributeNumericInputFieldComponent
 
   protected reportMissingLocaleData(lang: string): void {
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `ConfigAttributeNumericInputFieldComponent: No locale data registered for '${lang}' (see https://angular.io/api/common/registerLocaleData).`
       );
     }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
index 11ad444db0b..21b87be4d60 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
@@ -4,10 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { I18nTestingModule } from '@spartacus/core';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
 import { Configurator } from '../../../../core/model/configurator.model';
-import { ConfiguratorPriceComponentOptions } from '../../../price/configurator-price.component';
-import { ConfiguratorAttributeReadOnlyComponent } from './configurator-attribute-read-only.component';
 import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
+import { ConfiguratorPriceComponentOptions } from '../../../price/configurator-price.component';
 import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
+import { ConfiguratorAttributeReadOnlyComponent } from './configurator-attribute-read-only.component';
 
 @Component({
   selector: 'cx-configurator-price',
@@ -152,7 +152,6 @@ describe('ConfigAttributeReadOnlyComponent', () => {
     it('should display price component of selected value for attribute with domain', () => {
       component.attribute.values = myValues;
       fixture.detectChanges();
-      console.log('html:  ' + htmlElem);
       CommonConfiguratorTestUtilsService.expectElementPresent(
         expect,
         htmlElem,
diff --git a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
index 14cab729363..fcd1f1426a7 100644
--- a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
-import { WindowRef } from '@spartacus/core';
+import { LoggerService, WindowRef } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { KeyboardFocusService } from '@spartacus/storefront';
 import { Observable } from 'rxjs';
@@ -29,6 +29,8 @@ export class ConfiguratorStorefrontUtilsService {
    */
   protected readonly ADD_TO_CART_BUTTON_HEIGHT = 82;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected configuratorGroupsService: ConfiguratorGroupsService,
     protected windowRef: WindowRef,
@@ -82,7 +84,7 @@ export class ConfiguratorStorefrontUtilsService {
         localAssembledValues.push(localAttributeValue);
       } else {
         if (isDevMode()) {
-          console.warn(
+          this.logger.warn(
             'ControlArray does not match values, at least one value could not been found'
           );
         }
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
index 0a907094fa4..19dd0d50c1c 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
-import { select, Store } from '@ngrx/store';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { Store, select } from '@ngrx/store';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
+import { LoggerService } from '@spartacus/core';
 import {
   CommonConfigurator,
   CommonConfiguratorUtilsService,
@@ -22,6 +23,8 @@ import { ConfiguratorUtilsService } from './utils/configurator-utils.service';
 
 @Injectable({ providedIn: 'root' })
 export class ConfiguratorCommonsService {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected store: Store<StateWithConfigurator>,
     protected commonConfigUtilsService: CommonConfiguratorUtilsService,
@@ -138,7 +141,9 @@ export class ConfiguratorCommonsService {
             take(1),
             tap((stable) => {
               if (isDevMode() && cart.code && !stable) {
-                console.warn('Cart is busy, no configuration updates possible');
+                this.logger.warn(
+                  'Cart is busy, no configuration updates possible'
+                );
               }
             }),
             filter((stable) => !cart.code || stable),
diff --git a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-basic.effect.ts b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-basic.effect.ts
index 983c4ad393d..e7ff83b353d 100644
--- a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-basic.effect.ts
+++ b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-basic.effect.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { select, Store } from '@ngrx/store';
-import { normalizeHttpError } from '@spartacus/core';
+import { Store, select } from '@ngrx/store';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import {
   CommonConfigurator,
   CommonConfiguratorUtilsService,
@@ -42,6 +42,8 @@ type updateConfigurationSuccessResultType =
  * and CPQ
  */
 export class ConfiguratorBasicEffects {
+  protected logger = inject(LoggerService);
+
   createConfiguration$: Observable<
     | ConfiguratorActions.CreateConfigurationSuccess
     | ConfiguratorActions.SearchVariants
@@ -79,7 +81,7 @@ export class ConfiguratorBasicEffects {
             catchError((error) => [
               new ConfiguratorActions.CreateConfigurationFail({
                 ownerKey: action.payload.owner.key,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
             ])
           );
@@ -108,7 +110,7 @@ export class ConfiguratorBasicEffects {
             catchError((error) => [
               new ConfiguratorActions.ReadConfigurationFail({
                 ownerKey: action.payload.configuration.owner.key,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
             ])
           );
@@ -140,7 +142,7 @@ export class ConfiguratorBasicEffects {
               });
             }),
             catchError((error) => {
-              const errorPayload = normalizeHttpError(error);
+              const errorPayload = normalizeHttpError(error, this.logger);
               return [
                 new ConfiguratorActions.UpdateConfigurationFail({
                   configuration: payload,
@@ -172,7 +174,7 @@ export class ConfiguratorBasicEffects {
             );
           }),
           catchError((error) => {
-            const errorPayload = normalizeHttpError(error);
+            const errorPayload = normalizeHttpError(error, this.logger);
             return [
               new ConfiguratorActions.UpdatePriceSummaryFail({
                 ownerKey: payload.owner.key,
@@ -205,7 +207,7 @@ export class ConfiguratorBasicEffects {
               });
             }),
             catchError((error) => {
-              const errorPayload = normalizeHttpError(error);
+              const errorPayload = normalizeHttpError(error, this.logger);
               return [
                 new ConfiguratorActions.GetConfigurationOverviewFail({
                   ownerKey: payload.owner.key,
@@ -241,7 +243,7 @@ export class ConfiguratorBasicEffects {
               );
             }),
             catchError((error) => {
-              const errorPayload = normalizeHttpError(error);
+              const errorPayload = normalizeHttpError(error, this.logger);
               return [
                 new ConfiguratorActions.UpdateConfigurationOverviewFail({
                   ownerKey: payload.owner.key,
@@ -435,7 +437,7 @@ export class ConfiguratorBasicEffects {
                 catchError((error) => [
                   new ConfiguratorActions.ReadConfigurationFail({
                     ownerKey: action.payload.configuration.owner.key,
-                    error: normalizeHttpError(error),
+                    error: normalizeHttpError(error, this.logger),
                   }),
                 ])
               );
diff --git a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-cart.effect.ts b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-cart.effect.ts
index 7e45805be2a..4068aeea9ef 100644
--- a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-cart.effect.ts
+++ b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-cart.effect.ts
@@ -5,12 +5,12 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { select, Store } from '@ngrx/store';
+import { Store, select } from '@ngrx/store';
 import { CartActions } from '@spartacus/cart/base/core';
 import { CartModification } from '@spartacus/cart/base/root';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import {
   CommonConfigurator,
   CommonConfiguratorUtilsService,
@@ -39,6 +39,8 @@ export const ERROR_MESSAGE_NO_ENTRY_NUMBER_FOUND =
  * Common configurator effects related to cart handling
  */
 export class ConfiguratorCartEffects {
+  protected logger = inject(LoggerService);
+
   addToCart$: Observable<
     | ConfiguratorActions.AddNextOwner
     | CartActions.CartAddEntrySuccess
@@ -84,7 +86,7 @@ export class ConfiguratorCartEffects {
                 quantity: payload.quantity,
                 error:
                   error instanceof HttpErrorResponse
-                    ? normalizeHttpError(error)
+                    ? normalizeHttpError(error, this.logger)
                     : error,
               })
             )
@@ -121,7 +123,7 @@ export class ConfiguratorCartEffects {
                     userId: payload.userId,
                     cartId: payload.cartId,
                     entryNumber: payload.cartEntryNumber,
-                    error: normalizeHttpError(error),
+                    error: normalizeHttpError(error, this.logger),
                   })
                 )
               )
@@ -164,7 +166,7 @@ export class ConfiguratorCartEffects {
               catchError((error) => [
                 new ConfiguratorActions.ReadCartEntryConfigurationFail({
                   ownerKey: action.payload.owner.key,
-                  error: normalizeHttpError(error),
+                  error: normalizeHttpError(error, this.logger),
                 }),
               ])
             );
@@ -192,7 +194,7 @@ export class ConfiguratorCartEffects {
             catchError((error) => [
               new ConfiguratorActions.ReadOrderEntryConfigurationFail({
                 ownerKey: action.payload.owner.key,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
             ])
           );
diff --git a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-variant.effect.ts b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-variant.effect.ts
index e1a61989bed..708cfacf484 100644
--- a/feature-libs/product-configurator/rulebased/core/state/effects/configurator-variant.effect.ts
+++ b/feature-libs/product-configurator/rulebased/core/state/effects/configurator-variant.effect.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { ConfiguratorType } from '@spartacus/product-configurator/common';
 import { Observable } from 'rxjs';
 import { catchError, filter, switchMap } from 'rxjs/operators';
@@ -20,6 +20,8 @@ import { ConfiguratorActions } from '../actions/index';
  * Rulebased configurator effects related to variant search
  */
 export class ConfiguratorVariantEffects {
+  protected logger = inject(LoggerService);
+
   searchVariants$: Observable<
     | ConfiguratorActions.SearchVariantsSuccess
     | ConfiguratorActions.SearchVariantsFail
@@ -48,7 +50,7 @@ export class ConfiguratorVariantEffects {
             catchError((error) => [
               new ConfiguratorActions.SearchVariantsFail({
                 ownerKey: action.payload.owner.key,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
               }),
             ])
           );
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts
index bf6e923ad1d..8650a398eae 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts
@@ -9,8 +9,8 @@ import {
   getCurrencySymbol,
   getLocaleId,
 } from '@angular/common';
-import { Injectable, isDevMode } from '@angular/core';
-import { LanguageService } from '@spartacus/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LanguageService, LoggerService } from '@spartacus/core';
 import { Configurator } from '@spartacus/product-configurator/rulebased';
 import { Cpq } from '../cpq.models';
 
@@ -19,6 +19,7 @@ import { Cpq } from '../cpq.models';
  */
 @Injectable({ providedIn: 'root' })
 export class CpqConfiguratorNormalizerUtilsService {
+  protected logger = inject(LoggerService);
   constructor(protected languageService: LanguageService) {}
 
   /**
@@ -299,7 +300,7 @@ export class CpqConfiguratorNormalizerUtilsService {
    */
   protected reportMissingLocaleData(lang: string): void {
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `CpqConfiguratorNormalizerUtilsService: No locale data registered for '${lang}' (see https://angular.io/api/common/registerLocaleData).`
       );
     }
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-endpoint.service.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-endpoint.service.ts
index 17ac4ea2c32..f16cbaaf12c 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-endpoint.service.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-endpoint.service.ts
@@ -5,13 +5,15 @@
  */
 
 import { HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { StringTemplate } from '@spartacus/core';
+import { Injectable, inject } from '@angular/core';
+import { LoggerService, StringTemplate } from '@spartacus/core';
 import { MARKER_HEADER_CPQ_CONFIGURATOR } from '@spartacus/product-configurator/rulebased/root';
 import { CpqConfiguratorEndpointConfig } from './cpq-configurator-endpoint.config';
 
 @Injectable({ providedIn: 'root' })
 export class CpqConfiguratorEndpointService {
+  protected logger = inject(LoggerService);
+
   constructor(protected config: CpqConfiguratorEndpointConfig) {}
 
   /**
@@ -46,7 +48,7 @@ export class CpqConfiguratorEndpointService {
 
     if (!endpoint) {
       endpoint = 'configurations';
-      console.warn(
+      this.logger.warn(
         `${endpointName} endpoint configuration missing for cpq backend, please provide it via key: "backend.cpq.endpoints.${endpointName}"`
       );
     }
diff --git a/feature-libs/product-configurator/textfield/core/state/effects/configurator-textfield.effect.ts b/feature-libs/product-configurator/textfield/core/state/effects/configurator-textfield.effect.ts
index 6a0875fdf66..57f63144a1b 100644
--- a/feature-libs/product-configurator/textfield/core/state/effects/configurator-textfield.effect.ts
+++ b/feature-libs/product-configurator/textfield/core/state/effects/configurator-textfield.effect.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { CartActions } from '@spartacus/cart/base/core';
-import { normalizeHttpError } from '@spartacus/core';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
@@ -17,6 +17,8 @@ import { ConfiguratorTextfieldActions } from '../actions/index';
 
 @Injectable()
 export class ConfiguratorTextfieldEffects {
+  protected logger = inject(LoggerService);
+
   createConfiguration$: Observable<
     | ConfiguratorTextfieldActions.CreateConfigurationSuccess
     | ConfiguratorTextfieldActions.CreateConfigurationFail
@@ -41,7 +43,7 @@ export class ConfiguratorTextfieldEffects {
             catchError((error) =>
               of(
                 new ConfiguratorTextfieldActions.CreateConfigurationFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -72,7 +74,7 @@ export class ConfiguratorTextfieldEffects {
           catchError((error) =>
             of(
               new ConfiguratorTextfieldActions.AddToCartFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
@@ -108,7 +110,7 @@ export class ConfiguratorTextfieldEffects {
             catchError((error) =>
               of(
                 new ConfiguratorTextfieldActions.UpdateCartEntryConfigurationFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -138,7 +140,7 @@ export class ConfiguratorTextfieldEffects {
               ]),
               catchError((error) => [
                 new ConfiguratorTextfieldActions.ReadCartEntryConfigurationFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 ),
               ])
             );
@@ -168,7 +170,7 @@ export class ConfiguratorTextfieldEffects {
               ]),
               catchError((error) => [
                 new ConfiguratorTextfieldActions.ReadOrderEntryConfigurationFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 ),
               ])
             );
diff --git a/feature-libs/product/future-stock/occ/adapters/occ-future-stock.adapter.ts b/feature-libs/product/future-stock/occ/adapters/occ-future-stock.adapter.ts
index 7c89491b348..443893c027e 100644
--- a/feature-libs/product/future-stock/occ/adapters/occ-future-stock.adapter.ts
+++ b/feature-libs/product/future-stock/occ/adapters/occ-future-stock.adapter.ts
@@ -5,18 +5,19 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 
 import {
-  OccEndpointsService,
   ConverterService,
+  LoggerService,
+  OccEndpointsService,
   normalizeHttpError,
 } from '@spartacus/core';
 
 import {
-  FutureStockAdapter,
-  FUTURE_STOCK_NORMALIZER,
   FUTURE_STOCK_LIST_NORMALIZER,
+  FUTURE_STOCK_NORMALIZER,
+  FutureStockAdapter,
   ProductFutureStock,
   ProductFutureStockList,
 } from '@spartacus/product/future-stock/core';
@@ -25,6 +26,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccFutureStockAdapter implements FutureStockAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -38,7 +41,9 @@ export class OccFutureStockAdapter implements FutureStockAdapter {
     return this.http
       .get<ProductFutureStock>(this.getFutureStockEndpoint(userId, productCode))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(FUTURE_STOCK_NORMALIZER)
       );
   }
@@ -52,7 +57,9 @@ export class OccFutureStockAdapter implements FutureStockAdapter {
         this.getFutureStocksEndpoint(userId, productCodes)
       )
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(FUTURE_STOCK_LIST_NORMALIZER)
       );
   }
diff --git a/feature-libs/qualtrics/components/qualtrics-loader/qualtrics-loader.service.ts b/feature-libs/qualtrics/components/qualtrics-loader/qualtrics-loader.service.ts
index cfec0ddeaca..f8e978f178e 100644
--- a/feature-libs/qualtrics/components/qualtrics-loader/qualtrics-loader.service.ts
+++ b/feature-libs/qualtrics/components/qualtrics-loader/qualtrics-loader.service.ts
@@ -6,13 +6,14 @@
 
 import { isPlatformBrowser } from '@angular/common';
 import {
+  inject,
   Inject,
   Injectable,
   isDevMode,
   OnDestroy,
   PLATFORM_ID,
 } from '@angular/core';
-import { ScriptLoader, WindowRef } from '@spartacus/core';
+import { LoggerService, ScriptLoader, WindowRef } from '@spartacus/core';
 import { EMPTY, fromEvent, Observable, of, Subscription } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 
@@ -41,6 +42,8 @@ interface QualtricsWindow extends Window {
 export class QualtricsLoaderService implements OnDestroy {
   protected subscription = new Subscription();
 
+  protected logger = inject(LoggerService);
+
   /**
    * Reference to the QSI API.
    */
@@ -120,7 +123,7 @@ export class QualtricsLoaderService implements OnDestroy {
   protected run(reload = false): void {
     if (!this.qsiApi?.API) {
       if (isDevMode()) {
-        console.log('The QSI api is not available');
+        this.logger.log('The QSI api is not available');
       }
       return;
     }
diff --git a/feature-libs/qualtrics/components/qualtrics-loader/qualtrics.component.ts b/feature-libs/qualtrics/components/qualtrics-loader/qualtrics.component.ts
index 39919b52a2b..0b0c674444f 100644
--- a/feature-libs/qualtrics/components/qualtrics-loader/qualtrics.component.ts
+++ b/feature-libs/qualtrics/components/qualtrics-loader/qualtrics.component.ts
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Component, isDevMode } from '@angular/core';
+import { Component, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { QualtricsConfig } from './config/qualtrics-config';
 import { QualtricsLoaderService } from './qualtrics-loader.service';
 /**
@@ -16,6 +17,8 @@ import { QualtricsLoaderService } from './qualtrics-loader.service';
   template: '',
 })
 export class QualtricsComponent {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected qualtricsLoader: QualtricsLoaderService,
     protected config: QualtricsConfig
@@ -23,7 +26,7 @@ export class QualtricsComponent {
     if (this.config.qualtrics?.scriptSource) {
       this.qualtricsLoader.addScript(this.config.qualtrics.scriptSource);
     } else if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `We're unable to add the Qualtrics deployment code as there is no script source defined in config.qualtrics.scriptSource.`
       );
     }
diff --git a/feature-libs/storefinder/core/service/google-map-renderer.service.ts b/feature-libs/storefinder/core/service/google-map-renderer.service.ts
index dbaedcdbc2c..bb33e1cb9a1 100644
--- a/feature-libs/storefinder/core/service/google-map-renderer.service.ts
+++ b/feature-libs/storefinder/core/service/google-map-renderer.service.ts
@@ -5,8 +5,8 @@
  */
 
 /// <reference types="@types/google.maps" />
-import { Injectable, isDevMode } from '@angular/core';
-import { ScriptLoader } from '@spartacus/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService, ScriptLoader } from '@spartacus/core';
 import { GOOGLE_MAPS_DEVELOPMENT_KEY_CONFIG } from '@spartacus/storefinder/root';
 import { StoreFinderConfig } from '../config/store-finder-config';
 import { StoreFinderService } from '../facade/store-finder.service';
@@ -18,6 +18,8 @@ export class GoogleMapRendererService {
   private googleMap: google.maps.Map = null;
   private markers: google.maps.Marker[];
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected config: StoreFinderConfig,
     protected storeFinderService: StoreFinderService,
@@ -58,7 +60,7 @@ export class GoogleMapRendererService {
       }
     } else {
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           'A Google Maps api key is required in the store finder configuration to display the Google map.'
         );
       }
diff --git a/feature-libs/storefinder/core/store/effects/find-stores.effect.ts b/feature-libs/storefinder/core/store/effects/find-stores.effect.ts
index 6634b8386bc..b1388a73adc 100644
--- a/feature-libs/storefinder/core/store/effects/find-stores.effect.ts
+++ b/feature-libs/storefinder/core/store/effects/find-stores.effect.ts
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { LoggerService, normalizeHttpError } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
 import { StoreFinderConnector } from '../../connectors/store-finder.connector';
 import { StoreFinderActions } from '../actions/index';
-import { normalizeHttpError } from '@spartacus/core';
 
 @Injectable()
 export class FindStoresEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private storeFinderConnector: StoreFinderConnector
@@ -49,7 +51,9 @@ export class FindStoresEffect {
             }),
             catchError((error) =>
               of(
-                new StoreFinderActions.FindStoresFail(normalizeHttpError(error))
+                new StoreFinderActions.FindStoresFail(
+                  normalizeHttpError(error, this.logger)
+                )
               )
             )
           )
@@ -70,7 +74,7 @@ export class FindStoresEffect {
           catchError((error) =>
             of(
               new StoreFinderActions.FindStoreByIdFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
diff --git a/feature-libs/storefinder/core/store/effects/view-all-stores.effect.ts b/feature-libs/storefinder/core/store/effects/view-all-stores.effect.ts
index ad612ca151e..b25384e846c 100644
--- a/feature-libs/storefinder/core/store/effects/view-all-stores.effect.ts
+++ b/feature-libs/storefinder/core/store/effects/view-all-stores.effect.ts
@@ -4,16 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  LoggerService,
+  SiteContextActions,
+  normalizeHttpError,
+} from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
 import { StoreFinderConnector } from '../../connectors/store-finder.connector';
 import { StoreFinderActions } from '../actions/index';
-import { normalizeHttpError, SiteContextActions } from '@spartacus/core';
 
 @Injectable()
 export class ViewAllStoresEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private storeFinderConnector: StoreFinderConnector
@@ -39,7 +45,7 @@ export class ViewAllStoresEffect {
           catchError((error) =>
             of(
               new StoreFinderActions.ViewAllStoresFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
diff --git a/feature-libs/tracking/personalization/core/services/personalization-context.service.ts b/feature-libs/tracking/personalization/core/services/personalization-context.service.ts
index 11fa6f54101..7bb59881949 100644
--- a/feature-libs/tracking/personalization/core/services/personalization-context.service.ts
+++ b/feature-libs/tracking/personalization/core/services/personalization-context.service.ts
@@ -4,8 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
-import { CmsService, ContentSlotComponentData, Page } from '@spartacus/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import {
+  CmsService,
+  ContentSlotComponentData,
+  LoggerService,
+  Page,
+} from '@spartacus/core';
 import { PersonalizationConfig } from '@spartacus/tracking/personalization/root';
 import { EMPTY, Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
@@ -15,6 +20,8 @@ import { PersonalizationContext } from '../model/personalization-context.model';
   providedIn: 'root',
 })
 export class PersonalizationContextService {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected config: PersonalizationConfig,
     protected cmsService: CmsService
@@ -23,7 +30,7 @@ export class PersonalizationContextService {
   getPersonalizationContext(): Observable<PersonalizationContext | undefined> {
     if (!this.config.personalization?.context) {
       if (isDevMode()) {
-        console.warn(`There is no context configured in Personalization.`);
+        this.logger.warn(`There is no context configured in Personalization.`);
       }
       return EMPTY;
     } else {
diff --git a/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-id.interceptor.ts b/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-id.interceptor.ts
index 2f0698e10a2..d79570a2792 100644
--- a/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-id.interceptor.ts
+++ b/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-id.interceptor.ts
@@ -11,8 +11,8 @@ import {
   HttpRequest,
   HttpResponse,
 } from '@angular/common/http';
-import { Injectable, isDevMode } from '@angular/core';
-import { OccEndpointsService, WindowRef } from '@spartacus/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService, OccEndpointsService, WindowRef } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { PersonalizationConfig } from '../config/personalization-config';
@@ -24,6 +24,8 @@ export class OccPersonalizationIdInterceptor implements HttpInterceptor {
   private enabled = false;
   protected readonly PERSONALIZATION_ID_KEY = 'personalization-id';
 
+  protected logger = inject(LoggerService);
+
   constructor(
     private config: PersonalizationConfig,
     private occEndpoints: OccEndpointsService,
@@ -36,7 +38,7 @@ export class OccPersonalizationIdInterceptor implements HttpInterceptor {
 
       if (this.enabled) {
         if (!this.config.personalization?.httpHeaderName && isDevMode()) {
-          console.warn(
+          this.logger.warn(
             `There is no httpHeaderName configured in Personalization`
           );
         }
diff --git a/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-time.interceptor.ts b/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-time.interceptor.ts
index dc62b59df7a..650a39d834c 100644
--- a/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-time.interceptor.ts
+++ b/feature-libs/tracking/personalization/root/http-interceptors/occ-personalization-time.interceptor.ts
@@ -11,8 +11,8 @@ import {
   HttpRequest,
   HttpResponse,
 } from '@angular/common/http';
-import { Injectable, isDevMode } from '@angular/core';
-import { OccEndpointsService, WindowRef } from '@spartacus/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService, OccEndpointsService, WindowRef } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { PersonalizationConfig } from '../config/personalization-config';
@@ -24,6 +24,8 @@ export class OccPersonalizationTimeInterceptor implements HttpInterceptor {
   private enabled = false;
   protected readonly PERSONALIZATION_TIME_KEY = 'personalization-time';
 
+  protected logger = inject(LoggerService);
+
   constructor(
     private config: PersonalizationConfig,
     private occEndpoints: OccEndpointsService,
@@ -36,7 +38,7 @@ export class OccPersonalizationTimeInterceptor implements HttpInterceptor {
 
       if (this.enabled) {
         if (!this.config.personalization?.httpHeaderName && isDevMode()) {
-          console.warn(
+          this.logger.warn(
             `There is no httpHeaderName configured in Personalization`
           );
         }
diff --git a/feature-libs/tracking/tms/core/services/tms.service.ts b/feature-libs/tracking/tms/core/services/tms.service.ts
index 0e8097cc328..46e27254224 100644
--- a/feature-libs/tracking/tms/core/services/tms.service.ts
+++ b/feature-libs/tracking/tms/core/services/tms.service.ts
@@ -4,8 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, Injector, isDevMode, OnDestroy } from '@angular/core';
-import { CxEvent, EventService, WindowRef } from '@spartacus/core';
+import {
+  inject,
+  Injectable,
+  Injector,
+  isDevMode,
+  OnDestroy,
+} from '@angular/core';
+import {
+  CxEvent,
+  EventService,
+  LoggerService,
+  WindowRef,
+} from '@spartacus/core';
 import { merge, Observable, Subscription } from 'rxjs';
 import { TmsConfig } from '../config/tms-config';
 import { TmsCollector } from '../model/tms.model';
@@ -20,6 +31,8 @@ export class TmsService implements OnDestroy {
    */
   protected subscription = new Subscription();
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected eventsService: EventService,
     protected windowRef: WindowRef,
@@ -45,7 +58,7 @@ export class TmsService implements OnDestroy {
 
       if (!collectorConfig.collector) {
         if (isDevMode()) {
-          console.warn(
+          this.logger.warn(
             `Skipping the '${tmsCollectorConfig}', as the collector is not defined.`
           );
         }
@@ -64,7 +77,7 @@ export class TmsService implements OnDestroy {
       this.subscription.add(
         this.mapEvents(events).subscribe((event) => {
           if (collectorConfig.debug) {
-            console.log(
+            this.logger.log(
               `🎤 Pushing the following event to ${tmsCollectorConfig}: `,
               event
             );
diff --git a/feature-libs/user/account/occ/adapters/occ-user-account.adapter.ts b/feature-libs/user/account/occ/adapters/occ-user-account.adapter.ts
index c06f3407294..0c875ee3297 100644
--- a/feature-libs/user/account/occ/adapters/occ-user-account.adapter.ts
+++ b/feature-libs/user/account/occ/adapters/occ-user-account.adapter.ts
@@ -5,9 +5,10 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
   ConverterService,
+  LoggerService,
   normalizeHttpError,
   Occ,
   OccEndpointsService,
@@ -22,6 +23,8 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class OccUserAccountAdapter implements UserAccountAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -31,7 +34,7 @@ export class OccUserAccountAdapter implements UserAccountAdapter {
   load(userId: string): Observable<User> {
     const url = this.occEndpoints.buildUrl('user', { urlParams: { userId } });
     return this.http.get<Occ.User>(url).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converter.pipeable(USER_ACCOUNT_NORMALIZER)
     );
   }
diff --git a/feature-libs/user/profile/occ/adapters/occ-user-profile.adapter.ts b/feature-libs/user/profile/occ/adapters/occ-user-profile.adapter.ts
index 6d150523dc9..78b52d22da8 100644
--- a/feature-libs/user/profile/occ/adapters/occ-user-profile.adapter.ts
+++ b/feature-libs/user/profile/occ/adapters/occ-user-profile.adapter.ts
@@ -5,22 +5,23 @@
  */
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import {
   ConverterService,
   InterceptorUtil,
-  normalizeHttpError,
+  LoggerService,
   Occ,
   OccEndpointsService,
   USE_CLIENT_TOKEN,
+  normalizeHttpError,
 } from '@spartacus/core';
 import { User } from '@spartacus/user/account/root';
 import {
   TITLE_NORMALIZER,
-  UserProfileAdapter,
   USER_PROFILE_NORMALIZER,
   USER_PROFILE_SERIALIZER,
   USER_SIGN_UP_SERIALIZER,
+  UserProfileAdapter,
 } from '@spartacus/user/profile/core';
 import { Title, UserSignUp } from '@spartacus/user/profile/root';
 import { Observable, throwError } from 'rxjs';
@@ -33,6 +34,8 @@ const CONTENT_TYPE_URLENCODED_HEADER = {
 
 @Injectable()
 export class OccUserProfileAdapter implements UserProfileAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected occEndpoints: OccEndpointsService,
@@ -47,7 +50,11 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     user = this.converter.convert(user, USER_PROFILE_SERIALIZER);
     return this.http
       .patch(url, user)
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   register(user: UserSignUp): Observable<User> {
@@ -59,7 +66,7 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     user = this.converter.convert(user, USER_SIGN_UP_SERIALIZER);
 
     return this.http.post<User>(url, user, { headers }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converter.pipeable(USER_PROFILE_NORMALIZER)
     );
   }
@@ -76,7 +83,7 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
       .set('password', password);
 
     return this.http.post<User>(url, httpParams, { headers }).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converter.pipeable(USER_PROFILE_NORMALIZER)
     );
   }
@@ -93,7 +100,11 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     headers = InterceptorUtil.createHeader(USE_CLIENT_TOKEN, true, headers);
     return this.http
       .post(url, httpParams, { headers })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   resetPassword(token: string, newPassword: string): Observable<unknown> {
@@ -105,7 +116,11 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
 
     return this.http
       .post(url, { token, newPassword }, { headers })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   updateEmail(
@@ -124,7 +139,11 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     });
     return this.http
       .put(url, httpParams, { headers })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   updatePassword(
@@ -143,7 +162,11 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     });
     return this.http
       .put(url, httpParams, { headers })
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   close(userId: string): Observable<unknown> {
@@ -153,13 +176,17 @@ export class OccUserProfileAdapter implements UserProfileAdapter {
     const url = this.occEndpoints.buildUrl(endpoint, { urlParams: { userId } });
     return this.http
       .delete<User>(url)
-      .pipe(catchError((error) => throwError(normalizeHttpError(error))));
+      .pipe(
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
   }
 
   loadTitles(): Observable<Title[]> {
     const url = this.occEndpoints.buildUrl('titles');
     return this.http.get<Occ.TitleList>(url).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       map((titleList) => titleList.titles ?? []),
       this.converter.pipeableMany(TITLE_NORMALIZER)
     );
diff --git a/integration-libs/cdc/core/store/effects/cdc-user-token.effect.ts b/integration-libs/cdc/core/store/effects/cdc-user-token.effect.ts
index 7fcdd181d77..903e76df69a 100644
--- a/integration-libs/cdc/core/store/effects/cdc-user-token.effect.ts
+++ b/integration-libs/cdc/core/store/effects/cdc-user-token.effect.ts
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   GlobalMessageService,
   GlobalMessageType,
+  LoggerService,
   normalizeHttpError,
 } from '@spartacus/core';
 import { EMPTY, Observable, of } from 'rxjs';
@@ -19,6 +20,8 @@ import { CdcAuthActions } from '../actions/index';
 
 @Injectable()
 export class CdcUserTokenEffects {
+  protected logger = inject(LoggerService);
+
   loadCdcUserToken$: Observable<CdcAuthActions.CdcUserTokenAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -45,7 +48,7 @@ export class CdcUserTokenEffects {
                 );
                 return of(
                   new CdcAuthActions.LoadCdcUserTokenFail({
-                    error: normalizeHttpError(error),
+                    error: normalizeHttpError(error, this.logger),
                     initialActionPayload: payload,
                   })
                 );
diff --git a/integration-libs/cds/src/profiletag/services/profiletag-event.service.ts b/integration-libs/cds/src/profiletag/services/profiletag-event.service.ts
index 409e08510d8..ca33841ee8b 100644
--- a/integration-libs/cds/src/profiletag/services/profiletag-event.service.ts
+++ b/integration-libs/cds/src/profiletag/services/profiletag-event.service.ts
@@ -5,14 +5,20 @@
  */
 
 import { isPlatformBrowser } from '@angular/common';
-import { Inject, Injectable, OnDestroy, PLATFORM_ID } from '@angular/core';
-import { BaseSiteService, WindowRef } from '@spartacus/core';
+import {
+  Inject,
+  Injectable,
+  OnDestroy,
+  PLATFORM_ID,
+  inject,
+} from '@angular/core';
+import { BaseSiteService, LoggerService, WindowRef } from '@spartacus/core';
 import {
   BehaviorSubject,
-  fromEvent,
-  merge,
   Observable,
   Subscription,
+  fromEvent,
+  merge,
 } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -45,6 +51,9 @@ export class ProfileTagEventService implements OnDestroy {
     this.setConsentReference(),
     this.debugModeChanged()
   );
+
+  protected logger = inject(LoggerService);
+
   constructor(
     private winRef: WindowRef,
     private config: CdsConfig,
@@ -112,7 +121,9 @@ export class ProfileTagEventService implements OnDestroy {
     try {
       this.profileTagWindow.Y_TRACKING.eventLayer.push(event);
     } catch (e) {
-      console.log(`Unexpected error when calling profiletag push method ${e}`);
+      this.logger.log(
+        `Unexpected error when calling profiletag push method ${e}`
+      );
     }
   }
 
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.spec.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.spec.ts
index a62a7f4798f..57b20889ef0 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.spec.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.spec.ts
@@ -2,6 +2,7 @@ import { Component, Input, TemplateRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
+import { LoggerService } from '@spartacus/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { EMPTY } from 'rxjs';
 import { PagedListComponent } from './paged-list.component';
@@ -79,19 +80,21 @@ describe('PagedList Component', () => {
     });
 
     it('should log an error when there is no header template given', () => {
-      spyOn(console, 'error');
+      const logger = TestBed.inject(LoggerService);
+      spyOn(logger, 'error');
       component.template = template;
       component.ngOnInit();
-      expect(console.error).toHaveBeenCalledWith(
+      expect(logger.error).toHaveBeenCalledWith(
         'No template reference provided to render the header for the `cx-epd-visualization-paged-list`'
       );
     });
 
     it('should log an error when there is no template given', () => {
-      spyOn(console, 'error');
+      const logger = TestBed.inject(LoggerService);
+      spyOn(logger, 'error');
       component.headerTemplate = headerTemplate;
       component.ngOnInit();
-      expect(console.error).toHaveBeenCalledWith(
+      expect(logger.error).toHaveBeenCalledWith(
         'No template reference provided to render the items for the `cx-epd-visualization-paged-list`'
       );
     });
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.ts
index 9007f62c676..66bac7336a3 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/product-list/paged-list/paged-list.component.ts
@@ -13,7 +13,9 @@ import {
   OnInit,
   Output,
   TemplateRef,
+  inject,
 } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable } from 'rxjs';
 /**
@@ -73,18 +75,20 @@ export class PagedListComponent implements OnInit {
     this.activeSlideStartIndexChange.emit(activeSlideStartIndex);
   }
 
+  protected logger = inject(LoggerService);
+
   constructor(protected el: ElementRef) {}
 
   ngOnInit() {
     if (!this.headerTemplate) {
-      console.error(
+      this.logger.error(
         'No template reference provided to render the header for the `cx-epd-visualization-paged-list`'
       );
       return;
     }
 
     if (!this.template) {
-      console.error(
+      this.logger.error(
         'No template reference provided to render the items for the `cx-epd-visualization-paged-list`'
       );
       return;
diff --git a/integration-libs/epd-visualization/epd-visualization-api/adapters/storage-v1/storage-v1.adapter.ts b/integration-libs/epd-visualization/epd-visualization-api/adapters/storage-v1/storage-v1.adapter.ts
index 44ea8374bad..b9950773bd9 100644
--- a/integration-libs/epd-visualization/epd-visualization-api/adapters/storage-v1/storage-v1.adapter.ts
+++ b/integration-libs/epd-visualization/epd-visualization-api/adapters/storage-v1/storage-v1.adapter.ts
@@ -5,11 +5,15 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { ConverterService, normalizeHttpError } from '@spartacus/core';
+import { Injectable, inject } from '@angular/core';
+import {
+  ConverterService,
+  LoggerService,
+  normalizeHttpError,
+} from '@spartacus/core';
 import {
-  NodesResponse,
   NODES_RESPONSE_NORMALIZER,
+  NodesResponse,
   SceneAdapter,
 } from '@spartacus/epd-visualization/core';
 import {
@@ -28,6 +32,8 @@ import { catchError } from 'rxjs/operators';
  */
 @Injectable()
 export class StorageV1Adapter implements SceneAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected epdVisualizationConfig: EpdVisualizationConfig,
@@ -92,7 +98,9 @@ export class StorageV1Adapter implements SceneAdapter {
     return this.http
       .get(this.getUrl(sceneId, nodeIds, $expand, $filter, contentType))
       .pipe(
-        catchError((error) => throwError(normalizeHttpError(error))),
+        catchError((error) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
         this.converter.pipeable(NODES_RESPONSE_NORMALIZER)
       );
   }
diff --git a/integration-libs/epd-visualization/epd-visualization-api/adapters/visualization-v1/visualization-v1.adapter.ts b/integration-libs/epd-visualization/epd-visualization-api/adapters/visualization-v1/visualization-v1.adapter.ts
index b296a7507b7..06166326ca9 100644
--- a/integration-libs/epd-visualization/epd-visualization-api/adapters/visualization-v1/visualization-v1.adapter.ts
+++ b/integration-libs/epd-visualization/epd-visualization-api/adapters/visualization-v1/visualization-v1.adapter.ts
@@ -5,11 +5,15 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { ConverterService, normalizeHttpError } from '@spartacus/core';
+import { Injectable, inject } from '@angular/core';
+import {
+  ConverterService,
+  LoggerService,
+  normalizeHttpError,
+} from '@spartacus/core';
 import {
-  LookupVisualizationsResponse,
   LOOKUP_VISUALIZATIONS_RESPONSE_NORMALIZER,
+  LookupVisualizationsResponse,
   VisualizationAdapter,
 } from '@spartacus/epd-visualization/core';
 import {
@@ -29,6 +33,8 @@ import { catchError } from 'rxjs/operators';
  */
 @Injectable()
 export class VisualizationV1Adapter implements VisualizationAdapter {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected http: HttpClient,
     protected epdVisualizationConfig: EpdVisualizationConfig,
@@ -73,7 +79,7 @@ export class VisualizationV1Adapter implements VisualizationAdapter {
     folderUsageId: UsageId
   ): Observable<LookupVisualizationsResponse> {
     return this.http.get(this.getUrl(visualizationUsageId, folderUsageId)).pipe(
-      catchError((error) => throwError(normalizeHttpError(error))),
+      catchError((error) => throwError(normalizeHttpError(error, this.logger))),
       this.converter.pipeable(LOOKUP_VISUALIZATIONS_RESPONSE_NORMALIZER)
     );
   }
diff --git a/projects/assets/generate-translations-properties-2-ts.ts b/projects/assets/generate-translations-properties-2-ts.ts
index 9bb527adeaa..4d089db4ac5 100644
--- a/projects/assets/generate-translations-properties-2-ts.ts
+++ b/projects/assets/generate-translations-properties-2-ts.ts
@@ -72,4 +72,5 @@ Object.keys(translations).forEach((lang) => {
   }
 });
 
+/* eslint-disable-next-line no-console */
 console.log(`properties files are converted to json files`);
diff --git a/projects/assets/generate-translations-ts-2-json.ts b/projects/assets/generate-translations-ts-2-json.ts
index 0dc27992ae5..0fd882b638f 100644
--- a/projects/assets/generate-translations-ts-2-json.ts
+++ b/projects/assets/generate-translations-ts-2-json.ts
@@ -19,6 +19,7 @@ const getFileName = (lang: string, chunk: string) =>
   `${getLangDir(lang)}${chunk}.json`;
 
 if (!fs.existsSync(assetsDistDir)) {
+  /* eslint-disable-next-line no-console */
   console.log(
     `Cannot generate translations. Directory '${assetsDistDir}' does not exist.`
   );
@@ -37,5 +38,6 @@ if (!fs.existsSync(assetsDistDir)) {
       fs.writeFileSync(fileName, json, 'utf8');
     });
   });
+  /* eslint-disable-next-line no-console */
   console.log(`Translations generated in '${assetsDistDir}'`);
 }
diff --git a/projects/assets/generate-translations-ts-2-properties.ts b/projects/assets/generate-translations-ts-2-properties.ts
index ade1f77dc76..a5031f97655 100644
--- a/projects/assets/generate-translations-ts-2-properties.ts
+++ b/projects/assets/generate-translations-ts-2-properties.ts
@@ -44,4 +44,5 @@ Object.keys(translations).forEach((lang) => {
     );
   });
 });
+/* eslint-disable-next-line no-console */
 console.log(`localized properties files are generated`);
diff --git a/projects/core/public_api.ts b/projects/core/public_api.ts
index 6d5685730ca..94f73d410cb 100644
--- a/projects/core/public_api.ts
+++ b/projects/core/public_api.ts
@@ -9,16 +9,20 @@
  */
 export * from './src/anonymous-consents/index';
 export * from './src/auth/index';
+export * from './src/base-core.module';
 export * from './src/checkout/index';
 export * from './src/cms/index';
 export * from './src/config/index';
+export * from './src/cost-center/index';
+export * from './src/error-handling/index';
 export * from './src/event/index';
 export * from './src/features-config/index';
 export * from './src/global-message/index';
 export * from './src/http/index';
 export * from './src/i18n/index';
+export * from './src/lazy-loading/index';
+export * from './src/logger/index';
 export * from './src/model/index';
-export * from './src/cost-center/index';
 export * from './src/occ/index';
 export * from './src/process/index';
 export * from './src/product/index';
@@ -28,22 +32,20 @@ export * from './src/state/index';
 export * from './src/user/index';
 export * from './src/util/index';
 export * from './src/window/index';
-export * from './src/lazy-loading/index';
-export * from './src/base-core.module';
 
 /** AUGMENTABLE_TYPES_START */
-export { Product, Price, Stock } from './src/model/product.model';
-export { ProductSearchPage, Facet } from './src/model/product-search.model';
+export { AuthToken } from './src/auth/user-auth/models/auth-token.model';
+export { Config } from './src/config/config-tokens';
+export { Address } from './src/model/address.model';
 export {
-  CostCenter,
   B2BUnit,
   B2BUser,
   B2BUserRole,
+  CostCenter,
 } from './src/model/org-unit.model';
-export { AuthToken } from './src/auth/user-auth/models/auth-token.model';
+export { Facet, ProductSearchPage } from './src/model/product-search.model';
+export { Price, Product, Stock } from './src/model/product.model';
+export { BackendConfig } from './src/occ/config/occ-config';
 export { OccEndpoints } from './src/occ/occ-models/occ-endpoints.model';
-export { Config } from './src/config/config-tokens';
 export { RoutingConfigDefinition } from './src/routing/configurable-routes/config/routing-config';
-export { BackendConfig } from './src/occ/config/occ-config';
-export { Address } from './src/model/address.model';
 /** AUGMENTABLE_TYPES_END */
diff --git a/projects/core/src/anonymous-consents/store/effects/anonymous-consents.effect.ts b/projects/core/src/anonymous-consents/store/effects/anonymous-consents.effect.ts
index 54edf5bf0e7..0222788febb 100644
--- a/projects/core/src/anonymous-consents/store/effects/anonymous-consents.effect.ts
+++ b/projects/core/src/anonymous-consents/store/effects/anonymous-consents.effect.ts
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
+
 import { EMPTY, Observable, of } from 'rxjs';
 import {
   catchError,
@@ -18,6 +19,7 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 import { AuthActions, AuthService, UserIdService } from '../../../auth/index';
+import { LoggerService } from '../../../logger';
 import { UserConsentService } from '../../../user/facade/user-consent.service';
 import { UserActions } from '../../../user/store/actions/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -28,6 +30,8 @@ import { AnonymousConsentsActions } from '../actions/index';
 
 @Injectable()
 export class AnonymousConsentsEffects {
+  protected logger = inject(LoggerService);
+
   checkConsentVersions$: Observable<
     | AnonymousConsentsActions.LoadAnonymousConsentTemplates
     | AnonymousConsentsActions.LoadAnonymousConsentTemplatesFail
@@ -43,7 +47,7 @@ export class AnonymousConsentsEffects {
             map((newConsents) => {
               if (!newConsents) {
                 if (isDevMode()) {
-                  console.warn(
+                  this.logger.warn(
                     'No consents were loaded. Please check the Spartacus documentation as this could be a back-end configuration issue.'
                   );
                 }
@@ -72,7 +76,7 @@ export class AnonymousConsentsEffects {
             catchError((error) =>
               of(
                 new AnonymousConsentsActions.LoadAnonymousConsentTemplatesFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -114,7 +118,7 @@ export class AnonymousConsentsEffects {
               catchError((error) =>
                 of(
                   new AnonymousConsentsActions.LoadAnonymousConsentTemplatesFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/projects/core/src/auth/client-auth/store/effects/client-token.effect.ts b/projects/core/src/auth/client-auth/store/effects/client-token.effect.ts
index edfe5bb4e66..a938c101c42 100644
--- a/projects/core/src/auth/client-auth/store/effects/client-token.effect.ts
+++ b/projects/core/src/auth/client-auth/store/effects/client-token.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, exhaustMap, map } from 'rxjs/operators';
+import { LoggerService } from '../../../../logger';
 import { normalizeHttpError } from '../../../../util/normalize-http-error';
 import { ClientToken } from '../../../client-auth/models/client-token.model';
 import { ClientAuthenticationTokenService } from '../../services/client-authentication-token.service';
@@ -15,6 +16,8 @@ import { ClientAuthActions } from '../actions/index';
 
 @Injectable()
 export class ClientTokenEffect {
+  protected logger = inject(LoggerService);
+
   loadClientToken$: Observable<ClientAuthActions.ClientTokenAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -29,7 +32,7 @@ export class ClientTokenEffect {
               catchError((error) =>
                 of(
                   new ClientAuthActions.LoadClientTokenFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/projects/core/src/base-core.module.ts b/projects/core/src/base-core.module.ts
index 2948519c484..1cd7d76970a 100644
--- a/projects/core/src/base-core.module.ts
+++ b/projects/core/src/base-core.module.ts
@@ -36,6 +36,9 @@ import { StateModule } from './state/state.module';
     BaseOccModule.forRoot(),
     LazyLoadingModule.forRoot(),
     HttpModule.forRoot(),
+
+    /* This module should be imported by default starting from version 7.0 (CXSPA-3680)*/
+    //ErrorHandlingModule.forRoot(),
   ],
 })
 export class BaseCoreModule {
diff --git a/projects/core/src/cms/store/effects/components.effect.ts b/projects/core/src/cms/store/effects/components.effect.ts
index 4e300a35007..55808175eb3 100755
--- a/projects/core/src/cms/store/effects/components.effect.ts
+++ b/projects/core/src/cms/store/effects/components.effect.ts
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
-import { from, Observable } from 'rxjs';
+import { Observable, from } from 'rxjs';
 import { catchError, groupBy, mergeMap, switchMap } from 'rxjs/operators';
 import { AuthActions } from '../../../auth/user-auth/store/actions/index';
+import { LoggerService } from '../../../logger';
 import { CmsComponent } from '../../../model/cms.model';
 import { PageContext } from '../../../routing/index';
 import { SiteContextActions } from '../../../site-context/store/actions/index';
@@ -22,6 +23,8 @@ import { CmsActions } from '../actions/index';
 
 @Injectable()
 export class ComponentsEffects {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private cmsComponentConnector: CmsComponentConnector
@@ -103,7 +106,7 @@ export class ComponentsEffects {
             (uid) =>
               new CmsActions.LoadCmsComponentFail({
                 uid,
-                error: normalizeHttpError(error),
+                error: normalizeHttpError(error, this.logger),
                 pageContext,
               })
           )
diff --git a/projects/core/src/cms/store/effects/navigation-entry-item.effect.ts b/projects/core/src/cms/store/effects/navigation-entry-item.effect.ts
index 17dbdc9a3f7..8f514e8d44b 100755
--- a/projects/core/src/cms/store/effects/navigation-entry-item.effect.ts
+++ b/projects/core/src/cms/store/effects/navigation-entry-item.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { RoutingService } from '../../../routing/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { isNotUndefined } from '../../../util/type-guards';
@@ -16,6 +17,8 @@ import { CmsActions } from '../actions/index';
 
 @Injectable()
 export class NavigationEntryItemEffects {
+  protected logger = inject(LoggerService);
+
   loadNavigationItems$: Observable<
     | CmsActions.LoadCmsNavigationItemsSuccess
     | CmsActions.LoadCmsNavigationItemsFail
@@ -51,7 +54,7 @@ export class NavigationEntryItemEffects {
                     of(
                       new CmsActions.LoadCmsNavigationItemsFail(
                         data.nodeId,
-                        normalizeHttpError(error)
+                        normalizeHttpError(error, this.logger)
                       )
                     )
                   )
diff --git a/projects/core/src/cms/store/effects/page.effect.ts b/projects/core/src/cms/store/effects/page.effect.ts
index d009f3faa2a..689d0231d8c 100755
--- a/projects/core/src/cms/store/effects/page.effect.ts
+++ b/projects/core/src/cms/store/effects/page.effect.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
@@ -18,6 +18,7 @@ import {
   take,
 } from 'rxjs/operators';
 import { AuthActions } from '../../../auth/user-auth/store/actions/index';
+import { LoggerService } from '../../../logger';
 import { RoutingService } from '../../../routing/index';
 import { SiteContextActions } from '../../../site-context/store/actions/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -28,6 +29,8 @@ import { CmsActions } from '../actions/index';
 
 @Injectable()
 export class PageEffects {
+  protected logger = inject(LoggerService);
+
   refreshPage$: Observable<Action> = createEffect(() =>
     this.actions$.pipe(
       ofType(
@@ -93,7 +96,7 @@ export class PageEffects {
                 of(
                   new CmsActions.LoadCmsPageDataFail(
                     pageContext,
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/projects/core/src/config/config-initializer/config-initializer.service.spec.ts b/projects/core/src/config/config-initializer/config-initializer.service.spec.ts
index 4b86788ad26..8aa9296e2ba 100644
--- a/projects/core/src/config/config-initializer/config-initializer.service.spec.ts
+++ b/projects/core/src/config/config-initializer/config-initializer.service.spec.ts
@@ -1,10 +1,15 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ConfigInitializerService } from './config-initializer.service';
-import { Config, ConfigInitializer, RootConfig } from '@spartacus/core';
-import { CONFIG_INITIALIZER_FORROOT_GUARD } from './config-initializer';
-import { tap } from 'rxjs/operators';
+import {
+  Config,
+  ConfigInitializer,
+  LoggerService,
+  RootConfig,
+} from '@spartacus/core';
 import { forkJoin } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { CONFIG_INITIALIZER_FORROOT_GUARD } from './config-initializer';
+import { ConfigInitializerService } from './config-initializer.service';
 
 const MockConfig = {
   test: 'test',
@@ -229,6 +234,8 @@ describe('ConfigInitializerService', () => {
   });
 
   describe('should warn for duplicate scopes', async () => {
+    let logger: LoggerService;
+
     function getInitializersForScopes(...scopes) {
       return scopes.map((scope) => ({
         scopes: scope,
@@ -240,21 +247,22 @@ describe('ConfigInitializerService', () => {
       'More than one CONFIG_INITIALIZER is initializing the same config scope.';
 
     beforeEach(() => {
-      spyOn(console, 'warn');
+      logger = TestBed.inject(LoggerService);
+      spyOn(logger, 'warn');
     });
 
     it('scope1, scope1', async () => {
       await service.initialize(
         getInitializersForScopes(['scope1'], ['scope1'])
       );
-      expect(console.warn).toHaveBeenCalledWith(duplicateWarn);
+      expect(logger.warn).toHaveBeenCalledWith(duplicateWarn);
     });
 
     it('scope1, scope1.nested', async () => {
       await service.initialize(
         getInitializersForScopes(['scope1'], ['scope1.nested'])
       );
-      expect(console.warn).toHaveBeenCalledWith(duplicateWarn);
+      expect(logger.warn).toHaveBeenCalledWith(duplicateWarn);
     });
   });
 });
diff --git a/projects/core/src/config/config-initializer/config-initializer.service.ts b/projects/core/src/config/config-initializer/config-initializer.service.ts
index 4b35af87e81..bd2d1414db8 100644
--- a/projects/core/src/config/config-initializer/config-initializer.service.ts
+++ b/projects/core/src/config/config-initializer/config-initializer.service.ts
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Inject, Injectable, isDevMode, Optional } from '@angular/core';
+import { inject, Inject, Injectable, isDevMode, Optional } from '@angular/core';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { filter, map, take } from 'rxjs/operators';
+import { LoggerService } from '../../logger';
 import { Config, RootConfig } from '../config-tokens';
 import { deepMerge } from '../utils/deep-merge';
 import {
-  ConfigInitializer,
   CONFIG_INITIALIZER_FORROOT_GUARD,
+  ConfigInitializer,
 } from './config-initializer';
 
 /**
@@ -21,6 +22,8 @@ import {
   providedIn: 'root',
 })
 export class ConfigInitializerService {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected config: Config,
     @Optional()
@@ -143,7 +146,7 @@ export class ConfigInitializerService {
       }
 
       if (isDevMode() && !this.areReady(initializer.scopes, ongoingScopes)) {
-        console.warn(
+        this.logger.warn(
           'More than one CONFIG_INITIALIZER is initializing the same config scope.'
         );
       }
diff --git a/projects/core/src/config/config-validator/config-validator.module.ts b/projects/core/src/config/config-validator/config-validator.module.ts
index 002cf0cb924..619acfdbf8a 100644
--- a/projects/core/src/config/config-validator/config-validator.module.ts
+++ b/projects/core/src/config/config-validator/config-validator.module.ts
@@ -6,11 +6,13 @@
 
 import {
   APP_INITIALIZER,
+  inject,
   isDevMode,
   ModuleWithProviders,
   NgModule,
   Optional,
 } from '@angular/core';
+import { LoggerService } from '../../logger';
 import { ConfigInitializerService } from '../config-initializer/config-initializer.service';
 import {
   ConfigValidator,
@@ -22,14 +24,16 @@ export function configValidatorFactory(
   configInitializer: ConfigInitializerService,
   validators: ConfigValidator[]
 ): () => void {
-  const validate = () => {
+  const logger = inject(LoggerService);
+  return () => {
     if (isDevMode()) {
       configInitializer
         .getStable()
-        .subscribe((config) => validateConfig(config, validators || []));
+        .subscribe((config) =>
+          validateConfig(config, validators || [], logger)
+        );
     }
   };
-  return validate;
 }
 
 /**
diff --git a/projects/core/src/config/config-validator/config-validator.spec.ts b/projects/core/src/config/config-validator/config-validator.spec.ts
index 32607ee43a9..87a139808b8 100644
--- a/projects/core/src/config/config-validator/config-validator.spec.ts
+++ b/projects/core/src/config/config-validator/config-validator.spec.ts
@@ -1,23 +1,26 @@
+import { LoggerService } from '../../logger';
 import { validateConfig } from './config-validator';
 
 describe('config validator', () => {
+  const logger = new LoggerService();
+  beforeEach(() => {
+    spyOn(logger, 'warn');
+  });
+
   it('should not warn if there is no validators', () => {
-    spyOn(console, 'warn');
-    validateConfig({}, []);
-    expect(console.warn).not.toHaveBeenCalled();
+    validateConfig({}, [], logger);
+    expect(logger.warn).not.toHaveBeenCalled();
   });
 
   it('should warn if there is a validation error', () => {
-    spyOn(console, 'warn');
-    validateConfig({}, [(_c) => 'error']);
-    expect(console.warn).toHaveBeenCalledWith('error');
+    validateConfig({}, [(_c) => 'error'], logger);
+    expect(logger.warn).toHaveBeenCalledWith('error');
   });
 
   it('should warn only for errors', () => {
-    spyOn(console, 'warn');
     const mockInvalid = (_c) => 'error';
     const mockValidValidator = (_c) => {};
-    validateConfig({}, [mockInvalid, mockValidValidator, mockInvalid]);
-    expect(console.warn).toHaveBeenCalledTimes(2);
+    validateConfig({}, [mockInvalid, mockValidValidator, mockInvalid], logger);
+    expect(logger.warn).toHaveBeenCalledTimes(2);
   });
 });
diff --git a/projects/core/src/config/config-validator/config-validator.ts b/projects/core/src/config/config-validator/config-validator.ts
index 314a22051f5..224abae4bce 100644
--- a/projects/core/src/config/config-validator/config-validator.ts
+++ b/projects/core/src/config/config-validator/config-validator.ts
@@ -5,6 +5,7 @@
  */
 
 import { InjectionToken, Provider } from '@angular/core';
+import { LoggerService } from '../../logger';
 import { Config } from '../config-tokens';
 
 export const ConfigValidatorToken = new InjectionToken(
@@ -35,12 +36,15 @@ export function provideConfigValidator(
 
 export function validateConfig(
   config: Config,
-  configValidators: ConfigValidator[]
+  configValidators: ConfigValidator[],
+  logger?: LoggerService
 ) {
   for (const validate of configValidators) {
     const warning = validate(config);
     if (warning) {
-      console.warn(warning);
+      // CXSPA-3680 - remove console.log before 7.0 release and make `logger` required param
+      /* eslint-disable-next-line no-console */
+      logger ? logger.warn(warning) : console.warn(warning);
     }
   }
 }
diff --git a/projects/core/src/error-handling/cx-error-handler.ts b/projects/core/src/error-handling/cx-error-handler.ts
new file mode 100644
index 00000000000..08f143c33cd
--- /dev/null
+++ b/projects/core/src/error-handling/cx-error-handler.ts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ErrorHandler, Injectable, inject } from '@angular/core';
+import { LoggerService } from '../logger/logger.service';
+
+@Injectable()
+export class CxErrorHandler implements ErrorHandler {
+  logger = inject(LoggerService);
+
+  handleError(error: any): void {
+    this.logger.error(error);
+  }
+}
diff --git a/projects/core/src/error-handling/error-handling.module.ts b/projects/core/src/error-handling/error-handling.module.ts
new file mode 100644
index 00000000000..4f40b3f4aa6
--- /dev/null
+++ b/projects/core/src/error-handling/error-handling.module.ts
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ErrorHandler, ModuleWithProviders, NgModule } from '@angular/core';
+import { CxErrorHandler } from './cx-error-handler';
+
+@NgModule()
+export class ErrorHandlingModule {
+  static forRoot(): ModuleWithProviders<ErrorHandlingModule> {
+    return {
+      ngModule: ErrorHandlingModule,
+      providers: [
+        {
+          provide: ErrorHandler,
+          useClass: CxErrorHandler,
+        },
+      ],
+    };
+  }
+}
diff --git a/projects/core/src/error-handling/index.ts b/projects/core/src/error-handling/index.ts
new file mode 100644
index 00000000000..5215bb557f2
--- /dev/null
+++ b/projects/core/src/error-handling/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cx-error-handler';
+export * from './error-handling.module';
diff --git a/projects/core/src/event/event.service.ts b/projects/core/src/event/event.service.ts
index 014833f4c24..929462200d8 100644
--- a/projects/core/src/event/event.service.ts
+++ b/projects/core/src/event/event.service.ts
@@ -4,9 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AbstractType, Injectable, isDevMode, Type } from '@angular/core';
+import {
+  AbstractType,
+  inject,
+  Injectable,
+  isDevMode,
+  Type,
+} from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { tap } from 'rxjs/operators';
+import { LoggerService } from '../logger';
 import { createFrom } from '../util/create-from';
 import { CxEvent } from './cx-event';
 import { MergingSubject } from './utils/merging-subject';
@@ -38,6 +45,7 @@ interface EventMeta<T> {
   providedIn: 'root',
 })
 export class EventService {
+  protected logger = inject(LoggerService);
   /**
    * The various events meta are collected in a map, stored by the event type class
    */
@@ -61,7 +69,7 @@ export class EventService {
     const eventMeta = this.getEventMeta(eventType);
     if (eventMeta.mergingSubject.has(source$)) {
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           `EventService: the event source`,
           source$,
           `has been already registered for the type`,
@@ -183,7 +191,7 @@ export class EventService {
       parentType = Object.getPrototypeOf(parentType);
     }
 
-    console.warn(
+    this.logger.warn(
       `The ${eventType.name} (or one of its parent classes) does not inherit from the ${CxEvent.type}`
     );
   }
@@ -200,7 +208,7 @@ export class EventService {
     return source$.pipe(
       tap((event) => {
         if (!(event instanceof eventType)) {
-          console.warn(
+          this.logger.warn(
             `EventService: The stream`,
             source$,
             `emitted the event`,
diff --git a/projects/core/src/global-message/http-interceptors/handlers/unknown-error/unknown-error.handler.ts b/projects/core/src/global-message/http-interceptors/handlers/unknown-error/unknown-error.handler.ts
index 821e1fa086c..5dee52c67db 100644
--- a/projects/core/src/global-message/http-interceptors/handlers/unknown-error/unknown-error.handler.ts
+++ b/projects/core/src/global-message/http-interceptors/handlers/unknown-error/unknown-error.handler.ts
@@ -5,7 +5,9 @@
  */
 
 import { HttpErrorResponse, HttpRequest } from '@angular/common/http';
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+
+import { LoggerService } from '../../../../logger';
 import { Priority } from '../../../../util/applicable';
 import { HttpResponseStatus } from '../../../models/response-status.model';
 import { HttpErrorHandler } from '../http-error.handler';
@@ -20,6 +22,8 @@ import { HttpErrorHandler } from '../http-error.handler';
 export class UnknownErrorHandler extends HttpErrorHandler {
   responseStatus = HttpResponseStatus.UNKNOWN;
 
+  protected logger = inject(LoggerService);
+
   /**
    * hasMatch always returns true, to mach all errors
    */
@@ -29,7 +33,10 @@ export class UnknownErrorHandler extends HttpErrorHandler {
 
   handleError(_request: HttpRequest<any>, errorResponse: HttpErrorResponse) {
     if (isDevMode() || this.isSsr()) {
-      console.warn(`An unknown http error occurred\n`, errorResponse.message);
+      this.logger.warn(
+        `An unknown http error occurred\n`,
+        errorResponse.message
+      );
     }
   }
 
diff --git a/projects/core/src/http/http-timeout/http-timeout.interceptor.spec.ts b/projects/core/src/http/http-timeout/http-timeout.interceptor.spec.ts
index 4d669b46545..bf9dae1121a 100644
--- a/projects/core/src/http/http-timeout/http-timeout.interceptor.spec.ts
+++ b/projects/core/src/http/http-timeout/http-timeout.interceptor.spec.ts
@@ -1,4 +1,5 @@
 import {
+  HTTP_INTERCEPTORS,
   HttpClient,
   HttpContext,
   HttpErrorResponse,
@@ -8,16 +9,16 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HTTP_INTERCEPTORS,
 } from '@angular/common/http';
 import {
   HttpClientTestingModule,
   HttpTestingController,
 } from '@angular/common/http/testing';
 import { Injectable } from '@angular/core';
-import { fakeAsync, flush, TestBed, tick } from '@angular/core/testing';
+import { TestBed, fakeAsync, flush, tick } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { delay } from 'rxjs/operators';
+import { LoggerService } from '../../logger';
 import { OccConfig } from '../../occ/config/occ-config';
 import { WindowRef } from '../../window/window-ref';
 import { HTTP_TIMEOUT_CONFIG } from './http-timeout.config';
@@ -37,6 +38,7 @@ describe('HttpTimeoutInterceptor', () => {
   let httpClient: HttpClient;
   let windowRef: WindowRef;
   let config: OccConfig;
+  let logger: LoggerService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -66,8 +68,9 @@ describe('HttpTimeoutInterceptor', () => {
     httpClient = TestBed.inject(HttpClient);
     windowRef = TestBed.inject(WindowRef);
     config = TestBed.inject(OccConfig);
+    logger = TestBed.inject(LoggerService);
 
-    spyOn(console, 'warn');
+    spyOn(logger, 'warn');
   });
 
   afterEach(fakeAsync(() => {
@@ -262,7 +265,7 @@ describe('HttpTimeoutInterceptor', () => {
     );
   }));
 
-  it('in case of timeout, it should console.warn', fakeAsync(() => {
+  it('in case of timeout, it should logger.warn', fakeAsync(() => {
     spyOn(windowRef, 'isBrowser').and.returnValue(false);
 
     httpClient.get(testUrl).subscribe({ error: () => {} });
@@ -272,7 +275,7 @@ describe('HttpTimeoutInterceptor', () => {
 
     tick(VERY_LONG_TIME);
 
-    expect(console.warn).toHaveBeenCalledWith(
+    expect(logger.warn).toHaveBeenCalledWith(
       `Request to URL '${testUrl}' exceeded expected time of ${SERVER_TIMEOUT}ms and was aborted.`
     );
   }));
diff --git a/projects/core/src/http/http-timeout/http-timeout.interceptor.ts b/projects/core/src/http/http-timeout/http-timeout.interceptor.ts
index 9f682b821f6..5c1944bc717 100644
--- a/projects/core/src/http/http-timeout/http-timeout.interceptor.ts
+++ b/projects/core/src/http/http-timeout/http-timeout.interceptor.ts
@@ -12,9 +12,10 @@ import {
   HttpInterceptor,
   HttpRequest,
 } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { NEVER, Observable, of, TimeoutError } from 'rxjs';
+import { Injectable, inject } from '@angular/core';
+import { NEVER, Observable, TimeoutError, of } from 'rxjs';
 import { catchError, startWith, switchMap, timeout } from 'rxjs/operators';
+import { LoggerService } from '../../logger';
 import { OccConfig } from '../../occ/config/occ-config';
 import { WindowRef } from '../../window/window-ref';
 import { HTTP_TIMEOUT_CONFIG } from './http-timeout.config';
@@ -24,6 +25,8 @@ import { HTTP_TIMEOUT_CONFIG } from './http-timeout.config';
  */
 @Injectable({ providedIn: 'root' })
 export class HttpTimeoutInterceptor implements HttpInterceptor {
+  protected logger = inject(LoggerService);
+
   constructor(protected windowRef: WindowRef, protected config: OccConfig) {}
 
   /**
@@ -112,7 +115,7 @@ export class HttpTimeoutInterceptor implements HttpInterceptor {
 
     // If an HTTP call times out, it is considered an unexpected error.
     // To assist with troubleshooting, the error is logged to the console.
-    console.warn(message);
+    this.logger.warn(message);
 
     return new Error(message);
   }
diff --git a/projects/core/src/i18n/date.pipe.ts b/projects/core/src/i18n/date.pipe.ts
index 6d11c2a9979..3a1f6e3c2c4 100644
--- a/projects/core/src/i18n/date.pipe.ts
+++ b/projects/core/src/i18n/date.pipe.ts
@@ -5,12 +5,15 @@
  */
 
 import { DatePipe, getLocaleId } from '@angular/common';
-import { isDevMode, Pipe, PipeTransform } from '@angular/core';
+import { Pipe, PipeTransform, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '../logger';
 import { LanguageService } from '../site-context/facade/language.service';
 
 // type CxDatePipe, not DatePipe, due to conflict with Angular's DatePipe - problem occurs for the backward compatibility compiler of Ivy
 @Pipe({ name: 'cxDate' })
 export class CxDatePipe extends DatePipe implements PipeTransform {
+  protected logger = inject(LoggerService);
+
   constructor(protected language: LanguageService) {
     super('');
   }
@@ -45,7 +48,7 @@ export class CxDatePipe extends DatePipe implements PipeTransform {
 
   private reportMissingLocaleData(lang: string) {
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `cxDate pipe: No locale data registered for '${lang}' (see https://angular.io/api/common/registerLocaleData).`
       );
     }
diff --git a/projects/core/src/i18n/i18next/i18next-initializer.ts b/projects/core/src/i18n/i18next/i18next-initializer.ts
index d54af9daec0..85ce74b922b 100644
--- a/projects/core/src/i18n/i18next/i18next-initializer.ts
+++ b/projects/core/src/i18n/i18next/i18next-initializer.ts
@@ -4,20 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Inject, Injectable, OnDestroy } from '@angular/core';
-import type { i18n, InitOptions } from 'i18next';
+import { Inject, Injectable, OnDestroy, inject } from '@angular/core';
+import type { InitOptions, i18n } from 'i18next';
 import { Subscription } from 'rxjs';
 import { LanguageService } from '../../site-context/facade/language.service';
 import { I18nConfig } from '../config/i18n-config';
 import { TranslationResources } from '../translation-resources';
 import { I18nextBackendService } from './i18next-backend/i18next-backend.service';
 import { I18NEXT_INSTANCE } from './i18next-instance';
+import { I18NEXT_LOGGER_PLUGIN } from './i18next-plugins/i18next-logger-plugin';
 
 /**
  * Initializes the i18next instance.
  */
 @Injectable({ providedIn: 'root' })
 export class I18nextInitializer implements OnDestroy {
+  loggerPlugin = inject(I18NEXT_LOGGER_PLUGIN);
+
   constructor(
     @Inject(I18NEXT_INSTANCE) protected i18next: i18n,
     protected config: I18nConfig,
@@ -32,7 +35,7 @@ export class I18nextInitializer implements OnDestroy {
    */
   initialize(): Promise<any> {
     const i18nextConfig = this.getI18nextConfig();
-    return this.i18next.init(i18nextConfig, () => {
+    return this.i18next.use(this.loggerPlugin).init(i18nextConfig, () => {
       // Don't use i18next's 'resources' config key for adding static translations,
       // because it will disable loading chunks from backend. We add resources here, in the init's callback.
       this.addTranslationResources();
diff --git a/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
new file mode 100644
index 00000000000..df82ddb3d13
--- /dev/null
+++ b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
@@ -0,0 +1,46 @@
+import { TestBed } from '@angular/core/testing';
+import { LoggerService } from '@spartacus/core';
+import { LoggerModule } from 'i18next';
+import { I18NEXT_LOGGER_PLUGIN } from './i18next-logger-plugin';
+
+describe('i18next logger plugin', () => {
+  let plugin: LoggerModule;
+  let logger: LoggerService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [LoggerService],
+    });
+
+    plugin = TestBed.inject(I18NEXT_LOGGER_PLUGIN);
+    logger = TestBed.inject(LoggerService);
+  });
+
+  it('should return logger plugin', () => {
+    expect(plugin).toBeTruthy();
+    expect(plugin.type).toEqual('logger');
+  });
+
+  it('should log', () => {
+    const log = spyOn(logger, 'log');
+
+    plugin.log(['test']);
+
+    expect(log).toHaveBeenCalledWith('test');
+  });
+
+  it('should warn', () => {
+    const warn = spyOn(logger, 'warn');
+
+    plugin.warn(['test']);
+
+    expect(warn).toHaveBeenCalledWith('test');
+  });
+
+  it('should error', () => {
+    const error = spyOn(logger, 'error');
+
+    plugin.error(['test']);
+
+    expect(error).toHaveBeenCalledWith('test');
+  });
+});
diff --git a/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.ts b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.ts
new file mode 100644
index 00000000000..c71d9022195
--- /dev/null
+++ b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.ts
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { InjectionToken, inject } from '@angular/core';
+
+import { LoggerModule } from 'i18next';
+import { LoggerService } from '../../../logger';
+
+/**
+ * The logger plugin for i18next that delegates logging to the Spartacus LoggerService.
+ * The logger plugin is used to log i18next events.
+ * See more: https://www.i18next.com/misc/creating-own-plugins#logger
+ */
+export const I18NEXT_LOGGER_PLUGIN = new InjectionToken<LoggerModule>(
+  'I18NEXT_LOGGER_PLUGIN',
+  {
+    providedIn: 'root',
+    factory: () => {
+      const logger = inject(LoggerService);
+      return {
+        type: 'logger',
+        /**
+         * @param args - Array of arguments. This is the only parameter that is an array. See more: https://www.i18next.com/misc/creating-own-plugins#logger
+         */
+        log: (args) => logger.log(...args),
+        /**
+         * @param args - Array of arguments. This is the only parameter that is an array. See more: https://www.i18next.com/misc/creating-own-plugins#logger
+         */
+        warn: (args) => logger.warn(...args),
+        /**
+         * @param args - Array of arguments. This is the only parameter that is an array. See more: https://www.i18next.com/misc/creating-own-plugins#logger
+         */
+        error: (args) => logger.error(...args),
+      };
+    },
+  }
+);
diff --git a/projects/core/src/i18n/i18next/i18next-translation.service.ts b/projects/core/src/i18n/i18next/i18next-translation.service.ts
index 8c2a0d00721..921aad2ca72 100644
--- a/projects/core/src/i18n/i18next/i18next-translation.service.ts
+++ b/projects/core/src/i18n/i18next/i18next-translation.service.ts
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Inject, Injectable, isDevMode } from '@angular/core';
+import { Inject, Injectable, inject, isDevMode } from '@angular/core';
 import { i18n } from 'i18next';
 import { Observable } from 'rxjs';
+import { LoggerService } from '../../logger';
 import { I18nConfig } from '../config/i18n-config';
 import { TranslationChunkService } from '../translation-chunk.service';
 import { TranslationService } from '../translation.service';
@@ -17,6 +18,8 @@ export class I18nextTranslationService implements TranslationService {
   private readonly NON_BREAKING_SPACE = String.fromCharCode(160);
   protected readonly NAMESPACE_SEPARATOR = ':';
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected config: I18nConfig,
     protected translationChunk: TranslationChunkService,
@@ -81,7 +84,7 @@ export class I18nextTranslationService implements TranslationService {
 
   private reportMissingKey(key: string, chunkName: string) {
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `Translation key missing '${key}' in the chunk '${chunkName}'`
       );
     }
diff --git a/projects/core/src/i18n/numeric.pipe.ts b/projects/core/src/i18n/numeric.pipe.ts
index c2c3095ac08..20ed87d200d 100644
--- a/projects/core/src/i18n/numeric.pipe.ts
+++ b/projects/core/src/i18n/numeric.pipe.ts
@@ -5,11 +5,14 @@
  */
 
 import { DecimalPipe, getLocaleId } from '@angular/common';
-import { isDevMode, Pipe, PipeTransform } from '@angular/core';
+import { Pipe, PipeTransform, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '../logger';
 import { LanguageService } from '../site-context/facade/language.service';
 
 @Pipe({ name: 'cxNumeric' })
 export class CxNumericPipe extends DecimalPipe implements PipeTransform {
+  protected logger = inject(LoggerService);
+
   constructor(protected language: LanguageService) {
     super('');
   }
@@ -42,7 +45,7 @@ export class CxNumericPipe extends DecimalPipe implements PipeTransform {
 
   protected reportMissingLocaleData(lang: string): void {
     if (isDevMode()) {
-      console.warn(
+      this.logger.warn(
         `cxNumeric pipe: No locale data registered for '${lang}' (see https://angular.io/api/common/registerLocaleData).`
       );
     }
diff --git a/projects/core/src/i18n/translate.pipe.spec.ts b/projects/core/src/i18n/translate.pipe.spec.ts
index 2d21ff08912..2b6f3e9e0b4 100644
--- a/projects/core/src/i18n/translate.pipe.spec.ts
+++ b/projects/core/src/i18n/translate.pipe.spec.ts
@@ -1,8 +1,14 @@
-import { ChangeDetectorRef } from '@angular/core';
+import { ChangeDetectorRef, Injectable } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
 import { EMPTY, of } from 'rxjs';
+import { MockTranslationService } from './testing/mock-translation.service';
 import { TranslatePipe } from './translate.pipe';
 import { TranslationService } from './translation.service';
-import createSpy = jasmine.createSpy;
+
+@Injectable()
+class MockChangeDetectorRef implements Partial<ChangeDetectorRef> {
+  markForCheck() {}
+}
 
 describe('TranslatePipe', () => {
   let pipe: TranslatePipe;
@@ -10,11 +16,16 @@ describe('TranslatePipe', () => {
   let cd: ChangeDetectorRef;
 
   beforeEach(() => {
-    service = {
-      translate: () => {},
-    } as any;
-    cd = { markForCheck: createSpy('markForCheck') } as any;
-    pipe = new TranslatePipe(service, cd);
+    TestBed.configureTestingModule({
+      providers: [
+        TranslatePipe,
+        { provide: TranslationService, useClass: MockTranslationService },
+        { provide: ChangeDetectorRef, useClass: MockChangeDetectorRef },
+      ],
+    });
+    pipe = TestBed.inject(TranslatePipe);
+    service = TestBed.inject(TranslationService);
+    cd = TestBed.inject(ChangeDetectorRef);
   });
 
   describe('transform', () => {
@@ -75,13 +86,14 @@ describe('TranslatePipe', () => {
     });
 
     it('should call cd.markForCheck every time when service.translate emits value', () => {
+      const markForCheckSpy = spyOn(cd, 'markForCheck').and.callThrough();
       spyOn(service, 'translate').and.returnValues(
         of('value1', 'value2'),
         of('value3')
       );
       pipe.transform('testKey', { param: 'param1' });
       pipe.transform('testKey', { param: 'param2' });
-      expect(cd.markForCheck).toHaveBeenCalledTimes(3);
+      expect(markForCheckSpy).toHaveBeenCalledTimes(3);
     });
   });
 });
diff --git a/projects/core/src/i18n/translate.pipe.ts b/projects/core/src/i18n/translate.pipe.ts
index d5ab7482466..8a8eb0ed0cc 100644
--- a/projects/core/src/i18n/translate.pipe.ts
+++ b/projects/core/src/i18n/translate.pipe.ts
@@ -6,12 +6,14 @@
 
 import {
   ChangeDetectorRef,
+  inject,
   isDevMode,
   OnDestroy,
   Pipe,
   PipeTransform,
 } from '@angular/core';
 import { Subscription } from 'rxjs';
+import { LoggerService } from '../logger';
 import { ObjectComparisonUtils } from '../util/object-comparison-utils';
 import { Translatable, TranslatableParams } from './translatable';
 import { TranslationService } from './translation.service';
@@ -23,6 +25,8 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
   private translatedValue: string;
   private sub: Subscription;
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected service: TranslationService,
     protected cd: ChangeDetectorRef
@@ -34,7 +38,7 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
   ): string {
     if (!input) {
       if (isDevMode()) {
-        console.error(
+        this.logger.error(
           `The given input for the cxTranslate pipe (${input}) is invalid and cannot be translated`
         );
       }
diff --git a/projects/core/src/i18n/translation-chunk.service.spec.ts b/projects/core/src/i18n/translation-chunk.service.spec.ts
index d3a5a4281fc..cfabf6caee2 100644
--- a/projects/core/src/i18n/translation-chunk.service.spec.ts
+++ b/projects/core/src/i18n/translation-chunk.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+import { LoggerService } from '../logger';
 import { I18nConfig } from './config/i18n-config';
 import { TranslationChunkService } from './translation-chunk.service';
 
@@ -8,24 +9,24 @@ describe('TranslationChunkService', () => {
   const mockChunksConfig = {
     chunk1: ['key1', 'key2', 'key2'],
   };
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        TranslationChunkService,
-        {
-          provide: I18nConfig,
-          useValue: {
-            production: false,
-            i18n: { chunks: mockChunksConfig },
-          },
-        },
-      ],
-    });
-
-    service = TestBed.inject(TranslationChunkService);
-  });
 
   describe('getChunk', () => {
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        providers: [
+          TranslationChunkService,
+          {
+            provide: I18nConfig,
+            useValue: {
+              production: false,
+              i18n: { chunks: mockChunksConfig },
+            },
+          },
+        ],
+      });
+
+      service = TestBed.inject(TranslationChunkService);
+    });
     it('should return chunk name configured for the given key', () => {
       expect(service.getChunkNameForKey('key1')).toBe('chunk1');
     });
@@ -44,23 +45,31 @@ describe('TranslationChunkService', () => {
   });
 
   describe('I18n config', () => {
+    let mockService: TranslationChunkService;
+
+    beforeEach(() => {
+      TestBed.configureTestingModule({});
+    });
+
     it('should not fail if no config has been provided', () => {
-      const mockService = new TranslationChunkService({});
+      mockService = TestBed.inject(TranslationChunkService);
       expect(mockService).toBeTruthy();
     });
 
     it('should not fail if no config chunks has been provided', () => {
-      const mockService = new TranslationChunkService({
-        i18n: {},
-      });
+      TestBed.overrideProvider(I18nConfig, { useValue: { i18n: {} } });
+      mockService = TestBed.inject(TranslationChunkService);
       expect(mockService).toBeTruthy();
     });
 
     it('should warn if there are duplicated keys in the config', () => {
-      const warnSpy = spyOn(console, 'warn');
-      const mockService = new TranslationChunkService({
-        i18n: { chunks: mockChunksConfig },
+      TestBed.overrideProvider(I18nConfig, {
+        useValue: { i18n: { chunks: mockChunksConfig } },
       });
+      const logger = TestBed.inject(LoggerService);
+      const warnSpy = spyOn(logger, 'warn');
+      mockService = TestBed.inject(TranslationChunkService);
+
       expect(mockService).toBeTruthy();
       expect(warnSpy).toHaveBeenCalled();
     });
diff --git a/projects/core/src/i18n/translation-chunk.service.ts b/projects/core/src/i18n/translation-chunk.service.ts
index f03dc9e4476..2d780f10fb1 100644
--- a/projects/core/src/i18n/translation-chunk.service.ts
+++ b/projects/core/src/i18n/translation-chunk.service.ts
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '../logger';
 import { I18nConfig } from './config/i18n-config';
 
 @Injectable({
@@ -13,6 +14,9 @@ import { I18nConfig } from './config/i18n-config';
 export class TranslationChunkService {
   protected duplicates: { [key: string]: string[] } = {};
   protected chunks: { [key: string]: string } = {};
+
+  protected logger = inject(LoggerService);
+
   constructor(protected config: I18nConfig) {
     const chunks = (config.i18n && config.i18n.chunks) || {};
     Object.keys(chunks).forEach((chunk) => {
@@ -53,7 +57,7 @@ export class TranslationChunkService {
         }.${key}'.`
       );
     });
-    console.warn(
+    this.logger.warn(
       `Duplicated keys has been found in the config of i18n chunks:\n${dupes.join(
         '\n'
       )}`
diff --git a/projects/core/src/lazy-loading/lazy-loading.module.ts b/projects/core/src/lazy-loading/lazy-loading.module.ts
index 73d26b13c77..fa33105a7dd 100644
--- a/projects/core/src/lazy-loading/lazy-loading.module.ts
+++ b/projects/core/src/lazy-loading/lazy-loading.module.ts
@@ -6,10 +6,12 @@
 
 import {
   APP_INITIALIZER,
+  inject,
   ModuleWithProviders,
   NgModule,
   Optional,
 } from '@angular/core';
+import { LoggerService } from '../logger';
 import { LazyModulesService } from './lazy-modules.service';
 import { MODULE_INITIALIZER } from './tokens';
 
@@ -17,20 +19,20 @@ export function moduleInitializersFactory(
   lazyModuleService: LazyModulesService,
   moduleInitializerFunctions: (() => any)[]
 ): () => any {
-  const factoryFunction = () => {
+  const logger = inject(LoggerService);
+  return () => {
     return Promise.all(
       lazyModuleService.runModuleInitializerFunctions(
         moduleInitializerFunctions
       )
     ).catch((error) => {
-      console.error(
+      logger.error(
         'MODULE_INITIALIZER promise was rejected during app initialization.',
         error
       );
       throw error;
     });
   };
-  return factoryFunction;
 }
 
 @NgModule({})
diff --git a/projects/core/src/lazy-loading/lazy-modules.service.ts b/projects/core/src/lazy-loading/lazy-modules.service.ts
index a7bb2bac00c..d807d1482a4 100644
--- a/projects/core/src/lazy-loading/lazy-modules.service.ts
+++ b/projects/core/src/lazy-loading/lazy-modules.service.ts
@@ -11,15 +11,16 @@ import {
   NgModuleFactory,
   NgModuleRef,
   OnDestroy,
+  inject,
 } from '@angular/core';
 import {
-  combineLatest,
   ConnectableObservable,
-  from,
   Observable,
+  Subscription,
+  combineLatest,
+  from,
   of,
   queueScheduler,
-  Subscription,
   throwError,
 } from 'rxjs';
 import {
@@ -32,6 +33,7 @@ import {
   tap,
 } from 'rxjs/operators';
 import { EventService } from '../event/event.service';
+import { LoggerService } from '../logger';
 import { CombinedInjector } from '../util/combined-injector';
 import { createFrom } from '../util/create-from';
 import { ModuleInitializedEvent } from './events/module-initialized-event';
@@ -44,6 +46,8 @@ import { MODULE_INITIALIZER } from './tokens';
   providedIn: 'root',
 })
 export class LazyModulesService implements OnDestroy {
+  protected logger = inject(LoggerService);
+
   /**
    * Expose lazy loaded module references
    */
@@ -160,7 +164,7 @@ export class LazyModulesService implements OnDestroy {
     if (asyncInitPromises.length) {
       return from(Promise.all(asyncInitPromises)).pipe(
         catchError((error) => {
-          console.error(
+          this.logger.error(
             'MODULE_INITIALIZER promise was rejected while lazy loading a module.',
             error
           );
@@ -198,7 +202,7 @@ export class LazyModulesService implements OnDestroy {
       }
       return initPromises;
     } catch (error) {
-      console.error(
+      this.logger.error(
         `MODULE_INITIALIZER init function throwed an error. `,
         error
       );
diff --git a/projects/core/src/logger/index.ts b/projects/core/src/logger/index.ts
new file mode 100644
index 00000000000..d2144560575
--- /dev/null
+++ b/projects/core/src/logger/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './logger.service';
diff --git a/projects/core/src/logger/logger.service.spec.ts b/projects/core/src/logger/logger.service.spec.ts
new file mode 100644
index 00000000000..de9704f0e85
--- /dev/null
+++ b/projects/core/src/logger/logger.service.spec.ts
@@ -0,0 +1,37 @@
+import { TestBed } from '@angular/core/testing';
+import { LoggerService } from './logger.service';
+
+describe('LoggerService', () => {
+  let loggerService: LoggerService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [LoggerService],
+    });
+
+    loggerService = TestBed.inject(LoggerService);
+  });
+
+  it('should be defined', () => {
+    expect(loggerService).toBeDefined();
+  });
+
+  const testInput = [
+    'test',
+    ['some %s', 'test'],
+    { test: 'test' },
+    ['test %i', 1],
+  ];
+
+  ['log', 'warn', 'error', 'info', 'debug'].forEach((method) => {
+    testInput.forEach((input) => {
+      it(`should ${method}`, () => {
+        const methodSpy: jasmine.Spy<jasmine.Func> = spyOn(
+          console,
+          method as keyof Console
+        );
+        loggerService[method as keyof LoggerService](input);
+        expect(methodSpy).toHaveBeenCalledWith(input);
+      });
+    });
+  });
+});
diff --git a/projects/core/src/logger/logger.service.ts b/projects/core/src/logger/logger.service.ts
new file mode 100644
index 00000000000..6ebaaac15eb
--- /dev/null
+++ b/projects/core/src/logger/logger.service.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+
+/**
+ * By default it delegates logged messages to the native `console` object.
+ *
+ * It's a good extension point for customizing the destination of logs
+ *(e.g. to use a 3rd party logger library) or to enhance logs with more contextual data.
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class LoggerService {
+  log(...args: Parameters<typeof console.log>): void {
+    /* eslint-disable-next-line no-console */
+    console.log(...args);
+  }
+  warn(...args: Parameters<typeof console.warn>): void {
+    /* eslint-disable-next-line no-console */
+    console.warn(...args);
+  }
+  error(...args: Parameters<typeof console.error>): void {
+    /* eslint-disable-next-line no-console */
+    console.error(...args);
+  }
+  info(...args: Parameters<typeof console.info>): void {
+    /* eslint-disable-next-line no-console */
+    console.info(...args);
+  }
+  debug(...args: Parameters<typeof console.debug>): void {
+    /* eslint-disable-next-line no-console */
+    console.debug(...args);
+  }
+}
diff --git a/projects/core/src/occ/services/occ-endpoints.service.ts b/projects/core/src/occ/services/occ-endpoints.service.ts
index cc38f74ed50..3fb09e1af87 100644
--- a/projects/core/src/occ/services/occ-endpoints.service.ts
+++ b/projects/core/src/occ/services/occ-endpoints.service.ts
@@ -5,8 +5,9 @@
  */
 
 import { HttpParams, HttpParamsOptions } from '@angular/common/http';
-import { Injectable, isDevMode, Optional } from '@angular/core';
+import { Injectable, Optional, inject, isDevMode } from '@angular/core';
 import { StringTemplate } from '../../config/utils/string-template';
+import { LoggerService } from '../../logger';
 import { getContextParameterDefault } from '../../site-context/config/context-config-utils';
 import { BaseSiteService } from '../../site-context/facade/base-site.service';
 import { BASE_SITE_CONTEXT_ID } from '../../site-context/providers/context-ids';
@@ -40,6 +41,8 @@ export class OccEndpointsService {
     );
   }
 
+  protected logger = inject(LoggerService);
+
   constructor(
     private config: OccConfig,
     @Optional() private baseSiteService: BaseSiteService
@@ -208,7 +211,7 @@ export class OccEndpointsService {
         return endpointConfig;
       }
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           `${endpoint} endpoint configuration missing for scope "${scope}"`
         );
       }
diff --git a/projects/core/src/product/store/effects/product-search.effect.ts b/projects/core/src/product/store/effects/product-search.effect.ts
index 69c32ba8753..ca6d6e55d38 100644
--- a/projects/core/src/product/store/effects/product-search.effect.ts
+++ b/projects/core/src/product/store/effects/product-search.effect.ts
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, groupBy, map, mergeMap, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { ProductSearchConnector } from '../../connectors/search/product-search.connector';
 import { ProductActions } from '../actions/index';
 
 @Injectable()
 export class ProductsSearchEffects {
+  protected logger = inject(LoggerService);
+
   searchProducts$: Observable<
     ProductActions.SearchProductsSuccess | ProductActions.SearchProductsFail
   > = createEffect(() =>
@@ -35,7 +38,7 @@ export class ProductsSearchEffects {
                 catchError((error) =>
                   of(
                     new ProductActions.SearchProductsFail(
-                      normalizeHttpError(error),
+                      normalizeHttpError(error, this.logger),
                       action.auxiliary
                     )
                   )
@@ -69,7 +72,7 @@ export class ProductsSearchEffects {
             catchError((error) =>
               of(
                 new ProductActions.GetProductSuggestionsFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/product/store/effects/product.effect.ts b/projects/core/src/product/store/effects/product.effect.ts
index e9184d60715..87582569f82 100644
--- a/projects/core/src/product/store/effects/product.effect.ts
+++ b/projects/core/src/product/store/effects/product.effect.ts
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
-import { merge, Observable, of } from 'rxjs';
+import { Observable, merge, of } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 import { AuthActions } from '../../../auth/user-auth/store/actions';
+import { LoggerService } from '../../../logger';
 import { SiteContextActions } from '../../../site-context/store/actions/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { bufferDebounceTime } from '../../../util/rxjs/buffer-debounce-time';
@@ -20,6 +21,8 @@ import { ProductActions } from '../actions/index';
 
 @Injectable()
 export class ProductEffects {
+  protected logger = inject(LoggerService);
+
   // we want to cancel all ongoing requests when currency or language changes,
   private contextChange$: Observable<Action> = this.actions$.pipe(
     ofType(
@@ -71,7 +74,7 @@ export class ProductEffects {
           return of(
             new ProductActions.LoadProductFail(
               productLoad.code,
-              normalizeHttpError(error),
+              normalizeHttpError(error, this.logger),
               productLoad.scope
             )
           );
diff --git a/projects/core/src/routing/configurable-routes/configurable-routes.service.ts b/projects/core/src/routing/configurable-routes/configurable-routes.service.ts
index 9af0ecdca81..51dd023a924 100644
--- a/projects/core/src/routing/configurable-routes/configurable-routes.service.ts
+++ b/projects/core/src/routing/configurable-routes/configurable-routes.service.ts
@@ -4,8 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, InjectionToken, Injector, isDevMode } from '@angular/core';
+import {
+  Injectable,
+  InjectionToken,
+  Injector,
+  inject,
+  isDevMode,
+} from '@angular/core';
 import { Route, Router, Routes, UrlMatcher } from '@angular/router';
+import { LoggerService } from '../../logger';
 import { UrlMatcherService } from '../services/url-matcher.service';
 import { UrlMatcherFactory } from '../url-matcher/url-matcher-factory';
 import { RouteConfig } from './routes-config';
@@ -13,6 +20,8 @@ import { RoutingConfigService } from './routing-config.service';
 
 @Injectable({ providedIn: 'root' })
 export class ConfigurableRoutesService {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected injector: Injector,
     protected routingConfigService: RoutingConfigService,
@@ -171,7 +180,7 @@ export class ConfigurableRoutesService {
 
   private warn(...args: any[]) {
     if (isDevMode()) {
-      console.warn(...args);
+      this.logger.warn(...args);
     }
   }
 }
diff --git a/projects/core/src/routing/configurable-routes/routing-config.service.ts b/projects/core/src/routing/configurable-routes/routing-config.service.ts
index c7b3c620921..882b777c6ec 100644
--- a/projects/core/src/routing/configurable-routes/routing-config.service.ts
+++ b/projects/core/src/routing/configurable-routes/routing-config.service.ts
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '../../logger';
 import { RouteLoadStrategy, RoutingConfig } from './config/routing-config';
 import { RouteConfig } from './routes-config';
 
@@ -15,6 +16,8 @@ export class RoutingConfigService {
    */
   protected routeNamesByPath: { [path: string]: string };
 
+  protected logger = inject(LoggerService);
+
   constructor(protected config: RoutingConfig) {}
 
   /**
@@ -32,7 +35,7 @@ export class RoutingConfigService {
 
   private warn(...args: string[]): void {
     if (isDevMode()) {
-      console.warn(...args);
+      this.logger.warn(...args);
     }
   }
 
@@ -79,7 +82,7 @@ export class RoutingConfigService {
     )) {
       routeConfig?.paths?.forEach((path) => {
         if (isDevMode() && this.routeNamesByPath[path]) {
-          console.error(
+          this.logger.error(
             `The same path '${path}' is configured for two different route names: '${this.routeNamesByPath[path]}' and '${routeName}`
           );
         }
diff --git a/projects/core/src/site-context/services/site-context-params.service.ts b/projects/core/src/site-context/services/site-context-params.service.ts
index 9d03d1cc052..b475a406637 100644
--- a/projects/core/src/site-context/services/site-context-params.service.ts
+++ b/projects/core/src/site-context/services/site-context-params.service.ts
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, Injector, isDevMode } from '@angular/core';
-import { combineLatest, Observable, of } from 'rxjs';
+import { Injectable, Injector, inject, isDevMode } from '@angular/core';
+import { Observable, combineLatest, of } from 'rxjs';
 import { distinctUntilChanged, filter } from 'rxjs/operators';
+import { LoggerService } from '../../logger';
 import {
   getContextParameterDefault,
   getContextParameterValues,
@@ -17,6 +18,8 @@ import { ContextServiceMap } from '../providers/context-service-map';
 
 @Injectable()
 export class SiteContextParamsService {
+  protected logger = inject(LoggerService);
+
   constructor(
     private config: SiteContextConfig,
     private injector: Injector,
@@ -50,7 +53,9 @@ export class SiteContextParamsService {
         return this.injector.get<SiteContext<any>>(this.serviceMap[param]);
       } catch {
         if (isDevMode()) {
-          console.warn(`Couldn't find site context service for '${param}'.`);
+          this.logger.warn(
+            `Couldn't find site context service for '${param}'.`
+          );
         }
         return undefined;
       }
diff --git a/projects/core/src/site-context/store/effects/base-site.effect.ts b/projects/core/src/site-context/store/effects/base-site.effect.ts
index fa2dbf9f348..29f07851c3a 100644
--- a/projects/core/src/site-context/store/effects/base-site.effect.ts
+++ b/projects/core/src/site-context/store/effects/base-site.effect.ts
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, exhaustMap, map } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { SiteConnector } from '../../connectors/site.connector';
 import { SiteContextActions } from '../actions/index';
 
 @Injectable()
 export class BaseSiteEffects {
+  protected logger = inject(LoggerService);
+
   loadBaseSite$: Observable<
     SiteContextActions.LoadBaseSiteSuccess | SiteContextActions.LoadBaseSiteFail
   > = createEffect(() =>
@@ -30,7 +33,9 @@ export class BaseSiteEffects {
           }),
           catchError((error) =>
             of(
-              new SiteContextActions.LoadBaseSiteFail(normalizeHttpError(error))
+              new SiteContextActions.LoadBaseSiteFail(
+                normalizeHttpError(error, this.logger)
+              )
             )
           )
         );
@@ -53,7 +58,7 @@ export class BaseSiteEffects {
           catchError((error) =>
             of(
               new SiteContextActions.LoadBaseSitesFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
diff --git a/projects/core/src/site-context/store/effects/currencies.effect.ts b/projects/core/src/site-context/store/effects/currencies.effect.ts
index f841f6b8ded..dc5307c5aab 100644
--- a/projects/core/src/site-context/store/effects/currencies.effect.ts
+++ b/projects/core/src/site-context/store/effects/currencies.effect.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
@@ -15,6 +15,7 @@ import {
   filter,
   map,
 } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { SiteConnector } from '../../connectors/site.connector';
 import { SiteContextActions } from '../actions/index';
@@ -23,6 +24,8 @@ import { StateWithSiteContext } from '../state';
 
 @Injectable()
 export class CurrenciesEffects {
+  protected logger = inject(LoggerService);
+
   loadCurrencies$: Observable<
     | SiteContextActions.LoadCurrenciesSuccess
     | SiteContextActions.LoadCurrenciesFail
@@ -38,7 +41,7 @@ export class CurrenciesEffects {
           catchError((error) =>
             of(
               new SiteContextActions.LoadCurrenciesFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
diff --git a/projects/core/src/site-context/store/effects/languages.effect.ts b/projects/core/src/site-context/store/effects/languages.effect.ts
index e8338dff7b0..59c2bc3198c 100644
--- a/projects/core/src/site-context/store/effects/languages.effect.ts
+++ b/projects/core/src/site-context/store/effects/languages.effect.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
@@ -15,6 +15,7 @@ import {
   filter,
   map,
 } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { SiteConnector } from '../../connectors/site.connector';
 import { SiteContextActions } from '../actions/index';
@@ -23,6 +24,8 @@ import { StateWithSiteContext } from '../state';
 
 @Injectable()
 export class LanguagesEffects {
+  protected logger = inject(LoggerService);
+
   loadLanguages$: Observable<
     | SiteContextActions.LoadLanguagesSuccess
     | SiteContextActions.LoadLanguagesFail
@@ -38,7 +41,7 @@ export class LanguagesEffects {
           catchError((error) =>
             of(
               new SiteContextActions.LoadLanguagesFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
diff --git a/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts b/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
index ed8fce53ad5..98188dc8132 100644
--- a/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
+++ b/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
@@ -40,6 +40,7 @@ export function processesLoaderReducer<T>(
         processesCountDiff &&
         state.processesCount + processesCountDiff < 0
       ) {
+        /* eslint-disable-next-line no-console */
         console.error(
           `Action '${action.type}' sets processesCount to value < 0!\n` +
             'Make sure to keep processesCount in sync.\n' +
diff --git a/projects/core/src/user/store/effects/billing-countries.effect.ts b/projects/core/src/user/store/effects/billing-countries.effect.ts
index 430a100433f..28dfca8bc82 100644
--- a/projects/core/src/user/store/effects/billing-countries.effect.ts
+++ b/projects/core/src/user/store/effects/billing-countries.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { CountryType } from '../../../model/address.model';
 import { SiteConnector } from '../../../site-context/connectors/site.connector';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -15,6 +16,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class BillingCountriesEffect {
+  protected logger = inject(LoggerService);
+
   loadBillingCountries$: Observable<UserActions.BillingCountriesAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -28,7 +31,7 @@ export class BillingCountriesEffect {
             catchError((error) =>
               of(
                 new UserActions.LoadBillingCountriesFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/customer-coupon.effect.ts b/projects/core/src/user/store/effects/customer-coupon.effect.ts
index 5be89a0259e..f81902a5f1a 100644
--- a/projects/core/src/user/store/effects/customer-coupon.effect.ts
+++ b/projects/core/src/user/store/effects/customer-coupon.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { CustomerCouponSearchResult } from '../../../model/customer-coupon.model';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { CustomerCouponConnector } from '../../connectors/customer-coupon/customer-coupon.connector';
@@ -15,6 +16,8 @@ import * as fromCustomerCouponsAction from '../actions/customer-coupon.action';
 
 @Injectable()
 export class CustomerCouponEffects {
+  protected logger = inject(LoggerService);
+
   loadCustomerCoupons$: Observable<fromCustomerCouponsAction.CustomerCouponAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -40,7 +43,7 @@ export class CustomerCouponEffects {
               catchError((error) =>
                 of(
                   new fromCustomerCouponsAction.LoadCustomerCouponsFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -69,7 +72,7 @@ export class CustomerCouponEffects {
               catchError((error) =>
                 of(
                   new fromCustomerCouponsAction.SubscribeCustomerCouponFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -98,7 +101,7 @@ export class CustomerCouponEffects {
               catchError((error) =>
                 of(
                   new fromCustomerCouponsAction.UnsubscribeCustomerCouponFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -127,7 +130,7 @@ export class CustomerCouponEffects {
               catchError((error) =>
                 of(
                   new fromCustomerCouponsAction.ClaimCustomerCouponFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/projects/core/src/user/store/effects/delivery-countries.effect.ts b/projects/core/src/user/store/effects/delivery-countries.effect.ts
index 38ac2647f00..0293aef1f58 100644
--- a/projects/core/src/user/store/effects/delivery-countries.effect.ts
+++ b/projects/core/src/user/store/effects/delivery-countries.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { CountryType } from '../../../model/address.model';
 import { SiteConnector } from '../../../site-context/connectors/site.connector';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -15,6 +16,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class DeliveryCountriesEffects {
+  protected logger = inject(LoggerService);
+
   loadDeliveryCountries$: Observable<UserActions.DeliveryCountriesAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -28,7 +31,7 @@ export class DeliveryCountriesEffects {
             catchError((error) =>
               of(
                 new UserActions.LoadDeliveryCountriesFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/notification-preference.effect.ts b/projects/core/src/user/store/effects/notification-preference.effect.ts
index e66dbd939ca..f5176714fdf 100644
--- a/projects/core/src/user/store/effects/notification-preference.effect.ts
+++ b/projects/core/src/user/store/effects/notification-preference.effect.ts
@@ -4,16 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { UserNotificationPreferenceConnector } from '../../connectors/notification-preference/user-notification-preference.connector';
 import { UserActions } from '../actions/index';
 
 @Injectable()
 export class NotificationPreferenceEffects {
+  protected logger = inject(LoggerService);
+
   loadPreferences$: Observable<UserActions.NotificationPreferenceAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -30,7 +33,7 @@ export class NotificationPreferenceEffects {
             catchError((error) =>
               of(
                 new UserActions.LoadNotificationPreferencesFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -57,7 +60,7 @@ export class NotificationPreferenceEffects {
             catchError((error) =>
               of(
                 new UserActions.UpdateNotificationPreferencesFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/payment-methods.effect.ts b/projects/core/src/user/store/effects/payment-methods.effect.ts
index 4a1c4faf48b..a38bb301132 100644
--- a/projects/core/src/user/store/effects/payment-methods.effect.ts
+++ b/projects/core/src/user/store/effects/payment-methods.effect.ts
@@ -4,20 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap } from 'rxjs/operators';
+import { GlobalMessageService } from '../../../global-message/facade/global-message.service';
+import { GlobalMessageType } from '../../../global-message/models/global-message.model';
+import { LoggerService } from '../../../logger';
 import { PaymentDetails } from '../../../model/payment.model';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { UserPaymentConnector } from '../../connectors/payment/user-payment.connector';
 import { UserActions } from '../actions/index';
-import { GlobalMessageService } from '../../../global-message/facade/global-message.service';
-import { GlobalMessageType } from '../../../global-message/models/global-message.model';
 
 @Injectable()
 export class UserPaymentMethodsEffects {
+  protected logger = inject(LoggerService);
+
   loadUserPaymentMethods$: Observable<Action> = createEffect(() =>
     this.actions$.pipe(
       ofType(UserActions.LOAD_USER_PAYMENT_METHODS),
@@ -30,7 +33,7 @@ export class UserPaymentMethodsEffects {
           catchError((error) =>
             of(
               new UserActions.LoadUserPaymentMethodsFail(
-                normalizeHttpError(error)
+                normalizeHttpError(error, this.logger)
               )
             )
           )
@@ -54,7 +57,7 @@ export class UserPaymentMethodsEffects {
             catchError((error) =>
               of(
                 new UserActions.SetDefaultUserPaymentMethodFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -84,7 +87,7 @@ export class UserPaymentMethodsEffects {
             catchError((error) =>
               of(
                 new UserActions.DeleteUserPaymentMethodFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/product-interests.effect.ts b/projects/core/src/user/store/effects/product-interests.effect.ts
index fdf38b20dce..d4d48b1f8c7 100644
--- a/projects/core/src/user/store/effects/product-interests.effect.ts
+++ b/projects/core/src/user/store/effects/product-interests.effect.ts
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { ProductInterestSearchResult } from '../../../model/product-interest.model';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { UserInterestsConnector } from '../../connectors/interests/user-interests.connector';
@@ -16,6 +17,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class ProductInterestsEffect {
+  protected logger = inject(LoggerService);
+
   constructor(
     private actions$: Actions,
     private userInterestsConnector: UserInterestsConnector
@@ -43,7 +46,7 @@ export class ProductInterestsEffect {
               catchError((error) =>
                 of(
                   new UserActions.LoadProductInterestsFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -76,7 +79,7 @@ export class ProductInterestsEffect {
             catchError((error) =>
               of(
                 new UserActions.RemoveProductInterestFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
@@ -108,7 +111,7 @@ export class ProductInterestsEffect {
             catchError((error) =>
               of(
                 new UserActions.AddProductInterestFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/regions.effect.ts b/projects/core/src/user/store/effects/regions.effect.ts
index 9a84a4d0a29..8254281eaa1 100644
--- a/projects/core/src/user/store/effects/regions.effect.ts
+++ b/projects/core/src/user/store/effects/regions.effect.ts
@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { SiteConnector } from '../../../site-context/connectors/site.connector';
 import { StateUtils } from '../../../state/utils/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -17,6 +18,8 @@ import { REGIONS } from '../user-state';
 
 @Injectable()
 export class RegionsEffects {
+  protected logger = inject(LoggerService);
+
   loadRegions$: Observable<UserActions.RegionsAction> = createEffect(() =>
     this.actions$.pipe(
       ofType(UserActions.LOAD_REGIONS),
@@ -33,7 +36,11 @@ export class RegionsEffects {
               })
           ),
           catchError((error) =>
-            of(new UserActions.LoadRegionsFail(normalizeHttpError(error)))
+            of(
+              new UserActions.LoadRegionsFail(
+                normalizeHttpError(error, this.logger)
+              )
+            )
           )
         );
       })
diff --git a/projects/core/src/user/store/effects/user-addresses.effect.ts b/projects/core/src/user/store/effects/user-addresses.effect.ts
index c626c32288a..88edf4c795d 100644
--- a/projects/core/src/user/store/effects/user-addresses.effect.ts
+++ b/projects/core/src/user/store/effects/user-addresses.effect.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap, tap } from 'rxjs/operators';
@@ -12,6 +12,7 @@ import {
   GlobalMessageService,
   GlobalMessageType,
 } from '../../../global-message/index';
+import { LoggerService } from '../../../logger';
 import { Address } from '../../../model/address.model';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { UserAddressConnector } from '../../connectors/address/user-address.connector';
@@ -20,6 +21,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class UserAddressesEffects {
+  protected logger = inject(LoggerService);
+
   loadUserAddresses$: Observable<UserActions.UserAddressesAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -32,7 +35,9 @@ export class UserAddressesEffects {
             }),
             catchError((error) =>
               of(
-                new UserActions.LoadUserAddressesFail(normalizeHttpError(error))
+                new UserActions.LoadUserAddressesFail(
+                  normalizeHttpError(error, this.logger)
+                )
               )
             )
           );
@@ -54,7 +59,9 @@ export class UserAddressesEffects {
               }),
               catchError((error) =>
                 of(
-                  new UserActions.AddUserAddressFail(normalizeHttpError(error))
+                  new UserActions.AddUserAddressFail(
+                    normalizeHttpError(error, this.logger)
+                  )
                 )
               )
             );
@@ -77,7 +84,7 @@ export class UserAddressesEffects {
               catchError((error) =>
                 of(
                   new UserActions.UpdateUserAddressFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
@@ -101,7 +108,7 @@ export class UserAddressesEffects {
               catchError((error) =>
                 of(
                   new UserActions.DeleteUserAddressFail(
-                    normalizeHttpError(error)
+                    normalizeHttpError(error, this.logger)
                   )
                 )
               )
diff --git a/projects/core/src/user/store/effects/user-consents.effect.ts b/projects/core/src/user/store/effects/user-consents.effect.ts
index 2e153f1eb97..d67d1273215 100644
--- a/projects/core/src/user/store/effects/user-consents.effect.ts
+++ b/projects/core/src/user/store/effects/user-consents.effect.ts
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, concatMap, map } from 'rxjs/operators';
 import { GlobalMessageType } from '../../../global-message/models/global-message.model';
 import { GlobalMessageActions } from '../../../global-message/store/actions';
+import { LoggerService } from '../../../logger';
 import { SiteContextActions } from '../../../site-context/store/actions/index';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
 import { UserConsentConnector } from '../../connectors/consent/user-consent.connector';
@@ -17,6 +18,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class UserConsentsEffect {
+  protected logger = inject(LoggerService);
+
   resetConsents$: Observable<UserActions.ResetLoadUserConsents> = createEffect(
     () =>
       this.actions$.pipe(
@@ -33,7 +36,11 @@ export class UserConsentsEffect {
         this.userConsentConnector.loadConsents(userId).pipe(
           map((consents) => new UserActions.LoadUserConsentsSuccess(consents)),
           catchError((error) =>
-            of(new UserActions.LoadUserConsentsFail(normalizeHttpError(error)))
+            of(
+              new UserActions.LoadUserConsentsFail(
+                normalizeHttpError(error, this.logger)
+              )
+            )
           )
         )
       )
@@ -61,7 +68,9 @@ export class UserConsentsEffect {
                 | UserActions.UserConsentsAction
                 | GlobalMessageActions.RemoveMessagesByType
               > = [
-                new UserActions.GiveUserConsentFail(normalizeHttpError(error)),
+                new UserActions.GiveUserConsentFail(
+                  normalizeHttpError(error, this.logger)
+                ),
               ];
               if (
                 action.type === UserActions.TRANSFER_ANONYMOUS_CONSENT &&
@@ -91,7 +100,7 @@ export class UserConsentsEffect {
             catchError((error) =>
               of(
                 new UserActions.WithdrawUserConsentFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/user/store/effects/user-cost-center.effect.ts b/projects/core/src/user/store/effects/user-cost-center.effect.ts
index ec0d9afb84f..d2c1e53b30d 100644
--- a/projects/core/src/user/store/effects/user-cost-center.effect.ts
+++ b/projects/core/src/user/store/effects/user-cost-center.effect.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+import { LoggerService } from '../../../logger';
 import { EntitiesModel } from '../../../model/misc.model';
 import { CostCenter } from '../../../model/org-unit.model';
 import { normalizeHttpError } from '../../../util/normalize-http-error';
@@ -16,6 +17,8 @@ import { UserActions } from '../actions/index';
 
 @Injectable()
 export class UserCostCenterEffects {
+  protected logger = inject(LoggerService);
+
   loadActiveCostCenters$: Observable<UserActions.UserCostCenterAction> =
     createEffect(() =>
       this.actions$.pipe(
@@ -31,7 +34,7 @@ export class UserCostCenterEffects {
             catchError((error) =>
               of(
                 new UserActions.LoadActiveCostCentersFail(
-                  normalizeHttpError(error)
+                  normalizeHttpError(error, this.logger)
                 )
               )
             )
diff --git a/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.spec.ts b/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.spec.ts
index 68c24604f3b..855ef536e10 100644
--- a/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.spec.ts
+++ b/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+import { LoggerService } from '../../logger';
 import { JavaRegExpConverter } from './java-reg-exp-converter';
 
 /**
@@ -14,6 +15,7 @@ import { JavaRegExpConverter } from './java-reg-exp-converter';
  */
 describe(`JavaRegExpConverter`, () => {
   let converter: JavaRegExpConverter;
+  let logger: LoggerService;
 
   /**
    * Given the regexp input, it compares the result regexp with the expected one, using the `toString()` method.
@@ -36,6 +38,9 @@ describe(`JavaRegExpConverter`, () => {
   beforeEach(() => {
     TestBed.configureTestingModule({});
     converter = TestBed.inject(JavaRegExpConverter);
+    logger = TestBed.inject(LoggerService);
+
+    spyOn(logger, 'warn');
   });
 
   describe(`toJsRegExp`, () => {
@@ -51,13 +56,17 @@ describe(`JavaRegExpConverter`, () => {
     });
 
     it(`should return null for unsupported JS modifiers`, () => {
-      spyOn(console, 'warn');
       test_toJsRegExp({ input: '(?iX)pattern', expected: null });
+      expect(logger.warn).toHaveBeenCalledWith(
+        'WARNING: Could not convert Java regexp into Javascript. Original regexp: (?iX)pattern \nMessage: SyntaxError: Invalid regular expression: /(?iX)pattern/: Invalid group'
+      );
     });
 
     it(`should return null for unsupported JS regexp features`, () => {
-      spyOn(console, 'warn');
       test_toJsRegExp({ input: 'x*+', expected: null });
+      expect(logger.warn).toHaveBeenCalledWith(
+        'WARNING: Could not convert Java regexp into Javascript. Original regexp: x*+ \nMessage: SyntaxError: Invalid regular expression: /x*+/: Nothing to repeat'
+      );
     });
 
     it(`should convert regexp when it's compatible in JS - with meta characters`, () => {
diff --git a/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.ts b/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.ts
index 178d78c679f..9d68ca5dc33 100644
--- a/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.ts
+++ b/projects/core/src/util/java-reg-exp-converter/java-reg-exp-converter.ts
@@ -4,10 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '../../logger';
 
 @Injectable({ providedIn: 'root' })
 export class JavaRegExpConverter {
+  logger = inject(LoggerService);
+
   /**
    * Pattern that extracts modifiers from the Java regexp.
    *
@@ -46,7 +49,7 @@ export class JavaRegExpConverter {
       return new RegExp(jsSyntax, modifiers);
     } catch (error) {
       if (isDevMode()) {
-        console.warn(
+        this.logger.warn(
           `WARNING: Could not convert Java regexp into Javascript. Original regexp: ${javaSyntax} \nMessage: ${error}`
         );
       }
diff --git a/projects/core/src/util/normalize-http-error.spec.ts b/projects/core/src/util/normalize-http-error.spec.ts
index 861ed038dc9..4f87b8964c3 100644
--- a/projects/core/src/util/normalize-http-error.spec.ts
+++ b/projects/core/src/util/normalize-http-error.spec.ts
@@ -1,7 +1,11 @@
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
+import * as isDevModeFunc from '@angular/core';
+import { LoggerService } from '../logger';
 import { HttpErrorModel } from '../model/index';
 import { normalizeHttpError } from './normalize-http-error';
 
+const logger = new LoggerService();
+
 describe('normalizeHttpError', () => {
   describe(`when the provided argument is not HttpError`, () => {
     it('should return undefined', () => {
@@ -9,6 +13,28 @@ describe('normalizeHttpError', () => {
       const result = normalizeHttpError(error);
       expect(result).toEqual(undefined);
     });
+
+    it('should log an error to the console in dev mode if logger is not provided', () => {
+      spyOnProperty(isDevModeFunc, 'isDevMode').and.returnValue(() => true);
+      spyOn(console, 'error');
+      const error = 'xxx';
+      normalizeHttpError(error);
+      expect(console.error).toHaveBeenCalledWith(
+        'Error passed to normalizeHttpError is not HttpErrorResponse instance',
+        error
+      );
+    });
+
+    it('should log an error to the logger in dev mode if logger is provided', () => {
+      spyOnProperty(isDevModeFunc, 'isDevMode').and.returnValue(() => true);
+      spyOn(logger, 'error');
+      const error = 'xxx';
+      normalizeHttpError(error, logger);
+      expect(logger.error).toHaveBeenCalledWith(
+        'Error passed to normalizeHttpError is not HttpErrorResponse instance',
+        error
+      );
+    });
   });
 
   describe('when the provided error is an instance of HttpErrorResponse', () => {
diff --git a/projects/core/src/util/normalize-http-error.ts b/projects/core/src/util/normalize-http-error.ts
index 4dc6952a556..1dad59daf1e 100644
--- a/projects/core/src/util/normalize-http-error.ts
+++ b/projects/core/src/util/normalize-http-error.ts
@@ -6,6 +6,7 @@
 
 import { HttpErrorResponse } from '@angular/common/http';
 import { isDevMode } from '@angular/core';
+import { LoggerService } from '../logger';
 import { HttpErrorModel } from '../model/misc.model';
 
 /**
@@ -17,7 +18,8 @@ import { HttpErrorModel } from '../model/misc.model';
  * (which usually happens when logic in NgRx Effect is not sealed correctly)
  */
 export function normalizeHttpError(
-  error: HttpErrorResponse | HttpErrorModel | any
+  error: HttpErrorResponse | HttpErrorModel | any,
+  logger?: LoggerService
 ): HttpErrorModel | undefined {
   if (error instanceof HttpErrorModel) {
     return error;
@@ -46,10 +48,11 @@ export function normalizeHttpError(
   }
 
   if (isDevMode()) {
-    console.error(
-      'Error passed to normalizeHttpError is not HttpErrorResponse instance',
-      error
-    );
+    const logMessage =
+      'Error passed to normalizeHttpError is not HttpErrorResponse instance';
+    // CXSPA-3680 - use logger by default and make logger required param
+    /* eslint-disable-next-line no-console */
+    logger ? logger.error(logMessage, error) : console.error(logMessage, error);
   }
 
   return undefined;
diff --git a/projects/schematics/.eslintrc.json b/projects/schematics/.eslintrc.json
index a5b02ff38ef..04be8021092 100644
--- a/projects/schematics/.eslintrc.json
+++ b/projects/schematics/.eslintrc.json
@@ -1,4 +1,12 @@
 {
   "extends": "../../.eslintrc.json",
-  "ignorePatterns": ["**/*.d.ts"]
+  "ignorePatterns": ["**/*.d.ts"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "rules": {
+        "no-console": "off"
+      }
+    }
+  ]
 }
diff --git a/projects/storefrontapp/server.ts b/projects/storefrontapp/server.ts
index e4cf575831a..c1e64a439aa 100644
--- a/projects/storefrontapp/server.ts
+++ b/projects/storefrontapp/server.ts
@@ -7,10 +7,11 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { ngExpressEngine as engine } from '@nguniversal/express-engine';
 import {
-  defaultSsrOptimizationOptions,
   NgExpressEngineDecorator,
   SsrOptimizationOptions,
+  defaultSsrOptimizationOptions,
 } from '@spartacus/setup/ssr';
+
 import { Express } from 'express';
 import { existsSync } from 'fs';
 import { join } from 'path';
@@ -75,6 +76,11 @@ function run() {
   // Start up the Node server
   const server = app();
   server.listen(port, () => {
+    /* eslint-disable-next-line no-console
+    --
+    It's just an example application file. This message is not crucial
+    to be logged using any special logger. Moreover, we don't have
+    any special logger available in this context. */
     console.log(`Node Express server listening on http://localhost:${port}`);
   });
 }
diff --git a/projects/storefrontapp/src/app/app.module.ts b/projects/storefrontapp/src/app/app.module.ts
index 1512eb45a76..5ea055b5e0e 100644
--- a/projects/storefrontapp/src/app/app.module.ts
+++ b/projects/storefrontapp/src/app/app.module.ts
@@ -16,12 +16,13 @@ import { StoreModule } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { translationChunksConfig, translations } from '@spartacus/assets';
 import {
+  ErrorHandlingModule,
   FeaturesConfig,
   I18nConfig,
   OccConfig,
-  provideConfig,
   RoutingConfig,
   TestConfigModule,
+  provideConfig,
 } from '@spartacus/core';
 import { StoreFinderConfig } from '@spartacus/storefinder/core';
 import { GOOGLE_MAPS_DEVELOPMENT_KEY_CONFIG } from '@spartacus/storefinder/root';
@@ -49,6 +50,7 @@ if (!environment.production) {
     SpartacusModule,
     TestOutletModule, // custom usages of cxOutletRef only for e2e testing
     TestConfigModule.forRoot({ cookie: 'cxConfigE2E' }), // Injects config dynamically from e2e tests. Should be imported after other config modules.
+    ErrorHandlingModule.forRoot(), // custom error handling that delegates to LoggerService. Remove for 7.0 as it will be the part of BaseCoreModule (CXSPA-3680).
 
     ...devImports,
   ],
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index c6c354abd65..abccc52836e 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -37,16 +37,16 @@ import {
   NavigationEventModule,
   NavigationModule,
   NotificationPreferenceModule,
+  PDFModule,
   PageTitleModule,
   PaymentMethodsModule,
-  PDFModule,
   ProductCarouselModule,
   ProductDetailsPageModule,
   ProductFacetNavigationModule,
   ProductImagesModule,
   ProductIntroModule,
-  ProductListingPageModule,
   ProductListModule,
+  ProductListingPageModule,
   ProductPageEventModule,
   ProductReferencesModule,
   ProductSummaryModule,
diff --git a/projects/storefrontapp/src/main.ts b/projects/storefrontapp/src/main.ts
index 115c1f9d5a4..08ac107441d 100644
--- a/projects/storefrontapp/src/main.ts
+++ b/projects/storefrontapp/src/main.ts
@@ -16,6 +16,11 @@ if (environment.production) {
 function bootstrap() {
   platformBrowserDynamic()
     .bootstrapModule(AppModule)
+    /* eslint-disable-next-line no-console
+    --
+    It's just an example application file. This message is not crucial
+    to be logged using any special logger. Moreover, we don't have
+    any special logger available in this context. */
     .catch((err) => console.error(err));
 }
 
diff --git a/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.spec.ts b/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.spec.ts
index 5c00386473c..062f1bea802 100644
--- a/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.spec.ts
+++ b/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.spec.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { CmsComponentMapping } from '@spartacus/core';
+import { CmsComponentMapping, LoggerService } from '@spartacus/core';
 import { EMPTY } from 'rxjs';
 import { ComponentHandler } from '../handlers/component-handler';
 import { ComponentHandlerService } from './component-handler.service';
@@ -54,7 +54,8 @@ describe('ComponentHandlerService', () => {
     });
 
     it('should return undefined if not matched', () => {
-      spyOn(console, 'warn').and.stub();
+      const logger = TestBed.inject(LoggerService);
+      spyOn(logger, 'warn').and.stub();
       const launcher = service.getLauncher(
         { component: 'unknown' },
         undefined,
diff --git a/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.ts b/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.ts
index 9f62a329a80..e6e257329e5 100644
--- a/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.ts
+++ b/projects/storefrontlib/cms-structure/page/component/services/component-handler.service.ts
@@ -7,6 +7,7 @@
 import {
   ComponentRef,
   ElementRef,
+  inject,
   Inject,
   Injectable,
   Injector,
@@ -15,7 +16,11 @@ import {
   Optional,
   ViewContainerRef,
 } from '@angular/core';
-import { CmsComponentMapping, resolveApplicable } from '@spartacus/core';
+import {
+  CmsComponentMapping,
+  LoggerService,
+  resolveApplicable,
+} from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { ComponentHandler } from '../handlers/component-handler';
 
@@ -26,6 +31,8 @@ import { ComponentHandler } from '../handlers/component-handler';
   providedIn: 'root',
 })
 export class ComponentHandlerService {
+  protected logger = inject(LoggerService);
+
   constructor(
     @Optional()
     @Inject(ComponentHandler)
@@ -47,7 +54,7 @@ export class ComponentHandlerService {
     if (isDevMode() && !handler) {
       if (!this.invalidMappings.has(componentMapping)) {
         this.invalidMappings.add(componentMapping);
-        console.warn(
+        this.logger.warn(
           "Can't resolve handler for component mapping: ",
           componentMapping
         );
diff --git a/projects/storefrontlib/cms-structure/page/page-layout/page-layout.service.ts b/projects/storefrontlib/cms-structure/page/page-layout/page-layout.service.ts
index 367364e29bf..892cfddf631 100644
--- a/projects/storefrontlib/cms-structure/page/page-layout/page-layout.service.ts
+++ b/projects/storefrontlib/cms-structure/page/page-layout/page-layout.service.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode, OnDestroy } from '@angular/core';
+import { inject, Injectable, isDevMode, OnDestroy } from '@angular/core';
 import {
   CmsService,
   isNotUndefined,
+  LoggerService,
   Page,
   UnifiedInjector,
 } from '@spartacus/core';
@@ -20,7 +21,7 @@ import {
   LayoutSlotConfig,
   SlotConfig,
 } from '../../../layout/config/layout-config';
-import { PageLayoutHandler, PAGE_LAYOUT_HANDLER } from './page-layout-handler';
+import { PAGE_LAYOUT_HANDLER, PageLayoutHandler } from './page-layout-handler';
 
 @Injectable({
   providedIn: 'root',
@@ -29,6 +30,8 @@ export class PageLayoutService implements OnDestroy {
   protected handlers: PageLayoutHandler[];
   protected subscription = new Subscription();
 
+  protected logger = inject(LoggerService);
+
   constructor(
     private cms: CmsService,
     private config: LayoutConfig,
@@ -257,8 +260,7 @@ export class PageLayoutService implements OnDestroy {
     }
     if (page.template && !this.logSlots[page.template]) {
       // the info log is not printed in production
-      // eslint-disable-next-line no-console
-      console.info(
+      this.logger.info(
         `Available CMS page slots: '${(page.slots
           ? Object.keys(page.slots)
           : []
@@ -269,7 +271,7 @@ export class PageLayoutService implements OnDestroy {
 
     const cacheKey = section || page.template;
     if (cacheKey && !this.warnLogMessages[cacheKey]) {
-      console.warn(
+      this.logger.warn(
         `No layout config found for ${cacheKey}, you can configure a 'LayoutConfig' to control the rendering of page slots.`
       );
       this.warnLogMessages[cacheKey] = true;
diff --git a/projects/storefrontlib/cms-structure/services/cms-components.service.ts b/projects/storefrontlib/cms-structure/services/cms-components.service.ts
index d72cffa1869..2ae760a9a91 100644
--- a/projects/storefrontlib/cms-structure/services/cms-components.service.ts
+++ b/projects/storefrontlib/cms-structure/services/cms-components.service.ts
@@ -6,6 +6,7 @@
 
 import { isPlatformServer } from '@angular/common';
 import {
+  inject,
   Inject,
   Injectable,
   isDevMode,
@@ -23,6 +24,7 @@ import {
   deepMerge,
   DeferLoadingStrategy,
   isNotUndefined,
+  LoggerService,
 } from '@spartacus/core';
 import { defer, forkJoin, Observable, of } from 'rxjs';
 import { filter, map, share, tap } from 'rxjs/operators';
@@ -48,6 +50,8 @@ export class CmsComponentsService {
   protected mappingResolvers: Map<string, Observable<CmsComponentMapping>> =
     new Map();
 
+  protected logger = inject(LoggerService);
+
   constructor(
     protected config: CmsConfig,
     @Inject(PLATFORM_ID) protected platformId: Object,
@@ -166,7 +170,7 @@ export class CmsComponentsService {
     if (isDevMode() && !componentConfig) {
       if (!this.missingComponents.includes(componentType)) {
         this.missingComponents.push(componentType);
-        console.warn(
+        this.logger.warn(
           `No component implementation found for the CMS component type '${componentType}'.\n`,
           `Make sure you implement a component and register it in the mapper.`
         );
diff --git a/projects/storefrontlib/layout/launch-dialog/services/inline-render.strategy.ts b/projects/storefrontlib/layout/launch-dialog/services/inline-render.strategy.ts
index 982d82df129..3eeb48b28e8 100644
--- a/projects/storefrontlib/layout/launch-dialog/services/inline-render.strategy.ts
+++ b/projects/storefrontlib/layout/launch-dialog/services/inline-render.strategy.ts
@@ -8,18 +8,22 @@ import { DOCUMENT } from '@angular/common';
 import {
   ComponentFactoryResolver,
   ComponentRef,
+  inject,
   Inject,
   Injectable,
   isDevMode,
   RendererFactory2,
   ViewContainerRef,
 } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
-import { LaunchInlineDialog, LAUNCH_CALLER } from '../config/index';
+import { LAUNCH_CALLER, LaunchInlineDialog } from '../config/index';
 import { LaunchRenderStrategy } from './launch-render.strategy';
 
 @Injectable({ providedIn: 'root' })
 export class InlineRenderStrategy extends LaunchRenderStrategy {
+  protected logger = inject(LoggerService);
+
   constructor(
     @Inject(DOCUMENT) protected document: any,
     protected rendererFactory: RendererFactory2,
@@ -57,9 +61,9 @@ export class InlineRenderStrategy extends LaunchRenderStrategy {
       return of(component);
     } else if (isDevMode()) {
       if (!vcr) {
-        console.warn(`No view container ref provided for ${caller}`);
+        this.logger.warn(`No view container ref provided for ${caller}`);
       } else {
-        console.warn(
+        this.logger.warn(
           `Element for ${caller} already rendered. To allow multi rendering add property multi: true.`
         );
       }
diff --git a/projects/storefrontlib/layout/launch-dialog/services/launch-dialog.service.ts b/projects/storefrontlib/layout/launch-dialog/services/launch-dialog.service.ts
index 04a928b0b97..05240b8f441 100644
--- a/projects/storefrontlib/layout/launch-dialog/services/launch-dialog.service.ts
+++ b/projects/storefrontlib/layout/launch-dialog/services/launch-dialog.service.ts
@@ -7,16 +7,17 @@
 import {
   ComponentRef,
   ElementRef,
+  inject,
   Inject,
   Injectable,
   isDevMode,
   ViewContainerRef,
 } from '@angular/core';
-import { resolveApplicable } from '@spartacus/core';
+import { LoggerService, resolveApplicable } from '@spartacus/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { filter, map, take, tap } from 'rxjs/operators';
 import { LayoutConfig } from '../../config/layout-config';
-import { LaunchOptions, LAUNCH_CALLER } from '../config/launch-config';
+import { LAUNCH_CALLER, LaunchOptions } from '../config/launch-config';
 import { LaunchRenderStrategy } from './launch-render.strategy';
 
 @Injectable({ providedIn: 'root' })
@@ -24,6 +25,8 @@ export class LaunchDialogService {
   private _dialogClose = new BehaviorSubject<any | undefined>(undefined);
   private _dataSubject = new BehaviorSubject<any>(undefined);
 
+  protected logger = inject(LoggerService);
+
   get data$(): Observable<any> {
     return this._dataSubject.asObservable();
   }
@@ -87,7 +90,7 @@ export class LaunchDialogService {
         return renderer.render(config, caller, vcr);
       }
     } else if (isDevMode()) {
-      console.warn('No configuration provided for caller ' + caller);
+      this.logger.warn('No configuration provided for caller ' + caller);
     }
   }
 
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts b/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
index 84c50f44035..bf0bf566d9a 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.spec.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { I18nTestingModule, Product } from '@spartacus/core';
+import { I18nTestingModule, LoggerService, Product } from '@spartacus/core';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { EMPTY, Observable, of } from 'rxjs';
 import { CarouselComponent } from './carousel.component';
@@ -80,9 +80,10 @@ describe('Carousel Component', () => {
     });
 
     it('should log an error when there is no render template given', () => {
-      spyOn(console, 'error');
+      const logger = TestBed.inject(LoggerService);
+      spyOn(logger, 'error');
       component.ngOnInit();
-      expect(console.error).toHaveBeenCalledWith(
+      expect(logger.error).toHaveBeenCalledWith(
         'No template reference provided to render the carousel items for the `cx-carousel`'
       );
     });
diff --git a/projects/storefrontlib/shared/components/carousel/carousel.component.ts b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
index 67d3bb8add6..deed76e8615 100644
--- a/projects/storefrontlib/shared/components/carousel/carousel.component.ts
+++ b/projects/storefrontlib/shared/components/carousel/carousel.component.ts
@@ -8,11 +8,13 @@ import {
   ChangeDetectionStrategy,
   Component,
   ElementRef,
+  inject,
   Input,
   isDevMode,
   OnInit,
   TemplateRef,
 } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { ICON_TYPE } from '../../../cms-components/misc/icon/icon.model';
@@ -83,11 +85,13 @@ export class CarouselComponent implements OnInit {
   activeSlide: number;
   size$: Observable<number>;
 
+  protected logger = inject(LoggerService);
+
   constructor(protected el: ElementRef, protected service: CarouselService) {}
 
   ngOnInit() {
     if (!this.template && isDevMode()) {
-      console.error(
+      this.logger.error(
         'No template reference provided to render the carousel items for the `cx-carousel`'
       );
       return;
diff --git a/projects/storefrontlib/shared/components/table/table.service.spec.ts b/projects/storefrontlib/shared/components/table/table.service.spec.ts
index ddc7306b61c..531149ac1ff 100644
--- a/projects/storefrontlib/shared/components/table/table.service.spec.ts
+++ b/projects/storefrontlib/shared/components/table/table.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+import { LoggerService } from '@spartacus/core';
 import { BREAKPOINT, BreakpointService } from '@spartacus/storefront';
 import { EMPTY, Observable, of } from 'rxjs';
 import { TableConfig } from './config/table.config';
@@ -231,12 +232,16 @@ describe('TableService', () => {
 
         it('should generate random table structure', () => {
           let result: TableStructure;
-          spyOn(console, 'warn').and.stub();
+          const logger = TestBed.inject(LoggerService);
+          spyOn(logger, 'warn').and.stub();
           tableService
             .buildStructure('unknown')
             .subscribe((structure) => (result = structure));
 
           expect(result.cells.length).toEqual(5);
+          expect(logger.warn).toHaveBeenCalledWith(
+            'No data available for "unknown", a random structure is generated (with hidden table headers).'
+          );
         });
       });
     });
diff --git a/projects/storefrontlib/shared/components/table/table.service.ts b/projects/storefrontlib/shared/components/table/table.service.ts
index da5f125cf22..d19a117f270 100644
--- a/projects/storefrontlib/shared/components/table/table.service.ts
+++ b/projects/storefrontlib/shared/components/table/table.service.ts
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, isDevMode } from '@angular/core';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { LoggerService } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { BreakpointService } from '../../../layout/breakpoint/breakpoint.service';
@@ -31,6 +32,8 @@ import { TableStructure, TableStructureConfiguration } from './table.model';
   providedIn: 'root',
 })
 export class TableService {
+  protected logger = inject(LoggerService);
+
   constructor(
     protected breakpointService: BreakpointService,
     protected config: TableConfig
@@ -177,7 +180,7 @@ export class TableService {
    */
   private logWarning(message: string) {
     if (isDevMode()) {
-      console.warn(message);
+      this.logger.warn(message);
     }
   }
 }

From e6eacb0bed4418c5391693920a4aa5ff0ed5ba49 Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Thu, 15 Jun 2023 07:47:48 +0200
Subject: [PATCH 035/122] feat: display of configurator messages w.r.t.
 required attributes (#17480)

Take new styling guidelines into account
---
 .../translations/en/configurator-common.ts    |   3 +
 ...nfigurator-attribute-footer.component.html |  53 ++-
 ...gurator-attribute-footer.component.spec.ts | 307 ++++++++++++++----
 ...configurator-attribute-footer.component.ts |  66 +++-
 .../configurator-attribute-footer.module.ts   |   7 +-
 ...gurator-attribute-header.component.spec.ts | 176 +++++++++-
 ...configurator-attribute-header.component.ts |  95 +++++-
 ...r-attribute-product-card.component.spec.ts |  21 +-
 ...urator-attribute-product-card.component.ts |   4 +-
 ...figurator-attribute-base.component.spec.ts | 150 ++++++++-
 .../configurator-attribute-base.component.ts  |  32 ++
 ...te-single-selection-base.component.spec.ts |   7 +-
 ...tribute-single-selection-base.component.ts |  49 ++-
 ...gurator-attribute-drop-down.component.html |  59 +++-
 ...ator-attribute-drop-down.component.spec.ts | 115 ++++++-
 ...figurator-attribute-drop-down.component.ts |  36 +-
 ...configurator-attribute-drop-down.module.ts |   7 +-
 ...rator-attribute-input-field.component.html |   3 +
 ...or-attribute-input-field.component.spec.ts |  13 +
 ...gurator-attribute-input-field.component.ts |  55 +++-
 ...tribute-numeric-input-field.component.html |  26 +-
 ...e-numeric-input-field.component.service.ts |   2 +-
 ...bute-numeric-input-field.component.spec.ts |  24 +-
 ...attribute-numeric-input-field.component.ts |  18 +-
 ...r-attribute-radio-button.component.spec.ts |  13 +
 ...urator-attribute-radio-button.component.ts |  35 +-
 ...e-selection-bundle-dropdown.component.html | 112 +++++--
 ...election-bundle-dropdown.component.spec.ts | 216 ++++++++----
 ...gle-selection-bundle-dropdown.component.ts |  59 +++-
 ...single-selection-bundle-dropdown.module.ts |   7 +-
 .../core/model/configurator.model.ts          |   1 +
 .../cpq-configurator-normalizer.spec.ts       |  20 +-
 .../converters/cpq-configurator-normalizer.ts |  10 +-
 .../cpq-configurator-serializer.spec.ts       |  29 ++
 .../converters/cpq-configurator-serializer.ts |   8 +-
 ...cc-configurator-variant-normalizer.spec.ts |  26 +-
 .../occ-configurator-variant-normalizer.ts    |   8 +-
 .../occ-configurator-variant-serializer.ts    |   8 +-
 .../mixins/_configurator-form-group.scss      |   4 +
 39 files changed, 1554 insertions(+), 330 deletions(-)

diff --git a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
index 52bbbf9ecdd..9de86228674 100644
--- a/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
+++ b/feature-libs/product-configurator/common/assets/translations/en/configurator-common.ts
@@ -56,8 +56,11 @@ export const configurator = {
       singleSelectRequiredMessage: 'Select a value',
       singleSelectAdditionalRequiredMessage: 'Select or enter a value',
       multiSelectRequiredMessage: 'Select one or more values',
+      // TODO (CXSPA-3392): `wrongNumericFormat` is deprecated and will be removed for the next major release
       wrongNumericFormat:
         'Wrong format, this numerical attribute should be entered according to pattern {{pattern}}',
+      wrongNumericFormatMessage:
+        'Enter the number in the following format: {{pattern}}',
       wrongIntervalFormat: 'Enter a value within the indicated boundaries',
       deselectionNotPossible:
         'Add a different product before removing this one',
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.html b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.html
index cd179cd60a8..aebfd49f75c 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.html
@@ -1,14 +1,39 @@
-<div
-  *ngIf="showRequiredMessageForUserInput$ | async"
-  class="cx-required-error-msg"
-  id="{{ createAttributeUiKey('attribute-msg', attribute.name) }}"
-  [attr.aria-label]="
-    'configurator.attribute.defaultRequiredMessage' | cxTranslate
-  "
-  aria-live="assertive"
-  aria-atomic="true"
-  role="alert"
->
-  <cx-icon [type]="iconType.ERROR"></cx-icon>
-  {{ 'configurator.attribute.defaultRequiredMessage' | cxTranslate }}
-</div>
+<ng-container *cxFeatureLevel="'!6.2'">
+  <div
+    *ngIf="showRequiredMessageForUserInput$ | async"
+    class="cx-required-error-msg"
+    id="{{ createAttributeUiKey('attribute-msg', attribute.name) }}"
+    [attr.aria-label]="
+      'configurator.attribute.defaultRequiredMessage' | cxTranslate
+    "
+    aria-live="assertive"
+    aria-atomic="true"
+    role="alert"
+  >
+    <cx-icon [type]="iconType.ERROR"></cx-icon>
+    {{ 'configurator.attribute.defaultRequiredMessage' | cxTranslate }}
+  </div>
+</ng-container>
+<ng-container *cxFeatureLevel="'6.2'">
+  <div
+    *ngIf="showRequiredMessageForUserInput$ | async"
+    class="cx-required-error-msg"
+    id="{{ createAttributeUiKey('attribute-msg', attribute.name) }}"
+    [attr.aria-label]="
+      isUserInput(attribute)
+        ? ('configurator.attribute.defaultRequiredMessage' | cxTranslate)
+        : ('configurator.attribute.singleSelectRequiredMessage' | cxTranslate)
+    "
+    aria-live="assertive"
+    aria-atomic="true"
+    role="alert"
+  >
+    <cx-icon [type]="iconType.ERROR"></cx-icon>
+    <ng-container *ngIf="isUserInput(attribute)">
+      {{ 'configurator.attribute.defaultRequiredMessage' | cxTranslate }}
+    </ng-container>
+    <ng-container *ngIf="isDropDown(attribute)">
+      {{ 'configurator.attribute.singleSelectRequiredMessage' | cxTranslate }}
+    </ng-container>
+  </div>
+</ng-container>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.spec.ts
index 7369c2c5362..66d93572b70 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.spec.ts
@@ -1,6 +1,10 @@
 import { ChangeDetectionStrategy } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { I18nTestingModule } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  FeaturesConfigModule,
+  I18nTestingModule,
+} from '@spartacus/core';
 import {
   CommonConfigurator,
   ConfiguratorModelUtils,
@@ -17,6 +21,7 @@ import { ConfiguratorAttributeCompositionContext } from '../composition/configur
 import { ConfiguratorStorefrontUtilsService } from '../../service/configurator-storefront-utils.service';
 import { ConfiguratorAttributeFooterComponent } from './configurator-attribute-footer.component';
 import { ConfiguratorTestUtils } from '../../../testing/configurator-test-utils';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 
 export class MockIconFontLoaderService {
   useSvg(_iconType: ICON_TYPE) {
@@ -32,43 +37,76 @@ export class MockIconFontLoaderService {
   getFlipDirection(): void {}
 }
 
-const isCartEntryOrGroupVisited = true;
+let showRequiredMessageForUserInput: boolean;
 class MockConfigUtilsService {
   isCartEntryOrGroupVisited(): Observable<boolean> {
-    return of(isCartEntryOrGroupVisited);
+    return of(showRequiredMessageForUserInput);
+  }
+}
+
+let testVersion: string;
+class MockFeatureConfigService {
+  isLevel(version: string): boolean {
+    return version === testVersion;
   }
 }
 
+function createComponentWithData(
+  releaseVersion: string,
+  isCartEntryOrGroupVisited: boolean = true
+): ConfiguratorAttributeFooterComponent {
+  testVersion = releaseVersion;
+  showRequiredMessageForUserInput = isCartEntryOrGroupVisited;
+
+  fixture = TestBed.createComponent(ConfiguratorAttributeFooterComponent);
+  component = fixture.componentInstance;
+  htmlElem = fixture.nativeElement;
+  component.attribute = currentAttribute;
+
+  component.owner = owner;
+  component.groupId = 'testGroup';
+  component.attribute.required = true;
+  component.attribute.incomplete = true;
+  component.attribute.uiType = Configurator.UiType.STRING;
+  component.attribute.userInput = '';
+
+  fixture.detectChanges();
+  return component;
+}
+
+let component: ConfiguratorAttributeFooterComponent;
+let fixture: ComponentFixture<ConfiguratorAttributeFooterComponent>;
+let htmlElem: HTMLElement;
 const attributeName = '123';
 const attrLabel = 'attLabel';
 
-describe('ConfigAttributeFooterComponent', () => {
-  let classUnderTest: ConfiguratorAttributeFooterComponent;
-  let fixture: ComponentFixture<ConfiguratorAttributeFooterComponent>;
-
-  const currentAttribute: Configurator.Attribute = {
-    name: attributeName,
-    label: attrLabel,
-    uiType: Configurator.UiType.RADIOBUTTON,
-  };
-  let htmlElem: HTMLElement;
-
-  const owner = ConfiguratorModelUtils.createOwner(
-    CommonConfigurator.OwnerType.CART_ENTRY,
-    'PRODUCT_CODE'
-  );
+const currentAttribute: Configurator.Attribute = {
+  name: attributeName,
+  label: attrLabel,
+  uiType: Configurator.UiType.RADIOBUTTON,
+};
+
+const owner = ConfiguratorModelUtils.createOwner(
+  CommonConfigurator.OwnerType.CART_ENTRY,
+  'PRODUCT_CODE'
+);
 
+describe('ConfigAttributeFooterComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [I18nTestingModule, IconModule],
-        declarations: [ConfiguratorAttributeFooterComponent],
+        imports: [FeaturesConfigModule, I18nTestingModule, IconModule],
+        declarations: [
+          ConfiguratorAttributeFooterComponent,
+          MockFeatureLevelDirective,
+        ],
         providers: [
           { provide: IconLoaderService, useClass: MockIconFontLoaderService },
           {
             provide: ConfiguratorStorefrontUtilsService,
             useClass: MockConfigUtilsService,
           },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
           {
             provide: ConfiguratorAttributeCompositionContext,
             useValue: ConfiguratorTestUtils.getAttributeContext(),
@@ -84,27 +122,27 @@ describe('ConfigAttributeFooterComponent', () => {
     })
   );
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfiguratorAttributeFooterComponent);
-    classUnderTest = fixture.componentInstance;
-    htmlElem = fixture.nativeElement;
-    classUnderTest.attribute = currentAttribute;
-
-    classUnderTest.owner = owner;
-    classUnderTest.groupId = 'testGroup';
-    classUnderTest.attribute.required = true;
-    classUnderTest.attribute.incomplete = true;
-    classUnderTest.attribute.uiType = Configurator.UiType.STRING;
-    classUnderTest.attribute.userInput = '';
-    fixture.detectChanges();
+  it('should render an empty component because showRequiredMessageForUserInput$ is `false`', () => {
+    createComponentWithData('6.2', false).ngOnInit();
+    CommonConfiguratorTestUtilsService.expectElementNotPresent(
+      expect,
+      htmlElem,
+      '.cx-required-error-msg'
+    );
   });
 
-  it('should create', () => {
-    expect(classUnderTest).toBeTruthy();
+  it('should render a required message for release version less than 6.2', () => {
+    createComponentWithData('6.1').ngOnInit();
+    expect(component).toBeTruthy();
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      '.cx-required-error-msg'
+    );
   });
 
   it('should render a required message if attribute has no value, yet.', () => {
-    fixture.detectChanges();
+    createComponentWithData('6.2');
     CommonConfiguratorTestUtilsService.expectElementPresent(
       expect,
       htmlElem,
@@ -113,7 +151,8 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it('should render a required message because the group has already been visited.', () => {
-    classUnderTest.owner.type = CommonConfigurator.OwnerType.PRODUCT;
+    createComponentWithData('6.2');
+    component.owner.type = CommonConfigurator.OwnerType.PRODUCT;
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementPresent(
       expect,
@@ -123,8 +162,9 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it('should render a required message because user input is an empty string.', () => {
+    createComponentWithData('6.2');
     currentAttribute.userInput = '  ';
-    classUnderTest.ngOnInit();
+    component.ngOnInit();
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementPresent(
       expect,
@@ -134,8 +174,9 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it("shouldn't render a required message if attribute is not required.", () => {
+    createComponentWithData('6.2');
     currentAttribute.required = false;
-    classUnderTest.ngOnInit();
+    component.ngOnInit();
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementNotPresent(
       expect,
@@ -145,8 +186,9 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it("shouldn't render a required message if attribute is complete.", () => {
+    createComponentWithData('6.2');
     currentAttribute.incomplete = false;
-    classUnderTest.ngOnInit();
+    component.ngOnInit();
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementNotPresent(
       expect,
@@ -156,8 +198,9 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it("shouldn't render a required message if UI type is another.", () => {
+    createComponentWithData('6.2');
     currentAttribute.uiType = Configurator.UiType.CHECKBOX;
-    classUnderTest.ngOnInit();
+    component.ngOnInit();
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementNotPresent(
       expect,
@@ -167,8 +210,9 @@ describe('ConfigAttributeFooterComponent', () => {
   });
 
   it("shouldn't render a required message because user input is set.", () => {
+    createComponentWithData('6.2');
     currentAttribute.userInput = 'test';
-    classUnderTest.ngOnInit();
+    component.ngOnInit();
     fixture.detectChanges();
     CommonConfiguratorTestUtilsService.expectElementNotPresent(
       expect,
@@ -177,73 +221,202 @@ describe('ConfigAttributeFooterComponent', () => {
     );
   });
 
-  describe('isUserInputEmpty()', () => {
+  describe('needsDropDownMsg', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
+    it('should not display drop-down message because attribute is not required', () => {
+      component.attribute.required = false;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(false);
+    });
+
+    it('should not display drop-down message because attribute is complete', () => {
+      component.attribute.incomplete = false;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(false);
+    });
+
+    it('should not display drop-down message for another UI type', () => {
+      component.attribute.uiType = Configurator.UiType.CHECKBOX;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(false);
+    });
+
+    it('should not display drop-down message because the list of values is undefined', () => {
+      component.attribute.values = undefined;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(false);
+    });
+
+    it('should not display drop-down message for UI type `DROPDOWN` because there is a selected value', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN;
+      component.attribute.values = [
+        ConfiguratorTestUtils.createValue(
+          Configurator.RetractValueCode,
+          undefined
+        ),
+        ConfiguratorTestUtils.createValue('123', 10, true),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(false);
+      component.attribute.values = undefined;
+      fixture.detectChanges();
+    });
+
+    it('should display drop-down message for UI type `DROPDOWN`', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(true);
+    });
+
+    it('should display drop-down message for UI type `DROPDOWN_PRODUCT`', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN_PRODUCT;
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(true);
+    });
+
+    it('should display drop-down message for UI type `DROPDOWN` because the selected value has a code `###RETRACT_VALUE_CODE###`', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN;
+      component.attribute.values = [
+        ConfiguratorTestUtils.createValue(
+          Configurator.RetractValueCode,
+          undefined,
+          true
+        ),
+        ConfiguratorTestUtils.createValue('123', 10),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      fixture.detectChanges();
+      expect(component['needsDropDownMsg']()).toBe(true);
+      component.attribute.values = undefined;
+      fixture.detectChanges();
+    });
+  });
+
+  describe('isUserInputEmpty', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it('should return false because user input is undefined', () => {
       currentAttribute.userInput = undefined;
-      expect(
-        classUnderTest.isUserInputEmpty(classUnderTest.attribute.userInput)
-      ).toBe(false);
+      expect(component.isUserInputEmpty(component.attribute.userInput)).toBe(
+        false
+      );
     });
 
     it('should return true because user input contains a number of whitespaces', () => {
       currentAttribute.userInput = '   ';
-      expect(
-        classUnderTest.isUserInputEmpty(classUnderTest.attribute.userInput)
-      ).toBe(true);
+      expect(component.isUserInputEmpty(component.attribute.userInput)).toBe(
+        true
+      );
     });
 
     it('should return true because user input contains an empty string', () => {
       currentAttribute.userInput = '';
-      expect(
-        classUnderTest.isUserInputEmpty(classUnderTest.attribute.userInput)
-      ).toBe(true);
+      expect(component.isUserInputEmpty(component.attribute.userInput)).toBe(
+        true
+      );
     });
 
     it('should return false because user input is defined and contains a string', () => {
       currentAttribute.userInput = 'user input string';
-      expect(
-        classUnderTest.isUserInputEmpty(classUnderTest.attribute.userInput)
-      ).toBe(false);
+      expect(component.isUserInputEmpty(component.attribute.userInput)).toBe(
+        false
+      );
+    });
+  });
+
+  describe('needsUserInputMsg', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
+    it('should not display user input message because attribute is not required', () => {
+      component.attribute.required = false;
+      fixture.detectChanges();
+      expect(component['needsUserInputMsg']()).toBe(false);
+    });
+
+    it('should not display user input message because attribute is complete', () => {
+      component.attribute.incomplete = false;
+      fixture.detectChanges();
+      expect(component['needsUserInputMsg']()).toBe(false);
+    });
+
+    it('should not display user input message because attribute user input is not empty', () => {
+      component.attribute.userInput = ' test ';
+      fixture.detectChanges();
+      expect(component['needsUserInputMsg']()).toBe(false);
+    });
+
+    it('should not display user input message for another UI type', () => {
+      component.attribute.uiType = Configurator.UiType.CHECKBOX;
+      fixture.detectChanges();
+      expect(component['needsUserInputMsg']()).toBe(false);
+    });
+
+    it('should display user input message for UI type `STRING`', () => {
+      expect(component['needsUserInputMsg']()).toBe(true);
+    });
+
+    it('should display user input message for UI type `NUMERIC`', () => {
+      component.attribute.uiType = Configurator.UiType.NUMERIC;
+      fixture.detectChanges();
+      expect(component['needsUserInputMsg']()).toBe(true);
     });
   });
 
-  describe('needsUserInputMessage()', () => {
+  describe('needsUserInputMessage', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it('should not display user input message because attribute is not required', () => {
-      classUnderTest.attribute.required = false;
+      component.attribute.required = false;
       fixture.detectChanges();
-      expect(classUnderTest['needsUserInputMessage']()).toBe(false);
+      expect(component['needsUserInputMessage']()).toBe(false);
     });
 
     it('should not display user input message because attribute is complete', () => {
-      classUnderTest.attribute.incomplete = false;
+      component.attribute.incomplete = false;
       fixture.detectChanges();
-      expect(classUnderTest['needsUserInputMessage']()).toBe(false);
+      expect(component['needsUserInputMessage']()).toBe(false);
     });
 
     it('should not display user input message because attribute user input is not empty', () => {
-      classUnderTest.attribute.userInput = ' test ';
+      component.attribute.userInput = ' test ';
       fixture.detectChanges();
-      expect(classUnderTest['needsUserInputMessage']()).toBe(false);
+      expect(component['needsUserInputMessage']()).toBe(false);
     });
 
     it('should not display user input message for another UI type', () => {
-      classUnderTest.attribute.uiType = Configurator.UiType.CHECKBOX;
+      component.attribute.uiType = Configurator.UiType.CHECKBOX;
       fixture.detectChanges();
-      expect(classUnderTest['needsUserInputMessage']()).toBe(false);
+      expect(component['needsUserInputMessage']()).toBe(false);
     });
 
     it('should display user input message for UI type `STRING`', () => {
-      expect(classUnderTest['needsUserInputMessage']()).toBe(true);
+      expect(component['needsUserInputMessage']()).toBe(true);
     });
 
     it('should display user input message for UI type `NUMERIC`', () => {
-      classUnderTest.attribute.uiType = Configurator.UiType.NUMERIC;
+      component.attribute.uiType = Configurator.UiType.NUMERIC;
       fixture.detectChanges();
-      expect(classUnderTest['needsUserInputMessage']()).toBe(true);
+      expect(component['needsUserInputMessage']()).toBe(true);
     });
   });
 
   describe('Accessibility', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2', true);
+    });
+
     it("should contain div element with class name 'cx-required-error-msg' and 'aria-label' attribute that defines an accessible name to label the current element", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.ts
index e6b34ea2d42..e9e2d3f60c5 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.component.ts
@@ -4,7 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import { FeatureConfigService } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable } from 'rxjs';
@@ -27,9 +33,26 @@ export class ConfiguratorAttributeFooterComponent
   owner: CommonConfigurator.Owner;
   groupId: string;
 
+  constructor(
+    configUtils: ConfiguratorStorefrontUtilsService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfigService?: FeatureConfigService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    configUtils: ConfiguratorStorefrontUtilsService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext
+  );
+
   constructor(
     protected configUtils: ConfiguratorStorefrontUtilsService,
-    protected attributeComponentContext: ConfiguratorAttributeCompositionContext
+    protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    // TODO (CXSPA-3392): for next major release remove featureConfigService
+    @Optional() protected featureConfigService?: FeatureConfigService
   ) {
     super();
     this.attribute = attributeComponentContext.attribute;
@@ -43,11 +66,33 @@ export class ConfiguratorAttributeFooterComponent
   ngOnInit(): void {
     /**
      * Show message that indicates that attribute is required in case attribute is a
-     * free input field
+     * free input field or a drop-dow list
      */
     this.showRequiredMessageForUserInput$ = this.configUtils
       .isCartEntryOrGroupVisited(this.owner, this.groupId)
-      .pipe(map((result) => (result ? this.needsUserInputMessage() : false)));
+      .pipe(
+        map((result) =>
+          result ? this.needsRequiredAttributeErrorMsg() : false
+        )
+      );
+  }
+
+  // TODO (CXSPA-3392): for next major release remove featureConfigService
+  protected needsRequiredAttributeErrorMsg(): boolean {
+    if (this.featureConfigService?.isLevel('6.2')) {
+      // TODO: for next major release only these requirements should be proved
+      return this.needsUserInputMsg() || this.needsDropDownMsg();
+    } else {
+      return this.needsUserInputMsg();
+    }
+  }
+
+  protected needsDropDownMsg(): boolean {
+    return (
+      this.isRequiredErrorMsg(this.attribute) &&
+      this.isDropDown(this.attribute) &&
+      this.isNoValueSelected(this.attribute)
+    );
   }
 
   /**
@@ -59,6 +104,19 @@ export class ConfiguratorAttributeFooterComponent
     return input !== undefined && (!input.trim() || 0 === input.length);
   }
 
+  protected needsUserInputMsg(): boolean {
+    return (
+      this.isRequiredErrorMsg(this.attribute) &&
+      this.isUserInput(this.attribute) &&
+      this.isUserInputEmpty(this.attribute.userInput)
+    );
+  }
+
+  /**
+   * @deprecated since 6.2
+   *
+   * `needsUserInputMsg` method will be called instead.
+   */
   protected needsUserInputMessage(): boolean {
     const uiType = this.attribute.uiType;
     const needsMessage =
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.module.ts b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.module.ts
index 68d4b445e22..be99d555c4f 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/footer/configurator-attribute-footer.module.ts
@@ -7,7 +7,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { IconModule } from '@spartacus/storefront';
 import { ConfiguratorAttributeCompositionConfig } from '../composition/configurator-attribute-composition.config';
 import { ConfiguratorAttributeFooterComponent } from './configurator-attribute-footer.component';
@@ -19,6 +23,7 @@ import { ConfiguratorAttributeFooterComponent } from './configurator-attribute-f
     CommonModule,
     I18nModule,
     IconModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<ConfiguratorAttributeCompositionConfig>{
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.spec.ts
index 0bca6063a25..37af7b6dcb2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.spec.ts
@@ -1,6 +1,11 @@
 import { ChangeDetectionStrategy, Type } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { I18nTestingModule } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  FeaturesConfig,
+  FeaturesConfigModule,
+  I18nTestingModule,
+} from '@spartacus/core';
 import {
   CommonConfigurator,
   ConfiguratorModelUtils,
@@ -69,6 +74,12 @@ class MockConfiguratorGroupsService {
   navigateToGroup(): void {}
 }
 
+class MockFeatureConfigService {
+  isLevel(): boolean {
+    return true;
+  }
+}
+
 describe('ConfigAttributeHeaderComponent', () => {
   let component: ConfiguratorAttributeHeaderComponent;
   let fixture: ComponentFixture<ConfiguratorAttributeHeaderComponent>;
@@ -110,7 +121,7 @@ describe('ConfigAttributeHeaderComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [I18nTestingModule, IconModule],
+        imports: [FeaturesConfigModule, I18nTestingModule, IconModule],
         declarations: [
           ConfiguratorAttributeHeaderComponent,
           MockFeatureLevelDirective,
@@ -133,10 +144,17 @@ describe('ConfigAttributeHeaderComponent', () => {
             provide: ConfiguratorUISettingsConfig,
             useValue: TestConfiguratorUISettings,
           },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
           {
             provide: ConfiguratorAttributeCompositionContext,
             useValue: ConfiguratorTestUtils.getAttributeContext(),
           },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '*' },
+            },
+          },
         ],
       })
         .overrideComponent(ConfiguratorAttributeHeaderComponent, {
@@ -343,20 +361,6 @@ describe('ConfigAttributeHeaderComponent', () => {
       );
     });
 
-    it('should return a single-select message key for ddlb attribute type', () => {
-      component.attribute.uiType = Configurator.UiType.DROPDOWN;
-      expect(component.getRequiredMessageKey()).toContain(
-        'singleSelectRequiredMessage'
-      );
-    });
-
-    it('should return a single-select message key for ddlb-product attribute type', () => {
-      component.attribute.uiType = Configurator.UiType.DROPDOWN_PRODUCT;
-      expect(component.getRequiredMessageKey()).toContain(
-        'singleSelectRequiredMessage'
-      );
-    });
-
     it('should return a single-select message key for single-selection-image attribute type', () => {
       component.attribute.uiType = Configurator.UiType.SINGLE_SELECTION_IMAGE;
       expect(component.getRequiredMessageKey()).toContain(
@@ -1074,10 +1078,148 @@ describe('ConfigAttributeHeaderComponent', () => {
     });
   });
 
+  describe('isAttributeWithoutErrorMsg', () => {
+    it('should return `false` because attribute UI type is `Configurator.UiType.NOT_IMPLEMENTED`', () => {
+      component.attribute.uiType = Configurator.UiType.NOT_IMPLEMENTED;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.STRING`', () => {
+      component.attribute.uiType = Configurator.UiType.STRING;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.NUMERIC`', () => {
+      component.attribute.uiType = Configurator.UiType.NUMERIC;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.DROPDOWN`', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.DROPDOWN_PRODUCT`', () => {
+      component.attribute.uiType = Configurator.UiType.DROPDOWN_PRODUCT;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `true` because attribute UI type is `RADIOBUTTON`', () => {
+      expect(
+        component['isAttributeWithoutErrorMsg'](component.attribute.uiType)
+      ).toBe(true);
+    });
+  });
+
+  describe('isAttributeWithDomain', () => {
+    it('should return `false` because attribute UI type is `Configurator.UiType.NOT_IMPLEMENTED`', () => {
+      component.attribute.uiType = Configurator.UiType.NOT_IMPLEMENTED;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithDomain'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.STRING`', () => {
+      component.attribute.uiType = Configurator.UiType.STRING;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithDomain'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `false` because attribute UI type is `Configurator.UiType.NUMERIC`', () => {
+      component.attribute.uiType = Configurator.UiType.NUMERIC;
+      fixture.detectChanges();
+      expect(
+        component['isAttributeWithDomain'](component.attribute.uiType)
+      ).toBe(false);
+    });
+
+    it('should return `true` because attribute UI type is `RADIOBUTTON`', () => {
+      expect(
+        component['isAttributeWithDomain'](component.attribute.uiType)
+      ).toBe(true);
+    });
+  });
+
+  describe('isRequiredAttributeWithoutErrorMsg', () => {
+    it('should return `false` because because required attribute is `undefined`', () => {
+      component.attribute.required = undefined;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithoutErrorMsg']()).toBe(false);
+    });
+
+    it('should return `false` because definition of attribute incompleteness is `undefined`', () => {
+      component.attribute.incomplete = undefined;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithoutErrorMsg']()).toBe(false);
+    });
+
+    it('should return `false` because attribute attribute UI type is `Configurator.UiType.DROPDOWN`', () => {
+      component.attribute.required = true;
+      component.attribute.uiType = Configurator.UiType.DROPDOWN;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithoutErrorMsg']()).toBe(false);
+    });
+
+    it('should return `true` because attribute attribute UI type is `Configurator.UiType.RADIOBUTTON`', () => {
+      component.attribute.required = true;
+      component.attribute.uiType = Configurator.UiType.RADIOBUTTON;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithoutErrorMsg']()).toBe(true);
+    });
+  });
+
   describe('isRequiredAttributeWithDomain', () => {
-    it('should return false in case optional attribute is not defined', () => {
+    it('should return `false` because because required attribute is `undefined`', () => {
       component.attribute.required = undefined;
+      fixture.detectChanges();
       expect(component['isRequiredAttributeWithDomain']()).toBe(false);
     });
+
+    it('should return `false` because definition of attribute incompleteness is `undefined`', () => {
+      component.attribute.incomplete = undefined;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithDomain']()).toBe(false);
+    });
+
+    it('should return `false` because attribute attribute UI type is `Configurator.UiType.NUMERIC`', () => {
+      component.attribute.required = true;
+      component.attribute.uiType = Configurator.UiType.NUMERIC;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithDomain']()).toBe(false);
+    });
+
+    it('should return `true` because attribute attribute UI type is `Configurator.UiType.DROPDOWN_PRODUCT`', () => {
+      component.attribute.required = true;
+      component.attribute.uiType = Configurator.UiType.DROPDOWN_PRODUCT;
+      fixture.detectChanges();
+      expect(component['isRequiredAttributeWithDomain']()).toBe(true);
+    });
+  });
+
+  describe('needsRequiredAttributeErrorMsg', () => {
+    it('should return `true` because the newest release is active', () => {
+      component.attribute.required = true;
+      component.attribute.uiType = Configurator.UiType.RADIOBUTTON;
+      fixture.detectChanges();
+      expect(component['needsRequiredAttributeErrorMsg']()).toBe(true);
+    });
   });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
index 4de8062a3b6..e65995e51f2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/header/configurator-attribute-header.component.ts
@@ -10,16 +10,15 @@ import {
   inject,
   isDevMode,
   OnInit,
+  Optional,
 } from '@angular/core';
-import { LoggerService } from '@spartacus/core';
+import { FeatureConfigService, LoggerService } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ICON_TYPE } from '@spartacus/storefront';
 import { Observable } from 'rxjs';
 import { delay, filter, map, switchMap, take } from 'rxjs/operators';
-import {
-  ConfiguratorCommonsService,
-  ConfiguratorGroupsService,
-} from '../../../core';
+import { ConfiguratorCommonsService } from '../../../core/facade/configurator-commons.service';
+import { ConfiguratorGroupsService } from '../../../core/facade/configurator-groups.service';
 import { Configurator } from '../../../core/model/configurator.model';
 import { ConfiguratorUISettingsConfig } from '../../config/configurator-ui-settings.config';
 import { ConfiguratorStorefrontUtilsService } from '../../service/configurator-storefront-utils.service';
@@ -47,12 +46,35 @@ export class ConfiguratorAttributeHeaderComponent
 
   protected logger = inject(LoggerService);
 
+  constructor(
+    configUtils: ConfiguratorStorefrontUtilsService,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configuratorUiSettings: ConfiguratorUISettingsConfig,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfigService?: FeatureConfigService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    configUtils: ConfiguratorStorefrontUtilsService,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    configuratorGroupsService: ConfiguratorGroupsService,
+    configuratorUiSettings: ConfiguratorUISettingsConfig,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext
+  );
+
   constructor(
     protected configUtils: ConfiguratorStorefrontUtilsService,
     protected configuratorCommonsService: ConfiguratorCommonsService,
     protected configuratorGroupsService: ConfiguratorGroupsService,
     protected configuratorUiSettings: ConfiguratorUISettingsConfig,
-    protected attributeComponentContext: ConfiguratorAttributeCompositionContext
+    protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    // TODO (CXSPA-3392): for next major release remove featureConfigService
+    @Optional() protected featureConfigService?: FeatureConfigService
   ) {
     super();
     this.attribute = attributeComponentContext.attribute;
@@ -72,7 +94,7 @@ export class ConfiguratorAttributeHeaderComponent
      */
     this.showRequiredMessageForDomainAttribute$ = this.configUtils
       .isCartEntryOrGroupVisited(this.owner, this.groupId)
-      .pipe(map((result) => result && this.isRequiredAttributeWithDomain()));
+      .pipe(map((result) => result && this.needsRequiredAttributeErrorMsg()));
   }
 
   /**
@@ -87,7 +109,6 @@ export class ConfiguratorAttributeHeaderComponent
     } else if (this.isMultiSelection) {
       return 'configurator.attribute.multiSelectRequiredMessage';
     } else {
-      //input attribute types
       return 'configurator.attribute.singleSelectRequiredMessage';
     }
   }
@@ -109,9 +130,7 @@ export class ConfiguratorAttributeHeaderComponent
       case Configurator.UiType.RADIOBUTTON_ADDITIONAL_INPUT:
       case Configurator.UiType.RADIOBUTTON_PRODUCT:
       case Configurator.UiType.CHECKBOX:
-      case Configurator.UiType.DROPDOWN:
       case Configurator.UiType.DROPDOWN_ADDITIONAL_INPUT:
-      case Configurator.UiType.DROPDOWN_PRODUCT:
       case Configurator.UiType.SINGLE_SELECTION_IMAGE: {
         return true;
       }
@@ -119,15 +138,57 @@ export class ConfiguratorAttributeHeaderComponent
     return false;
   }
 
+  protected isAttributeWithoutErrorMsg(
+    uiType: Configurator.UiType | undefined
+  ): boolean {
+    switch (uiType) {
+      case Configurator.UiType.NOT_IMPLEMENTED:
+      case Configurator.UiType.STRING:
+      case Configurator.UiType.NUMERIC:
+      case Configurator.UiType.CHECKBOX:
+      case Configurator.UiType.DROPDOWN:
+      case Configurator.UiType.DROPDOWN_PRODUCT: {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  protected isAttributeWithDomain(
+    uiType: Configurator.UiType | undefined
+  ): boolean {
+    switch (uiType) {
+      case Configurator.UiType.NOT_IMPLEMENTED:
+      case Configurator.UiType.STRING:
+      case Configurator.UiType.NUMERIC:
+      case Configurator.UiType.CHECKBOX: {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  // TODO (CXSPA-3392): for next major release remove featureConfigService
+  protected needsRequiredAttributeErrorMsg(): boolean {
+    if (this.featureConfigService?.isLevel('6.2')) {
+      // TODO: for next major release this condition should be proved
+      return this.isRequiredAttributeWithoutErrorMsg();
+    } else {
+      return this.isRequiredAttributeWithDomain();
+    }
+  }
+
   protected isRequiredAttributeWithDomain(): boolean {
-    const uiType = this.attribute.uiType;
     return (
-      (this.attribute.required &&
-        this.attribute.incomplete &&
-        uiType !== Configurator.UiType.NOT_IMPLEMENTED &&
-        uiType !== Configurator.UiType.STRING &&
-        uiType !== Configurator.UiType.NUMERIC) ??
-      false
+      this.isRequiredErrorMsg(this.attribute) &&
+      this.isAttributeWithDomain(this.attribute.uiType)
+    );
+  }
+
+  protected isRequiredAttributeWithoutErrorMsg(): boolean {
+    return (
+      this.isRequiredErrorMsg(this.attribute) &&
+      this.isAttributeWithoutErrorMsg(this.attribute.uiType)
     );
   }
 
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
index 059ea1874cd..810de72b7e2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.spec.ts
@@ -643,26 +643,28 @@ describe('ConfiguratorAttributeProductCardComponent', () => {
   });
 
   describe('isValueCodeDefined', () => {
-    it('should return true when value code equals zero', () => {
-      expect(component.isValueCodeDefined('0')).toBe(false);
+    it('should return `false` when value code equals `###RETRACT_VALUE_CODE##`', () => {
+      expect(component.isValueCodeDefined(Configurator.RetractValueCode)).toBe(
+        false
+      );
     });
 
-    it('should return true when value code is null', () => {
+    it('should return `false` when value code is `null`', () => {
       expect(component.isValueCodeDefined(null)).toBe(false);
     });
 
-    it('should return true when value code is undefined', () => {
+    it('should return `false` when value code is `undefined`', () => {
       expect(component.isValueCodeDefined(undefined)).toBe(false);
     });
 
-    it('should return true when value code is defined', () => {
+    it('should return `true` when value code is defined', () => {
       expect(component.isValueCodeDefined('888')).toBe(true);
     });
   });
 
   describe('if "No Option Selected" is selected / not selected for not required single-selection-bundle', () => {
     it('should not show "Deselect" button', () => {
-      value.valueCode = '0';
+      value.valueCode = Configurator.RetractValueCode;
       setProductBoundValueAttributes(component);
       fixture.detectChanges();
 
@@ -674,7 +676,7 @@ describe('ConfiguratorAttributeProductCardComponent', () => {
     });
 
     it('should show "Select" button', () => {
-      value.valueCode = '0';
+      value.valueCode = Configurator.RetractValueCode;
       setProductBoundValueAttributes(component, false);
       fixture.detectChanges();
 
@@ -1020,8 +1022,9 @@ describe('ConfiguratorAttributeProductCardComponent', () => {
       );
     });
 
-    it("should return 'configurator.a11y.selectNoItemOfAttribute' if there is valueCode=0 for the productBoundValue", () => {
-      component.productCardOptions.productBoundValue.valueCode = '0';
+    it("should return 'configurator.a11y.selectNoItemOfAttribute' if there is valueCode=`###RETRACT_VALUE_CODE###` for the productBoundValue", () => {
+      component.productCardOptions.productBoundValue.valueCode =
+        Configurator.RetractValueCode;
       const itemIndex = component.productCardOptions.itemIndex + 1;
       expect(component.getAriaLabelSingleUnselected(product)).toBe(
         'configurator.a11y.selectNoItemOfAttribute attribute:' +
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
index 781ea5af8b2..7e0309e328f 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/product-card/configurator-attribute-product-card.component.ts
@@ -243,7 +243,9 @@ export class ConfiguratorAttributeProductCardComponent
    * @return {boolean} - 'true' if the value code is defined, otherwise 'false'
    */
   isValueCodeDefined(valueCode: string | null | undefined): boolean {
-    return valueCode && valueCode !== '0' ? true : false;
+    return valueCode && valueCode !== Configurator.RetractValueCode
+      ? true
+      : false;
   }
 
   protected transformToProductType(
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
index 799c84842d5..8acd8779b2c 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.spec.ts
@@ -11,7 +11,7 @@ const currentAttribute: Configurator.Attribute = {
 
 const attributeIncomplete: Configurator.Attribute = { name: 'name' };
 
-describe('ConfigUIKeyGeneratorService', () => {
+describe('ConfiguratorAttributeBaseComponent', () => {
   let classUnderTest: ConfiguratorAttributeBaseComponent;
 
   beforeEach(() => {
@@ -37,7 +37,7 @@ describe('ConfigUIKeyGeneratorService', () => {
       ).toEqual('cx-configurator--label--attributeId');
     });
 
-    it("should return only attribute id for aria-labelledby because value id is 'undefined'", () => {
+    it("should return only attribute id for aria-labelledby in case value id is 'undefined'", () => {
       expect(
         classUnderTest.createAriaLabelledBy('prefix', 'attributeId', undefined)
       ).toEqual('cx-configurator--label--attributeId');
@@ -200,7 +200,7 @@ describe('ConfigUIKeyGeneratorService', () => {
       expect(classUnderTest.getLabel(true, label, techName)).toEqual(label);
     });
 
-    it('should return label with technical name because expert mode is set to true', () => {
+    it('should return label with technical name in case expert mode is set to true', () => {
       const label = 'label';
       const techName = 'techName';
       const techLabel = label + ' / [' + techName + ']';
@@ -236,16 +236,16 @@ describe('ConfigUIKeyGeneratorService', () => {
   });
 
   describe('getValuePrice', () => {
-    it('should return empty string because value is undefined', () => {
+    it('should return empty string in case value is undefined', () => {
       expect(classUnderTest['getValuePrice'](undefined)).toEqual('');
     });
 
-    it('should return empty string because price is undefined', () => {
+    it('should return empty string in case price is undefined', () => {
       const value = ConfiguratorTestUtils.createValue('valueCode', undefined);
       expect(classUnderTest['getValuePrice'](value)).toEqual('');
     });
 
-    it('should return empty string because price is zero', () => {
+    it('should return empty string in case price is zero', () => {
       const value = ConfiguratorTestUtils.createValue('valueCode', 0);
       expect(classUnderTest['getValuePrice'](value)).toEqual('');
     });
@@ -264,4 +264,142 @@ describe('ConfigUIKeyGeneratorService', () => {
       );
     });
   });
+
+  describe('isRequiredErrorMsg', () => {
+    it('should return false in case both required and incomplete properties are undefined', () => {
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(
+        false
+      );
+    });
+
+    it('should return false in case required property is undefined', () => {
+      currentAttribute.required = undefined;
+      currentAttribute.incomplete = true;
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(
+        false
+      );
+    });
+
+    it('should return false in case incomplete property is undefined', () => {
+      currentAttribute.required = true;
+      currentAttribute.incomplete = undefined;
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(
+        false
+      );
+    });
+
+    it('should return false in case required property is false', () => {
+      currentAttribute.required = false;
+      currentAttribute.incomplete = true;
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(
+        false
+      );
+    });
+
+    it('should return false in case incomplete property is false', () => {
+      currentAttribute.required = false;
+      currentAttribute.incomplete = true;
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(
+        false
+      );
+    });
+
+    it('should return true in case both required and incomplete properties are true', () => {
+      currentAttribute.required = true;
+      currentAttribute.incomplete = true;
+      expect(classUnderTest['isRequiredErrorMsg'](currentAttribute)).toBe(true);
+    });
+  });
+
+  describe('isUserInput', () => {
+    it('should return false in case uiType is undefined', () => {
+      currentAttribute.uiType = undefined;
+      expect(classUnderTest['isUserInput'](currentAttribute)).toBe(false);
+    });
+
+    it('should return true in case uiType is RADIOBUTTON', () => {
+      expect(classUnderTest['isUserInput'](currentAttribute)).toBe(false);
+    });
+
+    it('should return true in case uiType is STRING', () => {
+      currentAttribute.uiType = Configurator.UiType.STRING;
+      expect(classUnderTest['isUserInput'](currentAttribute)).toBe(true);
+    });
+
+    it('should return true in case uiType is NUMERIC', () => {
+      currentAttribute.uiType = Configurator.UiType.NUMERIC;
+      expect(classUnderTest['isUserInput'](currentAttribute)).toBe(true);
+    });
+  });
+
+  describe('isDropDown', () => {
+    it('should return false in case uiType is undefined', () => {
+      currentAttribute.uiType = undefined;
+      expect(classUnderTest['isDropDown'](currentAttribute)).toBe(false);
+    });
+
+    it('should return true in case uiType is RADIOBUTTON', () => {
+      expect(classUnderTest['isDropDown'](currentAttribute)).toBe(false);
+    });
+
+    it('should return true in case uiType is DROPDOWN', () => {
+      currentAttribute.uiType = Configurator.UiType.DROPDOWN;
+      expect(classUnderTest['isDropDown'](currentAttribute)).toBe(true);
+    });
+
+    it('should return true in case uiType is DROPDOWN_PRODUCT', () => {
+      currentAttribute.uiType = Configurator.UiType.DROPDOWN_PRODUCT;
+      expect(classUnderTest['isDropDown'](currentAttribute)).toBe(true);
+    });
+  });
+
+  describe('isNoValueSelected', () => {
+    it('should return `false` in case there are no values', () => {
+      expect(classUnderTest['isNoValueSelected'](currentAttribute)).toBe(true);
+    });
+
+    it('should return `false` in case there is a selected value with value code `0`', () => {
+      currentAttribute.values = [
+        ConfiguratorTestUtils.createValue(
+          Configurator.RetractValueCode,
+          undefined,
+          true
+        ),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      expect(classUnderTest['isNoValueSelected'](currentAttribute)).toBe(true);
+    });
+
+    it('should return `false` in case the selected value has a code `###RETRACT_VALUE_CODE###`', () => {
+      currentAttribute.values = [
+        ConfiguratorTestUtils.createValue(
+          Configurator.RetractValueCode,
+          undefined,
+          true
+        ),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      expect(classUnderTest['isNoValueSelected'](currentAttribute)).toBe(true);
+    });
+
+    it('should return `false` in case there is selected value', () => {
+      currentAttribute.values = [
+        ConfiguratorTestUtils.createValue('123', 10, true),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      expect(classUnderTest['isNoValueSelected'](currentAttribute)).toBe(false);
+    });
+
+    it('should return `true` in case there is selected value', () => {
+      currentAttribute.values = [
+        ConfiguratorTestUtils.createValue('123', 10, true),
+        ConfiguratorTestUtils.createValue('456', 15),
+        ConfiguratorTestUtils.createValue('789', 20),
+      ];
+      expect(classUnderTest['isNoValueSelected'](currentAttribute)).toBe(false);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
index c0862878417..a7f648b6e09 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-base.component.ts
@@ -214,4 +214,36 @@ export class ConfiguratorAttributeBaseComponent {
       uiType === Configurator.UiType.DROPDOWN_ADDITIONAL_INPUT
     );
   }
+
+  protected isRequiredErrorMsg(attribute: Configurator.Attribute): boolean {
+    return (attribute.required && attribute.incomplete) || false;
+  }
+
+  protected isUserInput(attribute: Configurator.Attribute): boolean {
+    return (
+      attribute.uiType === Configurator.UiType.STRING ||
+      attribute.uiType === Configurator.UiType.NUMERIC
+    );
+  }
+
+  protected isDropDown(attribute: Configurator.Attribute): boolean {
+    return (
+      attribute.uiType === Configurator.UiType.DROPDOWN ||
+      attribute.uiType === Configurator.UiType.DROPDOWN_PRODUCT
+    );
+  }
+
+  protected getSelectedValue(
+    attribute: Configurator.Attribute
+  ): Configurator.Value | undefined {
+    return attribute.values?.find((value) => value.selected);
+  }
+
+  protected isNoValueSelected(attribute: Configurator.Attribute): boolean {
+    const selectedValue = this.getSelectedValue(attribute);
+    if (selectedValue) {
+      return selectedValue.valueCode === Configurator.RetractValueCode;
+    }
+    return true;
+  }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
index 03ffc9d76b2..099e5f30991 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.spec.ts
@@ -13,6 +13,7 @@ import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-uti
 import { StoreModule } from '@ngrx/store';
 import { CONFIGURATOR_FEATURE } from '../../../../core/state/configurator-state';
 import { getConfiguratorReducers } from '../../../../core/state/reducers';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 function createValue(code: string, name: string, isSelected: boolean) {
   const value: Configurator.Value = {
@@ -55,13 +56,15 @@ class ExampleConfiguratorAttributeSingleSelectionComponent extends ConfiguratorA
     protected quantityService: ConfiguratorAttributeQuantityService,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    protected configUtils: ConfiguratorStorefrontUtilsService
   ) {
     super(
       quantityService,
       translation,
       attributeComponentContext,
-      configuratorCommonsService
+      configuratorCommonsService,
+      configUtils
     );
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
index ed2a6c0163b..4c1647fdfc2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/base/configurator-attribute-single-selection-base.component.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Directive } from '@angular/core';
+import { Directive, Optional } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { TranslationService } from '@spartacus/core';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable, of } from 'rxjs';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { map, take } from 'rxjs/operators';
 import { Configurator } from '../../../../core/model/configurator.model';
@@ -17,6 +17,7 @@ import { ConfiguratorPriceComponentOptions } from '../../../price/configurator-p
 import { ConfiguratorAttributeQuantityComponentOptions } from '../../quantity/configurator-attribute-quantity.component';
 import { ConfiguratorAttributeQuantityService } from '../../quantity/configurator-attribute-quantity.service';
 import { ConfiguratorAttributeBaseComponent } from './configurator-attribute-base.component';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 @Directive()
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
@@ -29,11 +30,35 @@ export abstract class ConfiguratorAttributeSingleSelectionBaseComponent extends
   language: string;
   expMode: boolean;
 
+  showRequiredErrorMessage$: Observable<boolean> = of(false);
+
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
   constructor(
     protected quantityService: ConfiguratorAttributeQuantityService,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
   ) {
     super();
 
@@ -42,6 +67,24 @@ export abstract class ConfiguratorAttributeSingleSelectionBaseComponent extends
     this.ownerType = attributeComponentContext.owner.type;
     this.language = attributeComponentContext.language;
     this.expMode = attributeComponentContext.expMode;
+
+    if (this.configuratorStorefrontUtilsService) {
+      this.showRequiredErrorMessage$ = this.configuratorStorefrontUtilsService
+        .isCartEntryOrGroupVisited(
+          attributeComponentContext.owner,
+          attributeComponentContext.group.id
+        )
+        .pipe(
+          map(
+            (result) =>
+              (result &&
+                this.isRequiredErrorMsg(this.attribute) &&
+                this.isDropDown(this.attribute) &&
+                this.isNoValueSelected(this.attribute)) ||
+              false
+          )
+        );
+    }
   }
 
   /**
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.html
index be43df50043..59147f0c2c2 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.html
@@ -14,24 +14,49 @@
             }
     }}
   </label>
-  <select
-    id="{{ createAttributeIdForConfigurator(attribute) }}"
-    class="form-control"
-    [formControl]="attributeDropDownForm"
-    [cxFocus]="{ key: attribute.name }"
-    (change)="onSelect(attributeDropDownForm.value)"
-    [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
-  >
-    <option
-      *ngFor="let item of attribute.values"
-      [selected]="item.selected"
-      [label]="getLabel(expMode, item.valueDisplay, item.valueCode, item)"
-      [attr.aria-label]="getAriaLabel(item, attribute)"
-      [value]="item.valueCode"
+  <ng-container *cxFeatureLevel="'!6.2'">
+    <select
+      id="{{ createAttributeIdForConfigurator(attribute) }}"
+      class="form-control"
+      [formControl]="attributeDropDownForm"
+      [cxFocus]="{ key: attribute.name }"
+      (change)="onSelect(attributeDropDownForm.value)"
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
+    >
+      <option
+        *ngFor="let item of attribute.values"
+        [selected]="item.selected"
+        [label]="getLabel(expMode, item.valueDisplay, item.valueCode, item)"
+        [attr.aria-label]="getAriaLabel(item, attribute)"
+        [value]="item.valueCode"
+      >
+        {{ getLabel(expMode, item.valueDisplay, item.valueCode, item) }}
+      </option>
+    </select>
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.2'">
+    <select
+      id="{{ createAttributeIdForConfigurator(attribute) }}"
+      class="form-control"
+      [ngClass]="{
+        'cx-required-error-msg ': (showRequiredErrorMessage$ | async)
+      }"
+      [formControl]="attributeDropDownForm"
+      [cxFocus]="{ key: attribute.name }"
+      (change)="onSelect(attributeDropDownForm.value)"
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
     >
-      {{ getLabel(expMode, item.valueDisplay, item.valueCode, item) }}
-    </option>
-  </select>
+      <option
+        *ngFor="let item of attribute.values"
+        [selected]="item.selected"
+        [label]="getLabel(expMode, item.valueDisplay, item.valueCode, item)"
+        [attr.aria-label]="getAriaLabel(item, attribute)"
+        [value]="item.valueCode"
+      >
+        {{ getLabel(expMode, item.valueDisplay, item.valueCode, item) }}
+      </option>
+    </select>
+  </ng-container>
 
   <div
     *ngIf="!withQuantity && getSelectedValue()?.valuePrice"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.spec.ts
index 0b1ac384eee..70ae5022e8e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.spec.ts
@@ -10,7 +10,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
 import { StoreModule } from '@ngrx/store';
-import { FeaturesConfigModule, I18nTestingModule } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  FeaturesConfigModule,
+  I18nTestingModule,
+} from '@spartacus/core';
 import { CONFIGURATOR_FEATURE } from '../../../../core/state/configurator-state';
 import { getConfiguratorReducers } from '../../../../core/state/reducers';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
@@ -23,6 +27,9 @@ import { ConfiguratorAttributeNumericInputFieldComponent } from '../numeric-inpu
 import { ConfiguratorAttributeDropDownComponent } from './configurator-attribute-drop-down.component';
 import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
+import { Observable, of } from 'rxjs';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 
 function createValue(code: string, name: string, isSelected: boolean) {
   const value: Configurator.Value = {
@@ -62,6 +69,20 @@ class MockConfiguratorCommonsService {
   updateConfiguration(): void {}
 }
 
+let showRequiredErrorMessage: boolean;
+class MockConfigUtilsService {
+  isCartEntryOrGroupVisited(): Observable<boolean> {
+    return of(showRequiredErrorMessage);
+  }
+}
+
+let testVersion: string;
+class MockFeatureConfigService {
+  isLevel(version: string): boolean {
+    return version === testVersion;
+  }
+}
+
 describe('ConfigAttributeDropDownComponent', () => {
   let component: ConfiguratorAttributeDropDownComponent;
   let htmlElem: HTMLElement;
@@ -72,12 +93,44 @@ describe('ConfigAttributeDropDownComponent', () => {
   const groupId = 'theGroupId';
   const selectedValue = 'selectedValue';
 
-  const value1 = createValue('1', 'val1', true);
+  const value1 = createValue(
+    Configurator.RetractValueCode,
+    'Please select a value',
+    true
+  );
   const value2 = createValue('2', 'val2', false);
   const value3 = createValue('3', 'val3', false);
 
   const values: Configurator.Value[] = [value1, value2, value3];
 
+  function createComponentWithData(
+    releaseVersion: string,
+    isCartEntryOrGroupVisited: boolean = true
+  ): ConfiguratorAttributeDropDownComponent {
+    testVersion = releaseVersion;
+    showRequiredErrorMessage = isCartEntryOrGroupVisited;
+
+    fixture = TestBed.createComponent(ConfiguratorAttributeDropDownComponent);
+    htmlElem = fixture.nativeElement;
+    component = fixture.componentInstance;
+    component.attribute = {
+      name: name,
+      label: name,
+      attrCode: 444,
+      dataType: Configurator.DataType.USER_SELECTION_QTY_ATTRIBUTE_LEVEL,
+      uiType: Configurator.UiType.DROPDOWN,
+      selectedSingleValue: selectedValue,
+      quantity: 1,
+      groupId: groupId,
+      required: true,
+      incomplete: true,
+      values,
+    };
+
+    fixture.detectChanges();
+    return component;
+  }
+
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
@@ -88,6 +141,7 @@ describe('ConfigAttributeDropDownComponent', () => {
           MockFocusDirective,
           MockConfiguratorAttributeQuantityComponent,
           MockConfiguratorPriceComponent,
+          MockFeatureLevelDirective,
         ],
         imports: [
           ReactiveFormsModule,
@@ -106,6 +160,11 @@ describe('ConfigAttributeDropDownComponent', () => {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
           },
+          {
+            provide: ConfiguratorStorefrontUtilsService,
+            useClass: MockConfigUtilsService,
+          },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
         ],
       })
         .overrideComponent(ConfiguratorAttributeDropDownComponent, {
@@ -117,33 +176,37 @@ describe('ConfigAttributeDropDownComponent', () => {
     })
   );
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConfiguratorAttributeDropDownComponent);
-    htmlElem = fixture.nativeElement;
-    component = fixture.componentInstance;
-    component.attribute = {
-      name: name,
-      label: name,
-      attrCode: 444,
-      dataType: Configurator.DataType.USER_SELECTION_QTY_ATTRIBUTE_LEVEL,
-      uiType: Configurator.UiType.DROPDOWN,
-      selectedSingleValue: selectedValue,
-      quantity: 1,
-      groupId: groupId,
-      values,
-    };
-    fixture.detectChanges();
+  afterEach(() => {
+    document.body.removeChild(htmlElem);
+    fixture.destroy();
   });
 
   it('should create', () => {
+    createComponentWithData('6.2');
     expect(component).toBeTruthy();
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      'select.cx-required-error-msg'
+    );
+  });
+
+  it('should render an empty component because showRequiredErrorMessage$ is `false`', () => {
+    createComponentWithData('6.1', false);
+    CommonConfiguratorTestUtilsService.expectElementNotPresent(
+      expect,
+      htmlElem,
+      'select.cx-required-error-msg'
+    );
   });
 
   it('should set selectedSingleValue on init', () => {
+    createComponentWithData('6.2');
     expect(component.attributeDropDownForm.value).toEqual(selectedValue);
   });
 
   it('should call updateConfiguration on select', () => {
+    createComponentWithData('6.2');
     component.ownerKey = ownerKey;
     spyOn(
       component['configuratorCommonsService'],
@@ -163,6 +226,10 @@ describe('ConfigAttributeDropDownComponent', () => {
   });
 
   describe('attribute level', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it('should not display quantity and no price', () => {
       component.attribute.dataType =
         Configurator.DataType.USER_SELECTION_NO_QTY;
@@ -213,6 +280,10 @@ describe('ConfigAttributeDropDownComponent', () => {
   });
 
   describe('value level', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it('should not display quantity', () => {
       component.attribute.dataType =
         Configurator.DataType.USER_SELECTION_NO_QTY;
@@ -249,6 +320,10 @@ describe('ConfigAttributeDropDownComponent', () => {
   });
 
   describe('Rendering for additional value', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it('should provide input field for alpha numeric value ', () => {
       component.attribute.uiType =
         Configurator.UiType.DROPDOWN_ADDITIONAL_INPUT;
@@ -277,6 +352,10 @@ describe('ConfigAttributeDropDownComponent', () => {
   });
 
   describe('Accessibility', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2');
+    });
+
     it("should contain label element with class name 'cx-visually-hidden' that hides label content on the UI", () => {
       CommonConfiguratorTestUtilsService.expectElementContainsA11y(
         expect,
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.ts
index d879b22bb5c..77e348d8c70 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.component.ts
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
 
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { Configurator } from '../../../../core/model/configurator.model';
@@ -14,6 +19,7 @@ import { TranslationService } from '@spartacus/core';
 
 import { ConfiguratorAttributeQuantityService } from '../../quantity/configurator-attribute-quantity.service';
 import { ConfiguratorAttributeSingleSelectionBaseComponent } from '../base/configurator-attribute-single-selection-base.component';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 @Component({
   selector: 'cx-configurator-attribute-drop-down',
@@ -27,18 +33,42 @@ export class ConfiguratorAttributeDropDownComponent
   attributeDropDownForm = new UntypedFormControl('');
   group: string;
 
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
   constructor(
     protected quantityService: ConfiguratorAttributeQuantityService,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
   ) {
     super(
       quantityService,
       translation,
       attributeComponentContext,
-      configuratorCommonsService
+      configuratorCommonsService,
+      configuratorStorefrontUtilsService
     );
+
     this.group = attributeComponentContext.group.id;
   }
 
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.module.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.module.ts
index 58ccf27c5c9..f3a508376a7 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/drop-down/configurator-attribute-drop-down.module.ts
@@ -8,7 +8,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { KeyboardFocusModule } from '@spartacus/storefront';
 import { ConfiguratorAttributeCompositionConfig } from '../../composition/configurator-attribute-composition.config';
 import { ConfiguratorPriceModule } from '../../../price/configurator-price.module';
@@ -29,6 +33,7 @@ import { ConfiguratorAttributeInputFieldModule } from '../input-field/configurat
     ConfiguratorPriceModule,
     ConfiguratorAttributeNumericInputFieldModule,
     ConfiguratorAttributeInputFieldModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<ConfiguratorAttributeCompositionConfig>{
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
index ed3caaf9f32..181bfc822de 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.html
@@ -30,6 +30,9 @@
     <input
       [formControl]="attributeInputForm"
       class="form-control"
+      [ngClass]="{
+        'cx-required-error-msg ': (showRequiredErrorMessage$ | async)
+      }"
       [class.ng-invalid]="isRequired && isUserInputEmpty"
       maxlength="{{ attribute.maxlength }}"
       [attr.aria-label]="
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
index 0da10aa7430..21bfee1e506 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.spec.ts
@@ -22,6 +22,8 @@ import { ConfiguratorAttributeInputFieldComponent } from './configurator-attribu
 import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
 import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
+import { Observable, of } from 'rxjs';
+import { ConfiguratorStorefrontUtilsService } from '@spartacus/product-configurator/rulebased';
 
 @Directive({
   selector: '[cxFocus]',
@@ -33,6 +35,13 @@ class MockConfiguratorCommonsService {
   updateConfiguration(): void {}
 }
 
+const isCartEntryOrGroupVisited = true;
+class MockConfigUtilsService {
+  isCartEntryOrGroupVisited(): Observable<boolean> {
+    return of(isCartEntryOrGroupVisited);
+  }
+}
+
 describe('ConfigAttributeInputFieldComponent', () => {
   let component: ConfiguratorAttributeInputFieldComponent;
   let fixture: ComponentFixture<ConfiguratorAttributeInputFieldComponent>;
@@ -64,6 +73,10 @@ describe('ConfigAttributeInputFieldComponent', () => {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
           },
+          {
+            provide: ConfiguratorStorefrontUtilsService,
+            useClass: MockConfigUtilsService,
+          },
           {
             provide: FeaturesConfig,
             useValue: {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
index 324aeadf271..4d558ff3c9e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/input-field/configurator-attribute-input-field.component.ts
@@ -9,17 +9,18 @@ import {
   Component,
   OnDestroy,
   OnInit,
+  Optional,
 } from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
-import { Subscription, timer } from 'rxjs';
-import { debounce } from 'rxjs/operators';
+import { Observable, of, Subscription, timer } from 'rxjs';
+import { debounce, map } from 'rxjs/operators';
 import { Configurator } from '../../../../core/model/configurator.model';
 import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { ConfiguratorUISettingsConfig } from '../../../config/configurator-ui-settings.config';
-
 import { ConfiguratorAttributeBaseComponent } from '../base/configurator-attribute-base.component';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 @Component({
   selector: 'cx-configurator-attribute-input-field',
@@ -35,25 +36,64 @@ export class ConfiguratorAttributeInputFieldComponent
 
   attribute: Configurator.Attribute;
   group: string;
+  owner: CommonConfigurator.Owner;
   ownerKey: string;
   ownerType: CommonConfigurator.OwnerType;
 
+  showRequiredErrorMessage$: Observable<boolean> = of(false);
+
   /**
    * In case no config is injected, or when the debounce time is not configured at all,
    * this value will be used as fallback.
    */
   protected readonly FALLBACK_DEBOUNCE_TIME = 500;
 
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
+  constructor(
+    config: ConfiguratorUISettingsConfig,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    config: ConfiguratorUISettingsConfig,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
   constructor(
     protected config: ConfiguratorUISettingsConfig,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
   ) {
     super();
+
     this.attribute = attributeComponentContext.attribute;
     this.group = attributeComponentContext.group.id;
+    this.owner = attributeComponentContext.owner;
     this.ownerKey = attributeComponentContext.owner.key;
     this.ownerType = attributeComponentContext.owner.type;
+
+    if (this.configuratorStorefrontUtilsService) {
+      this.showRequiredErrorMessage$ = this.configuratorStorefrontUtilsService
+        .isCartEntryOrGroupVisited(this.owner, this.group)
+        .pipe(
+          map((result) =>
+            result
+              ? this.isRequiredErrorMsg(this.attribute) &&
+                this.isUserInput(this.attribute)
+              : false
+          )
+        );
+    }
   }
 
   ngOnInit() {
@@ -114,9 +154,8 @@ export class ConfiguratorAttributeInputFieldComponent
    * @returns Required?
    */
   get isRequired(): boolean {
-    const isNonDomainAttributeType =
-      this.attribute.uiType === Configurator.UiType.STRING ||
-      this.attribute.uiType === Configurator.UiType.NUMERIC;
-    return isNonDomainAttributeType ? this.attribute.required ?? false : false;
+    return this.isUserInput(this.attribute)
+      ? this.attribute.required ?? false
+      : false;
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
index f6fc0f0867f..ee31b0ddaba 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.html
@@ -27,8 +27,11 @@
   <ng-container *cxFeatureLevel="'6.2'">
     <input
       [formControl]="attributeInputForm"
-      [class.ng-invalid]="isRequired && isUserInputEmpty"
       class="form-control"
+      [ngClass]="{
+        'cx-required-error-msg ': (showRequiredErrorMessage$ | async)
+      }"
+      [class.ng-invalid]="isRequired && isUserInputEmpty"
       [attr.aria-describedby]="
         mustDisplayValidationMessage()
           ? createAttributeUiKey('label', attribute.name) +
@@ -55,11 +58,20 @@
   aria-atomic="true"
   role="alert"
 >
-  <cx-icon [type]="iconType.WARNING"></cx-icon>
-  {{
-    'configurator.attribute.wrongNumericFormat'
-      | cxTranslate: { pattern: numericFormatPattern }
-  }}
+  <ng-container *cxFeatureLevel="'!6.2'">
+    <cx-icon [type]="iconType.WARNING"></cx-icon>
+    {{
+      'configurator.attribute.wrongNumericFormat'
+        | cxTranslate: { pattern: numericFormatPattern }
+    }}
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.2'">
+    <cx-icon [type]="iconType.ERROR"></cx-icon>
+    {{
+      'configurator.attribute.wrongNumericFormatMessage'
+        | cxTranslate: { pattern: numericFormatPattern }
+    }}
+  </ng-container>
 </div>
 <div
   class="cx-validation-msg"
@@ -69,6 +81,6 @@
   aria-atomic="true"
   role="alert"
 >
-  <cx-icon [type]="iconType.WARNING"></cx-icon>
+  <cx-icon [type]="iconType.ERROR"></cx-icon>
   {{ 'configurator.attribute.wrongIntervalFormat' | cxTranslate }}
 </div>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
index 8765820743e..c26b5288ac1 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.service.ts
@@ -220,7 +220,7 @@ export class ConfiguratorAttributeNumericInputFieldService {
 
   /**
    * Get pattern for the message that is displayed when the validation fails. This message e.g. looks like
-   * 'Wrong format, this numerical attribute should be entered according to pattern ##,###,###.##'
+   * 'Enter the number in the following format: ##,###,###.##'
    * for the 'en' locale for an attribute with total length of 10 and 2 decimal places.
    *
    * @param decimalPlaces Number of decimal places
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
index 60e81588aa1..1ea7bbe85d1 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.spec.ts
@@ -13,13 +13,14 @@ import {
 } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import {
-  FeatureConfigService,
+  FeaturesConfig,
   FeaturesConfigModule,
+  FeatureConfigService,
   I18nTestingModule,
   LanguageService,
 } from '@spartacus/core';
 import { CommonConfigurator } from '@spartacus/product-configurator/common';
-import { of } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { Configurator } from '../../../../core/model/configurator.model';
@@ -32,6 +33,7 @@ import {
   ConfiguratorAttributeNumericInputFieldService,
   ConfiguratorAttributeNumericInterval,
 } from './configurator-attribute-numeric-input-field.component.service';
+import { ConfiguratorStorefrontUtilsService } from '@spartacus/product-configurator/rulebased';
 
 @Directive({
   selector: '[cxFocus]',
@@ -104,6 +106,12 @@ class MockConfiguratorCommonsService {
   updateConfiguration(): void {}
 }
 
+const isCartEntryOrGroupVisited = true;
+class MockConfigUtilsService {
+  isCartEntryOrGroupVisited(): Observable<boolean> {
+    return of(isCartEntryOrGroupVisited);
+  }
+}
 class MockFeatureConfigService {
   isLevel(version: string): boolean {
     return version === testVersion;
@@ -155,7 +163,17 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
             provide: ConfiguratorCommonsService,
             useClass: MockConfiguratorCommonsService,
           },
+          {
+            provide: ConfiguratorStorefrontUtilsService,
+            useClass: MockConfigUtilsService,
+          },
           { provide: FeatureConfigService, useClass: MockFeatureConfigService },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '*' },
+            },
+          },
         ],
       })
         .overrideComponent(ConfiguratorAttributeNumericInputFieldComponent, {
@@ -343,7 +361,7 @@ describe('ConfigAttributeNumericInputFieldComponent', () => {
     });
 
     it('should display no issue if input does not match interval but feature config service is not available', () => {
-      component['featureConfigservice'] = undefined;
+      component['featureConfigService'] = undefined;
       checkForIntervalValidity(VALUE_OUTSIDE_ALL_INTERVALS, 0);
     });
 
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
index 211dbccd673..ffda26a9e1e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/numeric-input-field/configurator-attribute-numeric-input-field.component.ts
@@ -32,6 +32,7 @@ import {
   ConfiguratorAttributeNumericInputFieldService,
   ConfiguratorAttributeNumericInterval,
 } from './configurator-attribute-numeric-input-field.component.service';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 class DefaultSettings {
   numDecimalPlaces: number;
@@ -63,6 +64,8 @@ export class ConfiguratorAttributeNumericInputFieldComponent
     attributeComponentContext: ConfiguratorAttributeCompositionContext,
     configuratorCommonsService: ConfiguratorCommonsService,
     // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
     featureConfigService: FeatureConfigService
   );
 
@@ -77,16 +80,24 @@ export class ConfiguratorAttributeNumericInputFieldComponent
     configuratorCommonsService: ConfiguratorCommonsService
   );
 
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
   constructor(
     protected configAttributeNumericInputFieldService: ConfiguratorAttributeNumericInputFieldService,
     protected config: ConfiguratorUISettingsConfig,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
     protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService,
     // TODO:(CXSPA-3392) for next major release remove feature config service
-    @Optional() protected featureConfigservice?: FeatureConfigService
+    @Optional() protected featureConfigService?: FeatureConfigService
   ) {
-    super(config, attributeComponentContext, configuratorCommonsService);
+    super(
+      config,
+      attributeComponentContext,
+      configuratorCommonsService,
+      configuratorStorefrontUtilsService
+    );
     this.language = attributeComponentContext.language;
   }
 
@@ -180,7 +191,8 @@ export class ConfiguratorAttributeNumericInputFieldComponent
         negativeAllowed
       );
 
-    const validatorArray = this.featureConfigservice?.isLevel('6.2')
+    // TODO (CXSPA-3392): for next major release remove feature level
+    const validatorArray = this.featureConfigService?.isLevel('6.2')
       ? [
           numberFormatValidator,
           this.configAttributeNumericInputFieldService.getIntervalValidator(
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.spec.ts
index 0f0169ecf50..180f11d939f 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.spec.ts
@@ -23,6 +23,7 @@ import { ConfiguratorAttributeInputFieldComponent } from '../input-field/configu
 import { ConfiguratorAttributeNumericInputFieldComponent } from '../numeric-input-field/configurator-attribute-numeric-input-field.component';
 import { ConfiguratorAttributeRadioButtonComponent } from './configurator-attribute-radio-button.component';
 import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
+import { Observable, of } from 'rxjs';
 
 const VALUE_NAME_2 = 'val2';
 
@@ -60,6 +61,14 @@ class MockConfiguratorAttributeQuantityComponent {
 class MockConfiguratorPriceComponent {
   @Input() formula: ConfiguratorPriceComponentOptions;
 }
+
+const isCartEntryOrGroupVisited = true;
+class MockConfigUtilsService {
+  isCartEntryOrGroupVisited(): Observable<boolean> {
+    return of(isCartEntryOrGroupVisited);
+  }
+}
+
 describe('ConfigAttributeRadioButtonComponent', () => {
   let component: ConfiguratorAttributeRadioButtonComponent;
   let htmlElem: HTMLElement;
@@ -103,6 +112,10 @@ describe('ConfigAttributeRadioButtonComponent', () => {
             provide: ConfiguratorAttributeCompositionContext,
             useValue: ConfiguratorTestUtils.getAttributeContext(),
           },
+          {
+            provide: ConfiguratorStorefrontUtilsService,
+            useClass: MockConfigUtilsService,
+          },
         ],
       })
         .overrideComponent(ConfiguratorAttributeRadioButtonComponent, {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.ts
index e7fcd1a7d4d..ba4568149c5 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/radio-button/configurator-attribute-radio-button.component.ts
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
 import { ConfiguratorAttributeCompositionContext } from '../../composition/configurator-attribute-composition.model';
 import { UntypedFormControl } from '@angular/forms';
@@ -12,6 +17,7 @@ import { TranslationService } from '@spartacus/core';
 
 import { ConfiguratorAttributeQuantityService } from '../../quantity/configurator-attribute-quantity.service';
 import { ConfiguratorAttributeSingleSelectionBaseComponent } from '../base/configurator-attribute-single-selection-base.component';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 @Component({
   selector: 'cx-configurator-attribute-radio-button',
@@ -24,17 +30,40 @@ export class ConfiguratorAttributeRadioButtonComponent
 {
   attributeRadioButtonForm = new UntypedFormControl('');
 
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
   constructor(
     protected quantityService: ConfiguratorAttributeQuantityService,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
   ) {
     super(
       quantityService,
       translation,
       attributeComponentContext,
-      configuratorCommonsService
+      configuratorCommonsService,
+      configuratorStorefrontUtilsService
     );
   }
 
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
index cb416caf1db..5badc62bd0f 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
@@ -11,45 +11,87 @@
             }
     }}
   </label>
-  <select
-    id="{{ createAttributeIdForConfigurator(attribute) }}"
-    class="form-control"
-    [formControl]="attributeDropDownForm"
-    [cxFocus]="{ key: attribute.name }"
-    (change)="onSelect(attributeDropDownForm.value)"
-    [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
-  >
-    <option
-      *ngFor="let item of attribute.values"
-      [label]="getLabel(false, item.valueDisplay, undefined, item)"
-      [selected]="item.selected"
-      [value]="item.valueCode"
-      [attr.aria-label]="
-        item.valueCode === '0'
-          ? ('configurator.a11y.forAttribute'
-            | cxTranslate
-              : { value: item.valueDisplay, attribute: attribute.label })
-          : item.valuePrice && item.valuePrice?.value !== 0
-          ? ('configurator.a11y.selectedValueOfAttributeFullWithPrice'
-            | cxTranslate
-              : {
-                  value: item.valueDisplay,
-                  attribute: attribute.label,
-                  price: item.valuePriceTotal?.formattedValue ?? 0
-                })
-          : ('configurator.a11y.selectedValueOfAttributeFull'
-            | cxTranslate
-              : { value: item.valueDisplay, attribute: attribute.label })
-      "
-      [value]="item.valueCode"
+  <ng-container *cxFeatureLevel="'!6.2'">
+    <select
+      id="{{ createAttributeIdForConfigurator(attribute) }}"
+      class="form-control"
+      [formControl]="attributeDropDownForm"
+      [cxFocus]="{ key: attribute.name }"
+      (change)="onSelect(attributeDropDownForm.value)"
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
+    >
+      <option
+        *ngFor="let item of attribute.values"
+        [label]="getLabel(false, item.valueDisplay, undefined, item)"
+        [selected]="item.selected"
+        [value]="item.valueCode"
+        [attr.aria-label]="
+          isRetractValue(item.valueCode)
+            ? ('configurator.a11y.forAttribute'
+              | cxTranslate
+                : { value: item.valueDisplay, attribute: attribute.label })
+            : item.valuePrice && item.valuePrice?.value !== 0
+            ? ('configurator.a11y.selectedValueOfAttributeFullWithPrice'
+              | cxTranslate
+                : {
+                    value: item.valueDisplay,
+                    attribute: attribute.label,
+                    price: item.valuePriceTotal?.formattedValue ?? 0
+                  })
+            : ('configurator.a11y.selectedValueOfAttributeFull'
+              | cxTranslate
+                : { value: item.valueDisplay, attribute: attribute.label })
+        "
+        [value]="item.valueCode"
+      >
+        {{ getLabel(false, item.valueDisplay, undefined, item) }}
+      </option>
+    </select>
+  </ng-container>
+  <ng-container *cxFeatureLevel="'6.2'">
+    <select
+      id="{{ createAttributeIdForConfigurator(attribute) }}"
+      class="form-control"
+      [ngClass]="{
+        'cx-required-error-msg ': (showRequiredErrorMessage$ | async)
+      }"
+      [formControl]="attributeDropDownForm"
+      [cxFocus]="{ key: attribute.name }"
+      (change)="onSelect(attributeDropDownForm.value)"
+      [attr.aria-describedby]="createAttributeUiKey('label', attribute.name)"
     >
-      {{ getLabel(false, item.valueDisplay, undefined, item) }}
-    </option>
-  </select>
+      <option
+        *ngFor="let item of attribute.values"
+        [label]="getLabel(false, item.valueDisplay, undefined, item)"
+        [selected]="item.selected"
+        [value]="item.valueCode"
+        [attr.aria-label]="
+          isRetractValue(item.valueCode)
+            ? ('configurator.a11y.forAttribute'
+              | cxTranslate
+                : { value: item.valueDisplay, attribute: attribute.label })
+            : item.valuePrice && item.valuePrice?.value !== 0
+            ? ('configurator.a11y.selectedValueOfAttributeFullWithPrice'
+              | cxTranslate
+                : {
+                    value: item.valueDisplay,
+                    attribute: attribute.label,
+                    price: item.valuePriceTotal?.formattedValue ?? 0
+                  })
+            : ('configurator.a11y.selectedValueOfAttributeFull'
+              | cxTranslate
+                : { value: item.valueDisplay, attribute: attribute.label })
+        "
+        [value]="item.valueCode"
+      >
+        {{ getLabel(false, item.valueDisplay, undefined, item) }}
+      </option>
+    </select>
+  </ng-container>
 </div>
 
 <cx-configurator-attribute-product-card
-  *ngIf="selectionValue !== undefined && selectionValue?.valueCode !== '0'"
+  *ngIf="isNotRetractValue()"
   id="{{
     createAttributeValueIdForConfigurator(attribute, selectionValue.valueCode)
   }}"
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
index a08444ff771..6dc7a4309b5 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
@@ -8,7 +8,11 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgSelectModule } from '@ng-select/ng-select';
-import { I18nTestingModule } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  FeaturesConfigModule,
+  I18nTestingModule,
+} from '@spartacus/core';
 
 import { UrlTestingModule } from 'projects/core/src/routing/configurable-routes/url-translation/testing/url-testing.module';
 import { CommonConfiguratorTestUtilsService } from '../../../../../common/testing/common-configurator-test-utils.service';
@@ -27,6 +31,10 @@ import { ConfiguratorAttributeQuantityService } from '../../quantity/configurato
 import { ConfiguratorAttributeSingleSelectionBundleDropdownComponent } from './configurator-attribute-single-selection-bundle-dropdown.component';
 import { StoreModule } from '@ngrx/store';
 import { ConfiguratorTestUtils } from '../../../../testing/configurator-test-utils';
+import { Observable, of } from 'rxjs';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
+
 const VALUE_DISPLAY_NAME = 'Lorem Ipsum Dolor';
 @Component({
   selector: 'cx-configurator-attribute-product-card',
@@ -59,6 +67,20 @@ export class MockFocusDirective {
   @Input('cxFocus') protected config: any;
 }
 
+let showRequiredErrorMessage: boolean;
+class MockConfigUtilsService {
+  isCartEntryOrGroupVisited(): Observable<boolean> {
+    return of(showRequiredErrorMessage);
+  }
+}
+
+let testVersion: string;
+class MockFeatureConfigService {
+  isLevel(version: string): boolean {
+    return version === testVersion;
+  }
+}
+
 describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
   let component: ConfiguratorAttributeSingleSelectionBundleDropdownComponent;
   let fixture: ComponentFixture<ConfiguratorAttributeSingleSelectionBundleDropdownComponent>;
@@ -67,7 +89,7 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
   const nameFake = 'nameAttribute';
   const attrCode = 1234;
   const groupId = 'theGroupId';
-  const selectedSingleValue = '0';
+  const selectedSingleValue = Configurator.RetractValueCode;
   let values: Configurator.Value[];
 
   const createImage = (url: string, altText: string): Configurator.Image => {
@@ -99,63 +121,27 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
     return value;
   };
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        declarations: [
-          ConfiguratorAttributeSingleSelectionBundleDropdownComponent,
-          ConfiguratorShowMoreComponent,
-          MockProductCardComponent,
-          MockConfiguratorAttributeQuantityComponent,
-          MockConfiguratorPriceComponent,
-          MockFocusDirective,
-        ],
-        imports: [
-          ReactiveFormsModule,
-          NgSelectModule,
-          I18nTestingModule,
-          RouterTestingModule,
-          UrlTestingModule,
-          StoreModule.forRoot({}),
-          StoreModule.forFeature(CONFIGURATOR_FEATURE, getConfiguratorReducers),
-        ],
+  function createComponentWithData(
+    releaseVersion: string,
+    isCartEntryOrGroupVisited: boolean = true
+  ): ConfiguratorAttributeSingleSelectionBundleDropdownComponent {
+    testVersion = releaseVersion;
+    showRequiredErrorMessage = isCartEntryOrGroupVisited;
 
-        providers: [
-          {
-            provide: ConfiguratorAttributeCompositionContext,
-            useValue: ConfiguratorTestUtils.getAttributeContext(),
-          },
-        ],
-      })
-        .overrideComponent(
-          ConfiguratorAttributeSingleSelectionBundleDropdownComponent,
-          {
-            set: {
-              changeDetection: ChangeDetectionStrategy.Default,
-              providers: [
-                {
-                  provide: ConfiguratorAttributeProductCardComponent,
-                  useClass: MockProductCardComponent,
-                },
-                {
-                  provide: ConfiguratorAttributeQuantityService,
-                  useClass: ConfiguratorAttributeQuantityService,
-                },
-              ],
-            },
-          }
-        )
-        .compileComponents();
-    })
-  );
-
-  beforeEach(() => {
     fixture = TestBed.createComponent(
       ConfiguratorAttributeSingleSelectionBundleDropdownComponent
     );
 
     values = [
-      createValue('', [], '', 1, true, '0', 'No Selected'),
+      createValue(
+        '',
+        [],
+        '',
+        1,
+        true,
+        Configurator.RetractValueCode,
+        'No Selected'
+      ),
       createValue(
         'Hih',
         [createImage('url', 'alt')],
@@ -206,24 +192,102 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
       groupId,
       name: nameFake,
       required: true,
+      incomplete: true,
       selectedSingleValue,
       values,
     };
 
     fixture.detectChanges();
+    return component;
+  }
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [
+          ConfiguratorAttributeSingleSelectionBundleDropdownComponent,
+          ConfiguratorShowMoreComponent,
+          MockProductCardComponent,
+          MockConfiguratorAttributeQuantityComponent,
+          MockConfiguratorPriceComponent,
+          MockFocusDirective,
+          MockFeatureLevelDirective,
+        ],
+        imports: [
+          ReactiveFormsModule,
+          NgSelectModule,
+          I18nTestingModule,
+          RouterTestingModule,
+          UrlTestingModule,
+          FeaturesConfigModule,
+          StoreModule.forRoot({}),
+          StoreModule.forFeature(CONFIGURATOR_FEATURE, getConfiguratorReducers),
+        ],
+
+        providers: [
+          {
+            provide: ConfiguratorAttributeCompositionContext,
+            useValue: ConfiguratorTestUtils.getAttributeContext(),
+          },
+          {
+            provide: ConfiguratorStorefrontUtilsService,
+            useClass: MockConfigUtilsService,
+          },
+          { provide: FeatureConfigService, useClass: MockFeatureConfigService },
+        ],
+      })
+        .overrideComponent(
+          ConfiguratorAttributeSingleSelectionBundleDropdownComponent,
+          {
+            set: {
+              changeDetection: ChangeDetectionStrategy.Default,
+              providers: [
+                {
+                  provide: ConfiguratorAttributeProductCardComponent,
+                  useClass: MockProductCardComponent,
+                },
+                {
+                  provide: ConfiguratorAttributeQuantityService,
+                  useClass: ConfiguratorAttributeQuantityService,
+                },
+              ],
+            },
+          }
+        )
+        .compileComponents();
+    })
+  );
+
+  afterEach(() => {
+    document.body.removeChild(htmlElem);
   });
 
   it('should create', () => {
-    component.ngOnInit();
+    createComponentWithData('6.2');
     expect(component).toBeTruthy();
+    CommonConfiguratorTestUtilsService.expectElementPresent(
+      expect,
+      htmlElem,
+      'select.cx-required-error-msg'
+    );
+  });
+
+  it('should render an empty component in case showRequiredErrorMessage$ is `false`', () => {
+    createComponentWithData('6.1', false).ngOnInit();
+    CommonConfiguratorTestUtilsService.expectElementNotPresent(
+      expect,
+      htmlElem,
+      'select.cx-required-error-msg'
+    );
   });
 
   it('should set selectedSingleValue on init', () => {
-    component.ngOnInit();
+    createComponentWithData('6.2').ngOnInit();
     expect(component.attributeDropDownForm.value).toEqual(selectedSingleValue);
   });
 
   it('should show product card when product selected', () => {
+    createComponentWithData('6.2');
     component.selectionValue = values[1];
     fixture.detectChanges();
 
@@ -235,6 +299,10 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
   });
 
   describe('quantity at attribute level', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2').ngOnInit();
+    });
+
     it('should display attribute quantity when dataType is with attribute quantity', () => {
       component.attribute.dataType =
         Configurator.DataType.USER_SELECTION_QTY_ATTRIBUTE_LEVEL;
@@ -317,4 +385,42 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
       });
     });
   });
+
+  describe('isNotRetractValue', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2').ngOnInit();
+    });
+
+    it('should return `true` in case value is `###RETRACT_VALUE_CODE###`', () => {
+      expect(component.isNotRetractValue()).toBe(false);
+    });
+
+    it('should return `true` in case selectionValue is `undefined`', () => {
+      component.selectionValue = undefined;
+      fixture.detectChanges();
+      expect(component.isNotRetractValue()).toBe(false);
+    });
+
+    it('should return `true` in case value is not `###RETRACT_VALUE_CODE###`', () => {
+      component.selectionValue = values[1];
+      fixture.detectChanges();
+      expect(component.isNotRetractValue()).toBe(true);
+    });
+  });
+
+  describe('isRetractValue', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2').ngOnInit();
+    });
+
+    it('should return `true` in case valueCode is `###RETRACT_VALUE_CODE###`', () => {
+      expect(component.isRetractValue(Configurator.RetractValueCode)).toBe(
+        true
+      );
+    });
+
+    it('should return `false` in case value is not `###RETRACT_VALUE_CODE###`', () => {
+      expect(component.isRetractValue('8624')).toBe(false);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
index 31133175fa9..a7612c80f47 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
 import { UntypedFormControl } from '@angular/forms';
 import { TranslationService } from '@spartacus/core';
 import { Configurator } from '../../../../core/model/configurator.model';
@@ -13,6 +18,7 @@ import { ConfiguratorAttributeProductCardComponentOptions } from '../../product-
 import { ConfiguratorAttributeQuantityService } from '../../quantity/configurator-attribute-quantity.service';
 import { ConfiguratorAttributeSingleSelectionBaseComponent } from '../base/configurator-attribute-single-selection-base.component';
 import { ConfiguratorCommonsService } from '../../../../core/facade/configurator-commons.service';
+import { ConfiguratorStorefrontUtilsService } from '../../../service/configurator-storefront-utils.service';
 
 @Component({
   selector: 'cx-configurator-attribute-single-selection-bundle-dropdown',
@@ -28,17 +34,40 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
   selectionValue: Configurator.Value;
   group: string;
 
+  // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    configuratorStorefrontUtilsService: ConfiguratorStorefrontUtilsService
+  );
+
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    quantityService: ConfiguratorAttributeQuantityService,
+    translation: TranslationService,
+    attributeComponentContext: ConfiguratorAttributeCompositionContext,
+    configuratorCommonsService: ConfiguratorCommonsService
+  );
+
   constructor(
     protected quantityService: ConfiguratorAttributeQuantityService,
     protected translation: TranslationService,
     protected attributeComponentContext: ConfiguratorAttributeCompositionContext,
-    protected configuratorCommonsService: ConfiguratorCommonsService
+    protected configuratorCommonsService: ConfiguratorCommonsService,
+    @Optional()
+    protected configuratorStorefrontUtilsService?: ConfiguratorStorefrontUtilsService
   ) {
     super(
       quantityService,
       translation,
       attributeComponentContext,
-      configuratorCommonsService
+      configuratorCommonsService,
+      configuratorStorefrontUtilsService
     );
 
     this.group = attributeComponentContext.group.id;
@@ -74,4 +103,28 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
       itemIndex: 0,
     };
   }
+
+  // TODO: CXSPA-3720
+  /**
+   * Verifies whether a selection value is defined and its value code is not a retract one.
+   *
+   * @returns {boolean} - 'True' if a selection value is defined and its value code is not a retract one, otherwise 'false'.
+   */
+  isNotRetractValue(): boolean {
+    return (
+      (this.selectionValue &&
+        this.selectionValue?.valueCode !== Configurator.RetractValueCode) ??
+      false
+    );
+  }
+
+  /**
+   * Verifies whether a value code is a retract one.
+   *
+   * @param {string} valueCode - Value code
+   * @returns {boolean} - 'True' if a value code is a retract one, otherwise 'false'.
+   */
+  isRetractValue(valueCode: string): boolean {
+    return valueCode === Configurator.RetractValueCode;
+  }
 }
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.module.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.module.ts
index d40d0e20cb5..98aff9dec1b 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.module.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.module.ts
@@ -7,7 +7,11 @@
 import { CommonModule } from '@angular/common';
 import { ConfiguratorAttributeSingleSelectionBundleDropdownComponent } from './configurator-attribute-single-selection-bundle-dropdown.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { KeyboardFocusModule } from '@spartacus/storefront';
 import { NgModule } from '@angular/core';
 import { NgSelectModule } from '@ng-select/ng-select';
@@ -27,6 +31,7 @@ import { ConfiguratorAttributeCompositionConfig } from '../../composition/config
     ReactiveFormsModule,
     ConfiguratorAttributeQuantityModule,
     ConfiguratorPriceModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<ConfiguratorAttributeCompositionConfig>{
diff --git a/feature-libs/product-configurator/rulebased/core/model/configurator.model.ts b/feature-libs/product-configurator/rulebased/core/model/configurator.model.ts
index ffbe0741b5d..43dd2a6b98c 100644
--- a/feature-libs/product-configurator/rulebased/core/model/configurator.model.ts
+++ b/feature-libs/product-configurator/rulebased/core/model/configurator.model.ts
@@ -281,4 +281,5 @@ export namespace Configurator {
   export const ConflictIdPrefix = 'CONFLICT';
   export const ConflictHeaderId = 'CONFLICT_HEADER';
   export const CustomUiTypeIndicator = '___';
+  export const RetractValueCode = '###RETRACT_VALUE_CODE###';
 }
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
index 0023a9a2261..b43464fcdde 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
@@ -404,6 +404,22 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(mappedConfiguration.pricingEnabled).toBe(true);
     });
   });
+
+  describe('convertValueCode', () => {
+    it('should return `###RETRACT_VALUE_CODE###` in case value code is zero', () => {
+      expect(cpqConfiguratorNormalizer['convertValueCode'](0)).toEqual(
+        Configurator.RetractValueCode
+      );
+    });
+
+    it('should return string of value code in case not zero', () => {
+      const pav_ID = 8462;
+      expect(cpqConfiguratorNormalizer['convertValueCode'](pav_ID)).toEqual(
+        pav_ID.toString()
+      );
+    });
+  });
+
   describe('convertValue', () => {
     it('should convert values', () => {
       const cpqAttr: Cpq.Attribute = {
@@ -431,7 +447,7 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(value.quantity).toBe(3);
     });
 
-    it('should map prices during value convertion', () => {
+    it('should map prices during value conversion', () => {
       const cpqAttr: Cpq.Attribute = {
         pA_ID: 1,
         stdAttrCode: 2,
@@ -498,7 +514,7 @@ describe('CpqConfiguratorNormalizer', () => {
         values
       );
       expect(values.length).toBe(1);
-      expect(values[0].valueCode).toBe('0');
+      expect(values[0].valueCode).toBe(Configurator.RetractValueCode);
     });
   });
 
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
index 4fac683417a..e0c5ce76172 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
@@ -235,6 +235,12 @@ export class CpqConfiguratorNormalizer
     }
   }
 
+  protected convertValueCode(valueCode: number): string {
+    return valueCode === 0
+      ? Configurator.RetractValueCode
+      : valueCode.toString();
+  }
+
   protected convertValue(
     sourceValue: Cpq.Value,
     sourceAttribute: Cpq.Attribute,
@@ -245,7 +251,7 @@ export class CpqConfiguratorNormalizer
       return;
     }
     const value: Configurator.Value = {
-      valueCode: sourceValue.paV_ID.toString(),
+      valueCode: this.convertValueCode(sourceValue.paV_ID),
       name: sourceValue.valueCode,
       description: sourceValue.description,
       productSystemId: sourceValue.productSystemId,
@@ -357,7 +363,7 @@ export class CpqConfiguratorNormalizer
       case Configurator.UiType.SINGLE_SELECTION_IMAGE: {
         if (
           !attribute.selectedSingleValue ||
-          attribute.selectedSingleValue === '0'
+          attribute.selectedSingleValue === Configurator.RetractValueCode
         ) {
           attribute.incomplete = true;
         }
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts
index 80fe1a6f26b..5053a1eed2b 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts
@@ -18,6 +18,7 @@ const userInput = '123';
 const expectedValueIdsMulti = 'ValueCode1,ValueCode3,';
 const expectedValueIdsMultiNoSelection = ',';
 const expectedProcessedSingleValueNoValue = ',';
+const expectedProcessedSingleValueRetractValue = '0';
 const firstGroupId = '1';
 
 const firstAttribute: Configurator.Attribute = {
@@ -238,6 +239,27 @@ describe('CpqConfiguratorSerializer', () => {
     });
   });
 
+  describe('processValueCode', () => {
+    it('should return `undefined` valueCode', () => {
+      expect(cpqConfiguratorSerializer['processValueCode']()).toBeUndefined();
+    });
+
+    it('should return `0` in case valueCode is `###RETRACT_VALUE_CODE###`', () => {
+      expect(
+        cpqConfiguratorSerializer['processValueCode'](
+          Configurator.RetractValueCode
+        )
+      ).toEqual(expectedProcessedSingleValueRetractValue);
+    });
+
+    it('should return valueCode', () => {
+      const valueCode = '8624';
+      expect(cpqConfiguratorSerializer['processValueCode'](valueCode)).toEqual(
+        valueCode
+      );
+    });
+  });
+
   describe('multi selection types', () => {
     it('should convert checkbox', () => {
       verifyUpdateAttributeMultiValue(
@@ -307,6 +329,13 @@ describe('CpqConfiguratorSerializer', () => {
     expect(processedValue).toBe(expectedProcessedSingleValueNoValue);
   });
 
+  it('should process single selected value correctly when `###RETRACT_VALUE_CODE###` is selected', () => {
+    const singleValue = Configurator.RetractValueCode;
+    const processedValue: string =
+      cpqConfiguratorSerializer['processSelectedSingleValue'](singleValue);
+    expect(processedValue).toBe('0');
+  });
+
   it('should prepare value ids correctly', () => {
     const valueIds: string =
       cpqConfiguratorSerializer['prepareValueIds'](attributeCBList);
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts
index 2135caedb1c..87612a04457 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts
@@ -86,8 +86,14 @@ export class CpqConfiguratorSerializer
     return updateAttribute;
   }
 
+  protected processValueCode(valueCode?: string): string | undefined {
+    return valueCode && valueCode === Configurator.RetractValueCode
+      ? '0'
+      : valueCode;
+  }
+
   protected processSelectedSingleValue(singleValue?: string): string {
-    let processedValue = singleValue;
+    let processedValue = this.processValueCode(singleValue);
     if (!processedValue) {
       // Is required to remove the value
       processedValue = VALUE_SEPARATOR;
diff --git a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.spec.ts b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.spec.ts
index b1b47bd4010..b4eded07007 100644
--- a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.spec.ts
@@ -1039,8 +1039,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
     });
 
     it('should set incomplete for radio button type with retract option correctly', () => {
-      attributeRBWithValues.selectedSingleValue =
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE;
+      attributeRBWithValues.selectedSingleValue = Configurator.RetractValueCode;
       occConfiguratorVariantNormalizer.compileAttributeIncomplete(
         attributeRBWithValues
       );
@@ -1061,8 +1060,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
     });
 
     it('should set incomplete for drop-down type with retract option correctly', () => {
-      attributeDDWithValues.selectedSingleValue =
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE;
+      attributeDDWithValues.selectedSingleValue = Configurator.RetractValueCode;
       occConfiguratorVariantNormalizer.compileAttributeIncomplete(
         attributeDDWithValues
       );
@@ -1325,9 +1323,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
         values
       );
       expect(values.length).toEqual(1);
-      expect(values[0].valueCode).toEqual(
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
-      );
+      expect(values[0].valueCode).toEqual(Configurator.RetractValueCode);
       expect(values[0].valueDisplay).toEqual(
         'configurator.attribute.dropDownSelectMsg'
       );
@@ -1346,9 +1342,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
         values
       );
       expect(values.length).toEqual(1);
-      expect(values[0].valueCode).toEqual(
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
-      );
+      expect(values[0].valueCode).toEqual(Configurator.RetractValueCode);
       expect(values[0].valueDisplay).toEqual(
         'configurator.attribute.noOptionSelectedMsg'
       );
@@ -1412,9 +1406,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
         values
       );
       expect(values.length).toEqual(1);
-      expect(values[0].valueCode).toEqual(
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
-      );
+      expect(values[0].valueCode).toEqual(Configurator.RetractValueCode);
       expect(values[0].valueDisplay).toEqual(
         'configurator.attribute.dropDownSelectMsg'
       );
@@ -1449,9 +1441,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
         values
       );
       expect(values.length).toEqual(1);
-      expect(values[0].valueCode).toEqual(
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
-      );
+      expect(values[0].valueCode).toEqual(Configurator.RetractValueCode);
       expect(values[0].valueDisplay).toEqual(
         'configurator.attribute.noOptionSelectedMsg'
       );
@@ -1486,9 +1476,7 @@ describe('OccConfiguratorVariantNormalizer', () => {
         values
       );
       expect(values.length).toEqual(1);
-      expect(values[0].valueCode).toEqual(
-        OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
-      );
+      expect(values[0].valueCode).toEqual(Configurator.RetractValueCode);
       expect(values[0].valueDisplay).toEqual(
         'configurator.attribute.noOptionSelectedMsg'
       );
diff --git a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.ts b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.ts
index 53b5ae66805..9f490b661c5 100644
--- a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.ts
+++ b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-normalizer.ts
@@ -17,6 +17,9 @@ export class OccConfiguratorVariantNormalizer
   implements
     Converter<OccConfigurator.Configuration, Configurator.Configuration>
 {
+  /**
+   * @deprecated since 6.2
+   */
   static readonly RETRACT_VALUE_CODE = '###RETRACT_VALUE_CODE###';
 
   constructor(
@@ -245,7 +248,7 @@ export class OccConfiguratorVariantNormalizer
           attributeType === Configurator.UiType.DROPDOWN
         ) {
           const value: Configurator.Value = {
-            valueCode: OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE,
+            valueCode: Configurator.RetractValueCode,
             selected: this.isRetractValueSelected(sourceAttribute),
           };
 
@@ -457,8 +460,7 @@ export class OccConfiguratorVariantNormalizer
       case Configurator.UiType.DROPDOWN: {
         if (
           !attribute.selectedSingleValue ||
-          attribute.selectedSingleValue ===
-            OccConfiguratorVariantNormalizer.RETRACT_VALUE_CODE
+          attribute.selectedSingleValue === Configurator.RetractValueCode
         ) {
           attribute.incomplete = true;
         }
diff --git a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-serializer.ts b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-serializer.ts
index 32e54d41ba1..60bc83a6c9f 100644
--- a/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-serializer.ts
+++ b/feature-libs/product-configurator/rulebased/occ/variant/converters/occ-configurator-variant-serializer.ts
@@ -14,6 +14,9 @@ export class OccConfiguratorVariantSerializer
   implements
     Converter<Configurator.Configuration, OccConfigurator.Configuration>
 {
+  /**
+   * @deprecated since 6.2
+   */
   static readonly RETRACT_VALUE_CODE = '###RETRACT_VALUE_CODE###';
 
   convert(
@@ -65,10 +68,7 @@ export class OccConfiguratorVariantSerializer
   }
 
   protected isRetractValue(attribute: Configurator.Attribute): boolean {
-    return (
-      attribute.selectedSingleValue ===
-      OccConfiguratorVariantSerializer.RETRACT_VALUE_CODE
-    );
+    return attribute.selectedSingleValue === Configurator.RetractValueCode;
   }
 
   protected getRetractedValue(
diff --git a/feature-libs/product-configurator/rulebased/styles/mixins/_configurator-form-group.scss b/feature-libs/product-configurator/rulebased/styles/mixins/_configurator-form-group.scss
index bf8c4518271..87b53e289d6 100644
--- a/feature-libs/product-configurator/rulebased/styles/mixins/_configurator-form-group.scss
+++ b/feature-libs/product-configurator/rulebased/styles/mixins/_configurator-form-group.scss
@@ -8,6 +8,10 @@
     margin-block-start: 0.5rem;
     margin-block-end: 0.5rem;
 
+    .cx-required-error-msg {
+      border-color: var(--cx-color-danger);
+    }
+
     @include media-breakpoint-up(md) {
       select {
         width: 80%;

From 60d7251dafc3a6267f6f94a162e8b3408b92ee1c Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Thu, 15 Jun 2023 12:15:10 +0200
Subject: [PATCH 036/122] test: Fix failing CPQ cypress test (#17523)

Fis failing CPQ cypress test

Closes CXSPA-3743
---
 .../e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts       | 2 +-
 .../cypress/helpers/product-configurator.ts               | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
index 42f04aa94aa..c4c0698173a 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
@@ -71,7 +71,7 @@ const VAL_CAM_PROF_Y = '8953';
 /** Insurance */
 const ATTR_CAM_INS = '2899';
 /** No Option Selcted */
-const VAL_NO_OPT_SEL = '0';
+const VAL_NO_OPT_SEL = '###RETRACT_VALUE_CODE###';
 /** Insurance Select 2 years */
 const VAL_CB_INS_Y2 = '8735';
 /** Insurance Pro 4 years */
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
index 9b8bdd932d0..89e41540429 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
@@ -367,9 +367,11 @@ export function checkValueSelected(
     );
   } else {
     if (uiType === 'dropdownProduct') {
-      if (valueName === '0') {
-        // no product card for 'no option selected'
-        cy.get(`#${valueId} .cx-product-card`).should('not.exist');
+      if (valueName.includes('RETRACT_VALUE_CODE')) {
+        // No product card for 'No option selected'
+        // The RETRACT_VALUE_CODE constant contains special sing, namely `#`, that should be masked accordingly `\\#`
+        const newValueId = valueId.replaceAll('#', '\\#');
+        cy.get(`#${newValueId} .cx-product-card`).should('not.exist');
       } else {
         cy.get(`#${valueId} .cx-product-card`).should('be.visible');
       }

From ed545c67cbf1fb02a72f99fa5f1af4ab12341b4f Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:10:59 +0200
Subject: [PATCH 037/122] refactor: (CXSPA-3720) better error handling for CPQ
 selection value (#17526)

---
 ...e-selection-bundle-dropdown.component.html |  4 ++--
 ...election-bundle-dropdown.component.spec.ts | 11 ++++++++++
 ...gle-selection-bundle-dropdown.component.ts | 21 ++++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
index 5badc62bd0f..d3940546ca0 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.html
@@ -93,9 +93,9 @@
 <cx-configurator-attribute-product-card
   *ngIf="isNotRetractValue()"
   id="{{
-    createAttributeValueIdForConfigurator(attribute, selectionValue.valueCode)
+    createAttributeValueIdForConfigurator(attribute, selectedValue.valueCode)
   }}"
-  (handleDeselect)="onSelect('0')"
+  (handleDeselect)="onSelect(RETRACT_VALUE_CODE)"
   [productCardOptions]="extractProductCardParameters()"
 >
 </cx-configurator-attribute-product-card>
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
index 6dc7a4309b5..6b4564280ed 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.spec.ts
@@ -423,4 +423,15 @@ describe('ConfiguratorAttributeSingleSelectionBundleDropdownComponent', () => {
       expect(component.isRetractValue('8624')).toBe(false);
     });
   });
+
+  describe('selectedValue', () => {
+    beforeEach(() => {
+      createComponentWithData('6.2').ngOnInit();
+    });
+
+    it('should throw error in case no selection has been made', () => {
+      component.selectionValue = undefined;
+      expect(() => component.selectedValue).toThrow();
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
index a7612c80f47..5d32a4ba5ed 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/single-selection-bundle-dropdown/configurator-attribute-single-selection-bundle-dropdown.component.ts
@@ -30,8 +30,9 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
   extends ConfiguratorAttributeSingleSelectionBaseComponent
   implements OnInit
 {
+  readonly RETRACT_VALUE_CODE = Configurator.RetractValueCode;
   attributeDropDownForm = new UntypedFormControl('');
-  selectionValue: Configurator.Value;
+  selectionValue?: Configurator.Value;
   group: string;
 
   // TODO (CXSPA-3392): make ConfiguratorStorefrontUtilsService a required dependency
@@ -84,6 +85,21 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
       }
     }
   }
+  /**
+   * Returns selected value. We assume that when this method is called,
+   * a selection has been made before. In case this assumption is false,
+   * an error is thrown
+   * @returns selected value
+   */
+  get selectedValue(): Configurator.Value {
+    let selectedValue: Configurator.Value;
+    if (this.selectionValue) {
+      selectedValue = this.selectionValue;
+    } else {
+      throw new Error('selectedValue called without a defined selectionValue');
+    }
+    return selectedValue;
+  }
 
   /**
    * Extract corresponding product card parameters
@@ -93,7 +109,7 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
   extractProductCardParameters(): ConfiguratorAttributeProductCardComponentOptions {
     return {
       hideRemoveButton: true,
-      productBoundValue: this.selectionValue,
+      productBoundValue: this.selectedValue,
       singleDropdown: true,
       withQuantity: false,
       loading$: this.loading$,
@@ -104,7 +120,6 @@ export class ConfiguratorAttributeSingleSelectionBundleDropdownComponent
     };
   }
 
-  // TODO: CXSPA-3720
   /**
    * Verifies whether a selection value is defined and its value code is not a retract one.
    *

From 4396379669c9448ad275fde744c58f8d501ac529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Thu, 15 Jun 2023 16:29:35 +0200
Subject: [PATCH 038/122] chore: Fix for failing CDS unit tests (#17528)

---
 .../services/profiletag-event.service.spec.ts | 409 +++++++++---------
 1 file changed, 208 insertions(+), 201 deletions(-)

diff --git a/integration-libs/cds/src/profiletag/services/profiletag-event.service.spec.ts b/integration-libs/cds/src/profiletag/services/profiletag-event.service.spec.ts
index 21af12e33bc..2a69bd44eff 100644
--- a/integration-libs/cds/src/profiletag/services/profiletag-event.service.spec.ts
+++ b/integration-libs/cds/src/profiletag/services/profiletag-event.service.spec.ts
@@ -68,225 +68,232 @@ describe('ProfileTagEventTracker', () => {
       getActive: () => getActiveBehavior,
     };
   }
-  beforeEach(() => {
-    setVariables();
-    TestBed.configureTestingModule({
-      providers: [
-        { provide: CdsConfig, useValue: mockCDSConfig },
-        { provide: WindowRef, useValue: mockedWindowRef },
-        { provide: BaseSiteService, useValue: baseSiteService },
-        { provide: PLATFORM_ID, useValue: 'browser' },
-      ],
+
+  describe('no local storage called', () => {
+    beforeEach(() => {
+      setVariables();
+      TestBed.configureTestingModule({
+        providers: [
+          { provide: CdsConfig, useValue: mockCDSConfig },
+          { provide: WindowRef, useValue: mockedWindowRef },
+          { provide: BaseSiteService, useValue: baseSiteService },
+          { provide: PLATFORM_ID, useValue: 'browser' },
+        ],
+      });
+      profileTagEventTracker = TestBed.inject(ProfileTagEventService);
+      nativeWindow = TestBed.inject(WindowRef)
+        .nativeWindow as ProfileTagWindowObject;
     });
-    profileTagEventTracker = TestBed.inject(ProfileTagEventService);
-    nativeWindow = TestBed.inject(WindowRef)
-      .nativeWindow as ProfileTagWindowObject;
-  });
 
-  it('should be created', () => {
-    expect(profileTagEventTracker).toBeTruthy();
-  });
+    it('should be created', () => {
+      expect(profileTagEventTracker).toBeTruthy();
+    });
 
-  it('Should first wait for the basesite to be active before adding config parameters to the q array', () => {
-    expect(appendChildSpy).not.toHaveBeenCalled();
-    expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
-    expect(nativeWindow.Y_TRACKING.q).not.toBeDefined();
-  });
+    it('Should first wait for the basesite to be active before adding config parameters to the q array', () => {
+      expect(appendChildSpy).not.toHaveBeenCalled();
+      expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
+      expect(nativeWindow.Y_TRACKING.q).not.toBeDefined();
+    });
+
+    it(`Should add config parameters to the q array after the base site is active`, () => {
+      const profileTagLoaded$ = profileTagEventTracker.addTracker();
+      const subscription = profileTagLoaded$.subscribe();
+      const baseSite = 'electronics-test';
+      getActiveBehavior.next(baseSite);
+      subscription.unsubscribe();
 
-  it(`Should add config parameters to the q array after the base site is active`, () => {
-    const profileTagLoaded$ = profileTagEventTracker.addTracker();
-    const subscription = profileTagLoaded$.subscribe();
-    const baseSite = 'electronics-test';
-    getActiveBehavior.next(baseSite);
-    subscription.unsubscribe();
-
-    expect(nativeWindow.Y_TRACKING.q[0][0]).toEqual({
-      ...mockCDSConfig.cds.profileTag,
-      tenant: mockCDSConfig.cds.tenant,
-      siteId: baseSite,
-      spa: true,
+      expect(nativeWindow.Y_TRACKING.q[0][0]).toEqual({
+        ...mockCDSConfig.cds.profileTag,
+        tenant: mockCDSConfig.cds.tenant,
+        siteId: baseSite,
+        spa: true,
+      });
+      expect(appendChildSpy).toHaveBeenCalled();
+      expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
     });
-    expect(appendChildSpy).toHaveBeenCalled();
-    expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
-  });
 
-  it(`Should not add config parameters to the q array if PT is already loaded`, () => {
-    const profileTagLoaded$ = profileTagEventTracker.addTracker();
-    let subscription = profileTagLoaded$.subscribe();
-    const baseSite = 'electronics-test';
-    getActiveBehavior.next(baseSite);
-    subscription.unsubscribe();
-
-    expect(nativeWindow.Y_TRACKING.q[0][0]).toEqual({
-      ...mockCDSConfig.cds.profileTag,
-      tenant: mockCDSConfig.cds.tenant,
-      siteId: baseSite,
-      spa: true,
+    it(`Should not add config parameters to the q array if PT is already loaded`, () => {
+      const profileTagLoaded$ = profileTagEventTracker.addTracker();
+      let subscription = profileTagLoaded$.subscribe();
+      const baseSite = 'electronics-test';
+      getActiveBehavior.next(baseSite);
+      subscription.unsubscribe();
+
+      expect(nativeWindow.Y_TRACKING.q[0][0]).toEqual({
+        ...mockCDSConfig.cds.profileTag,
+        tenant: mockCDSConfig.cds.tenant,
+        siteId: baseSite,
+        spa: true,
+      });
+      expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
+
+      // reset the mock correctly so that the existing script is detected
+      spyOn(mockedWindowRef.document, 'querySelector').and.returnValue(
+        {} as Element
+      );
+      // retrigger profile-tag
+      subscription = profileTagLoaded$.subscribe();
+      subscription.unsubscribe();
+      expect(appendChildSpy).toHaveBeenCalledTimes(1);
+      expect(nativeWindow.Y_TRACKING.q[0].length).toEqual(1);
     });
-    expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
-
-    // reset the mock correctly so that the existing script is detected
-    spyOn(mockedWindowRef.document, 'querySelector').and.returnValue(
-      {} as Element
-    );
-    // retrigger profile-tag
-    subscription = profileTagLoaded$.subscribe();
-    subscription.unsubscribe();
-    expect(appendChildSpy).toHaveBeenCalledTimes(1);
-    expect(nativeWindow.Y_TRACKING.q[0].length).toEqual(1);
-  });
 
-  it(`Should not call the push method if the event receiver callback hasn't been called`, () => {
-    const profileTagLoaded$ = profileTagEventTracker.addTracker();
-    const subscription = profileTagLoaded$.subscribe();
-    getActiveBehavior.next('electronics-test');
-    getConsentBehavior.next({ consent: 'test' });
-    subscription.unsubscribe();
+    it(`Should not call the push method if the event receiver callback hasn't been called`, () => {
+      const profileTagLoaded$ = profileTagEventTracker.addTracker();
+      const subscription = profileTagLoaded$.subscribe();
+      getActiveBehavior.next('electronics-test');
+      getConsentBehavior.next({ consent: 'test' });
+      subscription.unsubscribe();
 
-    expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
-  });
+      expect(nativeWindow.Y_TRACKING.eventLayer.push).not.toHaveBeenCalled();
+    });
 
-  it(`Should call the pageLoaded method if the site is active even when the event receiver callback
+    it(`Should call the pageLoaded method if the site is active even when the event receiver callback
    has not been called with loaded`, () => {
-    let loaded = 0;
-    const subscription = profileTagEventTracker
-      .addTracker()
-      .pipe(tap(() => loaded++))
-      .subscribe();
-    getActiveBehavior.next('electronics-test');
-    subscription.unsubscribe();
-
-    expect(loaded).toEqual(1);
-  });
+      let loaded = 0;
+      const subscription = profileTagEventTracker
+        .addTracker()
+        .pipe(tap(() => loaded++))
+        .subscribe();
+      getActiveBehavior.next('electronics-test');
+      subscription.unsubscribe();
 
-  it(`Should call the debugChanged method when profileTagDebug value changes`, () => {
-    let timesCalled = 0;
-    const subscription = profileTagEventTracker
-      .getProfileTagEvents()
-      .pipe(tap(() => timesCalled++))
-      .subscribe();
-
-    const debugEvent = <DebugEvent>(
-      new CustomEvent(InternalProfileTagEventNames.DEBUG_FLAG_CHANGED, {
-        detail: { debug: true },
-      })
-    );
-    eventListener[InternalProfileTagEventNames.DEBUG_FLAG_CHANGED](debugEvent);
-    subscription.unsubscribe();
-
-    expect(timesCalled).toEqual(1);
-  });
+      expect(loaded).toEqual(1);
+    });
 
-  it(`Should call the consentReferenceChanged method when consentReference value changes`, () => {
-    let timesCalled = 0;
-    const subscription = profileTagEventTracker
-      .getProfileTagEvents()
-      .pipe(tap(() => timesCalled++))
-      .subscribe();
-
-    let consentReferenceChangedEvent = <ConsentReferenceEvent>(
-      new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
-        detail: { consentReference: 'some_id' },
-      })
-    );
-    eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
-      consentReferenceChangedEvent
-    );
-
-    consentReferenceChangedEvent = <ConsentReferenceEvent>(
-      new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
-        detail: { consentReference: 'another_id' },
-      })
-    );
-    eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
-      consentReferenceChangedEvent
-    );
-    subscription.unsubscribe();
-
-    expect(timesCalled).toEqual(2);
-  });
+    it(`Should call the debugChanged method when profileTagDebug value changes`, () => {
+      let timesCalled = 0;
+      const subscription = profileTagEventTracker
+        .getProfileTagEvents()
+        .pipe(tap(() => timesCalled++))
+        .subscribe();
 
-  it('Should give the lastest consent reference to late subscribers', () => {
-    let cr1 = null;
-    let cr2 = null;
-    let cr3 = null;
-    const subscription1CR = profileTagEventTracker
-      .getConsentReference()
-      .subscribe((cr) => (cr1 = cr));
-    const consentReferenceChangedEvent = <ConsentReferenceEvent>(
-      new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
-        detail: { consentReference: 'some_id' },
-      })
-    );
-    eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
-      consentReferenceChangedEvent
-    );
-    const subscription2CR = profileTagEventTracker
-      .getConsentReference()
-      .subscribe((cr) => (cr2 = cr));
-    const subscription3CR = profileTagEventTracker
-      .getConsentReference()
-      .subscribe((cr) => (cr3 = cr));
-    subscription1CR.unsubscribe();
-    subscription2CR.unsubscribe();
-    subscription3CR.unsubscribe();
-    expect(cr1).toEqual(cr2);
-    expect(cr3).toEqual(cr2);
-    expect(cr1).toEqual('some_id');
-  });
+      const debugEvent = <DebugEvent>(
+        new CustomEvent(InternalProfileTagEventNames.DEBUG_FLAG_CHANGED, {
+          detail: { debug: true },
+        })
+      );
+      eventListener[InternalProfileTagEventNames.DEBUG_FLAG_CHANGED](
+        debugEvent
+      );
+      subscription.unsubscribe();
 
-  it('Should load consent-reference from local storage on page refresh', () => {
-    spyOn(window.localStorage, 'getItem').and.returnValue(
-      '{"cr":{"electronics-test-consentReference":{"consentReference": "abc"}}}'
-    );
-    profileTagEventTracker = new ProfileTagEventService(
-      mockedWindowRef,
-      mockCDSConfig,
-      baseSiteService,
-      ''
-    );
-    expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
-    expect(profileTagEventTracker.latestConsentReference.value).toEqual('abc');
-  });
+      expect(timesCalled).toEqual(1);
+    });
 
-  it('Should not load consent-reference from local storage on page refresh if consent is not granted', () => {
-    spyOn(window.localStorage, 'getItem').and.returnValue(undefined);
-    profileTagEventTracker = new ProfileTagEventService(
-      mockedWindowRef,
-      mockCDSConfig,
-      baseSiteService,
-      ''
-    );
-    expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
-    expect(
-      profileTagEventTracker.latestConsentReference.value
-    ).not.toBeDefined();
-  });
+    it(`Should call the consentReferenceChanged method when consentReference value changes`, () => {
+      let timesCalled = 0;
+      const subscription = profileTagEventTracker
+        .getProfileTagEvents()
+        .pipe(tap(() => timesCalled++))
+        .subscribe();
+
+      let consentReferenceChangedEvent = <ConsentReferenceEvent>(
+        new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
+          detail: { consentReference: 'some_id' },
+        })
+      );
+      eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
+        consentReferenceChangedEvent
+      );
+
+      consentReferenceChangedEvent = <ConsentReferenceEvent>(
+        new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
+          detail: { consentReference: 'another_id' },
+        })
+      );
+      eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
+        consentReferenceChangedEvent
+      );
+      subscription.unsubscribe();
+
+      expect(timesCalled).toEqual(2);
+    });
 
-  it('Should not load consent-reference from local storage on page refresh if consent is not granted for this base-site', () => {
-    spyOn(window.localStorage, 'getItem').and.returnValue(
-      '{"cr":{"electronics-x-consentReference":{"consentReference": "abc"}}}'
-    );
-    profileTagEventTracker = new ProfileTagEventService(
-      mockedWindowRef,
-      mockCDSConfig,
-      baseSiteService,
-      ''
-    );
-    expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
-    expect(
-      profileTagEventTracker.latestConsentReference.value
-    ).not.toBeDefined();
+    it('Should give the lastest consent reference to late subscribers', () => {
+      let cr1 = null;
+      let cr2 = null;
+      let cr3 = null;
+      const subscription1CR = profileTagEventTracker
+        .getConsentReference()
+        .subscribe((cr) => (cr1 = cr));
+      const consentReferenceChangedEvent = <ConsentReferenceEvent>(
+        new CustomEvent(InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED, {
+          detail: { consentReference: 'some_id' },
+        })
+      );
+      eventListener[InternalProfileTagEventNames.CONSENT_REFERENCE_LOADED](
+        consentReferenceChangedEvent
+      );
+      const subscription2CR = profileTagEventTracker
+        .getConsentReference()
+        .subscribe((cr) => (cr2 = cr));
+      const subscription3CR = profileTagEventTracker
+        .getConsentReference()
+        .subscribe((cr) => (cr3 = cr));
+      subscription1CR.unsubscribe();
+      subscription2CR.unsubscribe();
+      subscription3CR.unsubscribe();
+      expect(cr1).toEqual(cr2);
+      expect(cr3).toEqual(cr2);
+      expect(cr1).toEqual('some_id');
+    });
   });
 
-  it('Should not load consent-reference from local storage, if running in SSR mode', () => {
-    mockedWindowRef.isBrowser = () => false;
-    profileTagEventTracker = new ProfileTagEventService(
-      mockedWindowRef,
-      mockCDSConfig,
-      baseSiteService,
-      ''
-    );
-    expect(profileTagEventTracker.latestConsentReference).toBeUndefined();
+  describe('getting consent-reference from local storage', () => {
+    beforeEach(() => {
+      setVariables();
+      TestBed.configureTestingModule({
+        providers: [
+          { provide: CdsConfig, useValue: mockCDSConfig },
+          { provide: WindowRef, useValue: mockedWindowRef },
+          { provide: BaseSiteService, useValue: baseSiteService },
+          { provide: PLATFORM_ID, useValue: '' },
+        ],
+      });
+      nativeWindow = TestBed.inject(WindowRef)
+        .nativeWindow as ProfileTagWindowObject;
+    });
+
+    it('Should load consent-reference from local storage on page refresh', () => {
+      spyOn(window.localStorage, 'getItem').and.returnValue(
+        '{"cr":{"electronics-test-consentReference":{"consentReference": "abc"}}}'
+      );
+      profileTagEventTracker = TestBed.inject(ProfileTagEventService);
+
+      expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
+      expect(profileTagEventTracker.latestConsentReference.value).toEqual(
+        'abc'
+      );
+    });
+
+    it('Should not load consent-reference from local storage on page refresh if consent is not granted', () => {
+      spyOn(window.localStorage, 'getItem').and.returnValue(undefined);
+      profileTagEventTracker = TestBed.inject(ProfileTagEventService);
+
+      expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
+      expect(
+        profileTagEventTracker.latestConsentReference.value
+      ).not.toBeDefined();
+    });
+
+    it('Should not load consent-reference from local storage on page refresh if consent is not granted for this base-site', () => {
+      spyOn(window.localStorage, 'getItem').and.returnValue(
+        '{"cr":{"electronics-x-consentReference":{"consentReference": "abc"}}}'
+      );
+      profileTagEventTracker = TestBed.inject(ProfileTagEventService);
+
+      expect(window.localStorage.getItem).toHaveBeenCalledTimes(1);
+      expect(
+        profileTagEventTracker.latestConsentReference.value
+      ).not.toBeDefined();
+    });
+
+    it('Should not load consent-reference from local storage, if running in SSR mode', () => {
+      mockedWindowRef.isBrowser = () => false;
+      profileTagEventTracker = TestBed.inject(ProfileTagEventService);
+
+      expect(profileTagEventTracker.latestConsentReference).toBeUndefined();
+    });
   });
 });

From 02f8f56d3f2780b86d375ed331942269a56bed64 Mon Sep 17 00:00:00 2001
From: Scar Ai <38693320+scarai-sap@users.noreply.github.com>
Date: Fri, 16 Jun 2023 00:27:23 +0800
Subject: [PATCH 039/122] chore: Add team holidays as code owner for user lib

---
 .github/CODEOWNERS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c4e5d60827f..79c67f4e2e3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,6 +50,11 @@
 # ================================================
 /feature-libs/asm/          @SAP/spartacus-codeowners @SAP/spartacus-holidays
 
+# ================================================
+#  User domain
+# ================================================
+/feature-libs/user/          @SAP/spartacus-codeowners @SAP/spartacus-holidays
+
 # ================================================
 #  Product Configurator and CPQ integration
 # ================================================

From 684c98b60a2ae2823bba42efb3d1c0081c9853c8 Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Thu, 15 Jun 2023 23:00:10 +0530
Subject: [PATCH 040/122] Feature/cxint 2019 - cdc b2c consent management
 (#17497)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 core-libs/setup/tsconfig.spec.json            |   1 +
 feature-libs/asm/tsconfig.schematics.json     |   1 +
 feature-libs/cart/tsconfig.schematics.json    |   1 +
 .../checkout/tsconfig.schematics.json         |   1 +
 .../tsconfig.schematics.json                  |   1 +
 feature-libs/order/tsconfig.schematics.json   |   1 +
 .../organization/tsconfig.schematics.json     |   1 +
 .../pickup-in-store/tsconfig.schematics.json  |   1 +
 .../tsconfig.schematics.json                  |   1 +
 feature-libs/product/tsconfig.schematics.json |   1 +
 .../qualtrics/tsconfig.schematics.json        |   1 +
 .../smartedit/tsconfig.schematics.json        |   1 +
 .../storefinder/tsconfig.schematics.json      |   1 +
 .../tracking/tsconfig.schematics.json         |   1 +
 .../register-component.service.spec.ts        |  15 +
 .../register/register-component.service.ts    |  28 +-
 .../register/register.component.html          |  27 ++
 .../register/register.component.spec.ts       |   2 +
 .../components/register/register.component.ts |  20 +
 feature-libs/user/tsconfig.schematics.json    |   1 +
 integration-libs/cdc/assets/ng-package.json   |   6 +
 integration-libs/cdc/assets/public_api.ts     |   7 +
 .../cdc/assets/translations/en/cdc.i18n.ts    |  14 +
 .../cdc/assets/translations/en/index.ts       |  11 +
 .../cdc/assets/translations/translations.ts   |  16 +
 integration-libs/cdc/root/cdc-root.module.ts  |   2 +
 .../consent-management/cdc-consent.module.ts  |  31 ++
 .../cdc-user-consent.adapter.spec.ts          | 151 +++++++
 .../cdc-user-consent.adapter.ts               |  86 ++++
 .../cdc-user-preference.serializer.spec.ts    |  45 +++
 .../cdc-user-preference.serializer.ts         |  57 +++
 .../converters/converter.ts                   |  13 +
 .../consent-management/converters/index.ts    |   8 +
 .../cdc/root/consent-management/index.ts      |  11 +
 .../model/cdc-consent-management.model.ts     |  32 ++
 .../root/consent-management/model/index.ts    |   7 +
 ...nsent-management-component.service.spec.ts |  73 ++++
 ...dc-consent-management-component.service.ts |  49 +++
 ...cdc-consents-local-storage.service.spec.ts |  56 +++
 .../cdc-consents-local-storage.service.ts     |  82 ++++
 .../services/cdc-user-consent.service.spec.ts | 137 +++++++
 .../services/cdc-user-consent.service.ts      | 110 +++++
 .../root/consent-management/services/index.ts |   9 +
 integration-libs/cdc/root/events/cdc-event.ts |  12 +
 integration-libs/cdc/root/public_api.ts       |   1 +
 .../cdc/root/service/cdc-js.service.spec.ts   |  91 +++++
 .../cdc/root/service/cdc-js.service.ts        | 118 +++++-
 integration-libs/cdc/tsconfig.schematics.json |   1 +
 .../login-form/cdc-login-form.module.ts       |   4 +-
 .../cdc/user-account/login-form/index.ts      |   1 +
 .../cdc-reconsent-component.service.spec.ts   | 129 ++++++
 .../cdc-reconsent-component.service.ts        |  94 +++++
 ...-reconsent-dialogue-event.listener.spec.ts |  79 ++++
 .../cdc-reconsent-dialogue-event.listener.ts  |  55 +++
 .../reconsent/cdc-reconsent.component.html    |  61 +++
 .../reconsent/cdc-reconsent.component.spec.ts | 147 +++++++
 .../reconsent/cdc-reconsent.component.ts      | 115 ++++++
 .../reconsent/cdc-reconsent.module.ts         |  39 ++
 .../default-cdc-reconsent-layout.config.ts    |  18 +
 .../login-form/reconsent/index.ts             |  11 +
 .../cdc-register-component.service.spec.ts    | 199 ++++++++-
 .../cdc-register-component.service.ts         | 103 ++++-
 integration-libs/cds/tsconfig.schematics.json |   1 +
 .../digital-payments/tsconfig.schematics.json |   1 +
 .../tsconfig.schematics.json                  |   1 +
 .../s4om/tsconfig.schematics.json             |   1 +
 .../consent/user-consent.adapter.ts           |   6 +-
 .../consent/user-consent.connector.spec.ts    |   5 +-
 .../consent/user-consent.connector.ts         |   8 +-
 .../user/facade/user-consent.service.spec.ts  |   4 +-
 .../src/user/facade/user-consent.service.ts   |   3 +-
 .../store/actions/user-consents.action.ts     |   1 +
 .../store/effects/user-consents.effect.ts     |  18 +-
 .../integration-libs/cdc-schematics-config.ts |   9 +
 .../schematics/src/shared/libs-constants.ts   |   1 +
 .../b2c/cdc-b2c-consent-management-e2e.cy.ts  | 131 ++++++
 .../cypress/helpers/vendor/cdc/cdc.ts         |  10 +-
 .../features/cdc/cdc-feature.module.ts        |  14 +-
 projects/storefrontapp/tsconfig.app.prod.json |   1 +
 projects/storefrontapp/tsconfig.server.json   |   1 +
 .../storefrontapp/tsconfig.server.prod.json   |   1 +
 .../consent-management-form.component.html    |   7 +-
 .../consent-management-form.component.spec.ts |   3 +
 .../consent-management.component.spec.ts      |   8 +-
 .../consent-management.component.ts           |  21 +-
 ...nsent-management-component.service.spec.ts |  37 ++
 .../consent-management-component.service.ts   |  25 ++
 .../consent-management.module.ts              |   2 +
 .../myaccount/consent-management/index.ts     |   1 +
 tsconfig.compodoc.json                        |   3 +
 tsconfig.json                                 | 379 +++++++++++-------
 91 files changed, 2924 insertions(+), 177 deletions(-)
 create mode 100644 integration-libs/cdc/assets/ng-package.json
 create mode 100644 integration-libs/cdc/assets/public_api.ts
 create mode 100644 integration-libs/cdc/assets/translations/en/cdc.i18n.ts
 create mode 100644 integration-libs/cdc/assets/translations/en/index.ts
 create mode 100644 integration-libs/cdc/assets/translations/translations.ts
 create mode 100644 integration-libs/cdc/root/consent-management/cdc-consent.module.ts
 create mode 100644 integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.spec.ts
 create mode 100644 integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.ts
 create mode 100644 integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.spec.ts
 create mode 100644 integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.ts
 create mode 100644 integration-libs/cdc/root/consent-management/converters/converter.ts
 create mode 100644 integration-libs/cdc/root/consent-management/converters/index.ts
 create mode 100644 integration-libs/cdc/root/consent-management/index.ts
 create mode 100644 integration-libs/cdc/root/consent-management/model/cdc-consent-management.model.ts
 create mode 100644 integration-libs/cdc/root/consent-management/model/index.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.spec.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.spec.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.spec.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.ts
 create mode 100644 integration-libs/cdc/root/consent-management/services/index.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.spec.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.spec.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.spec.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.module.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/default-cdc-reconsent-layout.config.ts
 create mode 100644 integration-libs/cdc/user-account/login-form/reconsent/index.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2c/cdc-b2c-consent-management-e2e.cy.ts
 create mode 100644 projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.spec.ts
 create mode 100644 projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.ts

diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 6bf3acfc9c8..1a125185d68 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -451,6 +451,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index a3260b4f932..407c6789ddc 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -461,6 +461,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index dd00fb3959a..950fc7784fe 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -464,6 +464,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/feature-libs/user/profile/components/register/register-component.service.spec.ts b/feature-libs/user/profile/components/register/register-component.service.spec.ts
index 1737969f739..3ef7425b6ab 100644
--- a/feature-libs/user/profile/components/register/register-component.service.spec.ts
+++ b/feature-libs/user/profile/components/register/register-component.service.spec.ts
@@ -1,4 +1,5 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
 import { GlobalMessageService, GlobalMessageType } from '@spartacus/core';
 import { UserRegisterFacade, UserSignUp } from '@spartacus/user/profile/root';
 import { of } from 'rxjs';
@@ -18,11 +19,13 @@ describe('RegisterComponentService', () => {
   let service: RegisterComponentService;
   let userRegisterFacade: UserRegisterFacade;
   let globalMessageService: GlobalMessageService;
+  let fb: UntypedFormBuilder;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
         RegisterComponentService,
+        UntypedFormBuilder,
         { provide: UserRegisterFacade, useClass: MockUserRegisterFacade },
         { provide: GlobalMessageService, useClass: MockGlobalMessageService },
       ],
@@ -30,6 +33,7 @@ describe('RegisterComponentService', () => {
 
     globalMessageService = TestBed.inject(GlobalMessageService);
     userRegisterFacade = TestBed.inject(UserRegisterFacade);
+    fb = TestBed.inject(UntypedFormBuilder);
     service = TestBed.inject(RegisterComponentService);
   });
 
@@ -72,4 +76,15 @@ describe('RegisterComponentService', () => {
       );
     });
   });
+
+  it('generateAdditionalConsentsFormControl', () => {
+    spyOn(fb, 'array').and.callThrough();
+    service.generateAdditionalConsentsFormControl();
+    expect(fb.array).toHaveBeenCalled();
+  });
+
+  it('getAdditionalConsents', () => {
+    let result = service.getAdditionalConsents();
+    expect(result).toEqual([]);
+  });
 });
diff --git a/feature-libs/user/profile/components/register/register-component.service.ts b/feature-libs/user/profile/components/register/register-component.service.ts
index e1f8d14ce38..f6dfb5ab12e 100644
--- a/feature-libs/user/profile/components/register/register-component.service.ts
+++ b/feature-libs/user/profile/components/register/register-component.service.ts
@@ -5,7 +5,9 @@
  */
 
 import { Injectable } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormArray } from '@angular/forms';
 import {
+  ConsentTemplate,
   GlobalMessageService,
   GlobalMessageType,
   Title,
@@ -18,7 +20,8 @@ import { Observable } from 'rxjs';
 export class RegisterComponentService {
   constructor(
     protected userRegisterFacade: UserRegisterFacade,
-    protected globalMessageService: GlobalMessageService
+    protected globalMessageService: GlobalMessageService,
+    protected fb: UntypedFormBuilder
   ) {}
 
   /**
@@ -46,4 +49,27 @@ export class RegisterComponentService {
       GlobalMessageType.MSG_TYPE_CONFIRMATION
     );
   }
+
+  /**
+   * Get if any additional consents needs to be provided during registration
+   * In core feature, no additional consents are necessary during registration.
+   * In integration scenarios, eg: cdc, this method will be overridden to return
+   * necessary cdc consents
+   */
+  getAdditionalConsents(): {
+    template: ConsentTemplate;
+    required: boolean;
+  }[] {
+    return [];
+  }
+
+  /**
+   * Generate form control if any additional consents that needs to be provided during registration
+   * In core feature, no additional consents are necessary during registration.
+   * In integration scenarios, eg: cdc, this method will be overridden to return
+   * form controls for necessary cdc consents
+   */
+  generateAdditionalConsentsFormControl(): UntypedFormArray {
+    return this.fb.array([]);
+  }
 }
diff --git a/feature-libs/user/profile/components/register/register.component.html b/feature-libs/user/profile/components/register/register.component.html
index fa36d0b5e19..d5fccccd77c 100644
--- a/feature-libs/user/profile/components/register/register.component.html
+++ b/feature-libs/user/profile/components/register/register.component.html
@@ -159,6 +159,33 @@
             </div>
           </div>
 
+          <div
+            formArrayName="additionalConsents"
+            class="form-group"
+            *ngIf="additionalRegistrationConsents as consents"
+          >
+            <div
+              class="form-check"
+              *ngFor="let control of additionalConsents.controls; let i = index"
+            >
+              <div *ngIf="consents[i]?.template?.id as id">
+                <label>
+                  <input
+                    type="checkbox"
+                    [required]="consents[i].required"
+                    [name]="id"
+                    (change)="updateAdditionalConsents($any($event), i)"
+                    [formControlName]="i"
+                  />
+                  <span class="form-check-label">
+                    {{ consents[i].template.description }}
+                  </span>
+                  <cx-form-errors [control]="control"></cx-form-errors>
+                </label>
+              </div>
+            </div>
+          </div>
+
           <div class="form-group">
             <div class="form-check">
               <label>
diff --git a/feature-libs/user/profile/components/register/register.component.spec.ts b/feature-libs/user/profile/components/register/register.component.spec.ts
index 1d06fb5caf9..e99f34d71b7 100644
--- a/feature-libs/user/profile/components/register/register.component.spec.ts
+++ b/feature-libs/user/profile/components/register/register.component.spec.ts
@@ -110,6 +110,8 @@ class MockRegisterComponentService
   getTitles = createSpy().and.returnValue(of(mockTitlesList));
   register = createSpy().and.returnValue(of(undefined));
   postRegisterMessage = createSpy();
+  getAdditionalConsents = createSpy();
+  generateAdditionalConsentsFormControl = createSpy();
 }
 
 describe('RegisterComponent', () => {
diff --git a/feature-libs/user/profile/components/register/register.component.ts b/feature-libs/user/profile/components/register/register.component.ts
index 766f4812932..ae229a4df41 100644
--- a/feature-libs/user/profile/components/register/register.component.ts
+++ b/feature-libs/user/profile/components/register/register.component.ts
@@ -6,6 +6,7 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import {
+  UntypedFormArray,
   UntypedFormBuilder,
   UntypedFormControl,
   UntypedFormGroup,
@@ -60,6 +61,8 @@ export class RegisterComponent implements OnInit, OnDestroy {
         value: false,
         disabled: this.isConsentRequired(),
       }),
+      additionalConsents:
+        this.registerComponentService?.generateAdditionalConsentsFormControl(),
       termsandconditions: [false, Validators.requiredTrue],
     },
     {
@@ -70,6 +73,20 @@ export class RegisterComponent implements OnInit, OnDestroy {
     }
   );
 
+  additionalRegistrationConsents: {
+    template: ConsentTemplate;
+    required: boolean;
+  }[];
+
+  get additionalConsents(): UntypedFormArray {
+    return this.registerForm?.get('additionalConsents') as UntypedFormArray;
+  }
+
+  updateAdditionalConsents(event: MouseEvent, index: number) {
+    const { checked } = event.target as HTMLInputElement;
+    this.registerForm.value.additionalConsents[index] = checked;
+  }
+
   constructor(
     protected globalMessageService: GlobalMessageService,
     protected fb: UntypedFormBuilder,
@@ -132,6 +149,9 @@ export class RegisterComponent implements OnInit, OnDestroy {
       )
     );
 
+    this.additionalRegistrationConsents =
+      this.registerComponentService?.getAdditionalConsents() || [];
+
     this.subscription.add(
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       this.registerForm.get('newsletter')!.valueChanges.subscribe(() => {
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/integration-libs/cdc/assets/ng-package.json b/integration-libs/cdc/assets/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/integration-libs/cdc/assets/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/integration-libs/cdc/assets/public_api.ts b/integration-libs/cdc/assets/public_api.ts
new file mode 100644
index 00000000000..f3d8f426ab4
--- /dev/null
+++ b/integration-libs/cdc/assets/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './translations/translations';
diff --git a/integration-libs/cdc/assets/translations/en/cdc.i18n.ts b/integration-libs/cdc/assets/translations/en/cdc.i18n.ts
new file mode 100644
index 00000000000..3acf21604b1
--- /dev/null
+++ b/integration-libs/cdc/assets/translations/en/cdc.i18n.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const cdc = {
+  reconsent: {
+    dialog: {
+      title: 'Profile Completion',
+      description: 'We still need your consent for the following',
+    },
+  },
+};
diff --git a/integration-libs/cdc/assets/translations/en/index.ts b/integration-libs/cdc/assets/translations/en/index.ts
new file mode 100644
index 00000000000..0c8d3c40339
--- /dev/null
+++ b/integration-libs/cdc/assets/translations/en/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { cdc } from './cdc.i18n';
+
+export const en = {
+  cdc,
+};
diff --git a/integration-libs/cdc/assets/translations/translations.ts b/integration-libs/cdc/assets/translations/translations.ts
new file mode 100644
index 00000000000..cdde8a7a1b4
--- /dev/null
+++ b/integration-libs/cdc/assets/translations/translations.ts
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TranslationChunksConfig, TranslationResources } from '@spartacus/core';
+import { en } from './en/index';
+
+export const cdcTranslations: TranslationResources = {
+  en,
+};
+
+export const cdcTranslationChunksConfig: TranslationChunksConfig = {
+  cdc: ['reconsent'],
+};
diff --git a/integration-libs/cdc/root/cdc-root.module.ts b/integration-libs/cdc/root/cdc-root.module.ts
index 36380be4a09..c3716cb1fce 100644
--- a/integration-libs/cdc/root/cdc-root.module.ts
+++ b/integration-libs/cdc/root/cdc-root.module.ts
@@ -14,6 +14,7 @@ import {
 } from '@spartacus/core';
 import { LogoutGuard } from '@spartacus/storefront';
 import { tap } from 'rxjs/operators';
+import { CdcConsentManagementModule } from './consent-management/cdc-consent.module';
 import { defaultCdcRoutingConfig } from './config/default-cdc-routing-config';
 import { CDC_CORE_FEATURE, CDC_FEATURE } from './feature-name';
 import { CdcLogoutGuard } from './guards/cdc-logout.guard';
@@ -49,6 +50,7 @@ export function defaultCdcComponentsConfig(): CmsConfig {
 }
 
 @NgModule({
+  imports: [CdcConsentManagementModule],
   providers: [
     provideDefaultConfigFactory(defaultCdcComponentsConfig),
     { provide: LogoutGuard, useExisting: CdcLogoutGuard },
diff --git a/integration-libs/cdc/root/consent-management/cdc-consent.module.ts b/integration-libs/cdc/root/consent-management/cdc-consent.module.ts
new file mode 100644
index 00000000000..cbd5d514611
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/cdc-consent.module.ts
@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { I18nModule, UserConsentAdapter } from '@spartacus/core';
+import { CdcUserPreferenceSerializer } from './converters/cdc-user-preference.serializer';
+import { CommonModule } from '@angular/common';
+import { CdcConsentManagementComponentService } from './services/cdc-consent-management-component.service';
+import { ConsentManagementComponentService } from '@spartacus/storefront';
+import { CDC_USER_PREFERENCE_SERIALIZER } from './converters/converter';
+import { CdcUserConsentAdapter } from './cdc-user-consent.adapter';
+
+@NgModule({
+  imports: [CommonModule, I18nModule],
+  providers: [
+    { provide: UserConsentAdapter, useClass: CdcUserConsentAdapter },
+    {
+      provide: ConsentManagementComponentService,
+      useClass: CdcConsentManagementComponentService,
+    },
+    {
+      provide: CDC_USER_PREFERENCE_SERIALIZER,
+      useExisting: CdcUserPreferenceSerializer,
+      multi: true,
+    },
+  ],
+})
+export class CdcConsentManagementModule {}
diff --git a/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.spec.ts b/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.spec.ts
new file mode 100644
index 00000000000..58c7fc6808e
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.spec.ts
@@ -0,0 +1,151 @@
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { StoreModule } from '@ngrx/store';
+import { of } from 'rxjs';
+import { CdcUserConsentAdapter } from './cdc-user-consent.adapter';
+import { CdcConsentsLocalStorageService } from './services/cdc-consents-local-storage.service';
+import { CdcUserConsentService } from './services/cdc-user-consent.service';
+import createSpy = jasmine.createSpy;
+
+const consentTemplateId = 'xxxx';
+const consentTemplateVersion = 0;
+class MockCdcUserConsentService implements Partial<CdcUserConsentService> {
+  updateCdcConsent = createSpy();
+}
+class MockCdcConsentsLocalStorageService
+  implements Partial<CdcConsentsLocalStorageService>
+{
+  syncCdcConsentsState = createSpy();
+  checkIfConsentExists = createSpy();
+}
+
+describe('CdcUserConsentAdapter', () => {
+  let service: CdcUserConsentAdapter;
+  let cdcUserConsentService: CdcUserConsentService;
+  let storage: CdcConsentsLocalStorageService;
+  let httpMock: HttpTestingController;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule, StoreModule.forRoot()],
+      declarations: [],
+      providers: [
+        {
+          provide: CdcUserConsentService,
+          useClass: MockCdcUserConsentService,
+        },
+        {
+          provide: CdcConsentsLocalStorageService,
+          useClass: MockCdcConsentsLocalStorageService,
+        },
+      ],
+    });
+    service = TestBed.inject(CdcUserConsentAdapter);
+    cdcUserConsentService = TestBed.inject(CdcUserConsentService);
+    httpMock = TestBed.inject(HttpTestingController);
+    storage = TestBed.inject(CdcConsentsLocalStorageService);
+    TestBed.compileComponents();
+  });
+
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('giveConsent()', () => {
+    it('should update cdc consent', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(true);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 0 })
+      );
+      service
+        .giveConsent('current', consentTemplateId, consentTemplateVersion)
+        .subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalledWith(
+        true,
+        ['xxxx']
+      );
+      httpMock.expectOne((req) => {
+        return (
+          req.method === 'POST' &&
+          req.serializeBody() ===
+            `consentTemplateId=${consentTemplateId}&consentTemplateVersion=${consentTemplateVersion}`
+        );
+      });
+      httpMock.verify();
+    });
+    it('should not call CDC SDK', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(false);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 0 })
+      );
+      service.giveConsent('current', 'xxxx', 0).subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).not.toHaveBeenCalledWith(
+        true,
+        ['xxxx']
+      );
+    });
+    it('should not call Commerce API', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(true);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 2 })
+      );
+      service.giveConsent('current', 'xxxx', 0).subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalledWith(
+        true,
+        ['xxxx']
+      );
+      httpMock.expectNone((req) => {
+        return (
+          req.method === 'POST' &&
+          req.serializeBody() ===
+            `consentTemplateId=${consentTemplateId}&consentTemplateVersion=${consentTemplateVersion}`
+        );
+      });
+      httpMock.verify();
+    });
+  });
+  describe('withdrawConsent()', () => {
+    it('should update cdc consent', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(true);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 0 })
+      );
+      service.withdrawConsent('current', 'code', 'xxxx').subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalledWith(
+        false,
+        ['xxxx']
+      );
+      httpMock.expectOne((req) => {
+        return req.method === 'DELETE';
+      });
+      httpMock.verify();
+    });
+    it('should not call CDC SDK', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(false);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 0 })
+      );
+      service.withdrawConsent('current', 'code', 'xxxx').subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).not.toHaveBeenCalledWith(
+        false,
+        ['xxxx']
+      );
+    });
+    it('should not call Commerce API', () => {
+      storage.checkIfConsentExists = createSpy().and.returnValue(true);
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 2 })
+      );
+      service.withdrawConsent('current', 'code', 'xxxx').subscribe();
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalledWith(
+        false,
+        ['xxxx']
+      );
+      httpMock.expectNone((req) => {
+        return req.method === 'DELETE';
+      });
+      httpMock.verify();
+    });
+  });
+});
diff --git a/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.ts b/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.ts
new file mode 100644
index 00000000000..8d4d9f1a9cb
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/cdc-user-consent.adapter.ts
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  ConsentTemplate,
+  ConverterService,
+  OccEndpointsService,
+  OccUserConsentAdapter,
+} from '@spartacus/core';
+import { EMPTY, Observable, throwError } from 'rxjs';
+import { catchError, switchMap } from 'rxjs/operators';
+import { CdcConsentsLocalStorageService } from './services/cdc-consents-local-storage.service';
+import { CdcUserConsentService } from './services/cdc-user-consent.service';
+
+@Injectable({ providedIn: 'root' })
+export class CdcUserConsentAdapter extends OccUserConsentAdapter {
+  constructor(
+    protected http: HttpClient,
+    protected occEndpoints: OccEndpointsService,
+    protected converter: ConverterService,
+    protected cdcUserConsentService: CdcUserConsentService,
+    protected cdcConsentsStorage: CdcConsentsLocalStorageService
+  ) {
+    super(http, occEndpoints, converter);
+  }
+
+  loadConsents(userId: string): Observable<ConsentTemplate[]> {
+    return super.loadConsents(userId);
+  }
+  giveConsent(
+    userId: string,
+    consentTemplateId: string,
+    consentTemplateVersion: number
+  ): Observable<ConsentTemplate> {
+    if (!this.cdcConsentsStorage.checkIfConsentExists(consentTemplateId)) {
+      return super.giveConsent(
+        userId,
+        consentTemplateId,
+        consentTemplateVersion
+      );
+    } else {
+      return this.cdcUserConsentService
+        .updateCdcConsent(true, [consentTemplateId])
+        .pipe(
+          catchError((error: any) => throwError(error)),
+          switchMap((result) => {
+            if (result?.errorCode === 0) {
+              return super.giveConsent(
+                userId,
+                consentTemplateId,
+                consentTemplateVersion
+              );
+            }
+            return EMPTY;
+          })
+        );
+    }
+  }
+
+  withdrawConsent(
+    userId: string,
+    consentCode: string,
+    consentId?: string
+  ): Observable<{}> {
+    if (!this.cdcConsentsStorage.checkIfConsentExists(consentId ?? '')) {
+      return super.withdrawConsent(userId, consentCode);
+    } else {
+      return this.cdcUserConsentService
+        .updateCdcConsent(false, consentId ? [consentId] : [])
+        .pipe(
+          catchError((error: any) => throwError(error)),
+          switchMap((result) => {
+            if (result?.errorCode === 0) {
+              return super.withdrawConsent(userId, consentCode);
+            }
+            return EMPTY;
+          })
+        );
+    }
+  }
+}
diff --git a/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.spec.ts b/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.spec.ts
new file mode 100644
index 00000000000..079063a6239
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.spec.ts
@@ -0,0 +1,45 @@
+import { TestBed } from '@angular/core/testing';
+import { ConsentTemplate } from '@spartacus/core';
+import { CdcUserPreferenceSerializer } from './cdc-user-preference.serializer';
+const mockInput: ConsentTemplate = {
+  id: 'terms.of.use',
+  name: '',
+  description: 'Accept the terms of use to proceed further',
+  version: 1,
+  currentConsent: {
+    code: 'terms.of.use',
+    consentGivenDate: new Date('3 march 2022'),
+    consentWithdrawnDate: undefined,
+  },
+};
+const mockOutput = {
+  terms: {
+    of: {
+      use: {
+        isConsentGranted: true,
+      },
+    },
+  },
+};
+describe('CdcUserPreferenceSerializer', () => {
+  let service: CdcUserPreferenceSerializer;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      declarations: [],
+      providers: [],
+    });
+    service = TestBed.inject(CdcUserPreferenceSerializer);
+    TestBed.compileComponents();
+  });
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('convert()', () => {
+    it('convert consent template into cdc user preference', () => {
+      let target = {};
+      target = service.convert(mockInput, target);
+      expect(target).toEqual(mockOutput);
+    });
+  });
+});
diff --git a/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.ts b/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.ts
new file mode 100644
index 00000000000..ca327277ce2
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/converters/cdc-user-preference.serializer.ts
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { ConsentTemplate, Converter } from '@spartacus/core';
+
+@Injectable({ providedIn: 'root' })
+export class CdcUserPreferenceSerializer
+  implements Converter<ConsentTemplate, any>
+{
+  constructor() {
+    // Intentional empty constructor
+  }
+
+  convert(source: ConsentTemplate, target?: any): any {
+    if (source) {
+      const preference = source.id?.concat('.isConsentGranted');
+      let giveConsent: boolean = false;
+      if (preference) {
+        if (source.currentConsent?.consentGivenDate) {
+          giveConsent = true;
+        }
+        target = this.convertToCdcPreference(preference, giveConsent);
+      }
+    }
+
+    return target;
+  }
+  /**
+   * converts a dot separated string to deeply nested object
+   * @param path : dot separated string
+   * @param value : true if consent is given, false if consent is withdrawn
+   * @returns preference object compatible for cdc
+   * example:
+   * input path x.y.z.isConsentGranted
+   * input value: true
+   * output=  x:{y:{z:{isConsentGranted: true}}}
+   */
+  private convertToCdcPreference(path: string, value: any): any {
+    const target: any = {};
+    let consentCode = target;
+    const list = path.split('.');
+    const len = list.length;
+    for (let i = 0; i < len - 1; i++) {
+      const elem = list[i];
+      if (!consentCode[elem]) {
+        consentCode[elem] = {};
+      }
+      consentCode = consentCode[elem];
+    }
+    consentCode[list[len - 1]] = value;
+    return target;
+  }
+}
diff --git a/integration-libs/cdc/root/consent-management/converters/converter.ts b/integration-libs/cdc/root/consent-management/converters/converter.ts
new file mode 100644
index 00000000000..ee4eb039c06
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/converters/converter.ts
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { InjectionToken } from '@angular/core';
+import { Converter, ConsentTemplate } from '@spartacus/core';
+
+//maintaining target as any because 'preferences' in cdc can have any structure
+export const CDC_USER_PREFERENCE_SERIALIZER = new InjectionToken<
+  Converter<ConsentTemplate, any>
+>('CdcUserPreferenceSerializer');
diff --git a/integration-libs/cdc/root/consent-management/converters/index.ts b/integration-libs/cdc/root/consent-management/converters/index.ts
new file mode 100644
index 00000000000..1615a554fde
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/converters/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-user-preference.serializer';
+export * from './converter';
diff --git a/integration-libs/cdc/root/consent-management/index.ts b/integration-libs/cdc/root/consent-management/index.ts
new file mode 100644
index 00000000000..4aa1d6d0663
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-user-consent.adapter';
+export * from './model/index';
+export * from './cdc-consent.module';
+export * from './services/index';
+export * from './converters/index';
diff --git a/integration-libs/cdc/root/consent-management/model/cdc-consent-management.model.ts b/integration-libs/cdc/root/consent-management/model/cdc-consent-management.model.ts
new file mode 100644
index 00000000000..4a3ccb30d85
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/model/cdc-consent-management.model.ts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+declare module '@spartacus/storefront' {
+  const enum LAUNCH_CALLER {
+    CDC_RECONSENT = 'CDC_RECONSENT',
+  }
+}
+
+declare module '@spartacus/user/profile/root' {
+  export interface UserSignUp {
+    firstName?: string;
+    lastName?: string;
+    password?: string;
+    titleCode?: string;
+    uid?: string;
+    preferences?: any;
+  }
+}
+export interface CdcSiteConsentTemplate {
+  siteConsentDetails: {
+    [key: string]: { isMandatory: boolean; isActive: boolean };
+  };
+}
+
+export interface CdcLocalStorageTemplate {
+  id: string;
+  required: boolean;
+}
diff --git a/integration-libs/cdc/root/consent-management/model/index.ts b/integration-libs/cdc/root/consent-management/model/index.ts
new file mode 100644
index 00000000000..65887eac361
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/model/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-consent-management.model';
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.spec.ts b/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.spec.ts
new file mode 100644
index 00000000000..a7c533cd9c8
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.spec.ts
@@ -0,0 +1,73 @@
+import { TestBed } from '@angular/core/testing';
+import { ConsentTemplate } from '@spartacus/core';
+import { CdcConsentManagementComponentService } from './cdc-consent-management-component.service';
+import { CdcConsentsLocalStorageService } from './cdc-consents-local-storage.service';
+import createSpy = jasmine.createSpy;
+
+const mockStore = [
+  {
+    id: 'terms.of.use',
+    required: true,
+  },
+  {
+    id: 'others.survey',
+    required: false,
+  },
+];
+const mockRequiredOutput = ['terms.of.use'];
+const mockActiveOutput = ['terms.of.use', 'others.survey'];
+class MockCdcConsentsLocalStorageService
+  implements Partial<CdcConsentsLocalStorageService>
+{
+  readCdcConsentsFromStorage = createSpy();
+}
+
+describe('CdcConsentManagementService', () => {
+  let service: CdcConsentManagementComponentService;
+  let store: CdcConsentsLocalStorageService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      declarations: [],
+      providers: [
+        {
+          provide: CdcConsentsLocalStorageService,
+          useClass: MockCdcConsentsLocalStorageService,
+        },
+      ],
+    });
+    service = TestBed.inject(CdcConsentManagementComponentService);
+    store = TestBed.inject(CdcConsentsLocalStorageService);
+    TestBed.compileComponents();
+  });
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('getRequiredConsents()', () => {
+    it('return all required consents', () => {
+      let templateList: ConsentTemplate[] = [];
+      service.getCdcConsentIDs = createSpy().and.returnValue(['terms.of.use']);
+      let result = service.getRequiredConsents(templateList);
+      expect(result).toEqual(mockRequiredOutput);
+      expect(service.getCdcConsentIDs).toHaveBeenCalledWith(true);
+    });
+  });
+  describe('getCdcConsentIDs()', () => {
+    it('return all required cdc consents', () => {
+      spyOn(service, 'getCdcConsentIDs').and.callThrough();
+      store.readCdcConsentsFromStorage = createSpy().and.returnValue(mockStore);
+      let result: string[] = [];
+      result = service.getCdcConsentIDs(true);
+      expect(result).toEqual(mockRequiredOutput);
+      expect(service.getCdcConsentIDs).toHaveBeenCalledWith(true);
+    });
+    it('return all active cdc consents', () => {
+      spyOn(service, 'getCdcConsentIDs').and.callThrough();
+      store.readCdcConsentsFromStorage = createSpy().and.returnValue(mockStore);
+      let result: string[] = [];
+      result = service.getCdcConsentIDs();
+      expect(result).toEqual(mockActiveOutput);
+      expect(service.getCdcConsentIDs).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.ts b/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.ts
new file mode 100644
index 00000000000..33dbed15da3
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-consent-management-component.service.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { ConsentTemplate } from '@spartacus/core';
+import { ConsentManagementComponentService } from '@spartacus/storefront';
+import { CdcLocalStorageTemplate } from '../model/index';
+import { CdcConsentsLocalStorageService } from './cdc-consents-local-storage.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class CdcConsentManagementComponentService extends ConsentManagementComponentService {
+  constructor(protected store: CdcConsentsLocalStorageService) {
+    super();
+  }
+  getRequiredConsents(templateList: ConsentTemplate[]): string[] {
+    const requiredConsents: string[] = [];
+    const cdcConsents = this.getCdcConsentIDs(true);
+    requiredConsents.push(...super.getRequiredConsents(templateList));
+    requiredConsents.push(...cdcConsents);
+    return requiredConsents;
+  }
+
+  /**
+   * Returns cdc consents from store
+   * @param mandatoryConsents - if passed true, only mandatory consents will be returned.
+   * if passed false, all active consents (irrespective of whether they are mandatory or not)
+   * @returns array of consents
+   */
+  getCdcConsentIDs(mandatoryConsents: boolean = false): string[] {
+    const consentIDs: string[] = [];
+    const consents: CdcLocalStorageTemplate[] =
+      this.store.readCdcConsentsFromStorage() || [];
+    consents.forEach((consent) => {
+      if (mandatoryConsents === true) {
+        if (consent.required === true) {
+          consentIDs.push(consent.id);
+        }
+      } else {
+        consentIDs.push(consent.id);
+      }
+    });
+    return consentIDs;
+  }
+}
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.spec.ts b/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.spec.ts
new file mode 100644
index 00000000000..6813ab04d35
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.spec.ts
@@ -0,0 +1,56 @@
+import { TestBed } from '@angular/core/testing';
+import { StatePersistenceService } from '@spartacus/core';
+import { CdcLocalStorageTemplate, CdcSiteConsentTemplate } from '../model';
+import { CdcConsentsLocalStorageService } from './cdc-consents-local-storage.service';
+import createSpy = jasmine.createSpy;
+
+const mockCdcSiteConsents: CdcSiteConsentTemplate = {
+  siteConsentDetails: {
+    'terms.of.use': { isMandatory: true, isActive: true },
+    'privacy.statement': { isMandatory: true, isActive: true },
+    'consent.survey': { isMandatory: false, isActive: true },
+  },
+};
+const mockCdcConsents: CdcLocalStorageTemplate[] = [
+  { id: 'terms.of.use', required: true },
+  { id: 'privacy.statement', required: true },
+  { id: 'consent.survey', required: false },
+];
+describe('CdcConsentsLocalStorageService', () => {
+  let service: CdcConsentsLocalStorageService;
+  let persistenceService: StatePersistenceService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [StatePersistenceService],
+    });
+    service = TestBed.inject(CdcConsentsLocalStorageService);
+    persistenceService = TestBed.inject(StatePersistenceService);
+    spyOn(persistenceService, 'syncWithStorage').and.stub();
+  });
+
+  it('should inject service', () => {
+    expect(service).toBeTruthy();
+  });
+  it('should update storage', () => {
+    service.persistCdcConsentsToStorage(mockCdcSiteConsents);
+    expect(persistenceService.syncWithStorage).toHaveBeenCalled();
+  });
+  it('should return true if ID passed in request param exists in store', () => {
+    persistenceService.readStateFromStorage =
+      createSpy().and.returnValue(mockCdcConsents);
+    let output = service.checkIfConsentExists('consent.survey');
+    expect(persistenceService.readStateFromStorage).toHaveBeenCalledWith({
+      key: 'cdc-consents-list',
+    });
+    expect(output).toEqual(true);
+  });
+  it('should return false if ID passed in request param doesnot exists in store', () => {
+    persistenceService.readStateFromStorage =
+      createSpy().and.returnValue(mockCdcConsents);
+    let output = service.checkIfConsentExists('consent.training');
+    expect(persistenceService.readStateFromStorage).toHaveBeenCalledWith({
+      key: 'cdc-consents-list',
+    });
+    expect(output).toEqual(false);
+  });
+});
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.ts b/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.ts
new file mode 100644
index 00000000000..ac52a523429
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-consents-local-storage.service.ts
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { of, Subscription } from 'rxjs';
+import { StatePersistenceService } from '@spartacus/core';
+import { Injectable, OnDestroy } from '@angular/core';
+import {
+  CdcLocalStorageTemplate,
+  CdcSiteConsentTemplate,
+} from '../model/index';
+
+const KEY = 'cdc-consents-list';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class CdcConsentsLocalStorageService implements OnDestroy {
+  constructor(protected statePersistenceService: StatePersistenceService) {}
+  protected subscription = new Subscription();
+
+  /**
+   * saves active cdc consents to storage
+   * @param siteConsent - cdc site consent details
+   */
+  persistCdcConsentsToStorage(siteConsent: CdcSiteConsentTemplate) {
+    const consents: CdcLocalStorageTemplate[] = [];
+    const siteDetails = siteConsent.siteConsentDetails;
+    for (const key in siteDetails) {
+      //key will be a string with dot separated IDs
+      if (
+        Object.hasOwn(siteDetails, key) &&
+        siteDetails[key]?.isActive === true
+      ) {
+        const consent: any = {};
+        consent.id = key;
+        consent.required = siteDetails[key]?.isMandatory;
+        consents.push(consent);
+      }
+    }
+    this.subscription.add(
+      this.statePersistenceService.syncWithStorage<
+        CdcLocalStorageTemplate[] | undefined
+      >({
+        key: KEY,
+        state$: of(consents),
+      })
+    );
+  }
+
+  /**
+   * Returns cdc consents from storage
+   * @returns cdc consents
+   */
+  readCdcConsentsFromStorage(): CdcLocalStorageTemplate[] {
+    return this.statePersistenceService.readStateFromStorage({
+      key: KEY,
+    }) as CdcLocalStorageTemplate[];
+  }
+
+  /**
+   * Returns true if input consent is present in storage, else returns false
+   * @param consentId - cdc consent id
+   * @returns - returns true/false
+   */
+  checkIfConsentExists(consentId: string): boolean {
+    const consents = this.readCdcConsentsFromStorage();
+    let result: boolean = false;
+    consents.forEach((consent) => {
+      if (consent.id === consentId) {
+        result = true;
+      }
+    });
+    return result;
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+}
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.spec.ts b/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.spec.ts
new file mode 100644
index 00000000000..b6dcb068455
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.spec.ts
@@ -0,0 +1,137 @@
+import { TestBed } from '@angular/core/testing';
+import { ConverterService, LanguageService } from '@spartacus/core';
+import { UserProfileFacade } from '@spartacus/user/profile/root';
+import { of } from 'rxjs';
+import { CdcJsService } from '../../service';
+import { CdcUserConsentService } from './cdc-user-consent.service';
+import createSpy = jasmine.createSpy;
+
+const mockUser = { uid: 'sampleuser@mail.com' };
+const mockCdcSdkOutput = {
+  errorCode: 0,
+  errorMessage: '',
+  time: new Date('3 march 2023'),
+};
+class MockUserProfileFacade implements Partial<UserProfileFacade> {
+  get = createSpy();
+}
+class MockLanguageService implements Partial<LanguageService> {
+  getActive = createSpy();
+}
+class MockCdcJsService implements Partial<CdcJsService> {
+  setUserConsentPreferences = createSpy();
+  getSiteConsentDetails = createSpy();
+}
+class MockConverterService implements Partial<ConverterService> {
+  convert = createSpy();
+}
+describe('CdcUserConsentService()', () => {
+  let service: CdcUserConsentService;
+  let userProfileFacade: UserProfileFacade;
+  let languageService: LanguageService;
+  let cdcJsService: CdcJsService;
+  let converter: ConverterService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: UserProfileFacade,
+          useClass: MockUserProfileFacade,
+        },
+        {
+          provide: LanguageService,
+          useClass: MockLanguageService,
+        },
+        {
+          provide: CdcJsService,
+          useClass: MockCdcJsService,
+        },
+        {
+          provide: ConverterService,
+          useClass: MockConverterService,
+        },
+      ],
+    });
+    service = TestBed.inject(CdcUserConsentService);
+    userProfileFacade = TestBed.inject(UserProfileFacade);
+    languageService = TestBed.inject(LanguageService);
+    cdcJsService = TestBed.inject(CdcJsService);
+    converter = TestBed.inject(ConverterService);
+    TestBed.compileComponents();
+  });
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('getUserID()', () => {
+    it('get logged in user id', () => {
+      userProfileFacade.get = createSpy().and.returnValue(of(mockUser));
+      let output = service.getUserID();
+      expect(userProfileFacade.get).toHaveBeenCalled();
+      expect(output).toEqual('sampleuser@mail.com');
+    });
+  });
+  describe('getActiveLanguage()', () => {
+    it('get active language', () => {
+      languageService.getActive = createSpy().and.returnValue(of('en'));
+      let output = service.getActiveLanguage();
+      expect(languageService.getActive).toHaveBeenCalled();
+      expect(output).toEqual('en');
+    });
+  });
+  describe('updateCdcConsent()', () => {
+    it('give consent via CDC SDK', () => {
+      languageService.getActive = createSpy().and.returnValue(of('en'));
+      userProfileFacade.get = createSpy().and.returnValue(of(mockUser));
+      converter.convert = createSpy().and.returnValue({
+        others: {
+          survey: {
+            isConsentGranted: true,
+          },
+        },
+      });
+      cdcJsService.setUserConsentPreferences = createSpy().and.returnValue(
+        of(mockCdcSdkOutput)
+      );
+      service.updateCdcConsent(true, ['others.survey']);
+      expect(cdcJsService.setUserConsentPreferences).toHaveBeenCalledWith(
+        'sampleuser@mail.com',
+        'en',
+        {
+          others: {
+            survey: {
+              isConsentGranted: true,
+            },
+          },
+        },
+        undefined
+      );
+    });
+    it('withdraw consent via CDC SDK', () => {
+      languageService.getActive = createSpy().and.returnValue(of('en'));
+      userProfileFacade.get = createSpy().and.returnValue(of(mockUser));
+      converter.convert = createSpy().and.returnValue({
+        others: {
+          survey: {
+            isConsentGranted: false,
+          },
+        },
+      });
+      cdcJsService.setUserConsentPreferences = createSpy().and.returnValue(
+        of(mockCdcSdkOutput)
+      );
+      service.updateCdcConsent(false, ['others.survey']);
+      expect(cdcJsService.setUserConsentPreferences).toHaveBeenCalledWith(
+        'sampleuser@mail.com',
+        'en',
+        {
+          others: {
+            survey: {
+              isConsentGranted: false,
+            },
+          },
+        },
+        undefined
+      );
+    });
+  });
+});
diff --git a/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.ts b/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.ts
new file mode 100644
index 00000000000..ef6958e6869
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/cdc-user-consent.service.ts
@@ -0,0 +1,110 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import {
+  ConsentTemplate,
+  ConverterService,
+  LanguageService,
+} from '@spartacus/core';
+import { UserProfileFacade } from '@spartacus/user/profile/root';
+import { Observable, throwError } from 'rxjs';
+import { CdcConsentsLocalStorageService } from './cdc-consents-local-storage.service';
+import { CDC_USER_PREFERENCE_SERIALIZER } from '../converters/converter';
+import { tap } from 'rxjs/operators';
+import { CdcJsService } from '../../service';
+
+@Injectable({ providedIn: 'root' })
+export class CdcUserConsentService {
+  constructor(
+    protected languageService: LanguageService,
+    protected userProfileFacade: UserProfileFacade,
+    protected cdcJsService: CdcJsService,
+    protected converter: ConverterService,
+    protected cdcConsentsStorage: CdcConsentsLocalStorageService
+  ) {}
+
+  /**
+   *
+   * @param isConsentGranted - set true - if consent is given; false - if consent is withdrawn
+   * @param consentCodes - array of cdc consent ids
+   * @param user - If user is not passed, the logged in user id will be fetched and used. If passed, it will be considered.
+   * @param regToken - token
+   * @returns - returns Observable with error code and status
+   */
+  updateCdcConsent(
+    isConsentGranted: boolean,
+    consentCodes: string[],
+    user?: string,
+    regToken?: string
+  ): Observable<{ errorCode: number; errorMessage: string }> {
+    let consent: ConsentTemplate;
+    let serializedPreference: any = {};
+    for (const consentCode of consentCodes) {
+      consent = {};
+      consent.id = consentCode;
+      consent.currentConsent = {};
+      if (isConsentGranted) {
+        consent.currentConsent.consentGivenDate = new Date();
+      } else {
+        consent.currentConsent.consentWithdrawnDate = new Date();
+      }
+      const preference: any = this.converter.convert(
+        consent,
+        CDC_USER_PREFERENCE_SERIALIZER
+      );
+      serializedPreference = Object.assign(serializedPreference, preference);
+    }
+    let userId: string = '';
+    if (user === undefined) {
+      userId = this.getUserID() ?? '';
+    } else if (user !== undefined) {
+      userId = user;
+    }
+
+    const currentLanguage = this.getActiveLanguage();
+
+    return this.cdcJsService
+      .setUserConsentPreferences(
+        userId,
+        currentLanguage,
+        serializedPreference,
+        regToken
+      )
+      .pipe(
+        tap({
+          error: (error) => {
+            throwError(error);
+          },
+        })
+      );
+  }
+
+  /**
+   * Returns logged in User ID
+   * @returns user id
+   */
+  getUserID(): string | undefined {
+    let uid: string | undefined;
+    this.userProfileFacade.get().subscribe((user) => {
+      uid = user?.uid;
+    });
+    return uid;
+  }
+
+  /**
+   * Returns current language of the current site
+   * @returns language iso code
+   */
+  getActiveLanguage(): string {
+    let currentLanguage: string = '';
+    this.languageService
+      .getActive()
+      .subscribe((language) => (currentLanguage = language))
+      .unsubscribe();
+    return currentLanguage;
+  }
+}
diff --git a/integration-libs/cdc/root/consent-management/services/index.ts b/integration-libs/cdc/root/consent-management/services/index.ts
new file mode 100644
index 00000000000..b8883700676
--- /dev/null
+++ b/integration-libs/cdc/root/consent-management/services/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-consent-management-component.service';
+export * from './cdc-consents-local-storage.service';
+export * from './cdc-user-consent.service';
diff --git a/integration-libs/cdc/root/events/cdc-event.ts b/integration-libs/cdc/root/events/cdc-event.ts
index 7aa0cfeeab0..c08cf83674d 100644
--- a/integration-libs/cdc/root/events/cdc-event.ts
+++ b/integration-libs/cdc/root/events/cdc-event.ts
@@ -15,3 +15,15 @@ export class CdcLoadUserTokenFailEvent extends CxEvent {
    */
   static readonly type = 'CdcLoadUserTokenFailEvent';
 }
+
+export class CdcReConsentEvent extends CxEvent {
+  /**
+   * Event's type
+   */
+  static readonly type = 'CdcReConsentEvent';
+  user: string;
+  password: string;
+  consentIds: string[];
+  errorMessage: string;
+  regToken: string;
+}
diff --git a/integration-libs/cdc/root/public_api.ts b/integration-libs/cdc/root/public_api.ts
index f9e3819aaf2..285d6a3e867 100644
--- a/integration-libs/cdc/root/public_api.ts
+++ b/integration-libs/cdc/root/public_api.ts
@@ -11,3 +11,4 @@ export * from './facade/index';
 export * from './feature-name';
 export * from './guards/index';
 export * from './service/index';
+export * from './consent-management';
diff --git a/integration-libs/cdc/root/service/cdc-js.service.spec.ts b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
index 9d0c0a557f3..2e79b9c300f 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.spec.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
@@ -13,6 +13,10 @@ import { UserProfileFacade } from '@spartacus/user/profile/root';
 import { EMPTY, Observable, of, Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
+import {
+  CdcConsentsLocalStorageService,
+  CdcSiteConsentTemplate,
+} from '../consent-management';
 import { CdcAuthFacade } from '../facade/cdc-auth.facade';
 import { CdcJsService } from './cdc-js.service';
 import createSpy = jasmine.createSpy;
@@ -40,6 +44,12 @@ class LanguageServiceStub implements Partial<LanguageService> {
   }
 }
 
+class MockCdcConsentsLocalStorageService
+  implements Partial<CdcConsentsLocalStorageService>
+{
+  persistCdcConsentsToStorage(_siteConsent: CdcSiteConsentTemplate) {}
+}
+
 declare var window: Window;
 
 interface Window {
@@ -124,6 +134,7 @@ describe('CdcJsService', () => {
   let winRef: WindowRef;
   let authService: AuthService;
   let globalMessageService: GlobalMessageService;
+  let store: CdcConsentsLocalStorageService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -138,6 +149,10 @@ describe('CdcJsService', () => {
         { provide: Subscription, useValue: MockSubscription },
         { provide: AuthService, useClass: MockAuthService },
         { provide: GlobalMessageService, useValue: mockedGlobalMessageService },
+        {
+          provide: CdcConsentsLocalStorageService,
+          useClass: MockCdcConsentsLocalStorageService,
+        },
       ],
     });
 
@@ -150,6 +165,7 @@ describe('CdcJsService', () => {
     authService = TestBed.inject(AuthService);
     winRef = TestBed.inject(WindowRef);
     globalMessageService = TestBed.inject(GlobalMessageService);
+    store = TestBed.inject(CdcConsentsLocalStorageService);
     service['gigyaSDK'] = mockedWindowRef.nativeWindow.gigya;
   });
 
@@ -393,6 +409,7 @@ describe('CdcJsService', () => {
           password: 'password',
           firstName: 'fname',
           lastName: 'lname',
+          preferences: {},
         },
         { regToken: 'TOKEN' }
       ).subscribe({
@@ -404,6 +421,7 @@ describe('CdcJsService', () => {
               firstName: 'fname',
               lastName: 'lname',
             },
+            preferences: {},
             regToken: 'TOKEN',
             regSource: 'https://spartacus.cx',
             finalizeRegistration: true,
@@ -433,6 +451,8 @@ describe('CdcJsService', () => {
         expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
           loginID: 'uid',
           password: 'password',
+          include: 'missing-required-fields',
+          ignoreInterruptions: true,
           sessionExpiry: sampleCdcConfig.cdc[0].sessionExpiration,
           callback: jasmine.any(Function),
         });
@@ -460,6 +480,8 @@ describe('CdcJsService', () => {
           expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
             loginID: 'uid',
             password: 'password',
+            include: 'missing-required-fields',
+            ignoreInterruptions: true,
             context: 'RESET_EMAIL',
             sessionExpiry: sampleCdcConfig?.cdc[0]?.sessionExpiration,
             callback: jasmine.any(Function),
@@ -467,6 +489,19 @@ describe('CdcJsService', () => {
           done();
         });
     });
+    it('should raise reconsent event in case of error code 206001', () => {
+      spyOn(service['gigyaSDK'].accounts, 'login').and.callFake(
+        (options: { callback: Function }) => {
+          options.callback({ status: 'NOT OK', errorCode: 206001 });
+        }
+      );
+      spyOn(service, 'raiseCdcReconsentEvent').and.stub();
+      service.loginUserWithoutScreenSet('uid', 'password').subscribe({
+        error: () => {
+          expect(service.raiseCdcReconsentEvent).toHaveBeenCalled();
+        },
+      });
+    });
   });
 
   describe('resetPasswordWithoutScreenSet', () => {
@@ -1098,4 +1133,60 @@ describe('CdcJsService', () => {
       expect(service['invokeAPI']).toHaveBeenCalledWith('accounts.logout', {});
     });
   });
+
+  describe('setUserConsentPreferences', () => {
+    var mockUser = 'sampleuser@mail.com';
+    var userPreference = {
+      others: {
+        survey: {
+          isConsentGranted: false,
+        },
+      },
+    };
+    var lang = 'en';
+    it('should set cdc consents for a user', (done) => {
+      spyOn(service as any, 'invokeAPI').and.returnValue(of({ status: 'OK' }));
+      service.setUserConsentPreferences(mockUser, lang, userPreference);
+      expect(service['invokeAPI']).toHaveBeenCalled();
+      expect(service.setUserConsentPreferences).toBeTruthy();
+      done();
+    });
+    it('should throw error', (done) => {
+      spyOn(service as any, 'invokeAPI').and.returnValue(
+        of({ status: 'ERROR' })
+      );
+      service.setUserConsentPreferences(mockUser, lang, userPreference);
+      expect(service['invokeAPI']).toHaveBeenCalled();
+      expect(service.setUserConsentPreferences).toBeTruthy();
+      expect(service.setUserConsentPreferences).toThrowError();
+      done();
+    });
+  });
+
+  describe('getSiteConsentDetails()', () => {
+    it('fetch consents from the current site without persisting into Local Storage', () => {
+      spyOn(baseSiteService, 'getActive').and.returnValue(
+        of('electronics-spa')
+      );
+      spyOn(store, 'persistCdcConsentsToStorage').and.stub();
+      spyOn(service as any, 'invokeAPI').and.returnValue(of({ status: 'OK' }));
+      service.getSiteConsentDetails(false).subscribe(() => {
+        expect(store.persistCdcConsentsToStorage).not.toHaveBeenCalled();
+      });
+      expect(service['invokeAPI']).toHaveBeenCalled();
+      expect(service.getSiteConsentDetails).toBeTruthy();
+    });
+    it('fetch consents from the current site, persisting into Local Storage', () => {
+      spyOn(baseSiteService, 'getActive').and.returnValue(
+        of('electronics-spa')
+      );
+      spyOn(store, 'persistCdcConsentsToStorage').and.stub();
+      spyOn(service as any, 'invokeAPI').and.returnValue(of({ status: 'OK' }));
+      service.getSiteConsentDetails(true).subscribe(() => {
+        expect(store.persistCdcConsentsToStorage).toHaveBeenCalled();
+      });
+      expect(service['invokeAPI']).toHaveBeenCalled();
+      expect(service.getSiteConsentDetails).toBeTruthy();
+    });
+  });
 });
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index c42562513db..26aee76e4d1 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -16,6 +16,7 @@ import {
 import {
   AuthService,
   BaseSiteService,
+  EventService,
   GlobalMessageService,
   GlobalMessageType,
   LanguageService,
@@ -35,6 +36,9 @@ import {
 import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
 import { CdcAuthFacade } from '../facade/cdc-auth.facade';
+import { CdcReConsentEvent } from '../events';
+import { CdcSiteConsentTemplate } from '../consent-management/model/index';
+import { CdcConsentsLocalStorageService } from '../consent-management';
 
 const defaultSessionTimeOut = 3600;
 const setAccountInfoAPI = 'accounts.setAccountInfo';
@@ -58,7 +62,9 @@ export class CdcJsService implements OnDestroy {
     protected zone: NgZone,
     protected userProfileFacade: UserProfileFacade,
     @Inject(PLATFORM_ID) protected platform: any,
-    protected globalMessageService: GlobalMessageService
+    protected globalMessageService: GlobalMessageService,
+    protected eventService: EventService,
+    protected consentStore: CdcConsentsLocalStorageService
   ) {}
 
   /**
@@ -105,6 +111,7 @@ export class CdcJsService implements OnDestroy {
                 attributes: { type: 'text/javascript' },
                 callback: () => {
                   this.registerEventListeners(baseSite);
+                  this.getSiteConsentDetails(true).subscribe(); //fetch CDC consents and persist to local storage
                   this.loaded$.next(true);
                   this.errorLoading$.next(false);
                 },
@@ -222,6 +229,7 @@ export class CdcJsService implements OnDestroy {
           firstName: user.firstName,
           lastName: user.lastName,
         },
+        preferences: user.preferences,
         regSource: regSource,
         regToken: response.regToken,
         finalizeRegistration: true,
@@ -246,17 +254,32 @@ export class CdcJsService implements OnDestroy {
     password: string,
     context?: any
   ): Observable<{ status: string }> {
+    const missingConsentErrorCode = 206001;
     return this.getSessionExpirationValue().pipe(
       switchMap((sessionExpiration) => {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
+          include: 'missing-required-fields',
+          ignoreInterruptions: true,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,
         }).pipe(
           take(1),
           tap({
-            error: (response) => this.handleLoginError(response),
+            error: (response) => {
+              if (response.errorCode !== missingConsentErrorCode) {
+                this.handleLoginError(response);
+              } else {
+                this.raiseCdcReconsentEvent(
+                  email,
+                  password,
+                  response.missingRequiredFields,
+                  response.errorMessage,
+                  response.regToken
+                );
+              }
+            },
           })
         );
       })
@@ -618,6 +641,97 @@ export class CdcJsService implements OnDestroy {
     });
   }
 
+  /**
+   * Retrieves consent statements for logged in CDC site (based on CDC site API Key)
+   * @param persistToLocalStorage - set this to true, if you want to save the fetched CDC consents to a local storage
+   * @returns - Observable with site consent details
+   */
+  getSiteConsentDetails(
+    persistToLocalStorage: boolean = false
+  ): Observable<CdcSiteConsentTemplate> {
+    const baseSite: string = this.getCurrentBaseSite();
+    const javascriptURL: string = this.getJavascriptUrlForCurrentSite(baseSite);
+    const queryParams = new URLSearchParams(
+      javascriptURL.substring(javascriptURL.indexOf('?'))
+    );
+    const siteApiKey: string | null = queryParams.get('apikey');
+    return this.invokeAPI('accounts.getSiteConsentDetails', {
+      apiKey: siteApiKey,
+    }).pipe(
+      tap({
+        next: (response) => {
+          if (persistToLocalStorage) {
+            this.consentStore.persistCdcConsentsToStorage(response);
+          }
+        },
+      })
+    );
+  }
+
+  /**
+   * Triggers the update (give/withdraw) of a CDC consent for a user
+   * @param uid - user ID of the logged in user
+   * @param lang - current storefront language
+   * @param preferences - object containing the preference details
+   * @param regToken - optional parameter, which is necessary when reconsent is provided during login scenario
+   * @returns - returns Observable with error code and status
+   */
+  setUserConsentPreferences(
+    uid: string,
+    lang: string,
+    preferences: any,
+    regToken?: string
+  ): Observable<{ errorCode: number; errorMessage: string }> {
+    const regSource: string = this.winRef.nativeWindow?.location?.href || '';
+    return this.invokeAPI(setAccountInfoAPI, {
+      uid: uid,
+      lang: lang,
+      preferences: preferences,
+      regSource: regSource,
+      regToken: regToken,
+    }).pipe(
+      tap({
+        error: (error) => {
+          throwError(error);
+        },
+      })
+    );
+  }
+
+  /**
+   * Dispatch an event when reconsent is required during login. This will be listened
+   * by reconsent module to show reconsent pop-up
+   * @param user - user ID provided in login screen
+   * @param password - password provided in login screen
+   * @param reconsentIds - missing required cdc consent IDs
+   * @param errorMessage - error message indicating that reconsent is required
+   * @param regToken - token of the login session
+   */
+  raiseCdcReconsentEvent(
+    user: string,
+    password: string,
+    reconsentIds: string[],
+    errorMessage: string,
+    regToken: string
+  ): void {
+    const consentIds: string[] = [];
+    reconsentIds.forEach((template) => {
+      const removePreference = template.replace('preferences.', '');
+      const removeIsConsentGranted = removePreference.replace(
+        '.isConsentGranted',
+        ''
+      );
+      consentIds.push(removeIsConsentGranted);
+    });
+    const newReConsentEvent = new CdcReConsentEvent();
+    newReConsentEvent.user = user;
+    newReConsentEvent.password = password;
+    newReConsentEvent.consentIds = consentIds;
+    newReConsentEvent.errorMessage = errorMessage;
+    newReConsentEvent.regToken = regToken;
+    this.eventService.dispatch(newReConsentEvent);
+  }
+
   protected logoutUser() {
     this.auth.logout();
     this.invokeAPI('accounts.logout', {});
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/integration-libs/cdc/user-account/login-form/cdc-login-form.module.ts b/integration-libs/cdc/user-account/login-form/cdc-login-form.module.ts
index 7f38848545e..ce625396c45 100644
--- a/integration-libs/cdc/user-account/login-form/cdc-login-form.module.ts
+++ b/integration-libs/cdc/user-account/login-form/cdc-login-form.module.ts
@@ -8,7 +8,6 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { CdcJsService } from '@spartacus/cdc/root';
 import {
   AuthService,
   CmsConfig,
@@ -23,7 +22,9 @@ import {
   LoginFormComponent,
   LoginFormComponentService,
 } from '@spartacus/user/account/components';
+import { CdcReconsentModule } from './reconsent/cdc-reconsent.module';
 import { CdcLoginFormComponentService } from './cdc-login-form-component.service';
+import { CdcJsService } from '@spartacus/cdc/root';
 
 @NgModule({
   imports: [
@@ -35,6 +36,7 @@ import { CdcLoginFormComponentService } from './cdc-login-form-component.service
     I18nModule,
     FormErrorsModule,
     SpinnerModule,
+    CdcReconsentModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/integration-libs/cdc/user-account/login-form/index.ts b/integration-libs/cdc/user-account/login-form/index.ts
index 9f8f7ba3f7d..76f8f243630 100644
--- a/integration-libs/cdc/user-account/login-form/index.ts
+++ b/integration-libs/cdc/user-account/login-form/index.ts
@@ -6,3 +6,4 @@
 
 export * from './cdc-login-form-component.service';
 export * from './cdc-login-form.module';
+export * from './reconsent/index';
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.spec.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.spec.ts
new file mode 100644
index 00000000000..de863e01e7b
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.spec.ts
@@ -0,0 +1,129 @@
+import { TestBed } from '@angular/core/testing';
+import { CdcUserConsentService, CdcJsService } from '@spartacus/cdc/root';
+import { GlobalMessageService } from '@spartacus/core';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { of, throwError } from 'rxjs';
+import { CdcReconsentComponentService } from './cdc-reconsent-component.service';
+import createSpy = jasmine.createSpy;
+const reconsentIds = ['consent.survey'];
+const userParams = {
+  user: 'sample@user.com',
+  password: 'password',
+  regToken: '45rytthysc2w',
+};
+class mockedGlobalMessageService implements Partial<GlobalMessageService> {
+  add = createSpy();
+  remove = createSpy();
+}
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  closeDialog = createSpy();
+}
+class MockCdcUserConsentService implements Partial<CdcUserConsentService> {
+  updateCdcConsent = createSpy();
+}
+class MockCdcJsService implements Partial<CdcJsService> {
+  didLoad = createSpy();
+  loginUserWithoutScreenSet = createSpy();
+}
+describe('CdcReconsentComponentService', () => {
+  let service: CdcReconsentComponentService;
+  let cdcUserConsentService: CdcUserConsentService;
+  let cdcJsService: CdcJsService;
+  let globalMessageService: GlobalMessageService;
+  let launchDialogService: LaunchDialogService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      providers: [
+        CdcJsService,
+        GlobalMessageService,
+        LaunchDialogService,
+        { provide: CdcUserConsentService, useClass: MockCdcUserConsentService },
+        { provide: CdcJsService, useClass: MockCdcJsService },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: GlobalMessageService, useClass: mockedGlobalMessageService },
+      ],
+    });
+    service = TestBed.inject(CdcReconsentComponentService);
+    cdcJsService = TestBed.inject(CdcJsService);
+    cdcUserConsentService = TestBed.inject(CdcUserConsentService);
+    globalMessageService = TestBed.inject(GlobalMessageService);
+    launchDialogService = TestBed.inject(LaunchDialogService);
+    TestBed.compileComponents();
+  });
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('saveConsentAndLogin', () => {
+    it('on successful save of re-consent and re-login', () => {
+      cdcJsService.didLoad = createSpy().and.returnValue(of(true));
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 0, errorMessage: '' })
+      );
+      cdcJsService.loginUserWithoutScreenSet = createSpy().and.returnValue(
+        of({ status: 'OK' })
+      );
+      spyOn(service, 'handleReconsentUpdateError').and.stub();
+      service.saveConsentAndLogin(reconsentIds, userParams);
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      expect(cdcJsService.loginUserWithoutScreenSet).toHaveBeenCalledWith(
+        userParams.user,
+        userParams.password
+      );
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalled();
+      expect(service.handleReconsentUpdateError).not.toHaveBeenCalled();
+    });
+    it('on error during save of re-consent', () => {
+      cdcJsService.didLoad = createSpy().and.returnValue(of(true));
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        throwError({ errorCode: 404, errorMessage: 'error during process' })
+      );
+      cdcJsService.loginUserWithoutScreenSet = createSpy().and.returnValue(
+        of({ status: 'OK' })
+      );
+      launchDialogService.closeDialog = createSpy().and.stub();
+      spyOn(service, 'handleReconsentUpdateError').and.stub();
+      service.saveConsentAndLogin(reconsentIds, userParams);
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      expect(cdcUserConsentService.updateCdcConsent).toHaveBeenCalled();
+      expect(cdcJsService.loginUserWithoutScreenSet).not.toHaveBeenCalled();
+      expect(service.handleReconsentUpdateError).toHaveBeenCalled();
+    });
+    it('should stop processing in case of cdc load failure', () => {
+      cdcJsService.didLoad = createSpy().and.returnValue(of(false));
+      cdcJsService.loginUserWithoutScreenSet = createSpy().and.returnValue(
+        of({ status: 'ok' })
+      );
+      cdcUserConsentService.updateCdcConsent = createSpy().and.returnValue(
+        of({ errorCode: 404, errorMessage: 'error during process' })
+      );
+      globalMessageService.add = createSpy().and.stub();
+      service.saveConsentAndLogin(reconsentIds, userParams);
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      expect(cdcJsService.loginUserWithoutScreenSet).not.toHaveBeenCalled();
+      expect(cdcUserConsentService.updateCdcConsent).not.toHaveBeenCalled();
+      expect(globalMessageService.add).toHaveBeenCalled();
+    });
+  });
+  describe('handleReconsentUpdateError', () => {
+    it('should close dialog and raise error', () => {
+      launchDialogService.closeDialog = createSpy().and.stub();
+      globalMessageService.add = createSpy().and.stub();
+      service.handleReconsentUpdateError(
+        'Error During Reconsent Update',
+        'error message'
+      );
+      expect(globalMessageService.add).toHaveBeenCalled();
+      expect(launchDialogService.closeDialog).toHaveBeenCalledWith(
+        'Error During Reconsent Update'
+      );
+    });
+  });
+  describe('ngOnDestroy', () => {
+    it('should unsubscribe from any subscriptions when destroyed', () => {
+      spyOn(service['subscription'], 'unsubscribe');
+      service.ngOnDestroy();
+      expect(service['subscription'].unsubscribe).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.ts
new file mode 100644
index 00000000000..8d242681657
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-component.service.ts
@@ -0,0 +1,94 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable, OnDestroy } from '@angular/core';
+import { GlobalMessageService, GlobalMessageType } from '@spartacus/core';
+import { Subscription } from 'rxjs';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { CdcJsService, CdcUserConsentService } from '@spartacus/cdc/root';
+
+@Injectable({ providedIn: 'root' })
+export class CdcReconsentComponentService implements OnDestroy {
+  constructor(
+    protected cdcUserConsentService: CdcUserConsentService,
+    protected cdcJsService: CdcJsService,
+    protected globalMessageService: GlobalMessageService,
+    protected launchDialogService: LaunchDialogService
+  ) {}
+  protected subscription: Subscription = new Subscription();
+
+  /**
+   * saves the consent given from reconsent pop-up and triggers a re-login
+   * @param consentId - array of consent IDs
+   * @param userParams - data from login session
+   */
+  saveConsentAndLogin(consentId: string[], userParams: any) {
+    this.subscription.add(
+      this.cdcJsService.didLoad().subscribe((cdcLoaded) => {
+        if (cdcLoaded) {
+          this.cdcUserConsentService
+            .updateCdcConsent(
+              true,
+              consentId,
+              userParams?.user,
+              userParams?.regToken
+            )
+            .subscribe({
+              next: (result) => {
+                if (result?.errorCode === 0) {
+                  //do a automatic re-login
+                  this.cdcJsService
+                    .loginUserWithoutScreenSet(
+                      userParams.user,
+                      userParams.password
+                    )
+                    .subscribe(() => {
+                      this.launchDialogService.closeDialog('relogin triggered');
+                    });
+                }
+              },
+              error: (error) => {
+                this.handleReconsentUpdateError(
+                  'Reconsent Error',
+                  error?.message
+                );
+              },
+            });
+        } else {
+          // CDC Gigya SDK not loaded, show error to the user
+          this.globalMessageService.add(
+            {
+              key: 'errorHandlers.scriptFailedToLoad',
+            },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+        }
+      })
+    );
+  }
+
+  /**
+   * Displays error message after closing reconsent dialog
+   */
+  handleReconsentUpdateError(reason?: string, errorMessage?: string) {
+    this.launchDialogService.closeDialog(reason);
+    if (errorMessage) {
+      this.globalMessageService.add(
+        {
+          key: 'httpHandlers.badRequestPleaseLoginAgain',
+          params: {
+            errorMessage: errorMessage,
+          },
+        },
+        GlobalMessageType.MSG_TYPE_ERROR
+      );
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+}
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.spec.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.spec.ts
new file mode 100644
index 00000000000..1e671c851fb
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.spec.ts
@@ -0,0 +1,79 @@
+import { ElementRef, ViewContainerRef } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { CdcReConsentEvent } from '@spartacus/cdc/root';
+import { CxEvent, EventService } from '@spartacus/core';
+import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
+import { CdcReconsentDialogEventListener } from './cdc-reconsent-dialogue-event.listener';
+const mockEventStream$ = new BehaviorSubject<CxEvent>({});
+
+class MockEventService implements Partial<EventService> {
+  get(): Observable<any> {
+    return mockEventStream$.asObservable();
+  }
+}
+
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  openDialog(
+    _caller: LAUNCH_CALLER,
+    _openElement?: ElementRef,
+    _vcr?: ViewContainerRef
+  ) {
+    return EMPTY;
+  }
+  closeDialog(_reason: string): void {}
+}
+const mockEvent = new CdcReConsentEvent();
+mockEvent.user = 'sampleuser@company.com';
+mockEvent.password = 'password';
+mockEvent.consentIds = ['consent.survey', 'terms.of.use'];
+mockEvent.errorMessage = 'Account Registration Pending';
+mockEvent.regToken = 'xcEfsd123';
+describe('CdcReconsentDialogEventListener', () => {
+  let listener: CdcReconsentDialogEventListener;
+  let launchDialogService: LaunchDialogService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        {
+          provide: EventService,
+          useClass: MockEventService,
+        },
+        {
+          provide: LaunchDialogService,
+          useClass: MockLaunchDialogService,
+        },
+      ],
+    });
+    listener = TestBed.inject(CdcReconsentDialogEventListener);
+    launchDialogService = TestBed.inject(LaunchDialogService);
+  });
+  it('should create listener', () => {
+    expect(listener).toBeTruthy();
+  });
+  describe('onReconsent', () => {
+    it('should receive event and trigger dialog opening', () => {
+      spyOn(listener as any, 'openDialog').and.stub();
+      mockEventStream$.next(mockEvent);
+      expect(listener['openDialog']).toHaveBeenCalledWith(mockEvent);
+    });
+  });
+  describe('openDialogue', () => {
+    it('should open reconsent dialog', () => {
+      spyOn(launchDialogService, 'openDialog').and.stub();
+      listener['openDialog'](mockEvent);
+      expect(launchDialogService.openDialog).toHaveBeenCalledWith(
+        LAUNCH_CALLER.CDC_RECONSENT,
+        undefined,
+        undefined,
+        {
+          user: mockEvent.user,
+          password: mockEvent.password,
+          consentIds: mockEvent.consentIds,
+          errorMessage: mockEvent.errorMessage,
+          regToken: mockEvent.regToken,
+        }
+      );
+    });
+  });
+});
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.ts
new file mode 100644
index 00000000000..f34e54ac0a0
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent-dialogue-event.listener.ts
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable, OnDestroy } from '@angular/core';
+import { CdcReConsentEvent } from '@spartacus/cdc/root';
+import { EventService } from '@spartacus/core';
+import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import { Subscription } from 'rxjs';
+import { take } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root',
+})
+export class CdcReconsentDialogEventListener implements OnDestroy {
+  protected subscription = new Subscription();
+
+  constructor(
+    protected eventService: EventService,
+    protected launchDialogService: LaunchDialogService
+  ) {
+    this.onReconsent();
+  }
+  protected onReconsent() {
+    this.subscription.add(
+      this.eventService.get(CdcReConsentEvent).subscribe((event) => {
+        this.openDialog(event);
+      })
+    );
+  }
+
+  protected openDialog(event: CdcReConsentEvent) {
+    const reconsentData = {
+      user: event.user,
+      password: event.password,
+      consentIds: event.consentIds,
+      errorMessage: event.errorMessage,
+      regToken: event.regToken,
+    };
+    const dialog = this.launchDialogService.openDialog(
+      LAUNCH_CALLER.CDC_RECONSENT,
+      undefined,
+      undefined,
+      reconsentData
+    );
+    if (dialog) {
+      dialog.pipe(take(1)).subscribe();
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscription?.unsubscribe();
+  }
+}
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
new file mode 100644
index 00000000000..5b69d711cec
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
@@ -0,0 +1,61 @@
+<div
+  class="cx-anonymous-consent-dialog"
+  [cxFocus]="focusConfig"
+  (esc)="dismissDialog('Escape pressed', reconsentEvent.errorMessage)"
+>
+  <div class="cx-dialog-content">
+    <!-- Modal Header -->
+    <ng-container *ngIf="loaded$ | async; else loading">
+      <div class="cx-dialog-header">
+        <h3>
+          {{ 'reconsent.dialog.title' | cxTranslate }}
+        </h3>
+        <button
+          type="button"
+          class="close"
+          [attr.aria-label]="'common.close' | cxTranslate"
+          (click)="dismissDialog('Cross click', reconsentEvent.errorMessage)"
+        >
+          <span aria-hidden="true">
+            <cx-icon [type]="iconTypes.CLOSE"></cx-icon>
+          </span>
+        </button>
+      </div>
+      <div class="cx-dialog-description">
+        {{ 'reconsent.dialog.description' | cxTranslate }}
+        <div
+          class="cx-dialog-separator col-sm-12 d-xs-block d-sm-block d-md-none"
+        ></div>
+      </div>
+      <div class="cx-dialog-buttons"></div>
+      <!-- Modal Body -->
+      <div class="cx-dialog-body" *ngIf="templateList$ | async as templateList">
+        <div
+          class="cx-dialog-row col-sm-12 col-md-6"
+          *ngFor="let consentTemplate of templateList"
+        >
+          <cx-consent-management-form
+            [consentTemplate]="consentTemplate"
+            (consentChanged)="onConsentChange($event)"
+          ></cx-consent-management-form>
+        </div>
+      </div>
+      <!-- Actions -->
+      <div class="cx-dialog-buttons">
+        <a
+          [class.disabled]="disableSubmitButton"
+          (click)="
+            dismissDialog('Proceed To Login', reconsentEvent.errorMessage)
+          "
+          class="btn btn-primary"
+          autofocus
+          >{{ 'common.submit' | cxTranslate }}</a
+        >
+      </div>
+    </ng-container>
+  </div>
+
+  <ng-template #loading>
+    <cx-spinner></cx-spinner>
+  </ng-template>
+</div>
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.spec.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.spec.ts
new file mode 100644
index 00000000000..9518d217c9b
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.spec.ts
@@ -0,0 +1,147 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { of, Subscription } from 'rxjs';
+import { CdcReconsentComponent } from './cdc-reconsent.component';
+import { CdcReconsentComponentService } from './cdc-reconsent-component.service';
+import { AnonymousConsentsService } from '@spartacus/core';
+import { take } from 'rxjs/operators';
+import createSpy = jasmine.createSpy;
+const reconsentEvent = {
+  user: 'sample@user.com',
+  password: 'password',
+  regToken: 'fg56sdfg',
+  errorMessage: 'Account registration pending',
+  consentIds: ['consent.survey'],
+};
+class MockSubscription {
+  unsubscribe() {}
+  add() {}
+}
+class MockCdcReconsentService implements Partial<CdcReconsentComponentService> {
+  saveReconsent = createSpy();
+  handleReconsentUpdateError = createSpy();
+}
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  data$ = of(reconsentEvent);
+}
+
+class MockAnonymousConsentsService
+  implements Partial<AnonymousConsentsService> {}
+describe('CdcReconsentComponent', () => {
+  let component: CdcReconsentComponent;
+  let fixture: ComponentFixture<CdcReconsentComponent>;
+  let cdcReconsentService: CdcReconsentComponentService;
+  let anonymousConsentsService: AnonymousConsentsService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      providers: [
+        { provide: Subscription, useValue: MockSubscription },
+        {
+          provide: AnonymousConsentsService,
+          useClass: MockAnonymousConsentsService,
+        },
+        {
+          provide: CdcReconsentComponentService,
+          useValue: MockCdcReconsentService,
+        },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+      ],
+      declarations: [CdcReconsentComponent],
+    });
+    cdcReconsentService = TestBed.inject(CdcReconsentComponentService);
+    anonymousConsentsService = TestBed.inject(AnonymousConsentsService);
+    fixture = TestBed.createComponent(CdcReconsentComponent);
+    component = fixture.componentInstance;
+  });
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+  describe('ngOnInit', () => {
+    it('should initialize the component', () => {
+      spyOn(component, 'loadConsents').and.stub();
+      component.reconsentEvent = {};
+      component.ngOnInit();
+      expect(component.reconsentEvent.user).toEqual(reconsentEvent.user);
+      expect(component.reconsentEvent.password).toEqual(
+        reconsentEvent.password
+      );
+      expect(component.reconsentEvent.regToken).toEqual(
+        reconsentEvent.regToken
+      );
+      expect(component.reconsentEvent.errorMessage).toEqual(
+        reconsentEvent.errorMessage
+      );
+      expect(component.loadConsents).toHaveBeenCalledWith(
+        reconsentEvent.consentIds
+      );
+    });
+  });
+  describe('onConsentChange', () => {
+    it('if consent is given', () => {
+      component.totalConsents = 2;
+      component.selectedConsents = ['terms.of.use'];
+      component.disableSubmitButton = true;
+      component.onConsentChange({
+        given: true,
+        template: { id: 'consent.survey' },
+      });
+      expect(component.disableSubmitButton).toEqual(false);
+      expect(component.selectedConsents).toEqual([
+        'terms.of.use',
+        'consent.survey',
+      ]);
+    });
+    it('if consent is withdrawn', () => {
+      component.totalConsents = 2;
+      component.selectedConsents = ['terms.of.use', 'consent.survey'];
+      component.disableSubmitButton = false;
+      component.onConsentChange({
+        given: false,
+        template: { id: 'consent.survey' },
+      });
+      expect(component.disableSubmitButton).toEqual(true);
+      expect(component.selectedConsents).toEqual(['terms.of.use']);
+    });
+  });
+  describe('loadConsents', () => {
+    const anonymousConsents = [
+      { id: 'terms.of.use' },
+      { id: 'consent.survey' },
+      { id: 'privacy.use' },
+    ];
+    const reconsentIds = ['consent.survey', 'privacy.use'];
+    const expectedOutput = [{ id: 'consent.survey' }, { id: 'privacy.use' }];
+    it('should load all anonymous consents', () => {
+      anonymousConsentsService.getTemplates = createSpy().and.returnValue(
+        of(anonymousConsents)
+      );
+      component.loadConsents(reconsentIds);
+      component.templateList$.pipe(take(1)).subscribe((value) => {
+        expect(component.totalConsents).toEqual(2);
+        expect(value).toEqual(expectedOutput);
+      });
+    });
+  });
+  describe('dismissDialog', () => {
+    it('should proceed to login', () => {
+      cdcReconsentService.saveConsentAndLogin = createSpy().and.stub();
+      component.dismissDialog('Proceed To Login');
+      expect(cdcReconsentService.saveConsentAndLogin).toHaveBeenCalled();
+    });
+    it('should not proceed to login', () => {
+      cdcReconsentService.handleReconsentUpdateError = createSpy().and.stub();
+      component.dismissDialog('Error Reason', 'Error message during login');
+      expect(
+        cdcReconsentService.handleReconsentUpdateError
+      ).toHaveBeenCalledWith('Error Reason', 'Error message during login');
+    });
+  });
+  describe('ngOnDestroy', () => {
+    it('should unsubscribe from any subscriptions when destroyed', () => {
+      spyOn(component['subscription'], 'unsubscribe');
+      component.ngOnDestroy();
+      expect(component['subscription'].unsubscribe).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.ts
new file mode 100644
index 00000000000..0e1b5dbc559
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.ts
@@ -0,0 +1,115 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import { AnonymousConsentsService, ConsentTemplate } from '@spartacus/core';
+import {
+  FocusConfig,
+  ICON_TYPE,
+  LaunchDialogService,
+} from '@spartacus/storefront';
+import { Observable, of, Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { CdcReconsentComponentService } from './cdc-reconsent-component.service';
+
+@Component({
+  selector: 'cx-anonymous-consent-dialog', //reusing existing selector
+  templateUrl: './cdc-reconsent.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class CdcReconsentComponent implements OnInit, OnDestroy {
+  protected subscription = new Subscription();
+
+  form: UntypedFormGroup = new UntypedFormGroup({});
+  iconTypes = ICON_TYPE;
+  loaded$: Observable<boolean> = of(false);
+
+  templateList$: Observable<ConsentTemplate[]>;
+  reconsentEvent: any = {};
+
+  selectedConsents: string[] = [];
+  disableSubmitButton: boolean = true;
+  totalConsents: number = 0;
+
+  focusConfig: FocusConfig = {
+    trap: true,
+    block: true,
+    autofocus: 'button',
+    focusOnEscape: true,
+  };
+
+  constructor(
+    protected launchDialogService: LaunchDialogService,
+    protected anonymousConsentsService: AnonymousConsentsService,
+    protected cdcReconsentService: CdcReconsentComponentService
+  ) {}
+
+  ngOnInit(): void {
+    this.subscription.add(
+      this.launchDialogService.data$.subscribe((data) => {
+        this.reconsentEvent['user'] = data.user;
+        this.reconsentEvent['password'] = data.password;
+        this.reconsentEvent['regToken'] = data.regToken;
+        this.reconsentEvent['errorMessage'] = data.errorMessage;
+        this.loadConsents(data.consentIds);
+      })
+    );
+  }
+
+  loadConsents(reconsentIds: string[]): void {
+    this.templateList$ = this.anonymousConsentsService.getTemplates(true).pipe(
+      map((templateList) => {
+        const output: ConsentTemplate[] = [];
+        templateList.forEach((template) => {
+          if (template.id && reconsentIds.includes(template.id)) {
+            output.push(template);
+          }
+        });
+        this.totalConsents = output.length;
+        return output;
+      })
+    );
+    this.loaded$ = of(true);
+  }
+
+  onConsentChange(event: { given: boolean; template: ConsentTemplate }) {
+    if (event.given === false && event.template?.id) {
+      const index: number = this.selectedConsents.indexOf(event.template.id);
+      if (index !== -1) {
+        this.selectedConsents.splice(index, 1);
+      }
+    } else if (event.given === true && event.template?.id) {
+      this.selectedConsents.push(event.template.id);
+    }
+    if (this.totalConsents === this.selectedConsents.length) {
+      this.disableSubmitButton = false;
+    } else {
+      this.disableSubmitButton = true;
+    }
+  }
+
+  dismissDialog(reason?: any, message?: string): void {
+    if (reason === 'Proceed To Login') {
+      this.loaded$ = of(false);
+      this.cdcReconsentService.saveConsentAndLogin(
+        this.selectedConsents,
+        this.reconsentEvent
+      );
+    } else {
+      this.cdcReconsentService.handleReconsentUpdateError(reason, message);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subscription?.unsubscribe();
+  }
+}
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.module.ts b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.module.ts
new file mode 100644
index 00000000000..9a7ba5dce0c
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.module.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  ConsentManagementModule,
+  IconModule,
+  KeyboardFocusModule,
+  SpinnerModule,
+} from '@spartacus/storefront';
+import { CdcReconsentDialogEventListener } from './cdc-reconsent-dialogue-event.listener';
+import { CdcReconsentComponent } from './cdc-reconsent.component';
+import { defaultCdcReconsentLayoutConfig } from './default-cdc-reconsent-layout.config';
+
+@NgModule({
+  providers: [provideDefaultConfig(defaultCdcReconsentLayoutConfig)],
+  declarations: [CdcReconsentComponent],
+  exports: [CdcReconsentComponent],
+  imports: [
+    CommonModule,
+    SpinnerModule,
+    IconModule,
+    I18nModule,
+    KeyboardFocusModule,
+    ConsentManagementModule,
+  ],
+})
+export class CdcReconsentModule {
+  constructor(
+    _cdcReconsentDialogEventListener: CdcReconsentDialogEventListener
+  ) {
+    // Intentional empty constructor
+  }
+}
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/default-cdc-reconsent-layout.config.ts b/integration-libs/cdc/user-account/login-form/reconsent/default-cdc-reconsent-layout.config.ts
new file mode 100644
index 00000000000..c6951f4796b
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/default-cdc-reconsent-layout.config.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DIALOG_TYPE, LayoutConfig } from '@spartacus/storefront';
+import { CdcReconsentComponent } from './cdc-reconsent.component';
+
+export const defaultCdcReconsentLayoutConfig: LayoutConfig = {
+  launch: {
+    CDC_RECONSENT: {
+      inlineRoot: true,
+      component: CdcReconsentComponent,
+      dialogType: DIALOG_TYPE.DIALOG,
+    },
+  },
+};
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/index.ts b/integration-libs/cdc/user-account/login-form/reconsent/index.ts
new file mode 100644
index 00000000000..f0ea2e91ea1
--- /dev/null
+++ b/integration-libs/cdc/user-account/login-form/reconsent/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-reconsent-dialogue-event.listener';
+export * from './cdc-reconsent.component';
+export * from './cdc-reconsent.module';
+export * from './cdc-reconsent-component.service';
+export * from './default-cdc-reconsent-layout.config';
diff --git a/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts b/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
index 51905f57637..fbd50323005 100644
--- a/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
+++ b/integration-libs/cdc/user-profile/register/cdc-register-component.service.spec.ts
@@ -1,9 +1,15 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Store } from '@ngrx/store';
-import { CdcJsService } from '@spartacus/cdc/root';
 import {
+  CdcConsentManagementComponentService,
+  CdcJsService,
+} from '@spartacus/cdc/root';
+import {
+  AnonymousConsentsService,
   AuthService,
+  ConverterService,
   EventService,
   GlobalMessageService,
   GlobalMessageType,
@@ -29,6 +35,7 @@ const userRegisterFormData: UserSignUp = {
   lastName: 'lastName',
   uid: 'uid',
   password: 'password',
+  preferences: {},
 };
 
 class MockUserProfileFacade implements Partial<UserProfileFacade> {
@@ -70,7 +77,22 @@ const mockedGlobalMessageService = {
   add: () => {},
   remove: () => {},
 };
-
+class MockConverterService implements Partial<ConverterService> {
+  convert = createSpy();
+}
+class MockCdcConsentManagementService
+  implements Partial<CdcConsentManagementComponentService>
+{
+  getCdcConsentIDs = createSpy();
+}
+class MockAnonymousConsentsService
+  implements Partial<AnonymousConsentsService>
+{
+  getTemplates = createSpy();
+}
+class MockUntypedFormBuilder implements Partial<UntypedFormBuilder> {
+  array = createSpy();
+}
 describe('CdcRegisterComponentService', () => {
   let cdcUserRegisterService: CDCRegisterComponentService;
   let connector: UserProfileConnector;
@@ -79,6 +101,10 @@ describe('CdcRegisterComponentService', () => {
   let userRegisterFacade: UserRegisterFacade;
   let authService: AuthService;
   let eventService: EventService;
+  let converter: ConverterService;
+  let cdcConsentManagementService: CdcConsentManagementComponentService;
+  let fb: UntypedFormBuilder;
+  let anonymousConsentsService: AnonymousConsentsService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -95,6 +121,22 @@ describe('CdcRegisterComponentService', () => {
         { provide: UserRegisterFacade, useClass: MockUserRegisterFacade },
         { provide: EventService, useClass: MockEventService },
         { provide: GlobalMessageService, useValue: mockedGlobalMessageService },
+        {
+          provide: ConverterService,
+          useClass: MockConverterService,
+        },
+        {
+          provide: CdcConsentManagementComponentService,
+          useClass: MockCdcConsentManagementService,
+        },
+        {
+          provide: UntypedFormBuilder,
+          useClass: MockUntypedFormBuilder,
+        },
+        {
+          provide: AnonymousConsentsService,
+          useClass: MockAnonymousConsentsService,
+        },
         CDCRegisterComponentService,
       ],
     });
@@ -106,7 +148,12 @@ describe('CdcRegisterComponentService', () => {
     userRegisterFacade = TestBed.inject(UserRegisterFacade);
     authService = TestBed.inject(AuthService);
     eventService = TestBed.inject(EventService);
-
+    converter = TestBed.inject(ConverterService);
+    cdcConsentManagementService = TestBed.inject(
+      CdcConsentManagementComponentService
+    );
+    anonymousConsentsService = TestBed.inject(AnonymousConsentsService);
+    fb = TestBed.inject(UntypedFormBuilder);
     TestBed.compileComponents();
   });
 
@@ -128,6 +175,15 @@ describe('CdcRegisterComponentService', () => {
 
   describe('Register', () => {
     it('should be able to register user through CDC', (done) => {
+      converter.convert = createSpy().and.returnValue({
+        others: {
+          survey: {
+            isConsentGranted: true,
+          },
+        },
+      });
+      cdcConsentManagementService.getCdcConsentIDs =
+        createSpy().and.returnValue(['others.survey']);
       cdcUserRegisterService.register(userRegisterFormData).subscribe(() => {
         expect(connector.register).not.toHaveBeenCalled();
         expect(cdcJsService.registerUserWithoutScreenSet).toHaveBeenCalledWith({
@@ -136,6 +192,13 @@ describe('CdcRegisterComponentService', () => {
           lastName: 'lastName',
           uid: 'uid',
           password: 'password',
+          preferences: {
+            others: {
+              survey: {
+                isConsentGranted: true,
+              },
+            },
+          },
         });
       });
       expect(cdcJsService.didLoad).toHaveBeenCalled();
@@ -145,6 +208,8 @@ describe('CdcRegisterComponentService', () => {
     it('should NOT happen without CDC, should show error', (done) => {
       spyOn(globalMessageService, 'remove');
       spyOn(globalMessageService, 'add');
+      cdcConsentManagementService.getCdcConsentIDs =
+        createSpy().and.returnValue(['others.survey']);
       cdcJsService.didLoad = createSpy().and.callFake(() => of(false));
       cdcUserRegisterService.register(userRegisterFormData).subscribe({
         error: () => {
@@ -170,6 +235,8 @@ describe('CdcRegisterComponentService', () => {
       cdcJsService.registerUserWithoutScreenSet = createSpy().and.returnValue(
         throwError('ERROR')
       );
+      cdcUserRegisterService.generatePreferencesObject =
+        createSpy().and.returnValue({});
 
       cdcUserRegisterService.register(userRegisterFormData).subscribe({
         error: () => {
@@ -182,6 +249,7 @@ describe('CdcRegisterComponentService', () => {
             lastName: 'lastName',
             uid: 'uid',
             password: 'password',
+            preferences: {},
           });
         },
       });
@@ -191,7 +259,8 @@ describe('CdcRegisterComponentService', () => {
 
     it('should throw error when CDC user token fails', (done) => {
       eventService.get = createSpy().and.returnValue(of(true));
-
+      cdcConsentManagementService.getCdcConsentIDs =
+        createSpy().and.returnValue(['others.survey']);
       cdcUserRegisterService.register(userRegisterFormData).subscribe({
         error: () => {
           expect(connector.register).not.toHaveBeenCalled();
@@ -213,7 +282,15 @@ describe('CdcRegisterComponentService', () => {
 
     it('should not do anything when user is not logged in', (done) => {
       authService.isUserLoggedIn = createSpy().and.returnValue(of(false));
-
+      converter.convert = createSpy().and.returnValue({
+        others: {
+          survey: {
+            isConsentGranted: true,
+          },
+        },
+      });
+      cdcConsentManagementService.getCdcConsentIDs =
+        createSpy().and.returnValue(['others.survey']);
       cdcUserRegisterService.register(userRegisterFormData).subscribe(() => {
         expect(connector.register).not.toHaveBeenCalled();
         expect(cdcJsService.registerUserWithoutScreenSet).toHaveBeenCalledWith({
@@ -222,10 +299,122 @@ describe('CdcRegisterComponentService', () => {
           lastName: 'lastName',
           uid: 'uid',
           password: 'password',
+          preferences: {
+            others: {
+              survey: {
+                isConsentGranted: true,
+              },
+            },
+          },
         });
       });
       expect(cdcJsService.didLoad).toHaveBeenCalled();
       done();
     });
+
+    it('should generate preferences for user registration', (done) => {
+      converter.convert = createSpy().and.returnValue({
+        others: {
+          survey: {
+            isConsentGranted: true,
+          },
+        },
+      });
+      cdcConsentManagementService.getCdcConsentIDs =
+        createSpy().and.returnValue(['others.survey']);
+      let result = cdcUserRegisterService.generatePreferencesObject();
+      expect(cdcConsentManagementService.getCdcConsentIDs).toHaveBeenCalled();
+      expect(result).toEqual({
+        others: {
+          survey: {
+            isConsentGranted: true,
+          },
+        },
+      });
+      done();
+    });
+  });
+  it('fetchCdcConsentsForRegistration', () => {
+    cdcConsentManagementService.getCdcConsentIDs = createSpy().and.returnValue([
+      'consent1.terms1',
+    ]);
+    anonymousConsentsService.getTemplates = createSpy().and.returnValue(
+      of([
+        {
+          id: 'consent1.terms1',
+          description: 'sample consent 1',
+        },
+        {
+          id: 'consent2.terms2',
+          description: 'sample consent 2',
+        },
+        {
+          id: 'consent3.terms3',
+          description: 'sample consent 3',
+        },
+      ])
+    );
+    let result = cdcUserRegisterService.fetchCdcConsentsForRegistration();
+    expect(anonymousConsentsService.getTemplates).toHaveBeenCalled();
+    expect(cdcConsentManagementService.getCdcConsentIDs).toHaveBeenCalled();
+    expect(result).toEqual([
+      {
+        id: 'consent1.terms1',
+        description: 'sample consent 1',
+      },
+    ]);
+  });
+  it('generateAdditionalConsentsFormControl', () => {
+    spyOn(
+      cdcUserRegisterService,
+      'fetchCdcConsentsForRegistration'
+    ).and.returnValue([
+      {
+        id: 'consent1.terms1',
+        description: 'sample consent 1',
+      },
+    ]);
+    fb.array = createSpy().and.returnValue([]);
+    cdcUserRegisterService.generateAdditionalConsentsFormControl();
+    expect(
+      cdcUserRegisterService.fetchCdcConsentsForRegistration
+    ).toHaveBeenCalled();
+    expect(fb.array).toHaveBeenCalled();
+  });
+  it('loadAdditionalConsents', () => {
+    spyOn(
+      cdcUserRegisterService,
+      'fetchCdcConsentsForRegistration'
+    ).and.returnValue([
+      {
+        id: 'consent2.terms2',
+        description: 'sample consent 2',
+      },
+      {
+        id: 'consent3.terms3',
+        description: 'sample consent 3',
+      },
+    ]);
+
+    let result = cdcUserRegisterService.getAdditionalConsents();
+    expect(
+      cdcUserRegisterService.fetchCdcConsentsForRegistration
+    ).toHaveBeenCalled();
+    expect(result).toEqual([
+      {
+        template: {
+          id: 'consent2.terms2',
+          description: 'sample consent 2',
+        },
+        required: true,
+      },
+      {
+        template: {
+          id: 'consent3.terms3',
+          description: 'sample consent 3',
+        },
+        required: true,
+      },
+    ]);
   });
 });
diff --git a/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts b/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
index 3a4c1b6dd31..46ef2a0fd0f 100644
--- a/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
+++ b/integration-libs/cdc/user-profile/register/cdc-register-component.service.ts
@@ -5,12 +5,26 @@
  */
 
 import { Injectable } from '@angular/core';
+import {
+  FormControl,
+  UntypedFormArray,
+  UntypedFormBuilder,
+  Validators,
+} from '@angular/forms';
 import { Store } from '@ngrx/store';
-import { CdcJsService, CdcLoadUserTokenFailEvent } from '@spartacus/cdc/root';
 import {
+  CdcConsentManagementComponentService,
+  CdcJsService,
+  CdcLoadUserTokenFailEvent,
+  CDC_USER_PREFERENCE_SERIALIZER,
+} from '@spartacus/cdc/root';
+import {
+  AnonymousConsentsService,
   AuthService,
   Command,
   CommandService,
+  ConsentTemplate,
+  ConverterService,
   EventService,
   GlobalMessageService,
   GlobalMessageType,
@@ -59,9 +73,13 @@ export class CDCRegisterComponentService extends RegisterComponentService {
     protected globalMessageService: GlobalMessageService,
     protected authService: AuthService,
     protected eventService: EventService,
-    protected userProfileFacade: UserProfileFacade
+    protected userProfileFacade: UserProfileFacade,
+    protected cdcConsentManagementService: CdcConsentManagementComponentService,
+    protected converter: ConverterService,
+    protected fb: UntypedFormBuilder,
+    protected anonymousConsentsService: AnonymousConsentsService
   ) {
-    super(userRegisterFacade, globalMessageService);
+    super(userRegisterFacade, globalMessageService, fb);
   }
 
   /**
@@ -73,7 +91,8 @@ export class CDCRegisterComponentService extends RegisterComponentService {
     if (!user.firstName || !user.lastName || !user.uid || !user.password) {
       return throwError(`The provided user is not valid: ${user}`);
     }
-
+    /** fill the user preferences */
+    user.preferences = this.generatePreferencesObject();
     return this.cdcJSService.didLoad().pipe(
       tap((cdcLoaded) => {
         if (!cdcLoaded) {
@@ -106,8 +125,84 @@ export class CDCRegisterComponentService extends RegisterComponentService {
     );
   }
 
+  /**
+   * Return preferences object that needs to be updated during register process
+   * @returns preference object
+   */
+  generatePreferencesObject(): any {
+    let preferences = {};
+    const consentIDs = this.cdcConsentManagementService.getCdcConsentIDs(); //fetch all active consents
+    for (const id of consentIDs) {
+      const consent: ConsentTemplate = {};
+      consent.id = id;
+      consent.currentConsent = {};
+      consent.currentConsent.consentGivenDate = new Date();
+      const serializedPreference: any = this.converter.convert(
+        consent,
+        CDC_USER_PREFERENCE_SERIALIZER
+      );
+      preferences = Object.assign(preferences, serializedPreference);
+    }
+    return preferences;
+  }
+
   // @override
   postRegisterMessage(): void {
     // don't show the message
   }
+
+  /**
+   * fetch consents that exist in commerce and is active in cdc
+   * @returns array of consent templates
+   */
+  fetchCdcConsentsForRegistration(): ConsentTemplate[] {
+    const consentList: ConsentTemplate[] = [];
+    const cdcActiveConsents: string[] =
+      this.cdcConsentManagementService.getCdcConsentIDs();
+    this.anonymousConsentsService.getTemplates().subscribe((templates) => {
+      if (templates && templates.length > 0) {
+        for (const template of templates) {
+          if (template.id && cdcActiveConsents.includes(template.id)) {
+            consentList.push(template);
+          }
+        }
+      }
+    });
+    return consentList;
+  }
+
+  /**
+   * generates a form array with form control for each consent
+   * @returns a form array
+   */
+  generateAdditionalConsentsFormControl(): UntypedFormArray {
+    const consentArray = this.fb.array([]);
+    const templates: ConsentTemplate[] = this.fetchCdcConsentsForRegistration();
+    for (const _template of templates) {
+      consentArray.push(new FormControl(false, [Validators.requiredTrue]));
+    }
+    return consentArray;
+  }
+
+  /**
+   * creates an array of active cdc consents and makes them mandatory to be provided during registration
+   * @returns consent templates in the necessary format for the component
+   */
+  getAdditionalConsents(): {
+    template: ConsentTemplate;
+    required: boolean;
+  }[] {
+    const templates: ConsentTemplate[] = this.fetchCdcConsentsForRegistration();
+    const returnConsents: {
+      template: ConsentTemplate;
+      required: boolean;
+    }[] = [];
+    for (const template of templates) {
+      const returnConsent: any = {};
+      returnConsent['template'] = template;
+      returnConsent['required'] = true; //these consents are always mandatory
+      returnConsents.push(returnConsent);
+    }
+    return returnConsents;
+  }
 }
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index aae36a89bbb..ff9faf3f3a5 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index 748b32b1755..14d788b8add 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -448,6 +448,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/projects/core/src/user/connectors/consent/user-consent.adapter.ts b/projects/core/src/user/connectors/consent/user-consent.adapter.ts
index 162c78ac5f1..550d7f419da 100644
--- a/projects/core/src/user/connectors/consent/user-consent.adapter.ts
+++ b/projects/core/src/user/connectors/consent/user-consent.adapter.ts
@@ -16,5 +16,9 @@ export abstract class UserConsentAdapter {
     consentTemplateVersion: number
   ): Observable<ConsentTemplate>;
 
-  abstract withdrawConsent(userId: string, consentCode: string): Observable<{}>;
+  abstract withdrawConsent(
+    userId: string,
+    consentCode: string,
+    consentId?: string
+  ): Observable<{}>;
 }
diff --git a/projects/core/src/user/connectors/consent/user-consent.connector.spec.ts b/projects/core/src/user/connectors/consent/user-consent.connector.spec.ts
index 60645284157..8bea2754a3f 100644
--- a/projects/core/src/user/connectors/consent/user-consent.connector.spec.ts
+++ b/projects/core/src/user/connectors/consent/user-consent.connector.spec.ts
@@ -46,12 +46,13 @@ describe('UserConsentConnector', () => {
   it('withdrawConsent should call adapter', () => {
     let result;
     service
-      .withdrawConsent('userId', 'consentCode')
+      .withdrawConsent('userId', 'consentCode', 'consentId')
       .subscribe((res) => (result = res));
     expect(result).toEqual({});
     expect(adapter.withdrawConsent).toHaveBeenCalledWith(
       'userId',
-      'consentCode'
+      'consentCode',
+      'consentId'
     );
   });
 });
diff --git a/projects/core/src/user/connectors/consent/user-consent.connector.ts b/projects/core/src/user/connectors/consent/user-consent.connector.ts
index 619de7a7e9c..224482cfbab 100644
--- a/projects/core/src/user/connectors/consent/user-consent.connector.ts
+++ b/projects/core/src/user/connectors/consent/user-consent.connector.ts
@@ -31,7 +31,11 @@ export class UserConsentConnector {
     );
   }
 
-  withdrawConsent(userId: string, consentCode: string): Observable<{}> {
-    return this.adapter.withdrawConsent(userId, consentCode);
+  withdrawConsent(
+    userId: string,
+    consentCode: string,
+    consentId?: string
+  ): Observable<{}> {
+    return this.adapter.withdrawConsent(userId, consentCode, consentId);
   }
 }
diff --git a/projects/core/src/user/facade/user-consent.service.spec.ts b/projects/core/src/user/facade/user-consent.service.spec.ts
index 2a82aed0b7f..b41f0bd262f 100644
--- a/projects/core/src/user/facade/user-consent.service.spec.ts
+++ b/projects/core/src/user/facade/user-consent.service.spec.ts
@@ -416,11 +416,13 @@ describe('UserConsentService', () => {
     describe('withdrawConsent', () => {
       it('should dispatch an action', () => {
         const consentCode = 'xxx';
-        service.withdrawConsent(consentCode);
+        const consentId = 'yyy';
+        service.withdrawConsent(consentCode, consentId);
         expect(store.dispatch).toHaveBeenCalledWith(
           new UserActions.WithdrawUserConsent({
             userId,
             consentCode,
+            consentId,
           })
         );
       });
diff --git a/projects/core/src/user/facade/user-consent.service.ts b/projects/core/src/user/facade/user-consent.service.ts
index df9c15e369d..e1805c30faa 100644
--- a/projects/core/src/user/facade/user-consent.service.ts
+++ b/projects/core/src/user/facade/user-consent.service.ts
@@ -236,12 +236,13 @@ export class UserConsentService {
    * Withdraw consent for the given `consentCode`
    * @param consentCode for which to withdraw the consent
    */
-  withdrawConsent(consentCode: string): void {
+  withdrawConsent(consentCode: string, consentId?: string): void {
     this.userIdService.takeUserId().subscribe((userId) => {
       this.store.dispatch(
         new UserActions.WithdrawUserConsent({
           userId,
           consentCode,
+          consentId,
         })
       );
     });
diff --git a/projects/core/src/user/store/actions/user-consents.action.ts b/projects/core/src/user/store/actions/user-consents.action.ts
index c12d6bd7fce..cab58b0c3c5 100644
--- a/projects/core/src/user/store/actions/user-consents.action.ts
+++ b/projects/core/src/user/store/actions/user-consents.action.ts
@@ -111,6 +111,7 @@ export class WithdrawUserConsent extends StateUtils.EntityLoadAction {
     public payload: {
       userId: string;
       consentCode: string;
+      consentId?: string;
     }
   ) {
     super(PROCESS_FEATURE, WITHDRAW_CONSENT_PROCESS_ID);
diff --git a/projects/core/src/user/store/effects/user-consents.effect.ts b/projects/core/src/user/store/effects/user-consents.effect.ts
index d67d1273215..bc0a9380a7c 100644
--- a/projects/core/src/user/store/effects/user-consents.effect.ts
+++ b/projects/core/src/user/store/effects/user-consents.effect.ts
@@ -94,17 +94,19 @@ export class UserConsentsEffect {
       this.actions$.pipe(
         ofType(UserActions.WITHDRAW_USER_CONSENT),
         map((action: UserActions.WithdrawUserConsent) => action.payload),
-        concatMap(({ userId, consentCode }) =>
-          this.userConsentConnector.withdrawConsent(userId, consentCode).pipe(
-            map(() => new UserActions.WithdrawUserConsentSuccess()),
-            catchError((error) =>
-              of(
-                new UserActions.WithdrawUserConsentFail(
-                  normalizeHttpError(error, this.logger)
+        concatMap(({ userId, consentCode, consentId }) =>
+          this.userConsentConnector
+            .withdrawConsent(userId, consentCode, consentId)
+            .pipe(
+              map(() => new UserActions.WithdrawUserConsentSuccess()),
+              catchError((error) =>
+                of(
+                  new UserActions.WithdrawUserConsentFail(
+                    normalizeHttpError(error, this.logger)
+                  )
                 )
               )
             )
-          )
         )
       )
   );
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
index 6ff77227362..6d7f2adf005 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
@@ -13,6 +13,7 @@ import {
   USER_PROFILE_FEATURE_NAME,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
   SPARTACUS_CDC_ORGANIZATION_ADMINISTRATION,
+  SPARTACUS_CDC_ASSETS,
 } from '../../libs-constants';
 import { AdditionalFeatureConfiguration } from '../../utils/feature-utils';
 import { LibraryOptions, SchematicConfig } from '../../utils/lib-utils';
@@ -41,6 +42,9 @@ export const CDC_USER_ACCOUNT_MODULE = 'CDCUserAccountModule';
 export const CDC_USER_PROFILE_MODULE = 'CDCUserProfileModule';
 export const CDC_ADMINISTRATION_MODULE = 'CdcAdministrationModule';
 
+export const CDC_TRANSLATION_CHUNKS_CONFIG = 'cdcTranslationChunksConfig';
+export const CDC_TRANSLATIONS = 'cdcTranslations';
+
 export const CDC_SCHEMATICS_CONFIG: SchematicConfig = {
   library: {
     featureName: CDC_FEATURE_NAME,
@@ -76,6 +80,11 @@ export const CDC_SCHEMATICS_CONFIG: SchematicConfig = {
     content: `${CDC_ROOT_MODULE}`,
   },
   customConfig: buildCdcConfig,
+  i18n: {
+    resources: CDC_TRANSLATIONS,
+    chunks: CDC_TRANSLATION_CHUNKS_CONFIG,
+    importPath: SPARTACUS_CDC_ASSETS,
+  },
   dependencyFeatures: [
     USER_PROFILE_FEATURE_NAME,
     ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index c25bdd3a183..3d2e69c7a73 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -176,6 +176,7 @@ export const SPARTACUS_CDS = `@spartacus/cds`;
 
 export const SPARTACUS_CDC = `@spartacus/cdc`;
 export const SPARTACUS_CDC_ROOT = `@spartacus/cdc/root`;
+export const SPARTACUS_CDC_ASSETS = `@spartacus/cdc/assets`;
 export const SPARTACUS_CDC_USER_ACCOUNT = `@spartacus/cdc/user-account`;
 export const SPARTACUS_CDC_USER_PROFILE = `@spartacus/cdc/user-profile`;
 export const SPARTACUS_CDC_ORGANIZATION_ADMINISTRATION = `@spartacus/cdc/organization/administration`;
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2c/cdc-b2c-consent-management-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2c/cdc-b2c-consent-management-e2e.cy.ts
new file mode 100644
index 00000000000..680a0a76ec4
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2c/cdc-b2c-consent-management-e2e.cy.ts
@@ -0,0 +1,131 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as cdc from '../../../../helpers/vendor/cdc/cdc';
+import * as alerts from '../../../../helpers/global-message';
+import { navigateToConsentPage } from '../../../../helpers/anonymous-consents';
+import { fillRegistrationForm } from '../../../../helpers/auth-forms';
+import { clickHamburger } from '../../../../helpers/homepage';
+//import { verifyGlobalMessageAfterRegistration } from '../../../../helpers/register';
+const requiredFieldMessage = 'This field is required';
+
+/** System Setup: CDC site should contain only 2 active consents terms.test.terms.of.use (required) and consent.survey (not required)
+ *  The system should have 2 users - mentioned in cdc.b2cConsentTestUser
+ *  The cdc.b2cConsentTestUser.stuntDoubleEmail should require terms.test.terms.of.use for reconsent
+ *  The cdc.b2cConsentTestUser.email should have both consents given.
+ */
+
+describe('CDC-B2C Consent Management', () => {
+  describe('Providing Reconsent During Login', () => {
+    it('error should appear without reconsent', () => {
+      cy.window().then((win) => win.sessionStorage.clear());
+      cy.intercept('/accounts.login', { times: 1 }, (req) => {
+        req.body = req.body.replace(
+          cdc.b2cConsentTestUser.encodedEmail,
+          cdc.b2cConsentTestUser.encodedStuntDoubleEmail
+        );
+        req.continue();
+      });
+      cy.visit('/login');
+      cdc.loginWithoutScreenSet(
+        cdc.b2cConsentTestUser.email,
+        cdc.b2cConsentTestUser.password
+      );
+      cy.get('.cx-dialog-header').contains('Profile Completion');
+      cy.get('.close').click();
+      alerts
+        .getErrorAlert()
+        .should('contain', 'Account Pending Registration. Please login again.');
+    });
+    it('provide reconsent and proceed to login', () => {
+      cy.window().then((win) => win.sessionStorage.clear());
+      cy.intercept('/accounts.login', { times: 1 }, (req) => {
+        req.body = req.body.replace(
+          cdc.b2cConsentTestUser.encodedEmail,
+          cdc.b2cConsentTestUser.encodedStuntDoubleEmail
+        );
+        req.continue();
+      });
+      cy.intercept(
+        '/accounts.setAccountInfo',
+        { times: 1 },
+        {
+          body: {
+            callId: 'c84243a81a0e4d2db0e28a25021faa66',
+            errorCode: 0,
+            apiVersion: 2,
+            statusCode: 200,
+            statusReason: 'OK',
+            time: '2023-06-12T17:25:50.729Z',
+          },
+        }
+      );
+      cy.visit('/login');
+      cdc.loginWithoutScreenSet(
+        cdc.b2cConsentTestUser.email,
+        cdc.b2cConsentTestUser.password
+      );
+      cy.get('.cx-dialog-header').contains('Profile Completion');
+      cy.get('.btn.btn-primary.disabled').contains('Submit');
+      cy.get('input[name="terms.test.terms.of.use"]').check();
+      cy.get('.btn.btn-primary').contains('Submit').click();
+      cdc.verifyLoginOrRegistrationSuccess(cdc.b2cConsentTestUser.fullName);
+    });
+  });
+  describe('My Account-> Consent Management', () => {
+    beforeEach(() => {
+      cy.window().then((win) => win.sessionStorage.clear());
+      cy.visit('/login');
+      cdc.loginWithoutScreenSet(
+        cdc.b2cConsentTestUser.email,
+        cdc.b2cConsentTestUser.password
+      );
+      navigateToConsentPage();
+    });
+    it('should successfully withdraw a cdc consent', () => {
+      cy.get('input[name="consent.survey"]').should('be.checked');
+      cy.get('input[name="consent.survey"]').uncheck();
+      cy.get('input[name="consent.survey"]').should('not.be.checked');
+      alerts
+        .getSuccessAlert()
+        .should('contain', 'Consent successfully withdrawn');
+    });
+    it('should successfully give a cdc consent', () => {
+      cy.get('input[name="consent.survey"]').should('not.be.checked');
+      cy.get('input[name="consent.survey"]').check();
+      cy.get('input[name="consent.survey"]').should('be.checked');
+      alerts.getSuccessAlert().should('contain', 'Consent successfully given');
+    });
+    it('mandatory cdc consents should be checked and in non-editable state', () => {
+      cy.get('input[name="terms.test.terms.of.use"]').should('be.checked');
+      cy.get('input[name="terms.test.terms.of.use"]').should('be.disabled');
+    });
+  });
+
+  describe('Consent Management During New User Registration', () => {
+    before(() => {
+      cy.window().then((win) => win.sessionStorage.clear());
+      cy.visit('/');
+    });
+    it('should register and redirect to home page', () => {
+      cy.onMobile(() => {
+        clickHamburger();
+      });
+      cy.findByText(/Sign in \/ Register/i).click();
+      cy.get('cx-login-register').findByText('Register').click();
+      fillRegistrationForm(cdc.user, true);
+      cy.get('button[type=submit]').findByText('Register').click();
+      cy.get('.control-invalid').each(() => {
+        cy.get('p').contains(requiredFieldMessage);
+      });
+      cy.get('[name="terms.test.terms.of.use"]').check();
+      cy.get('[name="consent.survey"]').check();
+      cy.get('button[type=submit]').findByText('Register').click();
+      //verifyGlobalMessageAfterRegistration(); //add this after bug fix
+      cdc.verifyLoginOrRegistrationSuccess(cdc.user.fullName); //remove this after bug fix
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
index a10d79fe69e..159281651b0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
@@ -26,7 +26,15 @@ export function registerUser(cdcUser) {
 
 export const user = getSampleUser(); //screenset UI user
 export const nativeUser = getSampleUser();
-
+export const b2cConsentTestUser = {
+  email: 'consenttester@xyz.com',
+  password: 'Password123.',
+  fullName: 'Consent Tester',
+  encodedEmail: 'consenttester%40xyz.com',
+  stuntDoubleEmail: 'stuntdouble@xyz.com',
+  stuntDoublePassword: 'Password123.',
+  encodedStuntDoubleEmail: 'stuntdouble%40xyz.com',
+};
 export const b2bUser = getSampleB2BUser();
 export const updatedFirstAddress = {
   ...editedAddress,
diff --git a/projects/storefrontapp/src/app/spartacus/features/cdc/cdc-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/cdc/cdc-feature.module.ts
index d9f192e7eb3..99875caca23 100644
--- a/projects/storefrontapp/src/app/spartacus/features/cdc/cdc-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/cdc/cdc-feature.module.ts
@@ -6,8 +6,11 @@
 
 import { NgModule } from '@angular/core';
 import { CdcConfig, CdcRootModule, CDC_FEATURE } from '@spartacus/cdc/root';
-import { CmsConfig, provideConfig } from '@spartacus/core';
-
+import { CmsConfig, I18nConfig, provideConfig } from '@spartacus/core';
+import {
+  cdcTranslations,
+  cdcTranslationChunksConfig,
+} from '@spartacus/cdc/assets';
 @NgModule({
   imports: [CdcRootModule],
   providers: [
@@ -32,6 +35,13 @@ import { CmsConfig, provideConfig } from '@spartacus/core';
         },
       },
     }),
+    provideConfig(<I18nConfig>{
+      i18n: {
+        resources: cdcTranslations,
+        chunks: cdcTranslationChunksConfig,
+        fallbackLang: 'en',
+      },
+    }),
   ],
 })
 export class CdcFeatureModule {}
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index fa2a711ed50..f8cdd6995de 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -289,6 +289,7 @@
       "@spartacus/user/profile": ["dist/user/profile"],
       "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
       "@spartacus/user/profile/root": ["dist/user/profile/root"],
+      "@spartacus/cdc/assets": ["dist/cdc/assets"],
       "@spartacus/cdc/components": ["dist/cdc/components"],
       "@spartacus/cdc/core": ["dist/cdc/core"],
       "@spartacus/cdc": ["dist/cdc"],
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 28b5d76d11a..d93bbb39278 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -450,6 +450,7 @@
       "@spartacus/user/profile/root": [
         "../../feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index 63a92a78ab9..f9f6d8968aa 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -328,6 +328,7 @@
       "@spartacus/user/profile": ["../../dist/user/profile"],
       "@spartacus/user/profile/occ": ["../../dist/user/profile/occ"],
       "@spartacus/user/profile/root": ["../../dist/user/profile/root"],
+      "@spartacus/cdc/assets": ["../../dist/cdc/assets"],
       "@spartacus/cdc/components": ["../../dist/cdc/components"],
       "@spartacus/cdc/core": ["../../dist/cdc/core"],
       "@spartacus/cdc": ["../../dist/cdc"],
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.html b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.html
index bf2aab7d908..8059b180de9 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.html
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.html
@@ -5,12 +5,15 @@
       class="form-check-input"
       (change)="onConsentChange()"
       [checked]="consentGiven"
+      [name]="consentTemplate.id"
       [disabled]="isRequired(consentTemplate?.id)"
     />
     <span class="form-check-label cx-be-bold">
-      {{ consentTemplate?.name }}
+      <ng-container *ngIf="consentTemplate?.name">
+        {{ consentTemplate?.name }}
+        <br />
+      </ng-container>
     </span>
-    <br />
     <span class="form-check-label">
       {{ consentTemplate?.description }}
     </span>
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
index 129d252bac7..da338c9e9b7 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-form/consent-management-form.component.spec.ts
@@ -25,6 +25,9 @@ describe('ConsentManagementFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ConsentManagementFormComponent);
     component = fixture.componentInstance;
+    component.consentTemplate = {};
+    component.requiredConsents = [];
+    component.consent = null;
     el = fixture.debugElement;
 
     fixture.detectChanges();
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.spec.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.spec.ts
index 27a6b975ad0..77bd7881407 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.spec.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.spec.ts
@@ -20,6 +20,7 @@ import {
   UserConsentService,
 } from '@spartacus/core';
 import { EMPTY, Observable, of } from 'rxjs';
+import { ConsentManagementComponentService } from '../consent-management-component.service';
 import { ConsentManagementComponent } from './consent-management.component';
 
 @Component({
@@ -133,6 +134,7 @@ describe('ConsentManagementComponent', () => {
           ConsentManagementComponent,
         ],
         providers: [
+          ConsentManagementComponentService,
           { provide: UserConsentService, useClass: UserConsentServiceMock },
           { provide: GlobalMessageService, useClass: GlobalMessageServiceMock },
           {
@@ -412,7 +414,8 @@ describe('ConsentManagementComponent', () => {
           });
 
           expect(userService.withdrawConsent).toHaveBeenCalledWith(
-            mockConsentTemplate.currentConsent.code
+            mockConsentTemplate.currentConsent.code,
+            mockConsentTemplate.id
           );
           expect(userService.giveConsent).not.toHaveBeenCalled();
         });
@@ -524,7 +527,8 @@ describe('ConsentManagementComponent', () => {
           component.rejectAll([mockConsentTemplate]);
 
           expect(userService.withdrawConsent).toHaveBeenCalledWith(
-            mockConsentTemplate.currentConsent.code
+            mockConsentTemplate.currentConsent.code,
+            mockConsentTemplate.id
           );
           expect(userService.withdrawConsent).toHaveBeenCalledTimes(1);
         });
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.ts
index 7bc550d59f5..ec3092180d2 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/components/consent-management.component.ts
@@ -30,6 +30,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators';
+import { ConsentManagementComponentService } from '../consent-management-component.service';
 
 @Component({
   selector: 'cx-consent-management',
@@ -49,7 +50,8 @@ export class ConsentManagementComponent implements OnInit, OnDestroy {
     protected globalMessageService: GlobalMessageService,
     protected anonymousConsentsConfig: AnonymousConsentsConfig,
     protected anonymousConsentsService: AnonymousConsentsService,
-    protected authService: AuthService
+    protected authService: AuthService,
+    protected consentManagementComponentService?: ConsentManagementComponentService
   ) {}
 
   ngOnInit(): void {
@@ -95,11 +97,12 @@ export class ConsentManagementComponent implements OnInit, OnDestroy {
         }
       }),
       map(([templateList, anonymousTemplates]) => {
+        this.requiredConsents = this.consentManagementComponentService
+          ? this.consentManagementComponentService.getRequiredConsents(
+              templateList
+            )
+          : [];
         if (this.anonymousConsentsConfig.anonymousConsents) {
-          if (this.anonymousConsentsConfig.anonymousConsents.requiredConsents) {
-            this.requiredConsents =
-              this.anonymousConsentsConfig.anonymousConsents.requiredConsents;
-          }
           if (
             this.anonymousConsentsConfig.anonymousConsents.consentManagementPage
           ) {
@@ -192,7 +195,10 @@ export class ConsentManagementComponent implements OnInit, OnDestroy {
     if (given && template.id && template.version !== undefined) {
       this.userConsentService.giveConsent(template.id, template.version);
     } else if (template.currentConsent?.code) {
-      this.userConsentService.withdrawConsent(template.currentConsent.code);
+      this.userConsentService.withdrawConsent(
+        template.currentConsent.code,
+        template?.id
+      );
     }
   }
 
@@ -253,8 +259,9 @@ export class ConsentManagementComponent implements OnInit, OnDestroy {
       tap((i) => {
         if (i < consentsToWithdraw.length) {
           const code = consentsToWithdraw[i].currentConsent?.code;
+          const id = consentsToWithdraw[i]?.id;
           if (code) {
-            this.userConsentService.withdrawConsent(code);
+            this.userConsentService.withdrawConsent(code, id);
           }
         }
       })
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.spec.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.spec.ts
new file mode 100644
index 00000000000..c106c9268eb
--- /dev/null
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.spec.ts
@@ -0,0 +1,37 @@
+import { TestBed } from '@angular/core/testing';
+import { AnonymousConsentsConfig, ConsentTemplate } from '@spartacus/core';
+import { ConsentManagementComponentService } from './consent-management-component.service';
+const mockAnonymousConsentsConfig = {
+  anonymousConsents: {
+    requiredConsents: ['test.required.consent'],
+  },
+};
+const mockOutput = ['test.required.consent'];
+describe('ConsentManagementComponentService', () => {
+  let service: ConsentManagementComponentService;
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [],
+      declarations: [],
+      providers: [
+        ConsentManagementComponentService,
+        {
+          provide: AnonymousConsentsConfig,
+          useValue: mockAnonymousConsentsConfig,
+        },
+      ],
+    });
+    service = TestBed.inject(ConsentManagementComponentService);
+    TestBed.compileComponents();
+  });
+  it('should create service', () => {
+    expect(service).toBeTruthy();
+  });
+  describe('getRequiredConsents()', () => {
+    let dummy: ConsentTemplate[] = [];
+    it('return all required consents', () => {
+      let result = service.getRequiredConsents(dummy);
+      expect(result).toEqual(mockOutput);
+    });
+  });
+});
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.ts
new file mode 100644
index 00000000000..045bcf0acc1
--- /dev/null
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management-component.service.ts
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { AnonymousConsentsConfig, ConsentTemplate } from '@spartacus/core';
+
+@Injectable()
+export class ConsentManagementComponentService {
+  constructor(protected anonymousConsentsConfig?: AnonymousConsentsConfig) {}
+  /**
+   * Returns the list of mandatory consents
+   * @param _templateList - list of all active consents. This parameter is not needed in core
+   * implementation. But is needed in CDC implementation to fetch only the required consents
+   * from this list
+   * @returns array of consent IDs
+   */
+  getRequiredConsents(_templateList: ConsentTemplate[]): string[] {
+    return (
+      this.anonymousConsentsConfig?.anonymousConsents?.requiredConsents || []
+    );
+  }
+}
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management.module.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management.module.ts
index 962bdc5236d..c14344abeb1 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management.module.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/consent-management.module.ts
@@ -17,6 +17,7 @@ import { SpinnerModule } from '../../../shared/components/spinner/spinner.module
 import { IconModule } from '../../misc/icon/icon.module';
 import { ConsentManagementFormComponent } from './components/consent-form/consent-management-form.component';
 import { ConsentManagementComponent } from './components/consent-management.component';
+import { ConsentManagementComponentService } from './consent-management-component.service';
 
 @NgModule({
   imports: [
@@ -28,6 +29,7 @@ import { ConsentManagementComponent } from './components/consent-management.comp
     IconModule,
   ],
   providers: [
+    ConsentManagementComponentService,
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
         ConsentManagementComponent: {
diff --git a/projects/storefrontlib/cms-components/myaccount/consent-management/index.ts b/projects/storefrontlib/cms-components/myaccount/consent-management/index.ts
index 978c16297fd..c3c3e2530f1 100644
--- a/projects/storefrontlib/cms-components/myaccount/consent-management/index.ts
+++ b/projects/storefrontlib/cms-components/myaccount/consent-management/index.ts
@@ -7,3 +7,4 @@
 export * from './components/consent-form/consent-management-form.component';
 export * from './components/consent-management.component';
 export * from './consent-management.module';
+export * from './consent-management-component.service';
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index a1d50b62d66..6be29374853 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -518,6 +518,9 @@
       "@spartacus/user/profile/root": [
         "feature-libs/user/profile/root/public_api"
       ],
+      "@spartacus/cdc/assets": [
+        "integration-libs/cdc/assets/public_api"
+      ],
       "@spartacus/cdc/components": [
         "integration-libs/cdc/components/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 35dbe905d5f..8f2cd1ae64a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,8 +9,13 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "target": "ES2022",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["ES2022", "dom"],
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "ES2022",
+      "dom"
+    ],
     "strictPropertyInitialization": false,
     "strict": true,
     "noUnusedLocals": true,
@@ -19,32 +24,56 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "paths": {
-      "@spartacus/asm": ["feature-libs/asm/public_api"],
-      "@spartacus/asm/assets": ["feature-libs/asm/assets/public_api"],
-      "@spartacus/asm/components": ["feature-libs/asm/components/public_api"],
-      "@spartacus/asm/core": ["feature-libs/asm/core/public_api"],
-      "@spartacus/asm/occ": ["feature-libs/asm/occ/public_api"],
-      "@spartacus/asm/root": ["feature-libs/asm/root/public_api"],
-      "@spartacus/assets": ["projects/assets/src/public_api"],
-      "@spartacus/cart": ["feature-libs/cart/public_api"],
-      "@spartacus/cart/base": ["feature-libs/cart/base/public_api"],
+      "@spartacus/schematics": [
+        "projects/schematics/index"
+      ],
+      "@spartacus/setup": [
+        "core-libs/setup/public_api"
+      ],
+      "@spartacus/setup/ssr": [
+        "core-libs/setup/ssr/public_api"
+      ],
+      "@spartacus/asm/assets": [
+        "feature-libs/asm/assets/public_api"
+      ],
+      "@spartacus/asm/components": [
+        "feature-libs/asm/components/public_api"
+      ],
+      "@spartacus/asm/core": [
+        "feature-libs/asm/core/public_api"
+      ],
+      "@spartacus/asm": [
+        "feature-libs/asm/public_api"
+      ],
+      "@spartacus/asm/occ": [
+        "feature-libs/asm/occ/public_api"
+      ],
+      "@spartacus/asm/root": [
+        "feature-libs/asm/root/public_api"
+      ],
       "@spartacus/cart/base/assets": [
         "feature-libs/cart/base/assets/public_api"
       ],
-      "@spartacus/cart/base/components": [
-        "feature-libs/cart/base/components/public_api"
-      ],
       "@spartacus/cart/base/components/add-to-cart": [
         "feature-libs/cart/base/components/add-to-cart/public_api"
       ],
       "@spartacus/cart/base/components/mini-cart": [
         "feature-libs/cart/base/components/mini-cart/public_api"
       ],
-      "@spartacus/cart/base/core": ["feature-libs/cart/base/core/public_api"],
-      "@spartacus/cart/base/occ": ["feature-libs/cart/base/occ/public_api"],
-      "@spartacus/cart/base/root": ["feature-libs/cart/base/root/public_api"],
-      "@spartacus/cart/import-export": [
-        "feature-libs/cart/import-export/public_api"
+      "@spartacus/cart/base/components": [
+        "feature-libs/cart/base/components/public_api"
+      ],
+      "@spartacus/cart/base/core": [
+        "feature-libs/cart/base/core/public_api"
+      ],
+      "@spartacus/cart/base": [
+        "feature-libs/cart/base/public_api"
+      ],
+      "@spartacus/cart/base/occ": [
+        "feature-libs/cart/base/occ/public_api"
+      ],
+      "@spartacus/cart/base/root": [
+        "feature-libs/cart/base/root/public_api"
       ],
       "@spartacus/cart/import-export/assets": [
         "feature-libs/cart/import-export/assets/public_api"
@@ -55,11 +84,14 @@
       "@spartacus/cart/import-export/core": [
         "feature-libs/cart/import-export/core/public_api"
       ],
+      "@spartacus/cart/import-export": [
+        "feature-libs/cart/import-export/public_api"
+      ],
       "@spartacus/cart/import-export/root": [
         "feature-libs/cart/import-export/root/public_api"
       ],
-      "@spartacus/cart/quick-order": [
-        "feature-libs/cart/quick-order/public_api"
+      "@spartacus/cart": [
+        "feature-libs/cart/public_api"
       ],
       "@spartacus/cart/quick-order/assets": [
         "feature-libs/cart/quick-order/assets/public_api"
@@ -70,10 +102,12 @@
       "@spartacus/cart/quick-order/core": [
         "feature-libs/cart/quick-order/core/public_api"
       ],
+      "@spartacus/cart/quick-order": [
+        "feature-libs/cart/quick-order/public_api"
+      ],
       "@spartacus/cart/quick-order/root": [
         "feature-libs/cart/quick-order/root/public_api"
       ],
-      "@spartacus/cart/saved-cart": ["feature-libs/cart/saved-cart/public_api"],
       "@spartacus/cart/saved-cart/assets": [
         "feature-libs/cart/saved-cart/assets/public_api"
       ],
@@ -83,46 +117,33 @@
       "@spartacus/cart/saved-cart/core": [
         "feature-libs/cart/saved-cart/core/public_api"
       ],
+      "@spartacus/cart/saved-cart": [
+        "feature-libs/cart/saved-cart/public_api"
+      ],
       "@spartacus/cart/saved-cart/occ": [
         "feature-libs/cart/saved-cart/occ/public_api"
       ],
       "@spartacus/cart/saved-cart/root": [
         "feature-libs/cart/saved-cart/root/public_api"
       ],
-      "@spartacus/cart/wish-list": ["feature-libs/cart/wish-list/public_api"],
       "@spartacus/cart/wish-list/assets": [
         "feature-libs/cart/wish-list/assets/public_api"
       ],
-      "@spartacus/cart/wish-list/components": [
-        "feature-libs/cart/wish-list/components/public_api"
-      ],
       "@spartacus/cart/wish-list/components/add-to-wishlist": [
         "feature-libs/cart/wish-list/components/add-to-wishlist/public_api"
       ],
+      "@spartacus/cart/wish-list/components": [
+        "feature-libs/cart/wish-list/components/public_api"
+      ],
       "@spartacus/cart/wish-list/core": [
         "feature-libs/cart/wish-list/core/public_api"
       ],
+      "@spartacus/cart/wish-list": [
+        "feature-libs/cart/wish-list/public_api"
+      ],
       "@spartacus/cart/wish-list/root": [
         "feature-libs/cart/wish-list/root/public_api"
       ],
-      "@spartacus/cdc": ["integration-libs/cdc/public_api"],
-      "@spartacus/cdc/components": [
-        "integration-libs/cdc/components/public_api"
-      ],
-      "@spartacus/cdc/core": ["integration-libs/cdc/core/public_api"],
-      "@spartacus/cdc/organization/administration": [
-        "integration-libs/cdc/organization/administration/public_api"
-      ],
-      "@spartacus/cdc/root": ["integration-libs/cdc/root/public_api"],
-      "@spartacus/cdc/user-account": [
-        "integration-libs/cdc/user-account/public_api"
-      ],
-      "@spartacus/cdc/user-profile": [
-        "integration-libs/cdc/user-profile/public_api"
-      ],
-      "@spartacus/cds": ["integration-libs/cds/public_api"],
-      "@spartacus/checkout": ["feature-libs/checkout/public_api"],
-      "@spartacus/checkout/b2b": ["feature-libs/checkout/b2b/public_api"],
       "@spartacus/checkout/b2b/assets": [
         "feature-libs/checkout/b2b/assets/public_api"
       ],
@@ -132,13 +153,15 @@
       "@spartacus/checkout/b2b/core": [
         "feature-libs/checkout/b2b/core/public_api"
       ],
+      "@spartacus/checkout/b2b": [
+        "feature-libs/checkout/b2b/public_api"
+      ],
       "@spartacus/checkout/b2b/occ": [
         "feature-libs/checkout/b2b/occ/public_api"
       ],
       "@spartacus/checkout/b2b/root": [
         "feature-libs/checkout/b2b/root/public_api"
       ],
-      "@spartacus/checkout/base": ["feature-libs/checkout/base/public_api"],
       "@spartacus/checkout/base/assets": [
         "feature-libs/checkout/base/assets/public_api"
       ],
@@ -148,14 +171,17 @@
       "@spartacus/checkout/base/core": [
         "feature-libs/checkout/base/core/public_api"
       ],
+      "@spartacus/checkout/base": [
+        "feature-libs/checkout/base/public_api"
+      ],
       "@spartacus/checkout/base/occ": [
         "feature-libs/checkout/base/occ/public_api"
       ],
       "@spartacus/checkout/base/root": [
         "feature-libs/checkout/base/root/public_api"
       ],
-      "@spartacus/checkout/scheduled-replenishment": [
-        "feature-libs/checkout/scheduled-replenishment/public_api"
+      "@spartacus/checkout": [
+        "feature-libs/checkout/public_api"
       ],
       "@spartacus/checkout/scheduled-replenishment/assets": [
         "feature-libs/checkout/scheduled-replenishment/assets/public_api"
@@ -163,13 +189,12 @@
       "@spartacus/checkout/scheduled-replenishment/components": [
         "feature-libs/checkout/scheduled-replenishment/components/public_api"
       ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "feature-libs/checkout/scheduled-replenishment/public_api"
+      ],
       "@spartacus/checkout/scheduled-replenishment/root": [
         "feature-libs/checkout/scheduled-replenishment/root/public_api"
       ],
-      "@spartacus/core": ["projects/core/public_api"],
-      "@spartacus/customer-ticketing": [
-        "feature-libs/customer-ticketing/public_api"
-      ],
       "@spartacus/customer-ticketing/assets": [
         "feature-libs/customer-ticketing/assets/public_api"
       ],
@@ -179,47 +204,32 @@
       "@spartacus/customer-ticketing/core": [
         "feature-libs/customer-ticketing/core/public_api"
       ],
+      "@spartacus/customer-ticketing": [
+        "feature-libs/customer-ticketing/public_api"
+      ],
       "@spartacus/customer-ticketing/occ": [
         "feature-libs/customer-ticketing/occ/public_api"
       ],
       "@spartacus/customer-ticketing/root": [
         "feature-libs/customer-ticketing/root/public_api"
       ],
-      "@spartacus/digital-payments": [
-        "integration-libs/digital-payments/public_api"
+      "@spartacus/order/assets": [
+        "feature-libs/order/assets/public_api"
       ],
-      "@spartacus/digital-payments/assets": [
-        "integration-libs/digital-payments/assets/public_api"
-      ],
-      "@spartacus/epd-visualization": [
-        "integration-libs/epd-visualization/public_api"
+      "@spartacus/order/components": [
+        "feature-libs/order/components/public_api"
       ],
-      "@spartacus/epd-visualization/assets": [
-        "integration-libs/epd-visualization/assets/public_api"
+      "@spartacus/order/core": [
+        "feature-libs/order/core/public_api"
       ],
-      "@spartacus/epd-visualization/components": [
-        "integration-libs/epd-visualization/components/public_api"
+      "@spartacus/order": [
+        "feature-libs/order/public_api"
       ],
-      "@spartacus/epd-visualization/core": [
-        "integration-libs/epd-visualization/core/public_api"
-      ],
-      "@spartacus/epd-visualization/epd-visualization-api": [
-        "integration-libs/epd-visualization/epd-visualization-api/public_api"
+      "@spartacus/order/occ": [
+        "feature-libs/order/occ/public_api"
       ],
-      "@spartacus/epd-visualization/root": [
-        "integration-libs/epd-visualization/root/public_api"
-      ],
-      "@spartacus/order": ["feature-libs/order/public_api"],
-      "@spartacus/order/assets": ["feature-libs/order/assets/public_api"],
-      "@spartacus/order/components": [
-        "feature-libs/order/components/public_api"
-      ],
-      "@spartacus/order/core": ["feature-libs/order/core/public_api"],
-      "@spartacus/order/occ": ["feature-libs/order/occ/public_api"],
-      "@spartacus/order/root": ["feature-libs/order/root/public_api"],
-      "@spartacus/organization": ["feature-libs/organization/public_api"],
-      "@spartacus/organization/account-summary": [
-        "feature-libs/organization/account-summary/public_api"
+      "@spartacus/order/root": [
+        "feature-libs/order/root/public_api"
       ],
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
@@ -230,15 +240,15 @@
       "@spartacus/organization/account-summary/core": [
         "feature-libs/organization/account-summary/core/public_api"
       ],
+      "@spartacus/organization/account-summary": [
+        "feature-libs/organization/account-summary/public_api"
+      ],
       "@spartacus/organization/account-summary/occ": [
         "feature-libs/organization/account-summary/occ/public_api"
       ],
       "@spartacus/organization/account-summary/root": [
         "feature-libs/organization/account-summary/root/public_api"
       ],
-      "@spartacus/organization/administration": [
-        "feature-libs/organization/administration/public_api"
-      ],
       "@spartacus/organization/administration/assets": [
         "feature-libs/organization/administration/assets/public_api"
       ],
@@ -248,24 +258,27 @@
       "@spartacus/organization/administration/core": [
         "feature-libs/organization/administration/core/public_api"
       ],
+      "@spartacus/organization/administration": [
+        "feature-libs/organization/administration/public_api"
+      ],
       "@spartacus/organization/administration/occ": [
         "feature-libs/organization/administration/occ/public_api"
       ],
       "@spartacus/organization/administration/root": [
         "feature-libs/organization/administration/root/public_api"
       ],
-      "@spartacus/organization/order-approval": [
-        "feature-libs/organization/order-approval/public_api"
+      "@spartacus/organization": [
+        "feature-libs/organization/public_api"
       ],
       "@spartacus/organization/order-approval/assets": [
         "feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/order-approval": [
+        "feature-libs/organization/order-approval/public_api"
+      ],
       "@spartacus/organization/order-approval/root": [
         "feature-libs/organization/order-approval/root/public_api"
       ],
-      "@spartacus/organization/unit-order": [
-        "feature-libs/organization/unit-order/public_api"
-      ],
       "@spartacus/organization/unit-order/assets": [
         "feature-libs/organization/unit-order/assets/public_api"
       ],
@@ -275,15 +288,15 @@
       "@spartacus/organization/unit-order/core": [
         "feature-libs/organization/unit-order/core/public_api"
       ],
+      "@spartacus/organization/unit-order": [
+        "feature-libs/organization/unit-order/public_api"
+      ],
       "@spartacus/organization/unit-order/occ": [
         "feature-libs/organization/unit-order/occ/public_api"
       ],
       "@spartacus/organization/unit-order/root": [
         "feature-libs/organization/unit-order/root/public_api"
       ],
-      "@spartacus/organization/user-registration": [
-        "feature-libs/organization/user-registration/public_api"
-      ],
       "@spartacus/organization/user-registration/assets": [
         "feature-libs/organization/user-registration/assets/public_api"
       ],
@@ -293,13 +306,15 @@
       "@spartacus/organization/user-registration/core": [
         "feature-libs/organization/user-registration/core/public_api"
       ],
+      "@spartacus/organization/user-registration": [
+        "feature-libs/organization/user-registration/public_api"
+      ],
       "@spartacus/organization/user-registration/occ": [
         "feature-libs/organization/user-registration/occ/public_api"
       ],
       "@spartacus/organization/user-registration/root": [
         "feature-libs/organization/user-registration/root/public_api"
       ],
-      "@spartacus/pickup-in-store": ["feature-libs/pickup-in-store/public_api"],
       "@spartacus/pickup-in-store/assets": [
         "feature-libs/pickup-in-store/assets/public_api"
       ],
@@ -309,28 +324,30 @@
       "@spartacus/pickup-in-store/core": [
         "feature-libs/pickup-in-store/core/public_api"
       ],
+      "@spartacus/pickup-in-store": [
+        "feature-libs/pickup-in-store/public_api"
+      ],
       "@spartacus/pickup-in-store/occ": [
         "feature-libs/pickup-in-store/occ/public_api"
       ],
       "@spartacus/pickup-in-store/root": [
         "feature-libs/pickup-in-store/root/public_api"
       ],
-      "@spartacus/product": ["feature-libs/product/public_api"],
-      "@spartacus/product-configurator": [
-        "feature-libs/product-configurator/public_api"
+      "@spartacus/product-configurator/common/assets": [
+        "feature-libs/product-configurator/common/assets/public_api"
       ],
       "@spartacus/product-configurator/common": [
         "feature-libs/product-configurator/common/public_api"
       ],
-      "@spartacus/product-configurator/common/assets": [
-        "feature-libs/product-configurator/common/assets/public_api"
-      ],
-      "@spartacus/product-configurator/rulebased": [
-        "feature-libs/product-configurator/rulebased/public_api"
+      "@spartacus/product-configurator": [
+        "feature-libs/product-configurator/public_api"
       ],
       "@spartacus/product-configurator/rulebased/cpq": [
         "feature-libs/product-configurator/rulebased/cpq/public_api"
       ],
+      "@spartacus/product-configurator/rulebased": [
+        "feature-libs/product-configurator/rulebased/public_api"
+      ],
       "@spartacus/product-configurator/rulebased/root": [
         "feature-libs/product-configurator/rulebased/root/public_api"
       ],
@@ -340,9 +357,6 @@
       "@spartacus/product-configurator/textfield/root": [
         "feature-libs/product-configurator/textfield/root/public_api"
       ],
-      "@spartacus/product/bulk-pricing": [
-        "feature-libs/product/bulk-pricing/public_api"
-      ],
       "@spartacus/product/bulk-pricing/assets": [
         "feature-libs/product/bulk-pricing/assets/public_api"
       ],
@@ -352,15 +366,15 @@
       "@spartacus/product/bulk-pricing/core": [
         "feature-libs/product/bulk-pricing/core/public_api"
       ],
+      "@spartacus/product/bulk-pricing": [
+        "feature-libs/product/bulk-pricing/public_api"
+      ],
       "@spartacus/product/bulk-pricing/occ": [
         "feature-libs/product/bulk-pricing/occ/public_api"
       ],
       "@spartacus/product/bulk-pricing/root": [
         "feature-libs/product/bulk-pricing/root/public_api"
       ],
-      "@spartacus/product/future-stock": [
-        "feature-libs/product/future-stock/public_api"
-      ],
       "@spartacus/product/future-stock/assets": [
         "feature-libs/product/future-stock/assets/public_api"
       ],
@@ -370,26 +384,29 @@
       "@spartacus/product/future-stock/core": [
         "feature-libs/product/future-stock/core/public_api"
       ],
+      "@spartacus/product/future-stock": [
+        "feature-libs/product/future-stock/public_api"
+      ],
       "@spartacus/product/future-stock/occ": [
         "feature-libs/product/future-stock/occ/public_api"
       ],
       "@spartacus/product/future-stock/root": [
         "feature-libs/product/future-stock/root/public_api"
       ],
-      "@spartacus/product/image-zoom": [
-        "feature-libs/product/image-zoom/public_api"
-      ],
       "@spartacus/product/image-zoom/assets": [
         "feature-libs/product/image-zoom/assets/public_api"
       ],
       "@spartacus/product/image-zoom/components": [
         "feature-libs/product/image-zoom/components/public_api"
       ],
+      "@spartacus/product/image-zoom": [
+        "feature-libs/product/image-zoom/public_api"
+      ],
       "@spartacus/product/image-zoom/root": [
         "feature-libs/product/image-zoom/root/public_api"
       ],
-      "@spartacus/product/variants": [
-        "feature-libs/product/variants/public_api"
+      "@spartacus/product": [
+        "feature-libs/product/public_api"
       ],
       "@spartacus/product/variants/assets": [
         "feature-libs/product/variants/assets/public_api"
@@ -397,27 +414,33 @@
       "@spartacus/product/variants/components": [
         "feature-libs/product/variants/components/public_api"
       ],
+      "@spartacus/product/variants": [
+        "feature-libs/product/variants/public_api"
+      ],
       "@spartacus/product/variants/occ": [
         "feature-libs/product/variants/occ/public_api"
       ],
       "@spartacus/product/variants/root": [
         "feature-libs/product/variants/root/public_api"
       ],
-      "@spartacus/qualtrics": ["feature-libs/qualtrics/public_api"],
       "@spartacus/qualtrics/components": [
         "feature-libs/qualtrics/components/public_api"
       ],
-      "@spartacus/qualtrics/root": ["feature-libs/qualtrics/root/public_api"],
-      "@spartacus/s4om": ["integration-libs/s4om/public_api"],
-      "@spartacus/s4om/assets": ["integration-libs/s4om/assets/public_api"],
-      "@spartacus/s4om/root": ["integration-libs/s4om/root/public_api"],
-      "@spartacus/schematics": ["projects/schematics/index"],
-      "@spartacus/setup": ["core-libs/setup/public_api"],
-      "@spartacus/setup/ssr": ["core-libs/setup/ssr/public_api"],
-      "@spartacus/smartedit": ["feature-libs/smartedit/public_api"],
-      "@spartacus/smartedit/core": ["feature-libs/smartedit/core/public_api"],
-      "@spartacus/smartedit/root": ["feature-libs/smartedit/root/public_api"],
-      "@spartacus/storefinder": ["feature-libs/storefinder/public_api"],
+      "@spartacus/qualtrics": [
+        "feature-libs/qualtrics/public_api"
+      ],
+      "@spartacus/qualtrics/root": [
+        "feature-libs/qualtrics/root/public_api"
+      ],
+      "@spartacus/smartedit/core": [
+        "feature-libs/smartedit/core/public_api"
+      ],
+      "@spartacus/smartedit": [
+        "feature-libs/smartedit/public_api"
+      ],
+      "@spartacus/smartedit/root": [
+        "feature-libs/smartedit/root/public_api"
+      ],
       "@spartacus/storefinder/assets": [
         "feature-libs/storefinder/assets/public_api"
       ],
@@ -427,22 +450,27 @@
       "@spartacus/storefinder/core": [
         "feature-libs/storefinder/core/public_api"
       ],
-      "@spartacus/storefinder/occ": ["feature-libs/storefinder/occ/public_api"],
+      "@spartacus/storefinder": [
+        "feature-libs/storefinder/public_api"
+      ],
+      "@spartacus/storefinder/occ": [
+        "feature-libs/storefinder/occ/public_api"
+      ],
       "@spartacus/storefinder/root": [
         "feature-libs/storefinder/root/public_api"
       ],
-      "@spartacus/storefront": ["projects/storefrontlib/public_api"],
-      "@spartacus/tracking": ["feature-libs/tracking/public_api"],
-      "@spartacus/tracking/personalization": [
-        "feature-libs/tracking/personalization/public_api"
+      "@spartacus/tracking": [
+        "feature-libs/tracking/public_api"
       ],
       "@spartacus/tracking/personalization/core": [
         "feature-libs/tracking/personalization/core/public_api"
       ],
+      "@spartacus/tracking/personalization": [
+        "feature-libs/tracking/personalization/public_api"
+      ],
       "@spartacus/tracking/personalization/root": [
         "feature-libs/tracking/personalization/root/public_api"
       ],
-      "@spartacus/tracking/tms": ["feature-libs/tracking/tms/public_api"],
       "@spartacus/tracking/tms/aep": [
         "feature-libs/tracking/tms/aep/public_api"
       ],
@@ -452,8 +480,9 @@
       "@spartacus/tracking/tms/gtm": [
         "feature-libs/tracking/tms/gtm/public_api"
       ],
-      "@spartacus/user": ["feature-libs/user/public_api"],
-      "@spartacus/user/account": ["feature-libs/user/account/public_api"],
+      "@spartacus/tracking/tms": [
+        "feature-libs/tracking/tms/public_api"
+      ],
       "@spartacus/user/account/assets": [
         "feature-libs/user/account/assets/public_api"
       ],
@@ -463,13 +492,18 @@
       "@spartacus/user/account/core": [
         "feature-libs/user/account/core/public_api"
       ],
+      "@spartacus/user/account": [
+        "feature-libs/user/account/public_api"
+      ],
       "@spartacus/user/account/occ": [
         "feature-libs/user/account/occ/public_api"
       ],
       "@spartacus/user/account/root": [
         "feature-libs/user/account/root/public_api"
       ],
-      "@spartacus/user/profile": ["feature-libs/user/profile/public_api"],
+      "@spartacus/user": [
+        "feature-libs/user/public_api"
+      ],
       "@spartacus/user/profile/assets": [
         "feature-libs/user/profile/assets/public_api"
       ],
@@ -479,16 +513,91 @@
       "@spartacus/user/profile/core": [
         "feature-libs/user/profile/core/public_api"
       ],
+      "@spartacus/user/profile": [
+        "feature-libs/user/profile/public_api"
+      ],
       "@spartacus/user/profile/occ": [
         "feature-libs/user/profile/occ/public_api"
       ],
       "@spartacus/user/profile/root": [
         "feature-libs/user/profile/root/public_api"
+      ],
+      "@spartacus/cdc/assets": [
+        "integration-libs/cdc/assets/public_api"
+      ],
+      "@spartacus/cdc/components": [
+        "integration-libs/cdc/components/public_api"
+      ],
+      "@spartacus/cdc/core": [
+        "integration-libs/cdc/core/public_api"
+      ],
+      "@spartacus/cdc": [
+        "integration-libs/cdc/public_api"
+      ],
+      "@spartacus/cdc/organization/administration": [
+        "integration-libs/cdc/organization/administration/public_api"
+      ],
+      "@spartacus/cdc/root": [
+        "integration-libs/cdc/root/public_api"
+      ],
+      "@spartacus/cdc/user-account": [
+        "integration-libs/cdc/user-account/public_api"
+      ],
+      "@spartacus/cdc/user-profile": [
+        "integration-libs/cdc/user-profile/public_api"
+      ],
+      "@spartacus/cds": [
+        "integration-libs/cds/public_api"
+      ],
+      "@spartacus/digital-payments/assets": [
+        "integration-libs/digital-payments/assets/public_api"
+      ],
+      "@spartacus/digital-payments": [
+        "integration-libs/digital-payments/public_api"
+      ],
+      "@spartacus/epd-visualization/assets": [
+        "integration-libs/epd-visualization/assets/public_api"
+      ],
+      "@spartacus/epd-visualization/components": [
+        "integration-libs/epd-visualization/components/public_api"
+      ],
+      "@spartacus/epd-visualization/core": [
+        "integration-libs/epd-visualization/core/public_api"
+      ],
+      "@spartacus/epd-visualization/epd-visualization-api": [
+        "integration-libs/epd-visualization/epd-visualization-api/public_api"
+      ],
+      "@spartacus/epd-visualization": [
+        "integration-libs/epd-visualization/public_api"
+      ],
+      "@spartacus/epd-visualization/root": [
+        "integration-libs/epd-visualization/root/public_api"
+      ],
+      "@spartacus/s4om/assets": [
+        "integration-libs/s4om/assets/public_api"
+      ],
+      "@spartacus/s4om": [
+        "integration-libs/s4om/public_api"
+      ],
+      "@spartacus/s4om/root": [
+        "integration-libs/s4om/root/public_api"
+      ],
+      "@spartacus/assets": [
+        "projects/assets/src/public_api"
+      ],
+      "@spartacus/core": [
+        "projects/core/public_api"
+      ],
+      "@spartacus/storefront": [
+        "projects/storefrontlib/public_api"
       ]
     },
     "useDefineForClassFields": false
   },
-  "exclude": ["./dist", "./projects/storefrontapp-e2e-cypress"],
+  "exclude": [
+    "./dist",
+    "./projects/storefrontapp-e2e-cypress"
+  ],
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
@@ -498,4 +607,4 @@
     "strictTemplates": true,
     "strictInputAccessModifiers": true
   }
-}
+}
\ No newline at end of file

From b4085f8c68b0cd67274b23cf964381e571718364 Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Fri, 16 Jun 2023 14:31:44 +0530
Subject: [PATCH 041/122] Update index_spec.ts.snap (#17534)

---
 .../add-cdc/__snapshots__/index_spec.ts.snap  | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap b/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
index 72b59219559..6bd9f3ffbaa 100644
--- a/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
+++ b/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
@@ -3,11 +3,12 @@
 exports[`Spartacus CDC schematics: ng-add CDC feature eager loading should import appropriate modules 1`] = `
 "import { NgModule } from '@angular/core';
 import { CdcModule } from "@spartacus/cdc";
+import { cdcTranslationChunksConfig, cdcTranslations } from "@spartacus/cdc/assets";
 import { CdcAdministrationModule } from "@spartacus/cdc/organization/administration";
 import { CdcConfig, CdcRootModule } from "@spartacus/cdc/root";
 import { CDCUserAccountModule } from "@spartacus/cdc/user-account";
 import { CDCUserProfileModule } from "@spartacus/cdc/user-profile";
-import { provideConfig } from "@spartacus/core";
+import { I18nConfig, provideConfig } from "@spartacus/core";
 
 @NgModule({
   declarations: [],
@@ -18,7 +19,13 @@ import { provideConfig } from "@spartacus/core";
     CDCUserProfileModule,
     CdcAdministrationModule
   ],
-  providers: [provideConfig(<CdcConfig>{
+  providers: [provideConfig(<I18nConfig>{
+    i18n: {
+      resources: cdcTranslations,
+      chunks: cdcTranslationChunksConfig,
+    },
+  }),
+  provideConfig(<CdcConfig>{
     cdc: [
       {
         baseSite: 'electronics-spa',
@@ -26,7 +33,8 @@ import { provideConfig } from "@spartacus/core";
         sessionExpiration: 3600
       },
     ],
-  })]
+  })
+  ]
 })
 export class CdcFeatureModule { }
 "
@@ -34,8 +42,9 @@ export class CdcFeatureModule { }
 
 exports[`Spartacus CDC schematics: ng-add CDC feature general setup should add the feature using the lazy loading syntax 1`] = `
 "import { NgModule } from '@angular/core';
+import { cdcTranslationChunksConfig, cdcTranslations } from "@spartacus/cdc/assets";
 import { CdcConfig, CdcRootModule, CDC_FEATURE } from "@spartacus/cdc/root";
-import { CmsConfig, provideConfig } from "@spartacus/core";
+import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
 
 @NgModule({
   declarations: [],
@@ -50,6 +59,12 @@ import { CmsConfig, provideConfig } from "@spartacus/core";
       },
     }
   }),
+  provideConfig(<I18nConfig>{
+    i18n: {
+      resources: cdcTranslations,
+      chunks: cdcTranslationChunksConfig,
+    },
+  }),
   provideConfig(<CdcConfig>{
     cdc: [
       {
@@ -115,8 +130,9 @@ export class AdministrationWrapperModule { }
 
 exports[`Spartacus CDC schematics: ng-add CDC feature validation of jsSDKUrl should set the given javascriptUrl 1`] = `
 "import { NgModule } from '@angular/core';
+import { cdcTranslationChunksConfig, cdcTranslations } from "@spartacus/cdc/assets";
 import { CdcConfig, CdcRootModule, CDC_FEATURE } from "@spartacus/cdc/root";
-import { CmsConfig, provideConfig } from "@spartacus/core";
+import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
 
 @NgModule({
   declarations: [],
@@ -131,6 +147,12 @@ import { CmsConfig, provideConfig } from "@spartacus/core";
       },
     }
   }),
+  provideConfig(<I18nConfig>{
+    i18n: {
+      resources: cdcTranslations,
+      chunks: cdcTranslationChunksConfig,
+    },
+  }),
   provideConfig(<CdcConfig>{
     cdc: [
       {

From 73ec88f2f20f6b4cc0e90a2022ee9740eb00b5a8 Mon Sep 17 00:00:00 2001
From: Gilberto Alvarado <gilberto.alvarado.jimenez@sap.com>
Date: Thu, 15 Jun 2023 14:59:08 -0400
Subject: [PATCH 042/122] Marking test as flaky

---
 ...{asm-cost-center.e2e.cy.ts => asm-cost-center.e2e-flaky.cy.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/{asm-cost-center.e2e.cy.ts => asm-cost-center.e2e-flaky.cy.ts} (100%)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e-flaky.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e-flaky.cy.ts

From 1c319a1f72297bddbce28eb0f379af035f49d4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Mon, 19 Jun 2023 11:15:27 +0200
Subject: [PATCH 043/122] fix: CXSPA-3791 The registration page cannot be open
 (#17541)

---
 .../profile/components/register/register.module.ts     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/feature-libs/user/profile/components/register/register.module.ts b/feature-libs/user/profile/components/register/register.module.ts
index 150ccc69157..3aeeb5c1350 100644
--- a/feature-libs/user/profile/components/register/register.module.ts
+++ b/feature-libs/user/profile/components/register/register.module.ts
@@ -6,7 +6,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
+import { ReactiveFormsModule, UntypedFormBuilder } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { NgSelectModule } from '@ng-select/ng-select';
 import {
@@ -14,8 +14,8 @@ import {
   GlobalMessageService,
   I18nModule,
   NotAuthGuard,
-  provideDefaultConfig,
   UrlModule,
+  provideDefaultConfig,
 } from '@spartacus/core';
 import {
   FormErrorsModule,
@@ -50,7 +50,11 @@ import { RegisterComponent } from './register.component';
             {
               provide: RegisterComponentService,
               useClass: RegisterComponentService,
-              deps: [UserRegisterFacade, GlobalMessageService],
+              deps: [
+                UserRegisterFacade,
+                GlobalMessageService,
+                UntypedFormBuilder,
+              ],
             },
           ],
         },

From 9002414d87ff99ce8fe518ce7f3cc7e58faaedbd Mon Sep 17 00:00:00 2001
From: Krzysztof Platis <platonn.git@gmail.com>
Date: Mon, 19 Jun 2023 13:25:57 +0200
Subject: [PATCH 044/122] feat: move private part of MultiCartEffects (setting
 active cart id on LoadCartSuccess) to a public extendable service [6.2.x]
 (#17524)

(forward-port of PR https://github.com/SAP/spartacus/pull/17511 to 6.2.x)

Moved logic from `MultiCartEffects` (which is in private API) to a public extendable service `MultiCartEffectsService`, so to allow FSA for extending it.

The moved logic is responsible for setting active cart id on LoadCartSuccess action.

closes https://jira.tools.sap/browse/CXSPA-3551
---
 feature-libs/cart/base/core/public_api.ts     |  1 +
 .../cart/base/core/store/effects/index.ts     |  1 +
 .../effects/multi-cart-effect.service.spec.ts | 79 +++++++++++++++++++
 .../effects/multi-cart-effect.service.ts      | 35 ++++++++
 .../store/effects/multi-cart.effect.spec.ts   | 34 +++++++-
 .../core/store/effects/multi-cart.effect.ts   | 34 ++++----
 .../core/store/multi-cart-store.module.ts     |  3 +-
 7 files changed, 169 insertions(+), 18 deletions(-)
 create mode 100644 feature-libs/cart/base/core/store/effects/multi-cart-effect.service.spec.ts
 create mode 100644 feature-libs/cart/base/core/store/effects/multi-cart-effect.service.ts

diff --git a/feature-libs/cart/base/core/public_api.ts b/feature-libs/cart/base/core/public_api.ts
index 0bdd18dd0c5..17ca98d6e5b 100644
--- a/feature-libs/cart/base/core/public_api.ts
+++ b/feature-libs/cart/base/core/public_api.ts
@@ -12,6 +12,7 @@ export * from './facade/index';
 export * from './guards/index';
 export * from './services/index';
 export * from './store/actions/index';
+export * from './store/effects/multi-cart-effect.service';
 export * from './store/multi-cart-state';
 export * from './store/selectors/index';
 export * from './utils/utils';
diff --git a/feature-libs/cart/base/core/store/effects/index.ts b/feature-libs/cart/base/core/store/effects/index.ts
index c7ed2c39177..1801c2dca50 100644
--- a/feature-libs/cart/base/core/store/effects/index.ts
+++ b/feature-libs/cart/base/core/store/effects/index.ts
@@ -19,4 +19,5 @@ export const effects: any[] = [
 export * from './cart-entry.effect';
 export * from './cart-voucher.effect';
 export * from './cart.effect';
+export * from './multi-cart-effect.service';
 export * from './multi-cart.effect';
diff --git a/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.spec.ts b/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.spec.ts
new file mode 100644
index 00000000000..4d054ace20b
--- /dev/null
+++ b/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.spec.ts
@@ -0,0 +1,79 @@
+import { TestBed } from '@angular/core/testing';
+import { Cart, CartType } from '@spartacus/cart/base/root';
+import { CartActions } from '../actions';
+import { MultiCartEffectsService } from './multi-cart-effect.service';
+
+const testCart: Cart = {
+  code: 'xxx',
+  guid: 'testGuid',
+  totalItems: 0,
+  totalPrice: {
+    currencyIso: 'USD',
+    value: 0,
+  },
+  totalPriceWithTax: {
+    currencyIso: 'USD',
+    value: 0,
+  },
+};
+
+describe('MultiCartEffectsService', () => {
+  let service: MultiCartEffectsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [MultiCartEffectsService],
+    });
+
+    service = TestBed.inject(MultiCartEffectsService);
+  });
+
+  describe('getActiveCartTypeOnLoadSuccess', () => {
+    it('should return active cart id being value from LoadCartSuccess', () => {
+      const action = new CartActions.LoadCartSuccess({
+        userId: 'userId',
+        cartId: 'cartId',
+        cart: testCart,
+        extraData: { active: true },
+      });
+
+      const setActiveCartIdAction = new CartActions.SetCartTypeIndex({
+        cartType: CartType.ACTIVE,
+        cartId: 'cartId',
+      });
+
+      expect(service.getActiveCartTypeOnLoadSuccess(action)).toEqual(
+        setActiveCartIdAction
+      );
+    });
+
+    it('should return empty active cart id if the cart from LoadCartSuccess is active and saved', () => {
+      const action = new CartActions.LoadCartSuccess({
+        userId: 'userId',
+        cartId: 'cartId',
+        cart: { code: 'test', saveTime: new Date() },
+        extraData: { active: true },
+      });
+
+      const setActiveCartIdAction = new CartActions.SetCartTypeIndex({
+        cartType: CartType.ACTIVE,
+        cartId: '',
+      });
+
+      expect(service.getActiveCartTypeOnLoadSuccess(action)).toEqual(
+        setActiveCartIdAction
+      );
+    });
+
+    it('should return undefined if cart from LoadCartSuccess is not active', () => {
+      const action = new CartActions.LoadCartSuccess({
+        userId: 'userId',
+        cartId: 'cartId',
+        cart: testCart,
+        extraData: { active: false },
+      });
+
+      expect(service.getActiveCartTypeOnLoadSuccess(action)).toBeUndefined();
+    });
+  });
+});
diff --git a/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.ts b/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.ts
new file mode 100644
index 00000000000..1d85839144a
--- /dev/null
+++ b/feature-libs/cart/base/core/store/effects/multi-cart-effect.service.ts
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { CartType } from '@spartacus/cart/base/root';
+import { CartActions } from '../actions/index';
+
+@Injectable()
+export class MultiCartEffectsService {
+  /**
+   * Verifies if cart is the active cart or saved cart and returns the appropriate cart type
+   * @param action
+   * @returns cart type
+   */
+  getActiveCartTypeOnLoadSuccess(
+    action: CartActions.LoadCartSuccess
+  ): CartActions.SetCartTypeIndex | undefined {
+    if (action?.payload?.extraData?.active) {
+      // saved cart is not active cart
+      if (action.payload?.cart.saveTime) {
+        return new CartActions.SetCartTypeIndex({
+          cartType: CartType.ACTIVE,
+          cartId: '',
+        });
+      }
+      return new CartActions.SetCartTypeIndex({
+        cartType: CartType.ACTIVE,
+        cartId: action.meta.entityId as string,
+      });
+    }
+  }
+}
diff --git a/feature-libs/cart/base/core/store/effects/multi-cart.effect.spec.ts b/feature-libs/cart/base/core/store/effects/multi-cart.effect.spec.ts
index d7e39cf6608..4ff2e1aa220 100644
--- a/feature-libs/cart/base/core/store/effects/multi-cart.effect.spec.ts
+++ b/feature-libs/cart/base/core/store/effects/multi-cart.effect.spec.ts
@@ -8,6 +8,7 @@ import { Observable } from 'rxjs';
 import * as fromCartReducers from '../../store/reducers/index';
 import { CartActions } from '../actions/index';
 import { MULTI_CART_FEATURE } from '../multi-cart-state';
+import { MultiCartEffectsService } from './multi-cart-effect.service';
 import * as fromEffects from './multi-cart.effect';
 
 const testCart: Cart = {
@@ -24,6 +25,14 @@ const testCart: Cart = {
   },
 };
 
+class MockMultiCartEffectsService implements Partial<MultiCartEffectsService> {
+  getActiveCartTypeOnLoadSuccess(
+    _action: CartActions.LoadCartSuccess
+  ): CartActions.SetCartTypeIndex | undefined {
+    return undefined;
+  }
+}
+
 describe('Multi Cart effect', () => {
   let cartEffects: fromEffects.MultiCartEffects;
   let actions$: Observable<any>;
@@ -41,6 +50,10 @@ describe('Multi Cart effect', () => {
       providers: [
         fromEffects.MultiCartEffects,
         provideMockActions(() => actions$),
+        {
+          provide: MultiCartEffectsService,
+          useClass: MockMultiCartEffectsService,
+        },
       ],
     });
 
@@ -108,7 +121,7 @@ describe('Multi Cart effect', () => {
       expect(cartEffects.setActiveCartId$).toBeObservable(expected);
     });
 
-    it('should set active cart id to state for LoadCartSuccess', () => {
+    it('should call MultiCartEffectsService to set cart id for LoadCartSuccess, when cart is active', () => {
       const action = new CartActions.LoadCartSuccess({
         userId: 'userId',
         cartId: 'cartId',
@@ -121,13 +134,22 @@ describe('Multi Cart effect', () => {
         cartId: 'cartId',
       });
 
+      const multiCartEffectsService = TestBed.inject(MultiCartEffectsService);
+      spyOn(
+        multiCartEffectsService,
+        'getActiveCartTypeOnLoadSuccess'
+      ).and.returnValue(setActiveCartIdAction);
+
       actions$ = hot('-a', { a: action });
       const expected = cold('-b', { b: setActiveCartIdAction });
 
       expect(cartEffects.setActiveCartId$).toBeObservable(expected);
+      expect(
+        multiCartEffectsService.getActiveCartTypeOnLoadSuccess
+      ).toHaveBeenCalledWith(action);
     });
 
-    it('should remove active cart id if load an active cart which is saved', () => {
+    it('should call MultiCartEffectsService to set cart id for LoadCartSuccess, when the active cart is saved', () => {
       const action = new CartActions.LoadCartSuccess({
         userId: 'userId',
         cartId: 'cartId',
@@ -139,11 +161,19 @@ describe('Multi Cart effect', () => {
         cartType: CartType.ACTIVE,
         cartId: '',
       });
+      const multiCartEffectsService = TestBed.inject(MultiCartEffectsService);
+      spyOn(
+        multiCartEffectsService,
+        'getActiveCartTypeOnLoadSuccess'
+      ).and.returnValue(setActiveCartIdAction);
 
       actions$ = hot('-a', { a: action });
       const expected = cold('-b', { b: setActiveCartIdAction });
 
       expect(cartEffects.setActiveCartId$).toBeObservable(expected);
+      expect(
+        multiCartEffectsService.getActiveCartTypeOnLoadSuccess
+      ).toHaveBeenCalledWith(action);
     });
 
     it('should set active cart id to state for CreateCart', () => {
diff --git a/feature-libs/cart/base/core/store/effects/multi-cart.effect.ts b/feature-libs/cart/base/core/store/effects/multi-cart.effect.ts
index 56257331af0..1d5b0d68946 100644
--- a/feature-libs/cart/base/core/store/effects/multi-cart.effect.ts
+++ b/feature-libs/cart/base/core/store/effects/multi-cart.effect.ts
@@ -13,6 +13,7 @@ import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { isSelectiveCart } from '../../utils/utils';
 import { CartActions } from '../actions/index';
+import { MultiCartEffectsService } from './multi-cart-effect.service';
 
 @Injectable()
 export class MultiCartEffects {
@@ -64,20 +65,7 @@ export class MultiCartEffects {
               return this.getActiveCartTypeOnLoad(action);
             }
             case CartActions.LOAD_CART_SUCCESS: {
-              if (action?.payload?.extraData?.active) {
-                // saved cart is not active cart
-                if (action.payload?.cart.saveTime) {
-                  return new CartActions.SetCartTypeIndex({
-                    cartType: CartType.ACTIVE,
-                    cartId: '',
-                  });
-                }
-                return new CartActions.SetCartTypeIndex({
-                  cartType: CartType.ACTIVE,
-                  cartId: action.meta.entityId as string,
-                });
-              }
-              break;
+              return this.getActiveCartTypeOnLoadSuccess(action);
             }
             case CartActions.CREATE_CART: {
               return this.getActiveCartTypeOnCreate(action);
@@ -119,6 +107,19 @@ export class MultiCartEffects {
     return undefined;
   }
 
+  /**
+   * Verifies if cart is the active cart or saved cart and returns the appropriate cart type
+   * @param action
+   * @returns cart type
+   */
+  private getActiveCartTypeOnLoadSuccess(
+    action: CartActions.LoadCartSuccess
+  ): CartActions.SetCartTypeIndex | undefined {
+    // Extracted small portion of private effect's logic to a public service
+    // to allow FSA for customizing it (for more, see CXSPA-3551)
+    return this.multiCartEffectsService.getActiveCartTypeOnLoadSuccess(action);
+  }
+
   /**
    * Verifies if cart is active and returns the appropriate cart type
    * @param action
@@ -136,5 +137,8 @@ export class MultiCartEffects {
     return undefined;
   }
 
-  constructor(private actions$: Actions) {}
+  constructor(
+    private actions$: Actions,
+    private multiCartEffectsService: MultiCartEffectsService
+  ) {}
 }
diff --git a/feature-libs/cart/base/core/store/multi-cart-store.module.ts b/feature-libs/cart/base/core/store/multi-cart-store.module.ts
index 41a7f4bfb77..b44650fdaba 100644
--- a/feature-libs/cart/base/core/store/multi-cart-store.module.ts
+++ b/feature-libs/cart/base/core/store/multi-cart-store.module.ts
@@ -10,6 +10,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { StateModule } from '@spartacus/core';
 import { effects } from './effects/index';
+import { MultiCartEffectsService } from './effects/multi-cart-effect.service';
 import { MULTI_CART_FEATURE } from './multi-cart-state';
 import {
   multiCartMetaReducers,
@@ -26,6 +27,6 @@ import {
     }),
     EffectsModule.forFeature(effects),
   ],
-  providers: [multiCartReducerProvider],
+  providers: [multiCartReducerProvider, MultiCartEffectsService],
 })
 export class MultiCartStoreModule {}

From 4477d76caa8494fddf49fdb1bcfbb3bb82504e09 Mon Sep 17 00:00:00 2001
From: Caine Rotherham <rotherham.c@gmail.com>
Date: Mon, 19 Jun 2023 15:03:16 +0200
Subject: [PATCH 045/122] feat: ASM Deep Links (#17459)

Co-authored-by: Hak Woo Kim <kimhakwoo@hotmail.com>
Co-authored-by: i333055 <lulu.ran@sap.com>
Co-authored-by: Scar Ai <scar.ai@sap.com>
Co-authored-by: niehuayang <126219214+niehuayang@users.noreply.github.com>
---
 .../asm/assets/translations/en/asm.ts         |  19 +
 .../asm-bind-cart.component.html              |  24 +-
 .../asm-bind-cart.component.spec.ts           | 174 ++++-
 .../asm-bind-cart/asm-bind-cart.component.ts  | 184 ++++-
 .../asm/components/asm-components.module.ts   |   5 +
 .../asm-main-ui/asm-main-ui.component.html    |   9 +
 .../asm-main-ui/asm-main-ui.component.spec.ts | 182 ++++-
 .../asm-main-ui/asm-main-ui.component.ts      | 146 +++-
 .../asm-save-cart-dialog.component.html       |  96 +++
 .../asm-save-cart-dialog.component.spec.ts    | 131 ++++
 .../asm-save-cart-dialog.component.ts         |  78 +++
 .../default-save-cart-layout.config.ts        |  22 +
 feature-libs/asm/components/public_api.ts     |   1 +
 .../services/asm-component.service.spec.ts    |  44 ++
 .../services/asm-component.service.ts         |  59 +-
 feature-libs/asm/root/model/asm.models.ts     |   8 +
 .../asm/root/model/augmented-core.model.ts    |   1 +
 .../root/services/asm-enabler.service.spec.ts |   9 +
 .../asm/root/services/asm-enabler.service.ts  |   9 +-
 .../components/_asm-main-ui.component.scss    |  15 +
 .../_asm-save-cart-dialog.component.scss      | 240 +++++++
 .../asm/styles/components/_index.scss         |   8 +-
 .../accessibility/tabbing-order.e2e.asm.cy.ts |   7 +
 .../e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts    | 644 +++++++++++++++++-
 .../accessibility/tabbing-order.config.ts     |  14 +
 .../accessibility/tabbing-order/asm.ts        |  35 +-
 .../cypress/helpers/asm.ts                    | 110 +++
 .../ticket-listing.ts                         |   2 +-
 .../cypress/helpers/saved-cart.ts             |   6 +-
 .../cypress/support/utils/cart.ts             |  61 ++
 30 files changed, 2318 insertions(+), 25 deletions(-)
 create mode 100644 feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
 create mode 100644 feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.spec.ts
 create mode 100644 feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.ts
 create mode 100644 feature-libs/asm/components/default-save-cart-layout.config.ts
 create mode 100644 feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 344a6eeba2f..086b4a72984 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -13,6 +13,9 @@ export const asm = {
     customers: 'Customers',
     createCustomerSuccessfullyAlert:
       'The customer account has been created and the customer session has started.',
+    saveInactiveCartAlertInfo:
+      'The identified cart is an inactive cart. To take further actions on this cart, save it first.',
+    activeCartAlertInfo: 'The identified cart is an active cart.',
     toggleUi: {
       collapse: 'Hide ASM',
       expand: 'Show ASM',
@@ -100,6 +103,22 @@ export const asm = {
       searchBox: 'Search',
       enterSearchBox: 'Enter customer name or email',
     },
+    saveCart: {
+      saveCartBtn: 'Save for Later',
+      dialog: {
+        saveInfo: 'Save the cart before you can take further actions.',
+        disableInfo: 'Cannot save the cart as it is empty.',
+        title: 'Save Cart',
+        row: {
+          id: 'ID',
+          qty: 'Qty',
+          total: 'Total',
+        },
+        actions: {
+          save: 'Save for Later',
+        },
+      },
+    },
     bindCart: {
       cartNumber: 'Cart Number',
       bindCartToCustomer: 'Assign Cart to Customer',
diff --git a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.html b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.html
index 846b8c9e4fe..b31e47f947f 100644
--- a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.html
+++ b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.html
@@ -1,4 +1,4 @@
-<form (submit)="bindCartToCustomer()">
+<form>
   <label for="cartNumber">{{ 'asm.bindCart.cartNumber' | cxTranslate }} </label>
   <div
     role="search"
@@ -27,11 +27,13 @@
   </div>
   <button
     #bindToCart
+    *ngIf="displayBindCartBtn$ | async"
     class="cx-asm-bindCartToCustomer"
     [disabled]="!(valid$ | async)"
     type="submit"
     [class.cx-asm-active]="valid$ | async"
     [class.cx-bind-loading]="loading$ | async"
+    (click)="bindCartToCustomer()"
   >
     <span [attr.aria-hidden]="loading$ | async">
       {{ 'asm.bindCart.bindCartToCustomer' | cxTranslate }}
@@ -41,4 +43,24 @@
       [attr.aria-label]="'common.loading' | cxTranslate"
     ></cx-dot-spinner>
   </button>
+
+  <ng-container *cxFeatureLevel="'6.2'">
+    <button
+      id="asm-save-inactive-cart-btn"
+      #saveInactiveCart
+      *ngIf="displaySaveCartBtn$ | async"
+      class="cx-asm-bindCartToCustomer cx-asm-active"
+      type="submit"
+      [class.cx-bind-loading]="loading$ | async"
+      (click)="onSaveInactiveCart()"
+    >
+      <span [attr.aria-hidden]="loading$ | async">
+        {{ 'asm.saveCart.saveCartBtn' | cxTranslate }}
+      </span>
+      <cx-dot-spinner
+        [attr.aria-hidden]="!(loading$ | async)"
+        [attr.aria-label]="'common.loading' | cxTranslate"
+      ></cx-dot-spinner>
+    </button>
+  </ng-container>
 </form>
diff --git a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
index 923497f8c4d..f5c802cbbbf 100644
--- a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
+++ b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AsmBindCartFacade } from '@spartacus/asm/root';
+import { AsmBindCartFacade, CsAgentAuthService } from '@spartacus/asm/root';
 import {
   ActiveCartFacade,
   Cart,
@@ -9,16 +9,49 @@ import {
 } from '@spartacus/cart/base/root';
 import { SavedCartFacade } from '@spartacus/cart/saved-cart/root';
 import {
+  AuthService,
+  FeatureConfigService,
   GlobalMessageEntities,
   GlobalMessageService,
   GlobalMessageType,
   OCC_CART_ID_CURRENT,
+  RoutingService,
   Translatable,
 } from '@spartacus/core';
 import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
-import { EMPTY, NEVER, Observable, of, throwError } from 'rxjs';
+import { ProcessesLoaderState } from 'projects/core/src/state/utils/processes-loader';
+import {
+  BehaviorSubject,
+  EMPTY,
+  NEVER,
+  Observable,
+  of,
+  throwError,
+} from 'rxjs';
 import { BIND_CART_DIALOG_ACTION } from '../asm-bind-cart-dialog/asm-bind-cart-dialog.component';
+import { SAVE_CART_DIALOG_ACTION } from '../asm-save-cart-dialog/asm-save-cart-dialog.component';
+import { AsmComponentService } from '../services/asm-component.service';
 import { AsmBindCartComponent } from './asm-bind-cart.component';
+import createSpy = jasmine.createSpy;
+
+class MockAuthService implements Partial<AuthService> {
+  isUserLoggedIn(): Observable<boolean> {
+    return of(false);
+  }
+}
+
+class MockCsAgentAuthService implements Partial<CsAgentAuthService> {
+  authorizeCustomerSupportAgent(): Promise<void> {
+    return Promise.resolve();
+  }
+  isCustomerSupportAgentLoggedIn(): Observable<boolean> {
+    return of(false);
+  }
+  getCustomerSupportAgentTokenLoading(): Observable<boolean> {
+    return of(false);
+  }
+  startCustomerEmulationSession(_customerId: string) {}
+}
 
 class MockActiveCartService implements Partial<ActiveCartFacade> {
   getActiveCartId(): Observable<string> {
@@ -47,6 +80,10 @@ class MockGlobalMessageService implements Partial<GlobalMessageService> {
 
 class MockMultiCartFacade implements Partial<MultiCartFacade> {
   reloadCart(_: string, __?: { active: boolean } | undefined): void {}
+  loadCart = createSpy();
+  getCartEntity(): Observable<ProcessesLoaderState<Cart | undefined>> {
+    return EMPTY;
+  }
 }
 
 class MockAsmBindCartFacade {
@@ -63,6 +100,24 @@ class MockLaunchDialogService implements Partial<LaunchDialogService> {
 
 class MockSavedCartFacade implements Partial<SavedCartFacade> {
   saveCart(): void {}
+  getSaveCartProcessSuccess(): Observable<boolean> {
+    return EMPTY;
+  }
+  getSaveCartProcessError(): Observable<boolean> {
+    return EMPTY;
+  }
+}
+
+class MockAsmComponentService extends AsmComponentService {
+  logoutCustomerSupportAgentAndCustomer(): void {}
+  unload() {}
+  isCustomerEmulationSessionInProgress() {
+    return of(false);
+  }
+}
+
+class MockRoutingService implements Partial<RoutingService> {
+  go = () => Promise.resolve(true);
 }
 
 describe('AsmBindCartComponent', () => {
@@ -74,7 +129,11 @@ describe('AsmBindCartComponent', () => {
   let globalMessageService: GlobalMessageService;
   let launchDialogService: LaunchDialogService;
   let savedCartFacade: SavedCartFacade;
+  let asmComponentService: AsmComponentService;
+  let featureConfig: FeatureConfigService;
+  let routingService: RoutingService;
 
+  const inactiveCartId = '00000002';
   const prevActiveCartId = '00001122';
   const prevActiveCart: Cart = {
     code: prevActiveCartId,
@@ -86,12 +145,16 @@ describe('AsmBindCartComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [AsmBindCartComponent, MockTranslatePipe],
       providers: [
+        { provide: AuthService, useClass: MockAuthService },
+        { provide: CsAgentAuthService, useClass: MockCsAgentAuthService },
         { provide: ActiveCartFacade, useClass: MockActiveCartService },
         { provide: AsmBindCartFacade, useClass: MockAsmBindCartFacade },
         { provide: MultiCartFacade, useClass: MockMultiCartFacade },
         { provide: GlobalMessageService, useClass: MockGlobalMessageService },
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: SavedCartFacade, useClass: MockSavedCartFacade },
+        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: AsmComponentService, useClass: MockAsmComponentService },
       ],
     }).compileComponents();
   });
@@ -106,16 +169,22 @@ describe('AsmBindCartComponent', () => {
     globalMessageService = TestBed.inject(GlobalMessageService);
     launchDialogService = TestBed.inject(LaunchDialogService);
     savedCartFacade = TestBed.inject(SavedCartFacade);
+    featureConfig = TestBed.inject(FeatureConfigService);
+    asmComponentService = TestBed.inject(AsmComponentService);
+    routingService = TestBed.inject(RoutingService);
 
     spyOn(asmBindCartFacade, 'bindCart').and.returnValue(of(undefined));
     spyOn(multiCartFacade, 'reloadCart').and.stub();
     spyOn(activeCartFacade, 'getActiveCartId').and.returnValue(
       of(prevActiveCartId)
     );
+    spyOn(asmComponentService, 'setShowDeeplinkCartInfoAlert').and.stub();
+    spyOn(routingService, 'go').and.callThrough();
     spyOn(activeCartFacade, 'getActive').and.returnValue(of(prevActiveCart));
     spyOn(globalMessageService, 'add').and.callThrough();
     spyOn(launchDialogService, 'openDialogAndSubscribe').and.callThrough();
     spyOn(savedCartFacade, 'saveCart').and.callThrough();
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
   });
 
   it('should fill the cart field with the current active cart for the customer', () => {
@@ -265,4 +334,105 @@ describe('AsmBindCartComponent', () => {
       });
     });
   });
+
+  describe('subscribe deeplink cart id', () => {
+    beforeEach(() => {
+      spyOn(component.displayBindCartBtn$, 'next').and.stub();
+      spyOn(component.displaySaveCartBtn$, 'next').and.stub();
+      spyOn(asmComponentService, 'isEmulatedByDeepLink').and.returnValue(
+        new BehaviorSubject(true)
+      );
+    });
+
+    it('should subscribe deeplink inactive cart', () => {
+      spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
+        'inactive'
+      );
+
+      component.ngOnInit();
+
+      expect(
+        asmComponentService.setShowDeeplinkCartInfoAlert
+      ).toHaveBeenCalledWith(true);
+      expect(component.displayBindCartBtn$.next).toHaveBeenCalledWith(false);
+      expect(component.displaySaveCartBtn$.next).toHaveBeenCalledWith(true);
+    });
+
+    it('should subscribe deeplink active cart', () => {
+      spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
+        'active'
+      );
+      component.ngOnInit();
+
+      expect(component.displayBindCartBtn$.next).toHaveBeenCalledWith(false);
+      expect(component.displaySaveCartBtn$.next).toHaveBeenCalledWith(false);
+      expect(routingService.go).toHaveBeenCalled();
+    });
+  });
+
+  describe('save inactive cart id as deeplink', () => {
+    beforeEach(() => {
+      fixture.detectChanges();
+      component.deepLinkCartId = inactiveCartId;
+      spyOn(asmComponentService, 'getSearchParameter').and.returnValue('anyId');
+      spyOn(multiCartFacade, 'getCartEntity').and.returnValue(
+        of({
+          loading: false,
+          success: true,
+          value: {
+            code: inactiveCartId,
+          },
+        })
+      );
+    });
+
+    it('should close inactive cart info alert', () => {
+      component.onSaveInactiveCart();
+      expect(
+        asmComponentService.setShowDeeplinkCartInfoAlert
+      ).toHaveBeenCalledWith(false);
+    });
+
+    it('should open the save inactive cart dialog', () => {
+      component.onSaveInactiveCart();
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
+        LAUNCH_CALLER.ASM_SAVE_CART,
+        undefined,
+        jasmine.anything()
+      );
+    });
+
+    describe('save inactive cart', () => {
+      beforeEach(() => {
+        (
+          (<unknown>launchDialogService) as MockLaunchDialogService
+        ).dialogClose = of(SAVE_CART_DIALOG_ACTION.SAVE);
+      });
+
+      it('should navigate to saved cart detail page after save cart successed', () => {
+        spyOn(savedCartFacade, 'getSaveCartProcessSuccess').and.returnValue(
+          of(true)
+        );
+        spyOn(component.displayBindCartBtn$, 'next').and.stub();
+        spyOn(component.displaySaveCartBtn$, 'next').and.stub();
+
+        component.onSaveInactiveCart();
+        expect(routingService.go).toHaveBeenCalled();
+        expect(component.displaySaveCartBtn$.next).toHaveBeenCalledWith(false);
+      });
+
+      it('should not navigate to saved cart detail page after save cart failed', () => {
+        spyOn(savedCartFacade, 'getSaveCartProcessError').and.returnValue(
+          of(true)
+        );
+        spyOn(component.displaySaveCartBtn$, 'next').and.stub();
+        component.onSaveInactiveCart();
+        expect(routingService.go).not.toHaveBeenCalled();
+        expect(component.displaySaveCartBtn$.next).not.toHaveBeenCalledWith(
+          false
+        );
+      });
+    });
+  });
 });
diff --git a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
index 0d2627d778a..cc75f1fc9b4 100644
--- a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
+++ b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
@@ -10,17 +10,24 @@ import {
   ElementRef,
   OnDestroy,
   OnInit,
+  Optional,
   ViewChild,
 } from '@angular/core';
 import { FormControl, ValidatorFn, Validators } from '@angular/forms';
 import { AsmBindCartFacade } from '@spartacus/asm/root';
-import { ActiveCartFacade, MultiCartFacade } from '@spartacus/cart/base/root';
+import {
+  ActiveCartFacade,
+  Cart,
+  MultiCartFacade,
+} from '@spartacus/cart/base/root';
 import { SavedCartFacade } from '@spartacus/cart/saved-cart/root';
 import {
+  FeatureConfigService,
   GlobalMessageService,
   GlobalMessageType,
   HttpErrorModel,
   OCC_CART_ID_CURRENT,
+  RoutingService,
 } from '@spartacus/core';
 import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
 import {
@@ -42,6 +49,8 @@ import {
   tap,
 } from 'rxjs/operators';
 import { BIND_CART_DIALOG_ACTION } from '../asm-bind-cart-dialog/asm-bind-cart-dialog.component';
+import { SAVE_CART_DIALOG_ACTION } from '../asm-save-cart-dialog/asm-save-cart-dialog.component';
+import { AsmComponentService } from '../services/asm-component.service';
 
 @Component({
   selector: 'cx-asm-bind-cart',
@@ -53,6 +62,10 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     if (control.value === this.activeCartId) {
       return { activeCartError: true };
     }
+
+    if (!!this.deepLinkCartId && control.value !== this.deepLinkCartId) {
+      this.resetDeeplinkCart();
+    }
     return null;
   };
 
@@ -70,26 +83,59 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
   );
 
   activeCartId = '';
+  deepLinkCartId = '';
+
+  displayBindCartBtn$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+  displaySaveCartBtn$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   @ViewChild('bindToCart') bindToCartElemRef: ElementRef<HTMLButtonElement>;
+  @ViewChild('saveInactiveCart')
+  saveInactiveCartElemRef: ElementRef<HTMLButtonElement>;
 
   protected subscription = new Subscription();
 
+  constructor(
+    globalMessageService: GlobalMessageService,
+    activeCartFacade: ActiveCartFacade,
+    multiCartFacade: MultiCartFacade,
+    asmBindCartFacade: AsmBindCartFacade,
+    launchDialogService: LaunchDialogService,
+    savedCartFacade: SavedCartFacade,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    asmComponentService: AsmComponentService,
+    routing: RoutingService,
+    featureConfig: FeatureConfigService
+  );
+  /**
+   * @deprecated since 7.0
+   */
+  constructor(
+    globalMessageService: GlobalMessageService,
+    activeCartFacade: ActiveCartFacade,
+    multiCartFacade: MultiCartFacade,
+    asmBindCartFacade: AsmBindCartFacade,
+    launchDialogService: LaunchDialogService,
+    savedCartFacade: SavedCartFacade
+  );
   constructor(
     protected globalMessageService: GlobalMessageService,
     protected activeCartFacade: ActiveCartFacade,
     protected multiCartFacade: MultiCartFacade,
     protected asmBindCartFacade: AsmBindCartFacade,
     protected launchDialogService: LaunchDialogService,
-    protected savedCartFacade: SavedCartFacade
+    protected savedCartFacade: SavedCartFacade,
+    @Optional() protected asmComponentService?: AsmComponentService,
+    @Optional() protected routing?: RoutingService,
+    @Optional() protected featureConfig?: FeatureConfigService
   ) {}
 
   ngOnInit(): void {
+    this.subscribeForDeeplinkCart();
+
     this.subscription.add(
       this.activeCartFacade.getActiveCartId().subscribe((response) => {
         this.activeCartId = response ?? '';
-
-        this.cartId.setValue(this.activeCartId);
+        this.cartId.setValue(this.deepLinkCartId || this.activeCartId);
       })
     );
   }
@@ -147,8 +193,42 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     this.subscription.add(subscription);
   }
 
+  onSaveInactiveCart() {
+    this.asmComponentService?.setShowDeeplinkCartInfoAlert(false);
+    const customerId =
+      this.asmComponentService?.getSearchParameter('customerId');
+    this.multiCartFacade.loadCart({
+      cartId: this.deepLinkCartId,
+      userId: customerId as string,
+    });
+
+    this.multiCartFacade
+      .getCartEntity(this.deepLinkCartId)
+      .pipe(
+        filter((state) => state.loading === false && state.success === true),
+        take(1),
+        map((state) => state.value as Cart),
+        filter((cart) => !!cart)
+      )
+      .subscribe((cart) => {
+        this.openASMSaveCartDialog(cart);
+      });
+
+    this.afterCloseASMSaveCartDialog();
+  }
+
   clearText() {
     this.cartId.setValue('');
+    this.resetDeeplinkCart();
+  }
+
+  protected resetDeeplinkCart(): void {
+    if (this.featureConfig?.isLevel('6.2')) {
+      this.deepLinkCartId = '';
+      this.displayBindCartBtn$.next(true);
+      this.displaySaveCartBtn$.next(false);
+      this.asmComponentService?.setShowDeeplinkCartInfoAlert(false);
+    }
   }
 
   ngOnDestroy(): void {
@@ -219,4 +299,100 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
       })
     );
   }
+
+  protected subscribeForDeeplinkCart(): void {
+    if (this.featureConfig?.isLevel('6.2')) {
+      this.subscription.add(
+        this.asmComponentService
+          ?.isEmulatedByDeepLink()
+          .pipe(
+            filter(
+              (emulated) =>
+                emulated &&
+                !!this.asmComponentService?.getSearchParameter('cartId')
+            )
+          )
+          .subscribe(() => {
+            if (this.isDeepLinkInactiveCart()) {
+              this.displayBindCartBtn$.next(false);
+              this.displaySaveCartBtn$.next(true);
+              this.onDeeplinkCart();
+            } else if (this.isDeepLinkActiveCart()) {
+              this.onDeeplinkCart();
+              this.goToActiveCartDetail();
+              this.displayBindCartBtn$.next(false);
+              this.displaySaveCartBtn$.next(false);
+            }
+          })
+      );
+    }
+  }
+
+  protected onDeeplinkCart(): void {
+    this.deepLinkCartId = this.asmComponentService?.getSearchParameter(
+      'cartId'
+    ) as string;
+    this.cartId.setValue(this.deepLinkCartId);
+    this.asmComponentService?.setShowDeeplinkCartInfoAlert(true);
+  }
+
+  protected isDeepLinkInactiveCart(): boolean {
+    const cartType = this.asmComponentService?.getSearchParameter('cartType');
+    return cartType === 'inactive';
+  }
+
+  protected isDeepLinkActiveCart(): boolean {
+    const cartType = this.asmComponentService?.getSearchParameter('cartType');
+    return cartType === 'active';
+  }
+
+  protected openASMSaveCartDialog(inactiveCart: Cart): void {
+    this.launchDialogService.openDialogAndSubscribe(
+      LAUNCH_CALLER.ASM_SAVE_CART,
+      this.saveInactiveCartElemRef,
+      inactiveCart
+    );
+  }
+
+  protected afterCloseASMSaveCartDialog(): void {
+    this.launchDialogService.dialogClose
+      .pipe(
+        filter((result) => result === SAVE_CART_DIALOG_ACTION.SAVE),
+        take(1),
+        tap(() => this.loading$.next(true))
+      )
+      .subscribe();
+
+    this.savedCartFacade
+      .getSaveCartProcessSuccess()
+      .pipe(
+        filter((success) => success),
+        take(1),
+        tap(() => this.loading$.next(false))
+      )
+      .subscribe(() => {
+        this.goToSavedCartDetails(this.deepLinkCartId);
+        this.displaySaveCartBtn$.next(false);
+      });
+
+    this.savedCartFacade
+      .getSaveCartProcessError()
+      .pipe(
+        filter((error) => error),
+        take(1),
+        tap(() => this.loading$.next(false))
+      )
+      .subscribe();
+  }
+
+  protected goToSavedCartDetails(cartId: string): void {
+    this.routing?.go({
+      cxRoute: 'savedCartsDetails',
+      params: { savedCartId: cartId },
+    });
+  }
+
+  protected goToActiveCartDetail(): void {
+    this.routing?.go({ cxRoute: 'cart' });
+  }
 }
diff --git a/feature-libs/asm/components/asm-components.module.ts b/feature-libs/asm/components/asm-components.module.ts
index 62e76efdfc2..f689c036b21 100644
--- a/feature-libs/asm/components/asm-components.module.ts
+++ b/feature-libs/asm/components/asm-components.module.ts
@@ -29,6 +29,7 @@ import { AsmBindCartComponent } from './asm-bind-cart/asm-bind-cart.component';
 import { AsmCreateCustomerFormComponent } from './asm-create-customer-form/asm-create-customer-form.component';
 import { defaultAsmCreateCustomerFormLayoutConfig } from './asm-create-customer-form/default-asm-create-customer-form-layout.config';
 import { AsmMainUiComponent } from './asm-main-ui/asm-main-ui.component';
+import { AsmSaveCartDialogComponent } from './asm-save-cart-dialog/asm-save-cart-dialog.component';
 import { AsmSessionTimerComponent } from './asm-session-timer/asm-session-timer.component';
 import { FormatTimerPipe } from './asm-session-timer/format-timer.pipe';
 import { AsmToggleUiComponent } from './asm-toggle-ui/asm-toggle-ui.component';
@@ -39,6 +40,7 @@ import { defaultCustomerListLayoutConfig } from './customer-list/default-custome
 import { CustomerSelectionComponent } from './customer-selection/customer-selection.component';
 import { defaultAsmLayoutConfig } from './default-asm-layout.config';
 import { defaultBindCartLayoutConfig } from './default-bind-cart-layout.config';
+import { defaultSaveCartLayoutConfig } from './default-save-cart-layout.config';
 import { DotSpinnerComponent } from './dot-spinner/dot-spinner.component';
 import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
 
@@ -62,6 +64,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
   ],
   declarations: [
     AsmBindCartDialogComponent,
+    AsmSaveCartDialogComponent,
     AsmMainUiComponent,
     CSAgentLoginFormComponent,
     CustomerListComponent,
@@ -76,6 +79,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
   ],
   exports: [
     AsmBindCartDialogComponent,
+    AsmSaveCartDialogComponent,
     AsmMainUiComponent,
     CSAgentLoginFormComponent,
     CustomerListComponent,
@@ -91,6 +95,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
   providers: [
     provideDefaultConfig(defaultAsmLayoutConfig),
     provideDefaultConfig(defaultBindCartLayoutConfig),
+    provideDefaultConfig(defaultSaveCartLayoutConfig),
     provideDefaultConfig(defaultCustomerListLayoutConfig),
     provideDefaultConfig(defaultAsmPaginationConfig),
     provideDefaultConfig(defaultAsmCreateCustomerFormLayoutConfig),
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
index 2bf1dc3d7c9..dbe7bc2edf2 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
@@ -70,6 +70,15 @@
         >
         </cx-message>
       </ng-container>
+      <ng-container *cxFeatureLevel="'6.2'">
+        <cx-message
+          *ngIf="showDeeplinkCartInfoAlert$ | async"
+          [text]="deeplinkCartAlertKey | cxTranslate"
+          [type]="globalMessageType.MSG_TYPE_INFO"
+          (closeMessage)="closeDeeplinkCartInfoAlert()"
+        >
+        </cx-message>
+      </ng-container>
     </ng-container>
     <ng-template #showCustomerSelection>
       <cx-customer-selection
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
index a808c22a65b..3bbf4942ed1 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
@@ -9,12 +9,14 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { AsmService } from '@spartacus/asm/core';
 import {
+  AsmEnablerService,
   AsmUi,
   CsAgentAuthService,
   CustomerListColumnActionType,
 } from '@spartacus/asm/root';
 import {
   AuthService,
+  FeatureConfigService,
   GlobalMessageService,
   I18nTestingModule,
   RoutingService,
@@ -120,7 +122,7 @@ class MockRoutingService implements Partial<RoutingService> {
   go = () => Promise.resolve(true);
 }
 
-class MockAsmComponentService {
+class MockAsmComponentService extends AsmComponentService {
   logoutCustomerSupportAgentAndCustomer(): void {}
   unload() {}
   isCustomerEmulationSessionInProgress() {
@@ -150,6 +152,9 @@ describe('AsmMainUiComponent', () => {
   let asmComponentService: AsmComponentService;
   let asmService: AsmService;
   let launchDialogService: LaunchDialogService;
+  let featureConfig: FeatureConfigService;
+  let asmEnablerService: AsmEnablerService;
+  const testCustomerId: string = 'test.customer@hybris.com';
 
   beforeEach(
     waitForAsync(() => {
@@ -187,6 +192,8 @@ describe('AsmMainUiComponent', () => {
     asmComponentService = TestBed.inject(AsmComponentService);
     asmService = TestBed.inject(AsmService);
     launchDialogService = TestBed.inject(LaunchDialogService);
+    featureConfig = TestBed.inject(FeatureConfigService);
+    asmEnablerService = TestBed.inject(AsmEnablerService);
     component = fixture.componentInstance;
     el = fixture.debugElement;
     fixture.detectChanges();
@@ -444,4 +451,177 @@ describe('AsmMainUiComponent', () => {
       component.addNewCustomerLink
     );
   });
+
+  it('should call logout when agent has logined and user is login if customerId shows in URL', () => {
+    spyOn(csAgentAuthService, 'isCustomerSupportAgentLoggedIn').and.returnValue(
+      of(true)
+    );
+    spyOn(authService, 'isUserLoggedIn').and.returnValue(of(true));
+    spyOn(asmComponentService, 'logoutCustomer').and.stub();
+    spyOn(asmComponentService, 'getSearchParameter').and.returnValue('anyId');
+
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    component.ngOnInit();
+    expect(asmComponentService.logoutCustomer).toHaveBeenCalledWith();
+  });
+
+  it('should call startCustomerEmulationSession when agent has logined and user is not login if customerId shows in URL', (done) => {
+    spyOn(csAgentAuthService, 'startCustomerEmulationSession').and.stub();
+    spyOn(csAgentAuthService, 'isCustomerSupportAgentLoggedIn').and.returnValue(
+      of(true)
+    );
+    spyOn(authService, 'isUserLoggedIn').and.returnValue(of(false));
+    spyOn(asmComponentService, 'logoutCustomer').and.stub();
+    spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
+      testCustomerId
+    );
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    component.ngOnInit();
+    expect(asmComponentService.logoutCustomer).not.toHaveBeenCalled();
+    setTimeout(() => {
+      expect(
+        csAgentAuthService.startCustomerEmulationSession
+      ).toHaveBeenCalledWith(testCustomerId);
+      done();
+    }, 200);
+  });
+
+  it('should not call startCustomerEmulationSession when agent has logined and user is not login if no customerId shows in URL', (done) => {
+    spyOn(csAgentAuthService, 'startCustomerEmulationSession').and.stub();
+    spyOn(csAgentAuthService, 'isCustomerSupportAgentLoggedIn').and.returnValue(
+      of(true)
+    );
+    spyOn(authService, 'isUserLoggedIn').and.returnValue(of(false));
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    component.ngOnInit();
+    setTimeout(() => {
+      expect(
+        csAgentAuthService.startCustomerEmulationSession
+      ).not.toHaveBeenCalled();
+      done();
+    }, 200);
+  });
+
+  it('should call naviate to home page when isEmulatedByDeepLink return true', () => {
+    spyOn(routingService, 'go').and.stub();
+    dialogClose$.next({
+      selectedUser: {},
+      actionType: null,
+    });
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    spyOn(asmEnablerService, 'isEmulateInURL').and.returnValue(true);
+    component.ngOnInit();
+    expect(routingService.go).toHaveBeenCalledWith('/');
+  });
+
+  it('should not call naviate to home page when isEmulatedByDeepLink return false', () => {
+    spyOn(routingService, 'go').and.stub();
+    dialogClose$.next({
+      selectedUser: {},
+      actionType: null,
+    });
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    spyOn(asmEnablerService, 'isEmulateInURL').and.returnValue(false);
+    component.ngOnInit();
+    expect(routingService.go).not.toHaveBeenCalledWith('/');
+  });
+
+  it('should call naviate to order details when starting session with orderId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { orderId: '456' }
+    );
+
+    expect(routingService.go).toHaveBeenCalledWith({
+      cxRoute: 'orderDetails',
+      params: { code: '456' },
+    });
+  });
+
+  it('should call naviate to order details when starting session with orderId and ticketId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { orderId: '456', ticketId: '123' }
+    );
+
+    expect(routingService.go).toHaveBeenCalledWith({
+      cxRoute: 'orderDetails',
+      params: { code: '456' },
+    });
+  });
+
+  it('should call naviate to support ticket details when starting session with ticketId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { ticketId: '456' }
+    );
+
+    expect(routingService.go).toHaveBeenCalledWith({
+      cxRoute: 'supportTicketDetails',
+      params: { ticketCode: '456' },
+    });
+  });
+
+  it('should call naviate to saved cart when starting session with savedCartId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { cartId: '456', cartType: 'saved' }
+    );
+
+    expect(routingService.go).toHaveBeenCalledWith('my-account/saved-cart/456');
+  });
+
+  it('should call naviate to saved cart when starting session with savedCartId and ticketId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { cartId: '456', cartType: 'saved', ticketId: '123' }
+    );
+
+    expect(routingService.go).toHaveBeenCalledWith('my-account/saved-cart/456');
+  });
+
+  it('should not call naviate when starting session with active cartId and ticketId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { cartId: '456', cartType: 'active', ticketId: '123' }
+    );
+
+    expect(routingService.go).not.toHaveBeenCalled();
+  });
+
+  it('should not call naviate when starting session with inactive cartId and ticketId in parameters', () => {
+    spyOn(routingService, 'go').and.stub();
+
+    component.startCustomerEmulationSession(
+      { customerId: '123' },
+      { cartId: '456', cartType: 'inactive', ticketId: '123' }
+    );
+
+    expect(routingService.go).not.toHaveBeenCalled();
+  });
+
+  it('should emit false when close inactive cart info', () => {
+    spyOn(asmComponentService, 'setShowDeeplinkCartInfoAlert').and.stub();
+    component.closeDeeplinkCartInfoAlert();
+    expect(
+      asmComponentService.setShowDeeplinkCartInfoAlert
+    ).toHaveBeenCalledWith(false);
+  });
 });
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index 39c95856f06..9595dc1029e 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -10,16 +10,19 @@ import {
   HostBinding,
   OnDestroy,
   OnInit,
+  Optional,
   ViewChild,
 } from '@angular/core';
 import { AsmService } from '@spartacus/asm/core';
 import {
+  AsmDeepLinkParameters,
   AsmUi,
   CsAgentAuthService,
   CustomerListColumnActionType,
 } from '@spartacus/asm/root';
 import {
   AuthService,
+  FeatureConfigService,
   GlobalMessageService,
   GlobalMessageType,
   RoutingService,
@@ -27,11 +30,11 @@ import {
 } from '@spartacus/core';
 import {
   ICON_TYPE,
-  LAUNCH_CALLER,
   LaunchDialogService,
+  LAUNCH_CALLER,
 } from '@spartacus/storefront';
 import { UserAccountFacade } from '@spartacus/user/account/root';
-import { Observable, Subscription, of } from 'rxjs';
+import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
@@ -42,6 +45,14 @@ import {
 } from 'rxjs/operators';
 import { CustomerListAction } from '../customer-list/customer-list.model';
 import { AsmComponentService } from '../services/asm-component.service';
+interface CartTypeKey {
+  [key: string]: string;
+}
+
+export const CART_TYPE_KEY: CartTypeKey = {
+  active: 'asm.activeCartAlertInfo',
+  inactive: 'asm.saveInactiveCartAlertInfo',
+};
 @Component({
   selector: 'cx-asm-main-ui',
   templateUrl: './asm-main-ui.component.html',
@@ -52,6 +63,11 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
   customer$: Observable<User | undefined>;
   isCollapsed$: Observable<boolean> | undefined;
   iconTypes = ICON_TYPE;
+
+  showDeeplinkCartInfoAlert$: Observable<boolean> =
+    this.asmComponentService.shouldShowDeeplinkCartInfoAlert();
+  deeplinkCartAlertKey: string = '';
+
   showCreateCustomerSuccessfullyAlert = false;
   globalMessageType = GlobalMessageType;
 
@@ -64,6 +80,31 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
   @ViewChild('customerListLink') element: ElementRef;
   @ViewChild('addNewCustomerLink') addNewCustomerLink: ElementRef;
 
+  constructor(
+    authService: AuthService,
+    csAgentAuthService: CsAgentAuthService,
+    asmComponentService: AsmComponentService,
+    globalMessageService: GlobalMessageService,
+    routingService: RoutingService,
+    asmService: AsmService,
+    userAccountFacade: UserAccountFacade,
+    launchDialogService: LaunchDialogService
+  );
+  /**
+   * @deprecated since 7.0
+   */
+  constructor(
+    authService: AuthService,
+    csAgentAuthService: CsAgentAuthService,
+    asmComponentService: AsmComponentService,
+    globalMessageService: GlobalMessageService,
+    routingService: RoutingService,
+    asmService: AsmService,
+    userAccountFacade: UserAccountFacade,
+    launchDialogService: LaunchDialogService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfig: FeatureConfigService
+  );
   constructor(
     protected authService: AuthService,
     protected csAgentAuthService: CsAgentAuthService,
@@ -72,7 +113,8 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     protected routingService: RoutingService,
     protected asmService: AsmService,
     protected userAccountFacade: UserAccountFacade,
-    protected launchDialogService: LaunchDialogService
+    protected launchDialogService: LaunchDialogService,
+    @Optional() protected featureConfig?: FeatureConfigService
   ) {}
 
   ngOnInit(): void {
@@ -134,6 +176,62 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
           }
         })
     );
+    this.subscribeForDeeplink();
+  }
+
+  /**
+   * When agent is logged in and deep link has customerID,
+   * call logout if has customer emulated(userLoggedin) but not emulated by deep link.
+   * call startSessionWithParameters
+   */
+  protected subscribeForDeeplink(): void {
+    if (this.featureConfig?.isLevel('6.2')) {
+      if (this.asmComponentService.isEmulateInURL()) {
+        //Always route to home page to avoid 404
+        this.routingService.go('/');
+      }
+      const parameters = {
+        customerId: this.asmComponentService.getSearchParameter('customerId'),
+        orderId: this.asmComponentService.getSearchParameter('orderId'),
+        ticketId: this.asmComponentService.getSearchParameter('ticketId'),
+        cartId: this.asmComponentService.getSearchParameter('cartId'),
+        cartType: this.asmComponentService.getSearchParameter('cartType'),
+        emulated: false,
+      };
+      this.deeplinkCartAlertKey = CART_TYPE_KEY[parameters.cartType || ''];
+      this.subscription.add(
+        combineLatest([
+          this.customerSupportAgentLoggedIn$,
+          this.authService.isUserLoggedIn(),
+          this.asmComponentService.isEmulatedByDeepLink(),
+        ]).subscribe(([agentLoggedIn, userLoggedin, isEmulatedByDeepLink]) => {
+          if (agentLoggedIn && parameters.customerId) {
+            if (!isEmulatedByDeepLink && userLoggedin) {
+              this.asmComponentService.logoutCustomer();
+            } else {
+              parameters.emulated = isEmulatedByDeepLink;
+              setTimeout(() => this.startSessionWithParameters(parameters));
+            }
+          }
+        })
+      );
+    }
+  }
+
+  /**
+   * If url contains customerId and we haven't emulatedFromURL, we'll change the isEmulatedByDeepLink flag and
+   * start emulate customer in URL.
+   */
+  protected startSessionWithParameters(parameters: any): void {
+    if (!parameters.emulated) {
+      this.asmComponentService.setEmulatedByDeepLink(true);
+      this.startCustomerEmulationSession(
+        {
+          customerId: parameters.customerId,
+        },
+        parameters
+      );
+    }
   }
 
   protected handleCustomerSessionStartRedirection(): void {
@@ -163,10 +261,16 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     this.asmComponentService.logoutCustomerSupportAgentAndCustomer();
   }
 
-  startCustomerEmulationSession({ customerId }: { customerId?: string }): void {
+  startCustomerEmulationSession(
+    { customerId }: { customerId?: string },
+    parameters?: AsmDeepLinkParameters
+  ): void {
     if (customerId) {
       this.csAgentAuthService.startCustomerEmulationSession(customerId);
       this.startingCustomerSession = true;
+      if (parameters) {
+        this.handleDeepLinkParamsAfterStartSession(parameters);
+      }
     } else {
       this.globalMessageService.add(
         { key: 'asm.error.noCustomerId' },
@@ -175,6 +279,35 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     }
   }
 
+  protected handleDeepLinkParamsAfterStartSession(
+    parameters: AsmDeepLinkParameters
+  ) {
+    if (
+      (parameters.cartType === 'active' ||
+        parameters.cartType === 'inactive') &&
+      parameters.cartId
+    ) {
+      return;
+    }
+
+    if (parameters.cartType === 'saved' && parameters.cartId) {
+      // Navigate to saved cart
+      this.routingService.go('my-account/saved-cart/' + parameters.cartId);
+    } else if (parameters.orderId) {
+      // Navigate to order details
+      this.routingService.go({
+        cxRoute: 'orderDetails',
+        params: { code: parameters.orderId },
+      });
+    } else if (parameters.ticketId) {
+      // Navigate to support ticket details
+      this.routingService.go({
+        cxRoute: 'supportTicketDetails',
+        params: { ticketCode: parameters.ticketId },
+      });
+    }
+  }
+
   hideUi(): void {
     this.disabled = true;
     this.asmComponentService.unload();
@@ -197,10 +330,15 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
       this.addNewCustomerLink
     );
   }
+
   closeDialogConfirmationAlert(): void {
     this.showCreateCustomerSuccessfullyAlert = false;
   }
 
+  closeDeeplinkCartInfoAlert(): void {
+    this.asmComponentService.setShowDeeplinkCartInfoAlert(false);
+  }
+
   ngOnDestroy() {
     this.subscription?.unsubscribe();
   }
diff --git a/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
new file mode 100644
index 00000000000..e6e9e602a7c
--- /dev/null
+++ b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
@@ -0,0 +1,96 @@
+<div
+  class="cx-asm-save-cart-dialog cx-modal-container cx-asm-dialog"
+  [cxFocus]="focusConfig"
+  (esc)="closeModal(BIND_CART_ACTION.CANCEL)"
+>
+  <div class="cx-modal-content">
+    <!-- Modal Header -->
+    <div class="cx-dialog-header modal-header">
+      <h2 id="asm-save-cart-dialog-title" class="title modal-title">
+        {{ 'asm.saveCart.dialog.title' | cxTranslate }}
+      </h2>
+    </div>
+
+    <!-- Modal Body -->
+    <div class="cx-dialog-body modal-body">
+      <ng-container *ngIf="cartQty > 0; else showSaveCartWarning">
+        <div class="message-container">
+          <cx-message
+            *ngIf="showDialogAlert$ | async"
+            [text]="'asm.saveCart.dialog.saveInfo' | cxTranslate"
+            [type]="globalMessageType.MSG_TYPE_INFO"
+            (closeMessage)="closeDialogAlert()"
+          >
+          </cx-message>
+        </div>
+      </ng-container>
+      <ng-template #showSaveCartWarning>
+        <div class="message-container">
+          <cx-message
+            *ngIf="showDialogAlert$ | async"
+            [text]="'asm.saveCart.dialog.disableInfo' | cxTranslate"
+            [type]="globalMessageType.MSG_TYPE_WARNING"
+            (closeMessage)="closeDialogAlert()"
+          >
+          </cx-message>
+        </div>
+      </ng-template>
+
+      <div class="cx-dialog-content">
+        <div class="cx-dialog-row row">
+          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+            {{ 'asm.saveCart.dialog.row.id' | cxTranslate }}
+          </div>
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+          >
+            {{ cart.code }}
+          </div>
+        </div>
+        <div class="cx-dialog-row row">
+          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+            {{ 'asm.saveCart.dialog.row.qty' | cxTranslate }}
+          </div>
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+          >
+            {{ cartQty }}
+          </div>
+        </div>
+        <div class="cx-dialog-row row">
+          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+            {{ 'asm.saveCart.dialog.row.total' | cxTranslate }}
+          </div>
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+          >
+            {{ cart.totalPriceWithTax?.formattedValue }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Modal Footer -->
+    <div class="cx-dialog-footer modal-footer">
+      <button
+        id="asm-save-cart-dialog-btn"
+        (click)="closeModal(BIND_CART_ACTION.SAVE)"
+        [attr.aria-label]="'asm.saveCart.dialog.actions.save' | cxTranslate"
+        class="btn btn-primary"
+        type="button"
+        [disabled]="this.cartQty === 0"
+      >
+        {{ 'asm.saveCart.dialog.actions.save' | cxTranslate }}
+      </button>
+
+      <button
+        (click)="closeModal(BIND_CART_ACTION.CANCEL)"
+        [attr.aria-label]="'common.cancel' | cxTranslate"
+        class="btn btn-secondary"
+        type="button"
+      >
+        {{ 'common.cancel' | cxTranslate }}
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.spec.ts b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.spec.ts
new file mode 100644
index 00000000000..2b73ec38ca4
--- /dev/null
+++ b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.spec.ts
@@ -0,0 +1,131 @@
+import { DebugElement, Pipe, PipeTransform } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Cart } from '@spartacus/cart/base/root';
+import { SavedCartFacade } from '@spartacus/cart/saved-cart/root';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { EMPTY, Observable, of } from 'rxjs';
+import {
+  AsmSaveCartDialogComponent,
+  SAVE_CART_DIALOG_ACTION,
+} from './asm-save-cart-dialog.component';
+
+@Pipe({
+  name: 'cxTranslate',
+})
+class MockTranslatePipe implements PipeTransform {
+  transform(): any {}
+}
+class MockSavedCartFacade implements Partial<SavedCartFacade> {
+  saveCart(): void {}
+  getSaveCartProcessSuccess(): Observable<boolean> {
+    return EMPTY;
+  }
+  getSaveCartProcessError(): Observable<boolean> {
+    return EMPTY;
+  }
+}
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  get data$(): Observable<Cart> {
+    return of({
+      code: '00000001',
+      entries: [{ quantity: 1 }, { quantity: 2 }],
+    });
+  }
+  closeDialog(_reason: any) {}
+}
+
+describe('AsmBindCartDialogComponent', () => {
+  let component: AsmSaveCartDialogComponent;
+  let fixture: ComponentFixture<AsmSaveCartDialogComponent>;
+  let el: DebugElement;
+  let launchDialogService: LaunchDialogService;
+  let savedCartFacade: SavedCartFacade;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AsmSaveCartDialogComponent, MockTranslatePipe],
+      providers: [
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: SavedCartFacade, useClass: MockSavedCartFacade },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AsmSaveCartDialogComponent);
+    component = fixture.componentInstance;
+    el = fixture.debugElement;
+    launchDialogService = TestBed.inject(LaunchDialogService);
+    savedCartFacade = TestBed.inject(SavedCartFacade);
+
+    fixture.detectChanges();
+    spyOn(launchDialogService, 'closeDialog').and.stub();
+    spyOn(savedCartFacade, 'saveCart').and.stub();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('init()', () => {
+    it('should init the component', () => {
+      component.ngOnInit();
+
+      expect(component.cartQty).toEqual(3);
+      expect(component.cart).not.toBeNull();
+    });
+  });
+
+  it('should save cart when save button is clicked', () => {
+    fixture.detectChanges();
+
+    fixture.debugElement
+      .query(By.css('.btn-primary'))
+      .triggerEventHandler('click');
+
+    expect(launchDialogService.closeDialog).toHaveBeenCalledWith(
+      SAVE_CART_DIALOG_ACTION.SAVE
+    );
+    expect(savedCartFacade.saveCart).toHaveBeenCalled();
+  });
+
+  it('should not save cart when cancel button is clicked', () => {
+    fixture.detectChanges();
+
+    fixture.debugElement
+      .query(By.css('.btn-secondary'))
+      .triggerEventHandler('click');
+
+    expect(launchDialogService.closeDialog).toHaveBeenCalledWith(
+      SAVE_CART_DIALOG_ACTION.CANCEL
+    );
+    expect(savedCartFacade.saveCart).not.toHaveBeenCalled();
+  });
+
+  it('should show meaasge based on `cx-message` selector', () => {
+    expect(el.query(By.css('cx-message'))).not.toBeNull();
+    component.closeDialogAlert();
+  });
+
+  it('should show meaasge based on `cx-message` selector', () => {
+    spyOn(component.showDialogAlert$, 'next').and.stub();
+    component.closeDialogAlert();
+    expect(component.showDialogAlert$.next).toHaveBeenCalledWith(false);
+  });
+
+  it('should set cart total Qty', () => {
+    component.cart = {
+      entries: [
+        {
+          quantity: 1,
+        },
+        {
+          quantity: 2,
+        },
+      ],
+    };
+    component.setCartTotalQty();
+    expect(component.cartQty).toEqual(3);
+  });
+});
diff --git a/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.ts b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.ts
new file mode 100644
index 00000000000..a385a11010d
--- /dev/null
+++ b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.ts
@@ -0,0 +1,78 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { Cart } from '@spartacus/cart/base/root';
+import { SavedCartFacade } from '@spartacus/cart/saved-cart/root';
+import { GlobalMessageType } from '@spartacus/core';
+import { FocusConfig, LaunchDialogService } from '@spartacus/storefront';
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+export enum SAVE_CART_DIALOG_ACTION {
+  CANCEL = 'CANCEL',
+  SAVE = 'SAVE',
+}
+
+@Component({
+  selector: 'cx-asm-save-cart-dialog',
+  templateUrl: './asm-save-cart-dialog.component.html',
+})
+export class AsmSaveCartDialogComponent implements OnInit {
+  BIND_CART_ACTION = SAVE_CART_DIALOG_ACTION;
+  showDialogAlert$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+  globalMessageType = GlobalMessageType;
+  cart: Cart;
+  cartQty: number;
+
+  focusConfig: FocusConfig = {
+    trap: true,
+    block: true,
+    autofocus: true,
+    focusOnEscape: true,
+  };
+
+  constructor(
+    protected launchDialogService: LaunchDialogService,
+    protected savedCartFacade: SavedCartFacade
+  ) {}
+
+  ngOnInit(): void {
+    this.launchDialogService.data$.pipe(take(1)).subscribe((data: Cart) => {
+      this.cart = data;
+      this.setCartTotalQty();
+    });
+  }
+
+  setCartTotalQty(): void {
+    let count = 0;
+    if (this.cart.entries) {
+      for (const entry of this.cart.entries) {
+        count += entry.quantity ? entry.quantity : 0;
+      }
+    }
+    this.cartQty = count;
+  }
+
+  closeDialogAlert(): void {
+    this.showDialogAlert$.next(false);
+  }
+
+  closeModal(reason: SAVE_CART_DIALOG_ACTION): void {
+    if (reason === SAVE_CART_DIALOG_ACTION.SAVE) {
+      this.saveCart();
+    }
+    this.launchDialogService.closeDialog(reason);
+  }
+
+  protected saveCart(): void {
+    this.savedCartFacade.saveCart({
+      cartId: this.cart.code as string,
+      saveCartName: this.cart.code as string,
+      saveCartDescription: '-',
+    });
+  }
+}
diff --git a/feature-libs/asm/components/default-save-cart-layout.config.ts b/feature-libs/asm/components/default-save-cart-layout.config.ts
new file mode 100644
index 00000000000..8517f9d6812
--- /dev/null
+++ b/feature-libs/asm/components/default-save-cart-layout.config.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  DIALOG_TYPE,
+  LAUNCH_CALLER,
+  LayoutConfig,
+} from '@spartacus/storefront';
+import { AsmSaveCartDialogComponent } from './asm-save-cart-dialog/asm-save-cart-dialog.component';
+
+export const defaultSaveCartLayoutConfig: LayoutConfig = {
+  launch: {
+    [LAUNCH_CALLER.ASM_SAVE_CART]: {
+      inlineRoot: true,
+      component: AsmSaveCartDialogComponent,
+      dialogType: DIALOG_TYPE.DIALOG,
+    },
+  },
+};
diff --git a/feature-libs/asm/components/public_api.ts b/feature-libs/asm/components/public_api.ts
index 1b3e04da5f9..22ae908488a 100644
--- a/feature-libs/asm/components/public_api.ts
+++ b/feature-libs/asm/components/public_api.ts
@@ -9,6 +9,7 @@ export * from './asm-bind-cart/asm-bind-cart.component';
 export * from './asm-components.module';
 export * from './asm-create-customer-form/asm-create-customer-form.component';
 export * from './asm-main-ui/asm-main-ui.component';
+export * from './asm-save-cart-dialog/asm-save-cart-dialog.component';
 export * from './asm-session-timer/asm-session-timer.component';
 export * from './asm-session-timer/format-timer.pipe';
 export * from './asm-toggle-ui/asm-toggle-ui.component';
diff --git a/feature-libs/asm/components/services/asm-component.service.spec.ts b/feature-libs/asm/components/services/asm-component.service.spec.ts
index 577769bb131..823603a4ffe 100644
--- a/feature-libs/asm/components/services/asm-component.service.spec.ts
+++ b/feature-libs/asm/components/services/asm-component.service.spec.ts
@@ -2,6 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import {
   ASM_ENABLED_LOCAL_STORAGE_KEY,
   CsAgentAuthService,
+  AsmEnablerService,
 } from '@spartacus/asm/root';
 import { AuthService, WindowRef } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
@@ -36,8 +37,17 @@ const MockWindowRef = {
       }
     },
   },
+  location: {
+    search: 'customerId=testId',
+  },
 };
 
+class MockAsmEnablerService implements Partial<AsmEnablerService> {
+  isEmulateInURL(): boolean {
+    return true;
+  }
+}
+
 describe('AsmComponentService', () => {
   let authService: AuthService;
   let csAgentAuthService: CsAgentAuthService;
@@ -50,6 +60,7 @@ describe('AsmComponentService', () => {
         { provide: AuthService, useClass: MockAuthService },
         { provide: CsAgentAuthService, useClass: MockCsAgentAuthService },
         { provide: WindowRef, useValue: MockWindowRef },
+        { provide: AsmEnablerService, useClass: MockAsmEnablerService },
       ],
     });
 
@@ -114,4 +125,37 @@ describe('AsmComponentService', () => {
       ).toBeNull();
     });
   });
+
+  describe('getSearchParameter', () => {
+    it('should get parameter from search result', () => {
+      expect(asmComponentService.getSearchParameter('customerId')).toEqual(
+        'testId'
+      );
+    });
+  });
+
+  describe('isEmulatedByDeepLink and setEmulated ', () => {
+    it('should emit true when user is emulated', (done) => {
+      asmComponentService.setEmulatedByDeepLink(true);
+
+      asmComponentService
+        .isEmulatedByDeepLink()
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toBe(true);
+          done();
+        });
+    });
+
+    it('should emit false when setEmulated called with false', (done) => {
+      asmComponentService.setEmulatedByDeepLink(false);
+      asmComponentService
+        .isEmulatedByDeepLink()
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toBe(false);
+          done();
+        });
+    });
+  });
 });
diff --git a/feature-libs/asm/components/services/asm-component.service.ts b/feature-libs/asm/components/services/asm-component.service.ts
index 886f5a3df6c..92b8aecb3bf 100644
--- a/feature-libs/asm/components/services/asm-component.service.ts
+++ b/feature-libs/asm/components/services/asm-component.service.ts
@@ -4,23 +4,67 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, Optional } from '@angular/core';
 import {
   ASM_ENABLED_LOCAL_STORAGE_KEY,
   CsAgentAuthService,
+  AsmEnablerService,
 } from '@spartacus/asm/root';
 import { AuthService, WindowRef } from '@spartacus/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AsmComponentService {
+  protected searchparam: URLSearchParams;
+  isEmulatedByDeepLink$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+  protected showDeeplinkCartInfoAlert$: BehaviorSubject<boolean> =
+    new BehaviorSubject(false);
+
+  constructor(
+    authService: AuthService,
+    csAgentAuthService: CsAgentAuthService,
+    winRef: WindowRef,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    asmEnablerService: AsmEnablerService
+  );
+  /**
+   * @deprecated since 7.0
+   */
+  constructor(
+    authService: AuthService,
+    csAgentAuthService: CsAgentAuthService,
+    winRef: WindowRef
+  );
   constructor(
     protected authService: AuthService,
     protected csAgentAuthService: CsAgentAuthService,
-    protected winRef: WindowRef
-  ) {}
+    protected winRef: WindowRef,
+    @Optional() protected asmEnablerService?: AsmEnablerService
+  ) {
+    this.searchparam = new URLSearchParams(this.winRef?.location?.search);
+  }
+
+  getSearchParameter(key: string): string | null {
+    return this.searchparam.get(key);
+  }
+
+  isEmulatedByDeepLink(): BehaviorSubject<boolean> {
+    return this.isEmulatedByDeepLink$;
+  }
+
+  setEmulatedByDeepLink(emulated: boolean) {
+    this.isEmulatedByDeepLink$.next(emulated);
+  }
+
+  setShowDeeplinkCartInfoAlert(display: boolean) {
+    this.showDeeplinkCartInfoAlert$.next(display);
+  }
+
+  shouldShowDeeplinkCartInfoAlert(): Observable<boolean> {
+    return this.showDeeplinkCartInfoAlert$;
+  }
 
   logoutCustomerSupportAgentAndCustomer(): void {
     this.csAgentAuthService.logoutCustomerSupportAgent();
@@ -46,4 +90,11 @@ export class AsmComponentService {
       this.winRef.localStorage.removeItem(ASM_ENABLED_LOCAL_STORAGE_KEY);
     }
   }
+
+  /**
+   * check whether try to emulate customer from deeplink
+   */
+  isEmulateInURL(): boolean {
+    return this.asmEnablerService?.isEmulateInURL() || false;
+  }
 }
diff --git a/feature-libs/asm/root/model/asm.models.ts b/feature-libs/asm/root/model/asm.models.ts
index a25226fcae8..77caf3bacf4 100644
--- a/feature-libs/asm/root/model/asm.models.ts
+++ b/feature-libs/asm/root/model/asm.models.ts
@@ -23,3 +23,11 @@ export interface CustomerSearchOptions {
 export interface AsmUi {
   collapsed?: boolean;
 }
+
+export interface AsmDeepLinkParameters {
+  customerId?: string;
+  orderId?: string;
+  ticketId?: string;
+  cartId?: string;
+  cartType?: string;
+}
diff --git a/feature-libs/asm/root/model/augmented-core.model.ts b/feature-libs/asm/root/model/augmented-core.model.ts
index d2473ca767a..3ae76e4ce84 100644
--- a/feature-libs/asm/root/model/augmented-core.model.ts
+++ b/feature-libs/asm/root/model/augmented-core.model.ts
@@ -10,6 +10,7 @@ declare module '@spartacus/storefront' {
   const enum LAUNCH_CALLER {
     ASM_CUSTOMER_LIST = 'ASM_CUSTOMER_LIST',
     ASM_BIND_CART = 'ASM_BIND_CART',
+    ASM_SAVE_CART = 'ASM_SAVE_CART',
     ASM_CREATE_CUSTOMER_FORM = 'ASM_CREATE_CUSTOMER_FORM',
   }
 }
diff --git a/feature-libs/asm/root/services/asm-enabler.service.spec.ts b/feature-libs/asm/root/services/asm-enabler.service.spec.ts
index 4add4affd91..800fcb62c25 100644
--- a/feature-libs/asm/root/services/asm-enabler.service.spec.ts
+++ b/feature-libs/asm/root/services/asm-enabler.service.spec.ts
@@ -96,6 +96,15 @@ describe('AsmEnablerService', () => {
       expect((<any>asmEnablerService).addUi).toHaveBeenCalled();
     });
 
+    it('should add UI when assisted-service/emulate? shows in the url', () => {
+      spyOn(location, 'path').and.returnValue(
+        '/any/assisted-service/emulate?customerId=1234'
+      );
+      spyOn(<any>asmEnablerService, 'addUi').and.stub();
+      asmEnablerService.load();
+      expect((<any>asmEnablerService).addUi).toHaveBeenCalled();
+    });
+
     it('should not add UI when asm param is not used', () => {
       spyOn(location, 'path').and.returnValue('/any/url');
       spyOn(<any>asmEnablerService, 'addUi').and.stub();
diff --git a/feature-libs/asm/root/services/asm-enabler.service.ts b/feature-libs/asm/root/services/asm-enabler.service.ts
index 83aaa2ceca7..aefd5031133 100644
--- a/feature-libs/asm/root/services/asm-enabler.service.ts
+++ b/feature-libs/asm/root/services/asm-enabler.service.ts
@@ -45,7 +45,7 @@ export class AsmEnablerService {
         this.winRef.localStorage.setItem(ASM_ENABLED_LOCAL_STORAGE_KEY, 'true');
       }
     }
-    return this.isLaunched() || this.isUsedBefore();
+    return this.isLaunched() || this.isUsedBefore() || this.isEmulateInURL();
   }
 
   /**
@@ -57,6 +57,13 @@ export class AsmEnablerService {
     return !!params && params.split('&').includes('asm=true');
   }
 
+  /**
+   * check whether try to emulate customer from deeplink
+   * */
+  isEmulateInURL(): boolean {
+    return this.location.path().indexOf('assisted-service/emulate?') > 0;
+  }
+
   /**
    * Evaluates local storage where we persist the usage of ASM.
    */
diff --git a/feature-libs/asm/styles/components/_asm-main-ui.component.scss b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
index 0f3d5e9c2a4..69856fbc8e6 100644
--- a/feature-libs/asm/styles/components/_asm-main-ui.component.scss
+++ b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
@@ -181,4 +181,19 @@
       margin-top: 30px;
     }
   }
+
+  .cx-message-info {
+    background-color: #e1f4ff;
+    border-color: #7bcfff;
+
+    .cx-message-icon {
+      cx-icon {
+        color: #0070f2;
+      }
+    }
+
+    .close {
+      color: #0064d8;
+    }
+  }
 }
diff --git a/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss
new file mode 100644
index 00000000000..80fe3e96e70
--- /dev/null
+++ b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss
@@ -0,0 +1,240 @@
+$sapFiori_Button_Standard_TextColor: #1d2d3e;
+$sapFiori_Button_Standard_Background: #eaecee;
+$sapFiori_Button_Standard_BorderColor: transparent;
+$sapFiori_Button_Standard_Hover_TextColor: #1d2d3e;
+$sapFiori_Button_Standard_Hover_Background: #ffffff;
+$sapFiori_Button_Standard_Hover_BorderColor: transparent;
+$sapFiori_Button_Standard_Active_TextColor: #0070f2;
+$sapFiori_Button_Standard_Active_Background: #ffffff;
+$sapFiori_Button_Standard_Active_BorderColor: #0070f2;
+
+$sapFiori_Button_Lite_TextColor: #0064d9;
+$sapFiori_Button_Lite_Hover_Background: #ffffff;
+$sapFiori_Button_Lite_Active_Background: #ffffff;
+$sapFiori_Button_Lite_Active_TextColor: #0070f2;
+$sapFiori_Button_Lite_Active_BorderColor: #0070f2;
+
+$sapFiori_Button_Emphasized_TextColor: #ffffff;
+$sapFiori_Button_Emphasized_Background: #0070f2;
+$sapFiori_Button_Emphasized_BorderColor: transparent;
+$sapFiori_Button_Emphasized_Hover_Background: #0064d9;
+$sapFiori_Button_Emphasized_Hover_BorderColor: transparent;
+$sapFiori_Button_Emphasized_Active_TextColor: #0070f2;
+$sapFiori_Button_Emphasized_Active_Background: #ffffff;
+$sapFiori_Button_Emphasized_Active_BorderColor: #0070f2;
+
+%cx-asm-save-cart-dialog {
+  .cx-message {
+    border-radius: 8px;
+    margin-bottom: 0px;
+    border-width: 1px;
+    border-style: solid;
+
+    .cx-message-content {
+      margin-inline-start: 0;
+      max-width: 100%;
+      .cx-message-header {
+        padding-inline-start: 10px;
+        padding-inline-end: 1rem;
+        line-height: 16px;
+        text-align: start;
+        min-height: 35px;
+        .cx-message-text {
+          color: #1d2d3e;
+          font-size: 14px;
+          font-family: '72';
+          font-style: normal;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .close {
+      align-self: center;
+      margin-inline-start: auto;
+      position: unset;
+      font-size: 16px;
+    }
+  }
+
+  .cx-message-info {
+    background-color: #e1f4ff;
+    border-color: #7bcfff;
+
+    .close {
+      color: #0064d8;
+    }
+
+    .cx-message-icon {
+      cx-icon {
+        color: #0070f2;
+      }
+    }
+  }
+
+  .cx-message-warning {
+    background-color: #fff8d6;
+    border-color: #ffe770;
+
+    .close {
+      color: #0064d9;
+    }
+
+    .cx-message-icon {
+      cx-icon {
+        color: #e76500;
+      }
+    }
+  }
+
+  .cx-modal-content {
+    max-width: 477px;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
+  }
+
+  .cx-dialog-header {
+    padding-top: 0.9rem;
+    padding-inline-end: 1rem;
+    padding-bottom: 0.9rem;
+    padding-inline-start: 1rem;
+    border-width: 0;
+    display: flex;
+
+    box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.16), inset 0px -1px 0px #d9d9d9;
+
+    .title {
+      font-size: 1rem;
+      font-weight: 900;
+    }
+
+    .close {
+      font-size: 1rem;
+      color: $sapFiori_Button_Standard_TextColor;
+    }
+  }
+
+  .cx-dialog-body {
+    padding: 1rem;
+    font-size: 14px;
+    min-height: 137px;
+
+    .cx-dialog-content {
+      margin: 0px 60px 30px 60px;
+
+      .item-left-text {
+        width: 27px;
+        height: 22px;
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 400;
+        font-size: 16px;
+        line-height: 22px;
+        color: #14293a;
+        padding: 15px;
+      }
+      .item-right-text {
+        width: 93px;
+        height: 25px;
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 700;
+        font-size: 18px;
+        line-height: 25px;
+        text-transform: capitalize;
+        color: #14293a;
+        padding: 15px;
+      }
+    }
+  }
+
+  .cx-dialog-footer {
+    padding-top: 0;
+    padding-inline-end: 1rem;
+    padding-bottom: 0;
+    padding-inline-start: 1rem;
+  }
+
+  .btn {
+    color: $sapFiori_Button_Standard_TextColor;
+    transition: opacity 0.3s;
+    font-size: 14px;
+    padding-top: 0;
+    padding-bottom: 0;
+    padding-inline-start: 10px;
+    padding-inline-end: 10px;
+    min-width: 48px;
+    min-height: 36px;
+    line-height: 1.34;
+    border-radius: 8px;
+    border: 1px solid transparent;
+    font-weight: 600;
+
+    &:hover,
+    &:focus {
+      box-shadow: 0px 0px 4px rgba(120, 143, 166, 0.52);
+      background-color: $sapFiori_Button_Lite_Hover_Background;
+      filter: none;
+    }
+
+    &:not(:disabled):not(.disabled):active,
+    &:not(:disabled):not(.disabled).active {
+      color: $sapFiori_Button_Lite_Active_TextColor;
+      background-color: $sapFiori_Button_Lite_Active_Background;
+      border-color: $sapFiori_Button_Lite_Active_BorderColor;
+      filter: none;
+    }
+
+    &-primary {
+      color: $sapFiori_Button_Emphasized_TextColor;
+      border-color: $sapFiori_Button_Emphasized_BorderColor;
+      background-color: $sapFiori_Button_Emphasized_Background;
+      font-weight: 700;
+
+      &:hover,
+      &:focus {
+        background-color: $sapFiori_Button_Emphasized_Hover_Background;
+        border-color: $sapFiori_Button_Emphasized_Hover_BorderColor;
+        box-shadow: none;
+        filter: none;
+      }
+
+      &:not(:disabled):not(.disabled):active,
+      &:not(:disabled):not(.disabled).active {
+        color: $sapFiori_Button_Emphasized_Active_TextColor;
+        background-color: $sapFiori_Button_Emphasized_Active_Background;
+        border-color: $sapFiori_Button_Emphasized_Active_BorderColor;
+        filter: none;
+      }
+
+      &:disabled {
+        &:hover {
+          background-color: var(--cx-color-border-focus);
+        }
+      }
+    }
+
+    &-secondary {
+      color: $sapFiori_Button_Standard_TextColor;
+      border-color: $sapFiori_Button_Standard_BorderColor;
+      background-color: $sapFiori_Button_Standard_Background;
+
+      &:hover,
+      &:focus {
+        color: $sapFiori_Button_Standard_Hover_TextColor;
+        background-color: $sapFiori_Button_Standard_Hover_Background;
+        border-color: $sapFiori_Button_Standard_Hover_BorderColor;
+        box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.72);
+        filter: none;
+      }
+
+      &:not(:disabled):not(.disabled):active,
+      &:not(:disabled):not(.disabled).active {
+        color: $sapFiori_Button_Standard_Active_TextColor;
+        background-color: $sapFiori_Button_Standard_Active_Background;
+        border-color: $sapFiori_Button_Standard_Active_BorderColor;
+        filter: none;
+      }
+    }
+  }
+}
diff --git a/feature-libs/asm/styles/components/_index.scss b/feature-libs/asm/styles/components/_index.scss
index 2ccf2861bc0..649b8d03e09 100644
--- a/feature-libs/asm/styles/components/_index.scss
+++ b/feature-libs/asm/styles/components/_index.scss
@@ -1,4 +1,5 @@
 @import './_asm-bind-cart-dialog.component.scss';
+@import './_asm-save-cart-dialog.component.scss';
 @import './_asm-main-ui.component.scss';
 @import './_asm-session-timer.component.scss';
 @import './_asm-toggle-ui.component.scss';
@@ -11,9 +12,10 @@
 @import './_asm-create-customer-form.component.scss';
 
 $asm-components-allowlist: cx-asm-main-ui, cx-asm-session-timer,
-  cx-asm-bind-cart, cx-asm-bind-cart-dialog, cx-asm-toggle-ui,
-  cx-csagent-login-form, cx-customer-emulation, cx-customer-selection,
-  cx-dot-spinner, cx-customer-list, cx-asm-create-customer-form !default;
+  cx-asm-bind-cart, cx-asm-bind-cart-dialog, cx-asm-save-cart-dialog,
+  cx-asm-toggle-ui, cx-csagent-login-form, cx-customer-emulation,
+  cx-customer-selection, cx-dot-spinner, cx-customer-list,
+  cx-asm-create-customer-form !default;
 
 $skipComponentStyles: () !default;
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
index 31552db9c05..0ff93833eb2 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
@@ -8,6 +8,7 @@ import { tabbingOrderConfig as config } from '../../helpers/accessibility/tabbin
 import {
   asmTabbingOrderWithCreateCustomerForm,
   asmTabbingOrderWithCustomerList,
+  asmTabbingOrderWithSaveInactiveCartDialog,
 } from '../../helpers/accessibility/tabbing-order/asm';
 
 describe('Tabbing order for ASM', () => {
@@ -23,5 +24,11 @@ describe('Tabbing order for ASM', () => {
     it('should allow to navigate with tab key for create customer form (CXSPA-1594)', () => {
       asmTabbingOrderWithCreateCustomerForm(config.asmWithCreateCustomerForm);
     });
+
+    it('should allow to navigate with tab key for save deeplink inactive cart dialog (CXSPA-3313)', () => {
+      asmTabbingOrderWithSaveInactiveCartDialog(
+        config.asmInactiveCartSaveDialog
+      );
+    });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
index cf1af8ce9cf..9b39b9b2d3b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
@@ -8,19 +8,661 @@ import * as asm from '../../../../helpers/asm';
 import { login } from '../../../../helpers/auth-forms';
 import * as checkout from '../../../../helpers/checkout-flow';
 import { ELECTRONICS_BASESITE } from '../../../../helpers/checkout-flow';
+import * as customerTicketing from '../../../../helpers/customer-ticketing/customer-ticketing';
 import { getErrorAlert } from '../../../../helpers/global-message';
+import { signOutUser } from '../../../../helpers/login';
 import {
   navigateToCategory,
   waitForPage,
 } from '../../../../helpers/navigation';
+import { doPlaceOrder } from '../../../../helpers/order-history';
+import * as savedCart from '../../../../helpers/saved-cart';
 import { APPAREL_BASESITE } from '../../../../helpers/variants/apparel-checkout-flow';
-import { getSampleUser } from '../../../../sample-data/checkout-flow';
+import * as sampleData from '../../../../sample-data/saved-cart';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 
+import { getSampleUser } from '../../../../sample-data/checkout-flow';
+
+import {
+  emulateCustomerPrepare,
+  getCurrentCartIdAndAddProducts,
+  getCustomerId,
+  getInactiveCartIdAndAddProducts,
+} from '../../../../helpers/asm';
+
+const agentToken = {
+  userName: 'asagent',
+  pwd: 'pw4all',
+};
+
 context('Assisted Service Module', () => {
   describe('Customer Support Agent - Emulation', () => {
     asm.testCustomerEmulation();
 
+    it('should emulate customer with deeplink before agent login (CXSPA-3113)', () => {
+      const customer = getSampleUser();
+      cy.log('--> Register new user');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customer);
+
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId) => {
+          cy.visit('/assisted-service/emulate?customerId=' + customerId);
+          asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+          cy.log('--> Should has assignCart');
+          cy.get('.cx-asm-assignCart').should('exist');
+
+          cy.log('--> sign out and close ASM UI');
+          asm.agentSignOut();
+        }
+      );
+    });
+
+    it('should emulate customer and navigate to order with deeplink before agent login', () => {
+      const customer = getSampleUser();
+
+      cy.log('--> Agent logging in with deeplink');
+      cy.visit('/');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      doPlaceOrder().then((orderData: any) => {
+        signOutUser();
+
+        const orderId = orderData.body.code;
+
+        getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+          (customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&orderId=' +
+                orderId
+            );
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.url().should('contain', 'order/' + orderId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          }
+        );
+      });
+    });
+
+    it('should emulate customer and navigate to support ticket with deeplink before agent login', () => {
+      const testTicketDetails = {
+        subject: 'Testing',
+        message: 'I am testing asm deep linking.',
+        ticketCategory: {
+          id: 'ENQUIRY',
+          name: 'Complaint',
+        },
+      };
+
+      const customer = getSampleUser();
+
+      cy.log('--> Agent logging in with deeplink');
+      cy.visit('/');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      customerTicketing.visitElectronicTicketListingPage();
+      customerTicketing.createTicket(testTicketDetails);
+      customerTicketing.verifyTicketListingTableContent();
+      customerTicketing
+        .getIdInRow(1)
+        .invoke('text')
+        .then((text) => {
+          const ticketId = text.trim();
+          signOutUser();
+
+          getCustomerId(
+            agentToken.userName,
+            agentToken.pwd,
+            customer.email
+          ).then((customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&ticketId=' +
+                ticketId
+            );
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.url().should('contain', 'support-ticket/' + ticketId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          });
+        });
+    });
+
+    it('should emulate customer and navigate to saved cart with deeplink before agent login', () => {
+      const customer = getSampleUser();
+
+      cy.visit('/');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      savedCart.addProductToCart(sampleData.products[2], 2);
+      cy.intercept('save?saveCartName=test1*');
+      savedCart.saveActiveCart(false);
+
+      cy.visit('my-account/saved-carts');
+
+      cy.get('td.cx-saved-cart-list-cart-id').then((els) => {
+        const savedCartId = els[0].innerText;
+
+        signOutUser();
+
+        cy.log('--> Agent logging in with deeplink');
+
+        getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+          (customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&cartId=' +
+                savedCartId +
+                '&cartType=saved'
+            );
+
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.url().should('contain', 'saved-cart/' + savedCartId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          }
+        );
+      });
+    });
+
+    it('should emulate customer with deeplink after agent login (CXSPA-3113)', () => {
+      const customer = getSampleUser();
+      cy.log('--> Register new user');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customer);
+
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId) => {
+          cy.visit('/assisted-service/emulate?customerId=' + customerId);
+
+          cy.log('--> Should has assignCart');
+          cy.get('.cx-asm-assignCart').should('exist');
+
+          cy.log('--> sign out and close ASM UI');
+          asm.agentSignOut();
+        }
+      );
+    });
+
+    it('should emulate customer and navigate to order with deeplink after agent login', () => {
+      const customer = getSampleUser();
+
+      cy.visit('/?asm=true');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      doPlaceOrder().then((orderData: any) => {
+        signOutUser();
+
+        const orderId = orderData.body.code;
+
+        cy.log('--> login as agent');
+        asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+        cy.log('--> Agent visting URL with deeplink');
+
+        getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+          (customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&orderId=' +
+                orderId
+            );
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.get('cx-asm-main-ui').should('be.visible');
+            cy.get('cx-asm-main-ui').should('exist');
+
+            cy.url().should('contain', 'order/' + orderId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          }
+        );
+      });
+    });
+
+    it('should emulate customer and navigate to support ticket with deeplink after agent login', () => {
+      const testTicketDetails = {
+        subject: 'Testing',
+        message: 'I am testing asm deep linking.',
+        ticketCategory: {
+          id: 'ENQUIRY',
+          name: 'Complaint',
+        },
+      };
+
+      const customer = getSampleUser();
+
+      cy.visit('/?asm=true');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      customerTicketing.visitElectronicTicketListingPage();
+      customerTicketing.createTicket(testTicketDetails);
+      customerTicketing.verifyTicketListingTableContent();
+      customerTicketing
+        .getIdInRow(1)
+        .invoke('text')
+        .then((text) => {
+          const ticketId = text.trim();
+          signOutUser();
+
+          cy.log('--> login as agent');
+          asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+          cy.log('--> Agent visting URL with deeplink');
+
+          getCustomerId(
+            agentToken.userName,
+            agentToken.pwd,
+            customer.email
+          ).then((customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&ticketId=' +
+                ticketId
+            );
+
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            cy.url().should('contain', 'support-ticket/' + ticketId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          });
+        });
+    });
+
+    it('should emulate customer and navigate to saved cart with deeplink after agent login', () => {
+      const customer = getSampleUser();
+
+      cy.visit('/?asm=true');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      login(customer.email, customer.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
+
+      savedCart.addProductToCart(sampleData.products[2], 2);
+      cy.intercept('save?saveCartName=test1*');
+      savedCart.saveActiveCart(false);
+
+      cy.visit('my-account/saved-carts');
+
+      cy.get('td.cx-saved-cart-list-cart-id').then((els) => {
+        const savedCartId = els[0].innerText;
+
+        signOutUser();
+
+        asm.agentLogin(agentToken.userName, agentToken.pwd);
+
+        cy.log('--> Agent logging in with deeplink');
+
+        getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+          (customerId) => {
+            cy.visit(
+              '/assisted-service/emulate?customerId=' +
+                customerId +
+                '&cartId=' +
+                savedCartId +
+                '&cartType=saved'
+            );
+
+            cy.log('--> Should has assignCart');
+            cy.get('.cx-asm-assignCart').should('exist');
+
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            cy.url().should('contain', 'saved-cart/' + savedCartId);
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          }
+        );
+      });
+    });
+
+    it('should emulate customer and navigate to active cart with deeplink after agent login (CXSPA-3507)', () => {
+      const customer = emulateCustomerPrepare(
+        agentToken.userName,
+        agentToken.pwd
+      );
+
+      cy.log('--> Agent logging in with deeplink');
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId) => {
+          getCurrentCartIdAndAddProducts(
+            customer.email,
+            customer.password,
+            '1934793',
+            '2'
+          ).then((activeCartId) => {
+            cy.visit(
+              `/assisted-service/emulate?customerId=${customerId}&cartId=${activeCartId}&cartType=active`
+            );
+
+            cy.log('--> set input should be active cart id');
+            cy.get(
+              'cx-customer-emulation input[formcontrolname="cartNumber"]'
+            ).should('have.value', activeCartId);
+
+            cy.log('--> the message strip should be display');
+            cy.get('cx-asm-save-cart-dialog .cx-message-info button cx-icon')
+              .should('exist')
+              .click();
+
+            cy.log('--> Should navigate to current cart page');
+            cy.get('.cart-details-wrapper .cx-total').should(
+              'have.text',
+              `  Cart #${activeCartId} `
+            );
+
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            cy.url().should('contain', '/cart');
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          });
+        }
+      );
+    });
+
+    it('should emulate customer and navigate to active cart with deeplink ticketId and active cartId after agent login (CXSPA-3507)', () => {
+      const customer = emulateCustomerPrepare(
+        agentToken.userName,
+        agentToken.pwd
+      );
+
+      cy.log('--> Agent logging in with deeplink');
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId) => {
+          getCurrentCartIdAndAddProducts(
+            customer.email,
+            customer.password,
+            '1934793',
+            '2'
+          ).then((activeCartId) => {
+            cy.visit(
+              `/assisted-service/emulate?customerId=${customerId}&ticketId=00000008&cartId=${activeCartId}&cartType=active`
+            );
+
+            cy.log('--> set input should be active cart id');
+            cy.get(
+              'cx-customer-emulation input[formcontrolname="cartNumber"]'
+            ).should('have.value', activeCartId);
+
+            cy.log('--> the message strip should be display');
+            cy.get('cx-asm-save-cart-dialog .cx-message-info button cx-icon')
+              .should('exist')
+              .click();
+
+            cy.log('--> Should navigate to current cart page');
+            cy.get('.cart-details-wrapper .cx-total').should(
+              'have.text',
+              `  Cart #${activeCartId} `
+            );
+
+            cy.get('cx-asm-main-ui').should('exist');
+            cy.get('cx-asm-main-ui').should('be.visible');
+
+            cy.url().should('contain', '/cart');
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          });
+        }
+      );
+    });
+
+    it('should not emulate customer if uid is invalid - end emulation session is expected (CXSPA-3113)', () => {
+      const customer = getSampleUser();
+      cy.log('--> Register new user');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customer);
+
+      cy.log('--> login as agent');
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId) => {
+          cy.visit(
+            '/assisted-service/emulate?customerId=' + customerId + 'invalid end'
+          );
+
+          cy.log('--> Should not has assignCart');
+          cy.get('.cx-asm-assignCart').should('not.exist');
+
+          cy.log('--> sign out and close ASM UI');
+          asm.agentSignOut();
+        }
+      );
+    });
+
+    it('should end session of emulated customer and emulate new customer if valid uid shows in URL (CXSPA-3113)', () => {
+      const oldCustomer = getSampleUser();
+      const newCustomer = getSampleUser();
+
+      cy.log('--> Register 2 users');
+      checkout.visitHomePage('asm=true');
+      checkout.registerUser(false, oldCustomer);
+      checkout.visitHomePage('asm=true');
+      checkout.registerUser(false, newCustomer);
+
+      cy.log('--> login as agent');
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(
+        agentToken.userName,
+        agentToken.pwd,
+        oldCustomer.email
+      ).then((customerId) => {
+        const oldCustomerId = customerId;
+        getCustomerId(
+          agentToken.userName,
+          agentToken.pwd,
+          newCustomer.email
+        ).then((customerId) => {
+          const newCustomerId = customerId;
+
+          cy.log('--> Agent logging in deeplink with old customer');
+          cy.visit('/assisted-service/emulate?customerId=' + oldCustomerId);
+
+          cy.log('--> Should has assignCart and uid is old customer');
+          cy.get('.cx-asm-assignCart').should('exist');
+          cy.get('.cx-asm-uid').should('have.text', oldCustomer.email);
+
+          cy.log('--> Agent logging in deeplink with new customer');
+          cy.visit('/assisted-service/emulate?customerId=' + newCustomerId);
+
+          cy.log('--> Should has assignCart and uid is new customer');
+          cy.get('.cx-asm-assignCart').should('exist');
+          cy.get('.cx-asm-uid').should('have.text', newCustomer.email);
+
+          cy.log('--> sign out and close ASM UI');
+          asm.agentSignOut();
+        });
+      });
+    });
+
+    it('should save inactive cart in deeplink after agent login (CXSPA-3278)', () => {
+      let customer = emulateCustomerPrepare(
+        agentToken.userName,
+        agentToken.pwd
+      );
+      getInactiveCartIdAndAddProducts(
+        customer.email,
+        customer.password,
+        '1934793',
+        '2'
+      ).then((inactiveCartId) => {
+        // get customerId via token
+        getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+          (customerId) => {
+            cy.visit(
+              `/assisted-service/emulate?customerId=${customerId}&cartId=${inactiveCartId}&cartType=inactive`
+            );
+
+            cy.log(
+              '--> Should has assign inactive cart to input and display alert info'
+            );
+            cy.get('.cx-asm-assignCart').should('exist');
+            cy.get('button[id=asm-save-inactive-cart-btn]').should('exist');
+            cy.get(
+              'cx-customer-emulation input[formcontrolname="cartNumber"]'
+            ).should('have.value', inactiveCartId);
+            cy.get('cx-asm-main-ui cx-message').should('exist');
+
+            cy.log('--> Click save button the dialog shold display');
+            cy.get('button[id=asm-save-inactive-cart-btn]').click();
+            cy.get('cx-asm-save-cart-dialog').should('exist');
+            cy.get('cx-asm-save-cart-dialog .cx-message-info button cx-icon')
+              .should('exist')
+              .click();
+            cy.get('.cx-dialog-item.item-right-text').should(
+              'have.text',
+              ` ${inactiveCartId}  2  $199.70 `
+            );
+            cy.get('button[id=asm-save-cart-dialog-btn]')
+              .should('be.enabled')
+              .click();
+
+            cy.log(
+              '--> Click save button will navigate to the cart detail page'
+            );
+
+            cy.get('.cx-card-label').should('contain', inactiveCartId);
+            cy.get('cx-saved-cart-details-action .btn-primary').should(
+              'be.enabled'
+            );
+            cy.url().should('include', 'saved-cart');
+            cy.url().should('include', inactiveCartId);
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          }
+        );
+      });
+    });
+
+    it('should not save empty inactive cart in deeplink after agent login (CXSPA-3278)', () => {
+      let customer = emulateCustomerPrepare(
+        agentToken.userName,
+        agentToken.pwd
+      );
+      getInactiveCartIdAndAddProducts(customer.email, customer.password).then(
+        (inactiveCartId) => {
+          cy.log('--> create inactive cart');
+          // get customerId via token
+          getCustomerId(
+            agentToken.userName,
+            agentToken.pwd,
+            customer.email
+          ).then((customerId) => {
+            cy.visit(
+              `/assisted-service/emulate?customerId=${customerId}&cartId=${inactiveCartId}&cartType=inactive`
+            );
+
+            cy.log(
+              '--> Should has assign inactive cart to input and display alert info'
+            );
+            cy.get('.cx-asm-assignCart').should('exist');
+            cy.get('button[id=asm-save-inactive-cart-btn]').should('exist');
+            cy.get(
+              'cx-customer-emulation input[formcontrolname="cartNumber"]'
+            ).should('have.value', inactiveCartId);
+            cy.get('cx-asm-main-ui cx-message').should('exist');
+
+            cy.log(
+              '--> Click save button the dialog shold display, but the save button is disable'
+            );
+            cy.get('button[id=asm-save-inactive-cart-btn]').click();
+            cy.get('cx-asm-save-cart-dialog').should('exist');
+            cy.get('cx-asm-save-cart-dialog .cx-message-warning button cx-icon')
+              .should('exist')
+              .click();
+            cy.get('.cx-dialog-item.item-right-text').should(
+              'have.text',
+              ` ${inactiveCartId}  0  $0.00 `
+            );
+            cy.get('button[id=asm-save-cart-dialog-btn]').should('be.disabled');
+            cy.findByText(/Cancel/i).click();
+
+            cy.log('--> sign out and close ASM UI');
+            asm.agentSignOut();
+          });
+        }
+      );
+    });
+
     it('should checkout as customer', () => {
       const customer = getSampleUser();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
index 788657b15cc..134fd31c5b9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
@@ -2416,4 +2416,18 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
       value: 'Cancel',
     },
   ],
+  asmInactiveCartSaveDialog: [
+    {
+      type: TabbingOrderTypes.BUTTON,
+      value: '',
+    },
+    {
+      type: TabbingOrderTypes.BUTTON,
+      value: 'Save for Later',
+    },
+    {
+      type: TabbingOrderTypes.GENERIC_BUTTON,
+      value: 'Cancel',
+    },
+  ],
 };
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
index b20b27783c3..c7ab5ab9ccd 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as asm from '../../../helpers/asm';
 import { verifyTabbingOrder } from '../tabbing-order';
 import { TabElement } from '../tabbing-order.model';
-import * as asm from '../../../helpers/asm';
 
 const containerSelector = 'cx-asm-main-ui';
 const containerSelectorForCustomerLists = 'cx-customer-list';
 const containerSelectorForCreateCustomerForm = 'cx-asm-create-customer-form';
+const containerSelectorForInactiveCartDialog = 'cx-asm-save-cart-dialog';
 
 export function asmTabbingOrderNotLoggedIn(config: TabElement[]) {
   cy.visit('/?asm=true');
@@ -80,3 +81,35 @@ export function asmTabbingOrderWithCreateCustomerForm(config: TabElement[]) {
 
   verifyTabbingOrder(containerSelectorForCreateCustomerForm, config);
 }
+
+export function asmTabbingOrderWithSaveInactiveCartDialog(
+  config: TabElement[]
+) {
+  const customer = asm.emulateCustomerPrepare('asagent', 'pw4all');
+
+  asm.getCustomerId('asagent', 'pw4all', customer.email).then((customerId) => {
+    asm
+      .getInactiveCartIdAndAddProducts(
+        customer.email,
+        customer.password,
+        '1934793',
+        '2'
+      )
+      .then((inactiveCartId) => {
+        cy.visit(
+          `/assisted-service/emulate?customerId=${customerId}&cartId=${inactiveCartId}&cartType=inactive`
+        );
+        cy.get('.cx-asm-assignCart').should('exist');
+        cy.get('button[id=asm-save-inactive-cart-btn]').should('exist');
+        cy.get(
+          'cx-customer-emulation input[formcontrolname="cartNumber"]'
+        ).should('have.value', inactiveCartId);
+        cy.get('cx-asm-main-ui cx-message').should('exist');
+        cy.log('--> Click save button the dialog shold display');
+        cy.get('button[id=asm-save-inactive-cart-btn]').click();
+        verifyTabbingOrder(containerSelectorForInactiveCartDialog, config);
+        cy.findByText(/Cancel/i).click();
+        asm.agentSignOut();
+      });
+  });
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index c3d1113ed85..9f1461a3947 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -11,6 +11,13 @@ import { fillShippingAddress } from '../helpers/checkout-forms';
 import * as consent from '../helpers/consent-management';
 import * as profile from '../helpers/update-profile';
 import { getSampleUser, SampleUser } from '../sample-data/checkout-flow';
+import {
+  addToCartWithProducts,
+  createCart,
+  createInactiveCart,
+} from '../support/utils/cart';
+import { login as fetchingToken } from '../support/utils/login';
+
 import {
   interceptGet,
   interceptPatch,
@@ -750,3 +757,106 @@ export function verifyFormErrors() {
     cy.get('cx-form-errors p').should('have.length', 4);
   });
 }
+
+export function emulateCustomerPrepare(agentToken, agentPwd) {
+  const customer = getSampleUser();
+  cy.log('--> Register new user');
+  cy.visit('/?asm=true');
+  checkout.registerUser(false, customer);
+  asm.agentLogin(agentToken, agentPwd);
+  return customer;
+}
+
+export function getCustomerId(agentUserName, agentPwd, customerUid) {
+  return new Promise((resolve, reject) => {
+    fetchingToken(agentUserName, agentPwd, false).then((res) => {
+      // get customerId of it
+      cy.request({
+        method: 'get',
+        url:
+          `${Cypress.env('API_URL')}/${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+            'BASE_SITE'
+          )}/users/` + customerUid,
+        headers: {
+          Authorization: `bearer ${res.body.access_token}`,
+        },
+      }).then((response) => {
+        if (response.status === 200) {
+          resolve(response.body.customerId);
+        } else {
+          reject(response.status);
+        }
+      });
+    });
+  });
+}
+
+export function getInactiveCartIdAndAddProducts(
+  customerEmail,
+  customerPwd,
+  productCode?,
+  quantity?
+) {
+  let token = null;
+  return new Promise((resolve, reject) => {
+    fetchingToken(customerEmail, customerPwd, false).then((res) => {
+      token = res.body.access_token;
+      createInactiveCart(token)
+        .then((inactiveCartId) => {
+          if (!!productCode && quantity) {
+            addToCartWithProducts(
+              inactiveCartId,
+              productCode,
+              quantity,
+              token
+            ).then((response) => {
+              if (response.status === 200) {
+                resolve(inactiveCartId);
+              } else {
+                reject(response.status);
+              }
+            });
+          } else {
+            resolve(inactiveCartId);
+          }
+        })
+        .catch((status) => reject(status));
+    });
+  });
+}
+
+export function getCurrentCartIdAndAddProducts(
+  customerName,
+  customerPwd,
+  productCode?,
+  quantity?
+) {
+  return new Promise((resolve, reject) => {
+    fetchingToken(customerName, customerPwd, false).then((res) => {
+      const token = res.body.access_token;
+      createCart(token).then((response) => {
+        if (response.status === 200) {
+          const activeCartId = response.body.code;
+          if (!!productCode && quantity) {
+            addToCartWithProducts(
+              activeCartId,
+              productCode,
+              quantity,
+              token
+            ).then((response) => {
+              if (response.status === 200) {
+                resolve(activeCartId);
+              } else {
+                reject(response.status);
+              }
+            });
+          } else {
+            resolve(activeCartId);
+          }
+        } else {
+          reject(response.status);
+        }
+      });
+    });
+  });
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/customer-ticketing/customer-ticketing-helpers/ticket-listing.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/customer-ticketing/customer-ticketing-helpers/ticket-listing.ts
index c0aa9d84371..3467bac7e57 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/customer-ticketing/customer-ticketing-helpers/ticket-listing.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/customer-ticketing/customer-ticketing-helpers/ticket-listing.ts
@@ -181,7 +181,7 @@ export function verifyCertainNumberOfTicketsSortedById(
   }
 }
 
-function getIdInRow(rowNumber: number) {
+export function getIdInRow(rowNumber: number) {
   return cy
     .get('cx-customer-ticketing-list')
     .get('tbody')
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
index 184b4cd2945..967f5b7d52b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
@@ -234,7 +234,7 @@ export function waitForSavedCartDetailsPageData(product: SampleProduct) {
     });
 }
 
-export function saveActiveCart() {
+export function saveActiveCart(verify = true) {
   clickSavedCartButtonsFromCartPage(1);
 
   cy.window()
@@ -269,7 +269,9 @@ export function saveActiveCart() {
       cy.get('cx-paragraph').should('contain', 'Your shopping cart is empty');
 
       // assert the cart was saved in the listing page
-      verifyActiveCartWasSaved(active);
+      if (verify) {
+        verifyActiveCartWasSaved(active);
+      }
     });
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts b/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
index a47e5d6f244..adc76c0713b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/utils/cart.ts
@@ -24,6 +24,9 @@ export function createCart(accessToken: string) {
   });
 }
 
+/**
+ * param quantity is not used
+ */
 export function addToCart(
   cartCode: string,
   productCode: string,
@@ -48,6 +51,38 @@ export function addToCart(
   });
 }
 
+/**
+ *  add products to cart
+ * @param cartCode cart code
+ * @param productCode product code
+ * @param quantity quantity
+ * @param accessToken token
+ */
+export function addToCartWithProducts(
+  cartCode: string,
+  productCode: string,
+  quantity: string,
+  accessToken: string
+) {
+  const addToCartUrl = `${Cypress.env('API_URL')}/${Cypress.env(
+    'OCC_PREFIX'
+  )}/${Cypress.env('BASE_SITE')}/users/current/carts/${cartCode}/entries`;
+
+  return cy.request({
+    method: 'POST',
+    url: addToCartUrl,
+    body: {
+      product: {
+        code: productCode,
+      },
+      quantity: quantity,
+    },
+    headers: {
+      Authorization: `bearer ${accessToken}`,
+    },
+  });
+}
+
 export function addProductToB2BCart(
   cartCode: string,
   productCode: string,
@@ -57,6 +92,7 @@ export function addProductToB2BCart(
   const addToCartUrl = `${Cypress.env('API_URL')}/${Cypress.env(
     'OCC_PREFIX'
   )}/${Cypress.env('BASE_SITE')}/orgUsers/current/carts/${cartCode}/entries/`;
+
   return cy.request({
     method: 'POST',
     url: addToCartUrl,
@@ -75,3 +111,28 @@ export function addProductToB2BCart(
     },
   });
 }
+
+/**
+ * create inactive cart
+ *
+ * @param accessToken access token
+ * @returns promise of inactive card id
+ */
+export function createInactiveCart(accessToken: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    createCart(accessToken).then((response) => {
+      if (response.status === 201) {
+        const inactiveCartId = response.body.code;
+        createCart(accessToken).then((response) => {
+          if (response.status === 201) {
+            resolve(inactiveCartId);
+          } else {
+            reject(response.status);
+          }
+        });
+      } else {
+        reject(response.status);
+      }
+    });
+  });
+}

From 372053d7191975ba36f97536dea45a59f6f82439 Mon Sep 17 00:00:00 2001
From: steinsebastian <54309425+steinsebastian@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:37:31 +0200
Subject: [PATCH 046/122] fix: accessibilty for read-only attributes (#17548)

---
 ...ator-attribute-read-only.component.spec.ts | 24 +++++++++++++++++++
 ...figurator-attribute-read-only.component.ts |  6 +++++
 2 files changed, 30 insertions(+)

diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
index 21b87be4d60..d7e2ff4341e 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.spec.ts
@@ -289,6 +289,30 @@ describe('ConfigAttributeReadOnlyComponent', () => {
             valueName
         );
       });
+
+      it('should return aria label without valuePrice', () => {
+        myValues[0].selected = false;
+        myValues[1].selected = true;
+        myValues[2].selected = false;
+        component.attribute.values = myValues;
+        fixture.detectChanges();
+        let attributeLabel = component.attribute.label;
+        let valueName = myValues[1].valueCode;
+        CommonConfiguratorTestUtilsService.expectElementPresent(
+          expect,
+          htmlElem,
+          '.cx-visually-hidden'
+        );
+        expect(
+          component.getAriaLabel(component.attribute, myValues[1])
+        ).toEqual(
+          'configurator.a11y.readOnlyValueOfAttributeFull' +
+            ' attribute:' +
+            attributeLabel +
+            ' value:' +
+            valueName
+        );
+      });
     });
 
     describe('noStaticDomain', () => {
diff --git a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.ts b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.ts
index e663b45f4bc..d2116721d25 100644
--- a/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.ts
+++ b/feature-libs/product-configurator/rulebased/components/attribute/types/read-only/configurator-attribute-read-only.component.ts
@@ -70,6 +70,12 @@ export class ConfiguratorAttributeReadOnlyComponent extends ConfiguratorAttribut
             value.valuePrice?.formattedValue
           );
         }
+      } else {
+        ariaLabel = this.translate(
+          'configurator.a11y.readOnlyValueOfAttributeFull',
+          valueName,
+          attribute
+        );
       }
     } else {
       const valueName = this.getCurrentValueName(attribute);

From cf98f5bbadaa16e76a959c9bd24c123d48ff9431 Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Wed, 21 Jun 2023 12:56:01 +0530
Subject: [PATCH 047/122] review changes for cdc-consent management (#17551)

---
 .../components/register/register-component.service.ts       | 6 +++---
 .../user/profile/components/register/register.component.ts  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/feature-libs/user/profile/components/register/register-component.service.ts b/feature-libs/user/profile/components/register/register-component.service.ts
index f6dfb5ab12e..85176f8949c 100644
--- a/feature-libs/user/profile/components/register/register-component.service.ts
+++ b/feature-libs/user/profile/components/register/register-component.service.ts
@@ -21,7 +21,7 @@ export class RegisterComponentService {
   constructor(
     protected userRegisterFacade: UserRegisterFacade,
     protected globalMessageService: GlobalMessageService,
-    protected fb: UntypedFormBuilder
+    protected fb?: UntypedFormBuilder
   ) {}
 
   /**
@@ -69,7 +69,7 @@ export class RegisterComponentService {
    * In integration scenarios, eg: cdc, this method will be overridden to return
    * form controls for necessary cdc consents
    */
-  generateAdditionalConsentsFormControl(): UntypedFormArray {
-    return this.fb.array([]);
+  generateAdditionalConsentsFormControl(): UntypedFormArray | undefined {
+    return this.fb?.array([]) ?? undefined;
   }
 }
diff --git a/feature-libs/user/profile/components/register/register.component.ts b/feature-libs/user/profile/components/register/register.component.ts
index ae229a4df41..cbf56ad932f 100644
--- a/feature-libs/user/profile/components/register/register.component.ts
+++ b/feature-libs/user/profile/components/register/register.component.ts
@@ -62,7 +62,8 @@ export class RegisterComponent implements OnInit, OnDestroy {
         disabled: this.isConsentRequired(),
       }),
       additionalConsents:
-        this.registerComponentService?.generateAdditionalConsentsFormControl(),
+        this.registerComponentService.generateAdditionalConsentsFormControl?.() ??
+        this.fb.array([]),
       termsandconditions: [false, Validators.requiredTrue],
     },
     {

From abbba4fd2ce42d1b231860e3a4d839dc042b971d Mon Sep 17 00:00:00 2001
From: Hak Woo Kim <kimhakwoo@hotmail.com>
Date: Thu, 22 Jun 2023 09:51:45 -0400
Subject: [PATCH 048/122] fix: displayed image without link-to value (#17550)

Co-authored-by: Hakwoo Kim <hakwoo.kim@sap.com>
---
 .../content/banner/banner.component.html      | 13 ++++++++
 .../content/banner/banner.component.spec.ts   | 33 ++++++++++++++++++-
 .../content/banner/banner.module.ts           | 14 ++++++--
 .../components/content/banner/_banner.scss    |  4 +++
 4 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/projects/storefrontlib/cms-components/content/banner/banner.component.html b/projects/storefrontlib/cms-components/content/banner/banner.component.html
index 8906e296b72..3e9dd05e9df 100644
--- a/projects/storefrontlib/cms-components/content/banner/banner.component.html
+++ b/projects/storefrontlib/cms-components/content/banner/banner.component.html
@@ -8,4 +8,17 @@
     <cx-media [container]="getImage(data)"></cx-media>
     <p class="content" *ngIf="data.content" [innerHTML]="data.content"></p>
   </cx-generic-link>
+  <ng-container *cxFeatureLevel="'6.3'">
+    <ng-container *ngIf="!routerLink">
+      <div class="no-link">
+        <p
+          class="headline"
+          *ngIf="data.headline"
+          [innerHTML]="data.headline"
+        ></p>
+        <cx-media [container]="getImage(data)"></cx-media>
+        <p class="content" *ngIf="data.content" [innerHTML]="data.content"></p>
+      </div>
+    </ng-container>
+  </ng-container>
 </ng-container>
diff --git a/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts b/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
index 07314bb68a9..4dab2759a3e 100644
--- a/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
+++ b/projects/storefrontlib/cms-components/content/banner/banner.component.spec.ts
@@ -5,6 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import {
   CmsBannerComponent,
   CmsService,
+  FeaturesConfig,
+  FeaturesConfigModule,
   Page,
   PageContext,
   SemanticPathService,
@@ -30,6 +32,21 @@ const mockBannerData: CmsBannerComponent = {
   urlLink: '/logo',
 };
 
+const mockNoLinkBannerData: CmsBannerComponent = {
+  uid: 'SiteLogoComponent',
+  typeCode: 'SimpleBannerComponent',
+  name: 'Site Logo Component',
+  container: 'false',
+  external: 'false',
+  media: {
+    code: '/images/theme/logo_hybris.jpg',
+    mime: 'image/svg+xml',
+    altText: 'hybris Accelerator',
+    url: '/medias/logo-hybris.jpg',
+  },
+  urlLink: '',
+};
+
 const data$: BehaviorSubject<CmsBannerComponent> = new BehaviorSubject(
   mockBannerData
 );
@@ -66,7 +83,7 @@ describe('BannerComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [RouterTestingModule],
+      imports: [RouterTestingModule, FeaturesConfigModule],
       declarations: [BannerComponent, MockMediaComponent, GenericLinkComponent],
       providers: [
         {
@@ -75,6 +92,12 @@ describe('BannerComponent', () => {
         },
         { provide: CmsService, useClass: MockCmsService },
         { provide: SemanticPathService, useClass: MockSemanticPathService },
+        {
+          provide: FeaturesConfig,
+          useValue: {
+            features: { level: '6.3' },
+          },
+        },
       ],
     }).compileComponents();
 
@@ -148,6 +171,14 @@ describe('BannerComponent', () => {
         mockBannerDataWithCategory
       );
     });
+
+    it('should show content even there is no link', () => {
+      bannerComponent.routerLink = undefined;
+      data$.next(mockNoLinkBannerData);
+      fixture.detectChanges();
+
+      expect(el.query(By.css('.no-link'))).toBeTruthy();
+    });
   });
 
   describe('getTarget()', () => {
diff --git a/projects/storefrontlib/cms-components/content/banner/banner.module.ts b/projects/storefrontlib/cms-components/content/banner/banner.module.ts
index 4334e185ab5..e6232fd25af 100644
--- a/projects/storefrontlib/cms-components/content/banner/banner.module.ts
+++ b/projects/storefrontlib/cms-components/content/banner/banner.module.ts
@@ -7,13 +7,23 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  FeaturesConfigModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import { GenericLinkModule } from '../../../shared/components/generic-link/generic-link.module';
 import { MediaModule } from '../../../shared/components/media/media.module';
 import { BannerComponent } from './banner.component';
 
 @NgModule({
-  imports: [CommonModule, RouterModule, GenericLinkModule, MediaModule],
+  imports: [
+    CommonModule,
+    RouterModule,
+    GenericLinkModule,
+    MediaModule,
+    FeaturesConfigModule,
+  ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
       cmsComponents: {
diff --git a/projects/storefrontstyles/scss/components/content/banner/_banner.scss b/projects/storefrontstyles/scss/components/content/banner/_banner.scss
index dacd1ade0b2..a5c224046e4 100644
--- a/projects/storefrontstyles/scss/components/content/banner/_banner.scss
+++ b/projects/storefrontstyles/scss/components/content/banner/_banner.scss
@@ -11,6 +11,10 @@
     display: block;
   }
 
+  .no-link {
+    display: block;
+  }
+
   img {
     width: 100%;
     margin: var(--cx-margin);

From 89e7edb795f1a0862977cb1a492de6859ebf092f Mon Sep 17 00:00:00 2001
From: Scar Ai <38693320+scarai-sap@users.noreply.github.com>
Date: Fri, 23 Jun 2023 13:17:29 +0800
Subject: [PATCH 049/122] feat: update text as UX suggested #17522 for 6.3
 (#17564)

---
 feature-libs/asm/assets/translations/en/asm.ts              | 2 ++
 .../customer-emulation/customer-emulation.component.html    | 2 +-
 .../customer-emulation/customer-emulation.component.spec.ts | 2 +-
 .../customer-selection/customer-selection.component.html    | 2 +-
 .../cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts          | 2 +-
 .../cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts          | 4 ++--
 .../cypress/helpers/accessibility/tabbing-order.config.ts   | 4 ++--
 projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts   | 6 +++---
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 086b4a72984..748fb978d00 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -36,6 +36,7 @@ export const asm = {
         label: 'Customer Name/Email Address',
       },
       submit: 'Start Session',
+      startEmulation: 'Start Emulation',
       noMatch: 'No customer found.',
       noMatchResult: 'This account cannot be found.',
       createCustomer: 'Create New Customer',
@@ -136,6 +137,7 @@ export const asm = {
     },
     csagentTokenExpired: 'Your customer support agent session is expired.',
     endSession: 'End Session',
+    endEmulation: 'End Emulation',
     agentSessionTimer: {
       label: 'Session Timeout',
       minutes: 'min',
diff --git a/feature-libs/asm/components/customer-emulation/customer-emulation.component.html b/feature-libs/asm/components/customer-emulation/customer-emulation.component.html
index 6b91bb9f5f6..797eeafd9e4 100644
--- a/feature-libs/asm/components/customer-emulation/customer-emulation.component.html
+++ b/feature-libs/asm/components/customer-emulation/customer-emulation.component.html
@@ -5,6 +5,6 @@
   </div>
   <cx-asm-bind-cart></cx-asm-bind-cart>
   <button formcontrolname="logoutCustomer" (click)="logoutCustomer()">
-    {{ 'asm.endSession' | cxTranslate }}
+    {{ 'asm.endEmulation' | cxTranslate }}
   </button>
 </ng-container>
diff --git a/feature-libs/asm/components/customer-emulation/customer-emulation.component.spec.ts b/feature-libs/asm/components/customer-emulation/customer-emulation.component.spec.ts
index 3dadc3198ef..cdf02a65372 100644
--- a/feature-libs/asm/components/customer-emulation/customer-emulation.component.spec.ts
+++ b/feature-libs/asm/components/customer-emulation/customer-emulation.component.spec.ts
@@ -71,7 +71,7 @@ describe('CustomerEmulationComponent', () => {
     expect(el.query(By.css('dev.fd-alert'))).toBeFalsy();
   });
 
-  it("should call logoutCustomer() on 'End Session' button click", () => {
+  it("should call logoutCustomer() on 'End Emulation' button click", () => {
     //customer login
     const testUser = { uid: 'user@test.com', name: 'Test User' } as User;
     spyOn(userAccountFacade, 'get').and.returnValue(of(testUser));
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.html b/feature-libs/asm/components/customer-selection/customer-selection.component.html
index 3b3f6392da7..53dfca659e9 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.html
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.html
@@ -15,7 +15,7 @@
     ></cx-form-errors>
   </label>
   <button type="submit" [class.active]="selectedCustomer">
-    {{ 'asm.customerSearch.submit' | cxTranslate }}
+    {{ 'asm.customerSearch.startEmulation' | cxTranslate }}
   </button>
 </form>
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
index 9b39b9b2d3b..aad6223405e 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
@@ -507,7 +507,7 @@ context('Assisted Service Module', () => {
       );
     });
 
-    it('should end session of emulated customer and emulate new customer if valid uid shows in URL (CXSPA-3113)', () => {
+    it('should end emulation of emulated customer and emulate new customer if valid uid shows in URL (CXSPA-3113)', () => {
       const oldCustomer = getSampleUser();
       const newCustomer = getSampleUser();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts
index 87a67a5984e..e21e15209c5 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts
@@ -62,7 +62,7 @@ context('Assisted Service Module', () => {
       });
 
       cy.log(
-        '--> Stop customer emulation using the end session button in the ASM UI'
+        '--> Stop customer emulation using the end emulation button in the ASM UI'
       );
       asm.agentSignOut();
 
@@ -157,7 +157,7 @@ context('Assisted Service Module', () => {
       });
 
       cy.log(
-        '--> Stop customer emulation using the end session button in the ASM UI'
+        '--> Stop customer emulation using the end emulation button in the ASM UI'
       );
       asm.agentSignOut();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
index 134fd31c5b9..8a15006d4d3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
@@ -2346,7 +2346,7 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
     },
     {
       type: TabbingOrderTypes.BUTTON,
-      value: 'Start Session',
+      value: 'Start Emulation',
     },
     {
       type: TabbingOrderTypes.BUTTON,
@@ -2372,7 +2372,7 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
     },
     {
       type: TabbingOrderTypes.BUTTON,
-      value: 'Start Session',
+      value: 'Start Emulation',
     },
   ],
   asmWithCustomerLists: [
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 9f1461a3947..7efd7cbf1c9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -546,7 +546,7 @@ export function testCustomerEmulation() {
 
     cy.log('--> Stop customer emulation');
     cy.get('cx-customer-emulation')
-      .findByText(/End Session/i)
+      .findByText(/End Emulation/i)
       .click();
     cy.get('cx-csagent-login-form').should('not.exist');
     cy.get('cx-customer-selection').should('be.visible');
@@ -566,10 +566,10 @@ export function testCustomerEmulation() {
     asm.startCustomerEmulation(customer);
 
     cy.log(
-      '--> Stop customer emulation using the end session button in the ASM UI'
+      '--> Stop customer emulation using the end emulation button in the ASM UI'
     );
     cy.get('cx-customer-emulation')
-      .findByText(/End Session/i)
+      .findByText(/End Emulation/i)
       .click();
     cy.get('cx-customer-emulation').should('not.exist');
     cy.get('cx-customer-selection').should('be.visible');

From 796d9f647e86671b2d0c55148968974b17198fa1 Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Fri, 23 Jun 2023 15:17:19 +0800
Subject: [PATCH 050/122] test: ASM E2E tests instability to 6.3.x (#17568)

---
 ...b2b-customer-list-tabbling-order.e2e.cy.ts |   8 +-
 .../asm-cost-center.e2e-flaky.cy.ts           |  56 +--
 .../b2b => b2b/regression/asm}/asm.e2e.cy.ts  |   2 +-
 .../regression/asm}/customer-list.e2e.cy.ts   |  14 +-
 .../accessibility/tabbing-order.e2e.asm.cy.ts |   4 +-
 .../asm}/asm.e2e-flaky.cy.ts                  | 384 ++++++++----------
 .../asm/asm.emulation.core-e2e.cy.ts          | 124 ++++++
 .../asm}/bind-cart.e2e.cy.ts                  |  12 +-
 .../asm}/create-customer.e2e-flaky.cy.ts      |  10 +-
 .../asm}/customer-list.e2e-flaky.cy.ts        |   8 +-
 .../cypress/helpers/asm.ts                    |  37 +-
 .../cypress/helpers/saved-cart.ts             |  12 +-
 12 files changed, 361 insertions(+), 310 deletions(-)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{ => b2b/regression/asm}/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts (67%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/{checkout => asm}/asm-cost-center.e2e-flaky.cy.ts (53%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2b => b2b/regression/asm}/asm.e2e.cy.ts (96%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2b => b2b/regression/asm}/customer-list.e2e.cy.ts (85%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{ => regression/asm}/accessibility/tabbing-order.e2e.asm.cy.ts (85%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2c => regression/asm}/asm.e2e-flaky.cy.ts (72%)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2c => regression/asm}/bind-cart.e2e.cy.ts (94%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2c => regression/asm}/create-customer.e2e-flaky.cy.ts (94%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/{vendor/asm/b2c => regression/asm}/customer-list.e2e-flaky.cy.ts (81%)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
similarity index 67%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
index c5f036d494c..828a58740d9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { tabbingOrderConfig as config } from '../../helpers/accessibility/tabbing-order.config';
-import { asmTabbingOrderWithCustomerList } from '../../helpers/accessibility/tabbing-order/asm';
-import { ELECTRONICS_BASESITE } from '../../helpers/checkout-flow';
-import { POWERTOOLS_BASESITE } from '../../sample-data/b2b-checkout';
+import { tabbingOrderConfig as config } from '../../../../../helpers/accessibility/tabbing-order.config';
+import { asmTabbingOrderWithCustomerList } from '../../../../../helpers/accessibility/tabbing-order/asm';
+import { ELECTRONICS_BASESITE } from '../../../../../helpers/checkout-flow';
+import { POWERTOOLS_BASESITE } from '../../../../../sample-data/b2b-checkout';
 
 context('Tabbing order for ASM B2b Customer List', () => {
   before(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e-flaky.cy.ts
similarity index 53%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e-flaky.cy.ts
index b5281ee3449..4615bbbbe7b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/checkout/asm-cost-center.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e-flaky.cy.ts
@@ -36,7 +36,7 @@ context('B2B - ASM Account Checkout', () => {
     checkout.visitHomePage('asm=true');
     cy.get('cx-asm-main-ui').should('exist');
     cy.get('cx-asm-main-ui').should('be.visible');
-    asm.agentLogin('asagent', 'pw4all');
+    asm.agentLogin('brandon.leclair@acme.com', 'pw4all');
     cy.log('--> Agent emulate customer');
     asm.startCustomerEmulation(customer, true);
 
@@ -48,47 +48,21 @@ context('B2B - ASM Account Checkout', () => {
     cy.intercept('PUT', '*costcenter?costCenterId=*').as('costCenterReq');
 
     cy.get('cx-cost-center').within(() => {
-      cy.get('select').select(invalid_cost_center);
-    });
-
-    cy.wait('@costCenterReq').its('response.statusCode').should('eq', 400);
-    alerts.getErrorAlert().contains('Invalid cost center.');
-    alerts.getErrorAlert().then((alert) => {
-      cy.wrap(alert).within(() => {
-        cy.get('button').click();
+      cy.get('select').then((select) => {
+        cy.get('select').select(valid_cost_center);
+        if (select.find(`option:contains("${invalid_cost_center}")`).length) {
+          cy.get('select').select(invalid_cost_center);
+          cy.wait('@costCenterReq')
+            .its('response.statusCode')
+            .should('eq', 400);
+          alerts.getErrorAlert().contains('Invalid cost center.');
+          alerts.getErrorAlert().then((alert) => {
+            cy.wrap(alert).within(() => {
+              cy.get('button').click();
+            });
+          });
+        }
       });
     });
-    asm.agentSignOut();
-  });
-
-  it('should not show error on valid cost center', () => {
-    cy.log('--> Agent logging in');
-    checkout.visitHomePage('asm=true');
-    cy.get('cx-asm-main-ui').should('exist');
-    cy.get('cx-asm-main-ui').should('be.visible');
-    asm.agentLogin('asagent', 'pw4all');
-    cy.log('--> Agent emulate customer');
-    asm.startCustomerEmulation(customer, true);
-
-    b2bCheckout.addB2bProductToCartAndCheckout();
-    cy.get('cx-payment-type').within(() => {
-      cy.findByText('Account').click({ force: true });
-    });
-
-    cy.get('button.btn-primary').should('be.enabled').click({ force: true });
-
-    cy.intercept('PUT', '*costcenter?costCenterId=*').as('costCenterReq');
-    cy.get('cx-cost-center').within(() => {
-      cy.get('select').select(invalid_cost_center);
-      cy.wait('@costCenterReq');
-
-      cy.get('select').select(valid_cost_center);
-    });
-
-    cy.wait('@costCenterReq').its('response.statusCode').should('eq', 200);
-    alerts.getErrorAlert().should('not.exist');
-
-    cy.log('--> sign out');
-    asm.agentSignOut();
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/asm.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.e2e.cy.ts
similarity index 96%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/asm.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.e2e.cy.ts
index f2989c31895..92f50fe5392 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/asm.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.e2e.cy.ts
@@ -42,7 +42,7 @@ context('B2B - Assisted Service Module', () => {
 
       register(user, true);
 
-      asm.agentLogin('asagent', 'pw4all');
+      asm.agentLogin('brandon.leclair@acme.com', 'pw4all');
 
       asm.startCustomerEmulation(user, true);
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e.cy.ts
similarity index 85%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e.cy.ts
index 9d41d80216f..eaae974e83f 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2b/customer-list.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e.cy.ts
@@ -27,8 +27,18 @@ context('Assisted Service Module', () => {
           currency: ['USD'],
         },
       });
-      const productCode = '1979039';
-      asm.addProductToB2BCart('gi.sun@pronto-hw.com', 'pw4all', productCode);
+
+      const b2bProductCodes = [
+        '1979039',
+        '3879436',
+        '3755219',
+        '3881018',
+        '3592865',
+      ];
+      b2bProductCodes.forEach((productCode) => {
+        asm.addProductToB2BCart('gi.sun@pronto-hw.com', 'pw4all', productCode);
+      });
+
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.cy.ts
similarity index 85%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.cy.ts
index 0ff93833eb2..71438e3767c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e.asm.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.cy.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { tabbingOrderConfig as config } from '../../helpers/accessibility/tabbing-order.config';
+import { tabbingOrderConfig as config } from '../../../../helpers/accessibility/tabbing-order.config';
 import {
   asmTabbingOrderWithCreateCustomerForm,
   asmTabbingOrderWithCustomerList,
   asmTabbingOrderWithSaveInactiveCartDialog,
-} from '../../helpers/accessibility/tabbing-order/asm';
+} from '../../../../helpers/accessibility/tabbing-order/asm';
 
 describe('Tabbing order for ASM', () => {
   before(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.e2e-flaky.cy.ts
similarity index 72%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.e2e-flaky.cy.ts
index aad6223405e..03923257728 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/asm.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.e2e-flaky.cy.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as asm from '../../../../helpers/asm';
-import { login } from '../../../../helpers/auth-forms';
-import * as checkout from '../../../../helpers/checkout-flow';
-import { ELECTRONICS_BASESITE } from '../../../../helpers/checkout-flow';
-import * as customerTicketing from '../../../../helpers/customer-ticketing/customer-ticketing';
-import { getErrorAlert } from '../../../../helpers/global-message';
-import { signOutUser } from '../../../../helpers/login';
-import {
-  navigateToCategory,
-  waitForPage,
-} from '../../../../helpers/navigation';
-import { doPlaceOrder } from '../../../../helpers/order-history';
-import * as savedCart from '../../../../helpers/saved-cart';
-import { APPAREL_BASESITE } from '../../../../helpers/variants/apparel-checkout-flow';
-import * as sampleData from '../../../../sample-data/saved-cart';
-import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
+import * as asm from '../../../helpers/asm';
+import { login } from '../../../helpers/auth-forms';
+import * as checkout from '../../../helpers/checkout-flow';
+import * as customerTicketing from '../../../helpers/customer-ticketing/customer-ticketing';
+import { signOutUser } from '../../../helpers/login';
+import { doPlaceOrder } from '../../../helpers/order-history';
+import * as savedCart from '../../../helpers/saved-cart';
+import * as sampleData from '../../../sample-data/saved-cart';
 
-import { getSampleUser } from '../../../../sample-data/checkout-flow';
+import { getSampleUser } from '../../../sample-data/checkout-flow';
 
 import {
   emulateCustomerPrepare,
   getCurrentCartIdAndAddProducts,
   getCustomerId,
   getInactiveCartIdAndAddProducts,
-} from '../../../../helpers/asm';
+} from '../../../helpers/asm';
 
 const agentToken = {
   userName: 'asagent',
@@ -36,9 +28,7 @@ const agentToken = {
 };
 
 context('Assisted Service Module', () => {
-  describe('Customer Support Agent - Emulation', () => {
-    asm.testCustomerEmulation();
-
+  describe('Customer Support Agent - Emulation&deeplink', () => {
     it('should emulate customer with deeplink before agent login (CXSPA-3113)', () => {
       const customer = getSampleUser();
       cy.log('--> Register new user');
@@ -52,14 +42,11 @@ context('Assisted Service Module', () => {
 
           cy.log('--> Should has assignCart');
           cy.get('.cx-asm-assignCart').should('exist');
-
-          cy.log('--> sign out and close ASM UI');
-          asm.agentSignOut();
         }
       );
     });
 
-    it('should emulate customer and navigate to order with deeplink before agent login', () => {
+    it('should emulate customer and navigate to order with deeplink before agent login (CXSPA-3263)', () => {
       const customer = getSampleUser();
 
       cy.log('--> Agent logging in with deeplink');
@@ -93,15 +80,12 @@ context('Assisted Service Module', () => {
             cy.get('.cx-asm-assignCart').should('exist');
 
             cy.url().should('contain', 'order/' + orderId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           }
         );
       });
     });
 
-    it('should emulate customer and navigate to support ticket with deeplink before agent login', () => {
+    it('should emulate customer and navigate to support ticket with deeplink before agent login (CXSPA-3263)', () => {
       const testTicketDetails = {
         subject: 'Testing',
         message: 'I am testing asm deep linking.',
@@ -152,14 +136,11 @@ context('Assisted Service Module', () => {
             cy.get('.cx-asm-assignCart').should('exist');
 
             cy.url().should('contain', 'support-ticket/' + ticketId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           });
         });
     });
 
-    it('should emulate customer and navigate to saved cart with deeplink before agent login', () => {
+    it('should emulate customer and navigate to saved cart with deeplink before agent login (CXSPA-3263)', () => {
       const customer = getSampleUser();
 
       cy.visit('/');
@@ -202,9 +183,6 @@ context('Assisted Service Module', () => {
             cy.get('.cx-asm-assignCart').should('exist');
 
             cy.url().should('contain', 'saved-cart/' + savedCartId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           }
         );
       });
@@ -225,14 +203,158 @@ context('Assisted Service Module', () => {
 
           cy.log('--> Should has assignCart');
           cy.get('.cx-asm-assignCart').should('exist');
+        }
+      );
+    });
+
+    it('should switched emulated customer with deeplink when click switch customer after agent login (CXSPA-3380)', () => {
+      const customerOld = getSampleUser();
+      cy.log('--> Register new user1');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customerOld);
+
+      const customerNew = getSampleUser();
+      cy.log('--> Register new user2');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customerNew);
+
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(
+        agentToken.userName,
+        agentToken.pwd,
+        customerOld.email
+      ).then((customerOldId) => {
+        cy.visit('/assisted-service/emulate?customerId=' + customerOldId);
+
+        cy.log('--> Should has emulated old customer');
+        cy.get('.cx-asm-customerInfo .cx-asm-name').should(
+          'have.text',
+          customerOld.fullName
+        );
+        cy.get('.cx-asm-customerInfo .cx-asm-uid').should(
+          'have.text',
+          customerOld.email
+        );
+
+        getCustomerId(
+          agentToken.userName,
+          agentToken.pwd,
+          customerNew.email
+        ).then((customerNewId) => {
+          cy.visit('/assisted-service/emulate?customerId=' + customerNewId);
+
+          cy.log('--> Switch emulated customer dialog should be exist');
+          cy.get('cx-asm-switch-customer-dialog').should('exist');
+
+          cy.log('--> Click switch button to switch to emulate new customer');
+          cy.get('cx-asm-switch-customer-dialog .cx-dialog-footer .btn-primary')
+            .should('exist')
+            .click();
+
+          cy.log('--> Should has emulated new customer');
+          cy.get('.cx-asm-customerInfo .cx-asm-name').should(
+            'have.text',
+            customerNew.fullName
+          );
+          cy.get('.cx-asm-customerInfo .cx-asm-uid').should(
+            'have.text',
+            customerNew.email
+          );
+        });
+      });
+    });
+
+    it('should not to switch emulated customer with deeplink when click cancel after agent login (CXSPA-3380)', () => {
+      const customerA = getSampleUser();
+      cy.log('--> Register new user1');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customerA);
+
+      const customerB = getSampleUser();
+      cy.log('--> Register new user2');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customerB);
+
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(agentToken.userName, agentToken.pwd, customerA.email).then(
+        (customerId1) => {
+          cy.visit('/assisted-service/emulate?customerId=' + customerId1);
+
+          cy.log('--> Should has emulated customerA');
+          cy.get('.cx-asm-customerInfo .cx-asm-name').should(
+            'have.text',
+            customerA.fullName
+          );
+          cy.get('.cx-asm-customerInfo .cx-asm-uid').should(
+            'have.text',
+            customerA.email
+          );
+
+          getCustomerId(
+            agentToken.userName,
+            agentToken.pwd,
+            customerB.email
+          ).then((customerId2) => {
+            cy.visit('/assisted-service/emulate?customerId=' + customerId2);
+
+            cy.log('--> Switch emulated customer dialog should be exist');
+            cy.get('cx-asm-switch-customer-dialog').should('exist');
+
+            cy.log('--> Click cancel button to not switch customer');
+            cy.get(
+              'cx-asm-switch-customer-dialog .cx-dialog-footer .btn-secondary'
+            ).should('exist');
+            cy.findByText(/Cancel/i).click();
+
+            cy.log('--> Should still emulated customerA');
+            cy.get('.cx-asm-customerInfo .cx-asm-name').should(
+              'have.text',
+              customerA.fullName
+            );
+            cy.get('.cx-asm-customerInfo .cx-asm-uid').should(
+              'have.text',
+              customerA.email
+            );
+          });
+        }
+      );
+    });
+
+    it('should diaplay global error with deeplink when the switched customerId not exist after agent login (CXSPA-3380)', () => {
+      const customer = getSampleUser();
+      cy.log('--> Register new user1');
+      cy.visit('/?asm=true');
+      checkout.registerUser(false, customer);
+
+      cy.visit('/?asm=true');
+      asm.agentLogin(agentToken.userName, agentToken.pwd);
+      // get customerId via token
+      getCustomerId(agentToken.userName, agentToken.pwd, customer.email).then(
+        (customerId1) => {
+          cy.visit('/assisted-service/emulate?customerId=' + customerId1);
 
-          cy.log('--> sign out and close ASM UI');
-          asm.agentSignOut();
+          cy.log('--> Should has emulated customerA');
+          cy.get('.cx-asm-customerInfo .cx-asm-name').should(
+            'have.text',
+            customer.fullName
+          );
+          cy.get('.cx-asm-customerInfo .cx-asm-uid').should(
+            'have.text',
+            customer.email
+          );
+
+          cy.visit('/assisted-service/emulate?customerId=notexist');
+          cy.log('--> global error message should be display');
+          cy.get('cx-global-message .alert-danger').should('be.visible');
         }
       );
     });
 
-    it('should emulate customer and navigate to order with deeplink after agent login', () => {
+    it('should emulate customer and navigate to order with deeplink after agent login (CXSPA-3263)', () => {
       const customer = getSampleUser();
 
       cy.visit('/?asm=true');
@@ -268,15 +390,12 @@ context('Assisted Service Module', () => {
             cy.get('cx-asm-main-ui').should('exist');
 
             cy.url().should('contain', 'order/' + orderId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           }
         );
       });
     });
 
-    it('should emulate customer and navigate to support ticket with deeplink after agent login', () => {
+    it('should emulate customer and navigate to support ticket with deeplink after agent login (CXSPA-3263)', () => {
       const testTicketDetails = {
         subject: 'Testing',
         message: 'I am testing asm deep linking.',
@@ -330,14 +449,11 @@ context('Assisted Service Module', () => {
             cy.get('cx-asm-main-ui').should('be.visible');
 
             cy.url().should('contain', 'support-ticket/' + ticketId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           });
         });
     });
 
-    it('should emulate customer and navigate to saved cart with deeplink after agent login', () => {
+    it('should emulate customer and navigate to saved cart with deeplink after agent login (CXSPA-3263)', () => {
       const customer = getSampleUser();
 
       cy.visit('/?asm=true');
@@ -380,9 +496,6 @@ context('Assisted Service Module', () => {
             cy.get('cx-asm-main-ui').should('be.visible');
 
             cy.url().should('contain', 'saved-cart/' + savedCartId);
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           }
         );
       });
@@ -427,9 +540,6 @@ context('Assisted Service Module', () => {
             cy.get('cx-asm-main-ui').should('be.visible');
 
             cy.url().should('contain', '/cart');
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           });
         }
       );
@@ -474,9 +584,6 @@ context('Assisted Service Module', () => {
             cy.get('cx-asm-main-ui').should('be.visible');
 
             cy.url().should('contain', '/cart');
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           });
         }
       );
@@ -500,60 +607,10 @@ context('Assisted Service Module', () => {
 
           cy.log('--> Should not has assignCart');
           cy.get('.cx-asm-assignCart').should('not.exist');
-
-          cy.log('--> sign out and close ASM UI');
-          asm.agentSignOut();
         }
       );
     });
 
-    it('should end emulation of emulated customer and emulate new customer if valid uid shows in URL (CXSPA-3113)', () => {
-      const oldCustomer = getSampleUser();
-      const newCustomer = getSampleUser();
-
-      cy.log('--> Register 2 users');
-      checkout.visitHomePage('asm=true');
-      checkout.registerUser(false, oldCustomer);
-      checkout.visitHomePage('asm=true');
-      checkout.registerUser(false, newCustomer);
-
-      cy.log('--> login as agent');
-      cy.visit('/?asm=true');
-      asm.agentLogin(agentToken.userName, agentToken.pwd);
-      // get customerId via token
-      getCustomerId(
-        agentToken.userName,
-        agentToken.pwd,
-        oldCustomer.email
-      ).then((customerId) => {
-        const oldCustomerId = customerId;
-        getCustomerId(
-          agentToken.userName,
-          agentToken.pwd,
-          newCustomer.email
-        ).then((customerId) => {
-          const newCustomerId = customerId;
-
-          cy.log('--> Agent logging in deeplink with old customer');
-          cy.visit('/assisted-service/emulate?customerId=' + oldCustomerId);
-
-          cy.log('--> Should has assignCart and uid is old customer');
-          cy.get('.cx-asm-assignCart').should('exist');
-          cy.get('.cx-asm-uid').should('have.text', oldCustomer.email);
-
-          cy.log('--> Agent logging in deeplink with new customer');
-          cy.visit('/assisted-service/emulate?customerId=' + newCustomerId);
-
-          cy.log('--> Should has assignCart and uid is new customer');
-          cy.get('.cx-asm-assignCart').should('exist');
-          cy.get('.cx-asm-uid').should('have.text', newCustomer.email);
-
-          cy.log('--> sign out and close ASM UI');
-          asm.agentSignOut();
-        });
-      });
-    });
-
     it('should save inactive cart in deeplink after agent login (CXSPA-3278)', () => {
       let customer = emulateCustomerPrepare(
         agentToken.userName,
@@ -575,7 +632,7 @@ context('Assisted Service Module', () => {
             cy.log(
               '--> Should has assign inactive cart to input and display alert info'
             );
-            cy.get('.cx-asm-assignCart').should('exist');
+            cy.get('.cx-asm-assignCart', { timeout: 15000 }).should('exist');
             cy.get('button[id=asm-save-inactive-cart-btn]').should('exist');
             cy.get(
               'cx-customer-emulation input[formcontrolname="cartNumber"]'
@@ -606,8 +663,6 @@ context('Assisted Service Module', () => {
             );
             cy.url().should('include', 'saved-cart');
             cy.url().should('include', inactiveCartId);
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           }
         );
       });
@@ -634,7 +689,7 @@ context('Assisted Service Module', () => {
             cy.log(
               '--> Should has assign inactive cart to input and display alert info'
             );
-            cy.get('.cx-asm-assignCart').should('exist');
+            cy.get('.cx-asm-assignCart', { timeout: 15000 }).should('exist');
             cy.get('button[id=asm-save-inactive-cart-btn]').should('exist');
             cy.get(
               'cx-customer-emulation input[formcontrolname="cartNumber"]'
@@ -655,118 +710,9 @@ context('Assisted Service Module', () => {
             );
             cy.get('button[id=asm-save-cart-dialog-btn]').should('be.disabled');
             cy.findByText(/Cancel/i).click();
-
-            cy.log('--> sign out and close ASM UI');
-            asm.agentSignOut();
           });
         }
       );
     });
-
-    it('should checkout as customer', () => {
-      const customer = getSampleUser();
-
-      cy.log('--> Agent logging in');
-      checkout.visitHomePage('asm=true');
-      cy.get('cx-asm-main-ui').should('exist');
-      cy.get('cx-asm-main-ui').should('be.visible');
-
-      cy.log('--> Register user');
-      checkout.registerUser(false, customer);
-
-      asm.agentLogin('asagent', 'pw4all');
-
-      cy.log('--> Starting customer emulation');
-      asm.startCustomerEmulation(customer);
-
-      cy.log('--> Add product to cart and go to checkout');
-      checkout.goToCheapProductDetailsPage();
-      checkout.addCheapProductToCartAndBeginCheckoutForSignedInCustomer();
-
-      cy.log('--> Go through delivery form');
-      cy.contains('Continue').click();
-      checkout.fillAddressFormWithCheapProduct();
-
-      cy.log('--> Choose delivery method');
-      checkout.verifyDeliveryMethod();
-
-      cy.log('--> Fill payment form and continue');
-      checkout.fillPaymentForm();
-
-      cy.log('--> Place order');
-      checkout.placeOrderWithCheapProduct();
-
-      cy.log('--> sign out and close ASM UI');
-      asm.agentSignOut();
-    });
-  });
-
-  describe('When a customer session and an asm agent session are both active', () => {
-    let customer;
-
-    before(() => {
-      clearAllStorage();
-
-      cy.visit('/', { qs: { asm: true } });
-
-      customer = getSampleUser();
-      checkout.registerUser(false, customer);
-    });
-
-    it('Customer should not be able to login when there is an active CS agent session.', () => {
-      const loginPage = waitForPage('/login', 'getLoginPage');
-      cy.visit('/login?asm=true');
-      cy.wait(`@${loginPage}`);
-
-      asm.agentLogin('asagent', 'pw4all');
-      login(customer.email, customer.password);
-      getErrorAlert().should(
-        'contain',
-        'Cannot login as user when there is an active CS agent session. Please either emulate user or logout CS agent.'
-      );
-    });
-
-    // TODO(#9445): Add e2e test for this scenario
-    it.skip('agent login when user is logged in should start this user emulation', () => {});
-
-    // TODO(#9445): Add e2e test for this scenario
-    it.skip('agent logout when user was logged and emulated should restore the session', () => {});
-  });
-
-  describe('Apparel Site', () => {
-    before(() => {
-      Cypress.env('BASE_SITE', APPAREL_BASESITE);
-    });
-
-    after(() => {
-      Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
-    });
-
-    // This test only works if "sap-commerce-cloud-user-id" is added to the allowed headers of "corsfilter.commercewebservices.allowedHeaders" on the Commerce Cloud side. (CXSPA-1355)
-    it.skip("should fetch products in a category based on the emulated user's authentication", () => {
-      cy.cxConfig({
-        context: {
-          baseSite: ['apparel-uk-spa'],
-          currency: ['GBP'],
-        },
-      });
-
-      cy.visit('/', { qs: { asm: true } });
-
-      const customer = getSampleUser();
-      checkout.registerUser(false, customer);
-
-      asm.agentLogin('asagent', 'pw4all');
-
-      asm.startCustomerEmulation(customer);
-
-      navigateToCategory('Brands', 'brands', true);
-
-      cy.get('cx-product-list').should('exist');
-
-      navigateToCategory('Snow', 'snow', true);
-
-      cy.get('cx-product-list').should('exist');
-    });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
new file mode 100644
index 00000000000..14667b2547a
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
@@ -0,0 +1,124 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as asm from '../../../helpers/asm';
+import { login } from '../../../helpers/auth-forms';
+import * as checkout from '../../../helpers/checkout-flow';
+import { ELECTRONICS_BASESITE } from '../../../helpers/checkout-flow';
+import { getErrorAlert } from '../../../helpers/global-message';
+import { navigateToCategory, waitForPage } from '../../../helpers/navigation';
+import { APPAREL_BASESITE } from '../../../helpers/variants/apparel-checkout-flow';
+import { clearAllStorage } from '../../../support/utils/clear-all-storage';
+
+import { getSampleUser } from '../../../sample-data/checkout-flow';
+
+context('Assisted Service Module', () => {
+  describe('Customer Support Agent - Emulation', () => {
+    asm.testCustomerEmulation();
+    it('should checkout as customer', () => {
+      const customer = getSampleUser();
+
+      cy.log('--> Agent logging in');
+      checkout.visitHomePage('asm=true');
+      cy.get('cx-asm-main-ui').should('exist');
+      cy.get('cx-asm-main-ui').should('be.visible');
+
+      cy.log('--> Register user');
+      checkout.registerUser(false, customer);
+
+      asm.agentLogin('asagent', 'pw4all');
+
+      cy.log('--> Starting customer emulation');
+      asm.startCustomerEmulation(customer);
+
+      cy.log('--> Add product to cart and go to checkout');
+      checkout.goToCheapProductDetailsPage();
+      checkout.addCheapProductToCartAndBeginCheckoutForSignedInCustomer();
+
+      cy.log('--> Go through delivery form');
+      cy.contains('Continue').click();
+      checkout.fillAddressFormWithCheapProduct();
+
+      cy.log('--> Choose delivery method');
+      checkout.verifyDeliveryMethod();
+
+      cy.log('--> Fill payment form and continue');
+      checkout.fillPaymentForm();
+
+      cy.log('--> Place order');
+      checkout.placeOrderWithCheapProduct();
+    });
+  });
+
+  describe('When a customer session and an asm agent session are both active', () => {
+    let customer;
+
+    before(() => {
+      clearAllStorage();
+
+      cy.visit('/', { qs: { asm: true } });
+
+      customer = getSampleUser();
+      checkout.registerUser(false, customer);
+    });
+
+    it('Customer should not be able to login when there is an active CS agent session.', () => {
+      const loginPage = waitForPage('/login', 'getLoginPage');
+      cy.visit('/login?asm=true');
+      cy.wait(`@${loginPage}`);
+
+      asm.agentLogin('asagent', 'pw4all');
+      login(customer.email, customer.password);
+      getErrorAlert().should(
+        'contain',
+        'Cannot login as user when there is an active CS agent session. Please either emulate user or logout CS agent.'
+      );
+    });
+
+    // TODO(#9445): Add e2e test for this scenario
+    it.skip('agent login when user is logged in should start this user emulation', () => {});
+
+    // TODO(#9445): Add e2e test for this scenario
+    it.skip('agent logout when user was logged and emulated should restore the session', () => {});
+  });
+
+  describe('Apparel Site', () => {
+    before(() => {
+      Cypress.env('BASE_SITE', APPAREL_BASESITE);
+    });
+
+    after(() => {
+      Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
+    });
+
+    // This test only works if "sap-commerce-cloud-user-id" is added to the allowed headers of "corsfilter.commercewebservices.allowedHeaders" on the Commerce Cloud side. (CXSPA-1355)
+    it.skip("should fetch products in a category based on the emulated user's authentication", () => {
+      cy.cxConfig({
+        context: {
+          baseSite: ['apparel-uk-spa'],
+          currency: ['GBP'],
+        },
+      });
+
+      cy.visit('/', { qs: { asm: true } });
+
+      const customer = getSampleUser();
+      checkout.registerUser(false, customer);
+
+      asm.agentLogin('asagent', 'pw4all');
+
+      asm.startCustomerEmulation(customer);
+
+      navigateToCategory('Brands', 'brands', true);
+
+      cy.get('cx-product-list').should('exist');
+
+      navigateToCategory('Snow', 'snow', true);
+
+      cy.get('cx-product-list').should('exist');
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e.cy.ts
similarity index 94%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e.cy.ts
index e21e15209c5..d8f4f31e926 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/bind-cart.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e.cy.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as asm from '../../../../helpers/asm';
-import { login } from '../../../../helpers/auth-forms';
-import * as cart from '../../../../helpers/cart';
-import * as checkout from '../../../../helpers/checkout-flow';
-import { waitForPage } from '../../../../helpers/navigation';
-import { getSampleUser } from '../../../../sample-data/checkout-flow';
+import * as asm from '../../../helpers/asm';
+import { login } from '../../../helpers/auth-forms';
+import * as cart from '../../../helpers/cart';
+import * as checkout from '../../../helpers/checkout-flow';
+import { waitForPage } from '../../../helpers/navigation';
+import { getSampleUser } from '../../../sample-data/checkout-flow';
 
 context('Assisted Service Module', () => {
   describe('Bind cart', () => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
similarity index 94%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
index c91f143da79..9c110857fc4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/create-customer.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as asm from '../../../../helpers/asm';
-import * as checkout from '../../../../helpers/checkout-flow';
-import { getSampleUser } from '../../../../sample-data/checkout-flow';
-import { myCompanyAdminUser } from '../../../../sample-data/shared-users';
-import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
+import * as asm from '../../../helpers/asm';
+import * as checkout from '../../../helpers/checkout-flow';
+import { getSampleUser } from '../../../sample-data/checkout-flow';
+import { myCompanyAdminUser } from '../../../sample-data/shared-users';
+import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 context('Assisted Service Module', () => {
   beforeEach(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
similarity index 81%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
index a8c1489e3bc..af310c31a62 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/asm/b2c/customer-list.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as asm from '../../../../helpers/asm';
-import * as checkout from '../../../../helpers/checkout-flow';
-import { getSampleUser } from '../../../../sample-data/checkout-flow';
-import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
+import * as asm from '../../../helpers/asm';
+import * as checkout from '../../../helpers/checkout-flow';
+import { getSampleUser } from '../../../sample-data/checkout-flow';
+import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 context('Assisted Service Module', () => {
   before(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 7efd7cbf1c9..4102c106dfd 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -136,22 +136,24 @@ export function listenForCustomerCreateRequest(): string {
 }
 
 export function agentLogin(user, pwd): void {
-  const authRequest = listenForAuthenticationRequest();
-  cy.get('cx-storefront').within(() => {
-    cy.get('cx-csagent-login-form').should('exist');
-    cy.get('cx-customer-selection').should('not.exist');
-    cy.get('cx-csagent-login-form form').within(() => {
-      cy.get('[formcontrolname="userId"]').should('not.be.disabled').type(user);
-      cy.get('[formcontrolname="password"]')
-        .should('not.be.disabled')
-        .type(pwd);
-      cy.get('button[type="submit"]').click();
-    });
-  });
+  cy.get('cx-storefront cx-csagent-login-form').then(($element) => {
+    if ($element.length > 0) {
+      const authRequest = listenForAuthenticationRequest();
+      cy.get('cx-storefront').within(() => {
+        cy.get('cx-csagent-login-form').should('exist');
+        cy.get('cx-customer-selection').should('not.exist');
+        cy.get('cx-csagent-login-form form').within(() => {
+          cy.get('[formcontrolname="userId"]').clear().type(user);
+          cy.get('[formcontrolname="password"]').clear().type(pwd);
+          cy.get('button[type="submit"]').click();
+        });
+      });
 
-  cy.wait(authRequest).its('response.statusCode').should('eq', 200);
-  cy.get('cx-csagent-login-form').should('not.exist');
-  cy.get('cx-customer-selection').should('exist');
+      cy.wait(authRequest).its('response.statusCode').should('eq', 200);
+      cy.get('cx-csagent-login-form').should('not.exist');
+      cy.get('cx-customer-selection').should('exist');
+    }
+  });
 }
 
 export function asmOpenCustomerList(): void {
@@ -575,11 +577,6 @@ export function testCustomerEmulation() {
     cy.get('cx-customer-selection').should('be.visible');
 
     cy.log('--> sign out and close ASM UI');
-    asm.agentSignOut();
-
-    cy.get('button[title="Close ASM"]').click();
-    cy.get('cx-asm-main-ui').should('exist');
-    cy.get('cx-asm-main-ui').should('not.be.visible');
 
     // CXSPA-301/GH-14914
     // Must ensure that site is still functional after service agent logout
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
index 967f5b7d52b..27ab5483b36 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/saved-cart.ts
@@ -247,12 +247,12 @@ export function saveActiveCart(verify = true) {
       // open modal to save the cart
 
       cy.get('cx-saved-cart-form-dialog').within(() => {
-        cy.get('[formcontrolname="name"]').type(
-          sampleData.savedActiveCartForm[0].name
-        );
-        cy.get('[formcontrolname="description"]').type(
-          sampleData.savedActiveCartForm[0].description
-        );
+        cy.get('[formcontrolname="name"]')
+          .clear()
+          .type(sampleData.savedActiveCartForm[0].name);
+        cy.get('[formcontrolname="description"]')
+          .clear()
+          .type(sampleData.savedActiveCartForm[0].description);
 
         cy.get('button[aria-label="Save"]').click();
       });

From 45c0b7369315b96ec75fa80594a7ebf74e92608c Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Fri, 23 Jun 2023 17:00:32 +0800
Subject: [PATCH 051/122] test: modify ASM E2E tests to flaky (#17571)

---
 ...cy.ts => asm-b2b-customer-list-tabbling-order.e2e-flaky.cy.ts} | 0
 ...{asm-cost-center.e2e-flaky.cy.ts => asm-cost-center.e2e.cy.ts} | 0
 .../e2e/b2b/regression/asm/{asm.e2e.cy.ts => asm.core-e2e.cy.ts}  | 0
 .../{customer-list.e2e.cy.ts => customer-list.e2e-flaky.cy.ts}    | 0
 ...-order.e2e.asm.cy.ts => tabbing-order.e2e.asm.e2e-flaky.cy.ts} | 0
 .../asm/{asm.e2e-flaky.cy.ts => asm.deeplink.core-e2e.cy.ts}      | 0
 .../asm/{bind-cart.e2e.cy.ts => bind-cart.e2e-flaky.cy.ts}        | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/{asm-b2b-customer-list-tabbling-order.e2e.cy.ts => asm-b2b-customer-list-tabbling-order.e2e-flaky.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/{asm-cost-center.e2e-flaky.cy.ts => asm-cost-center.e2e.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/{asm.e2e.cy.ts => asm.core-e2e.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/{customer-list.e2e.cy.ts => customer-list.e2e-flaky.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/{tabbing-order.e2e.asm.cy.ts => tabbing-order.e2e.asm.e2e-flaky.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/{asm.e2e-flaky.cy.ts => asm.deeplink.core-e2e.cy.ts} (100%)
 rename projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/{bind-cart.e2e.cy.ts => bind-cart.e2e-flaky.cy.ts} (100%)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e-flaky.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/accessibility/asm-b2b-customer-list-tabbling-order.e2e-flaky.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm-cost-center.e2e.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.deeplink.core-e2e.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.e2e-flaky.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.deeplink.core-e2e.cy.ts
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts
similarity index 100%
rename from projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e.cy.ts
rename to projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts

From 720fdf741452190bf092b7a0f2c3822dd55c0d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Fri, 23 Jun 2023 15:22:18 +0200
Subject: [PATCH 052/122] feat: 3742-CXSPA [6.3 backport] Standardize LOGs
 output - minors after review (#17573)

---
 core-libs/setup/ssr/logger/index.ts           |   4 +-
 .../default-express-server-logger.spec.ts     | 227 +++++++++++++++++-
 .../loggers/default-express-server-logger.ts  |   5 +-
 .../logger/loggers/express-server-logger.ts   |  24 ++
 core-libs/setup/ssr/logger/loggers/index.ts   |   2 +-
 ...s => legacy-express-server-logger.spec.ts} |   2 +-
 ...ger.ts => legacy-express-server-logger.ts} |   0
 .../logger/services/express-logger.service.ts |  16 +-
 .../services/prerendering-logger.service.ts   |   5 +
 ...-loggable-ssr-optimization-options.spec.ts |  93 +++++++
 .../get-loggable-ssr-optimization-options.ts  |  39 +++
 .../optimized-ssr-engine.spec.ts              |  38 ++-
 .../optimized-engine/optimized-ssr-engine.ts  |  55 ++---
 .../i18next-logger-plugin.spec.ts             |  34 +--
 projects/core/src/logger/logger.service.ts    |   2 +-
 .../processes-loader.reducer.ts               |   1 +
 projects/storefrontapp/server.ts              |   1 +
 projects/storefrontapp/src/app/app.module.ts  |   2 +-
 .../suggested-addresses-dialog.component.ts   |   1 -
 19 files changed, 474 insertions(+), 77 deletions(-)
 rename core-libs/setup/ssr/logger/loggers/{legacy-server-logger.spec.ts => legacy-express-server-logger.spec.ts} (94%)
 rename core-libs/setup/ssr/logger/loggers/{legacy-server-logger.ts => legacy-express-server-logger.ts} (100%)
 create mode 100644 core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.spec.ts
 create mode 100644 core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.ts

diff --git a/core-libs/setup/ssr/logger/index.ts b/core-libs/setup/ssr/logger/index.ts
index 025449a0835..3d9e6184868 100644
--- a/core-libs/setup/ssr/logger/index.ts
+++ b/core-libs/setup/ssr/logger/index.ts
@@ -4,5 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './loggers';
-export * from './services';
+export * from './loggers/index';
+export * from './services/index';
diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
index b81197b9e1c..9f6bd811167 100644
--- a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
@@ -1,7 +1,19 @@
+import * as angularCore from '@angular/core';
 import { Request } from 'express';
 import { DefaultExpressServerLogger } from './default-express-server-logger';
 import { ExpressServerLoggerContext } from './express-server-logger';
 
+const request = {
+  originalUrl: 'test',
+  res: {
+    locals: {
+      cx: {
+        request: { uuid: 'test', timeReceived: new Date('2023-05-26') },
+      },
+    },
+  },
+} as unknown as Request;
+
 describe('DefaultExpressServerLogger', () => {
   let logger: DefaultExpressServerLogger;
 
@@ -68,6 +80,219 @@ describe('DefaultExpressServerLogger', () => {
         logger['createLogMessage']('test', { request: {} as Request })
       );
     });
+
+    describe('is not dev mode', () => {
+      beforeEach(() => {
+        jest.spyOn(angularCore, 'isDevMode').mockReturnValue(false);
+      });
+
+      it('should log proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'log')
+          .mockImplementation(() => {});
+
+        logger.log('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{"message":"test","context":{"timestamp":"2023-05-26T00:00:00.000Z","request":{"url":"test","uuid":"test","timeReceived":"2023-05-26T00:00:00.000Z"}}}",
+          ]
+        `);
+      });
+
+      it('should warn proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'warn')
+          .mockImplementation(() => {});
+
+        logger.warn('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{"message":"test","context":{"timestamp":"2023-05-26T00:00:00.000Z","request":{"url":"test","uuid":"test","timeReceived":"2023-05-26T00:00:00.000Z"}}}",
+          ]
+        `);
+      });
+
+      it('should error proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'error')
+          .mockImplementation(() => {});
+
+        logger.error('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{"message":"test","context":{"timestamp":"2023-05-26T00:00:00.000Z","request":{"url":"test","uuid":"test","timeReceived":"2023-05-26T00:00:00.000Z"}}}",
+          ]
+        `);
+      });
+
+      it('should info proper shape of the JSON', () => {
+        const request = {
+          originalUrl: 'test',
+          res: {
+            locals: {
+              cx: {
+                request: { uuid: 'test', timeReceived: new Date() },
+              },
+            },
+          },
+        } as unknown as Request;
+
+        const debugSpy = jest
+          .spyOn(console, 'info')
+          .mockImplementation(() => {});
+
+        logger.info('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{"message":"test","context":{"timestamp":"2023-05-26T00:00:00.000Z","request":{"url":"test","uuid":"test","timeReceived":"2023-05-26T00:00:00.000Z"}}}",
+          ]
+        `);
+      });
+
+      it('should debug proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'debug')
+          .mockImplementation(() => {});
+
+        logger.debug('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{"message":"test","context":{"timestamp":"2023-05-26T00:00:00.000Z","request":{"url":"test","uuid":"test","timeReceived":"2023-05-26T00:00:00.000Z"}}}",
+          ]
+        `);
+      });
+    });
+
+    describe('is dev mode', () => {
+      beforeEach(() => {
+        jest.spyOn(angularCore, 'isDevMode').mockReturnValue(true);
+      });
+
+      it('should log proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'log')
+          .mockImplementation(() => {});
+
+        logger.log('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{
+            "message": "test",
+            "context": {
+              "timestamp": "2023-05-26T00:00:00.000Z",
+              "request": {
+                "url": "test",
+                "uuid": "test",
+                "timeReceived": "2023-05-26T00:00:00.000Z"
+              }
+            }
+          }",
+          ]
+        `);
+      });
+
+      it('should warn proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'warn')
+          .mockImplementation(() => {});
+
+        logger.warn('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{
+            "message": "test",
+            "context": {
+              "timestamp": "2023-05-26T00:00:00.000Z",
+              "request": {
+                "url": "test",
+                "uuid": "test",
+                "timeReceived": "2023-05-26T00:00:00.000Z"
+              }
+            }
+          }",
+          ]
+        `);
+      });
+
+      it('should error proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'error')
+          .mockImplementation(() => {});
+
+        logger.error('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{
+            "message": "test",
+            "context": {
+              "timestamp": "2023-05-26T00:00:00.000Z",
+              "request": {
+                "url": "test",
+                "uuid": "test",
+                "timeReceived": "2023-05-26T00:00:00.000Z"
+              }
+            }
+          }",
+          ]
+        `);
+      });
+
+      it('should info proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'info')
+          .mockImplementation(() => {});
+
+        logger.info('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{
+            "message": "test",
+            "context": {
+              "timestamp": "2023-05-26T00:00:00.000Z",
+              "request": {
+                "url": "test",
+                "uuid": "test",
+                "timeReceived": "2023-05-26T00:00:00.000Z"
+              }
+            }
+          }",
+          ]
+        `);
+      });
+
+      it('should debug proper shape of the JSON', () => {
+        const debugSpy = jest
+          .spyOn(console, 'debug')
+          .mockImplementation(() => {});
+
+        logger.debug('test', { request });
+
+        expect(debugSpy.mock.lastCall).toMatchInlineSnapshot(`
+          [
+            "{
+            "message": "test",
+            "context": {
+              "timestamp": "2023-05-26T00:00:00.000Z",
+              "request": {
+                "url": "test",
+                "uuid": "test",
+                "timeReceived": "2023-05-26T00:00:00.000Z"
+              }
+            }
+          }",
+          ]
+        `);
+      });
+    });
   });
 
   describe('create log message', () => {
@@ -106,7 +331,7 @@ describe('DefaultExpressServerLogger', () => {
 
       expect(mappedRequest).toEqual({
         url: 'test',
-        ...request.res.locals.cx.request,
+        ...request.res?.locals.cx.request,
       });
     });
   });
diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
index ce6359d8e87..73d3ad0fcba 100644
--- a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { isDevMode } from '@angular/core';
 import { Request } from 'express';
 import {
   ExpressServerLogger,
@@ -56,7 +57,9 @@ export class DefaultExpressServerLogger implements ExpressServerLogger {
       });
     }
 
-    return JSON.stringify(object);
+    return isDevMode()
+      ? JSON.stringify(object, null, 2)
+      : JSON.stringify(object);
   }
 
   protected mapRequest(request: Request): Record<string, any> {
diff --git a/core-libs/setup/ssr/logger/loggers/express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
index 2c59386308c..54e789000f2 100644
--- a/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
+++ b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
@@ -7,11 +7,26 @@
 import { InjectionToken } from '@angular/core';
 import { Request } from 'express';
 
+/**
+ * ExpressServerLoggerContext is used for log message in server side rendering.
+ * It contains request object and additional properties that can be used in log message.
+ */
 export interface ExpressServerLoggerContext {
   request: Request;
   [_key: string]: any;
 }
 
+/**
+ * ExpressServerLogger is used for log message in server side rendering.
+ * It contains methods for logging messages with different levels. Each method accepts message and context.
+ * Context is an object that contains additional information about the log message.
+ *
+ * @property log - logs message with level "log"
+ * @property warn - logs message with level "warn"
+ * @property error - logs message with level "error"
+ * @property info - logs message with level "info"
+ * @property debug - logs message with level "debug"
+ */
 export interface ExpressServerLogger {
   log(message: string, context: ExpressServerLoggerContext): void;
   warn(message: string, context: ExpressServerLoggerContext): void;
@@ -20,6 +35,15 @@ export interface ExpressServerLogger {
   debug(message: string, context: ExpressServerLoggerContext): void;
 }
 
+/**
+ * Injection token for ExpressServerLogger used for log message in server side rendering.
+ * EXPRESS_SERVER_LOGGER is used to provide proper logger to LoggerService instance.
+ *
+ * Spartacus is providing two types of server loggers:
+ * - DefaultExpressServerLogger - default implementation used for logging contextual messages in SSR.
+ * - LegacyExpressServerLogger - used for logging if contextual logging is disabled
+ *
+ */
 export const EXPRESS_SERVER_LOGGER = new InjectionToken<ExpressServerLogger>(
   'EXPRESS_SERVER_LOGGER'
 );
diff --git a/core-libs/setup/ssr/logger/loggers/index.ts b/core-libs/setup/ssr/logger/loggers/index.ts
index eb6e18dfe33..09d18a173cf 100644
--- a/core-libs/setup/ssr/logger/loggers/index.ts
+++ b/core-libs/setup/ssr/logger/loggers/index.ts
@@ -6,4 +6,4 @@
 
 export * from './default-express-server-logger';
 export * from './express-server-logger';
-export * from './legacy-server-logger';
+export * from './legacy-express-server-logger';
diff --git a/core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts b/core-libs/setup/ssr/logger/loggers/legacy-express-server-logger.spec.ts
similarity index 94%
rename from core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts
rename to core-libs/setup/ssr/logger/loggers/legacy-express-server-logger.spec.ts
index adcfe6b876e..a53d707e5f3 100644
--- a/core-libs/setup/ssr/logger/loggers/legacy-server-logger.spec.ts
+++ b/core-libs/setup/ssr/logger/loggers/legacy-express-server-logger.spec.ts
@@ -1,4 +1,4 @@
-import { LegacyExpressServerLogger } from './legacy-server-logger';
+import { LegacyExpressServerLogger } from './legacy-express-server-logger';
 
 describe('LegacyExpressServerLogger', () => {
   const logger = new LegacyExpressServerLogger();
diff --git a/core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts b/core-libs/setup/ssr/logger/loggers/legacy-express-server-logger.ts
similarity index 100%
rename from core-libs/setup/ssr/logger/loggers/legacy-server-logger.ts
rename to core-libs/setup/ssr/logger/loggers/legacy-express-server-logger.ts
diff --git a/core-libs/setup/ssr/logger/services/express-logger.service.ts b/core-libs/setup/ssr/logger/services/express-logger.service.ts
index 04fdcc60cff..221f425a292 100644
--- a/core-libs/setup/ssr/logger/services/express-logger.service.ts
+++ b/core-libs/setup/ssr/logger/services/express-logger.service.ts
@@ -10,6 +10,16 @@ import { LoggerService } from '@spartacus/core';
 import { formatWithOptions } from 'util';
 import { EXPRESS_SERVER_LOGGER } from '../loggers';
 
+/**
+ * Custom `LoggerService` used in ExpressJS.
+ *
+ * It converts the input arguments to a final string message similar as the native `console`
+ * does (using the native function `format` from `node:util`) and passes this message
+ * to a concrete server logger, used in ExpressJS.
+ *
+ * Besides the message, it also passes the current `request` of ExpressJS as an additional
+ * context to the concrete server logger.
+ */
 @Injectable({ providedIn: 'root' })
 export class ExpressLoggerService implements LoggerService {
   request = inject(REQUEST);
@@ -42,11 +52,9 @@ export class ExpressLoggerService implements LoggerService {
   }
 
   protected formatLogMessage(message?: any, ...optionalParams: any[]): string {
-    /**
-     * built-in util function 'formatWithOptions' was used to not break provided message.
-     * That helps to present logs in moonitoring tools like Kibana in a proper way.
-     */
     return formatWithOptions(
+      // Prevent automatically breaking a long string message into multiple lines.
+      // Otherwise, multi-line logs would be treated on the server as separate log
       { breakLength: Infinity },
       message,
       ...optionalParams
diff --git a/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts b/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
index 2f5c6a9f1bc..e1a6fbbf11a 100644
--- a/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
+++ b/core-libs/setup/ssr/logger/services/prerendering-logger.service.ts
@@ -7,6 +7,11 @@
 import { Injectable } from '@angular/core';
 import { LoggerService } from '@spartacus/core';
 
+/**
+ * Custom `LoggerService` used in pre-rendering in the server environment.
+ *
+ * It simply forwards the arguments to the native `console` methods.
+ */
 @Injectable({
   providedIn: 'root',
 })
diff --git a/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.spec.ts b/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.spec.ts
new file mode 100644
index 00000000000..38e14228007
--- /dev/null
+++ b/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.spec.ts
@@ -0,0 +1,93 @@
+import { DefaultExpressServerLogger } from '../logger';
+import { getLoggableSsrOptimizationOptions } from './get-loggable-ssr-optimization-options';
+import { SsrOptimizationOptions } from './ssr-optimization-options';
+
+class MockLogger extends DefaultExpressServerLogger {
+  constructor() {
+    super();
+  }
+}
+
+describe('getLoggableSsrOptimizationOptions', () => {
+  const ssrOptions: SsrOptimizationOptions = {
+    concurrency: 10,
+    timeout: 3000,
+    forcedSsrTimeout: 60000,
+    maxRenderTime: 300000,
+    reuseCurrentRendering: true,
+    debug: false,
+  };
+
+  it('should return options in the same shape as provided', () => {
+    expect(getLoggableSsrOptimizationOptions(ssrOptions))
+      .toMatchInlineSnapshot(`
+      {
+        "concurrency": 10,
+        "debug": false,
+        "forcedSsrTimeout": 60000,
+        "maxRenderTime": 300000,
+        "reuseCurrentRendering": true,
+        "timeout": 3000,
+      }
+    `);
+  });
+
+  it('should return constructor name if property is not a plain object', () => {
+    expect(
+      getLoggableSsrOptimizationOptions({
+        ...ssrOptions,
+        logger: new MockLogger(),
+      })
+    ).toMatchInlineSnapshot(`
+      {
+        "concurrency": 10,
+        "debug": false,
+        "forcedSsrTimeout": 60000,
+        "logger": "MockLogger",
+        "maxRenderTime": 300000,
+        "reuseCurrentRendering": true,
+        "timeout": 3000,
+      }
+    `);
+  });
+
+  it('should not return constructor name if property is a plain object', () => {
+    expect(
+      getLoggableSsrOptimizationOptions({
+        ...ssrOptions,
+        somePlainObject: { config: 'value' },
+      } as SsrOptimizationOptions)
+    ).toMatchInlineSnapshot(`
+      {
+        "concurrency": 10,
+        "debug": false,
+        "forcedSsrTimeout": 60000,
+        "maxRenderTime": 300000,
+        "reuseCurrentRendering": true,
+        "somePlainObject": {
+          "config": "value",
+        },
+        "timeout": 3000,
+      }
+    `);
+  });
+
+  it('should change function to string if property is a function', () => {
+    expect(
+      getLoggableSsrOptimizationOptions({
+        ...ssrOptions,
+        renderKeyResolver: (req: any) => req.url,
+      })
+    ).toMatchInlineSnapshot(`
+      {
+        "concurrency": 10,
+        "debug": false,
+        "forcedSsrTimeout": 60000,
+        "maxRenderTime": 300000,
+        "renderKeyResolver": "(req) => req.url",
+        "reuseCurrentRendering": true,
+        "timeout": 3000,
+      }
+    `);
+  });
+});
diff --git a/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.ts b/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.ts
new file mode 100644
index 00000000000..e1877e44801
--- /dev/null
+++ b/core-libs/setup/ssr/optimized-engine/get-loggable-ssr-optimization-options.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SsrOptimizationOptions } from './ssr-optimization-options';
+
+/**
+ * Helper function that maps optimization options to primitive values.
+ * This is useful for logging and monitoring purposes.
+ *
+ * @param value optimization options that should be logged
+ * @returns options containing only primitive values that are easier to read by developers and monitoring tools
+ */
+export const getLoggableSsrOptimizationOptions = (
+  value: SsrOptimizationOptions
+) => {
+  const newValue: Record<string, any> = { ...value };
+  Object.keys(value).forEach((key) => {
+    if (isClassInstance(newValue[key])) {
+      newValue[key] = newValue[key].constructor?.name;
+    }
+    if (typeof newValue[key] === 'function') {
+      newValue[key] = newValue[key].toString();
+    }
+  });
+  return newValue;
+};
+
+/**
+ * Checks if the given value is a class instance,
+ * but not a plain Object.
+ *
+ * @private
+ */
+const isClassInstance = (value: any): boolean => {
+  return typeof value === 'object' && value.constructor !== Object;
+};
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
index 0abebd2beb4..ac97df28ba5 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
@@ -1183,7 +1183,21 @@ describe('OptimizedSsrEngine', () => {
       });
       expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
         [
-          "{"message":"[spartacus] SSR optimization engine initialized","context":{"timestamp":"2023-05-26T00:00:00.000Z","options":{"concurrency":10,"timeout":3000,"forcedSsrTimeout":60000,"maxRenderTime":300000,"reuseCurrentRendering":true,"debug":false,"logger":true}}}",
+          "{
+          "message": "[spartacus] SSR optimization engine initialized",
+          "context": {
+            "timestamp": "2023-05-26T00:00:00.000Z",
+            "options": {
+              "concurrency": 10,
+              "timeout": 3000,
+              "forcedSsrTimeout": 60000,
+              "maxRenderTime": 300000,
+              "reuseCurrentRendering": true,
+              "debug": false,
+              "logger": true
+            }
+          }
+        }",
         ]
       `);
     });
@@ -1211,17 +1225,17 @@ describe('OptimizedSsrEngine', () => {
     it('should use the legacy server logger, if logger option not specified', () => {
       new TestEngineRunner({});
       expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
-              [
-                "[spartacus] SSR optimization engine initialized with the following options: {
-                "concurrency": 10,
-                "timeout": 3000,
-                "forcedSsrTimeout": 60000,
-                "maxRenderTime": 300000,
-                "reuseCurrentRendering": true,
-                "debug": false
-              }",
-              ]
-            `);
+        [
+          "[spartacus] SSR optimization engine initialized with the following options: {
+          "concurrency": 10,
+          "timeout": 3000,
+          "forcedSsrTimeout": 60000,
+          "maxRenderTime": 300000,
+          "reuseCurrentRendering": true,
+          "debug": false
+        }",
+        ]
+      `);
     });
   });
 });
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
index 714dba192aa..5a3afc3f442 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
@@ -17,6 +17,7 @@ import {
   ExpressServerLoggerContext,
   LegacyExpressServerLogger,
 } from '../logger';
+import { getLoggableSsrOptimizationOptions } from './get-loggable-ssr-optimization-options';
 import { RenderingCache } from './rendering-cache';
 import {
   RenderingStrategy,
@@ -86,30 +87,22 @@ export class OptimizedSsrEngine {
       return;
     }
 
-    const replacer = (_key: string, value: unknown): unknown => {
-      if (typeof value === 'function') {
-        return value.toString();
-      }
-      if (this.isServerLogger(value)) {
-        return value.constructor.name;
-      }
-      return value;
-    };
+    const loggableSsrOptions = getLoggableSsrOptimizationOptions(
+      this.ssrOptions
+    );
 
-    const stringifiedOptions = JSON.stringify(this.ssrOptions, replacer, 2);
     // This check has been introduced to avoid breaking changes. Remove it in Spartacus version 7.0
-    const message = this.ssrOptions.logger
-      ? `[spartacus] SSR optimization engine initialized`
-      : `[spartacus] SSR optimization engine initialized with the following options: ${stringifiedOptions}`;
-    this.log(message, true, {
-      options: {
-        ...this.ssrOptions,
-        logger:
-          this.ssrOptions.logger === true
-            ? this.ssrOptions.logger
-            : this.ssrOptions.logger?.constructor?.name,
-      },
-    } as unknown as ExpressServerLoggerContext); //it expects ExpressServerLoggerContext, but the current logged message is printed a the start f the server and there is no request available yet.
+    if (this.ssrOptions.logger) {
+      this.log(`[spartacus] SSR optimization engine initialized`, true, {
+        options: loggableSsrOptions,
+      } as unknown as ExpressServerLoggerContext); //it expects ExpressServerLoggerContext, but the current logged message is printed at the start of the server and there is no request available yet.
+    } else {
+      const stringifiedOptions = JSON.stringify(loggableSsrOptions, null, 2);
+      this.log(
+        `[spartacus] SSR optimization engine initialized with the following options: ${stringifiedOptions}`,
+        true
+      );
+    }
   }
 
   /**
@@ -339,13 +332,10 @@ export class OptimizedSsrEngine {
     message: string,
     debug = true,
     //CXSPA-3680 - in a new major, let's make this argument required
-    logMetadata?: ExpressServerLoggerContext
+    context?: ExpressServerLoggerContext
   ): void {
     if (debug || this.ssrOptions?.debug) {
-      this.logger.log(
-        message,
-        logMetadata || ({} as ExpressServerLoggerContext)
-      );
+      this.logger.log(message, context || ({} as ExpressServerLoggerContext));
     }
   }
 
@@ -502,15 +492,4 @@ export class OptimizedSsrEngine {
     }
     return ssrOptions?.logger || new LegacyExpressServerLogger();
   }
-
-  private isServerLogger(logger: unknown): logger is ExpressServerLogger {
-    return (
-      logger instanceof Object &&
-      'log' in logger &&
-      'error' in logger &&
-      'warn' in logger &&
-      'info' in logger &&
-      'debug' in logger
-    );
-  }
 }
diff --git a/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
index df82ddb3d13..d819e63dc81 100644
--- a/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
+++ b/projects/core/src/i18n/i18next/i18next-plugins/i18next-logger-plugin.spec.ts
@@ -3,6 +3,8 @@ import { LoggerService } from '@spartacus/core';
 import { LoggerModule } from 'i18next';
 import { I18NEXT_LOGGER_PLUGIN } from './i18next-logger-plugin';
 
+const testInput: any[][] = [['test'], ['test2', 2], ['test3', 3, 4]];
+
 describe('i18next logger plugin', () => {
   let plugin: LoggerModule;
   let logger: LoggerService;
@@ -20,27 +22,31 @@ describe('i18next logger plugin', () => {
     expect(plugin.type).toEqual('logger');
   });
 
-  it('should log', () => {
-    const log = spyOn(logger, 'log');
+  testInput.forEach((input) => {
+    describe(`logging ${input.length} argument(s)`, () => {
+      it('should log', () => {
+        const log = spyOn(logger, 'log');
 
-    plugin.log(['test']);
+        plugin.log(input);
 
-    expect(log).toHaveBeenCalledWith('test');
-  });
+        expect(log).toHaveBeenCalledWith(...input);
+      });
 
-  it('should warn', () => {
-    const warn = spyOn(logger, 'warn');
+      it('should warn', () => {
+        const warn = spyOn(logger, 'warn');
 
-    plugin.warn(['test']);
+        plugin.warn(input);
 
-    expect(warn).toHaveBeenCalledWith('test');
-  });
+        expect(warn).toHaveBeenCalledWith(...input);
+      });
 
-  it('should error', () => {
-    const error = spyOn(logger, 'error');
+      it('should error', () => {
+        const error = spyOn(logger, 'error');
 
-    plugin.error(['test']);
+        plugin.error(input);
 
-    expect(error).toHaveBeenCalledWith('test');
+        expect(error).toHaveBeenCalledWith(...input);
+      });
+    });
   });
 });
diff --git a/projects/core/src/logger/logger.service.ts b/projects/core/src/logger/logger.service.ts
index 6ebaaac15eb..ac8c6c5256d 100644
--- a/projects/core/src/logger/logger.service.ts
+++ b/projects/core/src/logger/logger.service.ts
@@ -10,7 +10,7 @@ import { Injectable } from '@angular/core';
  * By default it delegates logged messages to the native `console` object.
  *
  * It's a good extension point for customizing the destination of logs
- *(e.g. to use a 3rd party logger library) or to enhance logs with more contextual data.
+ * (e.g. to use a 3rd party logger library) or to enhance logs with more contextual data.
  */
 @Injectable({
   providedIn: 'root',
diff --git a/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts b/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
index 98188dc8132..8410cca596e 100644
--- a/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
+++ b/projects/core/src/state/utils/processes-loader/processes-loader.reducer.ts
@@ -40,6 +40,7 @@ export function processesLoaderReducer<T>(
         processesCountDiff &&
         state.processesCount + processesCountDiff < 0
       ) {
+        //CXSPA-3670 - extract logging to an effect
         /* eslint-disable-next-line no-console */
         console.error(
           `Action '${action.type}' sets processesCount to value < 0!\n` +
diff --git a/projects/storefrontapp/server.ts b/projects/storefrontapp/server.ts
index c1e64a439aa..c060184d00e 100644
--- a/projects/storefrontapp/server.ts
+++ b/projects/storefrontapp/server.ts
@@ -26,6 +26,7 @@ const ssrOptions: SsrOptimizationOptions = {
   timeout: Number(
     process.env['SSR_TIMEOUT'] ?? defaultSsrOptimizationOptions.timeout
   ),
+  logger: true,
 };
 
 const ngExpressEngine = NgExpressEngineDecorator.get(engine, ssrOptions);
diff --git a/projects/storefrontapp/src/app/app.module.ts b/projects/storefrontapp/src/app/app.module.ts
index 5ea055b5e0e..3dcb13792ea 100644
--- a/projects/storefrontapp/src/app/app.module.ts
+++ b/projects/storefrontapp/src/app/app.module.ts
@@ -49,8 +49,8 @@ if (!environment.production) {
     EffectsModule.forRoot([]),
     SpartacusModule,
     TestOutletModule, // custom usages of cxOutletRef only for e2e testing
-    TestConfigModule.forRoot({ cookie: 'cxConfigE2E' }), // Injects config dynamically from e2e tests. Should be imported after other config modules.
     ErrorHandlingModule.forRoot(), // custom error handling that delegates to LoggerService. Remove for 7.0 as it will be the part of BaseCoreModule (CXSPA-3680).
+    TestConfigModule.forRoot({ cookie: 'cxConfigE2E' }), // Injects config dynamically from e2e tests. Should be imported after other config modules.
 
     ...devImports,
   ],
diff --git a/projects/storefrontlib/cms-components/myaccount/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.ts b/projects/storefrontlib/cms-components/myaccount/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.ts
index 06f143b7a05..bf2061518f5 100644
--- a/projects/storefrontlib/cms-components/myaccount/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.ts
+++ b/projects/storefrontlib/cms-components/myaccount/address-book/address-form/suggested-addresses-dialog/suggested-addresses-dialog.component.ts
@@ -61,6 +61,5 @@ export class SuggestedAddressDialogComponent implements OnInit {
     this.selectedAddress = data.suggestedAddresses?.length
       ? data.suggestedAddresses[0]
       : data.enteredAddress;
-    console.log(this.selectedAddress);
   }
 }

From 854c459bac85058f8409f0947125f274de0c6a20 Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Mon, 26 Jun 2023 12:55:24 +0200
Subject: [PATCH 053/122] fix: Fix behaviour of menu scrolling on the overview
 page (#17575)

Fix behaviour of menu scrolling on the overview page

Closes CXSPA-3838
---
 .../service/configurator-storefront-utils.service.ts           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
index fcd1f1426a7..47da09f8ea5 100644
--- a/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
+++ b/feature-libs/product-configurator/rulebased/components/service/configurator-storefront-utils.service.ts
@@ -460,8 +460,7 @@ export class ConfiguratorStorefrontUtilsService {
     if (element && container) {
       if (element.offsetTop > container.scrollTop) {
         const offsetBottom = element.offsetTop + element.offsetHeight;
-        const containerBottom = container.scrollTop + container.offsetHeight;
-        if (offsetBottom > containerBottom) {
+        if (offsetBottom > container.scrollTop) {
           container.scrollTop = offsetBottom - container.offsetHeight;
         }
       } else {

From 151bfe64f7c1357c67fe6caec54e3647e33077b5 Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:11:41 +0800
Subject: [PATCH 054/122] fix: Need to adapt to the width of mobile webpage on
 CustomerList (#17577)

---
 .../asm/components/customer-list/customer-list.component.html | 4 +++-
 feature-libs/asm/components/default-asm-pagination.config.ts  | 2 +-
 .../asm/styles/components/_customer-emulation.component.scss  | 1 +
 .../asm/styles/components/_customer-list.component.scss       | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/feature-libs/asm/components/customer-list/customer-list.component.html b/feature-libs/asm/components/customer-list/customer-list.component.html
index 8ff64c4f616..719ed663607 100644
--- a/feature-libs/asm/components/customer-list/customer-list.component.html
+++ b/feature-libs/asm/components/customer-list/customer-list.component.html
@@ -294,7 +294,9 @@ <h2 id="asm-customer-list-title" class="title modal-title">
         <!-- Modal Foot -->
         <div
           class="cx-dialog-sub-header modal-header cx-dialog-foot"
-          [class.tablet-mobile]="(breakpoint$ | async) !== BREAKPOINT.md"
+          [class.asm-mobile-pagination]="
+            (breakpoint$ | async) !== BREAKPOINT.md
+          "
           *ngIf="customerListsPage$ | async as customerListsPage"
         >
           <div
diff --git a/feature-libs/asm/components/default-asm-pagination.config.ts b/feature-libs/asm/components/default-asm-pagination.config.ts
index a53422e7e45..d07612df648 100644
--- a/feature-libs/asm/components/default-asm-pagination.config.ts
+++ b/feature-libs/asm/components/default-asm-pagination.config.ts
@@ -8,7 +8,7 @@ import { PaginationConfig } from '@spartacus/storefront';
 
 export const defaultAsmPaginationConfig: PaginationConfig = {
   pagination: {
-    rangeCount: 4,
+    rangeCount: 2,
     addPrevious: true,
     addNext: true,
     addStart: false,
diff --git a/feature-libs/asm/styles/components/_customer-emulation.component.scss b/feature-libs/asm/styles/components/_customer-emulation.component.scss
index 42d06b1abd1..bc5c92c79df 100644
--- a/feature-libs/asm/styles/components/_customer-emulation.component.scss
+++ b/feature-libs/asm/styles/components/_customer-emulation.component.scss
@@ -39,6 +39,7 @@
     }
     .cx-asm-uid {
       color: #556b82;
+      word-break: break-all;
     }
   }
 }
diff --git a/feature-libs/asm/styles/components/_customer-list.component.scss b/feature-libs/asm/styles/components/_customer-list.component.scss
index 09bb0885303..50261152453 100644
--- a/feature-libs/asm/styles/components/_customer-list.component.scss
+++ b/feature-libs/asm/styles/components/_customer-list.component.scss
@@ -149,6 +149,10 @@ $sapFioriContent_LabelColor: #6a6d70;
     flex-direction: column;
   }
 
+  .asm-mobile-pagination {
+    flex-direction: row-reverse;
+  }
+
   .cx-dialog-body {
     padding-top: 0;
     @include forVersion(6.1) {

From 16c59444c106391e24afeea63245cec992887ac1 Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Tue, 27 Jun 2023 14:39:56 +0200
Subject: [PATCH 055/122] fix: configurator restart must remove UI state as
 well (#17581) (#17582)

https://jira.tools.sap/browse/CXSPA-3839
---
 .../core/facade/configurator-commons.service.spec.ts | 12 +++++++++++-
 .../core/facade/configurator-commons.service.ts      |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.spec.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.spec.ts
index 608c875e7bd..0f9942a1a5c 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.spec.ts
@@ -683,7 +683,7 @@ describe('ConfiguratorCommonsService', () => {
   });
 
   describe('forceNewConfiguration', () => {
-    it('should call matching action', () => {
+    it('should call create action', () => {
       spyOn(store, 'dispatch').and.callThrough();
       serviceUnderTest.forceNewConfiguration(OWNER_PRODUCT);
       expect(store.dispatch).toHaveBeenCalledWith(
@@ -694,5 +694,15 @@ describe('ConfiguratorCommonsService', () => {
         })
       );
     });
+
+    it('should remove configuration from state', () => {
+      spyOn(store, 'dispatch').and.callThrough();
+      serviceUnderTest.forceNewConfiguration(OWNER_PRODUCT);
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new ConfiguratorActions.RemoveConfiguration({
+          ownerKey: OWNER_PRODUCT.key,
+        })
+      );
+    });
   });
 });
diff --git a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
index 19dd0d50c1c..0dcfde54fa5 100644
--- a/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
+++ b/feature-libs/product-configurator/rulebased/core/facade/configurator-commons.service.ts
@@ -265,6 +265,11 @@ export class ConfiguratorCommonsService {
    * @param owner - Configuration owner
    */
   forceNewConfiguration(owner: CommonConfigurator.Owner): void {
+    this.store.dispatch(
+      new ConfiguratorActions.RemoveConfiguration({
+        ownerKey: owner.key,
+      })
+    );
     this.store.dispatch(
       new ConfiguratorActions.CreateConfiguration({
         owner: owner,

From 0e492c3c3105f0addc3f2efd6baf88543070e556 Mon Sep 17 00:00:00 2001
From: Hak Woo Kim <kimhakwoo@hotmail.com>
Date: Tue, 27 Jun 2023 14:52:18 -0400
Subject: [PATCH 056/122] fix: Product name does not match in
 smartEdit(CXSPA-1589). (#17563)

Co-authored-by: Hakwoo Kim <hakwoo.kim@sap.com>
---
 .../cms-ticket.interceptor.spec.ts            | 21 +++++++++++++++++++
 .../cms-ticket.interceptor.ts                 |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.spec.ts b/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.spec.ts
index f1650225e07..608685f81a2 100644
--- a/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.spec.ts
+++ b/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.spec.ts
@@ -101,4 +101,25 @@ describe('CmsTicketInterceptor', () => {
       mockReq.flush('somedata');
     }
   ));
+
+  it('should add parameters for product requests: cmsTicketId', inject(
+    [HttpClient],
+    (http: HttpClient) => {
+      spyOnProperty(service, 'cmsTicketId', 'get').and.returnValue(
+        'mockCmsTicketId'
+      );
+
+      http.get(`${OccUrl}/products/mockId`).subscribe((result) => {
+        expect(result).toBeTruthy();
+      });
+      const mockReq = httpMock.expectOne((req) => {
+        return req.method === 'GET';
+      });
+
+      expect(mockReq.request.params.get('cmsTicketId')).toEqual(
+        'mockCmsTicketId'
+      );
+      mockReq.flush('somedata');
+    }
+  ));
 });
diff --git a/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.ts b/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.ts
index 8d21a43ff85..807c66f5896 100644
--- a/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.ts
+++ b/feature-libs/smartedit/root/http-interceptors/cms-ticket.interceptor.ts
@@ -22,7 +22,10 @@ export class CmsTicketInterceptor implements HttpInterceptor {
     request: HttpRequest<any>,
     next: HttpHandler
   ): Observable<HttpEvent<any>> {
-    if (this.service.cmsTicketId && request.url.includes('/cms/')) {
+    if (
+      this.service.cmsTicketId &&
+      (request.url.includes('/cms/') || request.url.includes('/products/'))
+    ) {
       request = request.clone({
         setParams: {
           cmsTicketId: this.service.cmsTicketId,

From 7dc1eae6e71938a220ba3454e6b89cf829aa8783 Mon Sep 17 00:00:00 2001
From: niehuayang <126219214+niehuayang@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:47:48 +0800
Subject: [PATCH 057/122] chore/CXSAP-3848: cherry-pick bug fixes from branch
 6.2.x to branch 6.3.x (#17586)

---
 .../asm/assets/translations/en/asm.ts         |   7 +
 .../asm-create-customer-form.component.html   | 133 +++++++++---------
 ...asm-create-customer-form.component.spec.ts |  44 +++++-
 .../asm-create-customer-form.component.ts     |  65 +++++++--
 .../customer-selection.component.html         |   3 +-
 .../customer-selection.component.spec.ts      |   2 +-
 .../_customer-selection.component.scss        |   1 -
 .../tabbing-order.e2e-spec-flaky.cy.ts        |  15 --
 .../tabbing-order.e2e.asm.e2e-flaky.cy.ts     |  15 ++
 .../asm/create-customer.e2e-flaky.cy.ts       |  39 ++++-
 .../accessibility/tabbing-order.config.ts     |  31 ++--
 .../cypress/helpers/asm.ts                    |  15 +-
 12 files changed, 261 insertions(+), 109 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 748fb978d00..767f3388d69 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -59,6 +59,13 @@ export const asm = {
       },
       createAccountAlert:
         'The customer session starts once you create the customer account.',
+      validationErrors: {
+        firstName: 'Enter a valid first name.',
+        lastName: 'Enter a valid last name.',
+        emailAddress: 'Enter a valid email address.',
+      },
+      badRequestDuplicatedEmail:
+        'Enter a different email address as {{ emailAddress }} already exists.',
     },
     customerList: {
       title: 'Customer List',
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
index 6a1d1615675..38e9cde6b90 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html
@@ -2,7 +2,6 @@
   class="cx-modal-container cx-asm-dialog"
   [cxFocus]="focusConfig"
   (esc)="closeModal('Escape clicked')"
-  *ngIf="!(isLoading$ | async); else loading"
 >
   <div class="cx-modal-content">
     <ng-container>
@@ -23,74 +22,80 @@ <h2 class="title modal-title">
               (closeMessage)="closeDialogInfoAlert()"
             >
             </cx-message>
-            <cx-message
-              *ngIf="showDialogBackendErrorAlert"
-              [text]="backendErrorMessage"
-              [type]="globalMessageType.MSG_TYPE_ERROR"
-              (closeMessage)="closeDialogBackendErroAlert()"
+            <ng-container
+              *ngFor="let errorMessage of backendErrorMessages; let i = index"
             >
-            </cx-message>
+              <cx-message
+                *ngIf="showDialogBackendErrorAlerts[i]"
+                [text]="errorMessage"
+                [type]="globalMessageType.MSG_TYPE_ERROR"
+                (closeMessage)="closeDialogBackendErroAlert(i)"
+              >
+              </cx-message>
+            </ng-container>
           </div>
 
-          <div class="form-group">
-            <label>
-              <span class="label-content">{{
-                'asm.createCustomerForm.firstName.label' | cxTranslate
-              }}</span>
-              <input
-                required="true"
-                class="form-control"
-                placeholder="{{
-                  'asm.createCustomerForm.firstName.placeholder' | cxTranslate
-                }}"
-                formControlName="firstName"
-                name="text"
-              />
-              <cx-form-errors
-                [control]="registerForm.get('firstName')"
-              ></cx-form-errors>
-            </label>
-          </div>
+          <div *ngIf="!(isLoading$ | async); else loading">
+            <div class="form-group">
+              <label>
+                <span class="label-content">{{
+                  'asm.createCustomerForm.firstName.label' | cxTranslate
+                }}</span>
+                <input
+                  required="true"
+                  class="form-control"
+                  placeholder="{{
+                    'asm.createCustomerForm.firstName.placeholder' | cxTranslate
+                  }}"
+                  formControlName="firstName"
+                  name="text"
+                />
+                <cx-form-errors
+                  [control]="registerForm.get('firstName')"
+                ></cx-form-errors>
+              </label>
+            </div>
 
-          <div class="form-group">
-            <label>
-              <span class="label-content">{{
-                'asm.createCustomerForm.lastName.label' | cxTranslate
-              }}</span>
-              <input
-                required="true"
-                class="form-control"
-                placeholder="{{
-                  'asm.createCustomerForm.lastName.placeholder' | cxTranslate
-                }}"
-                name="text"
-                formControlName="lastName"
-              />
-              <cx-form-errors
-                [control]="registerForm.get('lastName')"
-              ></cx-form-errors>
-            </label>
-          </div>
+            <div class="form-group">
+              <label>
+                <span class="label-content">{{
+                  'asm.createCustomerForm.lastName.label' | cxTranslate
+                }}</span>
+                <input
+                  required="true"
+                  class="form-control"
+                  placeholder="{{
+                    'asm.createCustomerForm.lastName.placeholder' | cxTranslate
+                  }}"
+                  name="text"
+                  formControlName="lastName"
+                />
+                <cx-form-errors
+                  [control]="registerForm.get('lastName')"
+                ></cx-form-errors>
+              </label>
+            </div>
 
-          <div class="form-group">
-            <label>
-              <span class="label-content">{{
-                'asm.createCustomerForm.emailAddress.label' | cxTranslate
-              }}</span>
-              <input
-                required="true"
-                class="form-control"
-                placeholder="{{
-                  'asm.createCustomerForm.emailAddress.placeholder'
-                    | cxTranslate
-                }}"
-                name="email"
-                formControlName="email"
-              />
-              <cx-form-errors
-                [control]="registerForm.get('email')"
-              ></cx-form-errors>
-            </label>
+            <div class="form-group">
+              <label>
+                <span class="label-content">{{
+                  'asm.createCustomerForm.emailAddress.label' | cxTranslate
+                }}</span>
+                <input
+                  required="true"
+                  class="form-control"
+                  placeholder="{{
+                    'asm.createCustomerForm.emailAddress.placeholder'
+                      | cxTranslate
+                  }}"
+                  name="email"
+                  formControlName="email"
+                />
+                <cx-form-errors
+                  [control]="registerForm.get('email')"
+                ></cx-form-errors>
+              </label>
+            </div>
           </div>
         </div>
         <!-- Modal Footer -->
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
index bf1696a0671..52738f58258 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
@@ -12,7 +12,7 @@ import {
   AsmCreateCustomerFacade,
   CustomerRegistrationForm,
 } from '@spartacus/asm/root';
-import { I18nTestingModule } from '@spartacus/core';
+import { HttpErrorModel, I18nTestingModule } from '@spartacus/core';
 import {
   FocusConfig,
   ICON_TYPE,
@@ -42,6 +42,31 @@ const user: User = {
   uid: 'john.smith@test.com',
 };
 
+const errorResponse: HttpErrorModel = {
+  details: [
+    {
+      message: 'This field is not a valid email addresss.',
+      reason: 'invalid',
+      subject: 'emailAddress',
+      subjectType: 'parameter',
+      type: 'ValidationError',
+    },
+    {
+      message: 'This field must to be between 0 and 100 characters long.',
+      reason: 'invalid',
+      subject: 'firstName',
+      subjectType: 'parameter',
+      type: 'ValidationError',
+    },
+    {
+      message: 'This field must to be between 0 and 100 characters long.',
+      reason: 'invalid',
+      subject: 'lastName',
+      subjectType: 'parameter',
+      type: 'ValidationError',
+    },
+  ],
+};
 @Component({
   selector: 'cx-icon',
   template: '',
@@ -149,6 +174,23 @@ describe('AsmCreateCustomerFormComponent', () => {
     expect(asmCreateCustomerFacade.createCustomer).not.toHaveBeenCalled();
   });
 
+  it('should show all errors detail with invalid form', () => {
+    // @ts-ignore
+    component.onRegisterUserFail(errorResponse);
+    expect(component.showDialogBackendErrorAlerts[0]).toBeTruthy();
+    expect(component.showDialogBackendErrorAlerts[1]).toBeTruthy();
+    expect(component.showDialogBackendErrorAlerts[2]).toBeTruthy();
+    expect(component.backendErrorMessages[0]).toEqual(
+      'asm.createCustomerForm.validationErrors.emailAddress'
+    );
+    expect(component.backendErrorMessages[1]).toEqual(
+      'asm.createCustomerForm.validationErrors.firstName'
+    );
+    expect(component.backendErrorMessages[2]).toEqual(
+      'asm.createCustomerForm.validationErrors.lastName'
+    );
+  });
+
   it('should close modal when create account successfully', () => {
     spyOn(asmCreateCustomerFacade, 'createCustomer').and.callThrough();
     component.registerForm.patchValue(createdCustomerData);
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
index 322ab17fb28..a94d7d1fdbf 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
@@ -10,7 +10,12 @@ import {
   AsmCreateCustomerFacade,
   CustomerRegistrationForm,
 } from '@spartacus/asm/root';
-import { GlobalMessageType, HttpErrorModel, User } from '@spartacus/core';
+import {
+  GlobalMessageType,
+  HttpErrorModel,
+  TranslationService,
+  User,
+} from '@spartacus/core';
 import {
   CustomFormValidators,
   FocusConfig,
@@ -18,6 +23,7 @@ import {
   LaunchDialogService,
 } from '@spartacus/storefront';
 import { BehaviorSubject } from 'rxjs';
+import { first } from 'rxjs/operators';
 import { CreatedCustomer } from './asm-create-customer-form.model';
 
 @Component({
@@ -33,11 +39,11 @@ export class AsmCreateCustomerFormComponent {
 
   showDialogInfoAlert = true;
 
-  showDialogBackendErrorAlert = false;
-
   globalMessageType = GlobalMessageType;
 
-  backendErrorMessage: string;
+  showDialogBackendErrorAlerts: boolean[];
+
+  backendErrorMessages: string[];
 
   focusConfig: FocusConfig = {
     trap: true,
@@ -55,7 +61,8 @@ export class AsmCreateCustomerFormComponent {
   constructor(
     protected launchDialogService: LaunchDialogService,
     protected fb: FormBuilder,
-    protected asmCreateCustomerFacade: AsmCreateCustomerFacade
+    protected asmCreateCustomerFacade: AsmCreateCustomerFacade,
+    protected translationService: TranslationService
   ) {}
 
   submitForm(): void {
@@ -105,8 +112,8 @@ export class AsmCreateCustomerFormComponent {
     this.showDialogInfoAlert = false;
   }
 
-  closeDialogBackendErroAlert(): void {
-    this.showDialogBackendErrorAlert = false;
+  closeDialogBackendErroAlert(index: number): void {
+    this.showDialogBackendErrorAlerts[index] = false;
   }
 
   protected onRegisterUserSuccess(user: User): void {
@@ -115,7 +122,47 @@ export class AsmCreateCustomerFormComponent {
 
   protected onRegisterUserFail(error: HttpErrorModel): void {
     this.isLoading$.next(false);
-    this.backendErrorMessage = error.details?.[0].message ?? '';
-    this.showDialogBackendErrorAlert = true;
+    this.backendErrorMessages = [];
+    this.showDialogBackendErrorAlerts = [];
+
+    const unknownError = 'httpHandlers.unknownError';
+    const errorDetails = error.details ?? [];
+
+    if (errorDetails.length === 0) {
+      this.addErrorMessage(unknownError);
+    }
+    errorDetails.forEach((errorDetail) => {
+      switch (errorDetail.type || '') {
+        case 'ValidationError':
+          this.addErrorMessage(
+            `asm.createCustomerForm.validationErrors.${errorDetail.subject}`
+          );
+          break;
+        case 'AssistedServiceError':
+          if (errorDetail.message === 'Duplicate User id') {
+            this.addErrorMessage(
+              'asm.createCustomerForm.badRequestDuplicatedEmail',
+              {
+                emailAddress: this.createdCustomer.email,
+              }
+            );
+          } else {
+            this.addErrorMessage(unknownError);
+          }
+          break;
+        default:
+          this.addErrorMessage(unknownError);
+      }
+    });
+  }
+
+  protected addErrorMessage(key: string, options?: unknown): void {
+    this.translationService
+      .translate(key, options)
+      .pipe(first())
+      .subscribe((text) => {
+        this.backendErrorMessages.push(text);
+        this.showDialogBackendErrorAlerts.push(true);
+      });
   }
 }
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.html b/feature-libs/asm/components/customer-selection/customer-selection.component.html
index 53dfca659e9..4eb952ec2a8 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.html
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.html
@@ -67,7 +67,6 @@
     <button
       #searchResultItem
       (click)="createCustomer()"
-      (keydown.enter)="createCustomer()"
       (keydown.escape)="closeResults($event)"
       (keydown.arrowright)="focusInputText($event)"
       (keydown.arrowleft)="focusInputText($event)"
@@ -82,7 +81,7 @@
         results.entries.length <= 0
       "
     >
-      {{ 'asm.customerSearch.noMatchResult' | cxTranslate }}
+      <span>{{ 'asm.customerSearch.noMatchResult' | cxTranslate }}</span>
       <span #createCustomerLink class="linkStyleLabel">{{
         'asm.customerSearch.createCustomer' | cxTranslate
       }}</span>
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
index e2d9124df93..0e58682be47 100644
--- a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
+++ b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts
@@ -245,7 +245,7 @@ describe('CustomerSelectionComponent', () => {
     expect(el.queryAll(By.css('div.asm-results button')).length).toEqual(1);
     const createAccountButton = el.query(By.css('div.asm-results button'));
     expect(createAccountButton.nativeElement.innerText).toEqual(
-      'asm.customerSearch.noMatchResult asm.customerSearch.createCustomer'
+      'asm.customerSearch.noMatchResultasm.customerSearch.createCustomer'
     );
     createAccountButton.nativeElement.dispatchEvent(new MouseEvent('click'));
     expect(asmService.customerSearchReset).toHaveBeenCalled();
diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
index 5f131c8d870..825f8580c57 100644
--- a/feature-libs/asm/styles/components/_customer-selection.component.scss
+++ b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -163,7 +163,6 @@
           font-family: '72';
           font-weight: 600;
           font-size: 13px;
-          padding-inline-start: 8px;
           color: #0064d9;
         }
       }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e-spec-flaky.cy.ts
index d01e4a0fa5d..81964e153aa 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/tabbing-order.e2e-spec-flaky.cy.ts
@@ -265,21 +265,6 @@ describe("Tabbing order - tests don't require user to be logged in", () => {
       stockNotificationNotLoginTabbingOrder(config.stockNotificationNotLogin);
     });
   });
-
-  // TODO: Fix helpers and renable
-  // context('ASM', () => {
-  //   it('should allow to navigate with tab key (not logged in)', () => {
-  //     asmTabbingOrderNotLoggedIn(config.asmNotLoggedIn);
-  //   });
-
-  //   it('should allow to navigate with tab key (no user selected)', () => {
-  //     asmTabbingOrderNoSelectedUser(config.asmNoSelectedUser);
-  //   });
-
-  //   it('should allow to navigate with tab key (with user selected)', () => {
-  //     asmTabbingOrderWithSelectedUser(config.asmWithSelectedUser);
-  //   });
-  // });
 });
 
 describe('Tabbing order - tests do require user to be logged in', () => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts
index 71438e3767c..f947a437a7c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/accessibility/tabbing-order.e2e.asm.e2e-flaky.cy.ts
@@ -6,9 +6,12 @@
 
 import { tabbingOrderConfig as config } from '../../../../helpers/accessibility/tabbing-order.config';
 import {
+  asmTabbingOrderNoSelectedUser,
+  asmTabbingOrderNotLoggedIn,
   asmTabbingOrderWithCreateCustomerForm,
   asmTabbingOrderWithCustomerList,
   asmTabbingOrderWithSaveInactiveCartDialog,
+  asmTabbingOrderWithSelectedUser,
 } from '../../../../helpers/accessibility/tabbing-order/asm';
 
 describe('Tabbing order for ASM', () => {
@@ -17,6 +20,18 @@ describe('Tabbing order for ASM', () => {
   });
 
   context('ASM', () => {
+    it('should allow to navigate with tab key (not logged in)', () => {
+      asmTabbingOrderNotLoggedIn(config.asmNotLoggedIn);
+    });
+
+    it('should allow to navigate with tab key (no user selected)', () => {
+      asmTabbingOrderNoSelectedUser(config.asmNoSelectedUser);
+    });
+
+    it('should allow to navigate with tab key (with user selected)', () => {
+      asmTabbingOrderWithSelectedUser(config.asmWithSelectedUser);
+    });
+
     it('should allow to navigate with tab key for customer List （CXSPA-1595）', () => {
       asmTabbingOrderWithCustomerList(config.asmWithCustomerLists, 'asagent');
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
index 9c110857fc4..cce0303f15c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
@@ -56,17 +56,20 @@ context('Assisted Service Module', () => {
       const sentArgs = { email: user.email, password: user.password };
       cy.origin(backOfficeUrl, { args: sentArgs }, ({ email, password }) => {
         cy.get('.z-loading-indicator', { timeout: 30000 }).should('not.exist');
+        cy.get('[ytestid="loginButton"]').should('exist');
         cy.get('[ytestid="loginButton"]').should('be.visible');
 
         cy.get('[ytestid="j_username"]').clear({ force: true });
         cy.get('[ytestid="j_password"]').clear({ force: true });
 
-        cy.get('[ytestid="j_username"]').type('CustomerSupportAgent');
+        cy.get('[ytestid="j_username"]')
+          .scrollIntoView()
+          .type('CustomerSupportAgent');
         cy.get('[ytestid="j_username"]').should(
           'have.value',
           'CustomerSupportAgent'
         );
-        cy.get('[ytestid="j_password"]').type('pw4all');
+        cy.get('[ytestid="j_password"]').scrollIntoView().type('pw4all');
         cy.get('[ytestid="j_password"]').should('have.value', 'pw4all');
         cy.get('[ytestid="loginButton"]').click({ force: true });
 
@@ -150,7 +153,7 @@ context('Assisted Service Module', () => {
 
       asm.agentSignOut();
     });
-    it('should be not able to create a new customer with dupcated email by agent (CXSPA-1594)', () => {
+    it('should be not able to create a new customer with invalid user data by agent (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
@@ -171,6 +174,36 @@ context('Assisted Service Module', () => {
         .its('response.statusCode')
         .should('eq', 400);
 
+      cy.get('div.message-container cx-message').should('exist');
+      cy.get('div.message-container cx-message').should('be.visible');
+      cy.get('div.message-container cx-message').should('have.length', 2);
+      cy.get('div.message-container cx-message')
+        .eq(1)
+        .should('contain', 'Enter a different email address as');
+
+      let invalidUser = asm.invalidUser;
+      cy.log('--> fill form');
+      asm.fillCreateCustomerForm(invalidUser);
+
+      cy.log('--> submit form');
+      asm
+        .submitCreateCustomerForm()
+        .its('response.statusCode')
+        .should('eq', 400);
+
+      cy.get('div.message-container cx-message').should('exist');
+      cy.get('div.message-container cx-message').should('be.visible');
+      cy.get('div.message-container cx-message').should('have.length', 4);
+      cy.get('div.message-container cx-message')
+        .eq(1)
+        .should('contain', 'Enter a valid email address.');
+      cy.get('div.message-container cx-message')
+        .eq(2)
+        .should('contain', 'Enter a valid first name.');
+      cy.get('div.message-container cx-message')
+        .eq(3)
+        .should('contain', 'Enter a valid last name.');
+
       cy.log('--> close create customer dialog');
       asm.asmCloseCreateCustomerDialog();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
index 8a15006d4d3..8d3d833cfff 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order.config.ts
@@ -2316,6 +2316,10 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
     },
   ],
   asmNotLoggedIn: [
+    {
+      type: TabbingOrderTypes.LINK,
+      value: 'Hide ASM',
+    },
     {
       type: TabbingOrderTypes.BUTTON,
       value: '',
@@ -2326,19 +2330,28 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
     {
       type: TabbingOrderTypes.GENERIC_INPUT,
     },
+    {
+      type: TabbingOrderTypes.GENERIC_BUTTON,
+    },
     {
       type: TabbingOrderTypes.BUTTON,
       value: 'Sign In',
     },
   ],
   asmNoSelectedUser: [
+    {
+      type: TabbingOrderTypes.LINK,
+      value: 'Customers',
+    },
+    {
+      type: TabbingOrderTypes.LINK,
+      value: 'Hide ASM',
+    },
     {
       type: TabbingOrderTypes.BUTTON,
-      value: '',
     },
     {
       type: TabbingOrderTypes.BUTTON,
-      value: '',
     },
     {
       type: TabbingOrderTypes.FORM_FIELD,
@@ -2348,23 +2361,21 @@ export const tabbingOrderConfig: TabbingOrderConfig = {
       type: TabbingOrderTypes.BUTTON,
       value: 'Start Emulation',
     },
+  ],
+  asmWithSelectedUser: [
     {
-      type: TabbingOrderTypes.BUTTON,
-      value: 'Linda Wolf',
+      type: TabbingOrderTypes.LINK,
+      value: 'Customers',
     },
     {
-      type: TabbingOrderTypes.BUTTON,
-      value: 'Linda Wolf',
+      type: TabbingOrderTypes.LINK,
+      value: 'Hide ASM',
     },
-  ],
-  asmWithSelectedUser: [
     {
       type: TabbingOrderTypes.BUTTON,
-      value: '',
     },
     {
       type: TabbingOrderTypes.BUTTON,
-      value: '',
     },
     {
       type: TabbingOrderTypes.FORM_FIELD,
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 4102c106dfd..0bf9029dc1e 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -32,6 +32,15 @@ import {
 } from './navigation';
 import { generateMail, randomString } from './user';
 
+export const invalidUser: SampleUser = {
+  firstName:
+    'JohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohnJohn',
+  lastName:
+    'SmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmithSmith',
+  email:
+    'john.smith.john.smith.john.smith.john.smith.john.smith.john.smith.john.smith.john.smith.john.smith@test.com',
+};
+
 const asmForB2CCustomer = 'aaron.customer@hybris.com';
 const asmForB2BCustomer = 'Gi Sun';
 
@@ -725,9 +734,9 @@ export function fillCreateCustomerForm({
 }: SampleUser) {
   cy.get('cx-asm-create-customer-form').should('be.visible');
   cy.get('cx-asm-create-customer-form').within(() => {
-    cy.get('[formcontrolname="firstName"]').type(firstName);
-    cy.get('[formcontrolname="lastName"]').type(lastName);
-    cy.get('[formcontrolname="email"]').type(email);
+    cy.get('[formcontrolname="firstName"]').clear().type(firstName);
+    cy.get('[formcontrolname="lastName"]').clear().type(lastName);
+    cy.get('[formcontrolname="email"]').clear().type(email);
   });
 }
 

From 773e5bc89023bf529db4c703b78ba24da36edc79 Mon Sep 17 00:00:00 2001
From: i333055 <lulu.ran@sap.com>
Date: Wed, 28 Jun 2023 15:08:10 +0800
Subject: [PATCH 058/122] fix/cherry pick CXSPA-3380 for develop 6.3 (#17570)

Co-authored-by: niehuayang <126219214+niehuayang@users.noreply.github.com>
---
 .../asm/assets/translations/en/asm.ts         |   9 +
 .../asm/components/asm-components.module.ts   |   9 +-
 .../asm-main-ui/asm-main-ui.component.spec.ts |  48 ++++-
 .../asm-main-ui/asm-main-ui.component.ts      |  32 +++-
 .../asm-switch-customer-dialog.component.html |  58 ++++++
 ...m-switch-customer-dialog.component.spec.ts | 113 ++++++++++++
 .../asm-switch-customer-dialog.component.ts   |  61 +++++++
 .../default-switch-customer-layout.config.ts  |  22 +++
 feature-libs/asm/components/public_api.ts     |   1 +
 .../asm/root/model/augmented-core.model.ts    |   1 +
 ..._asm-switch-customer-dialog.component.scss | 167 ++++++++++++++++++
 .../asm/styles/components/_index.scss         |   3 +
 .../core/facade/user-account.service.ts       |  20 ++-
 .../root/facade/user-account.facade.ts        |   7 +-
 14 files changed, 535 insertions(+), 16 deletions(-)
 create mode 100644 feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.html
 create mode 100644 feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
 create mode 100644 feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.ts
 create mode 100644 feature-libs/asm/components/default-switch-customer-layout.config.ts
 create mode 100644 feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 767f3388d69..000f9678367 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -111,6 +111,15 @@ export const asm = {
       searchBox: 'Search',
       enterSearchBox: 'Enter customer name or email',
     },
+    switchCustomer: {
+      dialog: {
+        title: 'Warning',
+        body: 'Clicking "Switch Customer" will end the emulation for "{{ customerA }}" and start for "{{ customerB }}". Any unsaved changes for "{{ customerA }}" will be lost.',
+        actions: {
+          switch: 'Switch Customer',
+        },
+      },
+    },
     saveCart: {
       saveCartBtn: 'Save for Later',
       dialog: {
diff --git a/feature-libs/asm/components/asm-components.module.ts b/feature-libs/asm/components/asm-components.module.ts
index f689c036b21..f4a600c25b9 100644
--- a/feature-libs/asm/components/asm-components.module.ts
+++ b/feature-libs/asm/components/asm-components.module.ts
@@ -19,10 +19,10 @@ import {
   KeyboardFocusModule,
   MessageComponentModule,
   NgSelectA11yModule,
+  PaginationModule,
   PasswordVisibilityToggleModule,
   SortingModule,
   SpinnerModule,
-  PaginationModule,
 } from '@spartacus/storefront';
 import { AsmBindCartDialogComponent } from './asm-bind-cart-dialog/asm-bind-cart-dialog.component';
 import { AsmBindCartComponent } from './asm-bind-cart/asm-bind-cart.component';
@@ -32,6 +32,7 @@ import { AsmMainUiComponent } from './asm-main-ui/asm-main-ui.component';
 import { AsmSaveCartDialogComponent } from './asm-save-cart-dialog/asm-save-cart-dialog.component';
 import { AsmSessionTimerComponent } from './asm-session-timer/asm-session-timer.component';
 import { FormatTimerPipe } from './asm-session-timer/format-timer.pipe';
+import { AsmSwitchCustomerDialogComponent } from './asm-switch-customer-dialog/asm-switch-customer-dialog.component';
 import { AsmToggleUiComponent } from './asm-toggle-ui/asm-toggle-ui.component';
 import { CSAgentLoginFormComponent } from './csagent-login-form/csagent-login-form.component';
 import { CustomerEmulationComponent } from './customer-emulation/customer-emulation.component';
@@ -39,10 +40,11 @@ import { CustomerListComponent } from './customer-list/customer-list.component';
 import { defaultCustomerListLayoutConfig } from './customer-list/default-customer-list-layout.config';
 import { CustomerSelectionComponent } from './customer-selection/customer-selection.component';
 import { defaultAsmLayoutConfig } from './default-asm-layout.config';
+import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
 import { defaultBindCartLayoutConfig } from './default-bind-cart-layout.config';
 import { defaultSaveCartLayoutConfig } from './default-save-cart-layout.config';
+import { defaultSwitchCustomerLayoutConfig } from './default-switch-customer-layout.config';
 import { DotSpinnerComponent } from './dot-spinner/dot-spinner.component';
-import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
 
 @NgModule({
   imports: [
@@ -74,6 +76,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
     CustomerEmulationComponent,
     AsmToggleUiComponent,
     AsmBindCartComponent,
+    AsmSwitchCustomerDialogComponent,
     DotSpinnerComponent,
     AsmCreateCustomerFormComponent,
   ],
@@ -89,6 +92,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
     CustomerEmulationComponent,
     AsmToggleUiComponent,
     AsmBindCartComponent,
+    AsmSwitchCustomerDialogComponent,
     DotSpinnerComponent,
     AsmCreateCustomerFormComponent,
   ],
@@ -96,6 +100,7 @@ import { defaultAsmPaginationConfig } from './default-asm-pagination.config';
     provideDefaultConfig(defaultAsmLayoutConfig),
     provideDefaultConfig(defaultBindCartLayoutConfig),
     provideDefaultConfig(defaultSaveCartLayoutConfig),
+    provideDefaultConfig(defaultSwitchCustomerLayoutConfig),
     provideDefaultConfig(defaultCustomerListLayoutConfig),
     provideDefaultConfig(defaultAsmPaginationConfig),
     provideDefaultConfig(defaultAsmCreateCustomerFormLayoutConfig),
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
index 3bbf4942ed1..2b709969ef3 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
@@ -49,7 +49,11 @@ class MockCsAgentAuthService implements Partial<CsAgentAuthService> {
 
 class MockUserAccountFacade implements Partial<UserAccountFacade> {
   get(): Observable<User> {
-    return of({});
+    return EMPTY;
+  }
+
+  getById(): Observable<User> {
+    return EMPTY;
   }
 }
 
@@ -452,18 +456,54 @@ describe('AsmMainUiComponent', () => {
     );
   });
 
-  it('should call logout when agent has logined and user is login if customerId shows in URL', () => {
+  it('should not display confirm switch dialog customer when agent has logined and customerId in deeplink is same', () => {
+    spyOn(csAgentAuthService, 'isCustomerSupportAgentLoggedIn').and.returnValue(
+      of(true)
+    );
+
+    spyOn(userAccountFacade, 'get').and.returnValue(
+      of({ customerId: 'testuser' })
+    );
+    spyOn(userAccountFacade, 'getById').and.returnValue(
+      of({ customerId: 'testuser' })
+    );
+    spyOn(authService, 'isUserLoggedIn').and.returnValue(of(true));
+    spyOn(asmComponentService, 'setEmulatedByDeepLink').and.stub();
+    spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
+      'testuser'
+    );
+
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
+
+    component.ngOnInit();
+    expect(asmComponentService.setEmulatedByDeepLink).toHaveBeenCalledWith(
+      true
+    );
+  });
+
+  it('should display confirm switch dialog customer when agent has logined and user is login if customerId shows in URL', () => {
     spyOn(csAgentAuthService, 'isCustomerSupportAgentLoggedIn').and.returnValue(
       of(true)
     );
     spyOn(authService, 'isUserLoggedIn').and.returnValue(of(true));
+    spyOn(asmComponentService, 'isEmulatedByDeepLink').and.returnValue(
+      new BehaviorSubject(false)
+    );
+
+    const oldUser = { customerId: 'olduser', name: 'Test old User' } as User;
+    const newUser = { customerId: 'newuser', name: 'Test new User' } as User;
+
+    spyOn(userAccountFacade, 'get').and.returnValue(of(oldUser));
+    spyOn(userAccountFacade, 'getById').and.returnValue(of(newUser));
+
     spyOn(asmComponentService, 'logoutCustomer').and.stub();
-    spyOn(asmComponentService, 'getSearchParameter').and.returnValue('anyId');
+    spyOn(launchDialogService, 'openDialogAndSubscribe').and.stub();
+    spyOn(asmComponentService, 'getSearchParameter').and.returnValue('newuser');
 
     spyOn(featureConfig, 'isLevel').and.returnValue(true);
 
     component.ngOnInit();
-    expect(asmComponentService.logoutCustomer).toHaveBeenCalledWith();
+    expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
   });
 
   it('should call startCustomerEmulationSession when agent has logined and user is not login if customerId shows in URL', (done) => {
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index 9595dc1029e..bdd26dac024 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -25,6 +25,7 @@ import {
   FeatureConfigService,
   GlobalMessageService,
   GlobalMessageType,
+  HttpErrorModel,
   RoutingService,
   User,
 } from '@spartacus/core';
@@ -207,7 +208,7 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
         ]).subscribe(([agentLoggedIn, userLoggedin, isEmulatedByDeepLink]) => {
           if (agentLoggedIn && parameters.customerId) {
             if (!isEmulatedByDeepLink && userLoggedin) {
-              this.asmComponentService.logoutCustomer();
+              this.confirmSwitchCustomer(parameters.customerId);
             } else {
               parameters.emulated = isEmulatedByDeepLink;
               setTimeout(() => this.startSessionWithParameters(parameters));
@@ -218,6 +219,35 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     }
   }
 
+  protected confirmSwitchCustomer(switchCustomerId: string): void {
+    this.customer$
+      .pipe(
+        filter((curCustomer) => !!curCustomer),
+        take(1)
+      )
+      .subscribe((curCustomer) => {
+        if (curCustomer?.customerId !== switchCustomerId) {
+          this.userAccountFacade.getById(switchCustomerId).subscribe({
+            next: (switchCustomer) => {
+              this.launchDialogService.openDialogAndSubscribe(
+                LAUNCH_CALLER.ASM_SWITCH_CUSTOMER,
+                this.element,
+                { curCustomer: curCustomer, switchCustomer: switchCustomer }
+              );
+            },
+            error: (error: HttpErrorModel) => {
+              this.globalMessageService.add(
+                error.details?.[0].message ?? '',
+                GlobalMessageType.MSG_TYPE_ERROR
+              );
+            },
+          });
+        } else {
+          this.asmComponentService.setEmulatedByDeepLink(true);
+        }
+      });
+  }
+
   /**
    * If url contains customerId and we haven't emulatedFromURL, we'll change the isEmulatedByDeepLink flag and
    * start emulate customer in URL.
diff --git a/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.html b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.html
new file mode 100644
index 00000000000..d33551d24e3
--- /dev/null
+++ b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.html
@@ -0,0 +1,58 @@
+<div
+  class="cx-asm-switch-customer-dialog cx-modal-container cx-asm-dialog"
+  [cxFocus]="focusConfig"
+  (esc)="closeModal(SWITCH_CUSTOMER_DIALOG_ACTION.CANCEL)"
+>
+  <div class="cx-modal-content">
+    <!-- Modal Header -->
+    <div class="cx-dialog-header modal-header">
+      <div>
+        <span>
+          <cx-icon type="WARNING"></cx-icon>
+        </span>
+        <span id="asm-switch-customer-dialog-title" class="title modal-title">
+          {{ 'asm.switchCustomer.dialog.title' | cxTranslate }}
+        </span>
+      </div>
+    </div>
+
+    <!-- Modal Body -->
+    <div class="cx-dialog-body modal-body">
+      <div class="cx-dialog-row switch-customer-content">
+        <div class="cx-dialog-item">
+          {{
+            'asm.switchCustomer.dialog.body'
+              | cxTranslate
+                : {
+                    customerA: curCustomerName,
+                    customerB: switchCustomerName
+                  }
+          }}
+        </div>
+      </div>
+    </div>
+
+    <!-- Modal Footer -->
+    <div class="cx-dialog-footer modal-footer">
+      <button
+        (click)="closeModal(SWITCH_CUSTOMER_DIALOG_ACTION.SWITCH)"
+        [attr.aria-label]="
+          'asm.switchCustomer.dialog.actions.switch' | cxTranslate
+        "
+        class="btn btn-primary"
+        type="button"
+      >
+        {{ 'asm.switchCustomer.dialog.actions.switch' | cxTranslate }}
+      </button>
+
+      <button
+        (click)="closeModal(SWITCH_CUSTOMER_DIALOG_ACTION.CANCEL)"
+        [attr.aria-label]="'common.cancel' | cxTranslate"
+        class="btn btn-secondary"
+        type="button"
+      >
+        {{ 'common.cancel' | cxTranslate }}
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
new file mode 100644
index 00000000000..8a840b1b7ae
--- /dev/null
+++ b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
@@ -0,0 +1,113 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { CsAgentAuthService } from '@spartacus/asm/root';
+import { AuthService } from '@spartacus/core';
+import { LaunchDialogService } from '@spartacus/storefront';
+import { Observable, of } from 'rxjs';
+import { AsmComponentService } from '../services';
+import {
+  AsmSwitchCustomerDialogComponent,
+  SwitchCustomerData,
+  SWITCH_CUSTOMER_DIALOG_ACTION,
+} from './asm-switch-customer-dialog.component';
+
+@Pipe({
+  name: 'cxTranslate',
+})
+class MockTranslatePipe implements PipeTransform {
+  transform(): any {}
+}
+
+class MockLaunchDialogService implements Partial<LaunchDialogService> {
+  get data$(): Observable<SwitchCustomerData> {
+    return of({
+      curCustomer: { customerId: '00000001' },
+      switchCustomer: { customerId: '00000002' },
+    });
+  }
+  closeDialog(_reason: any) {}
+}
+
+class MockAsmComponentService extends AsmComponentService {
+  logoutCustomer() {}
+}
+
+class MockAuthService implements Partial<AuthService> {
+  isUserLoggedIn(): Observable<boolean> {
+    return of(false);
+  }
+}
+
+class MockCsAgentAuthService implements Partial<CsAgentAuthService> {
+  authorizeCustomerSupportAgent(): Promise<void> {
+    return Promise.resolve();
+  }
+  isCustomerSupportAgentLoggedIn(): Observable<boolean> {
+    return of(false);
+  }
+  getCustomerSupportAgentTokenLoading(): Observable<boolean> {
+    return of(false);
+  }
+  startCustomerEmulationSession(_customerId: string) {}
+}
+
+describe('AsmBindCartDialogComponent', () => {
+  let component: AsmSwitchCustomerDialogComponent;
+  let fixture: ComponentFixture<AsmSwitchCustomerDialogComponent>;
+
+  let launchDialogService: LaunchDialogService;
+  let asmComponentService: AsmComponentService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AsmSwitchCustomerDialogComponent, MockTranslatePipe],
+      providers: [
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: AsmComponentService, useClass: MockAsmComponentService },
+        { provide: AuthService, useClass: MockAuthService },
+        { provide: CsAgentAuthService, useClass: MockCsAgentAuthService },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AsmSwitchCustomerDialogComponent);
+    component = fixture.componentInstance;
+
+    launchDialogService = TestBed.inject(LaunchDialogService);
+    asmComponentService = TestBed.inject(AsmComponentService);
+
+    spyOn(launchDialogService, 'closeDialog').and.stub();
+    spyOn(asmComponentService, 'logoutCustomer').and.stub();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should close with replace action when replace button is clicked', () => {
+    fixture.detectChanges();
+
+    fixture.debugElement
+      .query(By.css('.btn-primary'))
+      .triggerEventHandler('click');
+
+    expect(launchDialogService.closeDialog).toHaveBeenCalledWith(
+      SWITCH_CUSTOMER_DIALOG_ACTION.SWITCH
+    );
+    expect(asmComponentService.logoutCustomer).toHaveBeenCalled();
+  });
+
+  it('should close with cancel action when cancel button is clicked', () => {
+    fixture.detectChanges();
+
+    fixture.debugElement
+      .query(By.css('.btn-secondary'))
+      .triggerEventHandler('click');
+
+    expect(launchDialogService.closeDialog).toHaveBeenCalledWith(
+      SWITCH_CUSTOMER_DIALOG_ACTION.CANCEL
+    );
+  });
+});
diff --git a/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.ts b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.ts
new file mode 100644
index 00000000000..d7a095cc71a
--- /dev/null
+++ b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.ts
@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { User } from '@spartacus/core';
+import { FocusConfig, LaunchDialogService } from '@spartacus/storefront';
+import { take } from 'rxjs/operators';
+import { AsmComponentService } from '../services';
+
+export enum SWITCH_CUSTOMER_DIALOG_ACTION {
+  CANCEL = 'CANCEL',
+  SWITCH = 'SWITCH',
+}
+
+export interface SwitchCustomerData {
+  curCustomer: User;
+  switchCustomer: User;
+}
+
+@Component({
+  selector: 'cx-asm-switch-customer-dialog',
+  templateUrl: './asm-switch-customer-dialog.component.html',
+})
+export class AsmSwitchCustomerDialogComponent implements OnInit {
+  SWITCH_CUSTOMER_DIALOG_ACTION = SWITCH_CUSTOMER_DIALOG_ACTION;
+
+  focusConfig: FocusConfig = {
+    trap: true,
+    block: true,
+    autofocus: true,
+    focusOnEscape: true,
+  };
+
+  curCustomerName: string;
+  switchCustomerName: string;
+  iconTypes: any;
+
+  constructor(
+    protected launchDialogService: LaunchDialogService,
+    protected asmComponentService: AsmComponentService
+  ) {}
+
+  ngOnInit(): void {
+    this.launchDialogService.data$
+      .pipe(take(1))
+      .subscribe((data: SwitchCustomerData) => {
+        this.curCustomerName = data.curCustomer.name || '';
+        this.switchCustomerName = data.switchCustomer.name || '';
+      });
+  }
+
+  closeModal(reason: SWITCH_CUSTOMER_DIALOG_ACTION): void {
+    if (reason === SWITCH_CUSTOMER_DIALOG_ACTION.SWITCH) {
+      this.asmComponentService.logoutCustomer();
+    }
+    this.launchDialogService.closeDialog(reason);
+  }
+}
diff --git a/feature-libs/asm/components/default-switch-customer-layout.config.ts b/feature-libs/asm/components/default-switch-customer-layout.config.ts
new file mode 100644
index 00000000000..2e2a56c87c9
--- /dev/null
+++ b/feature-libs/asm/components/default-switch-customer-layout.config.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  DIALOG_TYPE,
+  LAUNCH_CALLER,
+  LayoutConfig,
+} from '@spartacus/storefront';
+import { AsmSwitchCustomerDialogComponent } from './asm-switch-customer-dialog/asm-switch-customer-dialog.component';
+
+export const defaultSwitchCustomerLayoutConfig: LayoutConfig = {
+  launch: {
+    [LAUNCH_CALLER.ASM_SWITCH_CUSTOMER]: {
+      inlineRoot: true,
+      component: AsmSwitchCustomerDialogComponent,
+      dialogType: DIALOG_TYPE.DIALOG,
+    },
+  },
+};
diff --git a/feature-libs/asm/components/public_api.ts b/feature-libs/asm/components/public_api.ts
index 22ae908488a..a055b6f2167 100644
--- a/feature-libs/asm/components/public_api.ts
+++ b/feature-libs/asm/components/public_api.ts
@@ -12,6 +12,7 @@ export * from './asm-main-ui/asm-main-ui.component';
 export * from './asm-save-cart-dialog/asm-save-cart-dialog.component';
 export * from './asm-session-timer/asm-session-timer.component';
 export * from './asm-session-timer/format-timer.pipe';
+export * from './asm-switch-customer-dialog/asm-switch-customer-dialog.component';
 export * from './asm-toggle-ui/asm-toggle-ui.component';
 export * from './csagent-login-form/csagent-login-form.component';
 export * from './customer-emulation/customer-emulation.component';
diff --git a/feature-libs/asm/root/model/augmented-core.model.ts b/feature-libs/asm/root/model/augmented-core.model.ts
index 3ae76e4ce84..cfad7eee841 100644
--- a/feature-libs/asm/root/model/augmented-core.model.ts
+++ b/feature-libs/asm/root/model/augmented-core.model.ts
@@ -11,6 +11,7 @@ declare module '@spartacus/storefront' {
     ASM_CUSTOMER_LIST = 'ASM_CUSTOMER_LIST',
     ASM_BIND_CART = 'ASM_BIND_CART',
     ASM_SAVE_CART = 'ASM_SAVE_CART',
+    ASM_SWITCH_CUSTOMER = 'ASM_SWITCH_CUSTOMER',
     ASM_CREATE_CUSTOMER_FORM = 'ASM_CREATE_CUSTOMER_FORM',
   }
 }
diff --git a/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss b/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss
new file mode 100644
index 00000000000..843a0d58552
--- /dev/null
+++ b/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss
@@ -0,0 +1,167 @@
+$sapFiori_Button_Standard_TextColor: #1d2d3e;
+$sapFiori_Button_Standard_Background: #eaecee;
+$sapFiori_Button_Standard_BorderColor: transparent;
+$sapFiori_Button_Standard_Hover_TextColor: #1d2d3e;
+$sapFiori_Button_Standard_Hover_Background: #ffffff;
+$sapFiori_Button_Standard_Hover_BorderColor: transparent;
+$sapFiori_Button_Standard_Active_TextColor: #0070f2;
+$sapFiori_Button_Standard_Active_Background: #ffffff;
+$sapFiori_Button_Standard_Active_BorderColor: #0070f2;
+
+$sapFiori_Button_Lite_TextColor: #0064d9;
+$sapFiori_Button_Lite_Hover_Background: #ffffff;
+$sapFiori_Button_Lite_Active_Background: #ffffff;
+$sapFiori_Button_Lite_Active_TextColor: #0070f2;
+$sapFiori_Button_Lite_Active_BorderColor: #0070f2;
+
+$sapFiori_Button_Emphasized_TextColor: #ffffff;
+$sapFiori_Button_Emphasized_Background: #0070f2;
+$sapFiori_Button_Emphasized_BorderColor: transparent;
+$sapFiori_Button_Emphasized_Hover_Background: #0064d9;
+$sapFiori_Button_Emphasized_Hover_BorderColor: transparent;
+$sapFiori_Button_Emphasized_Active_TextColor: #0070f2;
+$sapFiori_Button_Emphasized_Active_Background: #ffffff;
+$sapFiori_Button_Emphasized_Active_BorderColor: #0070f2;
+
+%cx-asm-switch-customer-dialog {
+  .cx-modal-content {
+    max-width: 477px;
+    margin-inline-start: auto;
+    margin-inline-end: auto;
+  }
+
+  .cx-dialog-header {
+    padding-top: 0.9rem;
+    padding-inline-end: 1rem;
+    padding-bottom: 0.9rem;
+    padding-inline-start: 1rem;
+    border-width: 0;
+    display: flex;
+
+    box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.16), inset 0px -1px 0px #d9d9d9;
+
+    .title {
+      font-family: '72';
+      font-style: normal;
+      font-weight: 700;
+      font-size: 16px;
+      line-height: 18px;
+    }
+
+    .cx-icon {
+      color: #e76500;
+    }
+
+    .close {
+      font-size: 1rem;
+      color: $sapFiori_Button_Standard_TextColor;
+    }
+  }
+
+  .cx-dialog-body::before {
+    content: '';
+    display: block;
+    width: 100%;
+    height: 1px;
+    background-color: #dd6100;
+  }
+
+  .modal-body {
+    padding: 0;
+  }
+
+  .cx-dialog-body {
+    .switch-customer-content {
+      padding: 16px;
+      font-family: '72';
+      font-style: normal;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 21px;
+    }
+  }
+
+  .cx-dialog-footer {
+    padding-top: 0;
+    padding-inline-end: 1rem;
+    padding-bottom: 0;
+    padding-inline-start: 1rem;
+  }
+
+  .btn {
+    color: $sapFiori_Button_Standard_TextColor;
+    transition: opacity 0.3s;
+    font-size: 14px;
+    padding-top: 0;
+    padding-bottom: 0;
+    padding-inline-start: 10px;
+    padding-inline-end: 10px;
+    min-width: 48px;
+    min-height: 36px;
+    line-height: 1.34;
+    border-radius: 8px;
+    border: 1px solid transparent;
+    font-weight: 600;
+
+    &:hover,
+    &:focus {
+      box-shadow: 0px 0px 4px rgba(120, 143, 166, 0.52);
+      background-color: $sapFiori_Button_Lite_Hover_Background;
+      filter: none;
+    }
+
+    &:not(:disabled):not(.disabled):active,
+    &:not(:disabled):not(.disabled).active {
+      color: $sapFiori_Button_Lite_Active_TextColor;
+      background-color: $sapFiori_Button_Lite_Active_Background;
+      border-color: $sapFiori_Button_Lite_Active_BorderColor;
+      filter: none;
+    }
+
+    &-primary {
+      color: $sapFiori_Button_Emphasized_TextColor;
+      border-color: $sapFiori_Button_Emphasized_BorderColor;
+      background-color: $sapFiori_Button_Emphasized_Background;
+      font-weight: 700;
+
+      &:hover,
+      &:focus {
+        background-color: $sapFiori_Button_Emphasized_Hover_Background;
+        border-color: $sapFiori_Button_Emphasized_Hover_BorderColor;
+        box-shadow: none;
+        filter: none;
+      }
+
+      &:not(:disabled):not(.disabled):active,
+      &:not(:disabled):not(.disabled).active {
+        color: $sapFiori_Button_Emphasized_Active_TextColor;
+        background-color: $sapFiori_Button_Emphasized_Active_Background;
+        border-color: $sapFiori_Button_Emphasized_Active_BorderColor;
+        filter: none;
+      }
+    }
+
+    &-secondary {
+      color: $sapFiori_Button_Standard_TextColor;
+      border-color: $sapFiori_Button_Standard_BorderColor;
+      background-color: $sapFiori_Button_Standard_Background;
+
+      &:hover,
+      &:focus {
+        color: $sapFiori_Button_Standard_Hover_TextColor;
+        background-color: $sapFiori_Button_Standard_Hover_Background;
+        border-color: $sapFiori_Button_Standard_Hover_BorderColor;
+        box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.72);
+        filter: none;
+      }
+
+      &:not(:disabled):not(.disabled):active,
+      &:not(:disabled):not(.disabled).active {
+        color: $sapFiori_Button_Standard_Active_TextColor;
+        background-color: $sapFiori_Button_Standard_Active_Background;
+        border-color: $sapFiori_Button_Standard_Active_BorderColor;
+        filter: none;
+      }
+    }
+  }
+}
diff --git a/feature-libs/asm/styles/components/_index.scss b/feature-libs/asm/styles/components/_index.scss
index 649b8d03e09..9d691b99a98 100644
--- a/feature-libs/asm/styles/components/_index.scss
+++ b/feature-libs/asm/styles/components/_index.scss
@@ -1,5 +1,6 @@
 @import './_asm-bind-cart-dialog.component.scss';
 @import './_asm-save-cart-dialog.component.scss';
+@import './_asm-switch-customer-dialog.component.scss';
 @import './_asm-main-ui.component.scss';
 @import './_asm-session-timer.component.scss';
 @import './_asm-toggle-ui.component.scss';
@@ -13,6 +14,8 @@
 
 $asm-components-allowlist: cx-asm-main-ui, cx-asm-session-timer,
   cx-asm-bind-cart, cx-asm-bind-cart-dialog, cx-asm-save-cart-dialog,
+  cx-asm-switch-customer-dialog, cx-asm-toggle-ui, cx-csagent-login-form,
+  cx-customer-emulation, cx-customer-selection, cx-dot-spinner, cx-customer-list,
   cx-asm-toggle-ui, cx-csagent-login-form, cx-customer-emulation,
   cx-customer-selection, cx-dot-spinner, cx-customer-list,
   cx-asm-create-customer-form !default;
diff --git a/feature-libs/user/account/core/facade/user-account.service.ts b/feature-libs/user/account/core/facade/user-account.service.ts
index d4a862997e4..b32e159c7cb 100644
--- a/feature-libs/user/account/core/facade/user-account.service.ts
+++ b/feature-libs/user/account/core/facade/user-account.service.ts
@@ -5,12 +5,6 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import {
-  User,
-  UserAccountChangedEvent,
-  UserAccountFacade,
-} from '@spartacus/user/account/root';
 import {
   LoginEvent,
   LogoutEvent,
@@ -18,6 +12,12 @@ import {
   QueryService,
   UserIdService,
 } from '@spartacus/core';
+import {
+  User,
+  UserAccountChangedEvent,
+  UserAccountFacade,
+} from '@spartacus/user/account/root';
+import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { UserAccountConnector } from '../connectors/user-account.connector';
 
@@ -40,6 +40,14 @@ export class UserAccountService implements UserAccountFacade {
     protected query: QueryService
   ) {}
 
+  /**
+   * Returns the user according the userId
+   * no use query for userId can change every time
+   */
+  getById(userId: string): Observable<User | undefined> {
+    return this.userAccountConnector.get(userId);
+  }
+
   /**
    * Returns the current user.
    */
diff --git a/feature-libs/user/account/root/facade/user-account.facade.ts b/feature-libs/user/account/root/facade/user-account.facade.ts
index 7cbbf6231ce..e1865cd457b 100644
--- a/feature-libs/user/account/root/facade/user-account.facade.ts
+++ b/feature-libs/user/account/root/facade/user-account.facade.ts
@@ -5,10 +5,10 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { User } from '../model/user.model';
 import { facadeFactory } from '@spartacus/core';
+import { Observable } from 'rxjs';
 import { USER_ACCOUNT_CORE_FEATURE } from '../feature-name';
+import { User } from '../model/user.model';
 
 @Injectable({
   providedIn: 'root',
@@ -16,9 +16,10 @@ import { USER_ACCOUNT_CORE_FEATURE } from '../feature-name';
     facadeFactory({
       facade: UserAccountFacade,
       feature: USER_ACCOUNT_CORE_FEATURE,
-      methods: ['get'],
+      methods: ['get', 'getById'],
     }),
 })
 export abstract class UserAccountFacade {
   abstract get(): Observable<User | undefined>;
+  abstract getById(userId: string): Observable<User | undefined>;
 }

From bda6c64db3b48e2372d0c202054cd1113929908d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Wed, 28 Jun 2023 16:02:05 +0200
Subject: [PATCH 059/122] [6.3 backport] chore: CXSPA-3794 - SSR contextual
 logging extensibility (#17587)

---
 .../default-express-server-logger.spec.ts     | 48 +++++++++++----
 .../loggers/default-express-server-logger.ts  | 59 +++++++++++++------
 .../logger/loggers/express-server-logger.ts   |  4 +-
 .../optimized-engine/optimized-ssr-engine.ts  |  4 +-
 4 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
index 9f6bd811167..52f8ce642f7 100644
--- a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.spec.ts
@@ -1,7 +1,6 @@
 import * as angularCore from '@angular/core';
 import { Request } from 'express';
 import { DefaultExpressServerLogger } from './default-express-server-logger';
-import { ExpressServerLoggerContext } from './express-server-logger';
 
 const request = {
   originalUrl: 'test',
@@ -33,7 +32,7 @@ describe('DefaultExpressServerLogger', () => {
       logger.log('test', { request: {} as Request });
 
       expect(logSpy).toHaveBeenCalledWith(
-        logger['createLogMessage']('test', { request: {} as Request })
+        logger['stringifyWithContext']('test', { request: {} as Request })
       );
     });
 
@@ -43,7 +42,7 @@ describe('DefaultExpressServerLogger', () => {
       logger.warn('test', { request: {} as Request });
 
       expect(warnSpy).toHaveBeenCalledWith(
-        logger['createLogMessage']('test', { request: {} as Request })
+        logger['stringifyWithContext']('test', { request: {} as Request })
       );
     });
 
@@ -55,7 +54,7 @@ describe('DefaultExpressServerLogger', () => {
       logger.error('test', { request: {} as Request });
 
       expect(errorSpy).toHaveBeenCalledWith(
-        logger['createLogMessage']('test', { request: {} as Request })
+        logger['stringifyWithContext']('test', { request: {} as Request })
       );
     });
 
@@ -65,7 +64,7 @@ describe('DefaultExpressServerLogger', () => {
       logger.info('test', { request: {} as Request });
 
       expect(infoSpy).toHaveBeenCalledWith(
-        logger['createLogMessage']('test', { request: {} as Request })
+        logger['stringifyWithContext']('test', { request: {} as Request })
       );
     });
 
@@ -77,7 +76,7 @@ describe('DefaultExpressServerLogger', () => {
       logger.debug('test', { request: {} as Request });
 
       expect(debugSpy).toHaveBeenCalledWith(
-        logger['createLogMessage']('test', { request: {} as Request })
+        logger['stringifyWithContext']('test', { request: {} as Request })
       );
     });
 
@@ -297,16 +296,13 @@ describe('DefaultExpressServerLogger', () => {
 
   describe('create log message', () => {
     it('should return message without request', () => {
-      const logMessage = logger['createLogMessage'](
-        'test',
-        {} as ExpressServerLoggerContext
-      );
+      const logMessage = logger['stringifyWithContext']('test', {});
 
       expect(logMessage).not.toContain('request');
     });
 
     it('should return message with request', () => {
-      const logMessage = logger['createLogMessage']('test', {
+      const logMessage = logger['stringifyWithContext']('test', {
         request: {} as Request,
       });
 
@@ -314,6 +310,36 @@ describe('DefaultExpressServerLogger', () => {
     });
   });
 
+  describe('map context', () => {
+    it('should return context without request', () => {
+      const context = logger['mapContext']({
+        options: {},
+      });
+
+      expect(context).toMatchInlineSnapshot(`
+        {
+          "options": {},
+          "timestamp": "2023-05-26T00:00:00.000Z",
+        }
+      `);
+    });
+
+    it('should return context with request', () => {
+      const context = logger['mapContext']({ request });
+
+      expect(context).toMatchInlineSnapshot(`
+        {
+          "request": {
+            "timeReceived": 2023-05-26T00:00:00.000Z,
+            "url": "test",
+            "uuid": "test",
+          },
+          "timestamp": "2023-05-26T00:00:00.000Z",
+        }
+      `);
+    });
+  });
+
   describe('map request', () => {
     it('should return mapped request', () => {
       const request = {
diff --git a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
index 73d3ad0fcba..d6b7fc82b2f 100644
--- a/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
+++ b/core-libs/setup/ssr/logger/loggers/default-express-server-logger.ts
@@ -20,48 +20,73 @@ import {
 export class DefaultExpressServerLogger implements ExpressServerLogger {
   log(message: string, context: ExpressServerLoggerContext): void {
     /* eslint-disable-next-line no-console */
-    console.log(this.createLogMessage(message, context));
+    console.log(this.stringifyWithContext(message, context));
   }
   warn(message: string, context: ExpressServerLoggerContext): void {
     /* eslint-disable-next-line no-console */
-    console.warn(this.createLogMessage(message, context));
+    console.warn(this.stringifyWithContext(message, context));
   }
   error(message: string, context: ExpressServerLoggerContext): void {
     /* eslint-disable-next-line no-console */
-    console.error(this.createLogMessage(message, context));
+    console.error(this.stringifyWithContext(message, context));
   }
   info(message: string, context: ExpressServerLoggerContext): void {
     /* eslint-disable-next-line no-console */
-    console.info(this.createLogMessage(message, context));
+    console.info(this.stringifyWithContext(message, context));
   }
   debug(message: string, context: ExpressServerLoggerContext): void {
     /* eslint-disable-next-line no-console */
-    console.debug(this.createLogMessage(message, context));
+    console.debug(this.stringifyWithContext(message, context));
   }
 
-  protected createLogMessage(
+  /**
+   * Converts a message and an ExpressServerLoggerContext object into a single JSON string containing both pieces of information, which can be used for logging purposes.
+   *
+   * @protected
+   * @param message - The message to be included in the log entry.
+   * @param context - The context object associated with the log entry.
+   * @returns A JSON string containing both the message and context information, suitable for logging.
+   */
+  protected stringifyWithContext(
     message: string,
     context: ExpressServerLoggerContext
   ): string {
+    const logObject = { message, context: this.mapContext(context) };
+
+    return isDevMode()
+      ? JSON.stringify(logObject, null, 2)
+      : JSON.stringify(logObject);
+  }
+
+  /**
+   * Map the context for the ExpressServerLogger
+   *
+   * @protected
+   * @param context - The logging context object to be mapped
+   * @returns - The mapped context with timestamp and request (if available)
+   */
+  protected mapContext(
+    context: ExpressServerLoggerContext
+  ): Record<string, any> {
     const timestamp = new Date().toISOString();
-    const object = {
-      message,
-      context: {
-        timestamp,
-        ...context,
-      },
-    };
+    const outputContext = { timestamp, ...context };
+
     if (context.request) {
-      Object.assign(object.context, {
+      Object.assign(outputContext, {
         request: this.mapRequest(context.request),
       });
     }
 
-    return isDevMode()
-      ? JSON.stringify(object, null, 2)
-      : JSON.stringify(object);
+    return outputContext;
   }
 
+  /**
+   * Maps a Request object into a JavaScript object with specific properties.
+   *
+   * @protected
+   * @param request - An Express Request object.
+   * @returns - A mapped request object. By default, it contains only "url", a random "uuid" and "timeReceived" of the request.
+   */
   protected mapRequest(request: Request): Record<string, any> {
     return {
       url: request.originalUrl,
diff --git a/core-libs/setup/ssr/logger/loggers/express-server-logger.ts b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
index 54e789000f2..5cff6937dd3 100644
--- a/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
+++ b/core-libs/setup/ssr/logger/loggers/express-server-logger.ts
@@ -9,10 +9,10 @@ import { Request } from 'express';
 
 /**
  * ExpressServerLoggerContext is used for log message in server side rendering.
- * It contains request object and additional properties that can be used in log message.
+ * It contains optional request object and additional properties that can be used in log message.
  */
 export interface ExpressServerLoggerContext {
-  request: Request;
+  request?: Request;
   [_key: string]: any;
 }
 
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
index 5a3afc3f442..8faa7c2f275 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
@@ -95,7 +95,7 @@ export class OptimizedSsrEngine {
     if (this.ssrOptions.logger) {
       this.log(`[spartacus] SSR optimization engine initialized`, true, {
         options: loggableSsrOptions,
-      } as unknown as ExpressServerLoggerContext); //it expects ExpressServerLoggerContext, but the current logged message is printed at the start of the server and there is no request available yet.
+      });
     } else {
       const stringifiedOptions = JSON.stringify(loggableSsrOptions, null, 2);
       this.log(
@@ -335,7 +335,7 @@ export class OptimizedSsrEngine {
     context?: ExpressServerLoggerContext
   ): void {
     if (debug || this.ssrOptions?.debug) {
-      this.logger.log(message, context || ({} as ExpressServerLoggerContext));
+      this.logger.log(message, context || {});
     }
   }
 

From f119889acc7938ec1d4bfb1de9df1182f0ea8dd6 Mon Sep 17 00:00:00 2001
From: LarisaStar <61147963+Larisa-Staroverova@users.noreply.github.com>
Date: Fri, 30 Jun 2023 15:21:25 +0200
Subject: [PATCH 060/122] fix: Wrong configuration display call (after update)
 for CPQ product w/o groups/tabs (#17247)

Wrong configuration display call (after update) for CPQ product w/o groups/tabs

Closes CXSPA-3059
---
 .../cpq/rest/converters/cpq-configurator-normalizer.spec.ts   | 3 ++-
 .../cpq/rest/converters/cpq-configurator-normalizer.ts        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
index b43464fcdde..ddd6ea81e49 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
@@ -727,6 +727,7 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(group.attributes?.length).toBe(1);
       if (group.attributes) {
         expect(group.attributes[0].attrCode).toBe(cpqAttributeStdAttrCode);
+        expect(group.attributes[0].groupId).toBe(cpqGroupId.toString());
       } else {
         fail();
       }
@@ -746,7 +747,7 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(groups.length).toBe(1);
       expect(flatGroups.length).toBe(1);
       const group: Configurator.Group = groups[0];
-      expect(group.id).toBe('0');
+      expect(group.id).toBe('1');
       expect(group.name).toBe('_GEN');
       expect(group.description).toBe('General');
       expect(group.configurable).toBe(true);
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
index e0c5ce76172..d669b7a58e1 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
@@ -132,10 +132,10 @@ export class CpqConfiguratorNormalizer
   ) {
     const attributes: Configurator.Attribute[] = [];
     sourceAttributes.forEach((sourceAttribute) =>
-      this.convertAttribute(sourceAttribute, 0, currency, attributes)
+      this.convertAttribute(sourceAttribute, 1, currency, attributes)
     );
     const group: Configurator.Group = {
-      id: '0',
+      id: '1',
       name: '_GEN',
       configurable: true,
       complete: incompleteAttributes.length === 0,

From 513887fa5512621a9125a16379e023336ae02fbf Mon Sep 17 00:00:00 2001
From: Radhep Sabapathipillai <34665674+RadhepS@users.noreply.github.com>
Date: Wed, 5 Jul 2023 15:35:35 -0400
Subject: [PATCH 061/122] fix: include PDF and Video modules to schematics for
 Spartacus installations

Fix installation script to include PDF and Video modules for schematics
closes: https://jira.tools.sap/browse/CXSPA-3888
---
 .../schematics/src/add-spartacus/spartacus-features.ts    | 4 ++++
 .../src/wrapper-module/__snapshots__/index_spec.ts.snap   | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/projects/schematics/src/add-spartacus/spartacus-features.ts b/projects/schematics/src/add-spartacus/spartacus-features.ts
index 04be144185d..140d4df5760 100644
--- a/projects/schematics/src/add-spartacus/spartacus-features.ts
+++ b/projects/schematics/src/add-spartacus/spartacus-features.ts
@@ -93,6 +93,8 @@ function configureSpartacusModules(
         'BreadcrumbModule,',
         'ScrollToTopModule,',
         'PageTitleModule',
+        'VideoModule',
+        'PDFModule',
       ].forEach((content) => {
         addModuleImport(sourceFile, {
           import: [
@@ -112,6 +114,8 @@ function configureSpartacusModules(
                 'BreadcrumbModule',
                 'ScrollToTopModule',
                 'PageTitleModule',
+                'VideoModule',
+                'PDFModule',
               ],
             },
           ],
diff --git a/projects/schematics/src/wrapper-module/__snapshots__/index_spec.ts.snap b/projects/schematics/src/wrapper-module/__snapshots__/index_spec.ts.snap
index 41ee8a02431..6ad52a46944 100644
--- a/projects/schematics/src/wrapper-module/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/wrapper-module/__snapshots__/index_spec.ts.snap
@@ -69,7 +69,7 @@ export class CheckoutWrapperModule {
 exports[`Spartacus Wrapper Module Schematics: ng g @spartacus/schematics:wrapper-module Checkout and DP Should order the imports in the wrapper and Spartacus features modules 1`] = `
 "import { NgModule } from '@angular/core';
 import { AnonymousConsentsModule, AuthModule, CostCenterOccModule, ExternalRoutesModule, ProductModule, ProductOccModule, UserModule, UserOccModule } from "@spartacus/core";
-import { AddressBookModule, AnonymousConsentManagementBannerModule, AnonymousConsentsDialogModule, BannerCarouselModule, BannerModule, BreadcrumbModule, CategoryNavigationModule, CmsParagraphModule, ConsentManagementModule, FooterNavigationModule, HamburgerMenuModule, HomePageEventModule, LinkModule, LoginRouteModule, LogoutModule, MyCouponsModule, MyInterestsModule, NavigationEventModule, NavigationModule, NotificationPreferenceModule, PageTitleModule, PaymentMethodsModule, ProductCarouselModule, ProductDetailsPageModule, ProductFacetNavigationModule, ProductImagesModule, ProductIntroModule, ProductListingPageModule, ProductListModule, ProductPageEventModule, ProductReferencesModule, ProductSummaryModule, ProductTabsModule, ScrollToTopModule, SearchBoxModule, SiteContextSelectorModule, StockNotificationModule, TabParagraphContainerModule } from "@spartacus/storefront";
+import { AddressBookModule, AnonymousConsentManagementBannerModule, AnonymousConsentsDialogModule, BannerCarouselModule, BannerModule, BreadcrumbModule, CategoryNavigationModule, CmsParagraphModule, ConsentManagementModule, FooterNavigationModule, HamburgerMenuModule, HomePageEventModule, LinkModule, LoginRouteModule, LogoutModule, MyCouponsModule, MyInterestsModule, NavigationEventModule, NavigationModule, NotificationPreferenceModule, PageTitleModule, PaymentMethodsModule, PDFModule, ProductCarouselModule, ProductDetailsPageModule, ProductFacetNavigationModule, ProductImagesModule, ProductIntroModule, ProductListingPageModule, ProductListModule, ProductPageEventModule, ProductReferencesModule, ProductSummaryModule, ProductTabsModule, ScrollToTopModule, SearchBoxModule, SiteContextSelectorModule, StockNotificationModule, TabParagraphContainerModule, VideoModule } from "@spartacus/storefront";
 import { UserFeatureModule } from './features/user/user-feature.module';
 import { CartBaseFeatureModule } from './features/cart/cart-base-feature.module';
 import { OrderFeatureModule } from './features/order/order-feature.module';
@@ -94,6 +94,8 @@ import { DigitalPaymentsFeatureModule } from './features/digital-payments/digita
         BreadcrumbModule,
         ScrollToTopModule,
         PageTitleModule,
+        VideoModule,
+        PDFModule,
         UserModule,
         UserOccModule,
         AddressBookModule,
@@ -452,7 +454,7 @@ exports[`Spartacus Wrapper Module Schematics: ng g @spartacus/schematics:wrapper
 import { CheckoutModule } from "@spartacus/checkout/base";
 import { AnonymousConsentsModule, AuthModule, CostCenterOccModule, ExternalRoutesModule, ProductModule, ProductOccModule, UserModule, UserOccModule } from "@spartacus/core";
 import { DigitalPaymentsModule } from "@spartacus/digital-payments";
-import { AddressBookModule, AnonymousConsentManagementBannerModule, AnonymousConsentsDialogModule, BannerCarouselModule, BannerModule, BreadcrumbModule, CategoryNavigationModule, CmsParagraphModule, ConsentManagementModule, FooterNavigationModule, HamburgerMenuModule, HomePageEventModule, LinkModule, LoginRouteModule, LogoutModule, MyCouponsModule, MyInterestsModule, NavigationEventModule, NavigationModule, NotificationPreferenceModule, PageTitleModule, PaymentMethodsModule, ProductCarouselModule, ProductDetailsPageModule, ProductFacetNavigationModule, ProductImagesModule, ProductIntroModule, ProductListingPageModule, ProductListModule, ProductPageEventModule, ProductReferencesModule, ProductSummaryModule, ProductTabsModule, ScrollToTopModule, SearchBoxModule, SiteContextSelectorModule, StockNotificationModule, TabParagraphContainerModule } from "@spartacus/storefront";
+import { AddressBookModule, AnonymousConsentManagementBannerModule, AnonymousConsentsDialogModule, BannerCarouselModule, BannerModule, BreadcrumbModule, CategoryNavigationModule, CmsParagraphModule, ConsentManagementModule, FooterNavigationModule, HamburgerMenuModule, HomePageEventModule, LinkModule, LoginRouteModule, LogoutModule, MyCouponsModule, MyInterestsModule, NavigationEventModule, NavigationModule, NotificationPreferenceModule, PageTitleModule, PaymentMethodsModule, PDFModule, ProductCarouselModule, ProductDetailsPageModule, ProductFacetNavigationModule, ProductImagesModule, ProductIntroModule, ProductListingPageModule, ProductListModule, ProductPageEventModule, ProductReferencesModule, ProductSummaryModule, ProductTabsModule, ScrollToTopModule, SearchBoxModule, SiteContextSelectorModule, StockNotificationModule, TabParagraphContainerModule, VideoModule } from "@spartacus/storefront";
 import { CartBaseFeatureModule } from './features/cart/cart-base-feature.module';
 import { CheckoutFeatureModule } from './features/checkout/checkout-feature.module';
 import { DigitalPaymentsFeatureModule } from './features/digital-payments/digital-payments-feature.module';
@@ -477,6 +479,8 @@ import { UserFeatureModule } from './features/user/user-feature.module';
         BreadcrumbModule,
         ScrollToTopModule,
         PageTitleModule,
+        VideoModule,
+        PDFModule,
         UserModule,
         UserOccModule,
         AddressBookModule,

From 64a76122c7f6c7f17399f014d1e79331f2d38c53 Mon Sep 17 00:00:00 2001
From: morganm58 <mikel.morgan@sap.com>
Date: Wed, 5 Jul 2023 22:37:47 -0400
Subject: [PATCH 062/122] styling: Style changes for mobile and desktop
 checkout UI revised (#17611)

---
 .../styles/components/_order-summary.scss     | 12 ++++
 .../checkout-delivery-address.component.html  | 30 +++++++-
 ...heckout-delivery-address.component.spec.ts | 10 ++-
 .../checkout-delivery-address.module.ts       |  8 ++-
 .../checkout-delivery-mode.component.html     | 17 ++++-
 .../checkout-delivery-mode.module.ts          |  8 ++-
 .../checkout-payment-method.component.html    | 31 ++++++++-
 .../checkout-payment-method.component.spec.ts | 10 ++-
 .../checkout-payment-method.module.ts         |  8 ++-
 .../styles/components/steps/_progress.scss    |  4 ++
 .../delivery-address/_delivery-address.scss   | 69 +++++++++++++++++++
 .../steps/delivery-method/_delivery-mode.scss | 39 +++++++++++
 .../steps/payment/_payment-form.scss          |  6 ++
 .../steps/payment/_payment-method.scss        | 68 ++++++++++++++++++
 .../components/steps/review/_review.scss      | 22 ++++++
 .../styles/mixins/_checkout-media-style.scss  | 36 +++++++++-
 .../navigation/_category-navigation.scss      |  4 ++
 17 files changed, 367 insertions(+), 15 deletions(-)

diff --git a/feature-libs/cart/base/styles/components/_order-summary.scss b/feature-libs/cart/base/styles/components/_order-summary.scss
index e233ddda3dc..f4b1e3d5fd9 100644
--- a/feature-libs/cart/base/styles/components/_order-summary.scss
+++ b/feature-libs/cart/base/styles/components/_order-summary.scss
@@ -12,6 +12,18 @@
     font-weight: var(--cx-font-weight-semi);
   }
 
+  @include forVersion(6.3) {
+    .cx-summary-heading {
+      border-bottom: 1px solid var(--cx-color-medium);
+      padding-bottom: 2.188rem;
+
+      @include media-breakpoint-down(md) {
+        margin-bottom: 0.438rem;
+        padding-bottom: 0.938rem;
+      }
+    }
+  }
+
   .cx-summary-label {
     text-align: start;
     padding: 0;
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
index 383b844b7d0..3f18a8cd4f1 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
@@ -18,8 +18,21 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
       <p class="cx-checkout-text">
         {{ 'checkoutAddress.selectYourDeliveryAddress' | cxTranslate }}
       </p>
-      <div class="cx-checkout-btns row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
+      <ng-container *cxFeatureLevel="'!6.3'">
+        <div class="cx-checkout-btns row">
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <button
+              class="btn btn-block btn-secondary"
+              (click)="showNewAddressForm()"
+            >
+              {{ 'checkoutAddress.addNewAddress' | cxTranslate }}
+            </button>
+          </div>
+        </div>
+      </ng-container>
+
+      <ng-container *cxFeatureLevel="'6.3'">
+        <div class="cx-checkout-btns cx-checkout-btns-top">
           <button
             class="btn btn-block btn-secondary"
             (click)="showNewAddressForm()"
@@ -27,7 +40,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
             {{ 'checkoutAddress.addNewAddress' | cxTranslate }}
           </button>
         </div>
-      </div>
+      </ng-container>
 
       <div class="cx-checkout-body row">
         <div
@@ -49,6 +62,17 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
         </div>
       </div>
 
+      <ng-container *cxFeatureLevel="'6.3'">
+        <div class="cx-checkout-btns cx-checkout-btns-bottom">
+          <button
+            class="btn btn-block btn-secondary"
+            (click)="showNewAddressForm()"
+          >
+            {{ 'checkoutAddress.addNewAddress' | cxTranslate }}
+          </button>
+        </div>
+      </ng-container>
+
       <div class="cx-checkout-btns row">
         <div class="col-md-12 col-lg-6">
           <button class="cx-btn btn btn-block btn-secondary" (click)="back()">
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
index 64b4ad7b686..e4219775fe4 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts
@@ -12,6 +12,8 @@ import {
   GlobalMessageService,
   I18nTestingModule,
   UserAddressService,
+  FeaturesConfig,
+  FeaturesConfigModule,
 } from '@spartacus/core';
 import { Card } from '@spartacus/storefront';
 import { EMPTY, of } from 'rxjs';
@@ -130,7 +132,7 @@ describe('CheckoutDeliveryAddressComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [I18nTestingModule],
+        imports: [I18nTestingModule, FeaturesConfigModule],
         declarations: [
           CheckoutDeliveryAddressComponent,
           MockAddressFormComponent,
@@ -151,6 +153,12 @@ describe('CheckoutDeliveryAddressComponent', () => {
             provide: CheckoutDeliveryModesFacade,
             useClass: MockCheckoutDeliveryModesFacade,
           },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '6.3' },
+            },
+          },
         ],
       })
         .overrideComponent(CheckoutDeliveryAddressComponent, {
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.module.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.module.ts
index e5e46a1cd47..2609d0c8270 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.module.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.module.ts
@@ -8,7 +8,12 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { CartValidationGuard } from '@spartacus/cart/base/core';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  I18nModule,
+  provideDefaultConfig,
+  FeaturesConfigModule,
+} from '@spartacus/core';
 import {
   AddressFormModule,
   CardModule,
@@ -26,6 +31,7 @@ import { CheckoutDeliveryAddressComponent } from './checkout-delivery-address.co
     CardModule,
     SpinnerModule,
     I18nModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
index 71fd4d8ce12..6b902eb46de 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
@@ -27,9 +27,20 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
           class="cx-delivery-label form-check-label form-radio-label"
           for="deliveryMode-{{ mode.code }}"
         >
-          <div class="cx-delivery-mode">
-            {{ mode.name }} ({{ mode.description }})
-          </div>
+          <ng-container *cxFeatureLevel="'!6.3'">
+            <div class="cx-delivery-mode">
+              {{ mode.name }} ({{ mode.description }})
+            </div>
+          </ng-container>
+
+          <ng-container *cxFeatureLevel="'6.3'">
+            <div class="cx-delivery-mode">
+              {{ mode.name }}
+              <span class="cx-delivery-mode-description"
+                >({{ mode.description }})</span
+              >
+            </div>
+          </ng-container>
           <div class="cx-delivery-price">
             {{ mode.deliveryCost?.formattedValue }}
           </div>
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
index 56e4bab4b09..3698ddc6c7f 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
@@ -7,7 +7,12 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  I18nModule,
+  provideDefaultConfig,
+  FeaturesConfigModule,
+} from '@spartacus/core';
 import {
   OutletModule,
   PageComponentModule,
@@ -25,6 +30,7 @@ import { CheckoutDeliveryModeComponent } from './checkout-delivery-mode.componen
     SpinnerModule,
     OutletModule,
     PageComponentModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.html b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.html
index 3eacaef1d2d..9a0189095c9 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.html
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.html
@@ -18,8 +18,22 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
     <p class="cx-checkout-text">
       {{ 'paymentForm.choosePaymentMethod' | cxTranslate }}
     </p>
-    <div class="cx-checkout-btns row">
-      <div class="col-md-12 col-lg-6">
+
+    <ng-container *cxFeatureLevel="'!6.3'">
+      <div class="cx-checkout-btns row">
+        <div class="col-md-12 col-lg-6">
+          <button
+            class="btn btn-block btn-secondary"
+            (click)="showNewPaymentForm()"
+          >
+            {{ 'paymentForm.addNewPayment' | cxTranslate }}
+          </button>
+        </div>
+      </div>
+    </ng-container>
+
+    <ng-container *cxFeatureLevel="'6.3'">
+      <div class="cx-checkout-btns cx-checkout-btns-top">
         <button
           class="btn btn-block btn-secondary"
           (click)="showNewPaymentForm()"
@@ -27,7 +41,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
           {{ 'paymentForm.addNewPayment' | cxTranslate }}
         </button>
       </div>
-    </div>
+    </ng-container>
 
     <div class="cx-checkout-body row">
       <div
@@ -49,6 +63,17 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
       </div>
     </div>
 
+    <ng-container *cxFeatureLevel="'6.3'">
+      <div class="cx-checkout-btns cx-checkout-btns-bottom">
+        <button
+          class="btn btn-block btn-secondary"
+          (click)="showNewPaymentForm()"
+        >
+          {{ 'paymentForm.addNewPayment' | cxTranslate }}
+        </button>
+      </div>
+    </ng-container>
+
     <div class="row cx-checkout-btns">
       <div class="col-md-12 col-lg-6">
         <button class="btn btn-block btn-secondary" (click)="back()">
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
index feaa2898574..4c7007da1b4 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts
@@ -9,6 +9,8 @@ import {
 } from '@spartacus/checkout/base/root';
 import {
   Address,
+  FeaturesConfig,
+  FeaturesConfigModule,
   GlobalMessageService,
   I18nTestingModule,
   QueryState,
@@ -168,7 +170,7 @@ describe('CheckoutPaymentMethodComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [I18nTestingModule],
+        imports: [I18nTestingModule, FeaturesConfigModule],
         declarations: [
           CheckoutPaymentMethodComponent,
           MockPaymentFormComponent,
@@ -193,6 +195,12 @@ describe('CheckoutPaymentMethodComponent', () => {
           { provide: CheckoutStepService, useClass: MockCheckoutStepService },
           { provide: ActivatedRoute, useValue: mockActivatedRoute },
           { provide: GlobalMessageService, useClass: MockGlobalMessageService },
+          {
+            provide: FeaturesConfig,
+            useValue: {
+              features: { level: '6.3' },
+            },
+          },
         ],
       }).compileComponents();
 
diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.module.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.module.ts
index c7d32b0d43f..b758cf7e55a 100644
--- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.module.ts
+++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.module.ts
@@ -7,7 +7,12 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  I18nModule,
+  provideDefaultConfig,
+  FeaturesConfigModule,
+} from '@spartacus/core';
 import { CardModule, SpinnerModule } from '@spartacus/storefront';
 import { CartNotEmptyGuard } from '../guards/cart-not-empty.guard';
 import { CheckoutAuthGuard } from '../guards/checkout-auth.guard';
@@ -22,6 +27,7 @@ import { CheckoutPaymentMethodComponent } from './checkout-payment-method.compon
     CardModule,
     SpinnerModule,
     I18nModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/styles/components/steps/_progress.scss b/feature-libs/checkout/base/styles/components/steps/_progress.scss
index a088c0a1134..07c6d3402af 100644
--- a/feature-libs/checkout/base/styles/components/steps/_progress.scss
+++ b/feature-libs/checkout/base/styles/components/steps/_progress.scss
@@ -105,6 +105,10 @@
         border-width: 0 0 1px 0;
         border-style: solid;
         border-color: var(--cx-color-light);
+
+        @include forVersion(6.3) {
+          padding: 0 1.875rem;
+        }
       }
 
       @include media-breakpoint-down(sm) {
diff --git a/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss b/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
index b9ba5ea06e4..fd939b1dbf0 100644
--- a/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
+++ b/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
@@ -1,13 +1,82 @@
 %cx-delivery-address {
   @include checkout-media-style();
 
+  @include forVersion(6.3) {
+    border: 1px solid var(--cx-color-medium);
+    border-radius: 10px;
+    margin-top: 32px;
+    margin-bottom: 30px;
+    padding-inline-start: 1.875rem;
+    padding-inline-end: 1.875rem;
+    padding-top: 1.875rem;
+
+    @include media-breakpoint-down(md) {
+      background-color: var(--cx-color-transparent);
+    }
+
+    cx-address-form {
+      @include media-breakpoint-down(md) {
+        background-color: var(--cx-color-transparent);
+      }
+      form {
+        background-color: var(--cx-color-transparent);
+        padding: 13px 0px 13px 0px;
+        margin-bottom: 0;
+      }
+    }
+  }
+
   .cx-delivery-address-card {
     padding-bottom: 30px;
 
+    @include forVersion(6.3) {
+      padding-inline-start: 0;
+      padding-inline-end: 0;
+
+      @include media-breakpoint-up(lg) {
+        &:nth-child(odd) {
+          padding-inline-end: 15px;
+        }
+        &:nth-child(even) {
+          padding-inline-start: 15px;
+        }
+      }
+    }
+
     .cx-delivery-address-card-inner {
       height: 100%;
       background-color: var(--cx-color-inverse);
       cursor: pointer;
     }
   }
+
+  @include forVersion(6.3) {
+    .cx-checkout-btns-top {
+      display: flex;
+      justify-content: flex-end;
+      padding-inline-start: 1.875rem;
+
+      @include media-breakpoint-down(md) {
+        display: none;
+      }
+
+      .btn {
+        width: 50%;
+      }
+    }
+  }
+
+  @include forVersion(6.3) {
+    .cx-checkout-btns-bottom {
+      padding-bottom: 0;
+
+      @include media-breakpoint-up(lg) {
+        display: none;
+      }
+
+      .btn-secondary {
+        margin-bottom: 0;
+      }
+    }
+  }
 }
diff --git a/feature-libs/checkout/base/styles/components/steps/delivery-method/_delivery-mode.scss b/feature-libs/checkout/base/styles/components/steps/delivery-method/_delivery-mode.scss
index d6d723c7262..70d71ff098c 100644
--- a/feature-libs/checkout/base/styles/components/steps/delivery-method/_delivery-mode.scss
+++ b/feature-libs/checkout/base/styles/components/steps/delivery-method/_delivery-mode.scss
@@ -3,6 +3,23 @@
 
   @include media-breakpoint-down(md) {
     padding: 20px 0;
+
+    @include forVersion(6.3) {
+      background-color: var(--cx-color-transparent);
+      margin-top: 32px;
+      padding: 23px 30px 8px;
+    }
+  }
+
+  @include forVersion(6.3) {
+    border: 1px solid var(--cx-color-light);
+    border-radius: 10px;
+    padding: 23px 30px 8px;
+    background-color: var(--cx-color-inverse);
+
+    @include media-breakpoint-up(lg) {
+      margin: 2rem 0 2rem;
+    }
   }
 
   .cx-delivery-mode-wrapper {
@@ -13,10 +30,24 @@
 
     @include media-breakpoint-down(md) {
       margin: 0 55px;
+
+      @include forVersion(6.3) {
+        margin: 0;
+      }
     }
 
     @include media-breakpoint-down(sm) {
       margin: 0 22px;
+
+      @include forVersion(6.3) {
+        margin: 0;
+      }
+    }
+
+    @include forVersion(6.3) {
+      border: none;
+      border-radius: 0px;
+      padding: 0;
     }
   }
 
@@ -50,6 +81,14 @@
         flex-basis: 100%;
         color: var(--cx-color-success);
       }
+
+      @include forVersion(6.3) {
+        .cx-delivery-mode-description {
+          width: 100%;
+          display: block;
+          color: var(--cx-color-success);
+        }
+      }
     }
   }
 }
diff --git a/feature-libs/checkout/base/styles/components/steps/payment/_payment-form.scss b/feature-libs/checkout/base/styles/components/steps/payment/_payment-form.scss
index d362913f8e1..874b947fb9c 100644
--- a/feature-libs/checkout/base/styles/components/steps/payment/_payment-form.scss
+++ b/feature-libs/checkout/base/styles/components/steps/payment/_payment-form.scss
@@ -36,4 +36,10 @@
   .form-check {
     margin: 0;
   }
+
+  @include forVersion(6.3) {
+    .label-content {
+      white-space: nowrap;
+    }
+  }
 }
diff --git a/feature-libs/checkout/base/styles/components/steps/payment/_payment-method.scss b/feature-libs/checkout/base/styles/components/steps/payment/_payment-method.scss
index dfb0fcc3053..4250f106093 100644
--- a/feature-libs/checkout/base/styles/components/steps/payment/_payment-method.scss
+++ b/feature-libs/checkout/base/styles/components/steps/payment/_payment-method.scss
@@ -1,6 +1,20 @@
 %cx-payment-method {
   @include checkout-media-style();
 
+  @include forVersion(6.3) {
+    border: 1px solid var(--cx-color-medium);
+    border-radius: 10px;
+    margin-top: 32px;
+    margin-bottom: 30px;
+    padding-inline-start: 1.875rem;
+    padding-inline-end: 1.875rem;
+    padding-top: 1.875rem;
+
+    @include media-breakpoint-down(md) {
+      background-color: var(--cx-color-transparent);
+    }
+  }
+
   .cx-payment {
     &.container {
       padding: 0;
@@ -9,6 +23,22 @@
 
   .cx-payment-card {
     padding-bottom: 30px;
+
+    @include forVersion(6.3) {
+      padding-inline-start: 0;
+      padding-inline-end: 0;
+      padding-bottom: 0.625rem;
+      margin-bottom: 0.625rem;
+
+      @include media-breakpoint-up(lg) {
+        &:nth-child(odd) {
+          padding-inline-end: 15px;
+        }
+        &:nth-child(even) {
+          padding-inline-start: 15px;
+        }
+      }
+    }
   }
 
   .cx-payment-card-inner {
@@ -33,9 +63,17 @@
   .cx-checkout-text {
     @include media-breakpoint-down(md) {
       padding-inline-start: 3.5rem;
+
+      @include forVersion(6.3) {
+        padding-inline-start: 0;
+      }
     }
     @include media-breakpoint-down(sm) {
       padding-inline-start: 1.5rem;
+
+      @include forVersion(6.3) {
+        padding-inline-start: 0;
+      }
     }
   }
 
@@ -53,6 +91,36 @@
     }
   }
 
+  @include forVersion(6.3) {
+    .cx-checkout-btns-top {
+      display: flex;
+      justify-content: flex-end;
+      padding-inline-start: 1.875rem;
+
+      @include media-breakpoint-down(md) {
+        display: none;
+      }
+
+      .btn {
+        width: 50%;
+      }
+    }
+  }
+
+  @include forVersion(6.3) {
+    .cx-checkout-btns-bottom {
+      padding-bottom: 0;
+
+      @include media-breakpoint-up(lg) {
+        display: none;
+      }
+
+      .btn-secondary {
+        margin-bottom: 0;
+      }
+    }
+  }
+
   .cx-checkout-body {
     display: flex;
     align-items: stretch;
diff --git a/feature-libs/checkout/base/styles/components/steps/review/_review.scss b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
index e07e378a9f2..6f99fa4db36 100644
--- a/feature-libs/checkout/base/styles/components/steps/review/_review.scss
+++ b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
@@ -21,6 +21,10 @@
     justify-content: space-between;
     flex-direction: row;
 
+    @include forVersion(6.3) {
+      background-color: var(--cx-color-inverse);
+    }
+
     @include media-breakpoint-up(lg) {
       margin-top: 1.5rem;
     }
@@ -30,6 +34,12 @@
       padding: 20px;
     }
 
+    @include forVersion(6.3) {
+      @include media-breakpoint-down(sm) {
+        padding: 0;
+      }
+    }
+
     &-wrapper {
       display: flex;
       flex-direction: column;
@@ -53,12 +63,20 @@
       border: 1px solid var(--cx-color-light);
       border-radius: 10px;
 
+      @include forVersion(6.3) {
+        flex-grow: 1;
+      }
+
       @include media-breakpoint-up(md) {
         &:first-child {
           margin-top: 30px;
           margin-inline-start: 25px;
           margin-bottom: 40px;
           margin-inline-end: 15px;
+
+          @include forVersion(6.3) {
+            margin-inline-start: 0px;
+          }
         }
 
         &:last-child {
@@ -66,6 +84,10 @@
           margin-inline-start: 15px;
           margin-bottom: 40px;
           margin-inline-end: 25px;
+
+          @include forVersion(6.3) {
+            margin-inline-end: 0px;
+          }
         }
       }
 
diff --git a/feature-libs/checkout/base/styles/mixins/_checkout-media-style.scss b/feature-libs/checkout/base/styles/mixins/_checkout-media-style.scss
index 8db486ef638..dad2504a1d8 100644
--- a/feature-libs/checkout/base/styles/mixins/_checkout-media-style.scss
+++ b/feature-libs/checkout/base/styles/mixins/_checkout-media-style.scss
@@ -2,6 +2,10 @@
   @include media-breakpoint-down(md) {
     display: block;
     background-color: var(--cx-color-background);
+
+    @include forVersion(6.3) {
+      background-color: var(--cx-color-transparent);
+    }
   }
 
   .col-md-12 {
@@ -12,8 +16,17 @@
     @include media-breakpoint-down(sm) {
       padding: 0 2.25rem;
     }
-  }
 
+    @include forVersion(6.3) {
+      @include media-breakpoint-down(md) {
+        padding: 0 0.813rem;
+      }
+
+      @include media-breakpoint-down(sm) {
+        padding: 0 0.875rem;
+      }
+    }
+  }
   .container {
     @include media-breakpoint-down(md) {
       width: 100%;
@@ -49,6 +62,15 @@
     padding-inline-end: 0;
     @include type('4');
     background-color: var(--cx-color-background);
+
+    @include forVersion(6.3) {
+      background-color: var(--cx-color-transparent);
+      margin-top: 0;
+      padding-top: 0;
+      padding-bottom: 0.438rem;
+      margin-bottom: 0.5rem;
+      padding-inline-start: 0;
+    }
   }
 
   .cx-checkout-body {
@@ -59,6 +81,10 @@
         padding: 0;
       }
     }
+
+    @include forVersion(6.3) {
+      margin: 0;
+    }
   }
 
   .cx-checkout-text {
@@ -66,9 +92,17 @@
 
     @include media-breakpoint-down(md) {
       padding-inline-start: 3.5rem;
+
+      @include forVersion(6.3) {
+        padding-inline-start: 0;
+      }
     }
     @include media-breakpoint-down(sm) {
       padding-inline-start: 1.5rem;
+
+      @include forVersion(6.3) {
+        padding-inline-start: 0;
+      }
     }
   }
 
diff --git a/projects/storefrontstyles/scss/components/content/navigation/_category-navigation.scss b/projects/storefrontstyles/scss/components/content/navigation/_category-navigation.scss
index a54bfbf2bfc..94f4a153a65 100644
--- a/projects/storefrontstyles/scss/components/content/navigation/_category-navigation.scss
+++ b/projects/storefrontstyles/scss/components/content/navigation/_category-navigation.scss
@@ -21,6 +21,10 @@
     > li {
       @include media-breakpoint-up(lg) {
         padding-inline-end: 15px;
+
+        @include forVersion(6.3) {
+          padding-inline-start: 15px;
+        }
       }
 
       list-style: none;

From c4f66e0d8177a2e5454d5036a5c0050c3272c484 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Thu, 6 Jul 2023 11:09:02 +0200
Subject: [PATCH 063/122] fix: console error when address fails to update 
 (#17608)

---
 .../store/effects/user-addresses.effect.ts    | 20 ++++++++------
 .../address-form/address-form.component.ts    | 27 +++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/projects/core/src/user/store/effects/user-addresses.effect.ts b/projects/core/src/user/store/effects/user-addresses.effect.ts
index 88edf4c795d..265081c052f 100644
--- a/projects/core/src/user/store/effects/user-addresses.effect.ts
+++ b/projects/core/src/user/store/effects/user-addresses.effect.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, inject } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, switchMap, tap } from 'rxjs/operators';
@@ -81,13 +81,17 @@ export class UserAddressesEffects {
               map(() => {
                 return new UserActions.UpdateUserAddressSuccess(payload);
               }),
-              catchError((error) =>
-                of(
+              catchError((error) => {
+                this.showGlobalMessage(
+                  'addressForm.invalidAddress',
+                  GlobalMessageType.MSG_TYPE_ERROR
+                );
+                return of(
                   new UserActions.UpdateUserAddressFail(
                     normalizeHttpError(error, this.logger)
                   )
-                )
-              )
+                );
+              })
             );
         })
       )
@@ -182,10 +186,10 @@ export class UserAddressesEffects {
   /**
    * Show global confirmation message with provided text
    */
-  private showGlobalMessage(text: string) {
+  private showGlobalMessage(key: string, type?: GlobalMessageType) {
     this.messageService.add(
-      { key: text },
-      GlobalMessageType.MSG_TYPE_CONFIRMATION
+      { key },
+      type ?? GlobalMessageType.MSG_TYPE_CONFIRMATION
     );
   }
 
diff --git a/projects/storefrontlib/cms-components/myaccount/address-book/address-form/address-form.component.ts b/projects/storefrontlib/cms-components/myaccount/address-book/address-form/address-form.component.ts
index fdcb4b25d3f..4d79a48c0c5 100644
--- a/projects/storefrontlib/cms-components/myaccount/address-book/address-form/address-form.component.ts
+++ b/projects/storefrontlib/cms-components/myaccount/address-book/address-form/address-form.component.ts
@@ -35,7 +35,7 @@ import {
 } from '@spartacus/core';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import { filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { LaunchDialogService, LAUNCH_CALLER } from '../../../../layout';
+import { LAUNCH_CALLER, LaunchDialogService } from '../../../../layout';
 import { sortTitles } from '../../../../shared/utils/forms/title-utils';
 
 @Component({
@@ -203,16 +203,21 @@ export class AddressFormComponent implements OnInit, OnDestroy {
 
   verifyAddress(): void {
     if (this.addressForm.valid) {
-      if (this.addressForm.get('region')?.value.isocode) {
-        this.regions$.pipe(take(1)).subscribe((regions) => {
-          const obj = regions.find(
-            (region) =>
-              region.isocode ===
-              this.addressForm.controls['region'].value.isocode
-          );
-          Object.assign(this.addressForm.value.region, {
-            isocodeShort: obj?.isocodeShort,
-          });
+      const regionControl = this.addressForm.get('region');
+      const isocode = regionControl?.value?.isocode;
+
+      if (isocode) {
+        this.regions$.pipe(take(1)).subscribe((regions: Region[]) => {
+          if (regions.length) {
+            const selectedRegion = regions.find(
+              (region: Region) => region.isocode === isocode
+            );
+            regionControl?.patchValue({
+              isocodeShort: selectedRegion?.isocodeShort,
+            });
+          } else {
+            regionControl?.reset();
+          }
         });
       }
 

From 170bcdafd6a4515083bf7fef9cdf57cc9eed0842 Mon Sep 17 00:00:00 2001
From: niehuayang <126219214+niehuayang@users.noreply.github.com>
Date: Thu, 6 Jul 2023 18:58:17 +0800
Subject: [PATCH 064/122] test: enable asm e2e tests skiped (#17593)

---
 .../e2e/b2b/regression/asm/asm.core-e2e.cy.ts | 29 +++++-----
 .../asm/asm.emulation.core-e2e.cy.ts          | 58 ++++++++++++++++---
 2 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts
index 92f50fe5392..65b7ed09d8e 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts
@@ -4,16 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import * as asm from '../../../../helpers/asm';
+import { addB2bProductToCartAndCheckout } from '../../../../helpers/b2b/b2b-checkout';
+import * as checkout from '../../../../helpers/checkout-flow';
 import { ELECTRONICS_BASESITE } from '../../../../helpers/checkout-flow';
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
-import { user } from '../../../../sample-data/checkout-flow';
-import { register } from '../../../../helpers/auth-forms';
-import { addB2bProductToCartAndCheckout } from '../../../../helpers/b2b/b2b-checkout';
+import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
 
 context('B2B - Assisted Service Module', () => {
+  const customer = {
+    fullName: 'William Hunter',
+    email: 'william.hunter@pronto-hw.com',
+  };
+
   before(() => {
     clearAllStorage();
   });
@@ -27,8 +31,7 @@ context('B2B - Assisted Service Module', () => {
       Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
     });
 
-    // This test only works if "sap-commerce-cloud-user-id" is added to the allowed headers of "corsfilter.commercewebservices.allowedHeaders" on the Commerce Cloud side (CXSPA-1355)
-    it.skip("should fetch cost centers based on the emulated user's role", () => {
+    it("should fetch cost centers based on the emulated user's role", () => {
       cy.cxConfig({
         context: {
           baseSite: ['powertools-spa'],
@@ -36,15 +39,13 @@ context('B2B - Assisted Service Module', () => {
         },
       });
 
-      cy.visit('/', { qs: { asm: true } });
-
-      cy.visit('/login/register');
-
-      register(user, true);
-
+      cy.log('--> Agent logging in');
+      checkout.visitHomePage('asm=true');
+      cy.get('cx-asm-main-ui').should('exist');
+      cy.get('cx-asm-main-ui').should('be.visible');
       asm.agentLogin('brandon.leclair@acme.com', 'pw4all');
-
-      asm.startCustomerEmulation(user, true);
+      cy.log('--> Agent emulate customer');
+      asm.startCustomerEmulation(customer, true);
 
       addB2bProductToCartAndCheckout();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
index 14667b2547a..f84b7f252e3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/asm.emulation.core-e2e.cy.ts
@@ -11,13 +11,13 @@ import { ELECTRONICS_BASESITE } from '../../../helpers/checkout-flow';
 import { getErrorAlert } from '../../../helpers/global-message';
 import { navigateToCategory, waitForPage } from '../../../helpers/navigation';
 import { APPAREL_BASESITE } from '../../../helpers/variants/apparel-checkout-flow';
-import { clearAllStorage } from '../../../support/utils/clear-all-storage';
-
 import { getSampleUser } from '../../../sample-data/checkout-flow';
+import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 context('Assisted Service Module', () => {
   describe('Customer Support Agent - Emulation', () => {
     asm.testCustomerEmulation();
+
     it('should checkout as customer', () => {
       const customer = getSampleUser();
 
@@ -78,11 +78,43 @@ context('Assisted Service Module', () => {
       );
     });
 
-    // TODO(#9445): Add e2e test for this scenario
-    it.skip('agent login when user is logged in should start this user emulation', () => {});
+    // TODO(#3974): fix the bug to enable e2e test for this scenario
+    it.skip('agent login when user is logged in should start this user emulation', () => {
+      cy.visit('/login');
+      login(customer.email, customer.password);
+
+      checkout.visitHomePage('asm=true');
+
+      cy.get('cx-asm-main-ui').should('exist');
+      cy.get('cx-asm-main-ui').should('be.visible');
+
+      cy.log('--> Agent logging in');
+      asm.agentLogin('asagent', 'pw4all');
+
+      cy.get('cx-csagent-login-form').should('not.exist');
+      cy.get('cx-customer-selection').should('not.exist');
+      cy.get('cx-customer-emulation').should('be.visible');
+    });
+
+    // TODO(#7221): enable this case
+    it.skip('agent logout when user was logged and emulated should restore the session', () => {
+      checkout.visitHomePage('asm=true');
+
+      cy.get('cx-asm-main-ui').should('exist');
+      cy.get('cx-asm-main-ui').should('be.visible');
+
+      cy.log('--> Agent logging in');
+      asm.agentLogin('asagent', 'pw4all');
+
+      cy.log('--> Starting customer emulation');
+      asm.startCustomerEmulation(customer);
 
-    // TODO(#9445): Add e2e test for this scenario
-    it.skip('agent logout when user was logged and emulated should restore the session', () => {});
+      cy.log('--> Agent sign out');
+      asm.agentSignOut();
+
+      cy.get('cx-csagent-login-form').should('exist');
+      cy.get('cx-customer-emulation').should('not.exist');
+    });
   });
 
   describe('Apparel Site', () => {
@@ -94,8 +126,7 @@ context('Assisted Service Module', () => {
       Cypress.env('BASE_SITE', ELECTRONICS_BASESITE);
     });
 
-    // This test only works if "sap-commerce-cloud-user-id" is added to the allowed headers of "corsfilter.commercewebservices.allowedHeaders" on the Commerce Cloud side. (CXSPA-1355)
-    it.skip("should fetch products in a category based on the emulated user's authentication", () => {
+    it("should fetch products in a category based on the emulated user's authentication", () => {
       cy.cxConfig({
         context: {
           baseSite: ['apparel-uk-spa'],
@@ -113,11 +144,20 @@ context('Assisted Service Module', () => {
       asm.startCustomerEmulation(customer);
 
       navigateToCategory('Brands', 'brands', true);
+      cy.get('cx-product-list').should('exist');
+      cy.get('cx-product-list cx-product-grid-item').should(
+        'have.length.at.least',
+        1
+      );
 
+      navigateToCategory('Streetwear', 'streetwear', true);
       cy.get('cx-product-list').should('exist');
+      cy.get('cx-product-list cx-product-grid-item').should(
+        'have.length.at.least',
+        1
+      );
 
       navigateToCategory('Snow', 'snow', true);
-
       cy.get('cx-product-list').should('exist');
     });
   });

From 801982b96f2dbb74dff23eadebe108a0fa877d11 Mon Sep 17 00:00:00 2001
From: Ulrich Stellmacher <ulrich.stellmacher@sap.com>
Date: Fri, 7 Jul 2023 14:48:45 +0200
Subject: [PATCH 065/122] feat: CXSPA-2818 Change adapter for replacement for
 header based routing  (#17580)

Adds an alternative adapter that calls CPQ via OCC instead of directly CPQ. A new Settings `productConfigurator.cpqOverOcc` was introduced to activate this new behavior.
The new adapter requires at least commerce 2211.FP2. Endpoints need to explicitly activated in commerce.
---
 .../core/config/configurator-core.config.ts   |   1 +
 .../default-configurator-core.config.ts       |   1 +
 .../rulebased-configurator.adapter.ts         |   9 +-
 .../rulebased-configurator.connector.spec.ts  |  99 +-
 .../rulebased-configurator.connector.ts       |  42 +-
 ...figurator-normalizer-utils.service.spec.ts |   0
 ...q-configurator-normalizer-utils.service.ts |   0
 .../cpq-configurator-normalizer.spec.ts       |  29 +
 .../converters/cpq-configurator-normalizer.ts |  17 +-
 ...q-configurator-overview-normalizer.spec.ts |  13 +
 .../cpq-configurator-overview-normalizer.ts   |   2 +-
 .../cpq-configurator-serializer.spec.ts       |   0
 .../converters/cpq-configurator-serializer.ts |   2 +-
 .../cpq-configurator-value-serializer.spec.ts |   0
 .../cpq-configurator-value-serializer.ts      |   2 +-
 .../converters/cpq-configurator.converters.ts |   0
 .../cpq/{rest => common}/converters/index.ts  |   0
 .../common/cpq-configurator-common.module.ts  |  14 +
 .../cpq/{rest => common}/cpq.models.ts        |   1 +
 .../rulebased/cpq/common/index.ts             |   9 +
 .../occ/cpq-configurator-occ.adapter.spec.ts  | 285 ++++++
 .../cpq/occ/cpq-configurator-occ.adapter.ts   | 129 +++
 .../cpq/occ/cpq-configurator-occ.module.ts    |   7 +
 .../occ/cpq-configurator-occ.service.spec.ts  | 278 ++++-
 .../cpq/occ/cpq-configurator-occ.service.ts   | 223 ++++
 .../default-occ-configurator-cpq-config.ts    |  14 +
 .../rulebased/cpq/occ/index.ts                |   1 +
 .../occ-cpq-configurator-endpoints.model.ts   |  32 +-
 .../rulebased/cpq/public_api.ts               |   1 +
 .../cpq-configurator-rest.adapter.spec.ts     |   4 +
 .../cpq/rest/cpq-configurator-rest.adapter.ts |   4 +
 .../cpq/rest/cpq-configurator-rest.module.ts  |  11 +-
 .../cpq-configurator-rest.service.spec.ts     |   4 +-
 .../cpq/rest/cpq-configurator-rest.service.ts |   4 +-
 .../rulebased/cpq/rest/index.ts               |   2 -
 .../cpq/rulebased-cpq-configurator.module.ts  |   7 +-
 .../cpq/cpq-configuration.core-e2e.cy.ts      | 963 ++++++++++--------
 .../helpers/product-configurator-cpq.ts       |  24 +-
 38 files changed, 1757 insertions(+), 477 deletions(-)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-normalizer-utils.service.spec.ts (100%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-normalizer-utils.service.ts (100%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-normalizer.spec.ts (98%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-normalizer.ts (94%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-overview-normalizer.spec.ts (97%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-overview-normalizer.ts (98%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-serializer.spec.ts (100%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-serializer.ts (98%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-value-serializer.spec.ts (100%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator-value-serializer.ts (95%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/cpq-configurator.converters.ts (100%)
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/converters/index.ts (100%)
 create mode 100644 feature-libs/product-configurator/rulebased/cpq/common/cpq-configurator-common.module.ts
 rename feature-libs/product-configurator/rulebased/cpq/{rest => common}/cpq.models.ts (99%)
 create mode 100644 feature-libs/product-configurator/rulebased/cpq/common/index.ts
 create mode 100644 feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.spec.ts
 create mode 100644 feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.ts

diff --git a/feature-libs/product-configurator/rulebased/core/config/configurator-core.config.ts b/feature-libs/product-configurator/rulebased/core/config/configurator-core.config.ts
index 4c81ceb22e1..f20045f91ed 100644
--- a/feature-libs/product-configurator/rulebased/core/config/configurator-core.config.ts
+++ b/feature-libs/product-configurator/rulebased/core/config/configurator-core.config.ts
@@ -9,6 +9,7 @@ import { Config } from '@spartacus/core';
 
 export interface ProductConfiguratorCoreConfig {
   enableVariantSearch?: boolean;
+  cpqOverOcc?: boolean;
 }
 
 @Injectable({
diff --git a/feature-libs/product-configurator/rulebased/core/config/default-configurator-core.config.ts b/feature-libs/product-configurator/rulebased/core/config/default-configurator-core.config.ts
index 083b596c4d4..f544b861009 100644
--- a/feature-libs/product-configurator/rulebased/core/config/default-configurator-core.config.ts
+++ b/feature-libs/product-configurator/rulebased/core/config/default-configurator-core.config.ts
@@ -9,5 +9,6 @@ import { ConfiguratorCoreConfig } from './configurator-core.config';
 export const defaultConfiguratorCoreConfig: ConfiguratorCoreConfig = {
   productConfigurator: {
     enableVariantSearch: false,
+    cpqOverOcc: false,
   },
 };
diff --git a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.adapter.ts b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.adapter.ts
index 01acbdfadf2..5f7395f2d08 100644
--- a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.adapter.ts
+++ b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.adapter.ts
@@ -112,13 +112,16 @@ export abstract class RulebasedConfiguratorAdapter {
   ): Observable<Configurator.Overview>;
 
   /**
-   * Abstract method to get configuration overview
+   * Abstract method to get the supported configurator type
    *
-   * @param configId configuration id
-   * @param owner configuration owner
    */
   abstract getConfiguratorType(): string;
 
+  /**
+   * Abstract method to check if the adapter supports to call CPQ over OCC. Only relevant for adapters supporting @see ConfiguratorType.CPQ
+   */
+  abstract supportsCpqOverOcc?(): boolean;
+
   /**
    * Searches for variants that are matching the configuration identified by its id.
    * Matches will be close to the attribute assignments of the configuration, but
diff --git a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.spec.ts b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.spec.ts
index c42f3fcb1ba..bc6faaa46ba 100644
--- a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.spec.ts
+++ b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.spec.ts
@@ -5,9 +5,11 @@ import {
   CommonConfigurator,
   CommonConfiguratorUtilsService,
   ConfiguratorModelUtils,
+  ConfiguratorType,
 } from '@spartacus/product-configurator/common';
 import { of } from 'rxjs';
 import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
+import { ConfiguratorCoreConfig } from '../config/configurator-core.config';
 import { Configurator } from '../model/configurator.model';
 import { RulebasedConfiguratorAdapter } from './rulebased-configurator.adapter';
 import { RulebasedConfiguratorConnector } from './rulebased-configurator.connector';
@@ -19,7 +21,7 @@ const CONFIG_ID = '1234-56-7890';
 const CONFIG_ID_TEMPLATE = '1234-56-aaab';
 const USER_ID = 'theUser';
 const CART_ID = '98876';
-const CONFIGURATOR_TYPE = 'cpqconfig';
+const CONFIGURATOR_TYPE = 'configuratortype';
 
 const productConfiguration: Configurator.Configuration = {
   ...ConfiguratorTestUtils.createConfiguration(
@@ -58,6 +60,9 @@ const updateFromCartEntryParameters: Configurator.UpdateConfigurationForCartEntr
 const cartModification: CartModification = {};
 
 class MockRulebasedConfiguratorAdapter implements RulebasedConfiguratorAdapter {
+  public configuratorType: string;
+  public cpqOverOcc: boolean | undefined;
+
   readConfigurationForCartEntry = createSpy().and.callFake(() =>
     of(productConfiguration)
   );
@@ -101,7 +106,10 @@ class MockRulebasedConfiguratorAdapter implements RulebasedConfiguratorAdapter {
     of('addToCart' + configId)
   );
   getConfiguratorType(): string {
-    return CONFIGURATOR_TYPE;
+    return this.configuratorType ?? CONFIGURATOR_TYPE;
+  }
+  supportsCpqOverOcc?(): boolean {
+    return this.cpqOverOcc ?? false;
   }
 }
 
@@ -109,11 +117,36 @@ describe('RulebasedConfiguratorConnector', () => {
   let service: RulebasedConfiguratorConnector;
   let configuratorUtils: CommonConfiguratorUtilsService;
   let adapter: RulebasedConfiguratorAdapter[];
+  let configuratorCpqConfig: ConfiguratorCoreConfig;
 
   const GROUP_ID = 'GROUP1';
 
   const QUANTITY = 1;
 
+  const MockConfig: ConfiguratorCoreConfig = {
+    productConfigurator: {
+      cpqOverOcc: true,
+    },
+  };
+
+  function setCpqOverOcc(cpqOverOcc: boolean | undefined) {
+    (configuratorCpqConfig.productConfigurator ?? {}).cpqOverOcc = cpqOverOcc;
+  }
+
+  function createMockAdapter(
+    configuratorType?: string,
+    supportsCpqOverOcc?: boolean
+  ): RulebasedConfiguratorAdapter {
+    let adapter = new MockRulebasedConfiguratorAdapter();
+    adapter.configuratorType = configuratorType ?? CONFIGURATOR_TYPE;
+    if (supportsCpqOverOcc) {
+      adapter.cpqOverOcc = supportsCpqOverOcc;
+    } else {
+      adapter.supportsCpqOverOcc = undefined;
+    }
+    return adapter;
+  }
+
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [
@@ -122,6 +155,10 @@ describe('RulebasedConfiguratorConnector', () => {
           useClass: MockRulebasedConfiguratorAdapter,
           multi: true,
         },
+        {
+          provide: ConfiguratorCoreConfig,
+          useValue: MockConfig,
+        },
         {
           provide: RulebasedConfiguratorConnector,
           useClass: RulebasedConfiguratorConnector,
@@ -137,7 +174,11 @@ describe('RulebasedConfiguratorConnector', () => {
     adapter = TestBed.inject(
       RulebasedConfiguratorConnector.CONFIGURATOR_ADAPTER_LIST
     );
+    configuratorCpqConfig = TestBed.inject(
+      ConfiguratorCoreConfig as Type<ConfiguratorCoreConfig>
+    );
     configuratorUtils.setOwnerKey(productConfiguration.owner);
+    setCpqOverOcc(false);
   });
 
   it('should be created', () => {
@@ -351,4 +392,58 @@ describe('RulebasedConfiguratorConnector', () => {
       );
     });
   });
+
+  describe('isAdapterMatching', () => {
+    function isAdapterMatching(
+      adapter: RulebasedConfiguratorAdapter,
+      configuratorType: string
+    ): boolean {
+      // we use call here to avoid losing 'this'-context
+      return service['isAdapterMatching'].call(
+        service,
+        adapter,
+        configuratorType
+      );
+    }
+
+    it('should match if configurator types are the same', () => {
+      const adapter = createMockAdapter(ConfiguratorType.VARIANT);
+      expect(isAdapterMatching(adapter, ConfiguratorType.VARIANT)).toBe(true);
+    });
+
+    it("shouldn't match if configurator types aren't the same", () => {
+      const adapter = createMockAdapter(ConfiguratorType.VARIANT);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(false);
+    });
+
+    it("shouldn't match if CPQ configurator type with cpqOverOcc flag is requested, but adapter doesn't support it", () => {
+      setCpqOverOcc(true);
+      const adapter = createMockAdapter(ConfiguratorType.CPQ, false);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(false);
+    });
+
+    it("shouldn't match if CPQ configurator type without cpqOverOcc flag is requested, but adapter supports it", () => {
+      setCpqOverOcc(false);
+      const adapter = createMockAdapter(ConfiguratorType.CPQ, true);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(false);
+    });
+
+    it('should match if CPQ configurator type with cpqOverOcc flag is requested and adapter supports it', () => {
+      setCpqOverOcc(true);
+      const adapter = createMockAdapter(ConfiguratorType.CPQ, true);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(true);
+    });
+
+    it("should match if CPQ configurator type without cpqOverOcc flag is requested and adapter doesn't support it", () => {
+      setCpqOverOcc(false);
+      const adapter = createMockAdapter(ConfiguratorType.CPQ, false);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(true);
+    });
+
+    it("should match if CPQ configurator with non-existing config is requested and adapter doesn't implement method", () => {
+      service['config'] = undefined;
+      const adapter = createMockAdapter(ConfiguratorType.CPQ);
+      expect(isAdapterMatching(adapter, ConfiguratorType.CPQ)).toBe(true);
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.ts b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.ts
index a2b59d7c25f..03dbb4603e6 100644
--- a/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.ts
+++ b/feature-libs/product-configurator/rulebased/core/connectors/rulebased-configurator.connector.ts
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Inject, Injectable, InjectionToken } from '@angular/core';
+import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
 import { CartModification } from '@spartacus/cart/base/root';
 import {
   CommonConfigurator,
   CommonConfiguratorUtilsService,
+  ConfiguratorType,
 } from '@spartacus/product-configurator/common';
 import { Observable } from 'rxjs';
+import { ConfiguratorCoreConfig } from '../config/configurator-core.config';
 import { Configurator } from '../model/configurator.model';
 import { RulebasedConfiguratorAdapter } from './rulebased-configurator.adapter';
 
@@ -21,10 +23,27 @@ export class RulebasedConfiguratorConnector {
     RulebasedConfiguratorAdapter[]
   >('ConfiguratorAdapterList');
 
+  // TODO(CXSPA-3392): make config a required dependency
+  constructor(
+    adapters: RulebasedConfiguratorAdapter[],
+    configUtilsService: CommonConfiguratorUtilsService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    config: ConfiguratorCoreConfig
+  );
+
+  /**
+   * @deprecated since 6.3
+   */
+  constructor(
+    adapters: RulebasedConfiguratorAdapter[],
+    configUtilsService: CommonConfiguratorUtilsService
+  );
+
   constructor(
     @Inject(RulebasedConfiguratorConnector.CONFIGURATOR_ADAPTER_LIST)
     protected adapters: RulebasedConfiguratorAdapter[],
-    protected configUtilsService: CommonConfiguratorUtilsService
+    protected configUtilsService: CommonConfiguratorUtilsService,
+    @Optional() protected config?: ConfiguratorCoreConfig
   ) {}
 
   createConfiguration(
@@ -128,8 +147,8 @@ export class RulebasedConfiguratorConnector {
   }
 
   protected getAdapter(configuratorType: string): RulebasedConfiguratorAdapter {
-    const adapterResult = this.adapters.find(
-      (adapter) => adapter.getConfiguratorType() === configuratorType
+    const adapterResult = this.adapters.find((adapter) =>
+      this.isAdapterMatching(adapter, configuratorType)
     );
     if (adapterResult) {
       return adapterResult;
@@ -139,4 +158,19 @@ export class RulebasedConfiguratorConnector {
       );
     }
   }
+
+  protected isAdapterMatching(
+    adapter: RulebasedConfiguratorAdapter,
+    configuratorType: string
+  ): boolean {
+    let matching = adapter.getConfiguratorType() === configuratorType;
+    if (matching && ConfiguratorType.CPQ === configuratorType) {
+      const isCpqOverOccRequested =
+        this.config?.productConfigurator?.cpqOverOcc ?? false;
+      const isCpqOverOccSupported =
+        !!adapter.supportsCpqOverOcc && adapter.supportsCpqOverOcc();
+      matching = isCpqOverOccRequested === isCpqOverOccSupported;
+    }
+    return matching;
+  }
 }
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.spec.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer-utils.service.spec.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.spec.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer-utils.service.spec.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer-utils.service.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer-utils.service.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer-utils.service.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.spec.ts
similarity index 98%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.spec.ts
index ddd6ea81e49..21932901bf1 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.spec.ts
@@ -164,6 +164,8 @@ const cpqConfigurationIncompleteConsistent: Cpq.Configuration = {
   numberOfConflicts: 0,
 };
 
+const cpqConfigurationId = '1234-56-7890';
+
 class MockLanguageService {
   getActive(): Observable<string> {
     return of('en-US');
@@ -231,6 +233,15 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(result.priceSummary?.selectedOptions?.formattedValue).toBe(
         '$2,333.33'
       );
+      expect(result.configId).toBe('');
+    });
+
+    it('should set configuration id if provided', () => {
+      const result = cpqConfiguratorNormalizer.convert({
+        ...cpqConfiguration,
+        configurationId: cpqConfigurationId,
+      });
+      expect(result.configId).toBe(cpqConfigurationId);
     });
 
     it('should set target to incomplete if incomplete attributes are undefined', () => {
@@ -1319,4 +1330,22 @@ describe('CpqConfiguratorNormalizer', () => {
       expect(value.valueDisplay).toEqual(mockCpqValue.valueDisplay);
     });
   });
+
+  describe('mapPAId', () => {
+    it("should map standard field name 'pA_ID' if present", () => {
+      expect(
+        cpqConfiguratorNormalizer['mapPAId'](<any>{
+          pA_ID: 123,
+          PA_ID: 456,
+        })
+      ).toBe('123');
+    });
+    it("should map fallback field name 'PA_ID' if standard field name 'pA_ID' is not present", () => {
+      expect(
+        cpqConfiguratorNormalizer['mapPAId'](<any>{
+          PA_ID: 456,
+        })
+      ).toBe('456');
+    });
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.ts
similarity index 94%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.ts
index d669b7a58e1..cd45e44cb6a 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-normalizer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-normalizer.ts
@@ -27,7 +27,7 @@ export class CpqConfiguratorNormalizer
   ): Configurator.Configuration {
     const resultTarget: Configurator.Configuration = {
       ...target,
-      configId: '', //will later be populated with final value
+      configId: source.configurationId ? source.configurationId : '', //if empty, will later be populated with final value
       complete: !source.incompleteAttributes?.length,
       consistent:
         !source.invalidMessages?.length &&
@@ -162,7 +162,7 @@ export class CpqConfiguratorNormalizer
   ): void {
     const attribute: Configurator.Attribute = {
       attrCode: sourceAttribute.stdAttrCode,
-      name: sourceAttribute.pA_ID.toString(),
+      name: this.mapPAId(sourceAttribute),
       description: sourceAttribute.description,
       label:
         this.cpqConfiguratorNormalizerUtilsService.convertAttributeLabel(
@@ -204,6 +204,19 @@ export class CpqConfiguratorNormalizer
     attributeList.push(attribute);
   }
 
+  /**
+   * In case the CPQ API is called via REST, the attribute id is returned using field name pA_ID.
+   * If we call CPQ via OCC the attribute is mapped to field name PA_ID.
+   * This can't be changed easily and is related to the non-standard conform name 'pA_ID';
+   * @param sourceAttribute source attribute
+   * @returns value of PA_ID or pA_ID, depending on which field is filled.
+   */
+  protected mapPAId(sourceAttribute: Cpq.Attribute): string {
+    return sourceAttribute.pA_ID
+      ? sourceAttribute.pA_ID.toString()
+      : (<any>sourceAttribute).PA_ID.toString();
+  }
+
   protected setSelectedSingleValue(attribute: Configurator.Attribute) {
     const values = attribute.values;
     if (values) {
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.spec.ts
similarity index 97%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.spec.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.spec.ts
index cef68e2dff7..e3c9bb5a33f 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.spec.ts
@@ -122,6 +122,8 @@ const multiSelectionProductValues: Cpq.Value[] = [
 
 const CURRENCY = 'USD';
 
+const configurationId = '1234-56-7890';
+
 class MockLanguageService {
   getActive(): Observable<string> {
     return of('en-US');
@@ -166,6 +168,17 @@ describe('CpqConfiguratorOverviewNormalizer', () => {
     expect(serviceUnderTest.convert(input).productCode).toEqual(PRODUCT_CODE);
   });
 
+  it('should set empty configuration id if not provided', () => {
+    expect(serviceUnderTest.convert(input).configId).toBe('');
+  });
+
+  it('should set configuration id if provided', () => {
+    expect(
+      serviceUnderTest.convert({ ...input, configurationId: configurationId })
+        .configId
+    ).toBe(configurationId);
+  });
+
   it('should calculate total number of issues', () => {
     expect(serviceUnderTest.convert(input).totalNumberOfIssues).toBe(6);
   });
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.ts
similarity index 98%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.ts
index 64cda3bfc11..2714f5c4f77 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-overview-normalizer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-overview-normalizer.ts
@@ -30,7 +30,7 @@ export class CpqConfiguratorOverviewNormalizer
   ): Configurator.Overview {
     const resultTarget: Configurator.Overview = {
       ...target,
-      configId: '',
+      configId: source.configurationId ? source.configurationId : '',
       productCode: source.productSystemId,
       priceSummary:
         this.cpqConfiguratorNormalizerUtilsService.convertPriceSummary(source),
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-serializer.spec.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.spec.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-serializer.spec.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-serializer.ts
similarity index 98%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-serializer.ts
index 87612a04457..fd7ec2f9896 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-serializer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-serializer.ts
@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
 import { Converter } from '@spartacus/core';
 import { Configurator } from '@spartacus/product-configurator/rulebased';
 import { Cpq } from '../cpq.models';
-import { CpqConfiguratorUtils } from './../cpq-configurator-utils';
+import { CpqConfiguratorUtils } from '../../rest/cpq-configurator-utils';
 
 const VALUE_SEPARATOR = ',';
 
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-value-serializer.spec.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-value-serializer.spec.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-value-serializer.spec.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-value-serializer.spec.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-value-serializer.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-value-serializer.ts
similarity index 95%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-value-serializer.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-value-serializer.ts
index f157738666d..5833813b04e 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator-value-serializer.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator-value-serializer.ts
@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
 import { Converter } from '@spartacus/core';
 import { Configurator } from '@spartacus/product-configurator/rulebased';
 import { Cpq } from '../cpq.models';
-import { CpqConfiguratorUtils } from './../cpq-configurator-utils';
+import { CpqConfiguratorUtils } from '../../rest/cpq-configurator-utils';
 
 @Injectable()
 export class CpqConfiguratorValueSerializer
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator.converters.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator.converters.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/cpq-configurator.converters.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/cpq-configurator.converters.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/converters/index.ts b/feature-libs/product-configurator/rulebased/cpq/common/converters/index.ts
similarity index 100%
rename from feature-libs/product-configurator/rulebased/cpq/rest/converters/index.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/converters/index.ts
diff --git a/feature-libs/product-configurator/rulebased/cpq/common/cpq-configurator-common.module.ts b/feature-libs/product-configurator/rulebased/cpq/common/cpq-configurator-common.module.ts
new file mode 100644
index 00000000000..3ab3762f98c
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/cpq/common/cpq-configurator-common.module.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+@NgModule({
+  imports: [CommonModule],
+  //TODO: CXSPA-3392 move converters from cpq-configurator-rest module here
+})
+export class CpqConfiguratorCommonModule {}
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq.models.ts b/feature-libs/product-configurator/rulebased/cpq/common/cpq.models.ts
similarity index 99%
rename from feature-libs/product-configurator/rulebased/cpq/rest/cpq.models.ts
rename to feature-libs/product-configurator/rulebased/cpq/common/cpq.models.ts
index 2c93d6e1aac..a2ae45a3e90 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq.models.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/common/cpq.models.ts
@@ -38,6 +38,7 @@ export namespace Cpq {
     responder?: Cpq.Responder;
     tabs?: Tab[];
     attributes?: Attribute[]; // attributes of current selected tab
+    configurationId?: string;
   }
 
   /**
diff --git a/feature-libs/product-configurator/rulebased/cpq/common/index.ts b/feature-libs/product-configurator/rulebased/cpq/common/index.ts
new file mode 100644
index 00000000000..ad21caa5253
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/cpq/common/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './converters/index';
+export * from './cpq-configurator-common.module';
+export * from './cpq.models';
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.spec.ts b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.spec.ts
new file mode 100644
index 00000000000..017608f0a3e
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.spec.ts
@@ -0,0 +1,285 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { Type } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { CartModification } from '@spartacus/cart/base/root';
+import {
+  CommonConfigurator,
+  ConfiguratorModelUtils,
+  ConfiguratorType,
+} from '@spartacus/product-configurator/common';
+import { Configurator } from '@spartacus/product-configurator/rulebased';
+import { of } from 'rxjs';
+import { ConfiguratorTestUtils } from '../../testing/configurator-test-utils';
+import { CpqConfiguratorOccService } from './cpq-configurator-occ.service';
+import { CpqConfiguratorOccAdapter } from './cpq-configurator-occ.adapter';
+
+const productCode = 'CONF_LAPTOP';
+const configId = '1234-56-7890';
+const userId = 'Anony';
+const documentId = '82736353';
+
+const owner: CommonConfigurator.Owner = {
+  type: CommonConfigurator.OwnerType.PRODUCT,
+  id: productCode,
+  key: ConfiguratorModelUtils.getOwnerKey(
+    CommonConfigurator.OwnerType.PRODUCT,
+    productCode
+  ),
+  configuratorType: ConfiguratorType.CPQ,
+};
+
+const productConfiguration: Configurator.Configuration = {
+  ...ConfiguratorTestUtils.createConfiguration(configId, owner),
+  productCode: productCode,
+};
+
+const groupId = '123';
+
+const inputForUpdateConfiguration: Configurator.Configuration = {
+  ...ConfiguratorTestUtils.createConfiguration(configId, owner),
+  productCode: productCode,
+};
+
+const addToCartParams: Configurator.AddToCartParameters = {
+  productCode: productCode,
+  quantity: 1,
+  configId: configId,
+  owner: owner,
+  userId: userId,
+  cartId: documentId,
+};
+
+const updateCartParams: Configurator.UpdateConfigurationForCartEntryParameters =
+  {
+    userId: userId,
+    cartId: documentId,
+    cartEntryNumber: '3',
+    configuration: ConfiguratorTestUtils.createConfiguration(configId, owner),
+  };
+
+const cartResponse: CartModification = {
+  quantityAdded: 1,
+  entry: { entryNumber: 3 },
+  statusCode: '201',
+};
+
+const readConfigCartParams: CommonConfigurator.ReadConfigurationFromCartEntryParameters =
+  {
+    userId: userId,
+    cartId: documentId,
+    cartEntryNumber: '3',
+    owner: owner,
+  };
+
+const readConfigOrderEntryParams: CommonConfigurator.ReadConfigurationFromOrderEntryParameters =
+  {
+    userId: userId,
+    orderId: documentId,
+    orderEntryNumber: '3',
+    owner: owner,
+  };
+
+const asSpy = (f: any) => <jasmine.Spy>f;
+
+describe('CpqConfiguratorOccAdapter', () => {
+  let adapterUnderTest: CpqConfiguratorOccAdapter;
+  let mockedOccService: CpqConfiguratorOccService;
+
+  beforeEach(() => {
+    mockedOccService = jasmine.createSpyObj('mockedOccService', [
+      'addToCart',
+      'getConfigIdForCartEntry',
+      'getConfigIdForOrderEntry',
+      'updateCartEntry',
+      'createConfiguration',
+      'readConfiguration',
+      'updateAttribute',
+      'updateValueQuantity',
+      'readConfigurationOverview',
+      'readConfigurationForCartEntry',
+      'readConfigurationForOrderEntry',
+    ]);
+
+    asSpy(mockedOccService.createConfiguration).and.callFake(() => {
+      return of(productConfiguration);
+    });
+
+    asSpy(mockedOccService.readConfiguration).and.callFake(() => {
+      return of(productConfiguration);
+    });
+
+    asSpy(mockedOccService.updateAttribute).and.callFake(() => {
+      return of(productConfiguration);
+    });
+    asSpy(mockedOccService.updateValueQuantity).and.callFake(() => {
+      return of(productConfiguration);
+    });
+    asSpy(mockedOccService.readConfigurationOverview).and.callFake(() => {
+      return of(productConfiguration);
+    });
+    asSpy(mockedOccService.addToCart).and.callFake(() => {
+      return of(cartResponse);
+    });
+    asSpy(mockedOccService.getConfigIdForCartEntry).and.callFake(() => {
+      return of(productConfiguration.configId);
+    });
+    asSpy(mockedOccService.getConfigIdForOrderEntry).and.callFake(() => {
+      return of(productConfiguration.configId);
+    });
+    asSpy(mockedOccService.updateCartEntry).and.callFake(() => {
+      return of(cartResponse);
+    });
+    asSpy(mockedOccService.getConfigIdForCartEntry).and.callFake(() => {
+      return of(productConfiguration.configId);
+    });
+    asSpy(mockedOccService.readConfigurationForCartEntry).and.callFake(() => {
+      return of(productConfiguration);
+    });
+    asSpy(mockedOccService.readConfigurationForOrderEntry).and.callFake(() => {
+      return of(productConfiguration);
+    });
+
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        CpqConfiguratorOccAdapter,
+        {
+          provide: CpqConfiguratorOccService,
+          useValue: mockedOccService,
+        },
+      ],
+    });
+
+    adapterUnderTest = TestBed.inject(
+      CpqConfiguratorOccAdapter as Type<CpqConfiguratorOccAdapter>
+    );
+
+    inputForUpdateConfiguration.updateType = Configurator.UpdateType.ATTRIBUTE;
+  });
+
+  it('should return correct configurator type', () => {
+    expect(adapterUnderTest.getConfiguratorType()).toEqual(
+      ConfiguratorType.CPQ
+    );
+  });
+
+  it('should state that this adapter supports CPQ API calls over OCC', () => {
+    expect(adapterUnderTest.supportsCpqOverOcc()).toBe(true);
+  });
+
+  it('should delegate create configuration to OCC service and map owner', () => {
+    adapterUnderTest.createConfiguration(owner).subscribe((config) => {
+      expect(config.owner).toEqual(owner);
+      expect(mockedOccService.createConfiguration).toHaveBeenCalledWith(
+        productCode
+      );
+    });
+  });
+
+  it('should delegate read configuration to OCC service and map owner', () => {
+    adapterUnderTest
+      .readConfiguration(productConfiguration.configId, groupId, owner)
+      .subscribe((config) => {
+        expect(config.owner).toEqual(owner);
+        expect(mockedOccService.readConfiguration).toHaveBeenCalledWith(
+          productConfiguration.configId,
+          groupId
+        );
+      });
+  });
+
+  // this ensures that there is a dummy response until the API is implemented,
+  // otherwise this leads to an NPE on the UI
+  it('should always return same configuration for price summary', () => {
+    adapterUnderTest
+      .readPriceSummary(productConfiguration)
+      .subscribe((config) => {
+        expect(config).toBe(productConfiguration);
+      });
+  });
+
+  it('should delegate update attribute to OCC service and map owner', () => {
+    adapterUnderTest
+      .updateConfiguration(inputForUpdateConfiguration)
+      .subscribe((config) => {
+        expect(config.owner).toEqual(owner);
+        expect(mockedOccService.updateAttribute).toHaveBeenCalledWith(
+          inputForUpdateConfiguration
+        );
+      });
+  });
+
+  it('should throw error in case overview is to be updated', () => {
+    expect(() => adapterUnderTest.updateConfigurationOverview()).toThrowError();
+  });
+
+  it('should delegate update value quantity to OCC service and map owner', () => {
+    inputForUpdateConfiguration.updateType =
+      Configurator.UpdateType.VALUE_QUANTITY;
+    adapterUnderTest
+      .updateConfiguration(inputForUpdateConfiguration)
+      .subscribe((config) => {
+        expect(config.owner).toEqual(owner);
+        expect(mockedOccService.updateValueQuantity).toHaveBeenCalledWith(
+          inputForUpdateConfiguration
+        );
+      });
+  });
+
+  it('should delegate read configuration overview to OCC service', () => {
+    adapterUnderTest
+      .getConfigurationOverview(productConfiguration.configId)
+      .subscribe((config) => {
+        expect(config.configId).toEqual(configId);
+        expect(mockedOccService.readConfigurationOverview).toHaveBeenCalledWith(
+          productConfiguration.configId
+        );
+      });
+  });
+
+  it('should throw exception if variant search is attempted', () => {
+    expect(() => adapterUnderTest.searchVariants()).toThrowError();
+  });
+
+  it('should delegate addToCart to OCC service', () => {
+    adapterUnderTest.addToCart(addToCartParams).subscribe((response) => {
+      expect(response).toEqual(cartResponse);
+      expect(mockedOccService.addToCart).toHaveBeenCalledWith(addToCartParams);
+    });
+  });
+
+  it('should delegate readConfigurationForCartEntry to OCC service', () => {
+    adapterUnderTest
+      .readConfigurationForCartEntry(readConfigCartParams)
+      .subscribe((response) => {
+        expect(response).toBe(productConfiguration);
+        expect(response.owner).toBe(readConfigCartParams.owner);
+        expect(
+          mockedOccService.readConfigurationForCartEntry
+        ).toHaveBeenCalledWith(readConfigCartParams);
+      });
+  });
+
+  it('should delegate readConfigurationForOrderEntry to OCC service', () => {
+    adapterUnderTest
+      .readConfigurationForOrderEntry(readConfigOrderEntryParams)
+      .subscribe((response) => {
+        expect(response).toBe(productConfiguration);
+        expect(response.owner).toBe(readConfigOrderEntryParams.owner);
+        expect(
+          mockedOccService.readConfigurationForOrderEntry
+        ).toHaveBeenCalledWith(readConfigOrderEntryParams);
+      });
+  });
+
+  it('should delegate updateCart to OCC service', () => {
+    adapterUnderTest
+      .updateConfigurationForCartEntry(updateCartParams)
+      .subscribe((response) => {
+        expect(response).toEqual(cartResponse);
+        expect(mockedOccService.updateCartEntry).toHaveBeenCalledWith(
+          updateCartParams
+        );
+      });
+  });
+});
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.ts b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.ts
new file mode 100644
index 00000000000..7802fb3ed54
--- /dev/null
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.adapter.ts
@@ -0,0 +1,129 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { CartModification } from '@spartacus/cart/base/root';
+import {
+  CommonConfigurator,
+  ConfiguratorType,
+} from '@spartacus/product-configurator/common';
+import {
+  Configurator,
+  RulebasedConfiguratorAdapter,
+} from '@spartacus/product-configurator/rulebased';
+import { Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { CpqConfiguratorOccService } from './cpq-configurator-occ.service';
+
+@Injectable()
+export class CpqConfiguratorOccAdapter implements RulebasedConfiguratorAdapter {
+  constructor(protected cpqOccService: CpqConfiguratorOccService) {}
+
+  getConfiguratorType(): string {
+    return ConfiguratorType.CPQ;
+  }
+
+  supportsCpqOverOcc(): boolean {
+    return true;
+  }
+
+  createConfiguration(
+    owner: CommonConfigurator.Owner
+  ): Observable<Configurator.Configuration> {
+    // no error handling for missing owner id needed, as it's a
+    // mandatory attribute in owner
+    return this.cpqOccService.createConfiguration(owner.id).pipe(
+      map((configResponse) => {
+        configResponse.owner = owner;
+        return configResponse;
+      })
+    );
+  }
+
+  readConfiguration(
+    configId: string,
+    groupId: string,
+    owner: CommonConfigurator.Owner
+  ): Observable<Configurator.Configuration> {
+    return this.cpqOccService.readConfiguration(configId, groupId).pipe(
+      map((configResponse) => {
+        configResponse.owner = owner;
+        return configResponse;
+      })
+    );
+  }
+
+  updateConfiguration(
+    configuration: Configurator.Configuration
+  ): Observable<Configurator.Configuration> {
+    const updateMethod =
+      configuration.updateType === Configurator.UpdateType.VALUE_QUANTITY
+        ? this.cpqOccService.updateValueQuantity
+        : this.cpqOccService.updateAttribute;
+    return updateMethod.call(this.cpqOccService, configuration).pipe(
+      map((configResponse: Configurator.Configuration) => {
+        configResponse.owner = configuration.owner;
+        return configResponse;
+      })
+    );
+  }
+
+  updateConfigurationOverview(): Observable<Configurator.Overview> {
+    throw new Error(
+      'Update the configuration overview is not supported for the CPQ configurator'
+    );
+  }
+
+  addToCart(
+    parameters: Configurator.AddToCartParameters
+  ): Observable<CartModification> {
+    return this.cpqOccService.addToCart(parameters);
+  }
+
+  readConfigurationForCartEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromCartEntryParameters
+  ): Observable<Configurator.Configuration> {
+    return this.cpqOccService.readConfigurationForCartEntry(parameters).pipe(
+      map((configResponse) => {
+        configResponse.owner = parameters.owner;
+        return configResponse;
+      })
+    );
+  }
+
+  updateConfigurationForCartEntry(
+    parameters: Configurator.UpdateConfigurationForCartEntryParameters
+  ): Observable<CartModification> {
+    return this.cpqOccService.updateCartEntry(parameters);
+  }
+
+  readConfigurationForOrderEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromOrderEntryParameters
+  ): Observable<Configurator.Configuration> {
+    return this.cpqOccService.readConfigurationForOrderEntry(parameters).pipe(
+      map((configResponse) => {
+        configResponse.owner = parameters.owner;
+        return configResponse;
+      })
+    );
+  }
+
+  readPriceSummary(
+    configuration: Configurator.Configuration
+  ): Observable<Configurator.Configuration> {
+    return of(configuration); // so that UI does not run into exception
+  }
+
+  getConfigurationOverview(
+    configId: string
+  ): Observable<Configurator.Overview> {
+    return this.cpqOccService.readConfigurationOverview(configId);
+  }
+
+  searchVariants(): Observable<Configurator.Variant[]> {
+    throw new Error('searchVariants is not supported for the CPQ configurator');
+  }
+}
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.module.ts b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.module.ts
index 66e4a1b49bc..31ffde4d629 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.module.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.module.ts
@@ -14,6 +14,8 @@ import {
 import { OccConfiguratorCpqAddToCartSerializer } from './converters/occ-configurator-cpq-add-to-cart-serializer';
 import { defaultOccCpqConfiguratorConfigFactory } from './default-occ-configurator-cpq-config';
 import { provideDefaultConfigFactory } from '@spartacus/core';
+import { RulebasedConfiguratorConnector } from '@spartacus/product-configurator/rulebased';
+import { CpqConfiguratorOccAdapter } from './cpq-configurator-occ.adapter';
 
 @NgModule({
   imports: [CommonModule],
@@ -29,6 +31,11 @@ import { provideDefaultConfigFactory } from '@spartacus/core';
       useExisting: OccConfiguratorCpqUpdateCartEntrySerializer,
       multi: true,
     },
+    {
+      provide: RulebasedConfiguratorConnector.CONFIGURATOR_ADAPTER_LIST,
+      useClass: CpqConfiguratorOccAdapter,
+      multi: true,
+    },
   ],
 })
 export class CpqConfiguratorOccModule {}
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.spec.ts b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.spec.ts
index 7af46ae26fa..de9b80de843 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.spec.ts
@@ -26,6 +26,13 @@ import {
   CPQ_CONFIGURATOR_UPDATE_CART_ENTRY_SERIALIZER,
 } from './converters/cpq-configurator-occ.converters';
 import { CpqConfiguratorOccService } from './cpq-configurator-occ.service';
+import {
+  CPQ_CONFIGURATOR_NORMALIZER,
+  CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER,
+  CPQ_CONFIGURATOR_SERIALIZER,
+  CPQ_CONFIGURATOR_QUANTITY_SERIALIZER,
+} from '../common/converters/cpq-configurator.converters';
+import { Cpq } from '../common/cpq.models';
 
 describe('CpqConfigurationOccService', () => {
   const configId = '1234-56-7890';
@@ -72,7 +79,7 @@ describe('CpqConfigurationOccService', () => {
       },
     };
 
-  const readConfigCartParams: CommonConfigurator.ReadConfigurationFromCartEntryParameters =
+  const readConfigCartEntryParams: CommonConfigurator.ReadConfigurationFromCartEntryParameters =
     {
       userId: userId,
       cartId: documentId,
@@ -104,6 +111,45 @@ describe('CpqConfigurationOccService', () => {
       },
     };
 
+  const errorMessages = ['error message 1', 'error message 2'];
+  const numberOfConflicts = 2;
+  const attributeCode = '111';
+  const attributeValueId = 'abc';
+  const tabId = '11';
+
+  const cpqConfiguration: Cpq.Configuration = {
+    productSystemId: productCode,
+    currencyISOCode: 'USD',
+    errorMessages: errorMessages,
+    numberOfConflicts: numberOfConflicts,
+    configurationId: configId,
+  };
+
+  const configuration: Configurator.Configuration = {
+    ...ConfiguratorTestUtils.createConfiguration(
+      configId,
+      ConfiguratorModelUtils.createInitialOwner()
+    ),
+    productCode: productCode,
+  };
+
+  const updateAttribute: Cpq.UpdateAttribute = {
+    configurationId: configId,
+    standardAttributeCode: attributeCode,
+    changeAttributeValue: {
+      attributeValueIds: attributeValueId,
+    },
+    tabId: tabId,
+  };
+
+  const updateValue: Cpq.UpdateValue = {
+    configurationId: configId,
+    standardAttributeCode: attributeCode,
+    attributeValueId: attributeValueId,
+    quantity: 5,
+    tabId: tabId,
+  };
+
   class MockOccEndpointsService {
     buildUrl(
       endpoint: string,
@@ -145,7 +191,6 @@ describe('CpqConfigurationOccService', () => {
       CpqConfiguratorOccService as Type<CpqConfiguratorOccService>
     );
 
-    spyOn(converterService, 'convert').and.callThrough();
     spyOn(occEnpointsService, 'buildUrl').and.callThrough();
     spyOn(converterService, 'pipeable').and.callThrough();
   });
@@ -155,6 +200,7 @@ describe('CpqConfigurationOccService', () => {
   });
 
   it('should call addToCart endpoint', () => {
+    spyOn(converterService, 'convert').and.callThrough();
     serviceUnderTest.addToCart(addToCartParams).subscribe((response) => {
       expect(response).toBe(cartResponse);
     });
@@ -185,7 +231,7 @@ describe('CpqConfigurationOccService', () => {
 
   it('should call readCpqConfigurationForCartEntry endpoint', () => {
     serviceUnderTest
-      .getConfigIdForCartEntry(readConfigCartParams)
+      .getConfigIdForCartEntry(readConfigCartEntryParams)
       .subscribe((response) => {
         expect(response).toBe(configId);
       });
@@ -236,6 +282,7 @@ describe('CpqConfigurationOccService', () => {
   });
 
   it('should call upateCart endpoint', () => {
+    spyOn(converterService, 'convert').and.callThrough();
     serviceUnderTest.updateCartEntry(updateCartParams).subscribe((response) => {
       expect(response).toBe(cartResponse);
     });
@@ -266,4 +313,229 @@ describe('CpqConfigurationOccService', () => {
       }
     );
   });
+
+  it('should create a configuration and call normalizer', () => {
+    serviceUnderTest.createConfiguration(productCode).subscribe((config) => {
+      expect(config.errorMessages).toBe(errorMessages);
+    });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return req.method === 'GET' && req.url === 'createCpqConfiguration';
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'createCpqConfiguration',
+      {
+        urlParams: {
+          productCode: productCode,
+        },
+      }
+    );
+  });
+
+  it('should read the default configuration tab and call normalizer', () => {
+    serviceUnderTest.readConfiguration(configId).subscribe((config) => {
+      expect(config.errorMessages).toBe(errorMessages);
+    });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return req.method === 'GET' && req.url === 'readCpqConfiguration';
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'readCpqConfiguration',
+      {
+        urlParams: {
+          configurationId: configId,
+        },
+        queryParams: undefined,
+      }
+    );
+  });
+
+  it('should read the desired configuration tab and call normalizer', () => {
+    serviceUnderTest.readConfiguration(configId, tabId).subscribe((config) => {
+      expect(config.errorMessages).toBe(errorMessages);
+    });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return req.method === 'GET' && req.url === 'readCpqConfiguration';
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'readCpqConfiguration',
+      {
+        urlParams: {
+          configurationId: configId,
+        },
+        queryParams: {
+          tabId: tabId,
+        },
+      }
+    );
+  });
+
+  it('should read the configuration overview and call the overview normalizer', () => {
+    serviceUnderTest.readConfigurationOverview(configId).subscribe((config) => {
+      expect(config.numberOfConflicts).toBe(numberOfConflicts);
+    });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return req.method === 'GET' && req.url === 'readCpqConfigurationOverview';
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'readCpqConfigurationOverview',
+      {
+        urlParams: {
+          configurationId: configId,
+        },
+      }
+    );
+  });
+
+  it('should call serializer, update an attribute, retrieve configuration and call normalizer', () => {
+    spyOn(converterService, 'convert').and.returnValue(updateAttribute);
+    serviceUnderTest.updateAttribute(configuration).subscribe((config) => {
+      expect(config.errorMessages).toBe(errorMessages);
+    });
+
+    expect(converterService.convert).toHaveBeenCalledWith(
+      configuration,
+      CPQ_CONFIGURATOR_SERIALIZER
+    );
+
+    const mockReq = httpMock.expectOne((req) => {
+      return req.method === 'PATCH' && req.url === 'updateCpqAttribute';
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'updateCpqAttribute',
+      {
+        urlParams: {
+          configurationId: configId,
+          attributeCode: attributeCode,
+        },
+        queryParams: {
+          tabId: tabId,
+        },
+      }
+    );
+  });
+
+  it('should call serializer, update an attribute value quantity, retrieve configuration and call normalizer', () => {
+    spyOn(converterService, 'convert').and.returnValue(updateValue);
+    serviceUnderTest.updateValueQuantity(configuration).subscribe((config) => {
+      expect(config.errorMessages).toBe(errorMessages);
+    });
+
+    expect(converterService.convert).toHaveBeenCalledWith(
+      configuration,
+      CPQ_CONFIGURATOR_QUANTITY_SERIALIZER
+    );
+
+    const mockReq = httpMock.expectOne((req) => {
+      return (
+        req.method === 'PATCH' && req.url === 'updateCpqAttributeValueQuantity'
+      );
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(converterService.pipeable).toHaveBeenCalledWith(
+      CPQ_CONFIGURATOR_NORMALIZER
+    );
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'updateCpqAttributeValueQuantity',
+      {
+        urlParams: {
+          configurationId: configId,
+          attributeCode: attributeCode,
+          attributeValueId: attributeValueId,
+        },
+        queryParams: {
+          tabId: tabId,
+        },
+      }
+    );
+  });
+
+  it('should read the configuration for a cart entry and call normalizer', () => {
+    serviceUnderTest
+      .readConfigurationForCartEntry(readConfigCartEntryParams)
+      .subscribe((config) => {
+        expect(config.errorMessages).toBe(errorMessages);
+      });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return (
+        req.method === 'GET' &&
+        req.url === 'readCpqConfigurationForCartEntryFull'
+      );
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'readCpqConfigurationForCartEntryFull',
+      {
+        urlParams: {
+          userId: userId,
+          cartId: documentId,
+          cartEntryNumber: '3',
+        },
+      }
+    );
+  });
+
+  it('should read the configuration for an order entry and call normalizer', () => {
+    serviceUnderTest
+      .readConfigurationForOrderEntry(readConfigOrderEntryParams)
+      .subscribe((config) => {
+        expect(config.errorMessages).toBe(errorMessages);
+      });
+
+    const mockReq = httpMock.expectOne((req) => {
+      return (
+        req.method === 'GET' &&
+        req.url === 'readCpqConfigurationForOrderEntryFull'
+      );
+    });
+    mockReq.flush(cpqConfiguration);
+
+    expect(occEnpointsService.buildUrl).toHaveBeenCalledWith(
+      'readCpqConfigurationForOrderEntryFull',
+      {
+        urlParams: {
+          userId: userId,
+          orderId: documentId,
+          orderEntryNumber: '3',
+        },
+      }
+    );
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.ts b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.ts
index 4749ac5596e..14084622b3f 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/cpq-configurator-occ.service.ts
@@ -19,6 +19,13 @@ import {
   CPQ_CONFIGURATOR_ADD_TO_CART_SERIALIZER,
   CPQ_CONFIGURATOR_UPDATE_CART_ENTRY_SERIALIZER,
 } from './converters/cpq-configurator-occ.converters';
+import {
+  CPQ_CONFIGURATOR_NORMALIZER,
+  CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER,
+  CPQ_CONFIGURATOR_QUANTITY_SERIALIZER,
+  CPQ_CONFIGURATOR_SERIALIZER,
+} from '../common/converters/cpq-configurator.converters';
+import { Cpq } from '../common/cpq.models';
 
 @Injectable({ providedIn: 'root' })
 export class CpqConfiguratorOccService {
@@ -113,4 +120,220 @@ export class CpqConfiguratorOccService {
       })
     );
   }
+
+  /**
+   * Creates a new default runtime configuration for the given product id
+   * and read it from the CPQ system over OCC.
+   *
+   * @param {string} productSystemId - Product system ID
+   * @returns {Observable<Configurator.Configuration>} - Created configuration
+   */
+  createConfiguration(
+    productSystemId: string
+  ): Observable<Configurator.Configuration> {
+    return this.callCreateConfiguration(productSystemId).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  /**
+   * Retrieves a configuration from the CPQ system over OCC by its configuration ID and for a certain tab.
+   *
+   * @param {string} configId - Configuration ID
+   * @param {string} tabId - Tab ID
+   * @returns {Observable<Configurator.Configuration>} - Retrieved configuration
+   */
+  readConfiguration(
+    configId: string,
+    tabId?: string
+  ): Observable<Configurator.Configuration> {
+    return this.callReadConfiguration(configId, tabId).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  /**
+   * Retrieves a configuration overview from the CPQ system over OCC by its configuration ID.
+   *
+   * @param {string} configId - Configuration ID
+   * @returns {Observable<Configurator.Overview>} - Retrieved overview
+   */
+  readConfigurationOverview(
+    configId: string
+  ): Observable<Configurator.Overview> {
+    return this.callReadConfigurationOverview(configId).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER)
+    );
+  }
+
+  /**
+   * Updates an attribute of the runtime configuration for the given configuration id and attribute code
+   * and read the desired configuration tab from the CPQ system over OCC.
+   *
+   * @param {Configurator.Configuration} configuration - Configuration
+   * @returns {Observable<Configurator.Configuration>} - Updated configuration
+   */
+  updateAttribute(
+    configuration: Configurator.Configuration
+  ): Observable<Configurator.Configuration> {
+    const updateAttribute: Cpq.UpdateAttribute = this.converterService.convert(
+      configuration,
+      CPQ_CONFIGURATOR_SERIALIZER
+    );
+    return this.callUpdateAttribute(updateAttribute).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  /**
+   * Updates a quantity for an attribute of the runtime configuration for the given configuration id and attribute code
+   * and read the desired configuration tab from the CPQ system over OCC.
+   *
+   * @param {Configurator.Configuration} configuration - Configuration
+   * @returns {Observable<Configurator.Configuration>} - Updated configuration
+   */
+  updateValueQuantity(
+    configuration: Configurator.Configuration
+  ): Observable<Configurator.Configuration> {
+    const updateValue: Cpq.UpdateValue = this.converterService.convert(
+      configuration,
+      CPQ_CONFIGURATOR_QUANTITY_SERIALIZER
+    );
+    return this.callUpdateValue(updateValue).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  /**
+   * Retrieves a configuration assigned to a cart entry.
+   *
+   * @param {CommonConfigurator.ReadConfigurationFromCartEntryParameters} parameters - Cart entry parameters
+   * @returns {Observable<Configurator.Configuration>} - Retrieved configuration
+   */
+  readConfigurationForCartEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromCartEntryParameters
+  ): Observable<Configurator.Configuration> {
+    return this.callReadConfigurationForCartEntry(parameters).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  /**
+   * Retrieves a configuration assigned to an order entry.
+   *
+   * @param {CommonConfigurator.ReadConfigurationFromOrderEntryParameters} parameters - Order entry parameters
+   * @returns {Observable<Configurator.Configuration>} - Retrieved configuration
+   */
+  readConfigurationForOrderEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromOrderEntryParameters
+  ): Observable<Configurator.Configuration> {
+    return this.callReadConfigurationForOrderEntry(parameters).pipe(
+      this.converterService.pipeable(CPQ_CONFIGURATOR_NORMALIZER)
+    );
+  }
+
+  protected callCreateConfiguration(
+    productSystemId: string
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl('createCpqConfiguration', {
+      urlParams: {
+        productCode: productSystemId,
+      },
+    });
+    return this.http.get<Cpq.Configuration>(url);
+  }
+
+  protected callReadConfiguration(
+    configId: string,
+    tabId?: string
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl('readCpqConfiguration', {
+      urlParams: {
+        configurationId: configId,
+      },
+      queryParams: tabId ? { tabId: tabId } : undefined,
+    });
+    return this.http.get<Cpq.Configuration>(url);
+  }
+
+  protected callReadConfigurationOverview(
+    configId: string
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl(
+      'readCpqConfigurationOverview',
+      {
+        urlParams: {
+          configurationId: configId,
+        },
+      }
+    );
+    return this.http.get<Cpq.Configuration>(url);
+  }
+
+  protected callUpdateAttribute(
+    updateAttribute: Cpq.UpdateAttribute
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl('updateCpqAttribute', {
+      urlParams: {
+        configurationId: updateAttribute.configurationId,
+        attributeCode: updateAttribute.standardAttributeCode,
+      },
+      queryParams: { tabId: updateAttribute.tabId },
+    });
+    return this.http.patch<Cpq.Configuration>(
+      url,
+      updateAttribute.changeAttributeValue
+    );
+  }
+
+  protected callUpdateValue(
+    updateValue: Cpq.UpdateValue
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl(
+      'updateCpqAttributeValueQuantity',
+      {
+        urlParams: {
+          configurationId: updateValue.configurationId,
+          attributeCode: updateValue.standardAttributeCode,
+          attributeValueId: updateValue.attributeValueId,
+        },
+        queryParams: { tabId: updateValue.tabId },
+      }
+    );
+    return this.http.patch<Cpq.Configuration>(url, {
+      quantity: updateValue.quantity,
+    });
+  }
+
+  protected callReadConfigurationForCartEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromCartEntryParameters
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl(
+      'readCpqConfigurationForCartEntryFull',
+      {
+        urlParams: {
+          userId: parameters.userId,
+          cartId: parameters.cartId,
+          cartEntryNumber: parameters.cartEntryNumber,
+        },
+      }
+    );
+    return this.http.get<Cpq.Configuration>(url);
+  }
+
+  protected callReadConfigurationForOrderEntry(
+    parameters: CommonConfigurator.ReadConfigurationFromOrderEntryParameters
+  ): Observable<Cpq.Configuration> {
+    const url = this.occEndpointsService.buildUrl(
+      'readCpqConfigurationForOrderEntryFull',
+      {
+        urlParams: {
+          userId: parameters.userId,
+          orderId: parameters.orderId,
+          orderEntryNumber: parameters.orderEntryNumber,
+        },
+      }
+    );
+    return this.http.get<Cpq.Configuration>(url);
+  }
 }
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/default-occ-configurator-cpq-config.ts b/feature-libs/product-configurator/rulebased/cpq/occ/default-occ-configurator-cpq-config.ts
index cabfbc83dce..b986ccd9e13 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/default-occ-configurator-cpq-config.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/default-occ-configurator-cpq-config.ts
@@ -20,6 +20,20 @@ export function defaultOccCpqConfiguratorConfigFactory(): OccConfig {
             'users/${userId}/orders/${orderId}/entries/${orderEntryNumber}/cpqconfigurator',
           updateCpqConfigurationForCartEntry:
             'users/${userId}/carts/${cartId}/entries/${cartEntryNumber}/cpqconfigurator',
+          createCpqConfiguration:
+            'products/${productCode}/configurators/cpqconfigurator',
+          readCpqConfiguration:
+            'cpqconfigurator/${configurationId}/configuration?tabId=${tabId}',
+          readCpqConfigurationOverview:
+            'cpqconfigurator/${configurationId}/configurationOverview',
+          updateCpqAttribute:
+            'cpqconfigurator/${configurationId}/attributes/${attributeCode}?tabId=${tabId}',
+          updateCpqAttributeValueQuantity:
+            'cpqconfigurator/${configurationId}/attributes/${attributeCode}/values/${attributeValueId}?tabId=${tabId}',
+          readCpqConfigurationForCartEntryFull:
+            'users/${userId}/carts/${cartId}/entries/${cartEntryNumber}/cpqconfigurator/configuration',
+          readCpqConfigurationForOrderEntryFull:
+            'users/${userId}/orders/${orderId}/entries/${orderEntryNumber}/cpqconfigurator/configuration',
         },
       },
     },
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/index.ts b/feature-libs/product-configurator/rulebased/cpq/occ/index.ts
index b81127cd51f..d5210756a39 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/index.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/index.ts
@@ -8,4 +8,5 @@ export * from './converters/index';
 export * from './cpq-configurator-occ.models';
 export * from './cpq-configurator-occ.module';
 export * from './cpq-configurator-occ.service';
+export * from './cpq-configurator-occ.adapter';
 export * from './model/index';
diff --git a/feature-libs/product-configurator/rulebased/cpq/occ/model/occ-cpq-configurator-endpoints.model.ts b/feature-libs/product-configurator/rulebased/cpq/occ/model/occ-cpq-configurator-endpoints.model.ts
index 44974524abf..6fac0b02f21 100644
--- a/feature-libs/product-configurator/rulebased/cpq/occ/model/occ-cpq-configurator-endpoints.model.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/occ/model/occ-cpq-configurator-endpoints.model.ts
@@ -24,12 +24,40 @@ declare module '@spartacus/core' {
      */
     updateCpqConfigurationForCartEntry?: string | OccEndpoint;
     /**
-     * Endpoint for reading a CPQ configuration attached to the given cart entry
+     * Endpoint for reading the Id of a CPQ configuration attached to the given cart entry
      */
     readCpqConfigurationForCartEntry?: string | OccEndpoint;
     /**
-     * Endpoint for reading a CPQ configuration attached to a given order entry
+     * Endpoint for reading the Id of a CPQ configuration attached to the given order entry
      */
     readCpqConfigurationForOrderEntry?: string | OccEndpoint;
+    /**
+     * Endpoint for creation a CPQ configuration over OCC
+     */
+    createCpqConfiguration?: string | OccEndpoint;
+    /**
+     * Endpoint for retrieving a CPQ configuration over OCC
+     */
+    readCpqConfiguration?: string | OccEndpoint;
+    /**
+     * Endpoint for retrieving a CPQ configuration overview over OCC
+     */
+    readCpqConfigurationOverview?: string | OccEndpoint;
+    /**
+     * Endpoint for update a CPQ attribute over OCC
+     */
+    updateCpqAttribute?: string | OccEndpoint;
+    /**
+     * Endpoint for update a CPQ attribute value quantity over OCC
+     */
+    updateCpqAttributeValueQuantity?: string | OccEndpoint;
+    /**
+     * Endpoint for reading a CPQ configuration attached to the given cart entry over OCC
+     */
+    readCpqConfigurationForCartEntryFull?: string | OccEndpoint;
+    /**
+     * Endpoint for reading a CPQ configuration attached to a given order entry over OCC
+     */
+    readCpqConfigurationForOrderEntryFull?: string | OccEndpoint;
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/cpq/public_api.ts b/feature-libs/product-configurator/rulebased/cpq/public_api.ts
index 781e15ddc6b..2afe4abace1 100644
--- a/feature-libs/product-configurator/rulebased/cpq/public_api.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/public_api.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+export * from './common/index';
 export * from './occ/index';
 export * from './rest/index';
 export * from './rulebased-cpq-configurator.module';
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.spec.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.spec.ts
index 5bb25414aa6..02c208541bd 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.spec.ts
@@ -284,4 +284,8 @@ describe('CpqConfiguratorRestAdapter', () => {
         );
       });
   });
+
+  it("shouldn't support CPQ over OCC mode", () => {
+    expect(adapterUnderTest.supportsCpqOverOcc()).toBe(false);
+  });
 });
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.ts
index c9bc7041082..2a275ec3383 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.adapter.ts
@@ -32,6 +32,10 @@ export class CpqConfiguratorRestAdapter
     return ConfiguratorType.CPQ;
   }
 
+  supportsCpqOverOcc(): boolean {
+    return false;
+  }
+
   createConfiguration(
     owner: CommonConfigurator.Owner
   ): Observable<Configurator.Configuration> {
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.module.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.module.ts
index da047968394..07b4af13576 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.module.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.module.ts
@@ -8,16 +8,16 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { provideDefaultConfig } from '@spartacus/core';
 import { RulebasedConfiguratorConnector } from '@spartacus/product-configurator/rulebased';
-import { CpqConfiguratorNormalizer } from './converters/cpq-configurator-normalizer';
-import { CpqConfiguratorOverviewNormalizer } from './converters/cpq-configurator-overview-normalizer';
-import { CpqConfiguratorSerializer } from './converters/cpq-configurator-serializer';
-import { CpqConfiguratorValueSerializer } from './converters/cpq-configurator-value-serializer';
+import { CpqConfiguratorNormalizer } from '../common/converters/cpq-configurator-normalizer';
+import { CpqConfiguratorOverviewNormalizer } from '../common/converters/cpq-configurator-overview-normalizer';
+import { CpqConfiguratorSerializer } from '../common/converters/cpq-configurator-serializer';
+import { CpqConfiguratorValueSerializer } from '../common/converters/cpq-configurator-value-serializer';
 import {
   CPQ_CONFIGURATOR_NORMALIZER,
   CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER,
   CPQ_CONFIGURATOR_QUANTITY_SERIALIZER,
   CPQ_CONFIGURATOR_SERIALIZER,
-} from './converters/cpq-configurator.converters';
+} from '../common/converters/cpq-configurator.converters';
 import { CpqConfiguratorRestAdapter } from './cpq-configurator-rest.adapter';
 import { defaultCpqConfiguratorEndpointConfig } from './default-cpq-configurator-endpoint.config';
 
@@ -30,6 +30,7 @@ import { defaultCpqConfiguratorEndpointConfig } from './default-cpq-configurator
       useClass: CpqConfiguratorRestAdapter,
       multi: true,
     },
+    //TODO: CXSPA-3392 move converters from here to cpq-configurator-common module
     {
       provide: CPQ_CONFIGURATOR_NORMALIZER,
       useClass: CpqConfiguratorNormalizer,
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.spec.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.spec.ts
index 78ddc2c9e20..0e46dd6a3e7 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.spec.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.spec.ts
@@ -13,11 +13,11 @@ import {
   CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER,
   CPQ_CONFIGURATOR_QUANTITY_SERIALIZER,
   CPQ_CONFIGURATOR_SERIALIZER,
-} from './converters/cpq-configurator.converters';
+} from '../common/converters/cpq-configurator.converters';
 import { CpqConfiguratorEndpointConfig } from './cpq-configurator-endpoint.config';
 import { CpqConfiguratorRestAdapter } from './cpq-configurator-rest.adapter';
 import { CpqConfiguratorRestService } from './cpq-configurator-rest.service';
-import { Cpq } from './cpq.models';
+import { Cpq } from '../common/cpq.models';
 import { defaultCpqConfiguratorEndpointConfig } from './default-cpq-configurator-endpoint.config';
 
 const productCode = 'CONF_LAPTOP';
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.ts b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.ts
index 2a1bd0b5fd0..928f10eb272 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/cpq-configurator-rest.service.ts
@@ -15,9 +15,9 @@ import {
   CPQ_CONFIGURATOR_OVERVIEW_NORMALIZER,
   CPQ_CONFIGURATOR_QUANTITY_SERIALIZER,
   CPQ_CONFIGURATOR_SERIALIZER,
-} from './converters/cpq-configurator.converters';
+} from '../common/converters/cpq-configurator.converters';
 import { CpqConfiguratorEndpointService } from './cpq-configurator-endpoint.service';
-import { Cpq } from './cpq.models';
+import { Cpq } from '../common/cpq.models';
 
 @Injectable({ providedIn: 'root' })
 export class CpqConfiguratorRestService {
diff --git a/feature-libs/product-configurator/rulebased/cpq/rest/index.ts b/feature-libs/product-configurator/rulebased/cpq/rest/index.ts
index 7b0ff2af369..c25abcb5104 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rest/index.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rest/index.ts
@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './converters/index';
 export * from './cpq-configurator-endpoint.config';
 export * from './cpq-configurator-endpoint.service';
 export * from './cpq-configurator-rest.adapter';
 export * from './cpq-configurator-rest.module';
 export * from './cpq-configurator-rest.service';
 export * from './cpq-configurator-utils';
-export * from './cpq.models';
diff --git a/feature-libs/product-configurator/rulebased/cpq/rulebased-cpq-configurator.module.ts b/feature-libs/product-configurator/rulebased/cpq/rulebased-cpq-configurator.module.ts
index 8233a0a4715..d57f09b12e1 100644
--- a/feature-libs/product-configurator/rulebased/cpq/rulebased-cpq-configurator.module.ts
+++ b/feature-libs/product-configurator/rulebased/cpq/rulebased-cpq-configurator.module.ts
@@ -5,6 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
+import { CpqConfiguratorCommonModule } from './common/cpq-configurator-common.module';
 import { CpqConfiguratorOccModule } from './occ/cpq-configurator-occ.module';
 import { CpqConfiguratorRestModule } from './rest/cpq-configurator-rest.module';
 
@@ -13,6 +14,10 @@ import { CpqConfiguratorRestModule } from './rest/cpq-configurator-rest.module';
  * REST APIs and to commerce via OCC
  */
 @NgModule({
-  imports: [CpqConfiguratorOccModule, CpqConfiguratorRestModule],
+  imports: [
+    CpqConfiguratorCommonModule,
+    CpqConfiguratorOccModule,
+    CpqConfiguratorRestModule,
+  ],
 })
 export class RulebasedCpqConfiguratorModule {}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
index c4c0698173a..6c7348d5060 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
@@ -92,500 +92,587 @@ const ATTR_NAMES = {
   ],
 };
 
-const CPQ_BACKEND_URL = '**/api/configuration/v1/configurations/**';
-
-context('CPQ Configuration', () => {
-  beforeEach(() => {
-    configuration.defineAliases(CPQ_BACKEND_URL);
-    cy.visit('/');
-    clickAllowAllFromBanner();
-    configurationCpq.login(EMAIL, PASSWORD, CPQ_USER);
-  });
-
-  describe('Navigate to Product Configuration Page', () => {
-    it('should be able to navigate from the product search result', () => {
-      configurationCpq.searchForProduct(PROD_CODE_CAM);
-      configurationCpq.clickOnConfigureBtnInCatalog();
+const testConfig = [
+  {
+    name: 'CPQ Configuration - cpqOverOcc Mode',
+    cpqOverOcc: true,
+    backendURL: `${Cypress.env('OCC_PREFIX')}/${POWERTOOLS}/cpqconfigurator/**`,
+  },
+  {
+    name: 'CPQ Configuration - direct Mode',
+    cpqOverOcc: false,
+    backendURL: '**/api/configuration/v1/configurations/**',
+  },
+];
+
+testConfig.forEach((config) => {
+  context(config.name, () => {
+    const cpqSettings: any = {
+      productConfigurator: {
+        cpqOverOcc: config.cpqOverOcc,
+      },
+    };
+    beforeEach(() => {
+      cy.cxConfig(cpqSettings);
+      configuration.defineAliases(config.backendURL);
+      cy.visit('/');
+      clickAllowAllFromBanner();
+      configurationCpq.login(EMAIL, PASSWORD, CPQ_USER);
     });
 
-    it('should be able to navigate from the product details page', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
-      configurationCpq.clickOnConfigureBtnInCatalog();
+    describe('Navigate to Product Configuration Page', () => {
+      it('should be able to navigate from the product search result', () => {
+        configurationCpq.searchForProduct(PROD_CODE_CAM);
+        configurationCpq.clickOnConfigureBtnInCatalog();
+      });
+
+      it('should be able to navigate from the product details page', () => {
+        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
+        configurationCpq.clickOnConfigureBtnInCatalog();
+      });
     });
-  });
 
-  describe('Handling different UI type', () => {
-    it('should support radio button attribute type', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
-      configurationCpq.clickOnConfigureBtnInCatalog();
+    describe('Handling different UI type', () => {
+      it('should support radio button attribute type', () => {
+        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+        configurationCpq.clickOnConfigureBtnInCatalog();
 
-      configuration.checkAttributeDisplayed(ATTR_COF_CUPS, RADGRP);
+        configuration.checkAttributeDisplayed(ATTR_COF_CUPS, RADGRP);
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_COF_CUPS,
-        RADGRP,
-        VAL_COF_CUPS_300
-      );
-      configuration.checkValueSelected(RADGRP, ATTR_COF_CUPS, VAL_COF_CUPS_300);
+        configurationCpq.selectAttributeAndWait(
+          ATTR_COF_CUPS,
+          RADGRP,
+          VAL_COF_CUPS_300,
+          config.cpqOverOcc
+        );
+        configuration.checkValueSelected(
+          RADGRP,
+          ATTR_COF_CUPS,
+          VAL_COF_CUPS_300
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_COF_CUPS,
-        RADGRP,
-        VAL_COF_CUPS_500
-      );
-      configuration.checkValueSelected(RADGRP, ATTR_COF_CUPS, VAL_COF_CUPS_500);
-    });
+        configurationCpq.selectAttributeAndWait(
+          ATTR_COF_CUPS,
+          RADGRP,
+          VAL_COF_CUPS_500,
+          config.cpqOverOcc
+        );
+        configuration.checkValueSelected(
+          RADGRP,
+          ATTR_COF_CUPS,
+          VAL_COF_CUPS_500
+        );
+      });
 
-    it('should support checkbox list attribute type', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
-      configurationCpq.clickOnConfigureBtnInCatalog();
+      it('should support checkbox list attribute type', () => {
+        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+        configurationCpq.clickOnConfigureBtnInCatalog();
 
-      configuration.checkAttributeDisplayed(ATTR_COF_MODE, CHKBOX);
-      configurationCpq.checkValueNotSelected(
-        CHKBOX,
-        ATTR_COF_MODE,
-        VAL_COF_MODE
-      );
+        configuration.checkAttributeDisplayed(ATTR_COF_MODE, CHKBOX);
+        configurationCpq.checkValueNotSelected(
+          CHKBOX,
+          ATTR_COF_MODE,
+          VAL_COF_MODE
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_COF_MODE,
-        CHKBOX,
-        VAL_COF_MODE
-      );
-      configuration.checkValueSelected(CHKBOX, ATTR_COF_MODE, VAL_COF_MODE);
+        configurationCpq.selectAttributeAndWait(
+          ATTR_COF_MODE,
+          CHKBOX,
+          VAL_COF_MODE,
+          config.cpqOverOcc
+        );
+        configuration.checkValueSelected(CHKBOX, ATTR_COF_MODE, VAL_COF_MODE);
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_COF_MODE,
-        CHKBOX,
-        VAL_COF_MODE
-      );
-      configurationCpq.checkValueNotSelected(
-        CHKBOX,
-        ATTR_COF_MODE,
-        VAL_COF_MODE
-      );
-    });
+        configurationCpq.selectAttributeAndWait(
+          ATTR_COF_MODE,
+          CHKBOX,
+          VAL_COF_MODE,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkValueNotSelected(
+          CHKBOX,
+          ATTR_COF_MODE,
+          VAL_COF_MODE
+        );
+      });
 
-    it('should support single select (radio) bundle items', () => {
-      configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
-      configuration.checkCurrentGroupActive(GRP_CAM_MAIN);
+      it('should support single select (radio) bundle items', () => {
+        configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
+        configuration.checkCurrentGroupActive(GRP_CAM_MAIN);
 
-      configuration.checkAttributeDisplayed(ATTR_CAM_BODY, RADGRP_PROD);
-      configurationCpq.checkValueNotSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_D850
-      );
-      configurationCpq.checkValueNotSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_EOS80D
-      );
+        configuration.checkAttributeDisplayed(ATTR_CAM_BODY, RADGRP_PROD);
+        configurationCpq.checkValueNotSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_D850
+        );
+        configurationCpq.checkValueNotSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_EOS80D
+        );
 
-      configuration.selectAttribute(
-        ATTR_CAM_BODY,
-        RADGRP_PROD,
-        VAL_CAM_BODY_D850
-      );
-      configuration.checkValueSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_D850
-      );
-      configurationCpq.checkValueNotSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_EOS80D
-      );
+        configuration.selectAttribute(
+          ATTR_CAM_BODY,
+          RADGRP_PROD,
+          VAL_CAM_BODY_D850,
+          config.cpqOverOcc
+        );
+        configuration.checkValueSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_D850
+        );
+        configurationCpq.checkValueNotSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_EOS80D
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_CAM_BODY,
-        RADGRP_PROD,
-        VAL_CAM_BODY_EOS80D
-      );
-      configurationCpq.checkValueNotSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_D850
-      );
-      configuration.checkValueSelected(
-        RADGRP_PROD,
-        ATTR_CAM_BODY,
-        VAL_CAM_BODY_EOS80D
-      );
-    });
+        configurationCpq.selectAttributeAndWait(
+          ATTR_CAM_BODY,
+          RADGRP_PROD,
+          VAL_CAM_BODY_EOS80D,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkValueNotSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_D850
+        );
+        configuration.checkValueSelected(
+          RADGRP_PROD,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_EOS80D
+        );
+      });
 
-    it('should support single select (ddlb) bundle items', () => {
-      configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
+      it('should support single select (ddlb) bundle items', () => {
+        configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
 
-      configurationCpq.clickOnGroup(2);
-      configuration.checkCurrentGroupActive(GRP_CAM_IAW);
+        configurationCpq.clickOnGroup(2);
+        configuration.checkCurrentGroupActive(GRP_CAM_IAW);
 
-      configuration.checkAttributeDisplayed(ATTR_CAM_INS, DDLB_PROD);
-      configuration.checkValueSelected(DDLB_PROD, ATTR_CAM_INS, VAL_NO_OPT_SEL);
-      configurationCpq.checkValueNotSelected(
-        DDLB_PROD,
-        ATTR_CAM_INS,
-        VAL_CB_INS_Y2
-      );
+        configuration.checkAttributeDisplayed(ATTR_CAM_INS, DDLB_PROD);
+        configuration.checkValueSelected(
+          DDLB_PROD,
+          ATTR_CAM_INS,
+          VAL_NO_OPT_SEL
+        );
+        configurationCpq.checkValueNotSelected(
+          DDLB_PROD,
+          ATTR_CAM_INS,
+          VAL_CB_INS_Y2
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_CAM_INS,
-        DDLB_PROD,
-        VAL_CB_INS_Y2
-      );
-      configurationCpq.checkValueNotSelected(
-        DDLB_PROD,
-        ATTR_CAM_INS,
-        VAL_NO_OPT_SEL
-      );
-      configuration.checkValueSelected(DDLB_PROD, ATTR_CAM_INS, VAL_CB_INS_Y2);
-    });
+        configurationCpq.selectAttributeAndWait(
+          ATTR_CAM_INS,
+          DDLB_PROD,
+          VAL_CB_INS_Y2,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkValueNotSelected(
+          DDLB_PROD,
+          ATTR_CAM_INS,
+          VAL_NO_OPT_SEL
+        );
+        configuration.checkValueSelected(
+          DDLB_PROD,
+          ATTR_CAM_INS,
+          VAL_CB_INS_Y2
+        );
+      });
 
-    it('should support multi select bundle items', () => {
-      configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
+      it('should support multi select bundle items', () => {
+        configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
 
-      configuration.checkAttributeDisplayed(ATTR_CAM_MC, CHKBOX_PROD);
-      configuration.checkValueSelected(
-        CHKBOX_PROD,
-        ATTR_CAM_MC,
-        VAL_CAM_MC_128
-      );
-      configurationCpq.checkValueNotSelected(
-        CHKBOX_PROD,
-        ATTR_CAM_MC,
-        VAL_CAM_MC_64
-      );
+        configuration.checkAttributeDisplayed(ATTR_CAM_MC, CHKBOX_PROD);
+        configuration.checkValueSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128
+        );
+        configurationCpq.checkValueNotSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_64
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_CAM_MC,
-        CHKBOX_PROD,
-        VAL_CAM_MC_64
-      );
-      configuration.checkValueSelected(
-        CHKBOX_PROD,
-        ATTR_CAM_MC,
-        VAL_CAM_MC_128
-      );
-      configuration.checkValueSelected(CHKBOX_PROD, ATTR_CAM_MC, VAL_CAM_MC_64);
+        configurationCpq.selectAttributeAndWait(
+          ATTR_CAM_MC,
+          CHKBOX_PROD,
+          VAL_CAM_MC_64,
+          config.cpqOverOcc
+        );
+        configuration.checkValueSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128
+        );
+        configuration.checkValueSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_64
+        );
 
-      configurationCpq.selectAttributeAndWait(
-        ATTR_CAM_MC,
-        CHKBOX_PROD,
-        VAL_CAM_MC_128
-      );
-      configurationCpq.checkValueNotSelected(
-        CHKBOX_PROD,
-        ATTR_CAM_MC,
-        VAL_CAM_MC_128
-      );
-      configuration.checkValueSelected(CHKBOX_PROD, ATTR_CAM_MC, VAL_CAM_MC_64);
+        configurationCpq.selectAttributeAndWait(
+          ATTR_CAM_MC,
+          CHKBOX_PROD,
+          VAL_CAM_MC_128,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkValueNotSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128
+        );
+        configuration.checkValueSelected(
+          CHKBOX_PROD,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_64
+        );
+      });
     });
-  });
 
-  describe('Group Handling', () => {
-    it('should navigate with next and previous buttons', () => {
-      configurationCpq
-        .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
-        .then(() => {
-          configurationCpq.waitForProductCardsLoad(12);
-          configuration.checkPreviousBtnDisabled();
-          configuration.checkNextBtnEnabled();
-
-          configuration.clickOnNextBtn(GRP_CAM_ACC);
-          configurationCpq.waitForProductCardsLoad(14);
-          configuration.checkPreviousBtnEnabled();
-          configuration.checkNextBtnEnabled();
-
-          configuration.clickOnNextBtn(GRP_CAM_IAW);
-          configurationCpq.waitForProductCardsLoad(0);
-          configuration.checkPreviousBtnEnabled();
-          configuration.checkNextBtnDisabled();
-
-          configuration.clickOnPreviousBtn(GRP_CAM_ACC);
-          configurationCpq.waitForProductCardsLoad(14);
-        });
-    });
+    describe('Group Handling', () => {
+      it('should navigate with next and previous buttons', () => {
+        configurationCpq
+          .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
+          .then(() => {
+            configurationCpq.waitForProductCardsLoad(12);
+            configuration.checkPreviousBtnDisabled();
+            configuration.checkNextBtnEnabled();
+
+            configuration.clickOnNextBtn(GRP_CAM_ACC);
+            configurationCpq.waitForProductCardsLoad(14);
+            configuration.checkPreviousBtnEnabled();
+            configuration.checkNextBtnEnabled();
+
+            configuration.clickOnNextBtn(GRP_CAM_IAW);
+            configurationCpq.waitForProductCardsLoad(0);
+            configuration.checkPreviousBtnEnabled();
+            configuration.checkNextBtnDisabled();
+
+            configuration.clickOnPreviousBtn(GRP_CAM_ACC);
+            configurationCpq.waitForProductCardsLoad(14);
+          });
+      });
 
-    it('should navigate via group menu', () => {
-      configurationCpq
-        .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
-        .then(() => {
-          configurationCpq.waitForProductCardsLoad(12);
+      it('should navigate via group menu', () => {
+        configurationCpq
+          .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
+          .then(() => {
+            configurationCpq.waitForProductCardsLoad(12);
 
-          configurationCpq.clickOnGroup(2);
-          configurationCpq.waitForProductCardsLoad(0);
-          configuration.checkCurrentGroupActive(GRP_CAM_IAW);
+            configurationCpq.clickOnGroup(2);
+            configurationCpq.waitForProductCardsLoad(0);
+            configuration.checkCurrentGroupActive(GRP_CAM_IAW);
 
-          configurationCpq.clickOnGroup(1);
-          configurationCpq.waitForProductCardsLoad(14);
-          configuration.checkCurrentGroupActive(GRP_CAM_ACC);
+            configurationCpq.clickOnGroup(1);
+            configurationCpq.waitForProductCardsLoad(14);
+            configuration.checkCurrentGroupActive(GRP_CAM_ACC);
 
-          configurationCpq.clickOnGroup(0);
-          configurationCpq.waitForProductCardsLoad(12);
-          configuration.checkCurrentGroupActive(GRP_CAM_MAIN);
-        });
+            configurationCpq.clickOnGroup(0);
+            configurationCpq.waitForProductCardsLoad(12);
+            configuration.checkCurrentGroupActive(GRP_CAM_MAIN);
+          });
+      });
+
+      it('should display correct attributes', () => {
+        configurationCpq
+          .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
+          .then(() => {
+            configurationCpq.waitForProductCardsLoad(12);
+
+            configurationCpq.checkAttributeHeaderDisplayed(
+              ATTR_NAMES.GRP_CAM_MAIN
+            );
+
+            configuration.clickOnNextBtn(GRP_CAM_ACC);
+            configurationCpq.checkAttributeHeaderDisplayed(
+              ATTR_NAMES.GRP_CAM_ACC
+            );
+
+            configuration.clickOnNextBtn(GRP_CAM_IAW);
+            configurationCpq.checkAttributeHeaderDisplayed(
+              ATTR_NAMES.GRP_CAM_IAW
+            );
+          });
+      });
     });
 
-    it('should display correct attributes', () => {
-      configurationCpq
-        .goToConfigurationPage(POWERTOOLS, PROD_CODE_CAM, 'cpq')
-        .then(() => {
-          configurationCpq.waitForProductCardsLoad(12);
+    describe('Overview Page', () => {
+      it('should display user selections and prices on overview page', () => {
+        configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
+        configurationCpq.selectProductCard(
+          RADGRP,
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_D850,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkPrice(
+          RADGRP_PROD,
+          '$1,500.00',
+          ATTR_CAM_BODY,
+          VAL_CAM_BODY_D850
+        );
 
-          configurationCpq.checkAttributeHeaderDisplayed(
-            ATTR_NAMES.GRP_CAM_MAIN
-          );
+        configurationCpq.checkPrice(
+          CHKBOX_PROD,
+          '1x($100.00) +$100.00',
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128
+        );
+        configurationCpq.setQuantity(
+          CHKBOX_PROD,
+          2,
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkPrice(
+          CHKBOX_PROD,
+          '2x($100.00) +$200.00',
+          ATTR_CAM_MC,
+          VAL_CAM_MC_128
+        );
+
+        configurationCpq.selectProductCard(
+          CHKBOX,
+          ATTR_CAM_LEN,
+          VAL_CAM_LEN_SI,
+          config.cpqOverOcc
+        );
+        configurationCpq.selectProductCard(
+          CHKBOX,
+          ATTR_CAM_LEN,
+          VAL_CAM_LEN_NI,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkPrice(
+          CHKBOX_PROD,
+          '$800.00',
+          ATTR_CAM_LEN,
+          VAL_CAM_LEN_SI
+        );
+        configurationCpq.checkPrice(
+          CHKBOX_PROD,
+          '$700.00',
+          ATTR_CAM_LEN,
+          VAL_CAM_LEN_NI
+        );
+
+        configuration.clickOnNextBtn(GRP_CAM_ACC);
+        configurationCpq.deSelectProductCard(
+          RADGRP,
+          ATTR_CAM_BAG,
+          VAL_CAM_BAG_LP,
+          config.cpqOverOcc
+        );
+
+        configuration.clickOnNextBtn(GRP_CAM_IAW);
+        configurationCpq.selectAttributeAndWait(
+          ATTR_CAM_PROF,
+          RADGRP,
+          VAL_CAM_PROF_Y,
+          config.cpqOverOcc
+        );
+        //wait for this option to disappear
+        configuration.checkAttrValueNotDisplayed(
+          ATTR_CAM_INS,
+          DDLB_PROD,
+          VAL_CB_INS_Y2
+        );
 
-          configuration.clickOnNextBtn(GRP_CAM_ACC);
-          configurationCpq.checkAttributeHeaderDisplayed(
-            ATTR_NAMES.GRP_CAM_ACC
+        configurationCpq.selectProductCard(
+          DDLB,
+          ATTR_CAM_INS,
+          VAL_CB_INS_P4,
+          config.cpqOverOcc
+        );
+        configurationCpq.checkPrice(
+          DDLB_PROD,
+          '$600.00',
+          ATTR_CAM_INS,
+          VAL_CB_INS_P4
+        );
+        configuration.navigateToOverviewPage();
+
+        configurationOverview.checkConfigOverviewPageDisplayed();
+        configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_MAIN, 0);
+        configurationOverviewCpq.checkGroupHeaderNotDisplayed(GRP_CAM_ACC);
+        configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_IAW, 1);
+
+        type ovContentType = {
+          name?: string;
+          value: string;
+          type: 'product' | 'simple';
+          price?: string;
+        };
+        const ovContent: ovContentType[] = [
+          {
+            name: 'Camera Body',
+            value: 'Nikon D850',
+            type: 'product',
+            price: '+$1,500.00',
+          },
+          {
+            name: 'Memory Card',
+            value: 'SanDisk Extreme Pro',
+            type: 'product',
+            price: '2x($100.00) +$200.00',
+          },
+          {
+            name: 'Lenses',
+            value: 'Sigma 85mm F1.4 DG HS',
+            type: 'product',
+            price: '+$800.00',
+          },
+          { value: 'Nikon AF-P DX NIKKOR', type: 'product', price: '+$700.00' },
+          {
+            name: 'professional photographer?',
+            value: 'yes',
+            type: 'simple',
+          },
+          {
+            name: 'Insurance',
+            value: 'Pro 4 years',
+            type: 'product',
+            price: '+$600.00',
+          },
+        ];
+        ovContent.forEach((line, idx) => {
+          configurationOverviewCpq.checkAttrDisplayed(
+            line.name,
+            line.value,
+            idx
           );
+          configurationOverviewCpq.checkAttrPriceDisplayed(line.price, idx);
+          configurationOverviewCpq.checkAttrType(line.type, idx);
+        });
+      });
+    });
 
-          configuration.clickOnNextBtn(GRP_CAM_IAW);
-          configurationCpq.checkAttributeHeaderDisplayed(
-            ATTR_NAMES.GRP_CAM_IAW
+    describe('Configuration Process', () => {
+      it('should support configuration aspect in product search, cart, checkout and order history', () => {
+        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
+        configuration.clickOnAddToCartBtnOnPD();
+        configuration.clickOnViewCartBtnOnPD();
+
+        cy.get('cx-mini-cart .count').then((elem) => {
+          const numberOfCartItems = Number(elem.text());
+          cy.log('numberOfCartItems = ' + numberOfCartItems);
+          editConfigurationFromCartEntry(numberOfCartItems);
+          // Checkout
+          configurationCartCpq.clickOnProceedToCheckoutBtnInCart();
+          configurationCartCpq.checkoutB2B();
+          configurationCartCpq.selectOrderByOrderNumberAlias(POWERTOOLS);
+          configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_MAIN, 0);
+          configurationOverviewCpq.checkAttrDisplayed(
+            'Camera Body',
+            'Canon EOS 80D',
+            0
           );
         });
+      });
     });
-  });
 
-  describe('Overview Page', () => {
-    it('should display user selections and prices on overview page', () => {
-      configurationCpq.goToCPQConfigurationPage(POWERTOOLS, PROD_CODE_CAM);
-      configurationCpq.selectProductCard(
-        RADGRP,
+    function editConfigurationFromCartEntry(numberOfCartItems: number) {
+      //We assume the last product in the cart is the one we added
+      const cartEntryIndex: number = numberOfCartItems - 1;
+      type ovBundleInfo = {
+        name: string;
+        price?: string;
+        quantity?: string;
+      };
+      const ovBundleInfos: ovBundleInfo[] = [
+        {
+          name: 'SanDisk Extreme Pro 128GB SDXC',
+          price: '$100.00',
+          quantity: '1',
+        },
+        {
+          name: 'Canon RF 24-105mm f4L IS USM',
+          price: '$1,500.00',
+        },
+        {
+          name: 'LowePro Streetline SL 140',
+          price: '$110.00',
+        },
+      ];
+      configurationCartCpq.checkAmountOfBundleItems(
+        cartEntryIndex,
+        ovBundleInfos.length
+      );
+
+      ovBundleInfos.forEach((line, bundleItemIndex) => {
+        configurationCartCpq.checkBundleItemName(
+          cartEntryIndex,
+          bundleItemIndex,
+          line.name
+        );
+        configurationCartCpq.checkBundleItemPrice(
+          cartEntryIndex,
+          bundleItemIndex,
+          line.price
+        );
+        configurationCartCpq.checkBundleItemQuantity(
+          cartEntryIndex,
+          bundleItemIndex,
+          line.quantity
+        );
+      });
+      configurationCart.clickOnEditConfigurationLink(cartEntryIndex);
+
+      configuration.checkAttributeDisplayed(ATTR_CAM_BODY, RADGRP_PROD);
+      configurationCpq.selectAttributeAndWait(
         ATTR_CAM_BODY,
-        VAL_CAM_BODY_D850
+        RADGRP_PROD,
+        VAL_CAM_BODY_D850,
+        config.cpqOverOcc
       );
-      configurationCpq.checkPrice(
+      configuration.checkValueSelected(
         RADGRP_PROD,
-        '$1,500.00',
         ATTR_CAM_BODY,
         VAL_CAM_BODY_D850
       );
-
-      configurationCpq.checkPrice(
-        CHKBOX_PROD,
-        '1x($100.00) +$100.00',
-        ATTR_CAM_MC,
-        VAL_CAM_MC_128
+      configurationCpq.selectAttributeAndWait(
+        ATTR_CAM_BODY,
+        RADGRP_PROD,
+        VAL_CAM_BODY_EOS80D,
+        config.cpqOverOcc
       );
-      configurationCpq.setQuantity(CHKBOX_PROD, 2, ATTR_CAM_MC, VAL_CAM_MC_128);
-      configurationCpq.checkPrice(
-        CHKBOX_PROD,
-        '2x($100.00) +$200.00',
-        ATTR_CAM_MC,
-        VAL_CAM_MC_128
+      configuration.checkValueSelected(
+        RADGRP_PROD,
+        ATTR_CAM_BODY,
+        VAL_CAM_BODY_EOS80D
       );
-
-      configurationCpq.selectProductCard(CHKBOX, ATTR_CAM_LEN, VAL_CAM_LEN_SI);
-      configurationCpq.selectProductCard(CHKBOX, ATTR_CAM_LEN, VAL_CAM_LEN_NI);
-      configurationCpq.checkPrice(
-        CHKBOX_PROD,
-        '$800.00',
+      configurationCpq.selectAttributeAndWait(
         ATTR_CAM_LEN,
-        VAL_CAM_LEN_SI
+        CHKBOX_PROD,
+        VAL_CAM_LEN_SI,
+        config.cpqOverOcc
       );
-      configurationCpq.checkPrice(
+      configuration.checkValueSelected(
         CHKBOX_PROD,
-        '$700.00',
         ATTR_CAM_LEN,
-        VAL_CAM_LEN_NI
-      );
-
-      configuration.clickOnNextBtn(GRP_CAM_ACC);
-      configurationCpq.deSelectProductCard(
-        RADGRP,
-        ATTR_CAM_BAG,
-        VAL_CAM_BAG_LP
-      );
-
-      configuration.clickOnNextBtn(GRP_CAM_IAW);
-      configurationCpq.selectAttributeAndWait(
-        ATTR_CAM_PROF,
-        RADGRP,
-        VAL_CAM_PROF_Y
-      );
-      //wait for this option to disappear
-      configuration.checkAttrValueNotDisplayed(
-        ATTR_CAM_INS,
-        DDLB_PROD,
-        VAL_CB_INS_Y2
-      );
-
-      configurationCpq.selectProductCard(DDLB, ATTR_CAM_INS, VAL_CB_INS_P4);
-      configurationCpq.checkPrice(
-        DDLB_PROD,
-        '$600.00',
-        ATTR_CAM_INS,
-        VAL_CB_INS_P4
+        VAL_CAM_LEN_SI
       );
-      configuration.navigateToOverviewPage();
+      configurationCpq.clickAddToCartBtn();
 
       configurationOverview.checkConfigOverviewPageDisplayed();
       configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_MAIN, 0);
-      configurationOverviewCpq.checkGroupHeaderNotDisplayed(GRP_CAM_ACC);
-      configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_IAW, 1);
+      configurationOverviewCpq.checkAttrDisplayed(
+        'Camera Body',
+        'Canon EOS 80D',
+        0
+      );
 
-      type ovContentType = {
-        name?: string;
-        value: string;
-        type: 'product' | 'simple';
-        price?: string;
-      };
-      const ovContent: ovContentType[] = [
-        {
-          name: 'Camera Body',
-          value: 'Nikon D850',
-          type: 'product',
-          price: '+$1,500.00',
-        },
-        {
-          name: 'Memory Card',
-          value: 'SanDisk Extreme Pro',
-          type: 'product',
-          price: '2x($100.00) +$200.00',
-        },
-        {
-          name: 'Lenses',
-          value: 'Sigma 85mm F1.4 DG HS',
-          type: 'product',
-          price: '+$800.00',
-        },
-        { value: 'Nikon AF-P DX NIKKOR', type: 'product', price: '+$700.00' },
-        {
-          name: 'professional photographer?',
-          value: 'yes',
-          type: 'simple',
-        },
-        {
-          name: 'Insurance',
-          value: 'Pro 4 years',
-          type: 'product',
-          price: '+$600.00',
-        },
-      ];
-      ovContent.forEach((line, idx) => {
-        configurationOverviewCpq.checkAttrDisplayed(line.name, line.value, idx);
-        configurationOverviewCpq.checkAttrPriceDisplayed(line.price, idx);
-        configurationOverviewCpq.checkAttrType(line.type, idx);
-      });
-    });
-  });
+      configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_ACC, 1);
+      configurationOverview.clickContinueToCartBtnOnOP();
 
-  describe('Configuration Process', () => {
-    it('should support configuration aspect in product search, cart, checkout and order history', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
-      configuration.clickOnAddToCartBtnOnPD();
-      configuration.clickOnViewCartBtnOnPD();
-
-      cy.get('cx-mini-cart .count').then((elem) => {
-        const numberOfCartItems = Number(elem.text());
-        cy.log('numberOfCartItems = ' + numberOfCartItems);
-        editConfigurationFromCartEntry(numberOfCartItems);
-        // Checkout
-        configurationCartCpq.clickOnProceedToCheckoutBtnInCart();
-        configurationCartCpq.checkoutB2B();
-        configurationCartCpq.selectOrderByOrderNumberAlias(POWERTOOLS);
-        configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_MAIN, 0);
-        configurationOverviewCpq.checkAttrDisplayed(
-          'Camera Body',
-          'Canon EOS 80D',
-          0
-        );
-      });
-    });
+      configurationCartCpq.checkAmountOfBundleItems(cartEntryIndex, 4);
+      configurationCartCpq.verifyCartCount(numberOfCartItems);
+    }
   });
-
-  function editConfigurationFromCartEntry(numberOfCartItems: number) {
-    //We assume the last product in the cart is the one we added
-    const cartEntryIndex: number = numberOfCartItems - 1;
-    type ovBundleInfo = {
-      name: string;
-      price?: string;
-      quantity?: string;
-    };
-    const ovBundleInfos: ovBundleInfo[] = [
-      {
-        name: 'SanDisk Extreme Pro 128GB SDXC',
-        price: '$100.00',
-        quantity: '1',
-      },
-      {
-        name: 'Canon RF 24-105mm f4L IS USM',
-        price: '$1,500.00',
-      },
-      {
-        name: 'LowePro Streetline SL 140',
-        price: '$110.00',
-      },
-    ];
-    configurationCartCpq.checkAmountOfBundleItems(
-      cartEntryIndex,
-      ovBundleInfos.length
-    );
-
-    ovBundleInfos.forEach((line, bundleItemIndex) => {
-      configurationCartCpq.checkBundleItemName(
-        cartEntryIndex,
-        bundleItemIndex,
-        line.name
-      );
-      configurationCartCpq.checkBundleItemPrice(
-        cartEntryIndex,
-        bundleItemIndex,
-        line.price
-      );
-      configurationCartCpq.checkBundleItemQuantity(
-        cartEntryIndex,
-        bundleItemIndex,
-        line.quantity
-      );
-    });
-    configurationCart.clickOnEditConfigurationLink(cartEntryIndex);
-
-    configuration.checkAttributeDisplayed(ATTR_CAM_BODY, RADGRP_PROD);
-    configurationCpq.selectAttributeAndWait(
-      ATTR_CAM_BODY,
-      RADGRP_PROD,
-      VAL_CAM_BODY_D850
-    );
-    configuration.checkValueSelected(
-      RADGRP_PROD,
-      ATTR_CAM_BODY,
-      VAL_CAM_BODY_D850
-    );
-    configurationCpq.selectAttributeAndWait(
-      ATTR_CAM_BODY,
-      RADGRP_PROD,
-      VAL_CAM_BODY_EOS80D
-    );
-    configuration.checkValueSelected(
-      RADGRP_PROD,
-      ATTR_CAM_BODY,
-      VAL_CAM_BODY_EOS80D
-    );
-    configurationCpq.selectAttributeAndWait(
-      ATTR_CAM_LEN,
-      CHKBOX_PROD,
-      VAL_CAM_LEN_SI
-    );
-    configuration.checkValueSelected(CHKBOX_PROD, ATTR_CAM_LEN, VAL_CAM_LEN_SI);
-    configurationCpq.clickAddToCartBtn();
-
-    configurationOverview.checkConfigOverviewPageDisplayed();
-    configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_MAIN, 0);
-    configurationOverviewCpq.checkAttrDisplayed(
-      'Camera Body',
-      'Canon EOS 80D',
-      0
-    );
-
-    configurationOverviewCpq.checkGroupHeaderDisplayed(GRP_CAM_ACC, 1);
-    configurationOverview.clickContinueToCartBtnOnOP();
-
-    configurationCartCpq.checkAmountOfBundleItems(cartEntryIndex, 4);
-    configurationCartCpq.verifyCartCount(numberOfCartItems);
-  }
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
index 384c094a112..b4605a355e9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
@@ -131,10 +131,11 @@ export function checkAttributeHeaderDisplayed(
 export function selectProductCard(
   cardType: cardType,
   attributeName: string,
-  valueName: string
+  valueName: string,
+  cpqOverOcc?: boolean
 ) {
   const uiType: configuration.uiType = convertCardTypeToUiType(cardType);
-  selectAttributeAndWait(attributeName, uiType, valueName);
+  selectAttributeAndWait(attributeName, uiType, valueName, cpqOverOcc);
   configuration.checkValueSelected(uiType, attributeName, valueName);
 }
 
@@ -147,10 +148,11 @@ export function selectProductCard(
 export function deSelectProductCard(
   cardType: cardType,
   attributeName: string,
-  valueName: string
+  valueName: string,
+  cpqOverOcc?: boolean
 ) {
   const uiType: configuration.uiType = convertCardTypeToUiType(cardType);
-  selectAttributeAndWait(attributeName, uiType, valueName);
+  selectAttributeAndWait(attributeName, uiType, valueName, cpqOverOcc);
   checkValueNotSelected(uiType, attributeName, valueName);
 }
 
@@ -184,11 +186,14 @@ export function convertCardTypeToUiType(cardType: cardType) {
 export function selectAttributeAndWait(
   attributeName: string,
   uiType: configuration.uiType,
-  valueName: string
+  valueName: string,
+  cpqOverOcc?: boolean
 ): void {
   configuration.selectAttribute(attributeName, uiType, valueName);
   cy.wait('@updateConfig');
-  cy.wait('@readConfig');
+  if (!cpqOverOcc) {
+    cy.wait('@readConfig');
+  }
 }
 
 /**
@@ -230,7 +235,8 @@ export function setQuantity(
   uiType: configuration.uiType,
   quantity: number,
   attributeName: string,
-  valueName?: string
+  valueName?: string,
+  cpqOverOcc?: boolean
 ): void {
   let containerId = configuration.getAttributeId(attributeName, uiType);
   if (valueName) {
@@ -242,7 +248,9 @@ export function setQuantity(
   );
   configuration.checkUpdatingMessageNotDisplayed();
   cy.wait('@updateConfig');
-  cy.wait('@readConfig');
+  if (!cpqOverOcc) {
+    cy.wait('@readConfig');
+  }
 }
 
 /**

From 16fee093a69df521640e75ee3ce7949d38250864 Mon Sep 17 00:00:00 2001
From: Roman Chygryn <129765378+rmch91@users.noreply.github.com>
Date: Tue, 11 Jul 2023 10:29:57 +0200
Subject: [PATCH 066/122] fix: fix failing delivery mode after clearing the
 cart and creating a new one by clearing checkout data when deleting a
 cart(#17613)

Issue was fixed by triggering the CheckoutQueryResetEvent on DeleteCartEvent.

DEPRECATED:

Constructor in CheckoutDeliveryModeComponent is marked as deprecated. GlobalMessageService will be required from v.7.0

Closes #3866
---
 .../checkout-delivery-mode.component.html     |  2 +-
 .../checkout-delivery-mode.component.spec.ts  | 49 ++++++++++++++++++-
 .../checkout-delivery-mode.component.ts       | 48 ++++++++++++++++--
 ...ut-delivery-address-event.listener.spec.ts | 13 ++++-
 ...heckout-delivery-address-event.listener.ts | 14 +++++-
 .../src/translations/en/delivery-mode.ts      | 11 +++++
 projects/assets/src/translations/en/index.ts  |  2 +
 .../translations/translation-chunks-config.ts |  1 +
 8 files changed, 131 insertions(+), 9 deletions(-)
 create mode 100644 projects/assets/src/translations/en/delivery-mode.ts

diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
index 6b902eb46de..1553670bcd4 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
@@ -83,7 +83,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
   <div class="col-md-12 col-lg-6">
     <button
       class="btn btn-block btn-primary"
-      [disabled]="deliveryModeInvalid"
+      [disabled]="deliveryModeInvalid || (isSetDeliveryModeHttpError$ | async)"
       (click)="next()"
     >
       {{ 'common.continue' | cxTranslate }}
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
index 04e6196badc..5d4201668e9 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
@@ -9,9 +9,14 @@ import {
   OrderEntry,
 } from '@spartacus/cart/base/root';
 import { CheckoutDeliveryModesFacade } from '@spartacus/checkout/base/root';
-import { I18nTestingModule, QueryState } from '@spartacus/core';
+import {
+  GlobalMessageService,
+  GlobalMessageType,
+  I18nTestingModule,
+  QueryState,
+} from '@spartacus/core';
 import { OutletModule } from '@spartacus/storefront';
-import { BehaviorSubject, EMPTY, of } from 'rxjs';
+import { BehaviorSubject, EMPTY, of, throwError } from 'rxjs';
 import { CheckoutConfigService } from '../services/checkout-config.service';
 import { CheckoutStepService } from '../services/checkout-step.service';
 import { CheckoutDeliveryModeComponent } from './checkout-delivery-mode.component';
@@ -88,11 +93,17 @@ class MockCartService implements Partial<ActiveCartFacade> {
   getPickupEntries = createSpy().and.returnValue(of([]));
 }
 
+class MockGlobalMessageService implements Partial<GlobalMessageService> {
+  add() {}
+}
+
 describe('CheckoutDeliveryModeComponent', () => {
   let component: CheckoutDeliveryModeComponent;
   let fixture: ComponentFixture<CheckoutDeliveryModeComponent>;
   let checkoutConfigService: CheckoutConfigService;
   let checkoutStepService: CheckoutStepService;
+  let checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade;
+  let globalMessageService: GlobalMessageService;
 
   beforeEach(
     waitForAsync(() => {
@@ -111,10 +122,13 @@ describe('CheckoutDeliveryModeComponent', () => {
           },
           { provide: ActivatedRoute, useValue: mockActivatedRoute },
           { provide: ActiveCartFacade, useClass: MockCartService },
+          { provide: GlobalMessageService, useClass: MockGlobalMessageService },
         ],
       }).compileComponents();
 
       checkoutConfigService = TestBed.inject(CheckoutConfigService);
+      checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade);
+      globalMessageService = TestBed.inject(GlobalMessageService);
       checkoutStepService = TestBed.inject(
         CheckoutStepService as Type<CheckoutStepService>
       );
@@ -154,6 +168,25 @@ describe('CheckoutDeliveryModeComponent', () => {
     );
   });
 
+  it('should show error message if setDeliveryMode fail', () => {
+    const showErrorMessageSpy = spyOn(
+      globalMessageService,
+      'add'
+    ).and.callThrough();
+    checkoutDeliveryModesFacade.setDeliveryMode = createSpy().and.returnValue(
+      throwError('error')
+    );
+
+    component.changeMode('pickup');
+
+    expect(showErrorMessageSpy).toHaveBeenCalledWith(
+      {
+        key: 'setDeliveryMode.unknownError',
+      },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+  });
+
   it('should remove pickup from supported delivery modes', () => {
     spyOn(checkoutConfigService, 'getPreferredDeliveryMode').and.callThrough();
     supportedDeliveryModes$.next([{ code: 'pickup' }]);
@@ -227,6 +260,18 @@ describe('CheckoutDeliveryModeComponent', () => {
       expect(getContinueBtn().nativeElement.disabled).toBe(false);
     });
 
+    it('should be disabled when setDeliveryMode failed', () => {
+      checkoutDeliveryModesFacade.setDeliveryMode = createSpy().and.returnValue(
+        throwError('error')
+      );
+
+      component.changeMode('pickup');
+
+      fixture.detectChanges();
+
+      expect(getContinueBtn().nativeElement.disabled).toBe(true);
+    });
+
     it('should call "next" function after being clicked', () => {
       spyOn(component, 'next');
 
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.ts
index dd6aa7fdd2b..d8559b20fbc 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Optional } from '@angular/core';
 import {
   UntypedFormBuilder,
   UntypedFormGroup,
@@ -13,6 +13,7 @@ import {
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade, CartOutlets } from '@spartacus/cart/base/root';
 import { CheckoutDeliveryModesFacade } from '@spartacus/checkout/base/root';
+import { GlobalMessageService, GlobalMessageType } from '@spartacus/core';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import {
   distinctUntilChanged,
@@ -31,8 +32,13 @@ import { CheckoutStepService } from '../services/checkout-step.service';
 })
 export class CheckoutDeliveryModeComponent {
   protected busy$ = new BehaviorSubject(false);
+  protected readonly isSetDeliveryModeHttpErrorSub = new BehaviorSubject(false);
+
   readonly CartOutlets = CartOutlets;
 
+  isSetDeliveryModeHttpError$ =
+    this.isSetDeliveryModeHttpErrorSub.asObservable();
+
   selectedDeliveryModeCode$ = this.checkoutDeliveryModesFacade
     .getSelectedDeliveryModeState()
     .pipe(
@@ -84,16 +90,43 @@ export class CheckoutDeliveryModeComponent {
     return this.mode.controls['deliveryModeId'].invalid;
   }
 
+  // TODO(CXSPA-3976): make globalMessageService a required dependency
+  constructor(
+    fb: UntypedFormBuilder,
+    checkoutConfigService: CheckoutConfigService,
+    activatedRoute: ActivatedRoute,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    activeCartFacade: ActiveCartFacade,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    globalMessageService: GlobalMessageService
+  );
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    fb: UntypedFormBuilder,
+    checkoutConfigService: CheckoutConfigService,
+    activatedRoute: ActivatedRoute,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    activeCartFacade: ActiveCartFacade
+  );
   constructor(
     protected fb: UntypedFormBuilder,
     protected checkoutConfigService: CheckoutConfigService,
     protected activatedRoute: ActivatedRoute,
     protected checkoutStepService: CheckoutStepService,
     protected checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
-    protected activeCartFacade: ActiveCartFacade
+    protected activeCartFacade: ActiveCartFacade,
+    @Optional() protected globalMessageService?: GlobalMessageService
   ) {}
 
-  changeMode(code: string): void {
+  changeMode(code: string | undefined): void {
+    if (!code) {
+      return;
+    }
+
     this.busy$.next(true);
 
     this.checkoutDeliveryModesFacade.setDeliveryMode(code).subscribe({
@@ -110,15 +143,22 @@ export class CheckoutDeliveryModeComponent {
     this.checkoutStepService.back(this.activatedRoute);
   }
 
-  getAriaChecked(code: string): boolean {
+  getAriaChecked(code: string | undefined): boolean {
     return code === this.mode.controls['deliveryModeId'].value;
   }
 
   protected onSuccess(): void {
+    this.isSetDeliveryModeHttpErrorSub.next(false);
     this.busy$.next(false);
   }
 
   protected onError(): void {
+    this.globalMessageService?.add(
+      { key: 'setDeliveryMode.unknownError' },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+
+    this.isSetDeliveryModeHttpErrorSub.next(true);
     this.busy$.next(false);
   }
 }
diff --git a/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.spec.ts b/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.spec.ts
index be47c15438e..7cc8982c5c9 100644
--- a/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.spec.ts
+++ b/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { ActiveCartFacade } from '@spartacus/cart/base/root';
+import { ActiveCartFacade, DeleteCartEvent } from '@spartacus/cart/base/root';
 import {
   createFrom,
   CxEvent,
@@ -239,4 +239,15 @@ describe(`CheckoutDeliveryAddressEventListener`, () => {
       );
     });
   });
+
+  describe(`onCartDeleted`, () => {
+    it(`DeleteCartEvent should dispatch CheckoutQueryResetEvent`, () => {
+      mockEventStream$.next(new DeleteCartEvent());
+
+      expect(eventService.dispatch).toHaveBeenCalledWith(
+        {},
+        CheckoutQueryResetEvent
+      );
+    });
+  });
 });
diff --git a/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.ts b/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.ts
index d70baa5aab8..67005c4411c 100644
--- a/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.ts
+++ b/feature-libs/checkout/base/root/events/checkout-delivery-address-event.listener.ts
@@ -5,7 +5,7 @@
  */
 
 import { Injectable, OnDestroy } from '@angular/core';
-import { ActiveCartFacade } from '@spartacus/cart/base/root';
+import { ActiveCartFacade, DeleteCartEvent } from '@spartacus/cart/base/root';
 import {
   DeleteUserAddressEvent,
   EventService,
@@ -47,6 +47,8 @@ export class CheckoutDeliveryAddressEventListener implements OnDestroy {
     this.onDeliveryAddressCleared();
 
     this.onUserAddressChange();
+
+    this.onCartDeleted();
   }
 
   /**
@@ -129,6 +131,16 @@ export class CheckoutDeliveryAddressEventListener implements OnDestroy {
     );
   }
 
+  protected onCartDeleted(): void {
+    this.subscriptions.add(
+      this.eventService
+        .get(DeleteCartEvent)
+        .subscribe(() =>
+          this.eventService.dispatch({}, CheckoutQueryResetEvent)
+        )
+    );
+  }
+
   ngOnDestroy(): void {
     this.subscriptions.unsubscribe();
   }
diff --git a/projects/assets/src/translations/en/delivery-mode.ts b/projects/assets/src/translations/en/delivery-mode.ts
new file mode 100644
index 00000000000..afa3b8f375c
--- /dev/null
+++ b/projects/assets/src/translations/en/delivery-mode.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const deliveryMode = {
+  setDeliveryMode: {
+    unknownError: 'An unknown error occurred. Please contact support.',
+  },
+};
diff --git a/projects/assets/src/translations/en/index.ts b/projects/assets/src/translations/en/index.ts
index ed0a04c185f..ad8a387debe 100644
--- a/projects/assets/src/translations/en/index.ts
+++ b/projects/assets/src/translations/en/index.ts
@@ -6,6 +6,7 @@
 
 import { address } from './address';
 import { common } from './common';
+import { deliveryMode } from './delivery-mode';
 import { myAccount } from './my-account';
 import { payment } from './payment';
 import { pdf } from './pdf';
@@ -24,4 +25,5 @@ export const en = {
   user,
   video,
   pdf,
+  deliveryMode,
 };
diff --git a/projects/assets/src/translations/translation-chunks-config.ts b/projects/assets/src/translations/translation-chunks-config.ts
index 1782f0863b5..c9632429ca9 100644
--- a/projects/assets/src/translations/translation-chunks-config.ts
+++ b/projects/assets/src/translations/translation-chunks-config.ts
@@ -73,4 +73,5 @@ export const translationChunksConfig: TranslationChunksConfig = {
   ],
   user: ['anonymousConsents', 'loginRegister', 'checkoutLogin', 'authMessages'],
   video: ['player'],
+  deliveryMode: ['setDeliveryMode'],
 };

From 1cb1fb5a235e6c46a62c2ca25aa112b998c25693 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Tue, 11 Jul 2023 16:46:19 +0200
Subject: [PATCH 067/122] feat: pre-fill delivery address for guest users
 (#17607)

---
 .../checkout-delivery-address.component.html  |  1 +
 .../checkout-delivery-address.component.ts    | 53 ++++++++++++++++++-
 .../services/checkout-config.service.ts       |  4 ++
 .../base/root/config/checkout-config.ts       |  4 ++
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
index 3f18a8cd4f1..3a073673822 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.html
@@ -102,6 +102,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
         <cx-address-form
           [showTitleCode]="true"
           [setAsDefaultField]="!isGuestCheckout"
+          [addressData]="selectedAddress"
           cancelBtnLabel="{{ backBtnText | cxTranslate }}"
           (backToAddress)="hideNewAddressForm(true)"
           (submitAddress)="addAddress($event)"
diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
index 2c37332e983..3c09d17373e 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
@@ -4,7 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ActiveCartFacade } from '@spartacus/cart/base/root';
 import {
@@ -29,6 +34,7 @@ import {
   tap,
 } from 'rxjs/operators';
 import { CheckoutStepService } from '../services/checkout-step.service';
+import { CheckoutConfigService } from '../services';
 
 export interface CardWithAddress {
   card: Card;
@@ -49,6 +55,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   addressFormOpened = false;
   doneAutoSelect = false;
 
+  selectedAddress?: Address;
+
   get isGuestCheckout(): boolean {
     return !!getLastValueSync(this.activeCartFacade.isGuestCart());
   }
@@ -65,6 +73,32 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     );
   }
 
+  // TODO(CXSPA-): make checkoutConfigService a required dependency
+  constructor(
+    userAddressService: UserAddressService,
+    checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
+    activatedRoute: ActivatedRoute,
+    translationService: TranslationService,
+    activeCartFacade: ActiveCartFacade,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    globalMessageService: GlobalMessageService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    checkoutConfigService: CheckoutConfigService
+  );
+  /**
+   * @deprecated since 6.2
+   */
+  constructor(
+    userAddressService: UserAddressService,
+    checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
+    activatedRoute: ActivatedRoute,
+    translationService: TranslationService,
+    activeCartFacade: ActiveCartFacade,
+    checkoutStepService: CheckoutStepService,
+    checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
+    globalMessageService: GlobalMessageService
+  );
   constructor(
     protected userAddressService: UserAddressService,
     protected checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade,
@@ -73,7 +107,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     protected activeCartFacade: ActiveCartFacade,
     protected checkoutStepService: CheckoutStepService,
     protected checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
-    protected globalMessageService: GlobalMessageService
+    protected globalMessageService: GlobalMessageService,
+    @Optional() protected checkoutConfigService?: CheckoutConfigService
   ) {}
 
   ngOnInit(): void {
@@ -137,6 +172,14 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   }
 
   addAddress(address: Address | undefined): void {
+    if (
+      !address &&
+      this.shouldUseAddressSavedInCart() &&
+      this.selectedAddress
+    ) {
+      this.next();
+    }
+
     if (!address) {
       return;
     }
@@ -242,6 +285,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
         this.setAddress(selected);
       }
       this.doneAutoSelect = true;
+    } else if (selected && this.shouldUseAddressSavedInCart()) {
+      this.selectedAddress = selected;
     }
   }
 
@@ -296,4 +341,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   protected onError(): void {
     this.busy$.next(false);
   }
+
+  protected shouldUseAddressSavedInCart(): boolean {
+    return !!this.checkoutConfigService?.shouldUseAddressSavedInCart();
+  }
 }
diff --git a/feature-libs/checkout/base/components/services/checkout-config.service.ts b/feature-libs/checkout/base/components/services/checkout-config.service.ts
index 223120b8924..81fdc9f9cf2 100644
--- a/feature-libs/checkout/base/components/services/checkout-config.service.ts
+++ b/feature-libs/checkout/base/components/services/checkout-config.service.ts
@@ -76,6 +76,10 @@ export class CheckoutConfigService {
       : this.findMatchingDeliveryMode(deliveryModes, index + 1);
   }
 
+  shouldUseAddressSavedInCart(): boolean {
+    return !!this.checkoutConfig?.checkout?.guestUseSavedAddress;
+  }
+
   getPreferredDeliveryMode(deliveryModes: DeliveryMode[]): string | undefined {
     deliveryModes.sort(this.compareDeliveryCost);
     return this.findMatchingDeliveryMode(deliveryModes);
diff --git a/feature-libs/checkout/base/root/config/checkout-config.ts b/feature-libs/checkout/base/root/config/checkout-config.ts
index f36231d8fa5..284309c63b9 100644
--- a/feature-libs/checkout/base/root/config/checkout-config.ts
+++ b/feature-libs/checkout/base/root/config/checkout-config.ts
@@ -36,6 +36,10 @@ export abstract class CheckoutConfig {
      * Allow for guest checkout.
      */
     guest?: boolean;
+    /**
+     * Use delivery address saved in cart for pre-filling delivery address form.
+     */
+    guestUseSavedAddress?: boolean;
   };
 }
 

From 211bede639414a7ddbcc59ba339ab05efe264d67 Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:59:07 +0530
Subject: [PATCH 068/122] CDC-B2B- Change Password pop-up does not appear
 during 1st time user login (#17623)

---
 .../cdc/root/service/cdc-js.service.spec.ts   | 21 +++++++++++++++++++
 .../cdc/root/service/cdc-js.service.ts        | 17 ++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/integration-libs/cdc/root/service/cdc-js.service.spec.ts b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
index 2e79b9c300f..c5744f4d8a4 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.spec.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
@@ -1,6 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import {
   AuthService,
+  BaseSite,
   BaseSiteService,
   GlobalMessageService,
   GlobalMessageType,
@@ -37,6 +38,9 @@ class BaseSiteServiceStub implements Partial<BaseSiteService> {
   getActive(): Observable<string> {
     return of('electronics-spa');
   }
+  get(_siteUid?: string): Observable<BaseSite | undefined> {
+    return of({ uid: 'electronics-spa', channel: 'B2C' });
+  }
 }
 class LanguageServiceStub implements Partial<LanguageService> {
   getActive(): Observable<string> {
@@ -441,6 +445,7 @@ describe('CdcJsService', () => {
 
   describe('loginUserWithoutScreenSet', () => {
     it('should login user without screenset', (done) => {
+      expect(service['getCurrentBaseSite']()).toBe('electronics-spa');
       spyOn(service['gigyaSDK'].accounts, 'login').and.callFake(
         (options: { callback: Function }) => {
           options.callback({ status: 'OK' });
@@ -696,6 +701,22 @@ describe('CdcJsService', () => {
     });
   });
 
+  describe('getCurrentBaseSiteChannel', () => {
+    it('should return the channel value of the base site - B2C', () => {
+      spyOn(baseSiteService, 'get').and.returnValue(
+        of({ uid: 'electronics-spa', channel: 'B2C' })
+      );
+      expect(service['getCurrentBaseSiteChannel']()).toBe('B2C');
+    });
+
+    it('should return the channel of the base site - B2B', () => {
+      spyOn(baseSiteService, 'get').and.returnValue(
+        of({ uid: 'powertools-spa', channel: 'B2B' })
+      );
+      expect(service['getCurrentBaseSiteChannel']()).toBe('B2B');
+    });
+  });
+
   describe('updateProfileWithoutScreenSet', () => {
     it('should not call accounts.setAccountInfo', (done) => {
       spyOn(service['gigyaSDK'].accounts, 'setAccountInfo').and.callFake(
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index 26aee76e4d1..ae41fde89df 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -255,13 +255,18 @@ export class CdcJsService implements OnDestroy {
     context?: any
   ): Observable<{ status: string }> {
     const missingConsentErrorCode = 206001;
+    let ignoreInterruptions = false;
+    const channel = this.getCurrentBaseSiteChannel();
+    if (channel && channel === 'B2C') {
+      ignoreInterruptions = true;
+    }
     return this.getSessionExpirationValue().pipe(
       switchMap((sessionExpiration) => {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
           include: 'missing-required-fields',
-          ignoreInterruptions: true,
+          ignoreInterruptions: ignoreInterruptions,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,
         }).pipe(
@@ -367,6 +372,16 @@ export class CdcJsService implements OnDestroy {
     return baseSite;
   }
 
+  private getCurrentBaseSiteChannel(): string {
+    let channel: string = '';
+    const baseSiteUid: string = this.getCurrentBaseSite();
+    this.baseSiteService
+      .get(baseSiteUid)
+      .pipe(take(1))
+      .subscribe((data) => (channel = data?.channel ?? ''));
+    return channel;
+  }
+
   /**
    * Trigger CDC forgot password using CDC APIs.
    *

From a2c37155ae56142ef847cd7a37810d643d858375 Mon Sep 17 00:00:00 2001
From: Christoph Hinssen <33626130+ChristophHi@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:40:26 +0200
Subject: [PATCH 069/122] test: refactor e2e tools to reduce duplication
 (#17630)

---
 .../product-configurator-textfield.e2e.cy.ts  |  5 +-
 ...oduct-configurator-vc-cart.e2e-flaky.cy.ts |  5 +-
 ...duct-configurator-vc-interactive.e2e.cy.ts |  3 +-
 .../cpq/cpq-configuration.ccv2-e2e.cy.ts      |  9 ++-
 .../cpq/cpq-configuration.core-e2e.cy.ts      | 13 ++--
 .../cypress/helpers/common.ts                 | 60 +++++++++++++++++++
 .../helpers/product-configurator-cpq.ts       | 14 -----
 .../helpers/product-configurator-vc.ts        | 26 +-------
 .../cypress/helpers/product-configurator.ts   | 36 +----------
 .../helpers/textfield-configuration.ts        | 36 -----------
 10 files changed, 83 insertions(+), 124 deletions(-)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/helpers/common.ts

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-textfield.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-textfield.e2e.cy.ts
index 0ed2ba23464..4283eaf496b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-textfield.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-textfield.e2e.cy.ts
@@ -7,6 +7,7 @@
 import * as cart from '../../../helpers/cart';
 import * as configuration from '../../../helpers/product-configurator';
 import * as textfieldConfiguration from '../../../helpers/textfield-configuration';
+import * as common from '../../../helpers/common';
 
 const electronicsShop = 'electronics-spa';
 const testProduct = '1934793';
@@ -46,8 +47,8 @@ context('Textfield Configuration', () => {
         electronicsShop,
         testProduct
       );
-      textfieldConfiguration.clickOnAddToCartBtnOnPD();
-      textfieldConfiguration.clickOnViewCartBtnOnPD();
+      common.clickOnAddToCartBtnOnPD();
+      common.clickOnViewCartBtnOnPD();
       cart.verifyCartNotEmpty();
       textfieldConfiguration.clickOnEditConfigurationLink(0);
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
index 5361db0d602..3ae7b31c767 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-cart.e2e-flaky.cy.ts
@@ -12,6 +12,7 @@ import * as configurationCartVc from '../../../helpers/product-configurator-cart
 import * as configurationOverview from '../../../helpers/product-configurator-overview';
 import * as configurationOverviewVc from '../../../helpers/product-configurator-overview-vc';
 import * as configurationVc from '../../../helpers/product-configurator-vc';
+import * as common from '../../../helpers/common';
 
 const electronicsShop = 'electronics-spa';
 const testProductMultiLevel = 'CONF_HOME_THEATER_ML';
@@ -98,8 +99,8 @@ context('Product Configuration', () => {
     it('should be able to navigate from the cart after adding product directly to the cart', () => {
       clickAllowAllFromBanner();
       configuration.searchForProduct(testProductMultiLevel);
-      configuration.clickOnAddToCartBtnOnPD();
-      configuration.clickOnViewCartBtnOnPD();
+      common.clickOnAddToCartBtnOnPD();
+      common.clickOnViewCartBtnOnPD();
       cart.verifyCartNotEmpty();
       configurationCart.clickOnEditConfigurationLink(0);
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
index ae4e2e9618f..825e716f8ca 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product_configurator/product-configurator-vc-interactive.e2e.cy.ts
@@ -8,6 +8,7 @@ import * as configuration from '../../../helpers/product-configurator';
 import { clickAllowAllFromBanner } from '../../../helpers/anonymous-consents';
 import * as configurationOverviewVc from '../../../helpers/product-configurator-overview-vc';
 import * as configurationVc from '../../../helpers/product-configurator-vc';
+import * as common from '../../../helpers/common';
 
 const electronicsShop = 'electronics-spa';
 const testProduct = 'CONF_CAMERA_SL';
@@ -96,7 +97,7 @@ context('Product Configuration', () => {
 
     it('should be able to navigate from the product details page', () => {
       clickAllowAllFromBanner();
-      configurationVc.goToPDPage(electronicsShop, testProduct);
+      common.goToPDPage(electronicsShop, testProduct);
       configurationVc.clickOnConfigureBtnInCatalog(testProduct);
     });
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.ccv2-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.ccv2-e2e.cy.ts
index 73072a13ccd..eaaa97ae98d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.ccv2-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.ccv2-e2e.cy.ts
@@ -8,8 +8,7 @@ import * as configuration from '../../../helpers/product-configurator';
 import * as configurationCpq from '../../../helpers/product-configurator-cpq';
 import * as configurationOverview from '../../../helpers/product-configurator-overview';
 import * as configurationOverviewCpq from '../../../helpers/product-configurator-overview-cpq';
-import * as configurationCart from '../../../helpers/product-configurator-cart';
-import * as configurationCartCpq from '../../../helpers/product-configurator-cart-cpq';
+import * as common from '../../../helpers/common';
 import { clickAllowAllFromBanner } from '../../../helpers/anonymous-consents';
 
 const POWERTOOLS = 'powertools-spa';
@@ -109,14 +108,14 @@ context('CPQ Configuration', () => {
     });
 
     it('should be able to navigate from the product details page', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
+      common.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
       configurationCpq.clickOnConfigureBtnInCatalog();
     });
   });
 
   describe('Handling different UI type', () => {
     it('should support radio button attribute type', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+      common.goToPDPage(POWERTOOLS, PROD_CODE_COF);
       configurationCpq.clickOnConfigureBtnInCatalog();
 
       configuration.checkAttributeDisplayed(ATTR_COF_CUPS, RADGRP);
@@ -137,7 +136,7 @@ context('CPQ Configuration', () => {
     });
 
     it('should support checkbox list attribute type', () => {
-      configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+      common.goToPDPage(POWERTOOLS, PROD_CODE_COF);
       configurationCpq.clickOnConfigureBtnInCatalog();
 
       configuration.checkAttributeDisplayed(ATTR_COF_MODE, CHKBOX);
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
index 6c7348d5060..404da626436 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cpq/cpq-configuration.core-e2e.cy.ts
@@ -10,6 +10,7 @@ import * as configurationOverview from '../../../helpers/product-configurator-ov
 import * as configurationOverviewCpq from '../../../helpers/product-configurator-overview-cpq';
 import * as configurationCart from '../../../helpers/product-configurator-cart';
 import * as configurationCartCpq from '../../../helpers/product-configurator-cart-cpq';
+import * as common from '../../../helpers/common';
 import { clickAllowAllFromBanner } from '../../../helpers/anonymous-consents';
 
 const POWERTOOLS = 'powertools-spa';
@@ -127,14 +128,14 @@ testConfig.forEach((config) => {
       });
 
       it('should be able to navigate from the product details page', () => {
-        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
+        common.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
         configurationCpq.clickOnConfigureBtnInCatalog();
       });
     });
 
     describe('Handling different UI type', () => {
       it('should support radio button attribute type', () => {
-        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+        common.goToPDPage(POWERTOOLS, PROD_CODE_COF);
         configurationCpq.clickOnConfigureBtnInCatalog();
 
         configuration.checkAttributeDisplayed(ATTR_COF_CUPS, RADGRP);
@@ -165,7 +166,7 @@ testConfig.forEach((config) => {
       });
 
       it('should support checkbox list attribute type', () => {
-        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_COF);
+        common.goToPDPage(POWERTOOLS, PROD_CODE_COF);
         configurationCpq.clickOnConfigureBtnInCatalog();
 
         configuration.checkAttributeDisplayed(ATTR_COF_MODE, CHKBOX);
@@ -555,9 +556,9 @@ testConfig.forEach((config) => {
 
     describe('Configuration Process', () => {
       it('should support configuration aspect in product search, cart, checkout and order history', () => {
-        configurationCpq.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
-        configuration.clickOnAddToCartBtnOnPD();
-        configuration.clickOnViewCartBtnOnPD();
+        common.goToPDPage(POWERTOOLS, PROD_CODE_CAM);
+        common.clickOnAddToCartBtnOnPD();
+        common.clickOnViewCartBtnOnPD();
 
         cy.get('cx-mini-cart .count').then((elem) => {
           const numberOfCartItems = Number(elem.text());
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/common.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/common.ts
new file mode 100644
index 00000000000..3b8b9edeeb5
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/common.ts
@@ -0,0 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Clicks on 'Add to cart' on the product details page.
+ */
+export function clickOnAddToCartBtnOnPD(): void {
+  cy.get('cx-add-to-cart button.btn-primary')
+    .contains('Add to cart')
+    .click()
+    .then(() => {
+      cy.get('cx-added-to-cart-dialog').should('be.visible');
+      cy.get('div.cx-dialog-body').should('be.visible');
+      cy.get('div.cx-dialog-buttons a.btn-primary')
+        .contains('view cart')
+        .should('be.visible');
+      cy.get('div.cx-dialog-buttons a.btn-secondary')
+        .contains('proceed to checkout')
+        .should('be.visible');
+    });
+}
+
+/**
+ * Clicks on 'View Cart' on the product details page.
+ */
+export function clickOnViewCartBtnOnPD(): void {
+  cy.get('div.cx-dialog-buttons a.btn-primary')
+    .contains('view cart')
+    .click()
+    .then(() => {
+      cy.location('pathname').should('contain', '/cart');
+      cy.get('cx-cart-details').should('be.visible');
+    });
+}
+
+/**
+ * Navigates to the product detail page.
+ *
+ * @param {string} shopName - shop name
+ * @param {string} productId - Product ID
+ */
+export function goToPDPage(shopName: string, productId: string): void {
+  const location = `${shopName}/en/USD/product/${productId}/${productId}`;
+  cy.visit(location).then(() => {
+    checkLoadingMsgNotDisplayed();
+    cy.location('pathname').should('contain', location);
+    cy.get('.ProductDetailsPageTemplate').should('be.visible');
+  });
+}
+
+/**
+ * Verifies whether the loading message is not displayed.
+ */
+export function checkLoadingMsgNotDisplayed(): void {
+  cy.log('Wait until the loading notification is not displayed anymore');
+  cy.get('cx-storefront').should('not.contain.value', 'Loading');
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
index b4605a355e9..1729b670172 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-cpq.ts
@@ -56,20 +56,6 @@ export function goToCPQConfigurationPage(
   });
 }
 
-/**
- * Navigates to the product detail page.
- *
- * @param {string} shopName - shop name
- * @param {string} productId - Product ID
- */
-export function goToPDPage(shopName: string, productId: string): void {
-  const location = `${shopName}/en/USD/product/${productId}/${productId}`;
-  cy.visit(location).then(() => {
-    cy.location('pathname').should('contain', location);
-    cy.get('.ProductDetailsPageTemplate').should('be.visible');
-  });
-}
-
 /**
  * Clicks on 'Add to Cart' button in catalog list.
  */
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
index 7f7b51e7ee0..d9401d8d128 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator-vc.ts
@@ -5,6 +5,7 @@
  */
 
 import * as configuration from './product-configurator';
+import * as common from './common';
 
 const addToCartButtonSelector =
   'cx-configurator-add-to-cart-button button.cx-add-to-cart-btn';
@@ -93,21 +94,6 @@ export function registerCreateConfigurationRoute() {
   }).as(CREATE_CONFIG_ALIAS.substring(1)); // strip the '@'
 }
 
-/**
- * Navigates to the product detail page.
- *
- * @param {string} shopName - shop name
- * @param {string} productId - Product ID
- */
-export function goToPDPage(shopName: string, productId: string): void {
-  const location = `${shopName}/en/USD/product/${productId}/${productId}`;
-  cy.visit(location).then(() => {
-    checkLoadingMsgNotDisplayed();
-    cy.location('pathname').should('contain', location);
-    cy.get('.ProductDetailsPageTemplate').should('be.visible');
-  });
-}
-
 /**
  * Navigates to the cart page.
  *
@@ -121,14 +107,6 @@ export function goToCart(shopName: string) {
   });
 }
 
-/**
- * Verifies whether the loading message is not displayed.
- */
-export function checkLoadingMsgNotDisplayed(): void {
-  cy.log('Wait until the loading notification is not displayed anymore');
-  cy.get('cx-storefront').should('not.contain.value', 'Loading');
-}
-
 /**
  * Verifies whether the global message is not displayed on the top of the configuration.
  */
@@ -171,7 +149,7 @@ export function checkGhostAnimationNotDisplayed(): void {
  */
 export function checkConfigPageDisplayed(): void {
   checkGhostAnimationNotDisplayed();
-  checkLoadingMsgNotDisplayed();
+  common.checkLoadingMsgNotDisplayed();
   checkGlobalMessageNotDisplayed();
   configuration.checkTabBarDisplayed();
   configuration.checkGroupTitleDisplayed();
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
index 89e41540429..9cf8c81b78a 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/product-configurator.ts
@@ -6,8 +6,8 @@
 
 import * as login from './login';
 import * as configurationCartVc from './product-configurator-cart-vc';
-//import * as configurationCart from './product-configurator-cart';
 import * as productSearch from './product-search';
+import * as common from './common';
 import { verifyGlobalMessageAfterRegistration } from './register';
 
 const nextBtnSelector =
@@ -487,38 +487,6 @@ export function checkHamburgerDisplayed(): void {
   ).should('be.visible');
 }
 
-/**
- * Clicks on 'Add to cart' on the product details page.
- */
-export function clickOnAddToCartBtnOnPD(): void {
-  cy.get('cx-add-to-cart button.btn-primary')
-    .contains('Add to cart')
-    .click()
-    .then(() => {
-      cy.get('cx-added-to-cart-dialog').should('be.visible');
-      cy.get('div.cx-dialog-body').should('be.visible');
-      cy.get('div.cx-dialog-buttons a.btn-primary')
-        .contains('view cart')
-        .should('be.visible');
-      cy.get('div.cx-dialog-buttons a.btn-secondary')
-        .contains('proceed to checkout')
-        .should('be.visible');
-    });
-}
-
-/**
- * Clicks on 'View Cart' on the product details page.
- */
-export function clickOnViewCartBtnOnPD(): void {
-  cy.get('div.cx-dialog-buttons a.btn-primary')
-    .contains('view cart')
-    .click()
-    .then(() => {
-      cy.location('pathname').should('contain', '/cart');
-      cy.get('cx-cart-details').should('be.visible');
-    });
-}
-
 /**
  * Clicks on 'Proceed to Checkout' on the product details page.
  */
@@ -569,7 +537,7 @@ export function completeOrderProcess(productName: string): void {
   login.loginUser();
   cy.wait(tokenAuthRequestAlias).its('response.statusCode').should('eq', 200);
   this.searchForProduct(productName);
-  this.clickOnAddToCartBtnOnPD();
+  common.clickOnAddToCartBtnOnPD();
   this.clickOnProceedToCheckoutBtnOnPD();
   configurationCartVc.checkout();
   //TODO: activate after 22.05
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/textfield-configuration.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/textfield-configuration.ts
index 12fcbec1138..d692a8ddef2 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/textfield-configuration.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/textfield-configuration.ts
@@ -144,42 +144,6 @@ export function clickAddToCartButton(shopName: string): void {
     });
 }
 
-/**
- * Clicks 'Add to Cart' button on the product details page.
- */
-export function clickOnAddToCartBtnOnPD(): void {
-  cy.log("Clicks 'Add to Cart' button on the product details page");
-  cy.get('cx-add-to-cart button.btn-primary')
-    .contains('Add to cart')
-    .click()
-    .then(() => {
-      cy.get('cx-added-to-cart-dialog').should('be.visible');
-      cy.get('div.cx-dialog-body').should('be.visible');
-      cy.get('div.cx-dialog-buttons a.btn-primary')
-        .contains('view cart')
-        .should('be.visible');
-      cy.get('div.cx-dialog-buttons a.btn-secondary')
-        .contains('proceed to checkout')
-        .should('be.visible');
-    });
-}
-
-/**
- * Clicks on 'View Cart' on the product details page.
- */
-export function clickOnViewCartBtnOnPD(): void {
-  cy.log("Clicks on 'View Cart' on the product details page");
-  cy.get('div.cx-dialog-buttons a.btn-primary')
-    .contains('view cart')
-    .click()
-    .then(() => {
-      cy.log("Verify whether 'Cart details section' is visible");
-      cy.get('cx-cart-details').should('be.visible');
-      cy.log("Verify whether 'cx-cart-details' is visible");
-      cy.get('cx-cart-details').should('be.visible');
-    });
-}
-
 /**
  * Verifies whether the cart contains the product.
  *

From 6175c91c84515214cccc74333597dd9b2eaacb3f Mon Sep 17 00:00:00 2001
From: anjana-bl <84384970+anjana-bl@users.noreply.github.com>
Date: Wed, 12 Jul 2023 20:28:35 +0530
Subject: [PATCH 070/122] CXINT- 2038 : segment reference (#17605)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .env-cmdrc                                    |   4 +
 core-libs/setup/tsconfig.spec.json            |   6 +
 feature-libs/asm/tsconfig.schematics.json     |   6 +
 feature-libs/cart/tsconfig.schematics.json    |   6 +
 .../checkout/tsconfig.schematics.json         |   6 +
 .../tsconfig.schematics.json                  |   6 +
 feature-libs/order/tsconfig.schematics.json   |   6 +
 .../organization/tsconfig.schematics.json     |   6 +
 .../pickup-in-store/tsconfig.schematics.json  |   6 +
 .../tsconfig.schematics.json                  |   6 +
 feature-libs/product/tsconfig.schematics.json |   6 +
 .../qualtrics/tsconfig.schematics.json        |   6 +
 .../smartedit/tsconfig.schematics.json        |   6 +
 .../storefinder/tsconfig.schematics.json      |   6 +
 .../tracking/tsconfig.schematics.json         |   6 +
 feature-libs/user/tsconfig.schematics.json    |   6 +
 integration-libs/cdc/tsconfig.schematics.json |   6 +
 integration-libs/cds/tsconfig.schematics.json |   6 +
 .../digital-payments/tsconfig.schematics.json |   6 +
 .../tsconfig.schematics.json                  |   6 +
 .../s4om/tsconfig.schematics.json             |   6 +
 integration-libs/segment-refs/README.md       |   7 +
 .../segment-refs/jest.schematics.config.js    |  35 ++
 integration-libs/segment-refs/karma.conf.js   |  45 ++
 integration-libs/segment-refs/ng-package.json |   8 +
 integration-libs/segment-refs/package.json    |  34 ++
 integration-libs/segment-refs/project.json    |  50 ++
 integration-libs/segment-refs/public_api.ts   |  10 +
 .../config/default-segment-refs-config.ts     |  13 +
 .../root/config/segment-refs-config.ts        |  22 +
 .../segment-refs/root/feature-name.ts         |   7 +
 .../root/http-interceptors/index.ts           |  17 +
 .../occ-segment-refs.interceptor.spec.ts      | 166 ++++++
 .../occ-segment-refs.interceptor.ts           |  87 +++
 .../segment-refs/root/ng-package.json         |   6 +
 .../segment-refs/root/public_api.ts           |   7 +
 .../root/segment-refs-root.module.ts          |  20 +
 .../segment-refs/schematics/.gitignore        |  18 +
 .../__snapshots__/index_spec.ts.snap          |  29 +
 .../schematics/add-segment-refs/index.ts      |  45 ++
 .../schematics/add-segment-refs/index_spec.ts | 179 ++++++
 .../schematics/add-segment-refs/schema.json   |  25 +
 .../segment-refs/schematics/collection.json   |  18 +
 integration-libs/segment-refs/setup-jest.ts   |   8 +
 integration-libs/segment-refs/test.ts         |  22 +
 .../segment-refs/tsconfig.lib.json            |  29 +
 .../segment-refs/tsconfig.lib.prod.json       |   9 +
 .../segment-refs/tsconfig.schematics.json     | 523 ++++++++++++++++++
 .../segment-refs/tsconfig.spec.json           |  12 +
 package.json                                  |   4 +-
 .../schematics/src/add-spartacus/schema.json  |   5 +
 projects/schematics/src/dependencies.json     |   8 +
 .../lib-configs/integration-libs/index.ts     |   1 +
 .../segment-refs-schematics-config.ts         |  40 ++
 .../schematics/src/shared/libs-constants.ts   |   6 +
 .../src/shared/schematics-config-mappings.ts  |   3 +
 .../src/shared/utils/graph-utils_spec.ts      |   3 +
 .../schematics/src/shared/utils/test-utils.ts |   2 +
 .../segment-refs/segment-refs-e2e.cy.ts       |  28 +
 .../storefrontapp-e2e-cypress/package.json    |   3 +-
 .../segment-refs-feature.module.ts            |  13 +
 .../spartacus/spartacus-features.module.ts    |   4 +
 .../src/environments/environment.prod.ts      |   1 +
 .../src/environments/environment.ts           |   1 +
 .../models/build.process.env.d.ts             |   1 +
 .../environments/models/environment.model.ts  |   1 +
 projects/storefrontapp/tsconfig.app.prod.json |   2 +
 projects/storefrontapp/tsconfig.server.json   |   6 +
 .../storefrontapp/tsconfig.server.prod.json   |   2 +
 tools/schematics/testing.ts                   |   3 +
 tsconfig.compodoc.json                        |   6 +
 tsconfig.json                                 |   6 +
 72 files changed, 1722 insertions(+), 2 deletions(-)
 create mode 100644 integration-libs/segment-refs/README.md
 create mode 100644 integration-libs/segment-refs/jest.schematics.config.js
 create mode 100644 integration-libs/segment-refs/karma.conf.js
 create mode 100644 integration-libs/segment-refs/ng-package.json
 create mode 100644 integration-libs/segment-refs/package.json
 create mode 100644 integration-libs/segment-refs/project.json
 create mode 100644 integration-libs/segment-refs/public_api.ts
 create mode 100644 integration-libs/segment-refs/root/config/default-segment-refs-config.ts
 create mode 100644 integration-libs/segment-refs/root/config/segment-refs-config.ts
 create mode 100644 integration-libs/segment-refs/root/feature-name.ts
 create mode 100644 integration-libs/segment-refs/root/http-interceptors/index.ts
 create mode 100644 integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.spec.ts
 create mode 100644 integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.ts
 create mode 100644 integration-libs/segment-refs/root/ng-package.json
 create mode 100644 integration-libs/segment-refs/root/public_api.ts
 create mode 100644 integration-libs/segment-refs/root/segment-refs-root.module.ts
 create mode 100644 integration-libs/segment-refs/schematics/.gitignore
 create mode 100644 integration-libs/segment-refs/schematics/add-segment-refs/__snapshots__/index_spec.ts.snap
 create mode 100644 integration-libs/segment-refs/schematics/add-segment-refs/index.ts
 create mode 100644 integration-libs/segment-refs/schematics/add-segment-refs/index_spec.ts
 create mode 100644 integration-libs/segment-refs/schematics/add-segment-refs/schema.json
 create mode 100644 integration-libs/segment-refs/schematics/collection.json
 create mode 100644 integration-libs/segment-refs/setup-jest.ts
 create mode 100644 integration-libs/segment-refs/test.ts
 create mode 100644 integration-libs/segment-refs/tsconfig.lib.json
 create mode 100644 integration-libs/segment-refs/tsconfig.lib.prod.json
 create mode 100644 integration-libs/segment-refs/tsconfig.schematics.json
 create mode 100644 integration-libs/segment-refs/tsconfig.spec.json
 create mode 100644 projects/schematics/src/shared/lib-configs/integration-libs/segment-refs-schematics-config.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/segment-refs/segment-refs-e2e.cy.ts
 create mode 100644 projects/storefrontapp/src/app/spartacus/features/segment-refs/segment-refs-feature.module.ts

diff --git a/.env-cmdrc b/.env-cmdrc
index e32846775ef..32dd9037fe6 100644
--- a/.env-cmdrc
+++ b/.env-cmdrc
@@ -34,6 +34,10 @@
     "CX_B2B": "true",
     "CX_CPQ": "true"
   },
+  "segment-refs": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p7-public.model-t.myhybris.cloud",
+    "CX_SEGMENT_REFS": "true"
+  },
   "b2c": {
     "CX_B2B": "false",
     "CX_CDS": "false"
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 1a125185d68..8651d06b628 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -497,6 +497,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 407c6789ddc..1f4a6c3d7d3 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -507,6 +507,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index 950fc7784fe..79162078353 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -510,6 +510,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index ff9faf3f3a5..8541afd1a3a 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index 14d788b8add..89a57f3fcac 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -494,6 +494,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/integration-libs/segment-refs/README.md b/integration-libs/segment-refs/README.md
new file mode 100644
index 00000000000..8b44e1b8999
--- /dev/null
+++ b/integration-libs/segment-refs/README.md
@@ -0,0 +1,7 @@
+# Spartacus Segment Reference Integration
+
+Spartacus' Segment Reference library is an enhancement to Personalization library. Spartacus' Segment Reference library enables external system (Emarsys) segmentation based personalisation capabilities into Spartacus storefront
+
+It can be added to the existing Spartacus application by running `ng add @spartacus/segment-refs`. For more information about Spartacus schematics, visit the [official Spartacus schematics documentation page](https://sap.github.io/spartacus-docs/schematics/).
+
+For more information, see [Spartacus](https://github.com/SAP/spartacus).
diff --git a/integration-libs/segment-refs/jest.schematics.config.js b/integration-libs/segment-refs/jest.schematics.config.js
new file mode 100644
index 00000000000..ce45d273ab7
--- /dev/null
+++ b/integration-libs/segment-refs/jest.schematics.config.js
@@ -0,0 +1,35 @@
+const { pathsToModuleNameMapper } = require('ts-jest');
+const { compilerOptions } = require('./tsconfig.schematics.json');
+const { defaultTransformerOptions } = require('jest-preset-angular/presets');
+
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'jest-preset-angular',
+  globalSetup: 'jest-preset-angular/global-setup',
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
+    prefix: '<rootDir>/',
+  }),
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
+  testMatch: ['**/+(*_)+(spec).+(ts)'],
+  transform: {
+    '^.+\\.(ts|js|mjs|html|svg)$': [
+      'jest-preset-angular',
+      {
+        ...defaultTransformerOptions,
+        tsconfig: '<rootDir>/tsconfig.schematics.json',
+      },
+    ],
+  },
+
+  collectCoverage: false,
+  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  coverageDirectory: '<rootDir>/../../coverage/segment/schematics',
+  coverageThreshold: {
+    global: {
+      statements: 90,
+      branches: 90,
+      functions: 90,
+      lines: 90,
+    },
+  },
+};
diff --git a/integration-libs/segment-refs/karma.conf.js b/integration-libs/segment-refs/karma.conf.js
new file mode 100644
index 00000000000..c784a91dad0
--- /dev/null
+++ b/integration-libs/segment-refs/karma.conf.js
@@ -0,0 +1,45 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-coverage'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+      require('karma-junit-reporter'),
+    ],
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+    },
+    reporters: ['progress', 'kjhtml', 'dots', 'junit'],
+    junitReporter: {
+      outputFile: 'unit-test-segment.xml',
+      outputDir: require('path').join(__dirname, '../../unit-tests-reports'),
+      useBrowserName: false,
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, '../../coverage/segment'),
+      reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }],
+      check: {
+        global: {
+          statements: 90,
+          lines: 90,
+          branches: 75,
+          functions: 90,
+        },
+      },
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true,
+  });
+};
diff --git a/integration-libs/segment-refs/ng-package.json b/integration-libs/segment-refs/ng-package.json
new file mode 100644
index 00000000000..ffb739c7c84
--- /dev/null
+++ b/integration-libs/segment-refs/ng-package.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/segment-refs",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  },
+  "assets": ["**/*.scss", "schematics/**/*.json", "schematics/**/*.js"]
+}
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
new file mode 100644
index 00000000000..1839f071177
--- /dev/null
+++ b/integration-libs/segment-refs/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "@spartacus/segment-refs",
+  "version": "5.0.0",
+  "description": "segment-refs",
+  "keywords": [
+    "spartacus",
+    "framework",
+    "storefront",
+    "segment"
+  ],
+  "homepage": "https://github.com/SAP/spartacus",
+  "repository": "https://github.com/SAP/spartacus",
+  "license": "Apache-2.0",
+  "scripts": {
+    "build:schematics": "npm run clean:schematics && ../../node_modules/.bin/tsc -p ./tsconfig.schematics.json",
+    "clean:schematics": "../../node_modules/.bin/rimraf --glob \"schematics/**/*.js\" \"schematics/**/*.js.map\" \"schematics/**/*.d.ts\"",
+    "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
+  },
+  "dependencies": {
+    "tslib": "^2.4.0"
+  },
+  "peerDependencies": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@spartacus/core": "5.0.0",
+    "@spartacus/schematics": "5.0.0",
+    "rxjs": "^6.6.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "schematics": "./schematics/collection.json"
+}
diff --git a/integration-libs/segment-refs/project.json b/integration-libs/segment-refs/project.json
new file mode 100644
index 00000000000..7a907450d7e
--- /dev/null
+++ b/integration-libs/segment-refs/project.json
@@ -0,0 +1,50 @@
+{
+  "name": "segment-refs",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "integration-libs/segment-refs",
+  "prefix": "cx",
+  "targets": {
+    "build": {
+      "executor": "@angular-devkit/build-angular:ng-packagr",
+      "options": {
+        "project": "integration-libs/segment-refs/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "integration-libs/segment-refs/tsconfig.lib.prod.json"
+        },
+        "development": {
+          "tsConfig": "integration-libs/segment-refs/tsconfig.lib.json"
+        }
+      },
+      "defaultConfiguration": "production"
+    },
+    "test": {
+      "executor": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "integration-libs/segment-refs/test.ts",
+        "tsConfig": "integration-libs/segment-refs/tsconfig.spec.json",
+        "polyfills": ["zone.js", "zone.js/testing"],
+        "karmaConfig": "integration-libs/segment-refs/karma.conf.js"
+      }
+    },
+    "test-jest": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "npm run test:schematics",
+        "cwd": "integration-libs/segment-refs"
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "integration-libs/segment-refs/**/*.ts",
+          "integration-libs/segment-refs/**/*.html"
+        ]
+      }
+    }
+  },
+  "tags": ["type:feature", "type:integration"]
+}
diff --git a/integration-libs/segment-refs/public_api.ts b/integration-libs/segment-refs/public_api.ts
new file mode 100644
index 00000000000..5a1a5ac7cbe
--- /dev/null
+++ b/integration-libs/segment-refs/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Public API Surface of segment
+ */
+export * from './root/public_api';
diff --git a/integration-libs/segment-refs/root/config/default-segment-refs-config.ts b/integration-libs/segment-refs/root/config/default-segment-refs-config.ts
new file mode 100644
index 00000000000..e7bbced03cd
--- /dev/null
+++ b/integration-libs/segment-refs/root/config/default-segment-refs-config.ts
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SegmentRefsConfig } from './segment-refs-config';
+
+export const defaultSegmentRefsConfig: SegmentRefsConfig = {
+  segmentRefs: {
+    httpHeaderName: 'Segmentrefs',
+  },
+};
diff --git a/integration-libs/segment-refs/root/config/segment-refs-config.ts b/integration-libs/segment-refs/root/config/segment-refs-config.ts
new file mode 100644
index 00000000000..c75f6f79358
--- /dev/null
+++ b/integration-libs/segment-refs/root/config/segment-refs-config.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { Config } from '@spartacus/core';
+
+@Injectable({
+  providedIn: 'root',
+  useExisting: Config,
+})
+export abstract class SegmentRefsConfig {
+  segmentRefs?: {
+    httpHeaderName: string;
+  };
+}
+
+declare module '@spartacus/core' {
+  interface Config extends SegmentRefsConfig {}
+}
diff --git a/integration-libs/segment-refs/root/feature-name.ts b/integration-libs/segment-refs/root/feature-name.ts
new file mode 100644
index 00000000000..0ac97b8e131
--- /dev/null
+++ b/integration-libs/segment-refs/root/feature-name.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const SEGMENT_REFS_FEATURE = 'Segment-Refs';
diff --git a/integration-libs/segment-refs/root/http-interceptors/index.ts b/integration-libs/segment-refs/root/http-interceptors/index.ts
new file mode 100644
index 00000000000..f263dae1da4
--- /dev/null
+++ b/integration-libs/segment-refs/root/http-interceptors/index.ts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Provider } from '@angular/core';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { OccSegmentRefsInterceptor } from './occ-segment-refs.interceptor';
+
+export const segmentRefsInterceptors: Provider[] = [
+  {
+    provide: HTTP_INTERCEPTORS,
+    useExisting: OccSegmentRefsInterceptor,
+    multi: true,
+  },
+];
diff --git a/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.spec.ts b/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.spec.ts
new file mode 100644
index 00000000000..28f2bc549ca
--- /dev/null
+++ b/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.spec.ts
@@ -0,0 +1,166 @@
+import { HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { inject, TestBed } from '@angular/core/testing';
+import { WindowRef } from '@spartacus/core';
+import { SegmentRefsConfig } from '../config/segment-refs-config';
+import { OccSegmentRefsInterceptor } from './occ-segment-refs.interceptor';
+
+const url =
+  'https://localhost:9002/occ/v2/electronics-spa/cms/pages?lang=en&curr=USD';
+const mockSegmentRefsConfig: SegmentRefsConfig = {
+  segmentRefs: {
+    httpHeaderName: 'mock-Segmentrefs',
+  },
+};
+const MockWindowRef1 = {
+  localStorage: {
+    setItem: (_key: string, _value: string) => {},
+  },
+  isBrowser(): boolean {
+    return true;
+  },
+  location: {
+    href: 'http://localhost:4200/electronics-spa/en/USD/?segmentrefs=footwear,bags',
+  },
+};
+const MockWindowRef2 = {
+  localStorage: {
+    getItem: (_key: string): string => {
+      return 'footwear,bags';
+    },
+  },
+  isBrowser(): boolean {
+    return true;
+  },
+  location: {
+    href: 'http://localhost:4200/electronics-spa/en/USD/',
+  },
+};
+const MockWindowRef3 = {
+  localStorage: {
+    getItem: (_key: string): null => {
+      return null;
+    },
+  },
+  isBrowser(): boolean {
+    return true;
+  },
+  location: {
+    href: 'http://localhost:4200/electronics-spa/en/USD/',
+  },
+};
+describe('OccSegmentRefsInterceptor', () => {
+  describe('launch storefront with url containing segmentrefs', () => {
+    let httpMock: HttpTestingController;
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        providers: [
+          { provide: SegmentRefsConfig, useValue: mockSegmentRefsConfig },
+          { provide: WindowRef, useValue: MockWindowRef1 },
+          {
+            provide: HTTP_INTERCEPTORS,
+            useClass: OccSegmentRefsInterceptor,
+            multi: true,
+          },
+        ],
+      });
+      httpMock = TestBed.inject(HttpTestingController);
+    });
+    afterEach(() => {
+      httpMock.verify();
+    });
+    it('should add request header if segmentrefs exists in url', inject(
+      [HttpClient],
+      (http: HttpClient) => {
+        http.get(url).subscribe((result) => {
+          expect(result).toBeTruthy();
+        });
+        const mockReq = httpMock.expectOne((req) => {
+          return req.method === 'GET';
+        });
+        const perHeader = mockReq.request.headers.get('mock-Segmentrefs');
+        expect(perHeader).toBeTruthy();
+        expect(perHeader).toEqual('footwear,bags');
+        mockReq.flush('someData');
+      }
+    ));
+  });
+
+  describe('launch storefront with url not containing segmentrefs but previous histroty exists', () => {
+    let httpMock: HttpTestingController;
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        providers: [
+          { provide: SegmentRefsConfig, useValue: mockSegmentRefsConfig },
+          { provide: WindowRef, useValue: MockWindowRef2 },
+          {
+            provide: HTTP_INTERCEPTORS,
+            useClass: OccSegmentRefsInterceptor,
+            multi: true,
+          },
+        ],
+      });
+      httpMock = TestBed.inject(HttpTestingController);
+    });
+    afterEach(() => {
+      httpMock.verify();
+    });
+    it('should add request header if segmentrefs exists in local storage', inject(
+      [HttpClient],
+      (http: HttpClient) => {
+        http.get(url).subscribe((result) => {
+          expect(result).toBeTruthy();
+        });
+        const mockReq = httpMock.expectOne((req) => {
+          return req.method === 'GET';
+        });
+        const perHeader = mockReq.request.headers.get('mock-Segmentrefs');
+        expect(perHeader).toBeTruthy();
+        expect(perHeader).toEqual('footwear,bags');
+        mockReq.flush('someData');
+      }
+    ));
+  });
+
+  describe('launch storefront with url not containing segmentrefs and no previous history of segmentRefs', () => {
+    let httpMock: HttpTestingController;
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        imports: [HttpClientTestingModule],
+        providers: [
+          { provide: SegmentRefsConfig, useValue: mockSegmentRefsConfig },
+          { provide: WindowRef, useValue: MockWindowRef3 },
+          {
+            provide: HTTP_INTERCEPTORS,
+            useClass: OccSegmentRefsInterceptor,
+            multi: true,
+          },
+        ],
+      });
+      httpMock = TestBed.inject(HttpTestingController);
+    });
+    afterEach(() => {
+      httpMock.verify();
+    });
+    it('should not add request header if segmentrefs doesnot exists', inject(
+      [HttpClient],
+      (http: HttpClient) => {
+        http.get(url).subscribe((result) => {
+          expect(result).toBeTruthy();
+        });
+        const mockReq = httpMock.expectOne((req) => {
+          return req.method === 'GET';
+        });
+        const perHeader = mockReq.request.headers.get('mock-Segmentrefs');
+        expect(perHeader).toBeFalsy();
+        expect(perHeader).toEqual(null);
+        mockReq.flush('someData');
+      }
+    ));
+  });
+});
diff --git a/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.ts b/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.ts
new file mode 100644
index 00000000000..07d47d231ee
--- /dev/null
+++ b/integration-libs/segment-refs/root/http-interceptors/occ-segment-refs.interceptor.ts
@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import { Injectable, inject, isDevMode } from '@angular/core';
+import { Observable } from 'rxjs';
+import { LoggerService, OccEndpointsService, WindowRef } from '@spartacus/core';
+import { SegmentRefsConfig } from '../config/segment-refs-config';
+
+@Injectable({ providedIn: 'root' })
+export class OccSegmentRefsInterceptor implements HttpInterceptor {
+  private segmentRefs?: string | null;
+  private requestHeader?: string;
+  protected readonly SEGMENT_REFS_KEY = 'segment-refs';
+  protected readonly SEGMENT_REFS_QUERY_PARAM = 'segmentrefs';
+
+  protected logger = inject(LoggerService);
+
+  constructor(
+    protected config: SegmentRefsConfig,
+    protected occEndpoints: OccEndpointsService,
+    protected winRef: WindowRef
+  ) {
+    this.initialize();
+  }
+
+  /**
+   * Fetched the segment reference ID from URL query parameter and saves it into
+   * browser local storage
+   */
+  protected initialize() {
+    const url = this.winRef.location.href ?? '';
+    const queryParams = new URLSearchParams(url.substring(url.indexOf('?')));
+    this.segmentRefs = queryParams.get(this.SEGMENT_REFS_QUERY_PARAM);
+    if (this.segmentRefs) {
+      this.winRef.localStorage?.setItem(
+        this.SEGMENT_REFS_KEY,
+        this.segmentRefs
+      );
+    } else {
+      this.segmentRefs = this.winRef.localStorage?.getItem(
+        this.SEGMENT_REFS_KEY
+      );
+    }
+    if (this.winRef.isBrowser()) {
+      if (!this.config.segmentRefs?.httpHeaderName && isDevMode()) {
+        this.logger.warn(`There is no httpHeaderName configured in Segment`);
+      }
+      this.requestHeader =
+        this.config.segmentRefs?.httpHeaderName?.toLowerCase?.();
+    }
+  }
+
+  /**
+   * Adds a new request header 'Segmentrefs' to the given HTTP request.
+   * @param request The outgoing request object to handle.
+   * @param next The next interceptor in the chain, or the backend
+   * if no interceptors remain in the chain.
+   * @returns An observable of the event stream.
+   */
+  intercept(
+    request: HttpRequest<any>,
+    next: HttpHandler
+  ): Observable<HttpEvent<any>> {
+    if (
+      this.winRef.isBrowser() &&
+      this.requestHeader &&
+      this.segmentRefs &&
+      request.url.includes(this.occEndpoints.getBaseUrl())
+    ) {
+      request = request.clone({
+        setHeaders: {
+          [this.requestHeader]: this.segmentRefs,
+        },
+      });
+    }
+    return next.handle(request);
+  }
+}
diff --git a/integration-libs/segment-refs/root/ng-package.json b/integration-libs/segment-refs/root/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/integration-libs/segment-refs/root/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/integration-libs/segment-refs/root/public_api.ts b/integration-libs/segment-refs/root/public_api.ts
new file mode 100644
index 00000000000..998448de30c
--- /dev/null
+++ b/integration-libs/segment-refs/root/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './segment-refs-root.module';
diff --git a/integration-libs/segment-refs/root/segment-refs-root.module.ts b/integration-libs/segment-refs/root/segment-refs-root.module.ts
new file mode 100644
index 00000000000..925b30ad055
--- /dev/null
+++ b/integration-libs/segment-refs/root/segment-refs-root.module.ts
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
+import { defaultSegmentRefsConfig } from './config/default-segment-refs-config';
+import { segmentRefsInterceptors } from './http-interceptors';
+
+@NgModule({
+  declarations: [],
+  imports: [],
+  providers: [
+    ...segmentRefsInterceptors,
+    provideDefaultConfig(defaultSegmentRefsConfig),
+  ],
+})
+export class SegmentRefsRootModule {}
diff --git a/integration-libs/segment-refs/schematics/.gitignore b/integration-libs/segment-refs/schematics/.gitignore
new file mode 100644
index 00000000000..c88f4d69e15
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/.gitignore
@@ -0,0 +1,18 @@
+# Outputs
+**/*.js
+**/*.js.map
+**/*.d.ts
+
+# IDEs
+.idea/
+jsconfig.json
+.vscode/
+
+# Misc
+node_modules/
+npm-debug.log*
+yarn-error.log*
+
+# Mac OSX Finder files.
+**/.DS_Store
+.DS_Store
diff --git a/integration-libs/segment-refs/schematics/add-segment-refs/__snapshots__/index_spec.ts.snap b/integration-libs/segment-refs/schematics/add-segment-refs/__snapshots__/index_spec.ts.snap
new file mode 100644
index 00000000000..b450e8c1bea
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/add-segment-refs/__snapshots__/index_spec.ts.snap
@@ -0,0 +1,29 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Spartacus segment-refs schematics: ng-add Segment-refs feature eager loading should import appropriate modules 1`] = `
+"import { NgModule } from '@angular/core';
+import { SegmentRefsRootModule } from "@spartacus/segment-refs/root";
+
+@NgModule({
+  declarations: [],
+  imports: [
+    SegmentRefsRootModule
+  ]
+})
+export class SegmentRefsFeatureModule { }
+"
+`;
+
+exports[`Spartacus segment-refs schematics: ng-add Segment-refs feature general setup should add the feature using the lazy loading syntax 1`] = `
+"import { NgModule } from '@angular/core';
+import { SegmentRefsRootModule } from "@spartacus/segment-refs/root";
+
+@NgModule({
+  declarations: [],
+  imports: [
+    SegmentRefsRootModule
+  ]
+})
+export class SegmentRefsFeatureModule { }
+"
+`;
diff --git a/integration-libs/segment-refs/schematics/add-segment-refs/index.ts b/integration-libs/segment-refs/schematics/add-segment-refs/index.ts
new file mode 100644
index 00000000000..3bf5c64d830
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/add-segment-refs/index.ts
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  chain,
+  Rule,
+  SchematicContext,
+  Tree,
+} from '@angular-devkit/schematics';
+import {
+  addFeatures,
+  addPackageJsonDependenciesForLibrary,
+  analyzeApplication,
+  analyzeCrossFeatureDependencies,
+  finalizeInstallation,
+  readPackageJson,
+  validateSpartacusInstallation,
+  LibraryOptions as SpartacusSegmentRefsOptions,
+} from '@spartacus/schematics';
+import { peerDependencies } from '../../package.json';
+
+export function addSegmentRefsFeature(
+  options: SpartacusSegmentRefsOptions
+): Rule {
+  return (tree: Tree, _context: SchematicContext): Rule => {
+    const packageJson = readPackageJson(tree);
+    validateSpartacusInstallation(packageJson);
+
+    const features = analyzeCrossFeatureDependencies(
+      options.features as string[]
+    );
+
+    return chain([
+      analyzeApplication(options, features),
+
+      addFeatures(options, features),
+      addPackageJsonDependenciesForLibrary(peerDependencies, options),
+
+      finalizeInstallation(options, features),
+    ]);
+  };
+}
diff --git a/integration-libs/segment-refs/schematics/add-segment-refs/index_spec.ts b/integration-libs/segment-refs/schematics/add-segment-refs/index_spec.ts
new file mode 100644
index 00000000000..f6a4cfb3694
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/add-segment-refs/index_spec.ts
@@ -0,0 +1,179 @@
+/// <reference types="jest" />
+
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import {
+  Schema as ApplicationOptions,
+  Style,
+} from '@schematics/angular/application/schema';
+import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
+import {
+  LibraryOptions as SegmentRefsOptions,
+  segmentRefsFeatureModulePath,
+  SEGMENT_REFS_FEATURE_NAME,
+  SpartacusOptions,
+  SPARTACUS_SCHEMATICS,
+  SPARTACUS_SEGMENT_REFS,
+  trackingPersonalizationFeatureModulePath,
+  TRACKING_PERSONALIZATION_FEATURE_NAME,
+} from '@spartacus/schematics';
+import * as path from 'path';
+import { peerDependencies } from '../../package.json';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+
+describe('Spartacus segment-refs schematics: ng-add', () => {
+  const schematicRunner = new SchematicTestRunner(
+    SPARTACUS_SEGMENT_REFS,
+    collectionPath
+  );
+
+  let appTree: UnitTestTree;
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    version: '0.5.0',
+  };
+
+  const appOptions: ApplicationOptions = {
+    name: 'schematics-test',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: false,
+    style: Style.Scss,
+    skipTests: false,
+    projectRoot: '',
+  };
+
+  const spartacusDefaultOptions: SpartacusOptions = {
+    project: 'schematics-test',
+    lazy: true,
+    features: [],
+  };
+
+  const libraryNoFeaturesOptions: SegmentRefsOptions = {
+    project: 'schematics-test',
+    lazy: false,
+    features: [],
+  };
+
+  const segmentRefsFeatureOptions: SegmentRefsOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [SEGMENT_REFS_FEATURE_NAME],
+  };
+
+  beforeEach(async () => {
+    schematicRunner.registerCollection(
+      SPARTACUS_SCHEMATICS,
+      path.join(
+        __dirname,
+        '../../../../projects/schematics/src/collection.json'
+      )
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'workspace',
+      workspaceOptions
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'application',
+      appOptions,
+      appTree
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      SPARTACUS_SCHEMATICS,
+      'ng-add',
+      { ...spartacusDefaultOptions, name: 'schematics-test' },
+      appTree
+    );
+  });
+
+  describe('Without features', () => {
+    beforeEach(async () => {
+      appTree = await schematicRunner.runSchematic(
+        'ng-add',
+        libraryNoFeaturesOptions,
+        appTree
+      );
+    });
+
+    it('should not create any of the feature modules', () => {
+      expect(appTree.exists(segmentRefsFeatureModulePath)).toBeFalsy();
+    });
+  });
+
+  describe('Segment-refs feature', () => {
+    describe('general setup', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          {
+            ...segmentRefsFeatureOptions,
+            features: [TRACKING_PERSONALIZATION_FEATURE_NAME],
+          },
+          appTree
+        );
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          segmentRefsFeatureOptions,
+          appTree
+        );
+      });
+
+      it('should install necessary Spartacus libraries', () => {
+        const packageJson = JSON.parse(appTree.readContent('package.json'));
+        let dependencies: Record<string, string> = {};
+        dependencies = { ...packageJson.dependencies };
+        dependencies = { ...dependencies, ...packageJson.devDependencies };
+
+        for (const toAdd in peerDependencies) {
+          if (
+            !peerDependencies.hasOwnProperty(toAdd) ||
+            toAdd === SPARTACUS_SCHEMATICS
+          ) {
+            continue;
+          }
+          const expectedDependency = dependencies[toAdd];
+          expect(expectedDependency).toBeTruthy();
+        }
+      });
+
+      it('should add the feature using the lazy loading syntax', async () => {
+        const module = appTree.readContent(segmentRefsFeatureModulePath);
+        expect(module).toMatchSnapshot();
+      });
+    });
+
+    describe('eager loading', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          {
+            ...segmentRefsFeatureOptions,
+            features: [TRACKING_PERSONALIZATION_FEATURE_NAME],
+          },
+          appTree
+        );
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          { ...segmentRefsFeatureOptions, lazy: false },
+          appTree
+        );
+      });
+
+      it('should import appropriate modules', async () => {
+        const module = appTree.readContent(segmentRefsFeatureModulePath);
+        expect(module).toMatchSnapshot();
+        expect(
+          appTree.readContent(trackingPersonalizationFeatureModulePath)
+        ).toBeTruthy();
+      });
+    });
+  });
+});
diff --git a/integration-libs/segment-refs/schematics/add-segment-refs/schema.json b/integration-libs/segment-refs/schematics/add-segment-refs/schema.json
new file mode 100644
index 00000000000..77eb434283f
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/add-segment-refs/schema.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "SegmentRefsSchematics",
+  "title": "Segment Refs Schematics",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "debug": {
+      "description": "Display additional details during the running process.",
+      "type": "boolean",
+      "default": false
+    },
+    "features": {
+      "type": "array",
+      "uniqueItems": true,
+      "default": ["Segment-Refs"]
+    }
+  }
+}
diff --git a/integration-libs/segment-refs/schematics/collection.json b/integration-libs/segment-refs/schematics/collection.json
new file mode 100644
index 00000000000..682bcca6840
--- /dev/null
+++ b/integration-libs/segment-refs/schematics/collection.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "factory": "./add-segment-refs/index#addSegmentRefsFeature",
+      "description": "Add and configure Spartacus' Segment feature",
+      "schema": "./add-segment-refs/schema.json",
+      "private": true,
+      "hidden": true,
+      "aliases": ["install"]
+    },
+    "add": {
+      "factory": "./add-segment-refs/index#addSegmentRefsFeature",
+      "description": "Add and configure Spartacus' Segment feature",
+      "schema": "./add-segment-refs/schema.json"
+    }
+  }
+}
diff --git a/integration-libs/segment-refs/setup-jest.ts b/integration-libs/segment-refs/setup-jest.ts
new file mode 100644
index 00000000000..919fe8743ac
--- /dev/null
+++ b/integration-libs/segment-refs/setup-jest.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import 'jest-preset-angular/setup-jest';
+import 'zone.js';
diff --git a/integration-libs/segment-refs/test.ts b/integration-libs/segment-refs/test.ts
new file mode 100644
index 00000000000..bd3bae74074
--- /dev/null
+++ b/integration-libs/segment-refs/test.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  {
+    teardown: { destroyAfterEach: false },
+  }
+);
diff --git a/integration-libs/segment-refs/tsconfig.lib.json b/integration-libs/segment-refs/tsconfig.lib.json
new file mode 100644
index 00000000000..d9e7d2b243d
--- /dev/null
+++ b/integration-libs/segment-refs/tsconfig.lib.json
@@ -0,0 +1,29 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "importHelpers": true,
+    "skipLibCheck": true,
+    "lib": ["dom", "esnext"],
+    "paths": {
+      "@spartacus/core": ["dist/core"]
+    },
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true
+  },
+  "exclude": ["test.ts", "**/*.spec.ts"]
+}
diff --git a/integration-libs/segment-refs/tsconfig.lib.prod.json b/integration-libs/segment-refs/tsconfig.lib.prod.json
new file mode 100644
index 00000000000..2a2faa884cf
--- /dev/null
+++ b/integration-libs/segment-refs/tsconfig.lib.prod.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
+  }
+}
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
new file mode 100644
index 00000000000..89a57f3fcac
--- /dev/null
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -0,0 +1,523 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "module": "CommonJs",
+    "types": ["jest"],
+    "paths": {
+      "@spartacus/schematics": ["../../projects/schematics/index"],
+      "@spartacus/setup": ["../../core-libs/setup/public_api"],
+      "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/asm/assets": ["../../feature-libs/asm/assets/public_api"],
+      "@spartacus/asm/components": [
+        "../../feature-libs/asm/components/public_api"
+      ],
+      "@spartacus/asm/core": ["../../feature-libs/asm/core/public_api"],
+      "@spartacus/asm": ["../../feature-libs/asm/public_api"],
+      "@spartacus/asm/occ": ["../../feature-libs/asm/occ/public_api"],
+      "@spartacus/asm/root": ["../../feature-libs/asm/root/public_api"],
+      "@spartacus/cart/base/assets": [
+        "../../feature-libs/cart/base/assets/public_api"
+      ],
+      "@spartacus/cart/base/components/add-to-cart": [
+        "../../feature-libs/cart/base/components/add-to-cart/public_api"
+      ],
+      "@spartacus/cart/base/components/mini-cart": [
+        "../../feature-libs/cart/base/components/mini-cart/public_api"
+      ],
+      "@spartacus/cart/base/components": [
+        "../../feature-libs/cart/base/components/public_api"
+      ],
+      "@spartacus/cart/base/core": [
+        "../../feature-libs/cart/base/core/public_api"
+      ],
+      "@spartacus/cart/base": ["../../feature-libs/cart/base/public_api"],
+      "@spartacus/cart/base/occ": [
+        "../../feature-libs/cart/base/occ/public_api"
+      ],
+      "@spartacus/cart/base/root": [
+        "../../feature-libs/cart/base/root/public_api"
+      ],
+      "@spartacus/cart/import-export/assets": [
+        "../../feature-libs/cart/import-export/assets/public_api"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "../../feature-libs/cart/import-export/components/public_api"
+      ],
+      "@spartacus/cart/import-export/core": [
+        "../../feature-libs/cart/import-export/core/public_api"
+      ],
+      "@spartacus/cart/import-export": [
+        "../../feature-libs/cart/import-export/public_api"
+      ],
+      "@spartacus/cart/import-export/root": [
+        "../../feature-libs/cart/import-export/root/public_api"
+      ],
+      "@spartacus/cart": ["../../feature-libs/cart/public_api"],
+      "@spartacus/cart/quick-order/assets": [
+        "../../feature-libs/cart/quick-order/assets/public_api"
+      ],
+      "@spartacus/cart/quick-order/components": [
+        "../../feature-libs/cart/quick-order/components/public_api"
+      ],
+      "@spartacus/cart/quick-order/core": [
+        "../../feature-libs/cart/quick-order/core/public_api"
+      ],
+      "@spartacus/cart/quick-order": [
+        "../../feature-libs/cart/quick-order/public_api"
+      ],
+      "@spartacus/cart/quick-order/root": [
+        "../../feature-libs/cart/quick-order/root/public_api"
+      ],
+      "@spartacus/cart/saved-cart/assets": [
+        "../../feature-libs/cart/saved-cart/assets/public_api"
+      ],
+      "@spartacus/cart/saved-cart/components": [
+        "../../feature-libs/cart/saved-cart/components/public_api"
+      ],
+      "@spartacus/cart/saved-cart/core": [
+        "../../feature-libs/cart/saved-cart/core/public_api"
+      ],
+      "@spartacus/cart/saved-cart": [
+        "../../feature-libs/cart/saved-cart/public_api"
+      ],
+      "@spartacus/cart/saved-cart/occ": [
+        "../../feature-libs/cart/saved-cart/occ/public_api"
+      ],
+      "@spartacus/cart/saved-cart/root": [
+        "../../feature-libs/cart/saved-cart/root/public_api"
+      ],
+      "@spartacus/cart/wish-list/assets": [
+        "../../feature-libs/cart/wish-list/assets/public_api"
+      ],
+      "@spartacus/cart/wish-list/components/add-to-wishlist": [
+        "../../feature-libs/cart/wish-list/components/add-to-wishlist/public_api"
+      ],
+      "@spartacus/cart/wish-list/components": [
+        "../../feature-libs/cart/wish-list/components/public_api"
+      ],
+      "@spartacus/cart/wish-list/core": [
+        "../../feature-libs/cart/wish-list/core/public_api"
+      ],
+      "@spartacus/cart/wish-list": [
+        "../../feature-libs/cart/wish-list/public_api"
+      ],
+      "@spartacus/cart/wish-list/root": [
+        "../../feature-libs/cart/wish-list/root/public_api"
+      ],
+      "@spartacus/checkout/b2b/assets": [
+        "../../feature-libs/checkout/b2b/assets/public_api"
+      ],
+      "@spartacus/checkout/b2b/components": [
+        "../../feature-libs/checkout/b2b/components/public_api"
+      ],
+      "@spartacus/checkout/b2b/core": [
+        "../../feature-libs/checkout/b2b/core/public_api"
+      ],
+      "@spartacus/checkout/b2b": ["../../feature-libs/checkout/b2b/public_api"],
+      "@spartacus/checkout/b2b/occ": [
+        "../../feature-libs/checkout/b2b/occ/public_api"
+      ],
+      "@spartacus/checkout/b2b/root": [
+        "../../feature-libs/checkout/b2b/root/public_api"
+      ],
+      "@spartacus/checkout/base/assets": [
+        "../../feature-libs/checkout/base/assets/public_api"
+      ],
+      "@spartacus/checkout/base/components": [
+        "../../feature-libs/checkout/base/components/public_api"
+      ],
+      "@spartacus/checkout/base/core": [
+        "../../feature-libs/checkout/base/core/public_api"
+      ],
+      "@spartacus/checkout/base": [
+        "../../feature-libs/checkout/base/public_api"
+      ],
+      "@spartacus/checkout/base/occ": [
+        "../../feature-libs/checkout/base/occ/public_api"
+      ],
+      "@spartacus/checkout/base/root": [
+        "../../feature-libs/checkout/base/root/public_api"
+      ],
+      "@spartacus/checkout": ["../../feature-libs/checkout/public_api"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "../../feature-libs/checkout/scheduled-replenishment/assets/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "../../feature-libs/checkout/scheduled-replenishment/components/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "../../feature-libs/checkout/scheduled-replenishment/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "../../feature-libs/checkout/scheduled-replenishment/root/public_api"
+      ],
+      "@spartacus/customer-ticketing/assets": [
+        "../../feature-libs/customer-ticketing/assets/public_api"
+      ],
+      "@spartacus/customer-ticketing/components": [
+        "../../feature-libs/customer-ticketing/components/public_api"
+      ],
+      "@spartacus/customer-ticketing/core": [
+        "../../feature-libs/customer-ticketing/core/public_api"
+      ],
+      "@spartacus/customer-ticketing": [
+        "../../feature-libs/customer-ticketing/public_api"
+      ],
+      "@spartacus/customer-ticketing/occ": [
+        "../../feature-libs/customer-ticketing/occ/public_api"
+      ],
+      "@spartacus/customer-ticketing/root": [
+        "../../feature-libs/customer-ticketing/root/public_api"
+      ],
+      "@spartacus/order/assets": ["../../feature-libs/order/assets/public_api"],
+      "@spartacus/order/components": [
+        "../../feature-libs/order/components/public_api"
+      ],
+      "@spartacus/order/core": ["../../feature-libs/order/core/public_api"],
+      "@spartacus/order": ["../../feature-libs/order/public_api"],
+      "@spartacus/order/occ": ["../../feature-libs/order/occ/public_api"],
+      "@spartacus/order/root": ["../../feature-libs/order/root/public_api"],
+      "@spartacus/organization/account-summary/assets": [
+        "../../feature-libs/organization/account-summary/assets/public_api"
+      ],
+      "@spartacus/organization/account-summary/components": [
+        "../../feature-libs/organization/account-summary/components/public_api"
+      ],
+      "@spartacus/organization/account-summary/core": [
+        "../../feature-libs/organization/account-summary/core/public_api"
+      ],
+      "@spartacus/organization/account-summary": [
+        "../../feature-libs/organization/account-summary/public_api"
+      ],
+      "@spartacus/organization/account-summary/occ": [
+        "../../feature-libs/organization/account-summary/occ/public_api"
+      ],
+      "@spartacus/organization/account-summary/root": [
+        "../../feature-libs/organization/account-summary/root/public_api"
+      ],
+      "@spartacus/organization/administration/assets": [
+        "../../feature-libs/organization/administration/assets/public_api"
+      ],
+      "@spartacus/organization/administration/components": [
+        "../../feature-libs/organization/administration/components/public_api"
+      ],
+      "@spartacus/organization/administration/core": [
+        "../../feature-libs/organization/administration/core/public_api"
+      ],
+      "@spartacus/organization/administration": [
+        "../../feature-libs/organization/administration/public_api"
+      ],
+      "@spartacus/organization/administration/occ": [
+        "../../feature-libs/organization/administration/occ/public_api"
+      ],
+      "@spartacus/organization/administration/root": [
+        "../../feature-libs/organization/administration/root/public_api"
+      ],
+      "@spartacus/organization": ["../../feature-libs/organization/public_api"],
+      "@spartacus/organization/order-approval/assets": [
+        "../../feature-libs/organization/order-approval/assets/public_api"
+      ],
+      "@spartacus/organization/order-approval": [
+        "../../feature-libs/organization/order-approval/public_api"
+      ],
+      "@spartacus/organization/order-approval/root": [
+        "../../feature-libs/organization/order-approval/root/public_api"
+      ],
+      "@spartacus/organization/unit-order/assets": [
+        "../../feature-libs/organization/unit-order/assets/public_api"
+      ],
+      "@spartacus/organization/unit-order/components": [
+        "../../feature-libs/organization/unit-order/components/public_api"
+      ],
+      "@spartacus/organization/unit-order/core": [
+        "../../feature-libs/organization/unit-order/core/public_api"
+      ],
+      "@spartacus/organization/unit-order": [
+        "../../feature-libs/organization/unit-order/public_api"
+      ],
+      "@spartacus/organization/unit-order/occ": [
+        "../../feature-libs/organization/unit-order/occ/public_api"
+      ],
+      "@spartacus/organization/unit-order/root": [
+        "../../feature-libs/organization/unit-order/root/public_api"
+      ],
+      "@spartacus/organization/user-registration/assets": [
+        "../../feature-libs/organization/user-registration/assets/public_api"
+      ],
+      "@spartacus/organization/user-registration/components": [
+        "../../feature-libs/organization/user-registration/components/public_api"
+      ],
+      "@spartacus/organization/user-registration/core": [
+        "../../feature-libs/organization/user-registration/core/public_api"
+      ],
+      "@spartacus/organization/user-registration": [
+        "../../feature-libs/organization/user-registration/public_api"
+      ],
+      "@spartacus/organization/user-registration/occ": [
+        "../../feature-libs/organization/user-registration/occ/public_api"
+      ],
+      "@spartacus/organization/user-registration/root": [
+        "../../feature-libs/organization/user-registration/root/public_api"
+      ],
+      "@spartacus/pickup-in-store/assets": [
+        "../../feature-libs/pickup-in-store/assets/public_api"
+      ],
+      "@spartacus/pickup-in-store/components": [
+        "../../feature-libs/pickup-in-store/components/public_api"
+      ],
+      "@spartacus/pickup-in-store/core": [
+        "../../feature-libs/pickup-in-store/core/public_api"
+      ],
+      "@spartacus/pickup-in-store": [
+        "../../feature-libs/pickup-in-store/public_api"
+      ],
+      "@spartacus/pickup-in-store/occ": [
+        "../../feature-libs/pickup-in-store/occ/public_api"
+      ],
+      "@spartacus/pickup-in-store/root": [
+        "../../feature-libs/pickup-in-store/root/public_api"
+      ],
+      "@spartacus/product-configurator/common/assets": [
+        "../../feature-libs/product-configurator/common/assets/public_api"
+      ],
+      "@spartacus/product-configurator/common": [
+        "../../feature-libs/product-configurator/common/public_api"
+      ],
+      "@spartacus/product-configurator": [
+        "../../feature-libs/product-configurator/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/cpq": [
+        "../../feature-libs/product-configurator/rulebased/cpq/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased": [
+        "../../feature-libs/product-configurator/rulebased/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/root": [
+        "../../feature-libs/product-configurator/rulebased/root/public_api"
+      ],
+      "@spartacus/product-configurator/textfield": [
+        "../../feature-libs/product-configurator/textfield/public_api"
+      ],
+      "@spartacus/product-configurator/textfield/root": [
+        "../../feature-libs/product-configurator/textfield/root/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/assets": [
+        "../../feature-libs/product/bulk-pricing/assets/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/components": [
+        "../../feature-libs/product/bulk-pricing/components/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/core": [
+        "../../feature-libs/product/bulk-pricing/core/public_api"
+      ],
+      "@spartacus/product/bulk-pricing": [
+        "../../feature-libs/product/bulk-pricing/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/occ": [
+        "../../feature-libs/product/bulk-pricing/occ/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/root": [
+        "../../feature-libs/product/bulk-pricing/root/public_api"
+      ],
+      "@spartacus/product/future-stock/assets": [
+        "../../feature-libs/product/future-stock/assets/public_api"
+      ],
+      "@spartacus/product/future-stock/components": [
+        "../../feature-libs/product/future-stock/components/public_api"
+      ],
+      "@spartacus/product/future-stock/core": [
+        "../../feature-libs/product/future-stock/core/public_api"
+      ],
+      "@spartacus/product/future-stock": [
+        "../../feature-libs/product/future-stock/public_api"
+      ],
+      "@spartacus/product/future-stock/occ": [
+        "../../feature-libs/product/future-stock/occ/public_api"
+      ],
+      "@spartacus/product/future-stock/root": [
+        "../../feature-libs/product/future-stock/root/public_api"
+      ],
+      "@spartacus/product/image-zoom/assets": [
+        "../../feature-libs/product/image-zoom/assets/public_api"
+      ],
+      "@spartacus/product/image-zoom/components": [
+        "../../feature-libs/product/image-zoom/components/public_api"
+      ],
+      "@spartacus/product/image-zoom": [
+        "../../feature-libs/product/image-zoom/public_api"
+      ],
+      "@spartacus/product/image-zoom/root": [
+        "../../feature-libs/product/image-zoom/root/public_api"
+      ],
+      "@spartacus/product": ["../../feature-libs/product/public_api"],
+      "@spartacus/product/variants/assets": [
+        "../../feature-libs/product/variants/assets/public_api"
+      ],
+      "@spartacus/product/variants/components": [
+        "../../feature-libs/product/variants/components/public_api"
+      ],
+      "@spartacus/product/variants": [
+        "../../feature-libs/product/variants/public_api"
+      ],
+      "@spartacus/product/variants/occ": [
+        "../../feature-libs/product/variants/occ/public_api"
+      ],
+      "@spartacus/product/variants/root": [
+        "../../feature-libs/product/variants/root/public_api"
+      ],
+      "@spartacus/qualtrics/components": [
+        "../../feature-libs/qualtrics/components/public_api"
+      ],
+      "@spartacus/qualtrics": ["../../feature-libs/qualtrics/public_api"],
+      "@spartacus/qualtrics/root": [
+        "../../feature-libs/qualtrics/root/public_api"
+      ],
+      "@spartacus/smartedit/core": [
+        "../../feature-libs/smartedit/core/public_api"
+      ],
+      "@spartacus/smartedit": ["../../feature-libs/smartedit/public_api"],
+      "@spartacus/smartedit/root": [
+        "../../feature-libs/smartedit/root/public_api"
+      ],
+      "@spartacus/storefinder/assets": [
+        "../../feature-libs/storefinder/assets/public_api"
+      ],
+      "@spartacus/storefinder/components": [
+        "../../feature-libs/storefinder/components/public_api"
+      ],
+      "@spartacus/storefinder/core": [
+        "../../feature-libs/storefinder/core/public_api"
+      ],
+      "@spartacus/storefinder": ["../../feature-libs/storefinder/public_api"],
+      "@spartacus/storefinder/occ": [
+        "../../feature-libs/storefinder/occ/public_api"
+      ],
+      "@spartacus/storefinder/root": [
+        "../../feature-libs/storefinder/root/public_api"
+      ],
+      "@spartacus/tracking": ["../../feature-libs/tracking/public_api"],
+      "@spartacus/tracking/personalization/core": [
+        "../../feature-libs/tracking/personalization/core/public_api"
+      ],
+      "@spartacus/tracking/personalization": [
+        "../../feature-libs/tracking/personalization/public_api"
+      ],
+      "@spartacus/tracking/personalization/root": [
+        "../../feature-libs/tracking/personalization/root/public_api"
+      ],
+      "@spartacus/tracking/tms/aep": [
+        "../../feature-libs/tracking/tms/aep/public_api"
+      ],
+      "@spartacus/tracking/tms/core": [
+        "../../feature-libs/tracking/tms/core/public_api"
+      ],
+      "@spartacus/tracking/tms/gtm": [
+        "../../feature-libs/tracking/tms/gtm/public_api"
+      ],
+      "@spartacus/tracking/tms": ["../../feature-libs/tracking/tms/public_api"],
+      "@spartacus/user/account/assets": [
+        "../../feature-libs/user/account/assets/public_api"
+      ],
+      "@spartacus/user/account/components": [
+        "../../feature-libs/user/account/components/public_api"
+      ],
+      "@spartacus/user/account/core": [
+        "../../feature-libs/user/account/core/public_api"
+      ],
+      "@spartacus/user/account": ["../../feature-libs/user/account/public_api"],
+      "@spartacus/user/account/occ": [
+        "../../feature-libs/user/account/occ/public_api"
+      ],
+      "@spartacus/user/account/root": [
+        "../../feature-libs/user/account/root/public_api"
+      ],
+      "@spartacus/user": ["../../feature-libs/user/public_api"],
+      "@spartacus/user/profile/assets": [
+        "../../feature-libs/user/profile/assets/public_api"
+      ],
+      "@spartacus/user/profile/components": [
+        "../../feature-libs/user/profile/components/public_api"
+      ],
+      "@spartacus/user/profile/core": [
+        "../../feature-libs/user/profile/core/public_api"
+      ],
+      "@spartacus/user/profile": ["../../feature-libs/user/profile/public_api"],
+      "@spartacus/user/profile/occ": [
+        "../../feature-libs/user/profile/occ/public_api"
+      ],
+      "@spartacus/user/profile/root": [
+        "../../feature-libs/user/profile/root/public_api"
+      ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
+      "@spartacus/cdc/components": [
+        "../../integration-libs/cdc/components/public_api"
+      ],
+      "@spartacus/cdc/core": ["../../integration-libs/cdc/core/public_api"],
+      "@spartacus/cdc": ["../../integration-libs/cdc/public_api"],
+      "@spartacus/cdc/organization/administration": [
+        "../../integration-libs/cdc/organization/administration/public_api"
+      ],
+      "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
+      "@spartacus/cdc/user-account": [
+        "../../integration-libs/cdc/user-account/public_api"
+      ],
+      "@spartacus/cdc/user-profile": [
+        "../../integration-libs/cdc/user-profile/public_api"
+      ],
+      "@spartacus/cds": ["../../integration-libs/cds/public_api"],
+      "@spartacus/digital-payments/assets": [
+        "../../integration-libs/digital-payments/assets/public_api"
+      ],
+      "@spartacus/digital-payments": [
+        "../../integration-libs/digital-payments/public_api"
+      ],
+      "@spartacus/epd-visualization/assets": [
+        "../../integration-libs/epd-visualization/assets/public_api"
+      ],
+      "@spartacus/epd-visualization/components": [
+        "../../integration-libs/epd-visualization/components/public_api"
+      ],
+      "@spartacus/epd-visualization/core": [
+        "../../integration-libs/epd-visualization/core/public_api"
+      ],
+      "@spartacus/epd-visualization/epd-visualization-api": [
+        "../../integration-libs/epd-visualization/epd-visualization-api/public_api"
+      ],
+      "@spartacus/epd-visualization": [
+        "../../integration-libs/epd-visualization/public_api"
+      ],
+      "@spartacus/epd-visualization/root": [
+        "../../integration-libs/epd-visualization/root/public_api"
+      ],
+      "@spartacus/s4om/assets": [
+        "../../integration-libs/s4om/assets/public_api"
+      ],
+      "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
+      "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
+      "@spartacus/assets": ["../../projects/assets/src/public_api"],
+      "@spartacus/core": ["../../projects/core/public_api"],
+      "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
+    },
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "noUnusedLocals": true,
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  },
+  "include": ["schematics/**/*.ts"],
+  "exclude": ["schematics/*/files/**/*", "schematics/**/*_spec.ts"]
+}
diff --git a/integration-libs/segment-refs/tsconfig.spec.json b/integration-libs/segment-refs/tsconfig.spec.json
new file mode 100644
index 00000000000..11ee9d53a30
--- /dev/null
+++ b/integration-libs/segment-refs/tsconfig.spec.json
@@ -0,0 +1,12 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "strict": false,
+    "module": "es2020",
+    "types": ["jasmine", "node"]
+  },
+  "files": ["test.ts"],
+  "include": ["**/*.spec.ts", "**/*.d.ts"]
+}
diff --git a/package.json b/package.json
index 9842c6dbfc0..cc467162663 100644
--- a/package.json
+++ b/package.json
@@ -22,12 +22,13 @@
     "build:digital-payments": "npm --prefix integration-libs/digital-payments run build:schematics && nx build digital-payments --configuration production",
     "build:epd-visualization": "npm --prefix integration-libs/epd-visualization run build:schematics && nx build epd-visualization --configuration production",
     "build:order": "npm --prefix feature-libs/order run build:schematics && nx build order --configuration production",
-    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:product npm:build:product-configurator npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:pickup-in-store && npm run build:setup",
+    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:product npm:build:product-configurator npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
     "build:organization": "npm --prefix feature-libs/organization run build:schematics && nx build organization --configuration production",
     "build:pickup-in-store": "npm --prefix feature-libs/pickup-in-store run build:schematics && nx build pickup-in-store --configuration production",
     "build:product": "npm --prefix feature-libs/product run build:schematics && nx build product --configuration production",
     "build:product-configurator": "npm --prefix feature-libs/product-configurator run build:schematics && nx build product-configurator --configuration production",
     "build:s4om": "npm --prefix integration-libs/s4om run build:schematics && nx build s4om --configuration production",
+    "build:segment-refs": "npm --prefix integration-libs/segment-refs run build:schematics && nx build segment-refs --configuration production",
     "build:qualtrics": "npm --prefix feature-libs/qualtrics run build:schematics && nx build qualtrics --configuration production",
     "build:schematics": "npm --prefix projects/schematics run build",
     "build:setup": "nx build setup --configuration production",
@@ -64,6 +65,7 @@
     "e2e:run:ci:ccv2-cpq": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:ccv2-cpq",
     "e2e:run:ci:mcs": "npm --prefix ./projects/storefrontapp-e2e-cypress run run cy:run:ci:mcs",
     "e2e:run:ci:cdc-b2b": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:cdc-b2b",
+    "e2e:run:ci:segment-refs": "npm --prefix ./projects/storefrontapp-e2e-cypress run cy:run:ci:segment-refs",
     "generate:docs": "npx @compodoc/compodoc@1.1.13 -p tsconfig.compodoc.json",
     "generate:publish:docs": "npm run generate:docs && npm run publish:docs",
     "graph": "nx graph",
diff --git a/projects/schematics/src/add-spartacus/schema.json b/projects/schematics/src/add-spartacus/schema.json
index b197c979392..02927e05dc3 100644
--- a/projects/schematics/src/add-spartacus/schema.json
+++ b/projects/schematics/src/add-spartacus/schema.json
@@ -48,6 +48,7 @@
           "SmartEdit",
           "Store-Finder",
           "Personalization",
+          "Segment-Refs",
           "TMS-GTM",
           "TMS-AEPL",
           "Pickup-In-Store",
@@ -201,6 +202,10 @@
             "value": "Personalization",
             "label": "Tracking - Personalization"
           },
+          {
+            "value": "Segment-Refs",
+            "label": "Segment Reference"
+          },
           {
             "value": "TMS-GTM",
             "label": "Tracking - Tag Management System - Google Tag Manager"
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 48413d084bb..e116776e166 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -327,6 +327,14 @@
     "@spartacus/styles": "5.0.0",
     "rxjs": "^6.6.0"
   },
+  "@spartacus/segment-refs": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@spartacus/core": "5.0.0",
+    "@spartacus/schematics": "5.0.0",
+    "rxjs": "^6.6.0"
+  },
   "storefrontapp": {
     "@angular/animations": "^15.2.4",
     "@angular/common": "^15.2.4",
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/index.ts b/projects/schematics/src/shared/lib-configs/integration-libs/index.ts
index 8281dbbf98f..f97c1039505 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/index.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/index.ts
@@ -9,3 +9,4 @@ export * from './cds-schematics-config';
 export * from './digital-payments-schematics-config';
 export * from './epd-schematics-config';
 export * from './s4om-schematics-config';
+export * from './segment-refs-schematics-config';
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/segment-refs-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/segment-refs-schematics-config.ts
new file mode 100644
index 00000000000..38469ebb1cd
--- /dev/null
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/segment-refs-schematics-config.ts
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  SEGMENT_REFS_FEATURE_NAME,
+  SPARTACUS_SEGMENT_REFS,
+  SPARTACUS_SEGMENT_REFS_ROOT,
+  TRACKING_PERSONALIZATION_FEATURE_NAME,
+} from '../../libs-constants';
+import { SchematicConfig } from '../../utils/lib-utils';
+
+export const SEGMENT_REFS_FOLDER_NAME = 'segment-refs';
+export const SEGMENT_REFS_MODULE_NAME = 'SegmentRefs';
+export const SEGMENT_REFS_ROOT_MODULE = 'SegmentRefsRootModule';
+export const SEGMENT_REF_FEATURE_NAME_CONSTANT = 'SEGMENT_REFS_FEATURE';
+
+export const SEGMENT_REFS_SCHEMATICS_CONFIG: SchematicConfig = {
+  library: {
+    featureName: SEGMENT_REFS_FEATURE_NAME,
+    mainScope: SPARTACUS_SEGMENT_REFS,
+  },
+  folderName: SEGMENT_REFS_FOLDER_NAME,
+  moduleName: SEGMENT_REFS_MODULE_NAME,
+  featureModule: {
+    name: SEGMENT_REFS_ROOT_MODULE,
+    importPath: SPARTACUS_SEGMENT_REFS,
+  },
+  rootModule: {
+    importPath: SPARTACUS_SEGMENT_REFS_ROOT,
+    name: SEGMENT_REFS_ROOT_MODULE,
+    content: `${SEGMENT_REFS_ROOT_MODULE}`,
+  },
+  /* Through Spartacus Segment-refs code doesnot have a dependency on Personalization,
+  backend occ api of Segment-refs requires Personalization to be enabled , hence adding this dependency
+  If Personalization library is not installed, Personalization & Segment-refs won't apply */
+  dependencyFeatures: [TRACKING_PERSONALIZATION_FEATURE_NAME],
+};
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index 3d2e69c7a73..c9630a48b49 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -192,6 +192,9 @@ export const SPARTACUS_S4OM = '@spartacus/s4om';
 export const SPARTACUS_S4OM_ROOT = `@spartacus/s4om/root`;
 export const SPARTACUS_S4OM_ASSETS = `@spartacus/s4om/assets`;
 
+export const SPARTACUS_SEGMENT_REFS = '@spartacus/segment-refs';
+export const SPARTACUS_SEGMENT_REFS_ROOT = `@spartacus/segment-refs/root`;
+
 export const SPARTACUS_CUSTOMER_TICKETING_ROOT = `@spartacus/customer-ticketing/root`;
 export const SPARTACUS_CUSTOMER_TICKETING_ASSETS = `@spartacus/customer-ticketing/assets`;
 export const SPARTACUS_CUSTOMER_TICKETING = '@spartacus/customer-ticketing';
@@ -263,6 +266,9 @@ export const DIGITAL_PAYMENTS_FEATURE_NAME = 'Digital-Payments';
 export const EPD_VISUALIZATION_FEATURE_NAME = 'EPD-Visualization';
 
 export const S4OM_FEATURE_NAME = 'S4HANA-Order-Management';
+
+export const SEGMENT_REFS_FEATURE_NAME = 'Segment-Refs';
+
 export const CUSTOMER_TICKETING_FEATURE_NAME = 'Customer-Ticketing';
 /***** Feature name end *****/
 
diff --git a/projects/schematics/src/shared/schematics-config-mappings.ts b/projects/schematics/src/shared/schematics-config-mappings.ts
index 59671444103..b427f5e5493 100644
--- a/projects/schematics/src/shared/schematics-config-mappings.ts
+++ b/projects/schematics/src/shared/schematics-config-mappings.ts
@@ -24,6 +24,7 @@ import { CDS_SCHEMATICS_CONFIG } from './lib-configs/integration-libs/cds-schema
 import { DIGITAL_PAYMENTS_SCHEMATICS_CONFIG } from './lib-configs/integration-libs/digital-payments-schematics-config';
 import { EPD_SCHEMATICS_CONFIG } from './lib-configs/integration-libs/epd-schematics-config';
 import { S4OM_SCHEMATICS_CONFIG } from './lib-configs/integration-libs/s4om-schematics-config';
+import { SEGMENT_REFS_SCHEMATICS_CONFIG } from './lib-configs/integration-libs/segment-refs-schematics-config';
 import { ORDER_SCHEMATICS_CONFIG } from './lib-configs/order-schematics-config';
 import {
   ORGANIZATION_ACCOUNT_SUMMARY_SCHEMATICS_CONFIG,
@@ -121,6 +122,8 @@ export const SCHEMATICS_CONFIGS: SchematicConfig[] = [
   EPD_SCHEMATICS_CONFIG,
 
   S4OM_SCHEMATICS_CONFIG,
+
+  SEGMENT_REFS_SCHEMATICS_CONFIG,
 ];
 
 /**
diff --git a/projects/schematics/src/shared/utils/graph-utils_spec.ts b/projects/schematics/src/shared/utils/graph-utils_spec.ts
index b11a136cde8..fdb414c1a4c 100644
--- a/projects/schematics/src/shared/utils/graph-utils_spec.ts
+++ b/projects/schematics/src/shared/utils/graph-utils_spec.ts
@@ -16,6 +16,7 @@ import {
   SPARTACUS_PRODUCT_CONFIGURATOR,
   SPARTACUS_QUALTRICS,
   SPARTACUS_S4OM,
+  SPARTACUS_SEGMENT_REFS,
   SPARTACUS_SMARTEDIT,
   SPARTACUS_STOREFINDER,
   SPARTACUS_TRACKING,
@@ -132,6 +133,7 @@ describe('Graph utils', () => {
         SPARTACUS_ORGANIZATION,
         SPARTACUS_ASM,
         SPARTACUS_STOREFINDER,
+        SPARTACUS_SEGMENT_REFS,
         SPARTACUS_S4OM,
         SPARTACUS_EPD_VISUALIZATION,
         SPARTACUS_DIGITAL_PAYMENTS,
@@ -174,6 +176,7 @@ describe('Graph utils', () => {
           "CPQ-Configurator",
           "Textfield-Configurator",
           "Store-Finder",
+          "Segment-Refs",
           "S4HANA-Order-Management",
           "EPD-Visualization",
           "Digital-Payments",
diff --git a/projects/schematics/src/shared/utils/test-utils.ts b/projects/schematics/src/shared/utils/test-utils.ts
index 10f4363f4fe..e3f69948d35 100644
--- a/projects/schematics/src/shared/utils/test-utils.ts
+++ b/projects/schematics/src/shared/utils/test-utils.ts
@@ -90,6 +90,8 @@ export const digitalPaymentsFeatureModulePath =
   'src/app/spartacus/features/digital-payments/digital-payments-feature.module.ts';
 export const epdFeatureModulePath =
   'src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts';
+export const segmentRefsFeatureModulePath =
+  'src/app/spartacus/features/segment-refs/segment-refs-feature.module.ts';
 
 export function writeFile(
   host: TempScopedNodeJsSyncHost,
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/segment-refs/segment-refs-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/segment-refs/segment-refs-e2e.cy.ts
new file mode 100644
index 00000000000..2023bab4aa6
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/segment-refs/segment-refs-e2e.cy.ts
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { interceptGet } from '../../../support/utils/intercept';
+
+export const APPAREL_BASESITE = 'apparel-uk-spa';
+export const APPAREL_CURRENCY = 'EUR';
+describe('Segment Reference', () => {
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    Cypress.env('BASE_SITE', APPAREL_BASESITE);
+    Cypress.env('BASE_CURRENCY', APPAREL_CURRENCY);
+  });
+  it('should fetch appropriate banner customization', () => {
+    interceptGet('segmentRefApi', '/cms/pages*');
+    cy.visit(
+      `${Cypress.env('BASE_SITE')}/${Cypress.env('BASE_LANG')}/${Cypress.env(
+        'BASE_CURRENCY'
+      )}/?segmentrefs=footwear`
+    );
+    cy.wait('@segmentRefApi').then((xhr) => {
+      expect(xhr.request.headers).to.have.property('segmentrefs', 'footwear');
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/package.json b/projects/storefrontapp-e2e-cypress/package.json
index 481128ed9c0..28f54557686 100644
--- a/projects/storefrontapp-e2e-cypress/package.json
+++ b/projects/storefrontapp-e2e-cypress/package.json
@@ -30,7 +30,8 @@
     "cy:run:ci:cdc": "cypress run --config-file cypress.config.ci.ts --env API_URL=https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud/ --record --key $CYPRESS_KEY --tag \"2005,cdc\" --group CDC --spec \"cypress/e2e/vendor/cdc/b2c/*.e2e.cy.ts\"",
     "cy:run:ci:cdc-b2b": "cypress run --config-file cypress.ci.json --env BASE_SITE=powertools-spa,OCC_PREFIX_USER_ENDPOINT=orgUsers,API_URL=https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud/ --record --key $CYPRESS_KEY --tag \"2211,cdc\" --group CDC --spec \"cypress/integration/vendor/cdc/b2b/*.e2e.cy.ts\"",
     "cy:run:ci:digital-payments": "cypress run --config-file cypress.config.ci.ts --env API_URL=https://backoffice.cp96avkh5f-sapcxteam1-d5-public.model-t.cc.commerce.ondemand.com --record --key $CYPRESS_KEY --tag \"2105,digital-payments\" --group DIGITAL-PAYMENTS --spec \"cypress/e2e/vendor/digital-payments/*.e2e.cy.ts\"",
-    "cy:run:ci:epd-visualization": "cypress run --config-file cypress.config.ci.ts --env API_URL=https://api.cp96avkh5f-integrati1-d1-public.model-t.cc.commerce.ondemand.com,BASE_SITE=powertools-epdvisualization-spa --record --key $CYPRESS_KEY --tag \"2105,epd-visualization\" --group EPD_VISUALIZATION --ci-build-id $BUILD_NUMBER --spec \"cypress/e2e/vendor/epd-visualization/**/*.e2e.cy.ts\""
+    "cy:run:ci:epd-visualization": "cypress run --config-file cypress.config.ci.ts --env API_URL=https://api.cp96avkh5f-integrati1-d1-public.model-t.cc.commerce.ondemand.com,BASE_SITE=powertools-epdvisualization-spa --record --key $CYPRESS_KEY --tag \"2105,epd-visualization\" --group EPD_VISUALIZATION --ci-build-id $BUILD_NUMBER --spec \"cypress/e2e/vendor/epd-visualization/**/*.e2e.cy.ts\"",
+    "cy:run:ci:segment-refs": "cypress run --config-file cypress.config.ci.ts --env API_URL=https://api.cg79x9wuu9-eccommerc1-p7-public.model-t.myhybris.cloud/ --record --key $CYPRESS_KEY --tag \"segment-refs\" --group SEGMENT-REFS --spec \"cypress/e2e/vendor/segment-refs/*.e2e.cy.ts\""
   },
   "devDependencies": {
     "@babel/core": "^7.14.3",
diff --git a/projects/storefrontapp/src/app/spartacus/features/segment-refs/segment-refs-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/segment-refs/segment-refs-feature.module.ts
new file mode 100644
index 00000000000..236693e4bdd
--- /dev/null
+++ b/projects/storefrontapp/src/app/spartacus/features/segment-refs/segment-refs-feature.module.ts
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { SegmentRefsRootModule } from '@spartacus/segment-refs/root';
+
+@NgModule({
+  imports: [SegmentRefsRootModule],
+})
+export class SegmentRefsFeatureModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index abccc52836e..55a57924202 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -86,6 +86,7 @@ import { VariantsFeatureModule } from './features/product/product-variants-featu
 import { QualtricsFeatureModule } from './features/qualtrics/qualtrics-feature.module';
 import { OrganizationUserRegistrationFeatureModule } from './features/registration-feature.module';
 import { S4OMFeatureModule } from './features/s4om/s4om-feature.module';
+import { SegmentRefsFeatureModule } from './features/segment-refs/segment-refs-feature.module';
 import { SmartEditFeatureModule } from './features/smartedit/smartedit-feature.module';
 import { StorefinderFeatureModule } from './features/storefinder/storefinder-feature.module';
 import { TrackingFeatureModule } from './features/tracking/tracking-feature.module';
@@ -122,6 +123,9 @@ if (environment.epdVisualization) {
 if (environment.s4om) {
   featureModules.push(S4OMFeatureModule);
 }
+if (environment.segmentRefs) {
+  featureModules.push(SegmentRefsFeatureModule);
+}
 
 @NgModule({
   imports: [
diff --git a/projects/storefrontapp/src/environments/environment.prod.ts b/projects/storefrontapp/src/environments/environment.prod.ts
index 89b96f8e4c8..79f9fbe2f07 100644
--- a/projects/storefrontapp/src/environments/environment.prod.ts
+++ b/projects/storefrontapp/src/environments/environment.prod.ts
@@ -17,4 +17,5 @@ export const environment: Environment = {
   digitalPayments: buildProcess.env.CX_DIGITAL_PAYMENTS,
   epdVisualization: buildProcess.env.CX_EPD_VISUALIZATION,
   s4om: buildProcess.env.CX_S4OM,
+  segmentRefs: buildProcess.env.CX_SEGMENT_REFS,
 };
diff --git a/projects/storefrontapp/src/environments/environment.ts b/projects/storefrontapp/src/environments/environment.ts
index 65b48712aee..b7a561e1809 100644
--- a/projects/storefrontapp/src/environments/environment.ts
+++ b/projects/storefrontapp/src/environments/environment.ts
@@ -30,4 +30,5 @@ export const environment: Environment = {
   digitalPayments: buildProcess.env.CX_DIGITAL_PAYMENTS ?? false,
   epdVisualization: buildProcess.env.CX_EPD_VISUALIZATION ?? false,
   s4om: buildProcess.env.CX_S4OM ?? false,
+  segmentRefs: buildProcess.env.CX_SEGMENT_REFS ?? false,
 };
diff --git a/projects/storefrontapp/src/environments/models/build.process.env.d.ts b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
index 5122bd186b5..0293384c55a 100644
--- a/projects/storefrontapp/src/environments/models/build.process.env.d.ts
+++ b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
@@ -19,4 +19,5 @@ interface Env {
   CX_DIGITAL_PAYMENTS: boolean;
   CX_EPD_VISUALIZATION: boolean;
   CX_S4OM: boolean;
+  CX_SEGMENT_REFS: boolean;
 }
diff --git a/projects/storefrontapp/src/environments/models/environment.model.ts b/projects/storefrontapp/src/environments/models/environment.model.ts
index 2e67720f564..1a6cff360b6 100644
--- a/projects/storefrontapp/src/environments/models/environment.model.ts
+++ b/projects/storefrontapp/src/environments/models/environment.model.ts
@@ -15,4 +15,5 @@ export interface Environment {
   digitalPayments: boolean;
   epdVisualization: boolean;
   s4om: boolean;
+  segmentRefs: boolean;
 }
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index f8cdd6995de..918e1b7d405 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -315,6 +315,8 @@
       "@spartacus/s4om/assets": ["dist/s4om/assets"],
       "@spartacus/s4om": ["dist/s4om"],
       "@spartacus/s4om/root": ["dist/s4om/root"],
+      "@spartacus/segment-refs": ["dist/segment-refs"],
+      "@spartacus/segment-refs/root": ["dist/segment-refs/root"],
       "@spartacus/assets": ["dist/assets"],
       "@spartacus/core": ["dist/core"],
       "@spartacus/storefront": ["dist/storefrontlib"]
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index d93bbb39278..0e568af081d 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -496,6 +496,12 @@
       ],
       "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
       "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": ["../../projects/assets/src/public_api"],
       "@spartacus/core": ["../../projects/core/public_api"],
       "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index f9f6d8968aa..64afc2fb45c 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -362,6 +362,8 @@
       "@spartacus/s4om/assets": ["../../dist/s4om/assets"],
       "@spartacus/s4om": ["../../dist/s4om"],
       "@spartacus/s4om/root": ["../../dist/s4om/root"],
+      "@spartacus/segment-refs": ["../../dist/segment-refs"],
+      "@spartacus/segment-refs/root": ["../../dist/segment-refs/root"],
       "@spartacus/assets": ["../../dist/assets"],
       "@spartacus/core": ["../../dist/core"],
       "@spartacus/storefront": ["../../dist/storefrontlib"]
diff --git a/tools/schematics/testing.ts b/tools/schematics/testing.ts
index ab64137ebbd..802446eacfd 100644
--- a/tools/schematics/testing.ts
+++ b/tools/schematics/testing.ts
@@ -34,6 +34,7 @@ const integrationLibsFolders: string[] = [
   'digital-payments',
   'epd-visualization',
   's4om',
+  'segment-refs',
 ];
 
 const commands = [
@@ -52,6 +53,7 @@ const commands = [
   'build product/schematics',
   'build product-configurator/schematics',
   'build s4om/schematics',
+  'build segment-refs/schematics',
   'build qualtrics/schematics',
   'build smartedit/schematics',
   'build storefinder/schematics',
@@ -200,6 +202,7 @@ async function executeCommand(command: Command): Promise<void> {
     case 'build product-configurator/schematics':
     case 'build qualtrics/schematics':
     case 'build s4om/schematics':
+    case 'build segment-refs/schematics':
     case 'build smartedit/schematics':
     case 'build storefinder/schematics':
     case 'build tracking/schematics':
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index 6be29374853..14b03bf673f 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -578,6 +578,12 @@
       "@spartacus/s4om/root": [
         "integration-libs/s4om/root/public_api"
       ],
+      "@spartacus/segment-refs": [
+        "integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": [
         "projects/assets/src/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 8f2cd1ae64a..24013c021d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -582,6 +582,12 @@
       "@spartacus/s4om/root": [
         "integration-libs/s4om/root/public_api"
       ],
+      "@spartacus/segment-refs": [
+        "integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "integration-libs/segment-refs/root/public_api"
+      ],
       "@spartacus/assets": [
         "projects/assets/src/public_api"
       ],

From 1c893cb4f9fd37159baa06bb99e32939ced0917f Mon Sep 17 00:00:00 2001
From: Mohit Sisodiya <122589468+sisodiyam@users.noreply.github.com>
Date: Thu, 13 Jul 2023 14:15:47 +0530
Subject: [PATCH 071/122] Feature/cxint 1294 6.3.x (#17620)

Co-authored-by: Krzysztof Platis <platonn.git@gmail.com>
---
 core-libs/setup/tsconfig.spec.json            |   3 +
 feature-libs/asm/tsconfig.schematics.json     |   3 +
 feature-libs/cart/tsconfig.schematics.json    |   3 +
 .../checkout/tsconfig.schematics.json         |   3 +
 .../tsconfig.schematics.json                  |   3 +
 feature-libs/order/tsconfig.schematics.json   |   3 +
 .../organization/tsconfig.schematics.json     |   3 +
 .../user-registration/root/public_api.ts      |   1 +
 .../pickup-in-store/tsconfig.schematics.json  |   3 +
 .../tsconfig.schematics.json                  |   3 +
 feature-libs/product/tsconfig.schematics.json |   3 +
 .../qualtrics/tsconfig.schematics.json        |   3 +
 .../smartedit/tsconfig.schematics.json        |   3 +
 .../storefinder/tsconfig.schematics.json      |   3 +
 .../tracking/tsconfig.schematics.json         |   3 +
 feature-libs/user/tsconfig.schematics.json    |   3 +
 ...cdc-b2b-register-component.service.spec.ts | 298 ++++++++++++++++++
 .../cdc-b2b-register-component.service.ts     | 138 ++++++++
 .../cdc-b2b-register.module.ts                |  40 +++
 .../user-registration/ng-package.json         |   6 +
 .../user-registration/public_api.ts           |   8 +
 .../cdc/root/service/cdc-js.service.ts        |  60 ++++
 .../add-cdc/__snapshots__/index_spec.ts.snap  |  20 +-
 .../cdc/schematics/add-cdc/index_spec.ts      |  10 +
 integration-libs/cdc/tsconfig.schematics.json |   3 +
 integration-libs/cds/tsconfig.schematics.json |   3 +
 .../digital-payments/tsconfig.schematics.json |   3 +
 .../tsconfig.schematics.json                  |   3 +
 .../s4om/tsconfig.schematics.json             |   3 +
 .../segment-refs/tsconfig.schematics.json     |   3 +
 .../integration-libs/cdc-schematics-config.ts |  17 +-
 .../schematics/src/shared/libs-constants.ts   |   1 +
 .../shared/schematics-config-mappings_spec.ts |   2 +
 .../src/shared/utils/dependency-utils_spec.ts |   2 +
 .../src/shared/utils/graph-utils_spec.ts      |   2 +-
 .../schematics/src/shared/utils/test-utils.ts |   2 +
 .../cdc/b2b/b2b-register-org.core-e2e.cy.ts   |  97 ++++++
 .../cypress/helpers/vendor/cdc/cdc.ts         |  29 +-
 .../cypress/sample-data/checkout-flow.ts      |  24 +-
 ...zation-user-registration-wrapper.module.ts |  22 ++
 .../features/registration-feature.module.ts   |   6 +-
 projects/storefrontapp/tsconfig.app.prod.json |   3 +
 projects/storefrontapp/tsconfig.server.json   |   3 +
 .../storefrontapp/tsconfig.server.prod.json   |   3 +
 tsconfig.compodoc.json                        |   3 +
 tsconfig.json                                 |   3 +
 46 files changed, 855 insertions(+), 8 deletions(-)
 create mode 100644 integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.spec.ts
 create mode 100644 integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.ts
 create mode 100644 integration-libs/cdc/organization/user-registration/cdc-b2b-register.module.ts
 create mode 100644 integration-libs/cdc/organization/user-registration/ng-package.json
 create mode 100644 integration-libs/cdc/organization/user-registration/public_api.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
 create mode 100644 projects/storefrontapp/src/app/spartacus/features/organization/organization-user-registration-wrapper.module.ts

diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 8651d06b628..825c5531f0f 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -460,6 +460,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 1f4a6c3d7d3..517a64516d3 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -470,6 +470,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/organization/user-registration/root/public_api.ts b/feature-libs/organization/user-registration/root/public_api.ts
index f45f787b151..93a4c255caf 100644
--- a/feature-libs/organization/user-registration/root/public_api.ts
+++ b/feature-libs/organization/user-registration/root/public_api.ts
@@ -8,3 +8,4 @@ export * from './user-registration-root.module';
 export * from './facade/index';
 export * from './model/index';
 export * from './feature-name';
+export * from './model/user-registration.model';
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index 79162078353..4e68f07aa60 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -473,6 +473,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.spec.ts b/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.spec.ts
new file mode 100644
index 00000000000..5a26d4308aa
--- /dev/null
+++ b/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.spec.ts
@@ -0,0 +1,298 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { FormGroup } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { CdcJsService } from '@spartacus/cdc/root';
+import {
+  AuthService,
+  EventService,
+  GlobalMessageService,
+  GlobalMessageType,
+  RoutingService,
+  TranslationService,
+  UserAddressService,
+} from '@spartacus/core';
+import { UserRegistrationConnector } from '@spartacus/organization/user-registration/core';
+import {
+  OrganizationUserRegistration,
+  UserRegistrationFacade,
+} from '@spartacus/organization/user-registration/root';
+import { UserRegisterFacade } from '@spartacus/user/profile/root';
+import { of, throwError } from 'rxjs';
+import { CDCB2BRegisterComponentService } from './cdc-b2b-register-component.service';
+import createSpy = jasmine.createSpy;
+
+const mockedGlobalMessageService = {
+  add: () => {},
+  remove: () => {},
+};
+
+class MockRoutingService implements Partial<RoutingService> {
+  go = () => Promise.resolve(true);
+}
+
+class MockUserAddressService implements Partial<UserAddressService> {
+  getDeliveryCountries = createSpy().and.returnValue(of([]));
+  getRegions = createSpy().and.returnValue(of([]));
+  loadDeliveryCountries(): void {
+    return;
+  }
+}
+
+class MockUserRegisterFacade implements Partial<UserRegisterFacade> {
+  getTitles = createSpy().and.returnValue(of([]));
+}
+
+class MockTranslationService implements Partial<TranslationService> {
+  translate(value: string, options: any) {
+    return of(value + Object.values(options));
+  }
+}
+
+class MockUserRegistrationFacade implements Partial<UserRegistrationFacade> {
+  registerUser(userData: OrganizationUserRegistration) {
+    return of(userData);
+  }
+}
+
+class MockUserRegistrationConnector
+  implements Partial<UserRegistrationConnector>
+{
+  registerUser = createSpy().and.callFake((user: any) => of(user));
+}
+
+class MockAuthService implements Partial<AuthService> {
+  loginWithCredentials = createSpy().and.returnValue(Promise.resolve());
+  isUserLoggedIn = createSpy().and.returnValue(of(true));
+}
+
+class MockEventService implements Partial<EventService> {
+  get = createSpy().and.callFake(() => of(false)); //no failures
+}
+
+class MockCDCJsService implements Partial<CdcJsService> {
+  didLoad = createSpy().and.callFake(() => of(true));
+  registerOrganisationWithoutScreenSet = createSpy().and.callFake(() =>
+    of({ status: 'OK' })
+  );
+  onLoginEventHandler = createSpy();
+}
+
+describe('CdcRegisterComponentService', () => {
+  let cdcOrgRegisterService: CDCB2BRegisterComponentService;
+  let connector: UserRegistrationConnector;
+  let cdcJsService: CdcJsService;
+  let globalMessageService: GlobalMessageService;
+  let eventService: EventService;
+  let userAddressService: UserAddressService;
+  let userRegisterFacade: UserRegisterFacade;
+  let routingService: RoutingService;
+  let orgRegistrationFormData: FormGroup;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        { provide: AuthService, useClass: MockAuthService },
+        {
+          provide: RoutingService,
+          useClass: MockRoutingService,
+        },
+        {
+          provide: UserAddressService,
+          useClass: MockUserAddressService,
+        },
+        {
+          provide: UserRegisterFacade,
+          useClass: MockUserRegisterFacade,
+        },
+        {
+          provide: TranslationService,
+          useClass: MockTranslationService,
+        },
+        {
+          provide: UserRegistrationFacade,
+          useClass: MockUserRegistrationFacade,
+        },
+        { provide: Store, useValue: { dispatch: () => {} } },
+        {
+          provide: UserRegistrationConnector,
+          useClass: MockUserRegistrationConnector,
+        },
+        { provide: CdcJsService, useClass: MockCDCJsService },
+        { provide: EventService, useClass: MockEventService },
+        { provide: GlobalMessageService, useValue: mockedGlobalMessageService },
+        CDCB2BRegisterComponentService,
+      ],
+    });
+
+    globalMessageService = TestBed.inject(GlobalMessageService);
+    cdcOrgRegisterService = TestBed.inject(CDCB2BRegisterComponentService);
+    connector = TestBed.inject(UserRegistrationConnector);
+    cdcJsService = TestBed.inject(CdcJsService);
+    eventService = TestBed.inject(EventService);
+    userAddressService = TestBed.inject(UserAddressService);
+    userRegisterFacade = TestBed.inject(UserRegisterFacade);
+    routingService = TestBed.inject(RoutingService);
+    orgRegistrationFormData = cdcOrgRegisterService.form;
+
+    orgRegistrationFormData.get('firstName')?.setValue('firstName');
+    orgRegistrationFormData.get('lastName')?.setValue('lastName');
+    orgRegistrationFormData
+      .get('email')
+      ?.setValue('firstName.lastName@test.com');
+    orgRegistrationFormData.get('companyName')?.setValue('New Company Inc.');
+    orgRegistrationFormData.get('line1')?.setValue('Test St.');
+    orgRegistrationFormData.get('line2')?.setValue('1/2');
+    orgRegistrationFormData.get('postalCode')?.setValue('1234');
+    orgRegistrationFormData.get('town')?.setValue('Town');
+    orgRegistrationFormData
+      .get('message')
+      ?.setValue('Department: CX; Position: QE');
+    orgRegistrationFormData.get('phoneNumber')?.setValue('9876543210');
+    orgRegistrationFormData.get('country')?.setValue({
+      isocode: 'US',
+    });
+    orgRegistrationFormData.get('region')?.setValue({
+      isocode: 'US-AZ',
+    });
+
+    TestBed.compileComponents();
+  });
+
+  it('should be created', () => {
+    expect(cdcOrgRegisterService).toBeTruthy();
+  });
+
+  it('should get countries from `userAddressService`', () => {
+    cdcOrgRegisterService.getCountries().subscribe().unsubscribe();
+    expect(userAddressService.getDeliveryCountries).toHaveBeenCalled();
+  });
+
+  it('should get titles from `userRegisterFacade`', () => {
+    cdcOrgRegisterService.getTitles().subscribe().unsubscribe();
+    expect(userRegisterFacade.getTitles).toHaveBeenCalled();
+  });
+
+  describe('Register', () => {
+    it('should be able to register organization through CDC', (done) => {
+      cdcOrgRegisterService
+        .registerUser(orgRegistrationFormData)
+        .subscribe(() => {
+          expect(connector.registerUser).not.toHaveBeenCalled();
+          expect(
+            cdcJsService.registerOrganisationWithoutScreenSet
+          ).toHaveBeenCalledWith({
+            firstName: 'firstName',
+            lastName: 'lastName',
+            email: 'firstName.lastName@test.com',
+            message: 'Department: CX; Position: QE',
+            addressLine1: 'Test St.',
+            addressLine2: '1/2',
+            postalCode: '1234',
+            town: 'Town',
+            region: 'US-AZ',
+            country: 'US',
+            phoneNumber: '9876543210',
+            companyName: 'New Company Inc.',
+          });
+        });
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      done();
+    });
+
+    it('should NOT happen without CDC, should show error', (done) => {
+      spyOn(globalMessageService, 'remove');
+      spyOn(globalMessageService, 'add');
+      cdcJsService.didLoad = createSpy().and.callFake(() => of(false));
+      cdcOrgRegisterService.registerUser(orgRegistrationFormData).subscribe({
+        error: () => {
+          expect(
+            cdcJsService.registerOrganisationWithoutScreenSet
+          ).not.toHaveBeenCalled();
+          expect(connector.registerUser).not.toHaveBeenCalled();
+          expect(globalMessageService.add).toHaveBeenCalledWith(
+            {
+              key: 'errorHandlers.scriptFailedToLoad',
+            },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+          expect(
+            cdcJsService.registerOrganisationWithoutScreenSet
+          ).not.toHaveBeenCalled();
+          done();
+        },
+      });
+    });
+
+    it('should not do anything when CDC registration fails', (done) => {
+      cdcJsService.registerOrganisationWithoutScreenSet =
+        createSpy().and.returnValue(throwError('ERROR'));
+
+      cdcOrgRegisterService.registerUser(orgRegistrationFormData).subscribe({
+        error: () => {
+          expect(connector.registerUser).not.toHaveBeenCalled();
+          expect(
+            cdcJsService.registerOrganisationWithoutScreenSet
+          ).toHaveBeenCalledWith({
+            firstName: 'firstName',
+            lastName: 'lastName',
+            email: 'firstName.lastName@test.com',
+            message: 'Department: CX; Position: QE',
+            addressLine1: 'Test St.',
+            addressLine2: '1/2',
+            postalCode: '1234',
+            town: 'Town',
+            region: 'US-AZ',
+            country: 'US',
+            phoneNumber: '9876543210',
+            companyName: 'New Company Inc.',
+          });
+        },
+      });
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      done();
+    });
+
+    it('should throw error when CDC user token fails', (done) => {
+      eventService.get = createSpy().and.returnValue(of(true));
+
+      cdcOrgRegisterService.registerUser(orgRegistrationFormData).subscribe({
+        error: () => {
+          expect(connector.registerUser).not.toHaveBeenCalled();
+          expect(
+            cdcJsService.registerOrganisationWithoutScreenSet
+          ).toHaveBeenCalledWith({
+            firstName: 'firstName',
+            lastName: 'lastName',
+            email: 'firstName.lastName@test.com',
+            message: 'Department: CX; Position: QE',
+            addressLine1: 'Test St.',
+            addressLine2: '1/2',
+            postalCode: '1234',
+            town: 'Town',
+            region: 'US-AZ',
+            country: 'US',
+            phoneNumber: '9876543210',
+            companyName: 'New Company Inc.',
+          });
+          done();
+        },
+      });
+      expect(cdcJsService.didLoad).toHaveBeenCalled();
+      done();
+    });
+
+    it('should redirect to login page', () => {
+      spyOn(routingService, 'go').and.callThrough();
+      cdcOrgRegisterService
+        .registerUser(orgRegistrationFormData)
+        .subscribe()
+        .unsubscribe();
+
+      expect(routingService.go).toHaveBeenCalledWith({
+        cxRoute: 'login',
+      });
+    });
+  });
+});
diff --git a/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.ts b/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.ts
new file mode 100644
index 00000000000..c845792a16f
--- /dev/null
+++ b/integration-libs/cdc/organization/user-registration/cdc-b2b-register-component.service.ts
@@ -0,0 +1,138 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { CdcJsService, CdcLoadUserTokenFailEvent } from '@spartacus/cdc/root';
+import {
+  AuthConfigService,
+  AuthService,
+  Command,
+  CommandService,
+  EventService,
+  GlobalMessageService,
+  GlobalMessageType,
+  RoutingService,
+  TranslationService,
+  UserAddressService,
+} from '@spartacus/core';
+import { UserRegistrationFormService } from '@spartacus/organization/user-registration/components';
+import {
+  UserRegistrationFacade,
+  OrganizationUserRegistrationForm,
+} from '@spartacus/organization/user-registration/root';
+import { UserRegisterFacade } from '@spartacus/user/profile/root';
+import { Observable, throwError } from 'rxjs';
+import { map, switchMap, tap } from 'rxjs/operators';
+
+@Injectable()
+export class CDCB2BRegisterComponentService extends UserRegistrationFormService {
+  protected registerCommand: Command<
+    { orgInfo: OrganizationUserRegistrationForm },
+    OrganizationUserRegistrationForm
+  > = this.command.create(
+    ({ orgInfo }) =>
+      // Registering user through CDC Gigya SDK
+      this.cdcJSService.registerOrganisationWithoutScreenSet(
+        orgInfo
+      ) as unknown as Observable<OrganizationUserRegistrationForm>
+  );
+
+  protected loadUserTokenFailed$: Observable<boolean> = this.eventService
+    .get(CdcLoadUserTokenFailEvent)
+    .pipe(
+      map((event) => !!event),
+      tap((failed) => {
+        if (failed) {
+          throw new Error(`User token failed to load.`);
+        }
+      })
+    );
+
+  constructor(
+    protected command: CommandService,
+    protected cdcJSService: CdcJsService,
+    protected authService: AuthService,
+    protected eventService: EventService,
+    protected userRegisterFacade: UserRegisterFacade,
+    protected userAddressService: UserAddressService,
+    protected organizationUserRegistrationFacade: UserRegistrationFacade,
+    protected translationService: TranslationService,
+    protected globalMessageService: GlobalMessageService,
+    protected authConfigService: AuthConfigService,
+    protected routingService: RoutingService,
+    protected formBuilder: FormBuilder
+  ) {
+    super(
+      userRegisterFacade,
+      userAddressService,
+      organizationUserRegistrationFacade,
+      translationService,
+      globalMessageService,
+      authConfigService,
+      routingService,
+      formBuilder
+    );
+  }
+
+  /**
+   * Register a new user using CDC SDK.
+   *
+   * @param form as FormGroup
+   */
+  registerUser(form: FormGroup): Observable<OrganizationUserRegistrationForm> {
+    if (
+      !form.get('firstName')?.value ||
+      !form.get('lastName')?.value ||
+      !form.get('email')?.value ||
+      !form.get('companyName')?.value
+    ) {
+      return throwError(`The provided user is not valid: ${form.value}`);
+    }
+
+    const orgInfo: OrganizationUserRegistrationForm = {
+      firstName: form.get('firstName')?.value,
+      lastName: form.get('lastName')?.value,
+      email: form.get('email')?.value,
+      companyName: form.get('companyName')?.value,
+      addressLine1: form.get('line1')?.value,
+      addressLine2: form.get('line2')?.value,
+      postalCode: form.get('postalCode')?.value,
+      town: form.get('town')?.value,
+      region: form.get('region')?.get('isocode')?.value,
+      country: form.get('country')?.get('isocode')?.value,
+      phoneNumber: form.get('phoneNumber')?.value,
+      message: form.get('message')?.value,
+    };
+    return this.cdcJSService.didLoad().pipe(
+      tap((cdcLoaded) => {
+        if (!cdcLoaded) {
+          this.globalMessageService.add(
+            {
+              key: 'errorHandlers.scriptFailedToLoad',
+            },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+          throw new Error(`CDC script didn't load.`);
+        }
+      }),
+      switchMap(() =>
+        // Logging in using CDC Gigya SDK, update the registerCommand
+        this.registerCommand.execute({ orgInfo })
+      ),
+      tap(() => {
+        this.displayGlobalMessage();
+        this.redirectToLogin();
+        form.reset();
+      })
+    );
+  }
+
+  // @override
+  postRegisterMessage(): void {
+    // don't show the message
+  }
+}
diff --git a/integration-libs/cdc/organization/user-registration/cdc-b2b-register.module.ts b/integration-libs/cdc/organization/user-registration/cdc-b2b-register.module.ts
new file mode 100644
index 00000000000..5ede1796de0
--- /dev/null
+++ b/integration-libs/cdc/organization/user-registration/cdc-b2b-register.module.ts
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { I18nModule, UrlModule } from '@spartacus/core';
+import {
+  FormErrorsModule,
+  NgSelectA11yModule,
+  SpinnerModule,
+} from '@spartacus/storefront';
+import { UserRegistrationFormService } from '@spartacus/organization/user-registration/components';
+import { CDCB2BRegisterComponentService } from './cdc-b2b-register-component.service';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    RouterModule,
+    UrlModule,
+    I18nModule,
+    SpinnerModule,
+    FormErrorsModule,
+    NgSelectModule,
+    NgSelectA11yModule,
+  ],
+  providers: [
+    {
+      provide: UserRegistrationFormService,
+      useClass: CDCB2BRegisterComponentService,
+    },
+  ],
+})
+export class CDCB2BRegisterModule {}
diff --git a/integration-libs/cdc/organization/user-registration/ng-package.json b/integration-libs/cdc/organization/user-registration/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/integration-libs/cdc/organization/user-registration/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/integration-libs/cdc/organization/user-registration/public_api.ts b/integration-libs/cdc/organization/user-registration/public_api.ts
new file mode 100644
index 00000000000..527a4ccf6d1
--- /dev/null
+++ b/integration-libs/cdc/organization/user-registration/public_api.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './cdc-b2b-register-component.service';
+export * from './cdc-b2b-register.module';
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index ae41fde89df..3f2e670be38 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -24,6 +24,7 @@ import {
   User,
   WindowRef,
 } from '@spartacus/core';
+import { OrganizationUserRegistrationForm } from '@spartacus/organization/user-registration/root';
 import { UserProfileFacade, UserSignUp } from '@spartacus/user/profile/root';
 import {
   combineLatest,
@@ -290,6 +291,65 @@ export class CdcJsService implements OnDestroy {
       })
     );
   }
+
+  /**
+   * Trigger CDC Organisation registration using CDC APIs.
+   *
+   * @param orgInfo
+   */
+  registerOrganisationWithoutScreenSet(
+    orgInfo: OrganizationUserRegistrationForm
+  ): Observable<{ status: string }> {
+    if (
+      !orgInfo?.companyName ||
+      !orgInfo?.email ||
+      !orgInfo?.firstName ||
+      !orgInfo?.lastName
+    ) {
+      return throwError(null);
+    } else {
+      const regSource: string = this.winRef.nativeWindow?.location?.href || '';
+      const message = orgInfo.message;
+      let department = null;
+      let position = null;
+      if (message) {
+        const msgList = message.replace('\n', '').split(';');
+        for (const msg of msgList) {
+          if (msg.trim().toLowerCase().search('department') === 0) {
+            department = msg.split(':')[1].trim();
+          } else if (msg.trim().toLowerCase().search('position') === 0) {
+            position = msg.split(':')[1].trim();
+          }
+        }
+      }
+
+      return this.invokeAPI('accounts.b2b.registerOrganization', {
+        organization: {
+          name: orgInfo.companyName,
+          street_address: orgInfo.addressLine1 + ' ' + orgInfo.addressLine2,
+          city: orgInfo.town,
+          state: orgInfo.region,
+          zip_code: orgInfo.postalCode,
+          country: orgInfo.country,
+        },
+        requester: {
+          firstName: orgInfo.firstName,
+          lastName: orgInfo.lastName,
+          email: orgInfo.email,
+          phone: orgInfo.phoneNumber,
+          department: department,
+          jobFunction: position,
+        },
+        regSource: regSource,
+      }).pipe(
+        take(1),
+        tap({
+          error: (errorResponse) => this.handleRegisterError(errorResponse),
+        })
+      );
+    }
+  }
+
   /**
    * Retrieves the organization selected by the logged in user
    *
diff --git a/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap b/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
index 6bd9f3ffbaa..d070e7678d8 100644
--- a/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
+++ b/integration-libs/cdc/schematics/add-cdc/__snapshots__/index_spec.ts.snap
@@ -5,6 +5,7 @@ exports[`Spartacus CDC schematics: ng-add CDC feature eager loading should impor
 import { CdcModule } from "@spartacus/cdc";
 import { cdcTranslationChunksConfig, cdcTranslations } from "@spartacus/cdc/assets";
 import { CdcAdministrationModule } from "@spartacus/cdc/organization/administration";
+import { CDCB2BRegisterModule } from "@spartacus/cdc/organization/user-registration";
 import { CdcConfig, CdcRootModule } from "@spartacus/cdc/root";
 import { CDCUserAccountModule } from "@spartacus/cdc/user-account";
 import { CDCUserProfileModule } from "@spartacus/cdc/user-profile";
@@ -17,7 +18,8 @@ import { I18nConfig, provideConfig } from "@spartacus/core";
     CdcModule,
     CDCUserAccountModule,
     CDCUserProfileModule,
-    CdcAdministrationModule
+    CdcAdministrationModule,
+    CDCB2BRegisterModule
   ],
   providers: [provideConfig(<I18nConfig>{
     i18n: {
@@ -128,6 +130,22 @@ export class AdministrationWrapperModule { }
 "
 `;
 
+exports[`Spartacus CDC schematics: ng-add CDC feature general setup should install the appropriate dependencies 4`] = `
+"import { NgModule } from '@angular/core';
+import { CDCB2BRegisterModule } from "@spartacus/cdc/organization/user-registration";
+import { OrganizationUserRegistrationModule } from "@spartacus/organization/user-registration";
+
+@NgModule({
+  declarations: [],
+  imports: [
+    OrganizationUserRegistrationModule,
+    CDCB2BRegisterModule
+  ]
+})
+export class OrganizationUserRegistrationWrapperModule { }
+"
+`;
+
 exports[`Spartacus CDC schematics: ng-add CDC feature validation of jsSDKUrl should set the given javascriptUrl 1`] = `
 "import { NgModule } from '@angular/core';
 import { cdcTranslationChunksConfig, cdcTranslations } from "@spartacus/cdc/assets";
diff --git a/integration-libs/cdc/schematics/add-cdc/index_spec.ts b/integration-libs/cdc/schematics/add-cdc/index_spec.ts
index 210d4f91313..7c899a0de99 100644
--- a/integration-libs/cdc/schematics/add-cdc/index_spec.ts
+++ b/integration-libs/cdc/schematics/add-cdc/index_spec.ts
@@ -14,7 +14,9 @@ import {
   CDC_FEATURE_NAME,
   LibraryOptions as SpartacusCdcOptions,
   organizationAdministrationWrapperModulePath,
+  organizationUserRegistrationWrapperModulePath,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+  ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   SpartacusOptions,
   SPARTACUS_ASM,
   SPARTACUS_CDC,
@@ -136,6 +138,7 @@ describe('Spartacus CDC schematics: ng-add', () => {
               USER_ACCOUNT_FEATURE_NAME,
               USER_PROFILE_FEATURE_NAME,
               ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+              ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
             ],
           },
           appTree
@@ -164,6 +167,7 @@ describe('Spartacus CDC schematics: ng-add', () => {
               USER_ACCOUNT_FEATURE_NAME,
               USER_PROFILE_FEATURE_NAME,
               ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+              ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
             ],
           },
           appTree
@@ -221,6 +225,11 @@ describe('Spartacus CDC schematics: ng-add', () => {
           organizationAdministrationWrapperModulePath
         );
         expect(administrationWrapperModule).toMatchSnapshot();
+
+        const organizationUserRegistrationWrapperModule = appTree.readContent(
+          organizationUserRegistrationWrapperModulePath
+        );
+        expect(organizationUserRegistrationWrapperModule).toMatchSnapshot();
       });
     });
 
@@ -234,6 +243,7 @@ describe('Spartacus CDC schematics: ng-add', () => {
               USER_ACCOUNT_FEATURE_NAME,
               USER_PROFILE_FEATURE_NAME,
               ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+              ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
             ],
           },
           appTree
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index 8541afd1a3a..780e4cdc0d9 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index 89a57f3fcac..762073f61f1 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -457,6 +457,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
index 6d7f2adf005..ba1676de488 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/cdc-schematics-config.ts
@@ -12,12 +12,17 @@ import {
   SPARTACUS_CDC_ROOT,
   USER_PROFILE_FEATURE_NAME,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+  ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   SPARTACUS_CDC_ORGANIZATION_ADMINISTRATION,
   SPARTACUS_CDC_ASSETS,
+  SPARTACUS_CDC_ORGANIZATION_REGISTRATION,
 } from '../../libs-constants';
 import { AdditionalFeatureConfiguration } from '../../utils/feature-utils';
 import { LibraryOptions, SchematicConfig } from '../../utils/lib-utils';
-import { ADMINISTRATION_MODULE } from '../organization-schematics-config';
+import {
+  ADMINISTRATION_MODULE,
+  ORGANIZATION_USER_REGISTRATION_MODULE,
+} from '../organization-schematics-config';
 import {
   USER_ACCOUNT_MODULE,
   USER_PROFILE_MODULE,
@@ -41,6 +46,7 @@ export const CDC_USER_ACCOUNT_MODULE = 'CDCUserAccountModule';
 
 export const CDC_USER_PROFILE_MODULE = 'CDCUserProfileModule';
 export const CDC_ADMINISTRATION_MODULE = 'CdcAdministrationModule';
+export const CDC_B2B_REGISTER_MODULE = 'CDCB2BRegisterModule';
 
 export const CDC_TRANSLATION_CHUNKS_CONFIG = 'cdcTranslationChunksConfig';
 export const CDC_TRANSLATIONS = 'cdcTranslations';
@@ -69,6 +75,10 @@ export const CDC_SCHEMATICS_CONFIG: SchematicConfig = {
       name: CDC_ADMINISTRATION_MODULE,
       importPath: SPARTACUS_CDC_ORGANIZATION_ADMINISTRATION,
     },
+    {
+      name: CDC_B2B_REGISTER_MODULE,
+      importPath: SPARTACUS_CDC_ORGANIZATION_REGISTRATION,
+    },
   ],
   lazyLoadingChunk: {
     moduleSpecifier: SPARTACUS_CDC_ROOT,
@@ -88,6 +98,7 @@ export const CDC_SCHEMATICS_CONFIG: SchematicConfig = {
   dependencyFeatures: [
     USER_PROFILE_FEATURE_NAME,
     ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+    ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   ],
   importAfter: [
     {
@@ -102,6 +113,10 @@ export const CDC_SCHEMATICS_CONFIG: SchematicConfig = {
       markerModuleName: ADMINISTRATION_MODULE,
       featureModuleName: CDC_ADMINISTRATION_MODULE,
     },
+    {
+      markerModuleName: ORGANIZATION_USER_REGISTRATION_MODULE,
+      featureModuleName: CDC_B2B_REGISTER_MODULE,
+    },
   ],
 };
 
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index c9630a48b49..29bc42e9e69 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -180,6 +180,7 @@ export const SPARTACUS_CDC_ASSETS = `@spartacus/cdc/assets`;
 export const SPARTACUS_CDC_USER_ACCOUNT = `@spartacus/cdc/user-account`;
 export const SPARTACUS_CDC_USER_PROFILE = `@spartacus/cdc/user-profile`;
 export const SPARTACUS_CDC_ORGANIZATION_ADMINISTRATION = `@spartacus/cdc/organization/administration`;
+export const SPARTACUS_CDC_ORGANIZATION_REGISTRATION = `@spartacus/cdc/organization/user-registration`;
 
 export const SPARTACUS_DIGITAL_PAYMENTS = `@spartacus/digital-payments`;
 export const SPARTACUS_DIGITAL_PAYMENTS_ASSETS = `@spartacus/digital-payments/assets`;
diff --git a/projects/schematics/src/shared/schematics-config-mappings_spec.ts b/projects/schematics/src/shared/schematics-config-mappings_spec.ts
index f9d100ef3ae..756b4dcab3f 100644
--- a/projects/schematics/src/shared/schematics-config-mappings_spec.ts
+++ b/projects/schematics/src/shared/schematics-config-mappings_spec.ts
@@ -19,6 +19,7 @@ import {
   CHECKOUT_SCHEDULED_REPLENISHMENT_ROOT_MODULE,
   CHECKOUT_SCHEDULED_REPLENISHMENT_SCHEMATICS_CONFIG,
   CDC_ADMINISTRATION_MODULE,
+  CDC_B2B_REGISTER_MODULE,
   MINI_CART_MODULE,
   ORDER_MODULE,
   ORDER_ROOT_MODULE,
@@ -86,6 +87,7 @@ describe('schematics-config-mappings', () => {
         CDC_USER_ACCOUNT_MODULE,
         CDC_USER_PROFILE_MODULE,
         CDC_ADMINISTRATION_MODULE,
+        CDC_B2B_REGISTER_MODULE,
       ]);
     });
   });
diff --git a/projects/schematics/src/shared/utils/dependency-utils_spec.ts b/projects/schematics/src/shared/utils/dependency-utils_spec.ts
index bce404db506..fa78ab3d3d9 100644
--- a/projects/schematics/src/shared/utils/dependency-utils_spec.ts
+++ b/projects/schematics/src/shared/utils/dependency-utils_spec.ts
@@ -7,6 +7,7 @@ import {
   CHECKOUT_BASE_FEATURE_NAME,
   DIGITAL_PAYMENTS_FEATURE_NAME,
   ORDER_FEATURE_NAME,
+  ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
   SPARTACUS_ASM,
   SPARTACUS_CART,
@@ -45,6 +46,7 @@ describe('dependency-util', () => {
         ORDER_FEATURE_NAME,
         CHECKOUT_BASE_FEATURE_NAME,
         CHECKOUT_B2B_FEATURE_NAME,
+        ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
         ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
         DIGITAL_PAYMENTS_FEATURE_NAME,
         CDC_FEATURE_NAME,
diff --git a/projects/schematics/src/shared/utils/graph-utils_spec.ts b/projects/schematics/src/shared/utils/graph-utils_spec.ts
index fdb414c1a4c..ecda68acfa1 100644
--- a/projects/schematics/src/shared/utils/graph-utils_spec.ts
+++ b/projects/schematics/src/shared/utils/graph-utils_spec.ts
@@ -167,10 +167,10 @@ describe('Graph utils', () => {
           "Personalization",
           "TMS-AEPL",
           "TMS-GTM",
+          "Organization-User-Registration",
           "Administration",
           "Account-Summary",
           "Unit-Order",
-          "Organization-User-Registration",
           "Order-Approval",
           "VC-Configurator",
           "CPQ-Configurator",
diff --git a/projects/schematics/src/shared/utils/test-utils.ts b/projects/schematics/src/shared/utils/test-utils.ts
index e3f69948d35..65558722568 100644
--- a/projects/schematics/src/shared/utils/test-utils.ts
+++ b/projects/schematics/src/shared/utils/test-utils.ts
@@ -49,6 +49,8 @@ export const organizationOrderApprovalFeatureModulePath =
   'src/app/spartacus/features/organization/organization-order-approval-feature.module.ts';
 export const organizationUserRegistrationFeatureModulePath =
   'src/app/spartacus/features/organization/organization-user-registration-feature.module.ts';
+export const organizationUserRegistrationWrapperModulePath =
+  'src/app/spartacus/features/organization/organization-user-registration-wrapper.module.ts';
 export const organizationUnitOrderFeatureModulePath =
   'src/app/spartacus/features/organization/organization-unit-order-feature.module.ts';
 export const organizationAccountSummaryFeatureModulePath =
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
new file mode 100644
index 00000000000..216ba80a3d4
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
@@ -0,0 +1,97 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as cdc from '../../../../helpers/vendor/cdc/cdc';
+import {
+  user,
+  organisation,
+  getSampleUser,
+} from '../../../../sample-data/checkout-flow';
+import { isolateTests } from '../../../../support/utils/test-isolation';
+import {
+  fillOrganizationUserRegistrationForm,
+  navigateToOrganizationUserRegisterPage,
+  submitOrganizationUserRegistrationForm,
+  verifyFormErrors,
+  verifyGlobalMessageAfterRegistration,
+  verifyRedirectionToLoginPage,
+  verifyTabbingOrder,
+} from '../../../../helpers/b2b/b2b-user-registration';
+
+describe('Register B2B Organisation when CDC enabled', () => {
+  describe('Register B2B Organisation with Screenset', () => {
+    before(() => {
+      cy.window().then((win) => win.sessionStorage.clear());
+      cy.visit('/cdc/register-org');
+    });
+
+    it('should register organization and request received message should appear', () => {
+      cdc.registerOrg(user, organisation);
+      cdc.verifyOrgRegistrationRequestReceived();
+    });
+  });
+
+  describe(
+    'Registration B2B Organization with Native UI',
+    { testIsolation: false },
+    () => {
+      isolateTests();
+      before(() => {
+        cy.window().then((win) => win.sessionStorage.clear());
+        cy.visit('/');
+      });
+
+      it('should navigate to organization user registration page', () => {
+        navigateToOrganizationUserRegisterPage();
+      });
+
+      it('should fill registration form and register user', () => {
+        fillOrganizationUserRegistrationForm(
+          getSampleUser(),
+          'Please register my account'
+        );
+      });
+
+      it('should verify tabbing order', () => {
+        // Accessibility
+        verifyTabbingOrder();
+      });
+
+      it('should submit the form filled with data', () => {
+        cy.get('cx-user-registration-form').within(() => {
+          cy.get('button[type=submit]').click();
+        });
+      });
+
+      it('should verify global message after successful registration', () => {
+        const message =
+          'Thank you for registering! A representative will contact you shortly and confirm your access information.';
+        verifyGlobalMessageAfterRegistration(message);
+        //   verifyRedirectionToLoginPage();
+        //   cdc.verifyOrgRegistrationRequestReceived();
+      });
+
+      describe('Form errors', () => {
+        before(() => {
+          cy.window().then((win) => win.sessionStorage.clear());
+          cy.visit('/');
+        });
+
+        it('should display validation errors if form is empty', () => {
+          navigateToOrganizationUserRegisterPage();
+
+          /*
+           * If form is not valid we should not expect call to the API
+           */
+          cy.get('cx-user-registration-form').within(() => {
+            cy.get('button[type=submit]').click();
+          });
+          verifyFormErrors();
+        });
+      });
+    }
+  );
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
index 159281651b0..5025fe9d6e4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/cdc/cdc.ts
@@ -8,7 +8,11 @@ import { editedAddress } from '../../../helpers/address-book';
 import { fillRegistrationForm, login } from '../../../helpers/auth-forms';
 import * as loginHelper from '../../../helpers/login';
 import { generateMail, randomString } from '../../../helpers/user';
-import { getSampleUser } from '../../../sample-data/checkout-flow';
+import {
+  getSampleUser,
+  SampleOrg,
+  SampleUser,
+} from '../../../sample-data/checkout-flow';
 import { AddressData, fillShippingAddress } from '../../checkout-forms';
 import * as alerts from '../../global-message';
 import { listenForTokenRevocationRequest } from '../../login';
@@ -148,6 +152,22 @@ export function loginUser(email: string, password: string) {
   });
 }
 
+export function registerOrg(user: SampleUser, org: SampleOrg) {
+  cy.get('[id="gigya-org-register-form"]').within(() => {
+    cy.get('[name="organization.name"]').type(org.companyName);
+    cy.get('[name="organization.street_address"]').type(org.address);
+    cy.get('[name="organization.city"]').type(org.city);
+    cy.get('[name="organization.state"]').type(org.state);
+    cy.get('[name="organization.zip_code"]').type(org.zipCode);
+    cy.get('[name="organization.country"]').type(org.country);
+    cy.get('[name="requester.firstName"]').type(user.firstName);
+    cy.get('[name="requester.lastName"]').type(user.lastName);
+    cy.get('[name="requester.email"]').type(user.email);
+    cy.get('[name="requester.phone"]').type(user.phone);
+    cy.get('[class="gigya-input-submit"]').click();
+  });
+}
+
 export function loginWithoutScreenSet(email: string, password: string) {
   login(email, password);
 }
@@ -156,6 +176,13 @@ export function verifyLoginOrRegistrationSuccess(fullName: string) {
   cy.get('[class="cx-login-greet"]').should('contain', fullName);
 }
 
+export function verifyOrgRegistrationRequestReceived() {
+  cy.get('[id="gigya-org-register-success-screen"]').should(
+    'contain',
+    "We have received your request to register as a Customer. You'll receive an email once your request is approved."
+  );
+}
+
 export function interceptCDCSDKMethod(methodName: string) {
   let cdcInterceptName = 'CDCSdkInvocation';
   cy.intercept({
diff --git a/projects/storefrontapp-e2e-cypress/cypress/sample-data/checkout-flow.ts b/projects/storefrontapp-e2e-cypress/cypress/sample-data/checkout-flow.ts
index 9b979b7de49..24ccfe311ec 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/sample-data/checkout-flow.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/sample-data/checkout-flow.ts
@@ -6,6 +6,15 @@
 
 import { generateMail, randomString } from '../helpers/user';
 
+export interface SampleOrg {
+  companyName?: string;
+  address?: string;
+  city?: string;
+  state?: string;
+  zipCode?: string;
+  country?: string;
+}
+
 export interface SampleUser {
   titleCode?: string;
   firstName?: string;
@@ -59,7 +68,7 @@ export function getSampleUser() {
     fullName: 'Cypress customer',
     password: 'Password123.',
     email: generateMail(randomString(), true),
-    phone: '555 555 555',
+    phone: '+919555555555',
     cellphone: '123 456 7899',
     address: {
       city: 'Los Angeles',
@@ -81,6 +90,19 @@ export function getSampleUser() {
   };
 }
 
+export const organisation = getSampleOrg();
+
+export function getSampleOrg() {
+  return {
+    companyName: randomString(),
+    address: '1111 S Figueroa St',
+    city: 'Los Angeles',
+    state: 'California',
+    zipCode: '90015',
+    country: 'United States',
+  };
+}
+
 export const product: SampleProduct = {
   name: 'Alpha 350',
   code: '1446509',
diff --git a/projects/storefrontapp/src/app/spartacus/features/organization/organization-user-registration-wrapper.module.ts b/projects/storefrontapp/src/app/spartacus/features/organization/organization-user-registration-wrapper.module.ts
new file mode 100644
index 00000000000..b71f40c12d6
--- /dev/null
+++ b/projects/storefrontapp/src/app/spartacus/features/organization/organization-user-registration-wrapper.module.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule, Type } from '@angular/core';
+import { CDCB2BRegisterModule } from '@spartacus/cdc/organization/user-registration';
+import { OrganizationUserRegistrationModule } from '@spartacus/organization/user-registration';
+
+import { environment } from '../../../../environments/environment';
+
+const extensions: Type<any>[] = [];
+
+if (environment.cdc) {
+  extensions.push(CDCB2BRegisterModule);
+}
+
+@NgModule({
+  imports: [OrganizationUserRegistrationModule, ...extensions],
+})
+export class OrganizationUserRegistrationWrapperModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/features/registration-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/registration-feature.module.ts
index 274d1b5b557..bc55479257c 100644
--- a/projects/storefrontapp/src/app/spartacus/features/registration-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/registration-feature.module.ts
@@ -22,9 +22,9 @@ import {
       featureModules: {
         [ORGANIZATION_USER_REGISTRATION_FEATURE]: {
           module: () =>
-            import('@spartacus/organization/user-registration').then(
-              (m) => m.OrganizationUserRegistrationModule
-            ),
+            import(
+              './organization/organization-user-registration-wrapper.module'
+            ).then((m) => m.OrganizationUserRegistrationWrapperModule),
         },
       },
     }),
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index 918e1b7d405..c604fd5b3dc 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -296,6 +296,9 @@
       "@spartacus/cdc/organization/administration": [
         "dist/cdc/organization/administration"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "dist/cdc/organization/user-registration"
+      ],
       "@spartacus/cdc/root": ["dist/cdc/root"],
       "@spartacus/cdc/user-account": ["dist/cdc/user-account"],
       "@spartacus/cdc/user-profile": ["dist/cdc/user-profile"],
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 0e568af081d..5965f73caa8 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -459,6 +459,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "../../integration-libs/cdc/user-account/public_api"
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index 64afc2fb45c..fb2a5bbf0df 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -335,6 +335,9 @@
       "@spartacus/cdc/organization/administration": [
         "../../dist/cdc/organization/administration"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../dist/cdc/organization/user-registration"
+      ],
       "@spartacus/cdc/root": ["../../dist/cdc/root"],
       "@spartacus/cdc/user-account": ["../../dist/cdc/user-account"],
       "@spartacus/cdc/user-profile": ["../../dist/cdc/user-profile"],
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index 14b03bf673f..b43f2caf1a4 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -533,6 +533,9 @@
       "@spartacus/cdc/organization/administration": [
         "integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": [
         "integration-libs/cdc/root/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 24013c021d0..9cb8188087e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -537,6 +537,9 @@
       "@spartacus/cdc/organization/administration": [
         "integration-libs/cdc/organization/administration/public_api"
       ],
+      "@spartacus/cdc/organization/user-registration": [
+        "integration-libs/cdc/organization/user-registration/public_api"
+      ],
       "@spartacus/cdc/root": [
         "integration-libs/cdc/root/public_api"
       ],

From 5ca6855a327af9e6028d808f317114b65fcafae4 Mon Sep 17 00:00:00 2001
From: Caine Rotherham <rotherham.c@gmail.com>
Date: Thu, 13 Jul 2023 14:15:25 +0200
Subject: [PATCH 072/122] refactor: Cleanup services for deep linking (#17492)

Closes: https://jira.tools.sap/browse/CXSPA-3884
---
 .gitignore                                    |   1 +
 .../asm-bind-cart.component.spec.ts           |   4 +
 .../asm-bind-cart/asm-bind-cart.component.ts  |  32 +++++
 .../asm-main-ui/asm-main-ui.component.spec.ts |  31 +++--
 .../asm-main-ui/asm-main-ui.component.ts      |  24 +++-
 ...m-switch-customer-dialog.component.spec.ts |   9 +-
 .../services/asm-component.service.spec.ts    |  27 ++++-
 .../services/asm-component.service.ts         |  45 ++++++-
 .../services/asm-deep-link.service.spec.ts    | 114 ++++++++++++++++++
 .../root/services/asm-deep-link.service.ts    |  80 ++++++++++++
 feature-libs/asm/root/services/index.ts       |   1 +
 11 files changed, 343 insertions(+), 25 deletions(-)
 create mode 100644 feature-libs/asm/root/services/asm-deep-link.service.spec.ts
 create mode 100644 feature-libs/asm/root/services/asm-deep-link.service.ts

diff --git a/.gitignore b/.gitignore
index 3bf7256d69f..5bc4d855cbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ scripts/install/config.sh
 *.launch
 .settings/
 *.sublime-workspace
+*.swp
 
 # IDE - VSCode
 .vscode/settings.json
diff --git a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
index f5c802cbbbf..b7d5788ceae 100644
--- a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
+++ b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.spec.ts
@@ -362,6 +362,10 @@ describe('AsmBindCartComponent', () => {
       spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
         'active'
       );
+      spyOn(asmComponentService, 'getDeepLinkUrlParams').and.returnValue({
+        cartType: 'active',
+        customerId: '123',
+      });
       component.ngOnInit();
 
       expect(component.displayBindCartBtn$.next).toHaveBeenCalledWith(false);
diff --git a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
index cc75f1fc9b4..1a7140f7092 100644
--- a/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
+++ b/feature-libs/asm/components/asm-bind-cart/asm-bind-cart.component.ts
@@ -300,6 +300,7 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     );
   }
 
+  // TODO(CXSPA-3090): Remove optional service flags in 7.0
   protected subscribeForDeeplinkCart(): void {
     if (this.featureConfig?.isLevel('6.2')) {
       this.subscription.add(
@@ -313,6 +314,25 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
             )
           )
           .subscribe(() => {
+            // TODO(CXSPA-3090): Remove feature flag in 7.0.
+            if (this.featureConfig?.isLevel('6.3')) {
+              const cartType =
+                this.asmComponentService?.getSearchParameter('cartType');
+              if (cartType === 'inactive' || cartType === 'active') {
+                this.displayBindCartBtn$.next(false);
+                this.displaySaveCartBtn$.next(cartType === 'inactive');
+                this.deepLinkCartId =
+                  this.asmComponentService?.getSearchParameter(
+                    'cartId'
+                  ) as string;
+                this.cartId.setValue(this.deepLinkCartId);
+                this.asmComponentService?.setShowDeeplinkCartInfoAlert(true);
+                this.asmComponentService?.handleDeepLinkNavigation();
+              }
+              return;
+            }
+
+            // TODO(CXSPA-3090): Remove this implementation in 7.0
             if (this.isDeepLinkInactiveCart()) {
               this.displayBindCartBtn$.next(false);
               this.displaySaveCartBtn$.next(true);
@@ -328,6 +348,9 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * @deprecated in 6.3: Will be removed in CXSPA-3090.
+   */
   protected onDeeplinkCart(): void {
     this.deepLinkCartId = this.asmComponentService?.getSearchParameter(
       'cartId'
@@ -336,11 +359,17 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     this.asmComponentService?.setShowDeeplinkCartInfoAlert(true);
   }
 
+  /**
+   * @deprecated in 6.3: Will be removed in CXSPA-3090.
+   */
   protected isDeepLinkInactiveCart(): boolean {
     const cartType = this.asmComponentService?.getSearchParameter('cartType');
     return cartType === 'inactive';
   }
 
+  /**
+   * @deprecated in 6.3: Will be removed in CXSPA-3090.
+   */
   protected isDeepLinkActiveCart(): boolean {
     const cartType = this.asmComponentService?.getSearchParameter('cartType');
     return cartType === 'active';
@@ -392,6 +421,9 @@ export class AsmBindCartComponent implements OnInit, OnDestroy {
     });
   }
 
+  /**
+   * @deprecated in 6.3: Will be removed in CXSPA-3090.
+   */
   protected goToActiveCartDetail(): void {
     this.routing?.go({ cxRoute: 'cart' });
   }
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
index 2b709969ef3..1a867e9d222 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
@@ -472,6 +472,9 @@ describe('AsmMainUiComponent', () => {
     spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
       'testuser'
     );
+    spyOn(asmComponentService, 'getDeepLinkUrlParams').and.returnValue({
+      customerId: 'testuser',
+    });
 
     spyOn(featureConfig, 'isLevel').and.returnValue(true);
 
@@ -489,6 +492,9 @@ describe('AsmMainUiComponent', () => {
     spyOn(asmComponentService, 'isEmulatedByDeepLink').and.returnValue(
       new BehaviorSubject(false)
     );
+    spyOn(asmComponentService, 'getDeepLinkUrlParams').and.returnValue({
+      customerId: 'newuser',
+    });
 
     const oldUser = { customerId: 'olduser', name: 'Test old User' } as User;
     const newUser = { customerId: 'newuser', name: 'Test new User' } as User;
@@ -513,6 +519,9 @@ describe('AsmMainUiComponent', () => {
     );
     spyOn(authService, 'isUserLoggedIn').and.returnValue(of(false));
     spyOn(asmComponentService, 'logoutCustomer').and.stub();
+    spyOn(asmComponentService, 'getDeepLinkUrlParams').and.returnValue({
+      customerId: testCustomerId,
+    });
     spyOn(asmComponentService, 'getSearchParameter').and.returnValue(
       testCustomerId
     );
@@ -545,33 +554,35 @@ describe('AsmMainUiComponent', () => {
     }, 200);
   });
 
-  it('should call naviate to home page when isEmulatedByDeepLink return true', () => {
+  it('should call navigate to home page when isEmulatedByDeepLink return true', () => {
     spyOn(routingService, 'go').and.stub();
     dialogClose$.next({
       selectedUser: {},
       actionType: null,
     });
-    spyOn(featureConfig, 'isLevel').and.returnValue(true);
 
+    spyOn(asmComponentService, 'isEmulateInURL').and.returnValue(true);
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
     spyOn(asmEnablerService, 'isEmulateInURL').and.returnValue(true);
     component.ngOnInit();
     expect(routingService.go).toHaveBeenCalledWith('/');
   });
 
-  it('should not call naviate to home page when isEmulatedByDeepLink return false', () => {
+  it('should not call navigate to home page when isEmulatedByDeepLink return false', () => {
     spyOn(routingService, 'go').and.stub();
     dialogClose$.next({
       selectedUser: {},
       actionType: null,
     });
-    spyOn(featureConfig, 'isLevel').and.returnValue(true);
 
+    spyOn(asmComponentService, 'isEmulateInURL').and.returnValue(false);
+    spyOn(featureConfig, 'isLevel').and.returnValue(true);
     spyOn(asmEnablerService, 'isEmulateInURL').and.returnValue(false);
     component.ngOnInit();
     expect(routingService.go).not.toHaveBeenCalledWith('/');
   });
 
-  it('should call naviate to order details when starting session with orderId in parameters', () => {
+  it('should call navigate to order details when starting session with orderId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
@@ -585,7 +596,7 @@ describe('AsmMainUiComponent', () => {
     });
   });
 
-  it('should call naviate to order details when starting session with orderId and ticketId in parameters', () => {
+  it('should call navigate to order details when starting session with orderId and ticketId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
@@ -599,7 +610,7 @@ describe('AsmMainUiComponent', () => {
     });
   });
 
-  it('should call naviate to support ticket details when starting session with ticketId in parameters', () => {
+  it('should call navigate to support ticket details when starting session with ticketId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
@@ -613,7 +624,7 @@ describe('AsmMainUiComponent', () => {
     });
   });
 
-  it('should call naviate to saved cart when starting session with savedCartId in parameters', () => {
+  it('should call navigate to saved cart when starting session with savedCartId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
@@ -624,7 +635,7 @@ describe('AsmMainUiComponent', () => {
     expect(routingService.go).toHaveBeenCalledWith('my-account/saved-cart/456');
   });
 
-  it('should call naviate to saved cart when starting session with savedCartId and ticketId in parameters', () => {
+  it('should call navigate to saved cart when starting session with savedCartId and ticketId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
@@ -646,7 +657,7 @@ describe('AsmMainUiComponent', () => {
     expect(routingService.go).not.toHaveBeenCalled();
   });
 
-  it('should not call naviate when starting session with inactive cartId and ticketId in parameters', () => {
+  it('should not call navigate when starting session with inactive cartId and ticketId in parameters', () => {
     spyOn(routingService, 'go').and.stub();
 
     component.startCustomerEmulationSession(
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index bdd26dac024..0af0d14aec8 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -35,7 +35,7 @@ import {
   LAUNCH_CALLER,
 } from '@spartacus/storefront';
 import { UserAccountFacade } from '@spartacus/user/account/root';
-import { combineLatest, Observable, of, Subscription } from 'rxjs';
+import { Observable, of, Subscription, combineLatest } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
@@ -191,7 +191,8 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
         //Always route to home page to avoid 404
         this.routingService.go('/');
       }
-      const parameters = {
+      // TODO(CXSPA-3090): Use asmDeepLinkService only in 7.0.
+      const parameters = this.asmComponentService.getDeepLinkUrlParams() ?? {
         customerId: this.asmComponentService.getSearchParameter('customerId'),
         orderId: this.asmComponentService.getSearchParameter('orderId'),
         ticketId: this.asmComponentService.getSearchParameter('ticketId'),
@@ -210,8 +211,12 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
             if (!isEmulatedByDeepLink && userLoggedin) {
               this.confirmSwitchCustomer(parameters.customerId);
             } else {
-              parameters.emulated = isEmulatedByDeepLink;
-              setTimeout(() => this.startSessionWithParameters(parameters));
+              setTimeout(() =>
+                this.startSessionWithParameters({
+                  ...parameters,
+                  emulated: isEmulatedByDeepLink,
+                })
+              );
             }
           }
         })
@@ -299,7 +304,16 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
       this.csAgentAuthService.startCustomerEmulationSession(customerId);
       this.startingCustomerSession = true;
       if (parameters) {
-        this.handleDeepLinkParamsAfterStartSession(parameters);
+        // TODO(CXSPA-3090): Remove feature flag in 7.0
+        if (this.featureConfig?.isLevel('6.3')) {
+          this.asmComponentService.handleDeepLinkNavigation({
+            customerId,
+            ...parameters,
+          });
+        } else {
+          // TODOi(CXSPA-3090): Remove this implementation in 7.0
+          this.handleDeepLinkParamsAfterStartSession(parameters);
+        }
       }
     } else {
       this.globalMessageService.add(
diff --git a/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
index 8a840b1b7ae..6f1096cc551 100644
--- a/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
+++ b/feature-libs/asm/components/asm-switch-customer-dialog/asm-switch-customer-dialog.component.spec.ts
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { CsAgentAuthService } from '@spartacus/asm/root';
-import { AuthService } from '@spartacus/core';
+import { AuthService, RoutingService } from '@spartacus/core';
 import { LaunchDialogService } from '@spartacus/storefront';
 import { Observable, of } from 'rxjs';
 import { AsmComponentService } from '../services';
@@ -38,7 +38,9 @@ class MockAuthService implements Partial<AuthService> {
     return of(false);
   }
 }
-
+class MockRoutingService implements Partial<RoutingService> {
+  go = () => Promise.resolve(true);
+}
 class MockCsAgentAuthService implements Partial<CsAgentAuthService> {
   authorizeCustomerSupportAgent(): Promise<void> {
     return Promise.resolve();
@@ -52,7 +54,7 @@ class MockCsAgentAuthService implements Partial<CsAgentAuthService> {
   startCustomerEmulationSession(_customerId: string) {}
 }
 
-describe('AsmBindCartDialogComponent', () => {
+describe('AsmSwitchCustomerDialogComponent', () => {
   let component: AsmSwitchCustomerDialogComponent;
   let fixture: ComponentFixture<AsmSwitchCustomerDialogComponent>;
 
@@ -67,6 +69,7 @@ describe('AsmBindCartDialogComponent', () => {
         { provide: AsmComponentService, useClass: MockAsmComponentService },
         { provide: AuthService, useClass: MockAuthService },
         { provide: CsAgentAuthService, useClass: MockCsAgentAuthService },
+        { provide: RoutingService, useClass: MockRoutingService },
       ],
     }).compileComponents();
   });
diff --git a/feature-libs/asm/components/services/asm-component.service.spec.ts b/feature-libs/asm/components/services/asm-component.service.spec.ts
index 823603a4ffe..7b8371070e0 100644
--- a/feature-libs/asm/components/services/asm-component.service.spec.ts
+++ b/feature-libs/asm/components/services/asm-component.service.spec.ts
@@ -2,9 +2,10 @@ import { TestBed } from '@angular/core/testing';
 import {
   ASM_ENABLED_LOCAL_STORAGE_KEY,
   CsAgentAuthService,
+  AsmDeepLinkService,
   AsmEnablerService,
 } from '@spartacus/asm/root';
-import { AuthService, WindowRef } from '@spartacus/core';
+import { AuthService, WindowRef, RoutingService } from '@spartacus/core';
 import { Observable, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { AsmComponentService } from './asm-component.service';
@@ -42,6 +43,28 @@ const MockWindowRef = {
   },
 };
 
+class MockAsmDeepLinkService implements Partial<AsmDeepLinkService> {
+  isEmulateInURL(): boolean {
+    return true;
+  }
+
+  getSearchParameter(key: any) {
+    return key;
+  }
+
+  handleNavigation() {
+    return {};
+  }
+
+  getParamsInUrl() {
+    return {};
+  }
+}
+
+class MockRoutingService implements Partial<RoutingService> {
+  go = () => Promise.resolve(true);
+}
+
 class MockAsmEnablerService implements Partial<AsmEnablerService> {
   isEmulateInURL(): boolean {
     return true;
@@ -60,6 +83,8 @@ describe('AsmComponentService', () => {
         { provide: AuthService, useClass: MockAuthService },
         { provide: CsAgentAuthService, useClass: MockCsAgentAuthService },
         { provide: WindowRef, useValue: MockWindowRef },
+        { provice: AsmDeepLinkService, useClass: MockAsmDeepLinkService },
+        { provide: RoutingService, useClass: MockRoutingService },
         { provide: AsmEnablerService, useClass: MockAsmEnablerService },
       ],
     });
diff --git a/feature-libs/asm/components/services/asm-component.service.ts b/feature-libs/asm/components/services/asm-component.service.ts
index 92b8aecb3bf..db460b3cf05 100644
--- a/feature-libs/asm/components/services/asm-component.service.ts
+++ b/feature-libs/asm/components/services/asm-component.service.ts
@@ -8,6 +8,8 @@ import { Injectable, Optional } from '@angular/core';
 import {
   ASM_ENABLED_LOCAL_STORAGE_KEY,
   CsAgentAuthService,
+  AsmDeepLinkParameters,
+  AsmDeepLinkService,
   AsmEnablerService,
 } from '@spartacus/asm/root';
 import { AuthService, WindowRef } from '@spartacus/core';
@@ -27,10 +29,11 @@ export class AsmComponentService {
     csAgentAuthService: CsAgentAuthService,
     winRef: WindowRef,
     // eslint-disable-next-line @typescript-eslint/unified-signatures
-    asmEnablerService: AsmEnablerService
+    asmEnablerService: AsmEnablerService,
+    asmDeepLinkService: AsmDeepLinkService
   );
   /**
-   * @deprecated since 7.0
+   * @deprecated since 7.0 (CXSPA-3090)
    */
   constructor(
     authService: AuthService,
@@ -41,13 +44,23 @@ export class AsmComponentService {
     protected authService: AuthService,
     protected csAgentAuthService: CsAgentAuthService,
     protected winRef: WindowRef,
-    @Optional() protected asmEnablerService?: AsmEnablerService
+    // TODO(CXSPA-3090): Remove optional flag in 7.0 where service is used
+    @Optional() protected asmEnablerService?: AsmEnablerService,
+    @Optional() protected asmDeepLinkService?: AsmDeepLinkService
   ) {
+    // TODO(CXSPA-3090): We can remove this in 7.0 and use asmDeepLinkService instead.
     this.searchparam = new URLSearchParams(this.winRef?.location?.search);
   }
 
-  getSearchParameter(key: string): string | null {
-    return this.searchparam.get(key);
+  /**
+   * Returns a deep link parameter value if it is in the url.
+   */
+  getSearchParameter(key: string): string | undefined | null {
+    // TODO(CXSPA-3090): Use asmDeepLinkService only in 7.0
+    return (
+      this.asmDeepLinkService?.getSearchParameter(key) ??
+      this.searchparam.get(key)
+    );
   }
 
   isEmulatedByDeepLink(): BehaviorSubject<boolean> {
@@ -95,6 +108,26 @@ export class AsmComponentService {
    * check whether try to emulate customer from deeplink
    */
   isEmulateInURL(): boolean {
-    return this.asmEnablerService?.isEmulateInURL() || false;
+    // TODO(CXSPA-3090): Use asmDeepLinkService only in 7.0
+    return (
+      (this.asmDeepLinkService?.isEmulateInURL() ??
+        this.asmEnablerService?.isEmulateInURL()) ||
+      false
+    );
+  }
+
+  /**
+   * Returns valid deep link parameters in the url.
+   */
+  getDeepLinkUrlParams(): AsmDeepLinkParameters | undefined {
+    return this.asmDeepLinkService?.getParamsInUrl();
+  }
+
+  /**
+   * Handles the navigation based on deep link parameters in the URL
+   * or passed parameter.
+   */
+  handleDeepLinkNavigation(parameters = this.getDeepLinkUrlParams()): void {
+    this.asmDeepLinkService?.handleNavigation(parameters);
   }
 }
diff --git a/feature-libs/asm/root/services/asm-deep-link.service.spec.ts b/feature-libs/asm/root/services/asm-deep-link.service.spec.ts
new file mode 100644
index 00000000000..c503a7abdb4
--- /dev/null
+++ b/feature-libs/asm/root/services/asm-deep-link.service.spec.ts
@@ -0,0 +1,114 @@
+import { TestBed } from '@angular/core/testing';
+import { WindowRef, RoutingService } from '@spartacus/core';
+import { AsmDeepLinkService } from './asm-deep-link.service';
+import { AsmEnablerService } from '@spartacus/asm/root';
+
+const MockWindowRef = {
+  location: {
+    search: 'customerId=testId&ticketId=123&invalidparam=666',
+  },
+};
+
+class MockRoutingService implements Partial<RoutingService> {
+  go = () => Promise.resolve(true);
+}
+
+class MockAsmEnablerService implements Partial<AsmEnablerService> {
+  isEmulateInURL = () => true;
+}
+
+describe('AsmDeepLinkService', () => {
+  let asmDeepLinkService: AsmDeepLinkService;
+  let asmEnablerService: AsmEnablerService;
+  let routingService: RoutingService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: WindowRef, useValue: MockWindowRef },
+        { provide: AsmEnablerService, useClass: MockAsmEnablerService },
+      ],
+    });
+
+    asmDeepLinkService = TestBed.inject(AsmDeepLinkService);
+    asmEnablerService = TestBed.inject(AsmEnablerService);
+    routingService = TestBed.inject(RoutingService);
+  });
+
+  it('should be created', () => {
+    expect(asmDeepLinkService).toBeTruthy();
+  });
+
+  describe('getSearchParameter', () => {
+    it('should get parameter from search result', () => {
+      expect(asmDeepLinkService.getSearchParameter('customerId')).toEqual(
+        'testId'
+      );
+    });
+  });
+
+  describe('isEmulateInURL', () => {
+    it('should call enabler service', () => {
+      spyOn(asmEnablerService, 'isEmulateInURL');
+      asmDeepLinkService.isEmulateInURL();
+      expect(asmEnablerService.isEmulateInURL).toHaveBeenCalled();
+    });
+  });
+
+  describe('getParamsInUrl', () => {
+    it('should return only valid deep link params in url', () => {
+      expect(asmDeepLinkService.getParamsInUrl()).toEqual({
+        customerId: 'testId',
+        ticketId: '123',
+      });
+    });
+  });
+
+  describe('handleNavigation', () => {
+    beforeEach(() => {
+      spyOn(routingService, 'go').and.callThrough();
+    });
+    it('should navigate to active cart', () => {
+      asmDeepLinkService.handleNavigation({
+        customerId: '123',
+        cartType: 'active',
+      });
+      expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'cart' });
+    });
+    it('should navigate to saved cart', () => {
+      asmDeepLinkService.handleNavigation({
+        customerId: '123',
+        cartType: 'saved',
+        cartId: '456',
+      });
+      expect(routingService.go).toHaveBeenCalledWith(
+        'my-account/saved-cart/456'
+      );
+    });
+    it('should navigate to order details', () => {
+      asmDeepLinkService.handleNavigation({
+        customerId: '123',
+        orderId: '456',
+      });
+      expect(routingService.go).toHaveBeenCalledWith({
+        cxRoute: 'orderDetails',
+        params: { code: '456' },
+      });
+    });
+    it('should navigate to support ticket details', () => {
+      asmDeepLinkService.handleNavigation({
+        customerId: '123',
+        ticketId: '456',
+      });
+      expect(routingService.go).toHaveBeenCalledWith({
+        cxRoute: 'supportTicketDetails',
+        params: { ticketCode: '456' },
+      });
+    });
+    it('should not navigate', () => {
+      asmDeepLinkService.handleNavigation({});
+      expect(routingService.go).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/feature-libs/asm/root/services/asm-deep-link.service.ts b/feature-libs/asm/root/services/asm-deep-link.service.ts
new file mode 100644
index 00000000000..1f99b1328b2
--- /dev/null
+++ b/feature-libs/asm/root/services/asm-deep-link.service.ts
@@ -0,0 +1,80 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RoutingService, WindowRef } from '@spartacus/core';
+import { Injectable } from '@angular/core';
+import { AsmEnablerService } from './asm-enabler.service';
+import { AsmDeepLinkParameters } from '../model/asm.models';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AsmDeepLinkService {
+  protected searchParams: URLSearchParams;
+
+  constructor(
+    protected routingService: RoutingService,
+    protected winRef: WindowRef,
+    protected asmEnablerService: AsmEnablerService
+  ) {
+    this.searchParams = new URLSearchParams(this.winRef?.location?.search);
+  }
+
+  /**
+   * check whether try to emulate customer from deeplink
+   */
+  isEmulateInURL(): boolean {
+    return this.asmEnablerService?.isEmulateInURL() || false;
+  }
+
+  /**
+   * Returns a deep link parameter value if it is in the url.
+   */
+  getSearchParameter(key: string): string | undefined {
+    return this.searchParams.get(key) ?? undefined;
+  }
+
+  /**
+   * Handles the navigation based on deep link parameters in the URL
+   * or passed parameters.
+   */
+  handleNavigation(parameters = this.getParamsInUrl()): void {
+    if (parameters.cartType === 'active') {
+      // Navigate to active cart
+      this.routingService.go({ cxRoute: 'cart' });
+    } else if (parameters.cartType === 'saved' && parameters.cartId) {
+      // Navigate to saved cart
+      this.routingService.go('my-account/saved-cart/' + parameters.cartId);
+    } else if (parameters.orderId) {
+      // Navigate to order details
+      this.routingService.go({
+        cxRoute: 'orderDetails',
+        params: { code: parameters.orderId },
+      });
+    } else if (parameters.ticketId) {
+      // Navigate to support ticket details
+      this.routingService.go({
+        cxRoute: 'supportTicketDetails',
+        params: { ticketCode: parameters.ticketId },
+      });
+    }
+  }
+
+  /**
+   * Returns valid deep link parameters in the url.
+   */
+  getParamsInUrl(): AsmDeepLinkParameters {
+    const params: AsmDeepLinkParameters = {
+      customerId: this.getSearchParameter('customerId'),
+      orderId: this.getSearchParameter('orderId'),
+      ticketId: this.getSearchParameter('ticketId'),
+      cartId: this.getSearchParameter('cartId'),
+      cartType: this.getSearchParameter('cartType'),
+    };
+    // Filter undefined properties
+    return Object.fromEntries(Object.entries(params).filter(([_, v]) => !!v));
+  }
+}
diff --git a/feature-libs/asm/root/services/index.ts b/feature-libs/asm/root/services/index.ts
index 96801af3c0a..62e71aaed9f 100644
--- a/feature-libs/asm/root/services/index.ts
+++ b/feature-libs/asm/root/services/index.ts
@@ -7,5 +7,6 @@
 export * from './asm-auth-http-header.service';
 export * from './asm-auth-storage.service';
 export * from './asm-auth.service';
+export * from './asm-deep-link.service';
 export * from './asm-enabler.service';
 export * from './csagent-auth.service';

From d5c4bc9c8ed6930958de0a0ea6e614840224c26d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 16 Jul 2023 20:36:31 -0400
Subject: [PATCH 073/122] chore(deps): bump tough-cookie from 4.1.2 to 4.1.3
 (#17645)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
---
 package-lock.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 66ea259b7e2..7f748bfa6db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21063,8 +21063,9 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "license": "BSD-3-Clause",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",

From f055e46c4df0c50eaa209b1715e222d9d6029d6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 11:26:51 -0400
Subject: [PATCH 074/122] chore(deps): bump tough-cookie and @azure/ms-rest-js
 in /.github/cache-builded-libs (#17646)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 .github/cache-builded-libs/package-lock.json | 50 +++++---------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/.github/cache-builded-libs/package-lock.json b/.github/cache-builded-libs/package-lock.json
index 5d9826d0f42..54002fde24c 100644
--- a/.github/cache-builded-libs/package-lock.json
+++ b/.github/cache-builded-libs/package-lock.json
@@ -140,15 +140,14 @@
       }
     },
     "@azure/ms-rest-js": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
-      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.7.0.tgz",
+      "integrity": "sha512-ngbzWbqF+NmztDOpLBVDxYM+XLcUj7nKhxGbSU9WtIsXfRB//cf2ZbAG5HkOrhU9/wd/ORRB6lM/d69RKVjiyA==",
       "requires": {
         "@azure/core-auth": "^1.1.4",
         "abort-controller": "^3.0.0",
         "form-data": "^2.5.0",
         "node-fetch": "^2.6.7",
-        "tough-cookie": "^3.0.1",
         "tslib": "^1.10.0",
         "tunnel": "0.0.6",
         "uuid": "^8.3.2",
@@ -164,15 +163,6 @@
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
           "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        },
-        "xml2js": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-          "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-          "requires": {
-            "sax": ">=0.6.0",
-            "xmlbuilder": "~11.0.0"
-          }
         }
       }
     },
@@ -447,11 +437,6 @@
         "mime-types": "^2.1.12"
       }
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
-    },
     "is-plain-object": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
@@ -499,16 +484,6 @@
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
     },
-    "psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-    },
-    "punycode": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz",
-      "integrity": "sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="
-    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -519,16 +494,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
-    "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
     "tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -579,6 +544,15 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
+    "xml2js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      }
+    },
     "xmlbuilder": {
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",

From ed5c1214d152c5a486685af4f15c6a39006d00e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 14:30:11 -0400
Subject: [PATCH 075/122] chore(deps): bump semver from 6.3.0 to 6.3.1 in
 /.github/api-extractor-action (#17644)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
---
 .github/api-extractor-action/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/api-extractor-action/package-lock.json b/.github/api-extractor-action/package-lock.json
index 5a0f6880dfc..97a9179c529 100644
--- a/.github/api-extractor-action/package-lock.json
+++ b/.github/api-extractor-action/package-lock.json
@@ -698,9 +698,9 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -1399,9 +1399,9 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
     "tough-cookie": {
       "version": "3.0.1",

From d1328a31ab7bb7317306c14cecdd97251b897aeb Mon Sep 17 00:00:00 2001
From: luoyifeng11 <127297696+luoyifeng11@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:09:15 +0800
Subject: [PATCH 076/122] test: Remove the asm.agentSignOut() in all ASM E2E
 Tests (#17638)

---
 .../asm/customer-list.e2e-flaky.cy.ts         |  2 -
 .../regression/asm/bind-cart.e2e-flaky.cy.ts  | 65 +++++++++----------
 .../asm/create-customer.e2e-flaky.cy.ts       | 10 +--
 .../asm/customer-list.e2e-flaky.cy.ts         |  2 -
 .../accessibility/tabbing-order/asm.ts        |  1 -
 .../cypress/helpers/asm.ts                    |  1 +
 6 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts
index eaae974e83f..dfd44574642 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/asm/customer-list.e2e-flaky.cy.ts
@@ -45,7 +45,6 @@ context('Assisted Service Module', () => {
 
       asm.agentLogin('brandon.leclair@acme.com', 'pw4all');
       asm.asmB2bCustomerLists();
-      asm.agentSignOut();
     });
 
     it('checking pagination (CXSPA-2109)', () => {
@@ -61,7 +60,6 @@ context('Assisted Service Module', () => {
 
       asm.agentLogin('jules.hasson@acme.com', 'pw4all');
       asm.asmB2bCustomerListPagination();
-      asm.agentSignOut();
     });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts
index d8f4f31e926..cfb79f8ef34 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/bind-cart.e2e-flaky.cy.ts
@@ -13,14 +13,14 @@ import { getSampleUser } from '../../../sample-data/checkout-flow';
 
 context('Assisted Service Module', () => {
   describe('Bind cart', () => {
-    it('should be able to bind anonymous cart to customer (CXSAP-153)', () => {
-      const customer = getSampleUser();
+    const customerForBindCart = getSampleUser();
+    let anonymousCartCodeForBindCart: string;
 
-      let anonymousCartCode: string;
+    it('should be able to bind anonymous cart to customer (CXSAP-153)', () => {
       checkout.visitHomePage();
       cy.get('cx-asm-main-ui').should('not.exist');
 
-      checkout.registerUser(false, customer);
+      checkout.registerUser(false, customerForBindCart);
 
       cy.log('--> Add to cart as an anonymous user');
       cart.addProductAsAnonymous();
@@ -32,7 +32,7 @@ context('Assisted Service Module', () => {
         .then(($cartId) => {
           // localStorage contains anonymous cart uid, read code from UI
           const text = $cartId.text();
-          anonymousCartCode = text.replace('Cart #', '').trim();
+          anonymousCartCodeForBindCart = text.replace('Cart #', '').trim();
 
           cy.log('--> Agent logging in');
           checkout.visitHomePage('asm=true');
@@ -41,12 +41,12 @@ context('Assisted Service Module', () => {
           asm.agentLogin('asagent', 'pw4all');
 
           cy.log('--> Starting customer emulation');
-          asm.startCustomerEmulation(customer);
+          asm.startCustomerEmulation(customerForBindCart);
 
           cy.log('--> Enter users cart number');
           cy.get(
             'cx-customer-emulation input[formcontrolname="cartNumber"]'
-          ).type(anonymousCartCode);
+          ).type(anonymousCartCodeForBindCart);
         });
 
       cy.log('--> Agent binding cart');
@@ -58,22 +58,17 @@ context('Assisted Service Module', () => {
         const customerCartCode = JSON.parse(
           window.localStorage.getItem('spartacus⚿electronics-spa⚿cart')
         ).active;
-        expect(customerCartCode).to.equal(anonymousCartCode);
+        expect(customerCartCode).to.equal(anonymousCartCodeForBindCart);
       });
+    });
 
-      cy.log(
-        '--> Stop customer emulation using the end emulation button in the ASM UI'
-      );
-      asm.agentSignOut();
-
-      cy.get('cx-asm-main-ui').should('exist');
-
+    it(`Verify anonymous cart is now the user's active cart for bind cart (CXSAP-153)`, () => {
       cy.log('--> Log in as customer');
       const loginPage = waitForPage('/login', 'getLoginPage');
       cy.visit('/login');
       cy.wait(`@${loginPage}`);
-      login(customer.email, customer.password);
-      cy.wait('@csAgentAuthentication');
+      login(customerForBindCart.email, customerForBindCart.password);
+      cy.get('cx-login .cx-login-greet').should('be.visible');
 
       cy.log("--> Verify anonymous cart is now the user's active cart");
       cart.goToCart();
@@ -81,17 +76,17 @@ context('Assisted Service Module', () => {
         const customerCartCode = JSON.parse(
           window.localStorage.getItem('spartacus⚿electronics-spa⚿cart')
         ).active;
-        expect(customerCartCode).to.equal(anonymousCartCode);
+        expect(customerCartCode).to.equal(anonymousCartCodeForBindCart);
       });
     });
 
+    const customerForReplaceBindCart = getSampleUser();
+    let anonymousCartCodeForReplaceBindCart: string;
     it('should be able to replace current customer cart with anonymous cart (CXSAP-153)', () => {
-      const customer = getSampleUser();
-
       checkout.visitHomePage();
       cy.get('cx-asm-main-ui').should('not.exist');
 
-      checkout.registerUser(false, customer);
+      checkout.registerUser(false, customerForReplaceBindCart);
 
       cy.log('--> Add to cart as an anonymous user');
       cart.addProductAsAnonymous();
@@ -103,8 +98,10 @@ context('Assisted Service Module', () => {
         .then(($cartId) => {
           // localStorage contains anonymous cart uid, but need cart code.  read cart code from UI
           const text = $cartId.text();
-          const anonymousCartCode = text.replace('Cart #', '').trim();
-          cy.wrap(anonymousCartCode).as('anonymousCartCode');
+          anonymousCartCodeForReplaceBindCart = text
+            .replace('Cart #', '')
+            .trim();
+          cy.wrap(anonymousCartCodeForReplaceBindCart).as('anonymousCartCode');
         });
       cy.get<string>('@anonymousCartCode').then((anonymousCartCode) => {
         cy.log(`--> Anonymous cart id: ${anonymousCartCode}`);
@@ -117,7 +114,7 @@ context('Assisted Service Module', () => {
       asm.agentLogin('asagent', 'pw4all');
 
       cy.log('--> Starting customer emulation');
-      asm.startCustomerEmulation(customer);
+      asm.startCustomerEmulation(customerForReplaceBindCart);
 
       cy.log('--> Create current active cart');
       cart.addProductFromPdp(cart.products[1].code).then(() => {
@@ -155,20 +152,18 @@ context('Assisted Service Module', () => {
           expect(customerCartCode).to.equal(anonymousCartCode);
         });
       });
+    });
 
-      cy.log(
-        '--> Stop customer emulation using the end emulation button in the ASM UI'
-      );
-      asm.agentSignOut();
-
-      cy.get('cx-asm-main-ui').should('exist');
-
+    it(`Verify anonymous cart is now the user's active cart for replace bind cart (CXSAP-153)`, () => {
       cy.log('--> Log in as customer');
       const loginPage = waitForPage('/login', 'getLoginPage');
       cy.visit('/login');
       cy.wait(`@${loginPage}`);
-      login(customer.email, customer.password);
-      cy.wait('@csAgentAuthentication');
+      login(
+        customerForReplaceBindCart.email,
+        customerForReplaceBindCart.password
+      );
+      cy.get('cx-login .cx-login-greet').should('be.visible');
 
       cy.log("--> Verify anonymous cart is now the user's active cart");
       cart.goToCart();
@@ -176,9 +171,7 @@ context('Assisted Service Module', () => {
         const customerCartCode = JSON.parse(
           window.localStorage.getItem('spartacus⚿electronics-spa⚿cart')
         ).active;
-        cy.get<string>('@anonymousCartCode').then((anonymousCartCode) => {
-          expect(customerCartCode).to.equal(anonymousCartCode);
-        });
+        expect(customerCartCode).to.equal(anonymousCartCodeForReplaceBindCart);
       });
     });
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
index cce0303f15c..f5dc14a04aa 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/create-customer.e2e-flaky.cy.ts
@@ -16,6 +16,7 @@ context('Assisted Service Module', () => {
   });
 
   describe('Create Customer', () => {
+    const user = getSampleUser();
     it('should be able to create a new customer by agent click button (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
       checkout.visitHomePage('asm=true');
@@ -35,7 +36,6 @@ context('Assisted Service Module', () => {
       asm.asmOpenCreateCustomerDialogOnCustomerListDialog();
 
       cy.log('--> fill form');
-      let user = getSampleUser();
       asm.fillCreateCustomerForm(user);
 
       cy.log('--> submit form');
@@ -46,8 +46,6 @@ context('Assisted Service Module', () => {
 
       cy.get('cx-customer-emulation').should('be.visible');
 
-      asm.agentSignOut();
-
       const backOfficeUrl =
         Cypress.env('BACK_OFFICE_URL') + Cypress.env('BACK_OFFICE_PREFIX');
       cy.log('--> Go to ' + backOfficeUrl + ' to update the customer password');
@@ -120,7 +118,9 @@ context('Assisted Service Module', () => {
           'Saved items'
         );
       });
+    });
 
+    it('vertify login to Spartacus (CXSPA-1594)', () => {
       cy.log('--> Return to Spartacus to verify login');
       checkout.visitHomePage();
       cy.log('--> Log in to Spartacus');
@@ -150,8 +150,6 @@ context('Assisted Service Module', () => {
 
       cy.log('--> close create customer dialog');
       asm.asmCloseCreateCustomerDialog();
-
-      asm.agentSignOut();
     });
     it('should be not able to create a new customer with invalid user data by agent (CXSPA-1594)', () => {
       cy.log('--> Agent logging in');
@@ -206,8 +204,6 @@ context('Assisted Service Module', () => {
 
       cy.log('--> close create customer dialog');
       asm.asmCloseCreateCustomerDialog();
-
-      asm.agentSignOut();
     });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
index af310c31a62..270555a3f37 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/asm/customer-list.e2e-flaky.cy.ts
@@ -27,7 +27,6 @@ context('Assisted Service Module', () => {
 
       asm.agentLogin('asagent', 'pw4all');
       asm.asmCustomerLists();
-      asm.agentSignOut();
     });
 
     it('checking pagination (CXSPA-2109)', () => {
@@ -37,7 +36,6 @@ context('Assisted Service Module', () => {
 
       asm.agentLogin('asagent', 'pw4all');
       asm.asmCustomerListPagination();
-      asm.agentSignOut();
     });
   });
 });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
index c7ab5ab9ccd..d1845bf8e53 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/accessibility/tabbing-order/asm.ts
@@ -109,7 +109,6 @@ export function asmTabbingOrderWithSaveInactiveCartDialog(
         cy.get('button[id=asm-save-inactive-cart-btn]').click();
         verifyTabbingOrder(containerSelectorForInactiveCartDialog, config);
         cy.findByText(/Cancel/i).click();
-        asm.agentSignOut();
       });
   });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
index 0bf9029dc1e..9c400e2b540 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/asm.ts
@@ -479,6 +479,7 @@ export function loginCustomerInStorefront(customer) {
   cy.wait(authRequest).its('response.statusCode').should('eq', 200);
 }
 
+// It is not recommended to use agentSignOut as it can cause failure in E2E tests related to ASM in the pipeline
 export function agentSignOut() {
   const tokenRevocationAlias = loginHelper.listenForTokenRevocationRequest();
   cy.get('button[title="Sign Out"]').click();

From 3544a49f15af7398e6ab68a1fe52c9d1211590fd Mon Sep 17 00:00:00 2001
From: Radhep Sabapathipillai <34665674+RadhepS@users.noreply.github.com>
Date: Tue, 18 Jul 2023 09:59:39 -0400
Subject: [PATCH 077/122] Release 6.3.0-1

---
 core-libs/setup/package.json                  |  10 +-
 feature-libs/asm/package.json                 |  14 +-
 feature-libs/cart/package.json                |  12 +-
 feature-libs/checkout/package.json            |  16 +-
 .../__snapshots__/index_spec.ts.snap          |   4 +-
 feature-libs/customer-ticketing/package.json  |  12 +-
 feature-libs/order/package.json               |  14 +-
 feature-libs/organization/package.json        |  16 +-
 .../__snapshots__/index_spec.ts.snap          |  10 +-
 feature-libs/pickup-in-store/package.json     |  18 +-
 .../product-configurator/package.json         |  16 +-
 .../__snapshots__/index_spec.ts.snap          |   6 +-
 feature-libs/product/package.json             |  10 +-
 .../__snapshots__/index_spec.ts.snap          |   4 +-
 feature-libs/qualtrics/package.json           |   8 +-
 feature-libs/smartedit/package.json           |   6 +-
 feature-libs/storefinder/package.json         |  10 +-
 feature-libs/tracking/package.json            |   6 +-
 feature-libs/user/package.json                |  10 +-
 integration-libs/cdc/package.json             |  14 +-
 integration-libs/cds/package.json             |  14 +-
 .../digital-payments/package.json             |  12 +-
 .../epd-visualization/package.json            |  12 +-
 integration-libs/s4om/package.json            |  12 +-
 integration-libs/segment-refs/package.json    |   6 +-
 projects/assets/package.json                  |   2 +-
 projects/core/package.json                    |   2 +-
 projects/schematics/package.json              |   2 +-
 projects/schematics/src/dependencies.json     | 208 +++++++++---------
 .../schematics/src/migrations/migrations.json |  20 +-
 .../ng-add/__snapshots__/index_spec.ts.snap   |  10 +-
 .../cypress/helpers/checkout-flow.ts          |   2 +-
 projects/storefrontlib/package.json           |   4 +-
 projects/storefrontstyles/package.json        |   2 +-
 .../storefrontstyles/scss/_versioning.scss    |   2 +-
 tools/config/const.ts                         |   2 +-
 36 files changed, 264 insertions(+), 264 deletions(-)

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 052c5037a2c..77c1944a24a 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -20,10 +20,10 @@
   },
   "peerDependencies": {
     "@angular/core": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/user": "5.0.0"
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^15.2.4",
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index c278a6050c5..84a145d3190 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,12 +32,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index c50d8d64fb4..43dbc51e2a3 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index 7d4dc5c8b91..add1c29d462 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
index 12e578e5070..27cc71fa3f2 100644
--- a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
@@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -506,7 +506,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 615c2a032ba..3acb2256931 100644
--- a/feature-libs/customer-ticketing/package.json
+++ b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,11 +30,11 @@
     "@angular/core": "^15.2.4",
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index bd568a131c0..ef8e96d979d 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,12 +33,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index ac7775f3060..38f89ae0f91 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
index 40492a9b238..0d0d33778be 100644
--- a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -266,7 +266,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -481,7 +481,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -696,7 +696,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -911,7 +911,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index 7921af273fb..1ffe58a0192 100644
--- a/feature-libs/pickup-in-store/package.json
+++ b/feature-libs/pickup-in-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pickup-in-store",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@angular/router": "^15.2.4",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefinder": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefinder": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index d8cb702f423..c92560dfcd8 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-configurator",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Product configurator feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/checkout": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
index 8401ae1c5ee..19148ba7c82 100644
--- a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
@@ -58,7 +58,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -303,7 +303,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -534,7 +534,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   })]
 })
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index e30e7d883eb..d05fcea3c57 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Product library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
index c0ca31940a6..c64f861dfdd 100644
--- a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -266,7 +266,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '5.0'
+      level: '6.3'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index b542a5e0d35..d957fc0a4fa 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Qualtrics library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,9 +30,9 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index cfbcdd1ef71..b56b5b3f661 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Smart Edit feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index 791914a8ce1..33507e7151a 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Store finder feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^15.2.4",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 0922b17227f..957912bb9f7 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Spartacus tracking and personalization library",
   "keywords": [
     "spartacus",
@@ -27,8 +27,8 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index 223d907ce18..dbd2f380bfb 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "User feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 31b6d40ffd3..39dd392508b 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Customer Data Cloud Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/asm": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/organization": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/asm": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/organization": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index da8e44e3d07..3821b1a1a00 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Context Driven Service library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular/core": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/tracking": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/tracking": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 57786f137c3..726b83f117f 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/digital-payments",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Digital Payments Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -27,11 +27,11 @@
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/checkout": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 3a5d5919187..23a84e541d2 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/epd-visualization",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "SAP Enterprise Product Development Visualization integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -38,11 +38,11 @@
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@sapui5/ts-types-esm": "1.108.14",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 5f04da81a4e..b2d3272ddc6 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "S/4HANA Order Management (b2b feature)",
   "keywords": [
     "spartacus",
@@ -23,11 +23,11 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 1839f071177..005fa7301d6 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/segment-refs",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "segment-refs",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/projects/assets/package.json b/projects/assets/package.json
index f82d01e76e7..7d083ba55f6 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
diff --git a/projects/core/package.json b/projects/core/package.json
index 1d9a43eace7..d4326fac941 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Spartacus - the core framework",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 485f2e7c26a..f9b1db5d2c9 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index e116776e166..9d4d2f7c75b 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -35,7 +35,7 @@
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0"
   },
@@ -47,10 +47,10 @@
   },
   "@spartacus/setup": {
     "@angular/core": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/user": "5.0.0"
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1"
   },
   "@spartacus/asm": {
     "@angular-devkit/schematics": "^15.2.4",
@@ -60,12 +60,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cart": {
@@ -77,11 +77,11 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -93,13 +93,13 @@
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -109,11 +109,11 @@
     "@angular/core": "^15.2.4",
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/order": {
@@ -125,12 +125,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/organization": {
@@ -142,13 +142,13 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -160,14 +160,14 @@
     "@angular/router": "^15.2.4",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefinder": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefinder": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -176,10 +176,10 @@
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
     "@angular/router": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -192,22 +192,22 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/checkout": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/qualtrics": {
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -215,8 +215,8 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/storefinder": {
@@ -227,10 +227,10 @@
     "@angular/router": "^15.2.4",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -238,8 +238,8 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/user": {
@@ -250,10 +250,10 @@
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cdc": {
@@ -265,12 +265,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/asm": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/organization": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/user": "5.0.0",
+    "@spartacus/asm": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/organization": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cds": {
@@ -279,12 +279,12 @@
     "@angular/core": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/tracking": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/tracking": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/digital-payments": {
@@ -294,11 +294,11 @@
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@ng-select/ng-select": "^10.0.3",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/checkout": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/epd-visualization": {
@@ -308,11 +308,11 @@
     "@angular/forms": "^15.2.4",
     "@angular/router": "^15.2.4",
     "@sapui5/ts-types-esm": "1.108.14",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -320,19 +320,19 @@
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
-    "@spartacus/storefront": "5.0.0",
-    "@spartacus/styles": "5.0.0",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/segment-refs": {
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
     "@angular/core": "^15.2.4",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/schematics": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "storefrontapp": {
diff --git a/projects/schematics/src/migrations/migrations.json b/projects/schematics/src/migrations/migrations.json
index c751a95682a..01112d36515 100644
--- a/projects/schematics/src/migrations/migrations.json
+++ b/projects/schematics/src/migrations/migrations.json
@@ -139,52 +139,52 @@
     },
 
     "00-migration-v6-ssr": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/ssr/ssr#migrate",
       "description": "Updates the SSR setup"
     },
     "01-migration-v6-config-deprecations": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/config-deprecations/config-deprecations#migrate",
       "description": "Handle deprecated configuration properties"
     },
     "02-migration-v6-constructor-deprecations": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/constructor-deprecations/constructor-deprecations#migrate",
       "description": "Add or remove constructor parameters"
     },
     "03-migration-v6-css": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/css/css#migrate",
       "description": "Handle deprecated CSS"
     },
     "04-migration-v6-dependency-management": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/dependency-management/dependency-management#migrate",
       "description": "Update dependencies"
     },
     "05-migration-v6-methods-and-properties-deprecations": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/methods-and-properties-deprecations/methods-and-properties-deprecations#migrate",
       "description": "Comment about usage of removed public methods or properties"
     },
     "06-migration-v6-missing-packages": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/missing-packages/missing-packages#migrate",
       "description": "Check missing packages"
     },
     "07-migration-v6-removed-public-api-deprecations": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/removed-public-api-deprecations/removed-public-api-deprecations#migrate",
       "description": "Comment about usage of removed public api"
     },
     "08-migration-v6-rename-symbol": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/rename-symbol/rename-symbol#migrate",
       "description": "Rename import symbols that were moved/changed in majors"
     },
     "09-migration-v6-angular-json-styling": {
-      "version": "6.0.0-next.0",
+      "version": "6.3.0-1",
       "factory": "./6_0/angular-json-styles/angular-json-styles#migrate",
       "description": "Update the angular.json with the style preprocessor options"
     }
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
index 645d3a796f5..0167385ada7 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -63,11 +63,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@nguniversal/express-engine": "^15.2.0",
-    "@spartacus/assets": "~5.0.0",
-    "@spartacus/core": "~5.0.0",
-    "@spartacus/setup": "~5.0.0",
-    "@spartacus/storefront": "~5.0.0",
-    "@spartacus/styles": "~5.0.0",
+    "@spartacus/assets": "~6.3.0-1",
+    "@spartacus/core": "~6.3.0-1",
+    "@spartacus/setup": "~6.3.0-1",
+    "@spartacus/storefront": "~6.3.0-1",
+    "@spartacus/styles": "~6.3.0-1",
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.15.2",
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-flow.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-flow.ts
index 469701b14b1..cda15cd92de 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-flow.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-flow.ts
@@ -322,7 +322,7 @@ export function goToPaymentDetails() {
 }
 
 export function clickAddNewPayment() {
-  cy.findByText('Add New Payment').click();
+  cy.contains('Add New Payment').click();
 }
 
 export function goToCheapProductDetailsPage(
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index abb61948760..ce778e85755 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "keywords": [
     "spartacus",
     "storefront",
@@ -23,7 +23,7 @@
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "5.0.0",
+    "@spartacus/core": "6.3.0-1",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0"
   },
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index e11de26b9ab..c8fc024414f 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index be37096b5d3..250a70f79d2 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -24,7 +24,7 @@
 // or `$styleVersion` are enabled.
 $_fullVersion: (
   major: 6,
-  minor: 1,
+  minor: 3,
   patch: 0,
 );
 
diff --git a/tools/config/const.ts b/tools/config/const.ts
index 6ae750650b3..c923a002212 100644
--- a/tools/config/const.ts
+++ b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '';
+export const PUBLISHING_VERSION = '6.3.0-1';

From 11978b48f098cda30692654aefacdfaeb888f02a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:57:23 -0400
Subject: [PATCH 078/122] chore(deps): bump tough-cookie and @azure/ms-rest-js
 in /.github/api-extractor-action (#17647)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 .../api-extractor-action/package-lock.json    | 73 ++-----------------
 1 file changed, 6 insertions(+), 67 deletions(-)

diff --git a/.github/api-extractor-action/package-lock.json b/.github/api-extractor-action/package-lock.json
index 97a9179c529..6c5642f561a 100644
--- a/.github/api-extractor-action/package-lock.json
+++ b/.github/api-extractor-action/package-lock.json
@@ -273,15 +273,14 @@
       "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "node_modules/@azure/ms-rest-js": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
-      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.7.0.tgz",
+      "integrity": "sha512-ngbzWbqF+NmztDOpLBVDxYM+XLcUj7nKhxGbSU9WtIsXfRB//cf2ZbAG5HkOrhU9/wd/ORRB6lM/d69RKVjiyA==",
       "dependencies": {
         "@azure/core-auth": "^1.1.4",
         "abort-controller": "^3.0.0",
         "form-data": "^2.5.0",
         "node-fetch": "^2.6.7",
-        "tough-cookie": "^3.0.1",
         "tslib": "^1.10.0",
         "tunnel": "0.0.6",
         "uuid": "^8.3.2",
@@ -590,14 +589,6 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/is-plain-object": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
@@ -679,19 +670,6 @@
         "node": ">= 0.6.0"
       }
     },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -705,19 +683,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "dependencies": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -1038,15 +1003,14 @@
       }
     },
     "@azure/ms-rest-js": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
-      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.7.0.tgz",
+      "integrity": "sha512-ngbzWbqF+NmztDOpLBVDxYM+XLcUj7nKhxGbSU9WtIsXfRB//cf2ZbAG5HkOrhU9/wd/ORRB6lM/d69RKVjiyA==",
       "requires": {
         "@azure/core-auth": "^1.1.4",
         "abort-controller": "^3.0.0",
         "form-data": "^2.5.0",
         "node-fetch": "^2.6.7",
-        "tough-cookie": "^3.0.1",
         "tslib": "^1.10.0",
         "tunnel": "0.0.6",
         "uuid": "^8.3.2",
@@ -1326,11 +1290,6 @@
         "mime-types": "^2.1.12"
       }
     },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
-    },
     "is-plain-object": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
@@ -1383,16 +1342,6 @@
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -1403,16 +1352,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
-    "tough-cookie": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-      "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-      "requires": {
-        "ip-regex": "^2.1.0",
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
     "tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",

From 168e2b7371b31171c747a24f7ec8ee6503855488 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:50:22 -0400
Subject: [PATCH 079/122] chore(deps): bump semver from 6.3.0 to 6.3.1 in
 /.github/cache-builded-libs (#17643)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 .github/cache-builded-libs/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/cache-builded-libs/package-lock.json b/.github/cache-builded-libs/package-lock.json
index 54002fde24c..ec717395065 100644
--- a/.github/cache-builded-libs/package-lock.json
+++ b/.github/cache-builded-libs/package-lock.json
@@ -490,9 +490,9 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
     },
     "tr46": {
       "version": "0.0.3",

From 87fd0b0bb3136423823782312191de5b3257ff05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 11:20:58 -0400
Subject: [PATCH 080/122] chore(deps): bump semver and @microsoft/api-extractor
 in /tools/breaking-changes (#17661)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
---
 tools/breaking-changes/package-lock.json | 153 +++++++++++++----------
 tools/breaking-changes/package.json      |   2 +-
 2 files changed, 88 insertions(+), 67 deletions(-)

diff --git a/tools/breaking-changes/package-lock.json b/tools/breaking-changes/package-lock.json
index 6396cd08796..7084a3729fd 100644
--- a/tools/breaking-changes/package-lock.json
+++ b/tools/breaking-changes/package-lock.json
@@ -8,7 +8,7 @@
       "name": "breaking-change-extractor",
       "version": "1.0.0",
       "dependencies": {
-        "@microsoft/api-extractor": "^7.34.4"
+        "@microsoft/api-extractor": "^7.36.3"
       },
       "devDependencies": {
         "@types/deep-equal": "^1.0.1",
@@ -58,35 +58,47 @@
       }
     },
     "node_modules/@microsoft/api-extractor": {
-      "version": "7.34.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.34.4.tgz",
-      "integrity": "sha512-HOdcci2nT40ejhwPC3Xja9G+WSJmWhCUKKryRfQYsmE9cD+pxmBaKBKCbuS9jUcl6bLLb4Gz+h7xEN5r0QiXnQ==",
+      "version": "7.36.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.36.3.tgz",
+      "integrity": "sha512-u0H6362AQq+r55X8drHx4npgkrCfJnMzRRHfQo8PMNKB8TcBnrTLfXhXWi+xnTM6CzlU/netEN8c4bq581Rnrg==",
       "dependencies": {
-        "@microsoft/api-extractor-model": "7.26.4",
+        "@microsoft/api-extractor-model": "7.27.5",
         "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.55.2",
-        "@rushstack/rig-package": "0.3.18",
-        "@rushstack/ts-command-line": "4.13.2",
+        "@rushstack/node-core-library": "3.59.6",
+        "@rushstack/rig-package": "0.4.0",
+        "@rushstack/ts-command-line": "4.15.1",
         "colors": "~1.2.1",
         "lodash": "~4.17.15",
         "resolve": "~1.22.1",
-        "semver": "~7.3.0",
+        "semver": "~7.5.4",
         "source-map": "~0.6.1",
-        "typescript": "~4.8.4"
+        "typescript": "~5.0.4"
       },
       "bin": {
         "api-extractor": "bin/api-extractor"
       }
     },
     "node_modules/@microsoft/api-extractor-model": {
-      "version": "7.26.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.26.4.tgz",
-      "integrity": "sha512-PDCgCzXDo+SLY5bsfl4bS7hxaeEtnXj7XtuzEE+BtALp7B5mK/NrS2kHWU69pohgsRmEALycQdaQPXoyT2i5MQ==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.27.5.tgz",
+      "integrity": "sha512-9/tBzYMJitR+o+zkPr1lQh2+e8ClcaTF6eZo7vZGDqRt2O5XmXWPbYJZmxyM3wb5at6lfJNEeGZrQXLjsQ0Nbw==",
       "dependencies": {
         "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.55.2"
+        "@rushstack/node-core-library": "3.59.6"
+      }
+    },
+    "node_modules/@microsoft/api-extractor/node_modules/typescript": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=12.20"
       }
     },
     "node_modules/@microsoft/tsdoc": {
@@ -118,16 +130,16 @@
       }
     },
     "node_modules/@rushstack/node-core-library": {
-      "version": "3.55.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.55.2.tgz",
-      "integrity": "sha512-SaLe/x/Q/uBVdNFK5V1xXvsVps0y7h1sN7aSJllQyFbugyOaxhNRF25bwEDnicARNEjJw0pk0lYnJQ9Kr6ev0A==",
+      "version": "3.59.6",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.59.6.tgz",
+      "integrity": "sha512-bMYJwNFfWXRNUuHnsE9wMlW/mOB4jIwSUkRKtu02CwZhQdmzMsUbxE0s1xOLwTpNIwlzfW/YT7OnOHgDffLgYg==",
       "dependencies": {
         "colors": "~1.2.1",
         "fs-extra": "~7.0.1",
         "import-lazy": "~4.0.0",
         "jju": "~1.4.0",
         "resolve": "~1.22.1",
-        "semver": "~7.3.0",
+        "semver": "~7.5.4",
         "z-schema": "~5.0.2"
       },
       "peerDependencies": {
@@ -140,18 +152,18 @@
       }
     },
     "node_modules/@rushstack/rig-package": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.18.tgz",
-      "integrity": "sha512-SGEwNTwNq9bI3pkdd01yCaH+gAsHqs0uxfGvtw9b0LJXH52qooWXnrFTRRLG1aL9pf+M2CARdrA9HLHJys3jiQ==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.4.0.tgz",
+      "integrity": "sha512-FnM1TQLJYwSiurP6aYSnansprK5l8WUK8VG38CmAaZs29ZeL1msjK0AP1VS4ejD33G0kE/2cpsPsS9jDenBMxw==",
       "dependencies": {
         "resolve": "~1.22.1",
         "strip-json-comments": "~3.1.1"
       }
     },
     "node_modules/@rushstack/ts-command-line": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.2.tgz",
-      "integrity": "sha512-bCU8qoL9HyWiciltfzg7GqdfODUeda/JpI0602kbN5YH22rzTxyqYvv7aRLENCM7XCQ1VRs7nMkEqgJUOU8Sag==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.15.1.tgz",
+      "integrity": "sha512-EL4jxZe5fhb1uVL/P/wQO+Z8Rc8FMiWJ1G7VgnPDvdIt5GVjRfK7vwzder1CZQiX3x0PY6uxENYLNGTFd1InRQ==",
       "dependencies": {
         "@types/argparse": "1.0.38",
         "argparse": "~1.0.9",
@@ -696,9 +708,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -1076,9 +1088,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -1117,9 +1129,9 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "node_modules/string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "engines": {
         "node": ">=0.6.19"
       }
@@ -1233,6 +1245,7 @@
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
       "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -1410,32 +1423,39 @@
       }
     },
     "@microsoft/api-extractor": {
-      "version": "7.34.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.34.4.tgz",
-      "integrity": "sha512-HOdcci2nT40ejhwPC3Xja9G+WSJmWhCUKKryRfQYsmE9cD+pxmBaKBKCbuS9jUcl6bLLb4Gz+h7xEN5r0QiXnQ==",
+      "version": "7.36.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.36.3.tgz",
+      "integrity": "sha512-u0H6362AQq+r55X8drHx4npgkrCfJnMzRRHfQo8PMNKB8TcBnrTLfXhXWi+xnTM6CzlU/netEN8c4bq581Rnrg==",
       "requires": {
-        "@microsoft/api-extractor-model": "7.26.4",
+        "@microsoft/api-extractor-model": "7.27.5",
         "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.55.2",
-        "@rushstack/rig-package": "0.3.18",
-        "@rushstack/ts-command-line": "4.13.2",
+        "@rushstack/node-core-library": "3.59.6",
+        "@rushstack/rig-package": "0.4.0",
+        "@rushstack/ts-command-line": "4.15.1",
         "colors": "~1.2.1",
         "lodash": "~4.17.15",
         "resolve": "~1.22.1",
-        "semver": "~7.3.0",
+        "semver": "~7.5.4",
         "source-map": "~0.6.1",
-        "typescript": "~4.8.4"
+        "typescript": "~5.0.4"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+          "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="
+        }
       }
     },
     "@microsoft/api-extractor-model": {
-      "version": "7.26.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.26.4.tgz",
-      "integrity": "sha512-PDCgCzXDo+SLY5bsfl4bS7hxaeEtnXj7XtuzEE+BtALp7B5mK/NrS2kHWU69pohgsRmEALycQdaQPXoyT2i5MQ==",
+      "version": "7.27.5",
+      "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.27.5.tgz",
+      "integrity": "sha512-9/tBzYMJitR+o+zkPr1lQh2+e8ClcaTF6eZo7vZGDqRt2O5XmXWPbYJZmxyM3wb5at6lfJNEeGZrQXLjsQ0Nbw==",
       "requires": {
         "@microsoft/tsdoc": "0.14.2",
         "@microsoft/tsdoc-config": "~0.16.1",
-        "@rushstack/node-core-library": "3.55.2"
+        "@rushstack/node-core-library": "3.59.6"
       }
     },
     "@microsoft/tsdoc": {
@@ -1466,32 +1486,32 @@
       }
     },
     "@rushstack/node-core-library": {
-      "version": "3.55.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.55.2.tgz",
-      "integrity": "sha512-SaLe/x/Q/uBVdNFK5V1xXvsVps0y7h1sN7aSJllQyFbugyOaxhNRF25bwEDnicARNEjJw0pk0lYnJQ9Kr6ev0A==",
+      "version": "3.59.6",
+      "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-3.59.6.tgz",
+      "integrity": "sha512-bMYJwNFfWXRNUuHnsE9wMlW/mOB4jIwSUkRKtu02CwZhQdmzMsUbxE0s1xOLwTpNIwlzfW/YT7OnOHgDffLgYg==",
       "requires": {
         "colors": "~1.2.1",
         "fs-extra": "~7.0.1",
         "import-lazy": "~4.0.0",
         "jju": "~1.4.0",
         "resolve": "~1.22.1",
-        "semver": "~7.3.0",
+        "semver": "~7.5.4",
         "z-schema": "~5.0.2"
       }
     },
     "@rushstack/rig-package": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.3.18.tgz",
-      "integrity": "sha512-SGEwNTwNq9bI3pkdd01yCaH+gAsHqs0uxfGvtw9b0LJXH52qooWXnrFTRRLG1aL9pf+M2CARdrA9HLHJys3jiQ==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.4.0.tgz",
+      "integrity": "sha512-FnM1TQLJYwSiurP6aYSnansprK5l8WUK8VG38CmAaZs29ZeL1msjK0AP1VS4ejD33G0kE/2cpsPsS9jDenBMxw==",
       "requires": {
         "resolve": "~1.22.1",
         "strip-json-comments": "~3.1.1"
       }
     },
     "@rushstack/ts-command-line": {
-      "version": "4.13.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.13.2.tgz",
-      "integrity": "sha512-bCU8qoL9HyWiciltfzg7GqdfODUeda/JpI0602kbN5YH22rzTxyqYvv7aRLENCM7XCQ1VRs7nMkEqgJUOU8Sag==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.15.1.tgz",
+      "integrity": "sha512-EL4jxZe5fhb1uVL/P/wQO+Z8Rc8FMiWJ1G7VgnPDvdIt5GVjRfK7vwzder1CZQiX3x0PY6uxENYLNGTFd1InRQ==",
       "requires": {
         "@types/argparse": "1.0.38",
         "argparse": "~1.0.9",
@@ -1921,9 +1941,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz",
-      "integrity": "sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -2190,9 +2210,9 @@
       }
     },
     "semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -2219,9 +2239,9 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q=="
     },
     "string.prototype.trimend": {
       "version": "1.0.4",
@@ -2288,7 +2308,8 @@
     "typescript": {
       "version": "4.8.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true
     },
     "unbox-primitive": {
       "version": "1.0.1",
diff --git a/tools/breaking-changes/package.json b/tools/breaking-changes/package.json
index d1da176b1b5..71f9a7f2585 100644
--- a/tools/breaking-changes/package.json
+++ b/tools/breaking-changes/package.json
@@ -22,7 +22,7 @@
     "gen-all": "npm run gen-const && npm run gen-methods-props && npm run gen-deleted && npm run gen-moved && npm run gen-doc"
   },
   "dependencies": {
-    "@microsoft/api-extractor": "^7.34.4"
+    "@microsoft/api-extractor": "^7.36.3"
   },
   "devDependencies": {
     "@types/deep-equal": "^1.0.1",

From 377f2b5adda97578e30c43fc90d9f6d371221b01 Mon Sep 17 00:00:00 2001
From: Florent Letendre <florent.letendre01@sap.com>
Date: Wed, 19 Jul 2023 12:32:48 -0400
Subject: [PATCH 081/122] fix: display error message on PaymentType
 ClassMismatchError (#17641)

CXSPA-3334

Error message is displayed and loader spinner is now hidden when server returns error 400 ClassMismatchError.

BREAKING CHANGE:

GlobalMessageService has been added in constructor
---
 .../checkout-payment-type.component.html      |  2 +-
 .../checkout-payment-type.component.spec.ts   | 17 ++++-
 .../checkout-payment-type.component.ts        | 63 +++++++++++++++++--
 .../facade/checkout-payment-type.service.ts   | 14 ++++-
 .../core/src/util/occ-http-error-constants.ts |  1 +
 5 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.html b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.html
index baf15c7bd01..e4707e495c3 100644
--- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.html
+++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.html
@@ -77,7 +77,7 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
 </ng-container>
 
 <ng-template #loading>
-  <div class="cx-spinner">
+  <div class="cx-spinner" *ngIf="!paymentTypesError">
     <cx-spinner></cx-spinner>
   </div>
 </ng-template>
diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts
index 505e8782429..432275a3cc0 100644
--- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts
+++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts
@@ -6,7 +6,11 @@ import { PaymentType } from '@spartacus/cart/base/root';
 import { CheckoutPaymentTypeFacade } from '@spartacus/checkout/b2b/root';
 import { CheckoutStepService } from '@spartacus/checkout/base/components';
 import { CheckoutStepType } from '@spartacus/checkout/base/root';
-import { I18nTestingModule, QueryState } from '@spartacus/core';
+import {
+  GlobalMessageService,
+  I18nTestingModule,
+  QueryState,
+} from '@spartacus/core';
 import { BehaviorSubject, of } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { CheckoutPaymentTypeComponent } from './checkout-payment-type.component';
@@ -18,6 +22,9 @@ import createSpy = jasmine.createSpy;
 })
 class MockSpinnerComponent {}
 
+class MockGlobalMessageService {
+  add = createSpy();
+}
 class MockCheckoutPaymentTypeService
   implements Partial<CheckoutPaymentTypeFacade>
 {
@@ -92,6 +99,10 @@ describe('CheckoutOnePaymentTypeComponent', () => {
             useClass: MockCheckoutStepService,
           },
           { provide: ActivatedRoute, useValue: mockActivatedRoute },
+          {
+            provide: GlobalMessageService,
+            useClass: MockGlobalMessageService,
+          },
         ],
       }).compileComponents();
 
@@ -145,6 +156,10 @@ describe('CheckoutPaymentTypeComponent', () => {
             useClass: MockCheckoutStepService,
           },
           { provide: ActivatedRoute, useValue: mockActivatedRoute },
+          {
+            provide: GlobalMessageService,
+            useClass: MockGlobalMessageService,
+          },
         ],
       }).compileComponents();
 
diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts
index 859cf31e525..55069a21be2 100644
--- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts
+++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts
@@ -8,6 +8,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   ElementRef,
+  Optional,
   ViewChild,
 } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
@@ -18,9 +19,22 @@ import {
 } from '@spartacus/checkout/b2b/root';
 import { CheckoutStepService } from '@spartacus/checkout/base/components';
 import { CheckoutStepType } from '@spartacus/checkout/base/root';
-import { getLastValueSync, isNotUndefined } from '@spartacus/core';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, tap } from 'rxjs/operators';
+import {
+  GlobalMessageService,
+  GlobalMessageType,
+  HttpErrorModel,
+  OccHttpErrorType,
+  getLastValueSync,
+  isNotUndefined,
+} from '@spartacus/core';
+import { BehaviorSubject, Observable, combineLatest, of } from 'rxjs';
+import {
+  catchError,
+  distinctUntilChanged,
+  filter,
+  map,
+  tap,
+} from 'rxjs/operators';
 
 @Component({
   selector: 'cx-payment-type',
@@ -34,6 +48,7 @@ export class CheckoutPaymentTypeComponent {
   protected busy$ = new BehaviorSubject<boolean>(false);
 
   typeSelected?: string;
+  paymentTypesError = false;
 
   isUpdating$ = combineLatest([
     this.busy$,
@@ -45,8 +60,24 @@ export class CheckoutPaymentTypeComponent {
     distinctUntilChanged()
   );
 
-  paymentTypes$: Observable<PaymentType[]> =
-    this.checkoutPaymentTypeFacade.getPaymentTypes();
+  paymentTypes$: Observable<PaymentType[]> = this.checkoutPaymentTypeFacade
+    .getPaymentTypes()
+    .pipe(
+      tap(() => (this.paymentTypesError = false)),
+      catchError((error: HttpErrorModel) => {
+        if (
+          error.details?.[0]?.type === OccHttpErrorType.CLASS_MISMATCH_ERROR &&
+          this.globalMessageService
+        ) {
+          this.globalMessageService.add(
+            { key: 'httpHandlers.forbidden' },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+          this.paymentTypesError = true;
+        }
+        return of([]);
+      })
+    );
 
   typeSelected$: Observable<PaymentType> = combineLatest([
     this.checkoutPaymentTypeFacade.getSelectedPaymentTypeState().pipe(
@@ -105,10 +136,30 @@ export class CheckoutPaymentTypeComponent {
       distinctUntilChanged()
     );
 
+  // TODO(CXSPA-3334): make globalMessageService a required dependency
+  constructor(
+    checkoutPaymentTypeFacade: CheckoutPaymentTypeFacade,
+    checkoutStepService: CheckoutStepService,
+    activatedRoute: ActivatedRoute,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    globalMessageService?: GlobalMessageService
+  );
+
+  /**
+   * @deprecated since 6.3
+   */
+  constructor(
+    checkoutPaymentTypeFacade: CheckoutPaymentTypeFacade,
+    checkoutStepService: CheckoutStepService,
+    activatedRoute: ActivatedRoute,
+    globalMessageService: GlobalMessageService
+  );
+
   constructor(
     protected checkoutPaymentTypeFacade: CheckoutPaymentTypeFacade,
     protected checkoutStepService: CheckoutStepService,
-    protected activatedRoute: ActivatedRoute
+    protected activatedRoute: ActivatedRoute,
+    @Optional() protected globalMessageService?: GlobalMessageService
   ) {}
 
   changeType(code: string): void {
diff --git a/feature-libs/checkout/b2b/core/facade/checkout-payment-type.service.ts b/feature-libs/checkout/b2b/core/facade/checkout-payment-type.service.ts
index a78be7f3333..5cb0805efb0 100644
--- a/feature-libs/checkout/b2b/core/facade/checkout-payment-type.service.ts
+++ b/feature-libs/checkout/b2b/core/facade/checkout-payment-type.service.ts
@@ -19,6 +19,7 @@ import {
   CommandService,
   CommandStrategy,
   EventService,
+  HttpErrorModel,
   OCC_USER_ID_ANONYMOUS,
   Query,
   QueryNotifier,
@@ -26,8 +27,8 @@ import {
   QueryState,
   UserIdService,
 } from '@spartacus/core';
-import { combineLatest, Observable } from 'rxjs';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { Observable, combineLatest, of, throwError } from 'rxjs';
+import { concatMap, filter, map, switchMap, take, tap } from 'rxjs/operators';
 import { CheckoutPaymentTypeConnector } from '../connectors/checkout-payment-type/checkout-payment-type.connector';
 
 @Injectable()
@@ -119,7 +120,14 @@ export class CheckoutPaymentTypeService implements CheckoutPaymentTypeFacade {
   }
 
   getPaymentTypes(): Observable<PaymentType[]> {
-    return this.getPaymentTypesState().pipe(map((state) => state.data ?? []));
+    return this.getPaymentTypesState().pipe(
+      concatMap((state) =>
+        (state?.error as HttpErrorModel)
+          ? throwError(state.error as HttpErrorModel)
+          : of(state)
+      ),
+      map((state) => state.data ?? [])
+    );
   }
 
   setPaymentType(
diff --git a/projects/core/src/util/occ-http-error-constants.ts b/projects/core/src/util/occ-http-error-constants.ts
index b491c68ad07..bd8d4efc6c8 100644
--- a/projects/core/src/util/occ-http-error-constants.ts
+++ b/projects/core/src/util/occ-http-error-constants.ts
@@ -8,6 +8,7 @@
 
 export declare const enum OccHttpErrorType {
   NOT_FOUND_ERROR = 'NotFoundError',
+  CLASS_MISMATCH_ERROR = 'ClassMismatchError',
 }
 
 export declare const enum OccHttpErrorReason {

From 90820904056dcbbd9388ddf048cb77875f41e0b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jul 2023 20:00:49 -0400
Subject: [PATCH 082/122] chore(deps): bump word-wrap from 1.2.3 to 1.2.4
 (#17663)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 package-lock.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f748bfa6db..5adb7f72589 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22363,8 +22363,9 @@
       "license": "MIT"
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "license": "MIT",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "engines": {
         "node": ">=0.10.0"
       }

From d74e46fd610199b636f2df5fa185aedaa86b24ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Jul 2023 11:26:12 -0400
Subject: [PATCH 083/122] chore(deps-dev): bump semver from 7.5.0 to 7.5.2
 (#17642)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 package-lock.json                | 7 ++++---
 package.json                     | 2 +-
 projects/schematics/package.json | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5adb7f72589..cded6608585 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,7 @@
         "prettier": "~2.4.1",
         "rimraf": "^5.0.0",
         "sass-true": "^6.1.0",
-        "semver": "^7.5.0",
+        "semver": "^7.5.2",
         "shelljs": "^0.8.5",
         "stylelint": "^13.13.1",
         "stylelint-scss": "^3.18.0",
@@ -19459,8 +19459,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.0",
-      "license": "ISC",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
diff --git a/package.json b/package.json
index cc467162663..24c65ec45a2 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
     "prettier": "~2.4.1",
     "rimraf": "^5.0.0",
     "sass-true": "^6.1.0",
-    "semver": "^7.5.0",
+    "semver": "^7.5.2",
     "shelljs": "^0.8.5",
     "stylelint": "^13.13.1",
     "stylelint-scss": "^3.18.0",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index f9b1db5d2c9..ef94a58cd77 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@angular/pwa": "^15.2.4",
     "@nguniversal/express-engine": "^15.2.0",
-    "semver": "^7.5.0",
+    "semver": "^7.5.2",
     "ts-morph": "^9.1.0",
     "tslib": "^2.4.0"
   },

From 06af7204f32cf671302d21078f2766b5d83cf91e Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Tue, 25 Jul 2023 09:04:14 +0200
Subject: [PATCH 084/122] feat: update order of BaseStorefrontModule in
 SpartacusModule (#17634)

---
 projects/schematics/src/add-spartacus/spartacus.ts              | 1 +
 .../__snapshots__/scaffold-app-structure_spec.ts.snap           | 2 +-
 .../scaffold-app-structure/scaffold-app-structure_spec.ts       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/schematics/src/add-spartacus/spartacus.ts b/projects/schematics/src/add-spartacus/spartacus.ts
index d9c87f147a8..a4f1f036e6e 100644
--- a/projects/schematics/src/add-spartacus/spartacus.ts
+++ b/projects/schematics/src/add-spartacus/spartacus.ts
@@ -68,6 +68,7 @@ function configureSpartacusModules(
         namedImports: [BASE_STOREFRONT_MODULE],
       },
       content: BASE_STOREFRONT_MODULE,
+      order: 0,
     });
     addModuleExport(sourceFile, {
       import: {
diff --git a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
index 1c8d5272a7b..c55722cb110 100644
--- a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
+++ b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/__snapshots__/scaffold-app-structure_spec.ts.snap
@@ -84,9 +84,9 @@ import { SpartacusFeaturesModule } from './spartacus-features.module';
   declarations: [],
   imports: [
     MyFeature,
+    BaseStorefrontModule,
     SpartacusFeaturesModule,
     SpartacusConfigurationModule,
-    BaseStorefrontModule
   ],
   exports: [BaseStorefrontModule]
 })
diff --git a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
index 1389f5bf70d..3d5f3e33ccc 100644
--- a/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
+++ b/projects/schematics/src/migrations/mechanism/scaffold-app-structure/scaffold-app-structure_spec.ts
@@ -24,9 +24,9 @@ import { SpartacusFeaturesModule } from './spartacus-features.module';
   declarations: [],
   imports: [
     MyFeature,
+    BaseStorefrontModule,
     SpartacusFeaturesModule,
     SpartacusConfigurationModule,
-    BaseStorefrontModule
   ],
   exports: [BaseStorefrontModule]
 })

From 321b332b3143b64b72adaf324a8fbe2f08c24dbf Mon Sep 17 00:00:00 2001
From: Caine Rotherham <rotherham.c@gmail.com>
Date: Wed, 26 Jul 2023 11:57:44 +0200
Subject: [PATCH 085/122] fix(navigation): prevent updating ngrx state when no
 components received from backend (#17683)

Closes: https://jira.tools.sap/browse/CXSPA-4157
---
 .../navigation-entry-item.reducer.spec.ts     | 10 ++++
 .../reducers/navigation-entry-item.reducer.ts |  6 +--
 .../regression/cms/cms-navigation.e2e.cy.ts   | 47 +++++++++++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cms/cms-navigation.e2e.cy.ts

diff --git a/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.spec.ts b/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.spec.ts
index 7246435e66f..7e40fbf246f 100755
--- a/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.spec.ts
+++ b/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.spec.ts
@@ -41,5 +41,15 @@ describe('Navigation Entry Item Reducer', () => {
       const state = fromComponent.reducer(initialState, action);
       expect(state).toEqual(mockNodes['testId']);
     });
+
+    it(`should NOT populate the component state nodes, when no components' details were received`, () => {
+      const mockPayload = { nodeId: 'testId', components: [] };
+
+      const { initialState } = fromComponent;
+      const action = new CmsActions.LoadCmsNavigationItemsSuccess(mockPayload);
+      const state = fromComponent.reducer(initialState, action);
+      expect(state).toEqual(initialState); // check that no nested mutations were done
+      expect(state).toBe(initialState); // check that the same object reference was returned
+    });
   });
 });
diff --git a/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.ts b/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.ts
index 0c0ab0ecb97..62989987792 100755
--- a/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.ts
+++ b/projects/core/src/cms/store/reducers/navigation-entry-item.reducer.ts
@@ -15,7 +15,7 @@ export function reducer(
 ): NodeItem | undefined {
   switch (action.type) {
     case CmsActions.LOAD_CMS_NAVIGATION_ITEMS_SUCCESS: {
-      if (action.payload.components) {
+      if (action.payload.components.length) {
         const components = action.payload.components;
         const newItem: NodeItem = components.reduce(
           (compItems: { [uid_type: string]: any }, component: any) => {
@@ -24,9 +24,7 @@ export function reducer(
               [`${component.uid}_AbstractCMSComponent`]: component,
             };
           },
-          {
-            ...{},
-          }
+          {}
         );
 
         return {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cms/cms-navigation.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cms/cms-navigation.e2e.cy.ts
new file mode 100644
index 00000000000..f928aa03d20
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cms/cms-navigation.e2e.cy.ts
@@ -0,0 +1,47 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isolateTests } from '../../../support/utils/test-isolation';
+
+context('Cms navigation', { testIsolation: false }, () => {
+  isolateTests();
+  it('should not go into infinite loop of loading cms components data, when some details of some component are missing', () => {
+    /**
+     * Circuit breaker, just in case if the infinite loop would happen. However, in a successful test pass, infinite loop should not happen.
+     */
+    let circuitBreakerCounter = 20;
+    function shouldSimulateMissingData(): boolean {
+      return circuitBreakerCounter-- >= 0;
+    }
+
+    // We want to intercept the HTTP response from `/cms/components` endpoint and simulate missing details of one random CMS component.
+    // This endpoint is expected to be called a few times, but not infinite number of times.
+    // Just in case we would go into infinite loop, we have circuit breaker.
+    cy.intercept('GET', `**/cms/components*`, (req) => {
+      req.reply((res) => {
+        if (shouldSimulateMissingData()) {
+          res.body.component.pop();
+        }
+        return res;
+      });
+    }).as('getComponents');
+
+    cy.visit('/');
+    cy.wait('@getComponents');
+    cy.get('cx-category-navigation cx-generic-link').should('exist');
+
+    // `/cms/components` endpoint is called for each different Navigation components (e.g. header and footer)
+    const EXPECTED_MAX_COUNT_LOADING_CMS_COMPONENTS = 4;
+
+    // Our heuristic to assert that there is no infinite loop of calling `/cms/components` endpoint
+    // is to check whether this endpoint was called not too many times during 1st second after the page is rendered.
+    cy.wait(1_000);
+    cy.get('@getComponents.all', { timeout: 0 }).should(
+      'have.length.at.most',
+      EXPECTED_MAX_COUNT_LOADING_CMS_COMPONENTS
+    );
+  });
+});

From 8a29feb105014a0dedf42039e60c563ee6ba0a06 Mon Sep 17 00:00:00 2001
From: Roman Chygryn <129765378+rmch91@users.noreply.github.com>
Date: Wed, 26 Jul 2023 17:43:15 +0200
Subject: [PATCH 086/122] fix: change attribute binding to property binding in
 GenericLink (#17684)

Changed attribute binding to property binding for target property in link html element in GenericLinkComponent.
In a case of usage of routerLink directive attribute binding of target property might not work as expected. Angular routerLink directive is designed to handle navigation and it takes precedence over the "target" attribute.
---
 .../shared/components/generic-link/generic-link.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/storefrontlib/shared/components/generic-link/generic-link.component.html b/projects/storefrontlib/shared/components/generic-link/generic-link.component.html
index 771d396368e..64725425dfa 100644
--- a/projects/storefrontlib/shared/components/generic-link/generic-link.component.html
+++ b/projects/storefrontlib/shared/components/generic-link/generic-link.component.html
@@ -19,7 +19,7 @@
     [routerLink]="routerUrl"
     [queryParams]="queryParams"
     [fragment]="fragment"
-    [attr.target]="target"
+    [target]="target || undefined"
     [attr.id]="id"
     [attr.class]="class"
     [attr.style]="style"

From 408c9a0f49029a8e5015594b03ef5af407399dc2 Mon Sep 17 00:00:00 2001
From: Florent Letendre <florent.letendre01@sap.com>
Date: Thu, 27 Jul 2023 12:13:44 -0400
Subject: [PATCH 087/122] fix: card payment info still displayed when values
 are empty(#17693)

CXSPA-3330

BREAKING CHANGE:

Public method has been added to verify the integrality of credit card info.
---
 .../order-overview.component.html             | 49 ++++++++++++++-----
 .../order-overview.component.spec.ts          |  9 ++++
 .../order-overview.component.ts               |  8 ++-
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.html b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
index e45b92f1bd5..83b381ab9be 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.html
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
@@ -96,18 +96,45 @@
       </div>
 
       <ng-container *ngIf="order.paymentInfo">
-        <div class="cx-summary-card">
-          <cx-card
-            [content]="getPaymentInfoCardContent(order?.paymentInfo) | async"
-          ></cx-card>
-
-          <cx-card
-            [content]="
-              getBillingAddressCardContent(order?.paymentInfo?.billingAddress)
-                | async
+        <ng-container *cxFeatureLevel="'6.3'">
+          <div
+            class="cx-summary-card"
+            *ngIf="
+              order?.paymentInfo?.billingAddress ||
+              isPaymentInfoCardFull(order?.paymentInfo)
             "
-          ></cx-card>
-        </div>
+          >
+            <ng-container *ngIf="isPaymentInfoCardFull(order?.paymentInfo)">
+              <cx-card
+                [content]="
+                  getPaymentInfoCardContent(order?.paymentInfo) | async
+                "
+              ></cx-card>
+            </ng-container>
+
+            <cx-card
+              [content]="
+                getBillingAddressCardContent(order?.paymentInfo?.billingAddress)
+                  | async
+              "
+            ></cx-card>
+          </div>
+        </ng-container>
+
+        <ng-container *cxFeatureLevel="'!6.3'">
+          <div class="cx-summary-card">
+            <cx-card
+              [content]="getPaymentInfoCardContent(order?.paymentInfo) | async"
+            ></cx-card>
+
+            <cx-card
+              [content]="
+                getBillingAddressCardContent(order?.paymentInfo?.billingAddress)
+                  | async
+              "
+            ></cx-card>
+          </div>
+        </ng-container>
       </ng-container>
     </div>
 
diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.spec.ts b/feature-libs/order/components/order-details/order-overview/order-overview.component.spec.ts
index 2334c3a9887..d020683f642 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.spec.ts
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.spec.ts
@@ -411,6 +411,15 @@ describe('OrderOverviewComponent', () => {
       );
     });
 
+    it('should isPaymentInfoCardFull be falsy when paymentInfo is partial', () => {
+      expect(
+        component.isPaymentInfoCardFull({
+          ...mockOrder.paymentInfo,
+          expiryMonth: undefined,
+        })
+      ).toBeFalsy();
+    });
+
     it('should call getBillingAddressCardContent(billingAddress: Address)', () => {
       spyOn(component, 'getBillingAddressCardContent').and.callThrough();
 
diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
index fc40394daab..f7a18ddc2ba 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
@@ -13,7 +13,7 @@ import {
   TranslationService,
 } from '@spartacus/core';
 import { Card, CmsComponentData } from '@spartacus/storefront';
-import { combineLatest, Observable, of } from 'rxjs';
+import { Observable, combineLatest, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import { OrderDetailsService } from '../order-details.service';
 
@@ -226,6 +226,12 @@ export class OrderOverviewComponent {
     );
   }
 
+  isPaymentInfoCardFull(payment: PaymentDetails): boolean {
+    return (
+      !!payment?.cardNumber && !!payment?.expiryMonth && !!payment?.expiryYear
+    );
+  }
+
   getBillingAddressCardContent(billingAddress: Address): Observable<Card> {
     return this.translation.translate('paymentForm.billingAddress').pipe(
       filter(() => Boolean(billingAddress)),

From 4a62ad8e2e957df32361d1f29febd1394885b508 Mon Sep 17 00:00:00 2001
From: evy-yang01 <evy.yang@sap.com>
Date: Fri, 28 Jul 2023 14:03:57 +0800
Subject: [PATCH 088/122] Fix: better error message when agent try to modify
 customer password (#17699)

---
 .../update-password-component.service.ts      | 14 ++-
 .../assets/src/translations/en/my-account.ts  |  1 +
 .../update-password.e2e-flaky.cy.ts           | 85 +++++++++++++++++++
 3 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-password.e2e-flaky.cy.ts

diff --git a/feature-libs/user/profile/components/update-password/update-password-component.service.ts b/feature-libs/user/profile/components/update-password/update-password-component.service.ts
index 8af7786a617..8b7585f2844 100644
--- a/feature-libs/user/profile/components/update-password/update-password-component.service.ts
+++ b/feature-libs/user/profile/components/update-password/update-password-component.service.ts
@@ -15,6 +15,7 @@ import {
   AuthService,
   GlobalMessageService,
   GlobalMessageType,
+  HttpErrorModel,
   RoutingService,
 } from '@spartacus/core';
 import { CustomFormValidators } from '@spartacus/storefront';
@@ -71,7 +72,7 @@ export class UpdatePasswordComponentService {
 
     this.userPasswordService.update(oldPassword, newPassword).subscribe({
       next: () => this.onSuccess(),
-      error: (error: Error) => this.onError(error),
+      error: (error: HttpErrorModel | Error) => this.onError(error),
     });
   }
 
@@ -93,7 +94,16 @@ export class UpdatePasswordComponentService {
     });
   }
 
-  protected onError(_error: Error): void {
+  protected onError(_error: HttpErrorModel | Error): void {
+    if (
+      _error instanceof HttpErrorModel &&
+      _error.details?.[0].type === 'AccessDeniedError'
+    ) {
+      this.globalMessageService.add(
+        { key: 'updatePasswordForm.accessDeniedError' },
+        GlobalMessageType.MSG_TYPE_ERROR
+      );
+    }
     this.busy$.next(false);
     this.form.reset();
   }
diff --git a/projects/assets/src/translations/en/my-account.ts b/projects/assets/src/translations/en/my-account.ts
index a9af034ab5a..1bac6db8186 100644
--- a/projects/assets/src/translations/en/my-account.ts
+++ b/projects/assets/src/translations/en/my-account.ts
@@ -32,6 +32,7 @@ export const myAccount = {
     },
     bothPasswordMustMatch: 'Both password must match',
     passwordUpdateSuccess: 'Password updated with success',
+    accessDeniedError: 'Access is denied',
   },
   updateProfileForm: {
     title: 'Title',
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-password.e2e-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-password.e2e-flaky.cy.ts
new file mode 100644
index 00000000000..99578b2e5f8
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-password.e2e-flaky.cy.ts
@@ -0,0 +1,85 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as asm from '../../../helpers/asm';
+import * as checkout from '../../../helpers/checkout-flow';
+import * as alerts from '../../../helpers/global-message';
+import { signOutUser } from '../../../helpers/login';
+import * as updatePassword from '../../../helpers/update-password';
+import { generateMail, randomString } from '../../../helpers/user';
+import { viewportContext } from '../../../helpers/viewport-context';
+import { standardUser } from '../../../sample-data/shared-users';
+import { isolateTests } from '../../../support/utils/test-isolation';
+describe('My Account - Update Password', () => {
+  viewportContext(['mobile'], () => {
+    before(() =>
+      cy.window().then((win) => {
+        win.sessionStorage.clear();
+      })
+    );
+    // Core e2e test. Repeat in mobile viewport.
+    updatePassword.testUpdatePasswordLoggedInUser();
+  });
+
+  viewportContext(['mobile', 'desktop'], () => {
+    before(() =>
+      cy.window().then((win) => {
+        win.sessionStorage.clear();
+      })
+    );
+
+    describe('update password by agent', { testIsolation: false }, () => {
+      isolateTests();
+      before(() => {
+        standardUser.registrationData.email = generateMail(
+          randomString(),
+          true
+        );
+        cy.requireLoggedIn(standardUser);
+        cy.visit('/');
+      });
+
+      it('should display server error if agent try to modify customer password(CXSPA-3399)', () => {
+        const customer = {
+          fullName:
+            standardUser.registrationData.firstName +
+            ' ' +
+            standardUser.registrationData.lastName,
+          email: standardUser.registrationData.email,
+        };
+        cy.log('--> Agent logging in');
+        checkout.visitHomePage('asm=true');
+        cy.get('cx-asm-main-ui').should('exist');
+        cy.get('cx-asm-main-ui').should('be.visible');
+        asm.agentLogin('asagent', 'pw4all');
+        cy.log('--> Starting customer emulation');
+        asm.startCustomerEmulation(customer);
+
+        cy.selectUserMenuOption({
+          option: 'Password',
+        });
+
+        alerts.getErrorAlert().should('not.exist');
+        cy.get('[formcontrolname="oldPassword"]').type(
+          standardUser.registrationData.password
+        );
+        cy.get('[formcontrolname="newPassword"]').type(
+          updatePassword.newPassword
+        );
+        cy.get('[formcontrolname="newPasswordConfirm"]').type(
+          updatePassword.newPassword
+        );
+        cy.get('cx-update-password button.btn-primary').click();
+        cy.url().should('contain', updatePassword.PAGE_URL_UPDATE_PASSWORD);
+        alerts.getErrorAlert().should('contain', 'Access is denied');
+      });
+
+      after(() => {
+        signOutUser();
+      });
+    });
+  });
+});

From b0bb9f0b860a709c0f8799001dea01f175cd33c0 Mon Sep 17 00:00:00 2001
From: Brian Gamboc-Javiniar <brian_javiniar@hotmail.com>
Date: Fri, 28 Jul 2023 03:57:52 -0400
Subject: [PATCH 089/122] chore: Export utility class for parsing fields -
 6.4.x (#17697)

closes https://jira.tools.sap/browse/CXSPA-4200
---
 projects/core/src/occ/utils/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/core/src/occ/utils/index.ts b/projects/core/src/occ/utils/index.ts
index 17a2528a7d5..d2e78d50ceb 100644
--- a/projects/core/src/occ/utils/index.ts
+++ b/projects/core/src/occ/utils/index.ts
@@ -14,6 +14,7 @@ export * from './interceptor-util';
 export * from './occ-constants';
 export * from './occ-url-util';
 export * from './occ-http-token';
+export * from './occ-fields';
 
 export const OCC_USER_ID_CONSTANTS = new InjectionToken<{
   [identifier: string]: string;

From a1232df480aa2e9725a2373849b634790e4ce683 Mon Sep 17 00:00:00 2001
From: niehuayang <126219214+niehuayang@users.noreply.github.com>
Date: Fri, 28 Jul 2023 21:29:20 +0800
Subject: [PATCH 090/122] fix/CXSPA-3440-3716: cherry-pick CXSPA-3440 and
 CXSPA-3716 to develop-6.4.x (#17700)

JIRA:
https://jira.tools.sap/browse/CXSPA-3716
https://jira.tools.sap/browse/CXSPA-3440
---
 .../asm/assets/translations/en/asm.ts         |  2 ++
 ...asm-create-customer-form.component.spec.ts | 21 +++++++++++++++++++
 .../asm-create-customer-form.component.ts     | 18 +++++++---------
 .../asm-main-ui/asm-main-ui.component.html    |  9 ++++++++
 .../asm-main-ui/asm-main-ui.component.spec.ts | 17 ++++++++++++++-
 .../asm-main-ui/asm-main-ui.component.ts      | 11 ++++++++--
 6 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/feature-libs/asm/assets/translations/en/asm.ts b/feature-libs/asm/assets/translations/en/asm.ts
index 000f9678367..46cd870a142 100644
--- a/feature-libs/asm/assets/translations/en/asm.ts
+++ b/feature-libs/asm/assets/translations/en/asm.ts
@@ -16,6 +16,8 @@ export const asm = {
     saveInactiveCartAlertInfo:
       'The identified cart is an inactive cart. To take further actions on this cart, save it first.',
     activeCartAlertInfo: 'The identified cart is an active cart.',
+    startCustomerEmulationAlertInfo:
+      'Customer emulation has started. Any actions you do will reflect the effects on the customer account.',
     toggleUi: {
       collapse: 'Hide ASM',
       expand: 'Show ASM',
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
index 52738f58258..a73b3a605b8 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.spec.ts
@@ -67,6 +67,16 @@ const errorResponse: HttpErrorModel = {
     },
   ],
 };
+
+const duplicatedUidErrorResponse: HttpErrorModel = {
+  details: [
+    {
+      message: 'Duplicate User id',
+      type: 'AssistedServiceDuplicatedUidError',
+    },
+  ],
+};
+
 @Component({
   selector: 'cx-icon',
   template: '',
@@ -191,6 +201,17 @@ describe('AsmCreateCustomerFormComponent', () => {
     );
   });
 
+  it('should show duplicated uid error with duplicate User id', () => {
+    component.createdCustomer = createdCustomerData;
+    // @ts-ignore
+    component.onRegisterUserFail(duplicatedUidErrorResponse);
+    expect(component.showDialogBackendErrorAlerts[0]).toBeTruthy();
+    expect(component.backendErrorMessages[0]).toEqual(
+      'asm.createCustomerForm.badRequestDuplicatedEmail emailAddress:' +
+        createdCustomerData.email
+    );
+  });
+
   it('should close modal when create account successfully', () => {
     spyOn(asmCreateCustomerFacade, 'createCustomer').and.callThrough();
     component.registerForm.patchValue(createdCustomerData);
diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
index a94d7d1fdbf..edba47086de 100644
--- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
+++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.ts
@@ -138,17 +138,13 @@ export class AsmCreateCustomerFormComponent {
             `asm.createCustomerForm.validationErrors.${errorDetail.subject}`
           );
           break;
-        case 'AssistedServiceError':
-          if (errorDetail.message === 'Duplicate User id') {
-            this.addErrorMessage(
-              'asm.createCustomerForm.badRequestDuplicatedEmail',
-              {
-                emailAddress: this.createdCustomer.email,
-              }
-            );
-          } else {
-            this.addErrorMessage(unknownError);
-          }
+        case 'AssistedServiceDuplicatedUidError':
+          this.addErrorMessage(
+            'asm.createCustomerForm.badRequestDuplicatedEmail',
+            {
+              emailAddress: this.createdCustomer.email,
+            }
+          );
           break;
         default:
           this.addErrorMessage(unknownError);
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
index dbe7bc2edf2..961baebe43f 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.html
@@ -79,6 +79,15 @@
         >
         </cx-message>
       </ng-container>
+      <ng-container *cxFeatureLevel="'6.3'">
+        <cx-message
+          *ngIf="notCollapsed && showCustomerEmulationInfoAlert"
+          [text]="'asm.startCustomerEmulationAlertInfo' | cxTranslate"
+          [type]="globalMessageType.MSG_TYPE_INFO"
+          (closeMessage)="closeCustomerEmulationInfoAlert()"
+        >
+        </cx-message>
+      </ng-container>
     </ng-container>
     <ng-template #showCustomerSelection>
       <cx-customer-selection
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
index 1a867e9d222..2bc41bd120f 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.spec.ts
@@ -22,7 +22,7 @@ import {
   RoutingService,
   User,
 } from '@spartacus/core';
-import { LaunchDialogService, LAUNCH_CALLER } from '@spartacus/storefront';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { UserAccountFacade } from '@spartacus/user/account/root';
 import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs';
 import { AsmComponentService } from '../services/asm-component.service';
@@ -675,4 +675,19 @@ describe('AsmMainUiComponent', () => {
       asmComponentService.setShowDeeplinkCartInfoAlert
     ).toHaveBeenCalledWith(false);
   });
+
+  it('should enable start customer emulation session meaasge and also can close the message', () => {
+    component.showCustomerEmulationInfoAlert = false;
+
+    spyOn(csAgentAuthService, 'startCustomerEmulationSession').and.stub();
+    const testCustomerId = 'customerid1234567890';
+    component.startCustomerEmulationSession({ customerId: testCustomerId });
+    expect(
+      csAgentAuthService.startCustomerEmulationSession
+    ).toHaveBeenCalledWith(testCustomerId);
+
+    expect(component.showCustomerEmulationInfoAlert).toBeTruthy;
+    component.closeCustomerEmulationInfoAlert();
+    expect(component.showCustomerEmulationInfoAlert).toBeFalsy;
+  });
 });
diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index 0af0d14aec8..b9f71340635 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -31,11 +31,11 @@ import {
 } from '@spartacus/core';
 import {
   ICON_TYPE,
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
 } from '@spartacus/storefront';
 import { UserAccountFacade } from '@spartacus/user/account/root';
-import { Observable, of, Subscription, combineLatest } from 'rxjs';
+import { Observable, Subscription, combineLatest, of } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
@@ -70,11 +70,13 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
   deeplinkCartAlertKey: string = '';
 
   showCreateCustomerSuccessfullyAlert = false;
+
   globalMessageType = GlobalMessageType;
 
   @HostBinding('class.hidden') disabled = false;
 
   protected startingCustomerSession = false;
+  showCustomerEmulationInfoAlert = true;
 
   subscription: Subscription = new Subscription();
 
@@ -303,6 +305,7 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     if (customerId) {
       this.csAgentAuthService.startCustomerEmulationSession(customerId);
       this.startingCustomerSession = true;
+      this.showCustomerEmulationInfoAlert = true;
       if (parameters) {
         // TODO(CXSPA-3090): Remove feature flag in 7.0
         if (this.featureConfig?.isLevel('6.3')) {
@@ -383,6 +386,10 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
     this.asmComponentService.setShowDeeplinkCartInfoAlert(false);
   }
 
+  closeCustomerEmulationInfoAlert(): void {
+    this.showCustomerEmulationInfoAlert = false;
+  }
+
   ngOnDestroy() {
     this.subscription?.unsubscribe();
   }

From 155e04f22ffca4a93f892ae9ebeefe32c8da9fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Zari=C4=87?=
 <11561723+znikola@users.noreply.github.com>
Date: Mon, 31 Jul 2023 23:47:51 +0200
Subject: [PATCH 091/122] Fix: product image normalizer now properly checks for
 gallery index when null (#17690)

closes https://jira.tools.sap/browse/CXSPA-4181
---
 .../converters/product-image-normalizer.spec.ts    | 14 ++++++++++++++
 .../product/converters/product-image-normalizer.ts |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/projects/core/src/occ/adapters/product/converters/product-image-normalizer.spec.ts b/projects/core/src/occ/adapters/product/converters/product-image-normalizer.spec.ts
index 35f8214bdfc..3266997eb74 100644
--- a/projects/core/src/occ/adapters/product/converters/product-image-normalizer.spec.ts
+++ b/projects/core/src/occ/adapters/product/converters/product-image-normalizer.spec.ts
@@ -43,6 +43,13 @@ describe('ProductImageNormalizer', () => {
         imageType: ImageType.PRIMARY,
         url: 'https://hybris.com/test3.jpg',
       },
+      {
+        altText: 'Test alt text',
+        format: 'cartIcon',
+        galleryIndex: null as any,
+        imageType: ImageType.PRIMARY,
+        url: '/test6',
+      },
       {
         altText: 'Test alt text',
         format: 'product',
@@ -83,6 +90,13 @@ describe('ProductImageNormalizer', () => {
           imageType: ImageType.PRIMARY,
           url: 'https://hybris.com/test3.jpg',
         },
+        cartIcon: {
+          altText: 'Test alt text',
+          format: 'cartIcon',
+          galleryIndex: null as any,
+          imageType: ImageType.PRIMARY,
+          url: baseUrl + '/test6',
+        },
       },
       GALLERY: [
         {
diff --git a/projects/core/src/occ/adapters/product/converters/product-image-normalizer.ts b/projects/core/src/occ/adapters/product/converters/product-image-normalizer.ts
index a80e80e29a1..58e2282ecc9 100644
--- a/projects/core/src/occ/adapters/product/converters/product-image-normalizer.ts
+++ b/projects/core/src/occ/adapters/product/converters/product-image-normalizer.ts
@@ -37,7 +37,7 @@ export class ProductImageNormalizer implements Converter<Occ.Product, Product> {
     const images: Images = {};
     if (source) {
       for (const image of source) {
-        const isList = image.hasOwnProperty('galleryIndex');
+        const isList = this.hasGalleryIndex(image);
         if (image.imageType) {
           if (!images.hasOwnProperty(image.imageType)) {
             images[image.imageType] = isList ? [] : {};
@@ -98,4 +98,9 @@ export class ProductImageNormalizer implements Converter<Occ.Product, Product> {
         '') + url
     );
   }
+
+  private hasGalleryIndex(image: Occ.Image) {
+    const galleryIndex = image.galleryIndex ?? false;
+    return galleryIndex !== false;
+  }
 }

From 6ec1bbd58afebd2bf3c7f68c3cea6c4dbf10dab3 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Tue, 1 Aug 2023 14:26:01 +0530
Subject: [PATCH 092/122] CXINT-2275: CDC `id_token` missing in the Oauth token
 request (#17705)

---
 integration-libs/cdc/root/service/cdc-js.service.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index 3f2e670be38..a86e511b464 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -36,10 +36,10 @@ import {
 } from 'rxjs';
 import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
-import { CdcAuthFacade } from '../facade/cdc-auth.facade';
-import { CdcReConsentEvent } from '../events';
-import { CdcSiteConsentTemplate } from '../consent-management/model/index';
 import { CdcConsentsLocalStorageService } from '../consent-management';
+import { CdcSiteConsentTemplate } from '../consent-management/model/index';
+import { CdcReConsentEvent } from '../events';
+import { CdcAuthFacade } from '../facade/cdc-auth.facade';
 
 const defaultSessionTimeOut = 3600;
 const setAccountInfoAPI = 'accounts.setAccountInfo';
@@ -125,7 +125,7 @@ export class CdcJsService implements OnDestroy {
                 (this.winRef.nativeWindow as { [key: string]: any })[
                   '__gigyaConf'
                 ] = {
-                  include: 'id_token',
+                  include: 'id_token, missing-required-fields',
                 };
               }
             }
@@ -266,7 +266,6 @@ export class CdcJsService implements OnDestroy {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
-          include: 'missing-required-fields',
           ignoreInterruptions: ignoreInterruptions,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,

From d277300aa465237a91f7039e6466cce06d920105 Mon Sep 17 00:00:00 2001
From: Gilberto Alvarado <gilberto.alvarado.jimenez@sap.com>
Date: Tue, 1 Aug 2023 09:31:39 -0400
Subject: [PATCH 093/122] Revert "CXINT-2275: CDC `id_token` missing in the
 Oauth token request (#17705)"

This reverts commit 6ec1bbd58afebd2bf3c7f68c3cea6c4dbf10dab3.
---
 integration-libs/cdc/root/service/cdc-js.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index a86e511b464..3f2e670be38 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -36,10 +36,10 @@ import {
 } from 'rxjs';
 import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
-import { CdcConsentsLocalStorageService } from '../consent-management';
-import { CdcSiteConsentTemplate } from '../consent-management/model/index';
-import { CdcReConsentEvent } from '../events';
 import { CdcAuthFacade } from '../facade/cdc-auth.facade';
+import { CdcReConsentEvent } from '../events';
+import { CdcSiteConsentTemplate } from '../consent-management/model/index';
+import { CdcConsentsLocalStorageService } from '../consent-management';
 
 const defaultSessionTimeOut = 3600;
 const setAccountInfoAPI = 'accounts.setAccountInfo';
@@ -125,7 +125,7 @@ export class CdcJsService implements OnDestroy {
                 (this.winRef.nativeWindow as { [key: string]: any })[
                   '__gigyaConf'
                 ] = {
-                  include: 'id_token, missing-required-fields',
+                  include: 'id_token',
                 };
               }
             }
@@ -266,6 +266,7 @@ export class CdcJsService implements OnDestroy {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
+          include: 'missing-required-fields',
           ignoreInterruptions: ignoreInterruptions,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,

From c5ddfbfc2556adb683d2dce1f118832046c8f7c1 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Tue, 1 Aug 2023 22:46:08 +0530
Subject: [PATCH 094/122] CXINT-2275: CDC `id_token` missing in the Oauth token
 request (#17712)

---
 integration-libs/cdc/root/service/cdc-js.service.spec.ts | 4 +---
 integration-libs/cdc/root/service/cdc-js.service.ts      | 9 ++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/integration-libs/cdc/root/service/cdc-js.service.spec.ts b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
index c5744f4d8a4..fe6ce38d4b2 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.spec.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
@@ -267,7 +267,7 @@ describe('CdcJsService', () => {
         errorCallback: jasmine.any(Function) as any,
       });
       expect(winRef?.nativeWindow['__gigyaConf']).toEqual({
-        include: 'id_token',
+        include: 'id_token, missing-required-fields',
       });
     });
 
@@ -456,7 +456,6 @@ describe('CdcJsService', () => {
         expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
           loginID: 'uid',
           password: 'password',
-          include: 'missing-required-fields',
           ignoreInterruptions: true,
           sessionExpiry: sampleCdcConfig.cdc[0].sessionExpiration,
           callback: jasmine.any(Function),
@@ -485,7 +484,6 @@ describe('CdcJsService', () => {
           expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
             loginID: 'uid',
             password: 'password',
-            include: 'missing-required-fields',
             ignoreInterruptions: true,
             context: 'RESET_EMAIL',
             sessionExpiry: sampleCdcConfig?.cdc[0]?.sessionExpiration,
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index 3f2e670be38..a86e511b464 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -36,10 +36,10 @@ import {
 } from 'rxjs';
 import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
-import { CdcAuthFacade } from '../facade/cdc-auth.facade';
-import { CdcReConsentEvent } from '../events';
-import { CdcSiteConsentTemplate } from '../consent-management/model/index';
 import { CdcConsentsLocalStorageService } from '../consent-management';
+import { CdcSiteConsentTemplate } from '../consent-management/model/index';
+import { CdcReConsentEvent } from '../events';
+import { CdcAuthFacade } from '../facade/cdc-auth.facade';
 
 const defaultSessionTimeOut = 3600;
 const setAccountInfoAPI = 'accounts.setAccountInfo';
@@ -125,7 +125,7 @@ export class CdcJsService implements OnDestroy {
                 (this.winRef.nativeWindow as { [key: string]: any })[
                   '__gigyaConf'
                 ] = {
-                  include: 'id_token',
+                  include: 'id_token, missing-required-fields',
                 };
               }
             }
@@ -266,7 +266,6 @@ export class CdcJsService implements OnDestroy {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
-          include: 'missing-required-fields',
           ignoreInterruptions: ignoreInterruptions,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,

From 1ac2d16a139e3e5ce2f21ea3751d98bf7538bcdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Fra=C5=9B?= <fras.pawel@yahoo.com>
Date: Wed, 2 Aug 2023 14:15:43 +0200
Subject: [PATCH 095/122] bugfix: CXSPA-4215  CI Testing strategy not working
 for integration libs (#17722)

---
 ci-scripts/unit-tests.sh  | 5 ++---
 docs/libs/creating-lib.md | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ci-scripts/unit-tests.sh b/ci-scripts/unit-tests.sh
index 16c55e9dce9..7f77ee450f0 100755
--- a/ci-scripts/unit-tests.sh
+++ b/ci-scripts/unit-tests.sh
@@ -4,16 +4,15 @@ set -o pipefail
 
 EXCLUDE_APPLICATIONS=storefrontapp
 EXCLUDE_JEST=storefrontstyles,schematics,setup
-EXCLUDE_INTEGRATION_LIBS=cdc,cds,digital-payments,epd-visualization,s4om
 
 echo "-----"
 
 function run_affected_unit_tests {
     echo "Running JASMINE unit tests and code coverage for AFFECTED libraries"
-    npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST,$EXCLUDE_INTEGRATION_LIBS" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless
+    npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless
 
     echo "Running JEST (mostly schematics) unit tests and code coverage for AFFECTED libraries"
-    npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_INTEGRATION_LIBS" -- --coverage --runInBand
+    npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS" -- --coverage --runInBand
 }
 
 function run_all_unit_tests {
diff --git a/docs/libs/creating-lib.md b/docs/libs/creating-lib.md
index 2e65c2e28c7..de95d5edb93 100644
--- a/docs/libs/creating-lib.md
+++ b/docs/libs/creating-lib.md
@@ -335,7 +335,6 @@ The following files should be modified:
 - `projects/storefrontapp/src/environments/models/build.process.env.d.ts` - if creating a feature that can be toggled on/off, add your feature environment variable to the `Env` interface located in this file
 - `projects/storefrontapp/src/environments/environment.ts` - if creating a feature that can be toggled on/off, set you feature for development as enabled or disabled by default
 - `projects/storefrontapp/src/environments/environment.prod.ts` - if creating a feature that can be toggled on/off, pass the created env. variable to your feature
-- look for `EXCLUDE_INTEGRATION_LIBS` in the entire codebase, and add the new library to the comma separated string `IF AND ONLY IF` it is a new integration library.
 
 - Root `package.json`
 
@@ -353,9 +352,6 @@ Also, add the new lib to the `build:libs` and `test:libs` scripts.
 
 - `ci-scripts/unit-tests.sh`
 
-`IF AND ONLY IF` you are creating a new integration-lib, then include the library's name to the command separated string for `EXCLUDE_INTEGRATION_LIBS`.
-
-
 
 ### Sample data release entry ONLY if applicable
 

From da286d74cc20546b07f1e637e293b7c1372f8ae2 Mon Sep 17 00:00:00 2001
From: Sam Garland <52560012+sam-garland@users.noreply.github.com>
Date: Thu, 3 Aug 2023 22:57:47 +1200
Subject: [PATCH 096/122] feat: (cherry pick) use evergreen SAPUI5 version
 (#17656) (#17707)

---
 .../visual-picking-tab/visual-picking-tab.component.ts   | 7 ++++++-
 .../visual-picking-tab/visual-picking-tab.service.ts     | 9 +++++++++
 .../components/visual-viewer/visual-viewer.service.ts    | 7 ++++++-
 .../root/testing/epd-visualization-test-config.ts        | 3 +--
 .../__snapshots__/index_spec.ts.snap                     | 6 +++---
 .../integration-libs/epd-schematics-config.ts            | 2 +-
 .../epd-visualization-feature.module.ts                  | 3 +--
 7 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.component.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.component.ts
index 9562771d32c..366b41d2e06 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.component.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.component.ts
@@ -32,7 +32,12 @@ export class VisualPickingTabComponent implements AfterViewInit {
     );
   }
 
-  selectedProductCodes: string[] = [];
+  public get selectedProductCodes() {
+    return this.visualPickingTabService.selectedProductCodes;
+  }
+  public set selectedProductCodes(selectedProducts: string[]) {
+    this.visualPickingTabService.selectedProductCodes = selectedProducts;
+  }
 
   @ViewChild(VisualViewerComponent, { read: VisualViewerService })
   visualViewerService: VisualViewerService;
diff --git a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.service.ts b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.service.ts
index 49c52db3f30..110b5063222 100644
--- a/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.service.ts
+++ b/integration-libs/epd-visualization/components/visual-picking/visual-picking-tab/visual-picking-tab.service.ts
@@ -98,6 +98,15 @@ export class VisualPickingTabService implements OnDestroy {
   private getProductReferencesSubscription: Subscription;
   private getFilteredProductReferencesSubscription: Subscription;
 
+  private _selectedProductCodes: string[] = [];
+  public get selectedProductCodes() {
+    return this._selectedProductCodes;
+  }
+  public set selectedProductCodes(selectedProducts: string[]) {
+    this._selectedProductCodes = selectedProducts;
+    this.changeDetectorRef.detectChanges();
+  }
+
   /**
    * When true, error messages will be shown when visualization load/lookup failures occur.
    */
diff --git a/integration-libs/epd-visualization/components/visual-viewer/visual-viewer.service.ts b/integration-libs/epd-visualization/components/visual-viewer/visual-viewer.service.ts
index 21d0e710804..ce00830d174 100644
--- a/integration-libs/epd-visualization/components/visual-viewer/visual-viewer.service.ts
+++ b/integration-libs/epd-visualization/components/visual-viewer/visual-viewer.service.ts
@@ -1104,17 +1104,22 @@ export class VisualViewerService implements OnDestroy {
       this.windowRef.document
         .getElementsByTagName('head')[0]
         .appendChild(script);
-      script.onload = () => {
+
+      (this.windowRef.document as any).onUi5Bootstrapped = () => {
         subscriber.next();
         subscriber.complete();
       };
+
       script.onerror = (error: any) => {
         subscriber.error(error);
         subscriber.complete();
       };
+
       script.id = 'sap-ui-bootstrap';
       script.type = 'text/javascript';
       script.setAttribute('data-sap-ui-compatVersion', 'edge');
+      script.setAttribute('data-sap-ui-async', 'true');
+      script.setAttribute('data-sap-ui-onInit', 'document.onUi5Bootstrapped()');
       script.src = ui5Config.bootstrapUrl;
     });
   }
diff --git a/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts b/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
index 9ae2ced1fef..507699ae820 100644
--- a/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
+++ b/integration-libs/epd-visualization/root/testing/epd-visualization-test-config.ts
@@ -14,8 +14,7 @@ export function getTestConfig(): EpdVisualizationConfig {
           'https://epd-acc-eu20-consumer.epdacc.cfapps.eu20.hana.ondemand.com',
       },
       ui5: {
-        bootstrapUrl:
-          'https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js',
+        bootstrapUrl: 'https://ui5.sap.com/1.108/resources/sap-ui-core.js',
       },
     },
   };
diff --git a/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap b/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
index c3cf97a731b..085cdda13ba 100644
--- a/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
+++ b/integration-libs/epd-visualization/schematics/add-epd-visualization/__snapshots__/index_spec.ts.snap
@@ -22,7 +22,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule } from "@spartacus/e
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
+        bootstrapUrl: "https://ui5.sap.com/1.108/resources/sap-ui-core.js"
       },
 
       apis: {
@@ -58,7 +58,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule } from "@spartacus/e
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
+        bootstrapUrl: "https://ui5.sap.com/1.108/resources/sap-ui-core.js"
       },
 
       apis: {
@@ -100,7 +100,7 @@ import { EpdVisualizationConfig, EpdVisualizationRootModule, EPD_VISUALIZATION_F
   provideConfig(<EpdVisualizationConfig>{
     epdVisualization: {
       ui5: {
-        bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
+        bootstrapUrl: "https://ui5.sap.com/1.108/resources/sap-ui-core.js"
       },
 
       apis: {
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
index b8e6de53fc3..943b883e4c3 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/epd-schematics-config.ts
@@ -75,7 +75,7 @@ function buildCdsConfig(
       content: `<${EPD_VISUALIZATION_CONFIG}>{
         epdVisualization: {
           ui5: {
-            bootstrapUrl: "https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js"
+            bootstrapUrl: "https://ui5.sap.com/1.108/resources/sap-ui-core.js"
           },
 
           apis: {
diff --git a/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
index 9c246c62d90..779932076bf 100644
--- a/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/epd-visualization/epd-visualization-feature.module.ts
@@ -24,8 +24,7 @@ const epdVisualizationConfig: EpdVisualizationConfig = {
     },
 
     ui5: {
-      bootstrapUrl:
-        'https://sapui5.hana.ondemand.com/1.108.14/resources/sap-ui-core.js',
+      bootstrapUrl: 'https://ui5.sap.com/1.108/resources/sap-ui-core.js',
     },
   },
 };

From b91ba8e7dff021bcc31a8f2478ea3c18a8f76241 Mon Sep 17 00:00:00 2001
From: Florent Letendre <florent.letendre01@sap.com>
Date: Thu, 3 Aug 2023 13:36:48 -0400
Subject: [PATCH 097/122] fix: mini cart stuck with value 0 (#17718)

CXSPA-4142

'totalUnitCount' property is now part of cart and savedCart requests parameters
---
 .../cart/base/occ/adapters/default-occ-cart-config.ts       | 6 +++---
 .../saved-cart/occ/config/default-occ-saved-cart-config.ts  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts b/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts
index 3da024ba3b9..53fb6ab7c76 100644
--- a/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts
+++ b/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts
@@ -12,10 +12,10 @@ export const defaultOccCartConfig: OccConfig = {
       endpoints: {
         /* eslint-disable max-len */
         carts:
-          'users/${userId}/carts?fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description)',
-        cart: 'users/${userId}/carts/${cartId}?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description',
+          'users/${userId}/carts?fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description)',
+        cart: 'users/${userId}/carts/${cartId}?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description',
         createCart:
-          'users/${userId}/carts?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user',
+          'users/${userId}/carts?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user',
         addEntries: 'users/${userId}/carts/${cartId}/entries',
         updateEntries: 'users/${userId}/carts/${cartId}/entries/${entryNumber}',
         removeEntries: 'users/${userId}/carts/${cartId}/entries/${entryNumber}',
diff --git a/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts b/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts
index ead8067453a..dd3ece8c564 100644
--- a/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts
+++ b/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts
@@ -11,7 +11,7 @@ export const defaultOccSavedCartConfig: OccConfig = {
     occ: {
       endpoints: {
         savedCarts:
-          '/users/${userId}/carts?savedCartsOnly=true&fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),saveTime,user,name,description)',
+          '/users/${userId}/carts?savedCartsOnly=true&fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),saveTime,user,name,description)',
         savedCart: '/users/${userId}/carts/${cartId}/savedcart',
         restoreSavedCart: '/users/${userId}/carts/${cartId}/restoresavedcart',
         cloneSavedCart:

From ce69fafafffed31e228c05a614e13bbc712aac53 Mon Sep 17 00:00:00 2001
From: Radhep Sabapathipillai <34665674+RadhepS@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:22:26 -0400
Subject: [PATCH 098/122] fix: modify install script to now correctly install
 spartacus versions for features (#3568)

CXSPA-3568

Modify install script to now correctly install spartacus versions for features
---
 scripts/install/functions.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/install/functions.sh b/scripts/install/functions.sh
index e1cd7ec6c2c..43ec075e050 100644
--- a/scripts/install/functions.sh
+++ b/scripts/install/functions.sh
@@ -94,7 +94,11 @@ function create_shell_app {
 function add_b2b {
     if [ "${ADD_B2B_LIBS}" = true ] ; then
         ng add @spartacus/organization@${SPARTACUS_VERSION} --skip-confirmation --no-interactive
+
+        ng add @spartacus/checkout@${SPARTACUS_VERSION} --skip-confirmation --no-interactive
         ng add @spartacus/checkout --skip-confirmation --no-interactive --features "Checkout-B2B" --features "Checkout-Scheduled-Replenishment"
+
+        ng add @spartacus/product@${SPARTACUS_VERSION} --skip-confirmation
         ng add @spartacus/product --skip-confirmation --no-interactive --features "Future-Stock"
     fi
 }
@@ -107,7 +111,7 @@ function add_cdc {
 
 function add_epd_visualization {
     if [ "$ADD_EPD_VISUALIZATION" = true ] ; then
-        ng add @spartacus/epd-visualization --base-url ${EPD_VISUALIZATION_BASE_URL} --skip-confirmation --no-interactive
+        ng add @spartacus/epd-visualization@${SPARTACUS_VERSION} --base-url ${EPD_VISUALIZATION_BASE_URL} --skip-confirmation --no-interactive
     fi
 }
 
@@ -128,7 +132,9 @@ function add_s4om {
 
 # Don't install b2b features here (use add_b2b function for that)
 function add_feature_libs {
+  ng add @spartacus/tracking@${SPARTACUS_VERSION} --skip-confirmation --no-interactive
   ng add @spartacus/tracking --skip-confirmation --no-interactive --features "TMS-GTM" --features "TMS-AEPL"
+  
   ng add @spartacus/qualtrics@${SPARTACUS_VERSION} --skip-confirmation --no-interactive
   ng add @spartacus/customer-ticketing --skip-confirmation --no-interactive
   ng add @spartacus/pickup-in-store --skip-confirmation --no-interactive

From 85fb1412c705806de6280a4dadcc5f9ca6f7a076 Mon Sep 17 00:00:00 2001
From: morganm58 <mikel.morgan@sap.com>
Date: Mon, 7 Aug 2023 10:51:38 -0400
Subject: [PATCH 099/122] styling: fix padding and border color in checkout
 cards for 6.4.x (#17691)

---
 .../components/steps/delivery-address/_delivery-address.scss | 1 +
 .../base/styles/components/steps/review/_review.scss         | 5 +++++
 .../storefrontstyles/scss/components/misc/card/_card.scss    | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss b/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
index fd939b1dbf0..5727aa81ff4 100644
--- a/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
+++ b/feature-libs/checkout/base/styles/components/steps/delivery-address/_delivery-address.scss
@@ -12,6 +12,7 @@
 
     @include media-breakpoint-down(md) {
       background-color: var(--cx-color-transparent);
+      padding-top: 1.5rem;
     }
 
     cx-address-form {
diff --git a/feature-libs/checkout/base/styles/components/steps/review/_review.scss b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
index 6f99fa4db36..bba2d112f23 100644
--- a/feature-libs/checkout/base/styles/components/steps/review/_review.scss
+++ b/feature-libs/checkout/base/styles/components/steps/review/_review.scss
@@ -65,6 +65,7 @@
 
       @include forVersion(6.3) {
         flex-grow: 1;
+        border: 1px solid var(--cx-color-medium);
       }
 
       @include media-breakpoint-up(md) {
@@ -106,6 +107,10 @@
       border-radius: 10px;
       flex-grow: 1;
 
+      @include forVersion(6.3) {
+        border: 1px solid var(--cx-color-medium);
+      }
+
       @include media-breakpoint-up(md) {
         &:first-child {
           margin-top: 0px;
diff --git a/projects/storefrontstyles/scss/components/misc/card/_card.scss b/projects/storefrontstyles/scss/components/misc/card/_card.scss
index 1599c5e3c88..96febe5009d 100644
--- a/projects/storefrontstyles/scss/components/misc/card/_card.scss
+++ b/projects/storefrontstyles/scss/components/misc/card/_card.scss
@@ -1,6 +1,10 @@
 %cx-card {
   .cx-card-border {
     border: 1px solid var(--cx-color-light);
+
+    @include forVersion(6.3) {
+      border: 1px solid var(--cx-color-medium);
+    }
   }
 
   .cx-card-container {

From 6aff2854d843dacec367329bbdf4fa92da15e252 Mon Sep 17 00:00:00 2001
From: Scar Ai <38693320+scarai-sap@users.noreply.github.com>
Date: Wed, 9 Aug 2023 14:42:53 +0800
Subject: [PATCH 100/122] fix: when asm login, it changed the logged in user to
 anonymous (#17738)

---
 .../services/csagent-auth.service.spec.ts     | 16 ++++---
 .../asm/root/services/csagent-auth.service.ts | 47 +++++++++++++++----
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/feature-libs/asm/root/services/csagent-auth.service.spec.ts b/feature-libs/asm/root/services/csagent-auth.service.spec.ts
index e534e5a478a..846706340e8 100644
--- a/feature-libs/asm/root/services/csagent-auth.service.spec.ts
+++ b/feature-libs/asm/root/services/csagent-auth.service.spec.ts
@@ -4,12 +4,12 @@ import {
   AuthActions,
   AuthService,
   AuthToken,
+  FeatureConfigService,
   OAuthLibWrapperService,
   OCC_USER_ID_ANONYMOUS,
   OCC_USER_ID_CURRENT,
   UserIdService,
 } from '@spartacus/core';
-import { UserProfileFacade } from '@spartacus/user/profile/root';
 import { TokenResponse } from 'angular-oauth2-oidc';
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -20,6 +20,7 @@ import {
   TokenTarget,
 } from '../services/asm-auth-storage.service';
 import { CsAgentAuthService } from './csagent-auth.service';
+import { UserAccountFacade } from '@spartacus/user/account/root';
 
 class MockAuthService implements Partial<AuthService> {
   logout() {}
@@ -34,7 +35,7 @@ class MockOAuthLibWrapperService implements Partial<OAuthLibWrapperService> {
   }
 }
 
-class MockUserProfileFacade implements Partial<UserProfileFacade> {
+class MockUserAccountFacade implements Partial<UserAccountFacade> {
   get() {
     return of({});
   }
@@ -47,7 +48,8 @@ describe('CsAgentAuthService', () => {
   let authService: AuthService;
   let asmAuthStorageService: AsmAuthStorageService;
   let oAuthLibWrapperService: OAuthLibWrapperService;
-  let userProfileFacade: UserProfileFacade;
+  let userAccountFacade: UserAccountFacade;
+  let featureConfig: FeatureConfigService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -63,7 +65,7 @@ describe('CsAgentAuthService', () => {
           provide: OAuthLibWrapperService,
           useClass: MockOAuthLibWrapperService,
         },
-        { provide: UserProfileFacade, useClass: MockUserProfileFacade },
+        { provide: UserAccountFacade, useClass: MockUserAccountFacade },
       ],
     });
 
@@ -72,7 +74,8 @@ describe('CsAgentAuthService', () => {
     authService = TestBed.inject(AuthService);
     asmAuthStorageService = TestBed.inject(AsmAuthStorageService);
     oAuthLibWrapperService = TestBed.inject(OAuthLibWrapperService);
-    userProfileFacade = TestBed.inject(UserProfileFacade);
+    userAccountFacade = TestBed.inject(UserAccountFacade);
+    featureConfig = TestBed.inject(FeatureConfigService);
     store = TestBed.inject(Store);
   });
 
@@ -117,9 +120,10 @@ describe('CsAgentAuthService', () => {
       ).and.callThrough();
       spyOn(userIdService, 'setUserId').and.callThrough();
       spyOn(asmAuthStorageService, 'setEmulatedUserToken').and.callThrough();
-      spyOn(userProfileFacade, 'get').and.returnValue(
+      spyOn(userAccountFacade, 'get').and.returnValue(
         of({ customerId: 'custId' })
       );
+      spyOn(featureConfig, 'isLevel').and.returnValue(true);
       asmAuthStorageService.setToken({ access_token: 'token' } as AuthToken);
 
       await service.authorizeCustomerSupportAgent('testUser', 'testPass');
diff --git a/feature-libs/asm/root/services/csagent-auth.service.ts b/feature-libs/asm/root/services/csagent-auth.service.ts
index 81cb22397e3..c5f2c537463 100644
--- a/feature-libs/asm/root/services/csagent-auth.service.ts
+++ b/feature-libs/asm/root/services/csagent-auth.service.ts
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, Optional } from '@angular/core';
 import { Store } from '@ngrx/store';
 import {
   AuthActions,
   AuthService,
   AuthToken,
+  FeatureConfigService,
   OAuthLibWrapperService,
   OCC_USER_ID_ANONYMOUS,
   OCC_USER_ID_CURRENT,
@@ -20,6 +21,7 @@ import { UserProfileFacade } from '@spartacus/user/profile/root';
 import { combineLatest, Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { AsmAuthStorageService, TokenTarget } from './asm-auth-storage.service';
+import { UserAccountFacade } from '@spartacus/user/account/root';
 
 /**
  * Auth service for CS agent. Useful to login/logout agent, start emulation
@@ -29,13 +31,39 @@ import { AsmAuthStorageService, TokenTarget } from './asm-auth-storage.service';
   providedIn: 'root',
 })
 export class CsAgentAuthService {
+  constructor(
+    authService: AuthService,
+    authStorageService: AsmAuthStorageService,
+    userIdService: UserIdService,
+    oAuthLibWrapperService: OAuthLibWrapperService,
+    store: Store,
+    // Consider delete it in 7.0
+    _userProfileFacade: UserProfileFacade,
+    userAccountFacade: UserAccountFacade
+  );
+  /**
+   * @deprecated since 7.0
+   */
+  constructor(
+    authService: AuthService,
+    authStorageService: AsmAuthStorageService,
+    userIdService: UserIdService,
+    oAuthLibWrapperService: OAuthLibWrapperService,
+    store: Store,
+    userProfileFacade: UserProfileFacade,
+    userAccountFacade: UserAccountFacade,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    featureConfig: FeatureConfigService
+  );
   constructor(
     protected authService: AuthService,
     protected authStorageService: AsmAuthStorageService,
     protected userIdService: UserIdService,
     protected oAuthLibWrapperService: OAuthLibWrapperService,
     protected store: Store,
-    protected userProfileFacade: UserProfileFacade
+    protected userProfileFacade: UserProfileFacade,
+    protected userAccountFacade: UserAccountFacade,
+    @Optional() protected featureConfig?: FeatureConfigService
   ) {}
 
   /**
@@ -48,6 +76,15 @@ export class CsAgentAuthService {
     password: string
   ): Promise<void> {
     let userToken: AuthToken | undefined;
+    // Start emulation for currently logged in user
+    let customerId: string | undefined;
+    if (this.featureConfig?.isLevel('6.4')) {
+      this.userAccountFacade
+        .get()
+        .subscribe((user) => (customerId = user?.customerId))
+        .unsubscribe();
+    }
+
     this.authStorageService
       .getToken()
       .subscribe((token) => (userToken = token))
@@ -59,12 +96,6 @@ export class CsAgentAuthService {
         userId,
         password
       );
-      // Start emulation for currently logged in user
-      let customerId: string | undefined;
-      this.userProfileFacade
-        .get()
-        .subscribe((user) => (customerId = user?.customerId))
-        .unsubscribe();
       this.store.dispatch(new AuthActions.Logout());
 
       if (customerId !== undefined && userToken !== undefined) {

From 9df9704d6939139de12d5f5024a1d683b955d4aa Mon Sep 17 00:00:00 2001
From: i333055 <lulu.ran@sap.com>
Date: Thu, 10 Aug 2023 13:56:59 +0800
Subject: [PATCH 101/122] fix: CXSPA-4080 css style fix for inactive cart
 dailog (#17745)

---
 .../asm-save-cart-dialog.component.html       | 18 ++++++----
 .../_asm-save-cart-dialog.component.scss      | 34 ++++++++-----------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
index e6e9e602a7c..36969cc272c 100644
--- a/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
+++ b/feature-libs/asm/components/asm-save-cart-dialog/asm-save-cart-dialog.component.html
@@ -38,31 +38,37 @@ <h2 id="asm-save-cart-dialog-title" class="title modal-title">
 
       <div class="cx-dialog-content">
         <div class="cx-dialog-row row">
-          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-left-text"
+          >
             {{ 'asm.saveCart.dialog.row.id' | cxTranslate }}
           </div>
           <div
-            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+            class="cx-dialog-item col-sm-6 col-md-6 text-left item-right-text"
           >
             {{ cart.code }}
           </div>
         </div>
         <div class="cx-dialog-row row">
-          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-left-text"
+          >
             {{ 'asm.saveCart.dialog.row.qty' | cxTranslate }}
           </div>
           <div
-            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+            class="cx-dialog-item col-sm-6 col-md-6 text-left item-right-text"
           >
             {{ cartQty }}
           </div>
         </div>
         <div class="cx-dialog-row row">
-          <div class="cx-dialog-item col-sm-6 col-md-6 item-left-text">
+          <div
+            class="cx-dialog-item col-sm-6 col-md-6 text-right item-left-text"
+          >
             {{ 'asm.saveCart.dialog.row.total' | cxTranslate }}
           </div>
           <div
-            class="cx-dialog-item col-sm-6 col-md-6 text-right item-right-text"
+            class="cx-dialog-item col-sm-6 col-md-6 text-left item-right-text"
           >
             {{ cart.totalPriceWithTax?.formattedValue }}
           </div>
diff --git a/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss
index 80fe3e96e70..9dfa1e2ab98 100644
--- a/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss
+++ b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss
@@ -120,30 +120,26 @@ $sapFiori_Button_Emphasized_Active_BorderColor: #0070f2;
     min-height: 137px;
 
     .cx-dialog-content {
-      margin: 0px 60px 30px 60px;
+      margin: 10px 60px 0px 60px;
 
       .item-left-text {
-        width: 27px;
-        height: 22px;
-        font-family: 'Open Sans';
-        font-style: normal;
+        font-family: 72;
+        font-size: 14px;
         font-weight: 400;
-        font-size: 16px;
-        line-height: 22px;
-        color: #14293a;
-        padding: 15px;
+        line-height: 16px;
+        letter-spacing: 0px;
+        color: #556b82;
+        padding: 5px;
       }
+
       .item-right-text {
-        width: 93px;
-        height: 25px;
-        font-family: 'Open Sans';
-        font-style: normal;
-        font-weight: 700;
-        font-size: 18px;
-        line-height: 25px;
-        text-transform: capitalize;
-        color: #14293a;
-        padding: 15px;
+        font-family: 72;
+        font-size: 14px;
+        font-weight: 400;
+        line-height: 16px;
+        letter-spacing: 0px;
+        color: #131e29;
+        padding: 5px;
       }
     }
   }

From 06068a08ec672d6f9d4c31c54882747b439abe7c Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Thu, 10 Aug 2023 14:44:18 +0530
Subject: [PATCH 102/122] feat: CXINT-1850: Requested Delivery Date feature
 library (#17598)

---
 .env-cmdrc                                    |  10 +-
 core-libs/setup/tsconfig.spec.json            |  15 +
 extra-webpack.config.js                       |   9 +-
 feature-libs/asm/tsconfig.schematics.json     |  15 +
 .../base/root/models/cart-outlets.model.ts    |   2 +
 feature-libs/cart/tsconfig.schematics.json    |  15 +
 .../checkout-review-submit.component.html     |  31 +-
 .../checkout-review-submit.module.ts          |   2 +
 .../checkout-delivery-mode.component.html     |  10 +
 .../checkout-delivery-mode.component.spec.ts  |  10 +
 .../checkout-delivery-mode.module.ts          |   3 +-
 .../checkout-review-submit.component.html     |  31 +-
 .../checkout/tsconfig.schematics.json         |  15 +
 .../tsconfig.schematics.json                  |  15 +
 .../order-overview.component.html             |  27 +
 .../order-overview.component.ts               |   8 +-
 feature-libs/order/tsconfig.schematics.json   |  15 +
 .../organization/tsconfig.schematics.json     |  15 +
 .../pickup-in-store/tsconfig.lib.json         |  14 +-
 .../pickup-in-store/tsconfig.schematics.json  |  15 +
 .../product-configurator/tsconfig.lib.json    |  84 +--
 .../tsconfig.schematics.json                  |  15 +
 feature-libs/product/tsconfig.schematics.json |  15 +
 .../qualtrics/tsconfig.schematics.json        |  15 +
 .../requested-delivery-date/.eslintrc.json    |   4 +
 .../requested-delivery-date/README.md         |   3 +
 .../requested-delivery-date/_index.scss       |   2 +
 .../assets/ng-package.json                    |   6 +
 .../assets/public_api.ts                      |   7 +
 .../assets/translations/en/index.ts           |  11 +
 .../en/requested-delivery-date.ts             |  14 +
 .../assets/translations/translations.ts       |  17 +
 .../core/connectors/index.ts                  |   8 +
 .../requested-delivery-date.adapter.ts        |  18 +
 .../requested-delivery-date.connector.spec.ts |  56 ++
 .../requested-delivery-date.connector.ts      |  24 +
 ...d-delivery-date-badrequest.handler.spec.ts |  64 +++
 ...uested-delivery-date-badrequest.handler.ts |  49 ++
 .../core/http-interceptors/index.ts           |   7 +
 .../core/ng-package.json                      |   6 +
 .../core/public_api.ts                        |  10 +
 .../requested-delivery-date-core.module.ts    |  30 +
 .../core/services/index.ts                    |   7 +
 .../requested-delivery-date.service.spec.ts   |  61 ++
 .../requested-delivery-date.service.ts        |  34 ++
 .../jest.schematics.config.js                 |  36 ++
 .../requested-delivery-date/karma.conf.js     |  50 ++
 .../requested-delivery-date/ng-package.json   |   8 +
 .../occ/adapters/index.ts                     |   7 +
 ...cc-requested-delivery-date.adapter.spec.ts | 107 ++++
 .../occ-requested-delivery-date.adapter.ts    |  45 ++
 ...ault-occ-requested-delivery-date-config.ts |  18 +
 .../occ/model/index.ts                        |   8 +
 ...requested-delivery-date-endpoints.model.ts |  18 +
 .../occ/ng-package.json                       |   6 +
 .../requested-delivery-date/occ/public_api.ts |   9 +
 .../occ/requested-delivery-date-occ.module.ts |  24 +
 .../requested-delivery-date/package.json      |  45 ++
 .../requested-delivery-date/project.json      |  40 ++
 .../requested-delivery-date/public_api.ts     |  10 +
 .../requested-delivery-date.module.ts         |  15 +
 .../delivery-mode-date-picker.component.html  |  30 +
 ...elivery-mode-date-picker.component.spec.ts | 286 +++++++++
 .../delivery-mode-date-picker.component.ts    | 154 +++++
 .../root/components/index.ts                  |   9 +
 ...rder-overview-delivery-date.component.html |   8 +
 ...r-overview-delivery-date.component.spec.ts |  69 +++
 .../order-overview-delivery-date.component.ts |  64 +++
 ...quested-delivery-date-components.module.ts |  32 ++
 .../shared/date-validation.service.spec.ts    |  35 ++
 .../shared/date-validation.service.ts         |  28 +
 .../root/facade/index.ts                      |   7 +
 .../facade/requested-delivery-date.facade.ts  |  33 ++
 .../root/feature-name.ts                      |   8 +
 .../root/model/augmented-core.model.ts        |  21 +
 .../root/model/index.ts                       |   8 +
 .../root/ng-package.json                      |   6 +
 .../root/public_api.ts                        |  12 +
 .../requested-delivery-date-root.module.ts    |  51 ++
 .../schematics/.gitignore                     |  18 +
 .../__snapshots__/index_spec.ts.snap          | 130 +++++
 .../add-requested-delivery-date/index.ts      |  46 ++
 .../add-requested-delivery-date/index_spec.ts | 181 ++++++
 .../add-requested-delivery-date/schema.json   |  31 +
 .../schematics/collection.json                |  18 +
 .../requested-delivery-date/setup-jest.ts     |   8 +
 .../styles/_index.scss                        |   1 +
 .../styles/_requested-delivery-date.scss      |  25 +
 feature-libs/requested-delivery-date/test.ts  |  22 +
 .../requested-delivery-date/tsconfig.lib.json | 124 ++++
 .../tsconfig.lib.prod.json                    |  11 +
 .../tsconfig.schematics.json                  | 541 ++++++++++++++++++
 .../tsconfig.spec.json                        |  14 +
 .../smartedit/tsconfig.schematics.json        |  15 +
 .../storefinder/tsconfig.schematics.json      |  15 +
 .../tracking/tsconfig.schematics.json         |  15 +
 feature-libs/user/tsconfig.schematics.json    |  15 +
 integration-libs/cdc/tsconfig.lib.json        |  29 +-
 integration-libs/cdc/tsconfig.schematics.json |  15 +
 integration-libs/cds/tsconfig.schematics.json |  15 +
 .../digital-payments/tsconfig.lib.json        |  82 +--
 .../digital-payments/tsconfig.schematics.json |  15 +
 .../tsconfig.schematics.json                  |  15 +
 integration-libs/s4om/package.json            |   1 +
 .../s4om/root/s4om-root.module.ts             |   6 +-
 .../s4om/schematics/add-s4om/schema.json      |  13 +-
 integration-libs/s4om/tsconfig.lib.json       |  46 +-
 .../s4om/tsconfig.schematics.json             |  15 +
 .../segment-refs/tsconfig.schematics.json     |  15 +
 package.json                                  |   5 +-
 projects/schematics/package.json              |   2 +
 .../schematics/src/add-spartacus/schema.json  |   5 +
 projects/schematics/src/dependencies.json     |  15 +
 ...quested-delivery-date-schematics-config.ts |  66 +++
 .../schematics/src/shared/libs-constants.ts   |   6 +
 .../src/shared/schematics-config-mappings.ts  |   8 +-
 .../src/shared/utils/graph-utils_spec.ts      |   3 +
 .../schematics/src/shared/utils/test-utils.ts |   2 +
 .../requested-delivery-date.e2e.cy.ts         | 168 ++++++
 .../vendor/s4om/s4om-schedule-lines.e2e.cy.ts |  26 +-
 .../cypress/helpers/b2b/b2b-checkout.ts       |  15 +-
 .../requested-delivery-date.ts                | 173 ++++++
 .../cypress/helpers/vendor/s4om/s4om.ts       | 272 +++++++--
 projects/storefrontapp/project.json           |   4 +
 .../requested-delivery-date-feature.module.ts |  40 ++
 .../spartacus/spartacus-features.module.ts    |   8 +-
 .../src/environments/environment.prod.ts      |   1 +
 .../src/environments/environment.ts           |   1 +
 .../models/build.process.env.d.ts             |   1 +
 .../environments/models/environment.model.ts  |   1 +
 .../styles/lib-requested-delivery-date.scss   |   2 +
 projects/storefrontapp/tsconfig.app.prod.json |  13 +
 projects/storefrontapp/tsconfig.server.json   |  15 +
 .../storefrontapp/tsconfig.server.prod.json   |  15 +
 tools/schematics/testing.ts                   |   3 +
 tsconfig.compodoc.json                        |  15 +
 tsconfig.json                                 | 225 +++-----
 137 files changed, 4414 insertions(+), 344 deletions(-)
 create mode 100644 feature-libs/requested-delivery-date/.eslintrc.json
 create mode 100644 feature-libs/requested-delivery-date/README.md
 create mode 100644 feature-libs/requested-delivery-date/_index.scss
 create mode 100644 feature-libs/requested-delivery-date/assets/ng-package.json
 create mode 100644 feature-libs/requested-delivery-date/assets/public_api.ts
 create mode 100644 feature-libs/requested-delivery-date/assets/translations/en/index.ts
 create mode 100644 feature-libs/requested-delivery-date/assets/translations/en/requested-delivery-date.ts
 create mode 100644 feature-libs/requested-delivery-date/assets/translations/translations.ts
 create mode 100644 feature-libs/requested-delivery-date/core/connectors/index.ts
 create mode 100644 feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.adapter.ts
 create mode 100644 feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.ts
 create mode 100644 feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.ts
 create mode 100644 feature-libs/requested-delivery-date/core/http-interceptors/index.ts
 create mode 100644 feature-libs/requested-delivery-date/core/ng-package.json
 create mode 100644 feature-libs/requested-delivery-date/core/public_api.ts
 create mode 100644 feature-libs/requested-delivery-date/core/requested-delivery-date-core.module.ts
 create mode 100644 feature-libs/requested-delivery-date/core/services/index.ts
 create mode 100644 feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.ts
 create mode 100644 feature-libs/requested-delivery-date/jest.schematics.config.js
 create mode 100644 feature-libs/requested-delivery-date/karma.conf.js
 create mode 100644 feature-libs/requested-delivery-date/ng-package.json
 create mode 100644 feature-libs/requested-delivery-date/occ/adapters/index.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/config/default-occ-requested-delivery-date-config.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/model/index.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/model/occ-requested-delivery-date-endpoints.model.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/ng-package.json
 create mode 100644 feature-libs/requested-delivery-date/occ/public_api.ts
 create mode 100644 feature-libs/requested-delivery-date/occ/requested-delivery-date-occ.module.ts
 create mode 100644 feature-libs/requested-delivery-date/package.json
 create mode 100644 feature-libs/requested-delivery-date/project.json
 create mode 100644 feature-libs/requested-delivery-date/public_api.ts
 create mode 100644 feature-libs/requested-delivery-date/requested-delivery-date.module.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.html
 create mode 100644 feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/index.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.html
 create mode 100644 feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/requested-delivery-date-components.module.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
 create mode 100644 feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
 create mode 100644 feature-libs/requested-delivery-date/root/facade/index.ts
 create mode 100644 feature-libs/requested-delivery-date/root/facade/requested-delivery-date.facade.ts
 create mode 100644 feature-libs/requested-delivery-date/root/feature-name.ts
 create mode 100644 feature-libs/requested-delivery-date/root/model/augmented-core.model.ts
 create mode 100644 feature-libs/requested-delivery-date/root/model/index.ts
 create mode 100644 feature-libs/requested-delivery-date/root/ng-package.json
 create mode 100644 feature-libs/requested-delivery-date/root/public_api.ts
 create mode 100644 feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
 create mode 100644 feature-libs/requested-delivery-date/schematics/.gitignore
 create mode 100644 feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/__snapshots__/index_spec.ts.snap
 create mode 100644 feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index.ts
 create mode 100644 feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index_spec.ts
 create mode 100644 feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/schema.json
 create mode 100644 feature-libs/requested-delivery-date/schematics/collection.json
 create mode 100644 feature-libs/requested-delivery-date/setup-jest.ts
 create mode 100644 feature-libs/requested-delivery-date/styles/_index.scss
 create mode 100644 feature-libs/requested-delivery-date/styles/_requested-delivery-date.scss
 create mode 100644 feature-libs/requested-delivery-date/test.ts
 create mode 100644 feature-libs/requested-delivery-date/tsconfig.lib.json
 create mode 100644 feature-libs/requested-delivery-date/tsconfig.lib.prod.json
 create mode 100644 feature-libs/requested-delivery-date/tsconfig.schematics.json
 create mode 100644 feature-libs/requested-delivery-date/tsconfig.spec.json
 create mode 100644 projects/schematics/src/shared/lib-configs/requested-delivery-date-schematics-config.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
 create mode 100644 projects/storefrontapp/src/app/spartacus/features/requested-delivery-date/requested-delivery-date-feature.module.ts
 create mode 100644 projects/storefrontapp/src/styles/lib-requested-delivery-date.scss

diff --git a/.env-cmdrc b/.env-cmdrc
index 32dd9037fe6..a8bec18cc0b 100644
--- a/.env-cmdrc
+++ b/.env-cmdrc
@@ -46,9 +46,13 @@
     "CX_B2B": "true"
   },
   "s4om": {
-    "CX_BASE_URL": "https://backoffice.c2twgq1sul-sapcxteam1-d11-public.model-t.myhybris.cloud",
-    "CX_CDC": "false",
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_B2B": "true",
-    "CX_S4OM": "true"
+    "CX_S4OM": "true",
+    "CX_REQUESTED_DELIVERY_DATE": "true"
+  },
+  "requested-delivery-date": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
+    "CX_REQUESTED_DELIVERY_DATE": "true"
   }
 }
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 825c5531f0f..a186e6ab397 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -375,6 +375,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/extra-webpack.config.js b/extra-webpack.config.js
index 23568878b1d..663f036087e 100644
--- a/extra-webpack.config.js
+++ b/extra-webpack.config.js
@@ -42,6 +42,10 @@ module.exports = {
       '@spartacus/asm': path.join(__dirname, 'feature-libs/asm'),
       '@spartacus/smartedit': path.join(__dirname, 'feature-libs/smartedit'),
       '@spartacus/qualtrics': path.join(__dirname, 'feature-libs/qualtrics'),
+      '@spartacus/requested-delivery-date': path.join(
+        __dirname,
+        'feature-libs/requested-delivery-date'
+      ),
       '@spartacus/tracking': path.join(__dirname, 'feature-libs/tracking'),
       '@spartacus/cart': path.join(__dirname, 'feature-libs/cart'),
       '@spartacus/order': path.join(__dirname, 'feature-libs/order'),
@@ -53,7 +57,10 @@ module.exports = {
         __dirname,
         'feature-libs/customer-ticketing'
       ),
-      '@spartacus/pickup-in-store': path.join(__dirname, 'feature-libs/pickup-in-store'),
+      '@spartacus/pickup-in-store': path.join(
+        __dirname,
+        'feature-libs/pickup-in-store'
+      ),
       '@spartacus/s4om': path.join(__dirname, 'integration-libs/s4om'),
     },
   },
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/cart/base/root/models/cart-outlets.model.ts b/feature-libs/cart/base/root/models/cart-outlets.model.ts
index 5f819a5ddaf..c07b2245d29 100644
--- a/feature-libs/cart/base/root/models/cart-outlets.model.ts
+++ b/feature-libs/cart/base/root/models/cart-outlets.model.ts
@@ -19,4 +19,6 @@ export enum CartOutlets {
   ADD_TO_CART_CONTAINER = 'cx-add-to-cart-container',
   PICKUP_INFO = 'cx-pickup-info',
   ADD_TO_CART_PICKUP_OPTION = 'cx-add-to-cart-pickup-option',
+  DELIVERY_MODE = 'cx-delivery-mode',
+  ORDER_OVERVIEW = 'cx-order-overview',
 }
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
index 323fceabfdd..ade77552529 100644
--- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
+++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
@@ -131,10 +131,33 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
   <!-- DELIVERY MODE SECTION -->
   <ng-template #deliveryMode>
     <div class="cx-review-summary-card cx-review-card-shipping">
-      <cx-card
-        *ngIf="deliveryMode$ | async as deliveryMode"
-        [content]="getDeliveryModeCard(deliveryMode) | async"
-      ></cx-card>
+      <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+      <ng-container *cxFeatureLevel="'!6.4'">
+        <cx-card
+          *ngIf="deliveryMode$ | async as deliveryMode"
+          [content]="getDeliveryModeCard(deliveryMode) | async"
+        >
+        </cx-card>
+      </ng-container>
+      <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+      <ng-container *cxFeatureLevel="'6.4'">
+        <div>
+          <cx-card
+            *ngIf="deliveryMode$ | async as deliveryMode"
+            [content]="getDeliveryModeCard(deliveryMode) | async"
+          >
+          </cx-card>
+          <ng-template
+            [cxOutlet]="cartOutlets.DELIVERY_MODE"
+            [cxOutletContext]="{
+              item: cart$ | async,
+              readonly: true
+            }"
+          >
+          </ng-template>
+        </div>
+      </ng-container>
+
       <div class="cx-review-summary-edit-step">
         <a
           [attr.aria-label]="'checkoutReview.editDeliveryMode' | cxTranslate"
diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.module.ts b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.module.ts
index 1b28257e700..8737f21f82d 100644
--- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.module.ts
+++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.module.ts
@@ -13,6 +13,7 @@ import {
 } from '@spartacus/checkout/base/components';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
   UrlModule,
@@ -35,6 +36,7 @@ import { B2BCheckoutReviewSubmitComponent } from './checkout-review-submit.compo
     PromotionsModule,
     IconModule,
     OutletModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
index 1553670bcd4..e16d6be3480 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
@@ -48,6 +48,16 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
         </label>
       </div>
     </div>
+    <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+    <ng-container *cxFeatureLevel="'6.4'">
+      <ng-template
+        [cxOutlet]="CartOutlets.DELIVERY_MODE"
+        [cxOutletContext]="{
+          item: activeCartFacade.getActive() | async
+        }"
+      >
+      </ng-template>
+    </ng-container>
   </div>
 </ng-container>
 
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
index 5d4201668e9..595d94d5356 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts
@@ -5,6 +5,7 @@ import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import {
   ActiveCartFacade,
+  Cart,
   DeliveryMode,
   OrderEntry,
 } from '@spartacus/cart/base/root';
@@ -60,6 +61,14 @@ class MockCheckoutStepService implements Partial<CheckoutStepService> {
   getBackBntText = createSpy().and.returnValue('common.back');
 }
 
+const mockCart: Cart = {
+  code: '123456789',
+  description: 'testCartDescription',
+  name: 'testCartName',
+};
+
+const cart$ = new BehaviorSubject<Cart>(mockCart);
+
 const mockActivatedRoute = {
   snapshot: {
     url: ['checkout', 'delivery-mode'],
@@ -91,6 +100,7 @@ class MockCartService implements Partial<ActiveCartFacade> {
   getDeliveryEntries = () => deliveryEntries$.asObservable();
   hasPickupItems = () => hasPickupItems$.asObservable();
   getPickupEntries = createSpy().and.returnValue(of([]));
+  getActive = () => cart$.asObservable();
 }
 
 class MockGlobalMessageService implements Partial<GlobalMessageService> {
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
index 3698ddc6c7f..994f76717ed 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.module.ts
@@ -9,9 +9,9 @@ import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import {
   CmsConfig,
+  FeaturesConfigModule,
   I18nModule,
   provideDefaultConfig,
-  FeaturesConfigModule,
 } from '@spartacus/core';
 import {
   OutletModule,
@@ -31,6 +31,7 @@ import { CheckoutDeliveryModeComponent } from './checkout-delivery-mode.componen
     OutletModule,
     PageComponentModule,
     FeaturesConfigModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{
diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
index 102d635a15a..af9615ad854 100644
--- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
+++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
@@ -58,10 +58,33 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
   <!-- DELIVERY MODE SECTION -->
   <ng-template #deliveryMode>
     <div class="cx-review-summary-card cx-review-card-shipping">
-      <cx-card
-        *ngIf="deliveryMode$ | async as deliveryMode"
-        [content]="getDeliveryModeCard(deliveryMode) | async"
-      ></cx-card>
+      <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+      <ng-container *cxFeatureLevel="'!6.4'">
+        <cx-card
+          *ngIf="deliveryMode$ | async as deliveryMode"
+          [content]="getDeliveryModeCard(deliveryMode) | async"
+        >
+        </cx-card>
+      </ng-container>
+      <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+      <ng-container *cxFeatureLevel="'6.4'">
+        <div>
+          <cx-card
+            *ngIf="deliveryMode$ | async as deliveryMode"
+            [content]="getDeliveryModeCard(deliveryMode) | async"
+          >
+          </cx-card>
+          <ng-template
+            [cxOutlet]="cartOutlets.DELIVERY_MODE"
+            [cxOutletContext]="{
+              item: cart$ | async,
+              readonly: true
+            }"
+          >
+          </ng-template>
+        </div>
+      </ng-container>
+
       <div class="cx-review-summary-edit-step">
         <a
           [attr.aria-label]="'checkoutReview.editDeliveryMode' | cxTranslate"
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 517a64516d3..bc2b2041ba7 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -385,6 +385,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.html b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
index 83b381ab9be..4d850012f8c 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.html
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
@@ -38,6 +38,15 @@
               ) | async
             "
           ></cx-card>
+
+          <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+          <ng-container *cxFeatureLevel="'6.4'">
+            <ng-template
+              [cxOutlet]="cartOutlets.ORDER_OVERVIEW"
+              [cxOutletContext]="{ item: order, readonly: true }"
+            >
+            </ng-template>
+          </ng-container>
         </div>
       </ng-container>
 
@@ -56,6 +65,15 @@
           <cx-card
             [content]="getOrderStatusCardContent(order.statusDisplay) | async"
           ></cx-card>
+
+          <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+          <ng-container *cxFeatureLevel="'6.4'">
+            <ng-template
+              [cxOutlet]="cartOutlets.ORDER_OVERVIEW"
+              [cxOutletContext]="{ item: order, readonly: true }"
+            >
+            </ng-template>
+          </ng-container>
         </div>
       </ng-template>
 
@@ -153,6 +171,15 @@
         <cx-card
           [content]="getOrderStatusCardContent(order.statusDisplay) | async"
         ></cx-card>
+
+        <!-- TODO:(CXINT-2309) for next major release remove feature level -->
+        <ng-container *cxFeatureLevel="'6.4'">
+          <ng-template
+            [cxOutlet]="cartOutlets.ORDER_OVERVIEW"
+            [cxOutletContext]="{ item: order, readonly: true }"
+          >
+          </ng-template>
+        </ng-container>
       </div>
       <cx-order-detail-billing></cx-order-detail-billing>
     </div>
diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
index f7a18ddc2ba..7a212ab8311 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts
@@ -5,7 +5,11 @@
  */
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { DeliveryMode, PaymentDetails } from '@spartacus/cart/base/root';
+import {
+  CartOutlets,
+  DeliveryMode,
+  PaymentDetails,
+} from '@spartacus/cart/base/root';
 import {
   Address,
   CmsOrderDetailOverviewComponent,
@@ -23,6 +27,8 @@ import { OrderDetailsService } from '../order-details.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class OrderOverviewComponent {
+  readonly cartOutlets = CartOutlets;
+
   order$: Observable<any> = this.orderDetailsService.getOrderDetails();
   isOrderLoading$: Observable<boolean> =
     typeof this.orderDetailsService.isOrderDetailsLoading === 'function'
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/pickup-in-store/tsconfig.lib.json b/feature-libs/pickup-in-store/tsconfig.lib.json
index 55e1a18086a..371a4445768 100644
--- a/feature-libs/pickup-in-store/tsconfig.lib.json
+++ b/feature-libs/pickup-in-store/tsconfig.lib.json
@@ -62,6 +62,12 @@
       "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
       "@spartacus/core": ["dist/core"],
+      "@spartacus/order/assets": ["dist/order/assets"],
+      "@spartacus/order/components": ["dist/order/components"],
+      "@spartacus/order/core": ["dist/order/core"],
+      "@spartacus/order": ["dist/order"],
+      "@spartacus/order/occ": ["dist/order/occ"],
+      "@spartacus/order/root": ["dist/order/root"],
       "@spartacus/storefinder/assets": ["dist/storefinder/assets"],
       "@spartacus/storefinder/components": ["dist/storefinder/components"],
       "@spartacus/storefinder/core": ["dist/storefinder/core"],
@@ -81,13 +87,7 @@
       "@spartacus/user/profile/core": ["dist/user/profile/core"],
       "@spartacus/user/profile": ["dist/user/profile"],
       "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
-      "@spartacus/user/profile/root": ["dist/user/profile/root"],
-      "@spartacus/order/assets": ["dist/order/assets"],
-      "@spartacus/order/components": ["dist/order/components"],
-      "@spartacus/order/core": ["dist/order/core"],
-      "@spartacus/order": ["dist/order"],
-      "@spartacus/order/occ": ["dist/order/occ"],
-      "@spartacus/order/root": ["dist/order/root"]
+      "@spartacus/user/profile/root": ["dist/user/profile/root"]
     },
     "strict": true
   },
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index 4e68f07aa60..a6671c2be12 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -388,6 +388,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/product-configurator/tsconfig.lib.json b/feature-libs/product-configurator/tsconfig.lib.json
index 367e3b22560..8bd6f6883a6 100644
--- a/feature-libs/product-configurator/tsconfig.lib.json
+++ b/feature-libs/product-configurator/tsconfig.lib.json
@@ -15,48 +15,6 @@
     "types": [],
     "lib": ["es2020", "dom"],
     "paths": {
-      "@spartacus/checkout": ["dist/checkout"],
-      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
-      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
-      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
-      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
-      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
-      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
-      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
-      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
-      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
-      "@spartacus/checkout/base": ["dist/checkout/base"],
-      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
-      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
-      "@spartacus/checkout/scheduled-replenishment/assets": [
-        "dist/checkout/scheduled-replenishment/assets"
-      ],
-      "@spartacus/checkout/scheduled-replenishment/components": [
-        "dist/checkout/scheduled-replenishment/components"
-      ],
-      "@spartacus/checkout/scheduled-replenishment": [
-        "dist/checkout/scheduled-replenishment"
-      ],
-      "@spartacus/checkout/scheduled-replenishment/root": [
-        "dist/checkout/scheduled-replenishment/root"
-      ],
-      "@spartacus/core": ["dist/core"],
-      "@spartacus/storefront": ["dist/storefrontlib"],
-      "@spartacus/order/assets": ["dist/order/assets"],
-      "@spartacus/order/components": ["dist/order/components"],
-      "@spartacus/order/core": ["dist/order/core"],
-      "@spartacus/order": ["dist/order"],
-      "@spartacus/order/occ": ["dist/order/occ"],
-      "@spartacus/order/root": ["dist/order/root"],
-      "@spartacus/cart/import-export/assets": [
-        "dist/cart/import-export/assets"
-      ],
-      "@spartacus/cart/import-export/components": [
-        "dist/cart/import-export/components"
-      ],
-      "@spartacus/cart/import-export/core": ["dist/cart/import-export/core"],
-      "@spartacus/cart/import-export": ["dist/cart/import-export"],
-      "@spartacus/cart/import-export/root": ["dist/cart/import-export/root"],
       "@spartacus/cart/base/assets": ["dist/cart/base/assets"],
       "@spartacus/cart/base/components/add-to-cart": [
         "dist/cart/base/components/add-to-cart"
@@ -69,6 +27,15 @@
       "@spartacus/cart/base": ["dist/cart/base"],
       "@spartacus/cart/base/occ": ["dist/cart/base/occ"],
       "@spartacus/cart/base/root": ["dist/cart/base/root"],
+      "@spartacus/cart/import-export/assets": [
+        "dist/cart/import-export/assets"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "dist/cart/import-export/components"
+      ],
+      "@spartacus/cart/import-export/core": ["dist/cart/import-export/core"],
+      "@spartacus/cart/import-export": ["dist/cart/import-export"],
+      "@spartacus/cart/import-export/root": ["dist/cart/import-export/root"],
       "@spartacus/cart": ["dist/cart"],
       "@spartacus/cart/quick-order/assets": ["dist/cart/quick-order/assets"],
       "@spartacus/cart/quick-order/components": [
@@ -95,6 +62,39 @@
       "@spartacus/cart/wish-list/core": ["dist/cart/wish-list/core"],
       "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
+      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
+      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
+      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
+      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
+      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
+      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
+      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
+      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
+      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
+      "@spartacus/checkout/base": ["dist/checkout/base"],
+      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
+      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
+      "@spartacus/checkout": ["dist/checkout"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "dist/checkout/scheduled-replenishment/assets"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "dist/checkout/scheduled-replenishment/components"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "dist/checkout/scheduled-replenishment"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "dist/checkout/scheduled-replenishment/root"
+      ],
+      "@spartacus/core": ["dist/core"],
+      "@spartacus/order/assets": ["dist/order/assets"],
+      "@spartacus/order/components": ["dist/order/components"],
+      "@spartacus/order/core": ["dist/order/core"],
+      "@spartacus/order": ["dist/order"],
+      "@spartacus/order/occ": ["dist/order/occ"],
+      "@spartacus/order/root": ["dist/order/root"],
+      "@spartacus/storefront": ["dist/storefrontlib"],
       "@spartacus/user/account/assets": ["dist/user/account/assets"],
       "@spartacus/user/account/components": ["dist/user/account/components"],
       "@spartacus/user/account/core": ["dist/user/account/core"],
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/requested-delivery-date/.eslintrc.json b/feature-libs/requested-delivery-date/.eslintrc.json
new file mode 100644
index 00000000000..862b5a870b0
--- /dev/null
+++ b/feature-libs/requested-delivery-date/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../.eslintrc.json",
+  "ignorePatterns": ["schematics/**/*.d.ts"]
+}
diff --git a/feature-libs/requested-delivery-date/README.md b/feature-libs/requested-delivery-date/README.md
new file mode 100644
index 00000000000..6e061e29cb4
--- /dev/null
+++ b/feature-libs/requested-delivery-date/README.md
@@ -0,0 +1,3 @@
+# Requested Delivery Date
+
+Requested Delivery Date allows customers to provide a delivery date for which the item would be needed. The minimum date would be fetched from the S/4 HANA system and used along with the Order.
diff --git a/feature-libs/requested-delivery-date/_index.scss b/feature-libs/requested-delivery-date/_index.scss
new file mode 100644
index 00000000000..86f72a0df42
--- /dev/null
+++ b/feature-libs/requested-delivery-date/_index.scss
@@ -0,0 +1,2 @@
+@import '@spartacus/styles/scss/core';
+@import './styles/index';
diff --git a/feature-libs/requested-delivery-date/assets/ng-package.json b/feature-libs/requested-delivery-date/assets/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/requested-delivery-date/assets/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/requested-delivery-date/assets/public_api.ts b/feature-libs/requested-delivery-date/assets/public_api.ts
new file mode 100644
index 00000000000..f3d8f426ab4
--- /dev/null
+++ b/feature-libs/requested-delivery-date/assets/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './translations/translations';
diff --git a/feature-libs/requested-delivery-date/assets/translations/en/index.ts b/feature-libs/requested-delivery-date/assets/translations/en/index.ts
new file mode 100644
index 00000000000..6e31c96fd7b
--- /dev/null
+++ b/feature-libs/requested-delivery-date/assets/translations/en/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { requestedDeliveryDate } from './requested-delivery-date';
+
+export const en = {
+  requestedDeliveryDate,
+};
diff --git a/feature-libs/requested-delivery-date/assets/translations/en/requested-delivery-date.ts b/feature-libs/requested-delivery-date/assets/translations/en/requested-delivery-date.ts
new file mode 100644
index 00000000000..6d89369eac5
--- /dev/null
+++ b/feature-libs/requested-delivery-date/assets/translations/en/requested-delivery-date.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const requestedDeliveryDate = {
+  requestedDeliveryDate: {
+    datePickerLabel: 'Request Delivery Date',
+    readOnlyTextLabel: 'Requested Delivery Date',
+    successMessage: 'Delivery Date updated successfully.',
+    errorMessage: 'Something went wrong. Unable to update the requested date.',
+  },
+};
diff --git a/feature-libs/requested-delivery-date/assets/translations/translations.ts b/feature-libs/requested-delivery-date/assets/translations/translations.ts
new file mode 100644
index 00000000000..ceded4e2c21
--- /dev/null
+++ b/feature-libs/requested-delivery-date/assets/translations/translations.ts
@@ -0,0 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TranslationChunksConfig, TranslationResources } from '@spartacus/core';
+import { en } from './en/index';
+
+export const requestedDeliveryDateTranslations: TranslationResources = {
+  en,
+};
+
+export const requestedDeliveryDateTranslationChunksConfig: TranslationChunksConfig =
+  {
+    requestedDeliveryDate: ['requestedDeliveryDate'],
+  };
diff --git a/feature-libs/requested-delivery-date/core/connectors/index.ts b/feature-libs/requested-delivery-date/core/connectors/index.ts
new file mode 100644
index 00000000000..aa0d3a7fbe4
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/connectors/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './requested-delivery-date.adapter';
+export * from './requested-delivery-date.connector';
diff --git a/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.adapter.ts b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.adapter.ts
new file mode 100644
index 00000000000..0fb381574a7
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.adapter.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Observable } from 'rxjs';
+
+export abstract class RequestedDeliveryDateAdapter {
+  /**
+   * Abstract method used to set the requested delivery date for a cart entry
+   */
+  abstract setRequestedDeliveryDate(
+    userId: string,
+    cartId: string,
+    requestedDate: string
+  ): Observable<{}>;
+}
diff --git a/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.spec.ts b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.spec.ts
new file mode 100644
index 00000000000..4fe26a9ab56
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.spec.ts
@@ -0,0 +1,56 @@
+import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { RequestedDeliveryDateAdapter } from './requested-delivery-date.adapter';
+import { RequestedDeliveryDateConnector } from './requested-delivery-date.connector';
+import createSpy = jasmine.createSpy;
+
+const mockUserId = 'userId1';
+const mockCartId = '00012345';
+const mockRequestedDate = '15-09-2023';
+
+class MockRequestedDeliveryDateAdapter
+  implements Partial<RequestedDeliveryDateAdapter>
+{
+  setRequestedDeliveryDate = createSpy(
+    'RequestedDeliveryDateAdapter.setRequestedDeliveryDate'
+  ).and.callFake((_userId: string, _cartId: string, _date: Date) => of());
+}
+
+describe('RequestedDeliveryDateConnector', () => {
+  let service: RequestedDeliveryDateConnector;
+  let adapter: RequestedDeliveryDateAdapter;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        RequestedDeliveryDateConnector,
+        {
+          provide: RequestedDeliveryDateAdapter,
+          useClass: MockRequestedDeliveryDateAdapter,
+        },
+      ],
+    });
+
+    service = TestBed.inject(RequestedDeliveryDateConnector);
+    adapter = TestBed.inject(RequestedDeliveryDateAdapter);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('setRequestedDeliveryDate should call adapter', () => {
+    let result;
+    service
+      .setRequestedDeliveryDate(mockUserId, mockCartId, mockRequestedDate)
+      .pipe(take(1))
+      .subscribe((res) => (result = res));
+    expect(result).toBeUndefined();
+    expect(adapter.setRequestedDeliveryDate).toHaveBeenCalledWith(
+      mockUserId,
+      mockCartId,
+      mockRequestedDate
+    );
+  });
+});
diff --git a/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.ts b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.ts
new file mode 100644
index 00000000000..e9b8359ad9a
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/connectors/requested-delivery-date.connector.ts
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { RequestedDeliveryDateAdapter } from './requested-delivery-date.adapter';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RequestedDeliveryDateConnector {
+  constructor(protected adapter: RequestedDeliveryDateAdapter) {}
+
+  public setRequestedDeliveryDate(
+    userId: string,
+    cartId: string,
+    requestedDate: string
+  ): Observable<{}> {
+    return this.adapter.setRequestedDeliveryDate(userId, cartId, requestedDate);
+  }
+}
diff --git a/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.spec.ts b/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.spec.ts
new file mode 100644
index 00000000000..edb25e19df4
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.spec.ts
@@ -0,0 +1,64 @@
+import { HttpErrorResponse, HttpRequest } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import {
+  GlobalMessageService,
+  GlobalMessageType,
+  HttpResponseStatus,
+} from '@spartacus/core';
+import { RequestedDeliveryDateBadRequestHandler } from './requested-delivery-date-badrequest.handler';
+
+class MockGlobalMessageService {
+  add() {}
+}
+
+const MockRequest = {} as HttpRequest<any>;
+
+const MockRDDBadRequestResponse = {
+  error: {
+    errors: [
+      {
+        message: 'checkout.multi.requestedretrievaldatevalid.error',
+        type: 'ValidationError',
+      },
+    ],
+  },
+} as HttpErrorResponse;
+
+describe('RequestedDeliveryDateBadRequestHandler', () => {
+  let service: RequestedDeliveryDateBadRequestHandler;
+  let globalMessageService: GlobalMessageService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        RequestedDeliveryDateBadRequestHandler,
+        {
+          provide: GlobalMessageService,
+          useClass: MockGlobalMessageService,
+        },
+      ],
+    });
+    service = TestBed.inject(RequestedDeliveryDateBadRequestHandler);
+    globalMessageService = TestBed.inject(GlobalMessageService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should register 400 responseStatus ', () => {
+    expect(service.responseStatus).toEqual(HttpResponseStatus.BAD_REQUEST);
+  });
+
+  it('should handle wrong date bad request', () => {
+    spyOn(globalMessageService, 'add');
+    service.handleError(MockRequest, MockRDDBadRequestResponse);
+
+    expect(globalMessageService.add).toHaveBeenCalledWith(
+      {
+        key: 'requestedDeliveryDate.errorMessage',
+      },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+  });
+});
diff --git a/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.ts b/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.ts
new file mode 100644
index 00000000000..fdc07f28460
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/http-interceptors/bad-request/requested-delivery-date-badrequest.handler.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpErrorResponse, HttpRequest } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  ErrorModel,
+  GlobalMessageType,
+  HttpErrorHandler,
+  HttpResponseStatus,
+  Priority,
+} from '@spartacus/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class RequestedDeliveryDateBadRequestHandler extends HttpErrorHandler {
+  responseStatus = HttpResponseStatus.BAD_REQUEST;
+
+  hasMatch(errorResponse: HttpErrorResponse): boolean {
+    return (
+      super.hasMatch(errorResponse) && this.getErrors(errorResponse)?.length > 0
+    );
+  }
+
+  handleError(request: HttpRequest<any>, response: HttpErrorResponse) {
+    if (request && this.getErrors(response)?.length) {
+      this.globalMessageService.add(
+        { key: 'requestedDeliveryDate.errorMessage' },
+        GlobalMessageType.MSG_TYPE_ERROR
+      );
+    }
+  }
+
+  protected getErrors(response: HttpErrorResponse): ErrorModel[] {
+    return (response.error?.errors).filter(
+      (error: any) =>
+        error?.type === 'ValidationError' &&
+        error?.message === 'checkout.multi.requestedretrievaldatevalid.error'
+    );
+  }
+
+  getPriority(): Priority {
+    return Priority.NORMAL;
+  }
+}
diff --git a/feature-libs/requested-delivery-date/core/http-interceptors/index.ts b/feature-libs/requested-delivery-date/core/http-interceptors/index.ts
new file mode 100644
index 00000000000..59dc0b1a99d
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/http-interceptors/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './bad-request/requested-delivery-date-badrequest.handler';
diff --git a/feature-libs/requested-delivery-date/core/ng-package.json b/feature-libs/requested-delivery-date/core/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/requested-delivery-date/core/public_api.ts b/feature-libs/requested-delivery-date/core/public_api.ts
new file mode 100644
index 00000000000..68e7d9884cc
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './connectors';
+export * from './requested-delivery-date-core.module';
+export * from './services/index';
diff --git a/feature-libs/requested-delivery-date/core/requested-delivery-date-core.module.ts b/feature-libs/requested-delivery-date/core/requested-delivery-date-core.module.ts
new file mode 100644
index 00000000000..aba8955e922
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/requested-delivery-date-core.module.ts
@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { HttpErrorHandler } from '@spartacus/core';
+import { RequestedDeliveryDateFacade } from '@spartacus/requested-delivery-date/root';
+import { RequestedDeliveryDateConnector } from './connectors/requested-delivery-date.connector';
+import { RequestedDeliveryDateBadRequestHandler } from './http-interceptors/bad-request/requested-delivery-date-badrequest.handler';
+import { RequestedDeliveryDateService } from './services';
+
+@NgModule({
+  imports: [],
+  providers: [
+    RequestedDeliveryDateService,
+    {
+      provide: RequestedDeliveryDateFacade,
+      useExisting: RequestedDeliveryDateService,
+    },
+    {
+      provide: HttpErrorHandler,
+      useExisting: RequestedDeliveryDateBadRequestHandler,
+      multi: true,
+    },
+    RequestedDeliveryDateConnector,
+  ],
+})
+export class RequestedDeliveryDateCoreModule {}
diff --git a/feature-libs/requested-delivery-date/core/services/index.ts b/feature-libs/requested-delivery-date/core/services/index.ts
new file mode 100644
index 00000000000..ebfd31df225
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './requested-delivery-date.service';
diff --git a/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.spec.ts b/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.spec.ts
new file mode 100644
index 00000000000..ff56059dc10
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.spec.ts
@@ -0,0 +1,61 @@
+import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+import { RequestedDeliveryDateConnector } from '../connectors/requested-delivery-date.connector';
+import { RequestedDeliveryDateService } from './requested-delivery-date.service';
+
+import createSpy = jasmine.createSpy;
+
+const mockUserId = 'userId1';
+const mockCartId = '00012345';
+const mockRequestedDate = '15-09-2023';
+
+class MockRequestedDeliveryDateConnector
+  implements Partial<RequestedDeliveryDateConnector>
+{
+  setRequestedDeliveryDate = createSpy().and.callFake(() => of());
+}
+
+describe('RequestedDeliveryDateService', () => {
+  let service: RequestedDeliveryDateService;
+  let connector: RequestedDeliveryDateConnector;
+
+  describe('Current user', () => {
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        providers: [
+          RequestedDeliveryDateService,
+          {
+            provide: RequestedDeliveryDateConnector,
+            useClass: MockRequestedDeliveryDateConnector,
+          },
+        ],
+      });
+
+      service = TestBed.inject(RequestedDeliveryDateService);
+      connector = TestBed.inject(RequestedDeliveryDateConnector);
+    });
+
+    it('should be created', () => {
+      expect(service).toBeTruthy();
+    });
+
+    it('should set requested delivery date', () => {
+      let result;
+      service
+        .setRequestedDeliveryDate(mockUserId, mockCartId, mockRequestedDate)
+        .subscribe((data) => {
+          result = data;
+        })
+        .unsubscribe();
+      expect(result).toBeUndefined();
+    });
+
+    it('should call connector', () => {
+      service
+        .setRequestedDeliveryDate(mockUserId, mockCartId, mockRequestedDate)
+        .subscribe(() => {})
+        .unsubscribe();
+      expect(connector.setRequestedDeliveryDate).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.ts b/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.ts
new file mode 100644
index 00000000000..328968dd441
--- /dev/null
+++ b/feature-libs/requested-delivery-date/core/services/requested-delivery-date.service.ts
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { RequestedDeliveryDateFacade } from '@spartacus/requested-delivery-date/root';
+import { Observable } from 'rxjs';
+import { RequestedDeliveryDateConnector } from '../connectors/requested-delivery-date.connector';
+
+@Injectable()
+export class RequestedDeliveryDateService
+  implements RequestedDeliveryDateFacade
+{
+  /**
+   * Set requested delivery date
+   */
+  setRequestedDeliveryDate(
+    userId: string,
+    cartId: string,
+    requestedDate: string
+  ): Observable<{}> {
+    return this.requestedDeliveryDateConnector.setRequestedDeliveryDate(
+      userId,
+      cartId,
+      requestedDate
+    );
+  }
+
+  constructor(
+    protected requestedDeliveryDateConnector: RequestedDeliveryDateConnector
+  ) {}
+}
diff --git a/feature-libs/requested-delivery-date/jest.schematics.config.js b/feature-libs/requested-delivery-date/jest.schematics.config.js
new file mode 100644
index 00000000000..9d613f804c1
--- /dev/null
+++ b/feature-libs/requested-delivery-date/jest.schematics.config.js
@@ -0,0 +1,36 @@
+const { pathsToModuleNameMapper } = require('ts-jest');
+const { compilerOptions } = require('./tsconfig.schematics.json');
+const { defaultTransformerOptions } = require('jest-preset-angular/presets');
+
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'jest-preset-angular',
+  globalSetup: 'jest-preset-angular/global-setup',
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
+    prefix: '<rootDir>/',
+  }),
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
+  testMatch: ['**/+(*_)+(spec).+(ts)'],
+  transform: {
+    '^.+\\.(ts|js|mjs|html|svg)$': [
+      'jest-preset-angular',
+      {
+        ...defaultTransformerOptions,
+        tsconfig: '<rootDir>/tsconfig.schematics.json',
+      },
+    ],
+  },
+
+  collectCoverage: false,
+  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  coverageDirectory:
+    '<rootDir>/../../coverage/requested-delivery-date/schematics',
+  coverageThreshold: {
+    global: {
+      statements: 90,
+      branches: 90,
+      functions: 90,
+      lines: 90,
+    },
+  },
+};
diff --git a/feature-libs/requested-delivery-date/karma.conf.js b/feature-libs/requested-delivery-date/karma.conf.js
new file mode 100644
index 00000000000..e451c881c40
--- /dev/null
+++ b/feature-libs/requested-delivery-date/karma.conf.js
@@ -0,0 +1,50 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-parallel'),
+      require('karma-jasmine'),
+      require('karma-coverage'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    parallelOptions: {
+      executors: 2,
+      shardStrategy: 'round-robin',
+    },
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false,
+      },
+    },
+    reporters: ['progress', 'kjhtml', 'dots'],
+    coverageReporter: {
+      dir: require('path').join(
+        __dirname,
+        '../../coverage/requested-delivery-date'
+      ),
+      reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }],
+      check: {
+        global: {
+          statements: 90,
+          lines: 90,
+          branches: 75,
+          functions: 85,
+        },
+      },
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true,
+  });
+};
diff --git a/feature-libs/requested-delivery-date/ng-package.json b/feature-libs/requested-delivery-date/ng-package.json
new file mode 100644
index 00000000000..d12af3d785d
--- /dev/null
+++ b/feature-libs/requested-delivery-date/ng-package.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/requested-delivery-date",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  },
+  "assets": ["**/*.scss", "schematics/**/*.json", "schematics/**/*.js"]
+}
diff --git a/feature-libs/requested-delivery-date/occ/adapters/index.ts b/feature-libs/requested-delivery-date/occ/adapters/index.ts
new file mode 100644
index 00000000000..8b47daab834
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/adapters/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './occ-requested-delivery-date.adapter';
diff --git a/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.spec.ts b/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.spec.ts
new file mode 100644
index 00000000000..e65f66370c7
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.spec.ts
@@ -0,0 +1,107 @@
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import { HttpErrorModel, OccConfig, OccEndpoints } from '@spartacus/core';
+import { throwError } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { OccRequestedDeliveryDateAdapter } from './occ-requested-delivery-date.adapter';
+
+const mockUserId = 'userId1';
+const mockCartId = '00012345';
+const mockRequestedDate = '15-09-2023';
+
+const MockOccModuleConfig: OccConfig = {
+  backend: {
+    occ: {
+      baseUrl: '',
+      prefix: '',
+      endpoints: {
+        requestedDeliveryDate:
+          'users/${userId}/carts/${cartId}/requestedretrievaldate',
+      } as OccEndpoints,
+    },
+  },
+  context: {
+    baseSite: [''],
+  },
+};
+
+const mockValidationError = new HttpErrorResponse({
+  error: {
+    errors: [
+      {
+        message: 'checkout.multi.requestedretrievaldatevalid.error',
+        reason: 'invalid',
+        type: 'ValidationError',
+      },
+    ],
+  },
+});
+
+describe('OccRequestedDeliveryDateAdapter', () => {
+  let service: OccRequestedDeliveryDateAdapter;
+  let httpClient: HttpClient;
+  let httpMock: HttpTestingController;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        OccRequestedDeliveryDateAdapter,
+        { provide: OccConfig, useValue: MockOccModuleConfig },
+      ],
+    });
+    service = TestBed.inject(OccRequestedDeliveryDateAdapter);
+    httpClient = TestBed.inject(HttpClient);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe(`set requested delivery date`, () => {
+    it(`should set requested delivery date for cart for given user id, cart id`, (done) => {
+      service
+        .setRequestedDeliveryDate(mockUserId, mockCartId, mockRequestedDate)
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toEqual('');
+          done();
+        });
+
+      const mockReq = httpMock.expectOne((req) => {
+        return (
+          req.method === 'PUT' &&
+          req.url ===
+            `users/${mockUserId}/carts/${mockCartId}/requestedretrievaldate?requestedRetrievalAt=${mockRequestedDate}`
+        );
+      });
+
+      expect(mockReq.cancelled).toBeFalsy();
+      mockReq.flush('');
+      expect(mockReq.request.responseType).toEqual('json');
+    });
+
+    it(`should result in error when Validation Error is thrown`, () => {
+      spyOn(httpClient, 'put').and.returnValue(throwError(mockValidationError));
+
+      let result: HttpErrorModel | undefined;
+      const subscription = service
+        .setRequestedDeliveryDate(mockUserId, mockCartId, mockRequestedDate)
+        .pipe(take(1))
+        .subscribe({ error: (err: any) => (result = err) });
+
+      expect(result).toEqual(mockValidationError);
+
+      subscription.unsubscribe();
+    });
+  });
+});
diff --git a/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.ts b/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.ts
new file mode 100644
index 00000000000..6e484dd5ef5
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/adapters/occ-requested-delivery-date.adapter.ts
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  InterceptorUtil,
+  OccEndpointsService,
+  USE_CLIENT_TOKEN,
+} from '@spartacus/core';
+import { RequestedDeliveryDateAdapter } from '@spartacus/requested-delivery-date/core';
+
+@Injectable()
+export class OccRequestedDeliveryDateAdapter
+  implements RequestedDeliveryDateAdapter
+{
+  constructor(
+    protected http: HttpClient,
+    protected occEndpoints: OccEndpointsService
+  ) {}
+
+  setRequestedDeliveryDate(
+    userId: string,
+    cartId: string,
+    requestedRetrievalAt: string
+  ) {
+    let headers = new HttpHeaders({
+      'Content-Type': 'application/x-www-form-urlencoded',
+    });
+    headers = InterceptorUtil.createHeader(USE_CLIENT_TOKEN, true, headers);
+
+    const url = this.occEndpoints.buildUrl('requestedDeliveryDate', {
+      urlParams: {
+        userId,
+        cartId,
+      },
+      queryParams: { requestedRetrievalAt },
+    });
+
+    return this.http.put(url, { headers });
+  }
+}
diff --git a/feature-libs/requested-delivery-date/occ/config/default-occ-requested-delivery-date-config.ts b/feature-libs/requested-delivery-date/occ/config/default-occ-requested-delivery-date-config.ts
new file mode 100644
index 00000000000..df99c19a8be
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/config/default-occ-requested-delivery-date-config.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccConfig } from '@spartacus/core';
+
+export const defaultOccRequestedDeliveryDateConfig: OccConfig = {
+  backend: {
+    occ: {
+      endpoints: {
+        requestedDeliveryDate:
+          'users/${userId}/carts/${cartId}/requestedretrievaldate',
+      },
+    },
+  },
+};
diff --git a/feature-libs/requested-delivery-date/occ/model/index.ts b/feature-libs/requested-delivery-date/occ/model/index.ts
new file mode 100644
index 00000000000..5b7bb4ef8f5
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/model/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Imported for side effects (module augmentation)
+import './occ-requested-delivery-date-endpoints.model';
diff --git a/feature-libs/requested-delivery-date/occ/model/occ-requested-delivery-date-endpoints.model.ts b/feature-libs/requested-delivery-date/occ/model/occ-requested-delivery-date-endpoints.model.ts
new file mode 100644
index 00000000000..fdec787b0a2
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/model/occ-requested-delivery-date-endpoints.model.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccEndpoint } from '@spartacus/core';
+
+declare module '@spartacus/core' {
+  interface OccEndpoints {
+    /**
+     * Endpoint for requested delivery date
+     *
+     * @member {string}
+     */
+    requestedDeliveryDate?: string | OccEndpoint;
+  }
+}
diff --git a/feature-libs/requested-delivery-date/occ/ng-package.json b/feature-libs/requested-delivery-date/occ/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/requested-delivery-date/occ/public_api.ts b/feature-libs/requested-delivery-date/occ/public_api.ts
new file mode 100644
index 00000000000..0ca2932226d
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/public_api.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './adapters/index';
+export * from './model/index';
+export * from './requested-delivery-date-occ.module';
diff --git a/feature-libs/requested-delivery-date/occ/requested-delivery-date-occ.module.ts b/feature-libs/requested-delivery-date/occ/requested-delivery-date-occ.module.ts
new file mode 100644
index 00000000000..59c4a8808fd
--- /dev/null
+++ b/feature-libs/requested-delivery-date/occ/requested-delivery-date-occ.module.ts
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
+import { RequestedDeliveryDateAdapter } from '@spartacus/requested-delivery-date/core';
+import { OccRequestedDeliveryDateAdapter } from './adapters/occ-requested-delivery-date.adapter';
+import { defaultOccRequestedDeliveryDateConfig } from './config/default-occ-requested-delivery-date-config';
+
+@NgModule({
+  imports: [CommonModule],
+  providers: [
+    provideDefaultConfig(defaultOccRequestedDeliveryDateConfig),
+    {
+      provide: RequestedDeliveryDateAdapter,
+      useClass: OccRequestedDeliveryDateAdapter,
+    },
+  ],
+})
+export class RequestedDeliveryDateOccModule {}
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
new file mode 100644
index 00000000000..cbeacc85e4a
--- /dev/null
+++ b/feature-libs/requested-delivery-date/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "@spartacus/requested-delivery-date",
+  "version": "6.3.0-1",
+  "description": "Requested Delivery Date library for Spartacus",
+  "keywords": [
+    "spartacus",
+    "framework",
+    "storefront",
+    "requested-delivery-date"
+  ],
+  "homepage": "https://github.com/SAP/spartacus",
+  "repository": "https://github.com/SAP/spartacus/tree/develop/feature-libs/requested-delivery-date",
+  "license": "Apache-2.0",
+  "exports": {
+    ".": {
+      "sass": "./_index.scss"
+    }
+  },
+  "scripts": {
+    "build:schematics": "npm run clean:schematics && ../../node_modules/.bin/tsc -p ./tsconfig.schematics.json",
+    "clean:schematics": "../../node_modules/.bin/rimraf --glob \"schematics/**/*.js\" \"schematics/**/*.js.map\" \"schematics/**/*.d.ts\"",
+    "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
+  },
+  "dependencies": {
+    "tslib": "^2.4.0"
+  },
+  "peerDependencies": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@angular/forms": "^15.2.4",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "rxjs": "^6.6.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "schematics": "./schematics/collection.json"
+}
diff --git a/feature-libs/requested-delivery-date/project.json b/feature-libs/requested-delivery-date/project.json
new file mode 100644
index 00000000000..9d42bce5e90
--- /dev/null
+++ b/feature-libs/requested-delivery-date/project.json
@@ -0,0 +1,40 @@
+{
+  "name": "requested-delivery-date",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "feature-libs/requested-delivery-date",
+  "prefix": "cx",
+  "targets": {
+    "build": {
+      "executor": "./tools/build-lib:augmented-types",
+      "options": {
+        "tsConfig": "feature-libs/requested-delivery-date/tsconfig.lib.json",
+        "project": "feature-libs/requested-delivery-date/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "feature-libs/requested-delivery-date/tsconfig.lib.prod.json"
+        }
+      }
+    },
+    "test": {
+      "executor": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "feature-libs/requested-delivery-date/test.ts",
+        "tsConfig": "feature-libs/requested-delivery-date/tsconfig.spec.json",
+        "polyfills": ["zone.js", "zone.js/testing"],
+        "karmaConfig": "feature-libs/requested-delivery-date/karma.conf.js"
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "feature-libs/requested-delivery-date/**/*.ts",
+          "feature-libs/requested-delivery-date/**/*.html"
+        ]
+      }
+    }
+  },
+  "tags": ["type:feature"]
+}
diff --git a/feature-libs/requested-delivery-date/public_api.ts b/feature-libs/requested-delivery-date/public_api.ts
new file mode 100644
index 00000000000..1076e3d5a24
--- /dev/null
+++ b/feature-libs/requested-delivery-date/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Public API Surface of requested-delivery-date
+ */
+export * from './requested-delivery-date.module';
diff --git a/feature-libs/requested-delivery-date/requested-delivery-date.module.ts b/feature-libs/requested-delivery-date/requested-delivery-date.module.ts
new file mode 100644
index 00000000000..3f262129034
--- /dev/null
+++ b/feature-libs/requested-delivery-date/requested-delivery-date.module.ts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { RequestedDeliveryDateCoreModule } from '@spartacus/requested-delivery-date/core';
+import { RequestedDeliveryDateOccModule } from '@spartacus/requested-delivery-date/occ';
+
+@NgModule({
+  imports: [RequestedDeliveryDateCoreModule, RequestedDeliveryDateOccModule],
+})
+export class RequestedDeliveryDateModule {}
diff --git a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.html b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.html
new file mode 100644
index 00000000000..1429921411c
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.html
@@ -0,0 +1,30 @@
+<ng-container *ngIf="isEarliestRetrievalDatePresent()">
+  <ng-container *ngIf="isDatePickerReadOnly; else datePickerEnabled">
+    <cx-card
+      [content]="
+        getRequestedDeliveryDateCardContent(requestedRetrievalAt | cxDate)
+          | async
+      "
+    ></cx-card>
+  </ng-container>
+  <ng-template #datePickerEnabled>
+    <div class="form-check">
+      <form [formGroup]="form">
+        <label class="row">
+          <div class="pl-4 col-8">
+            {{ 'requestedDeliveryDate.datePickerLabel' | cxTranslate }}
+          </div>
+          <div class="col-4">
+            <cx-date-picker
+              [control]="$any(form.get('requestDeliveryDate'))"
+              [min]="earliestRetrievalAt"
+              [required]="true"
+              (update)="setRequestedDeliveryDate()"
+            >
+            </cx-date-picker>
+          </div>
+        </label>
+      </form>
+    </div>
+  </ng-template>
+</ng-container>
diff --git a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
new file mode 100644
index 00000000000..2341afccc78
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
@@ -0,0 +1,286 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  CxDatePipe,
+  EventService,
+  GlobalMessageService,
+  GlobalMessageType,
+  I18nTestingModule,
+  LanguageService,
+  TranslationService,
+} from '@spartacus/core';
+import {
+  Card,
+  CardModule,
+  DatePickerModule,
+  OutletContextData,
+} from '@spartacus/storefront';
+import { of, throwError } from 'rxjs';
+import { RequestedDeliveryDateFacade } from '../../facade/requested-delivery-date.facade';
+import { DeliveryModeDatePickerComponent } from './delivery-mode-date-picker.component';
+
+describe('DeliveryModeDatePickerComponent', () => {
+  let component: DeliveryModeDatePickerComponent;
+  let fixture: ComponentFixture<DeliveryModeDatePickerComponent>;
+
+  const requestedDelDateFacadeMock = {
+    setRequestedDeliveryDate: jasmine
+      .createSpy('setRequestedDeliveryDate')
+      .and.returnValue(of({})),
+  };
+
+  const mockedGlobalMessageService = {
+    add: () => {},
+    remove: () => {},
+  };
+
+  const mockLanguageService = {
+    getActive: () => of('en'),
+  };
+
+  const translationServiceMock = {
+    translate: jasmine
+      .createSpy('translate')
+      .and.returnValue(of('Delivery Date')),
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [DeliveryModeDatePickerComponent],
+      imports: [I18nTestingModule, DatePickerModule, CardModule],
+      providers: [
+        CxDatePipe,
+        EventService,
+        {
+          provide: RequestedDeliveryDateFacade,
+          useValue: requestedDelDateFacadeMock,
+        },
+        { provide: GlobalMessageService, useValue: mockedGlobalMessageService },
+        { provide: TranslationService, useValue: translationServiceMock },
+        { provide: LanguageService, useValue: mockLanguageService },
+        {
+          provide: OutletContextData,
+          useValue: {
+            context: undefined,
+          },
+        },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DeliveryModeDatePickerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.destroy();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('Render the component based on the Outlet Context readonly attribute', () => {
+    it('should display card with translated text when outlet context readonly attribute is true', () => {
+      const data = TestBed.inject(OutletContextData);
+      const isoDate = '2023-09-15';
+      const formattedDate = 'Sep 15, 2023';
+      data.context$ = of({
+        item: {
+          requestedRetrievalAt: isoDate,
+          earliestRetrievalAt: isoDate,
+        },
+        readonly: true,
+      });
+      const textTitle = 'Delivery Date';
+
+      component.ngOnInit();
+      fixture.detectChanges();
+
+      let card: Card = {};
+      component
+        .getRequestedDeliveryDateCardContent(isoDate)
+        .subscribe((result) => {
+          card = result;
+        });
+
+      const expectedCard: Card = {
+        text: [textTitle, isoDate],
+      };
+
+      expect(card).toBeTruthy();
+      expect(card).toEqual(expectedCard);
+
+      const cardElement = fixture.debugElement.query(
+        By.css('.cx-card-label:first-child')
+      )?.nativeElement;
+      const cardText = fixture.debugElement.query(
+        By.css('cx-card > div > div > div > div > div:nth-child(2) > div')
+      )?.nativeElement;
+
+      expect(cardElement.textContent).toContain(textTitle);
+      expect(cardText.textContent).toContain(formattedDate);
+    });
+
+    it('should display date picker component when outlet context readonly attribute is false', () => {
+      const data = TestBed.inject(OutletContextData);
+      const earliestDate = '2023-03-05';
+      const requestedDate = '2023-09-15';
+
+      data.context$ = of({
+        item: {
+          requestedRetrievalAt: requestedDate,
+          earliestRetrievalAt: earliestDate,
+        },
+        readonly: false,
+      });
+      const datePickerLab = 'requestedDeliveryDate.datePickerLabel';
+
+      component.ngOnInit();
+      fixture.detectChanges();
+
+      const datePickerLabelEl = fixture.debugElement.query(
+        By.css('form > label > div')
+      )?.nativeElement;
+      const datePickerEl = fixture.debugElement.query(
+        By.css('cx-date-picker')
+      )?.nativeElement;
+
+      expect(datePickerLabelEl.textContent).toContain(datePickerLab);
+      expect(datePickerEl.innerHTML).toContain('min="2023-03-05"');
+      expect(component['form'].get('requestDeliveryDate')?.value).toBeTruthy();
+    });
+  });
+
+  it('should initialize form with requestedRetrievalAt value', () => {
+    const requestedRetrievalAt = '2023-09-15';
+    component['cartEntry'] = {
+      requestedRetrievalAt,
+    } as any;
+    component.ngOnInit();
+    expect(component['form'].get('requestDeliveryDate')?.value).toEqual(
+      requestedRetrievalAt
+    );
+  });
+
+  it('should set requestedRetrievalAt with earliestRetrievalAt if requestedRetrievalAt is not present', () => {
+    const earliestRetrievalAt = '2023-09-15';
+    component['cartEntry'] = {
+      earliestRetrievalAt,
+      code: '123',
+      user: {
+        uid: 'current',
+      },
+    } as any;
+    component.ngOnInit();
+    expect(component['requestedRetrievalAt']).toEqual(earliestRetrievalAt);
+    expect(component['form'].get('requestDeliveryDate')?.value).toEqual(
+      earliestRetrievalAt
+    );
+    expect(
+      component['requestedDelDateFacade'].setRequestedDeliveryDate
+    ).toHaveBeenCalled();
+  });
+
+  it('should call setRequestedDeliveryDate when form value changes and show info message on success', (done) => {
+    spyOn(component['globalMessageService'], 'add');
+    const requestedRetrievalAt = '2023-05-03';
+    const earliestRetrievalAt = '2023-09-15';
+    const data = TestBed.inject(OutletContextData);
+    data.context$ = of({
+      item: {
+        requestedRetrievalAt,
+        earliestRetrievalAt,
+        code: '123',
+        user: {
+          uid: 'current',
+        },
+      },
+      readonly: false,
+    });
+
+    component.ngOnInit();
+    fixture.detectChanges();
+    const newRequestedRetrievalAt = '2023-09-15';
+    component['form'].patchValue({
+      requestDeliveryDate: newRequestedRetrievalAt,
+    });
+
+    //Manually trigger change event for date picker.
+    const event = new Event('update');
+    const datePickerEl: HTMLInputElement = fixture.debugElement.query(
+      By.css('cx-date-picker')
+    )?.nativeElement;
+    datePickerEl.dispatchEvent(event);
+
+    expect(
+      component['requestedDelDateFacade'].setRequestedDeliveryDate
+    ).toHaveBeenCalled();
+    component['requestedDelDateFacade']
+      .setRequestedDeliveryDate('current', '123', newRequestedRetrievalAt)
+      .subscribe(() => {
+        expect(component['globalMessageService'].add).toHaveBeenCalledWith(
+          { key: 'requestedDeliveryDate.successMessage' },
+          GlobalMessageType.MSG_TYPE_INFO
+        );
+        done();
+      });
+  });
+
+  it('should show error message when backend OCC API returns UnknownResourceError', (done) => {
+    spyOn(component['globalMessageService'], 'add');
+
+    component['requestedDelDateFacade'].setRequestedDeliveryDate = jasmine
+      .createSpy('setRequestedDeliveryDate')
+      .and.returnValue(
+        throwError({
+          error: {
+            errors: [
+              {
+                message:
+                  'There is no resource for path /occ/v2/powertools-spa/users/user.lname%40sap-cx.com/carts/0000003004/requestedretrievaldate',
+                type: 'UnknownResourceError',
+              },
+            ],
+          },
+        })
+      );
+
+    const earliestRetrievalAt = '2023-09-15';
+    component['cartEntry'] = {
+      earliestRetrievalAt,
+      code: '123',
+      user: {
+        uid: 'current',
+      },
+    } as any;
+    component.ngOnInit();
+    expect(component['requestedRetrievalAt']).toEqual(earliestRetrievalAt);
+    expect(component['form'].get('requestDeliveryDate')?.value).toEqual(
+      earliestRetrievalAt
+    );
+    expect(
+      component['requestedDelDateFacade'].setRequestedDeliveryDate
+    ).toHaveBeenCalled();
+
+    component['requestedDelDateFacade']
+      .setRequestedDeliveryDate('current', '123', earliestRetrievalAt)
+      .subscribe({
+        error: () => {
+          expect(component['globalMessageService'].add).toHaveBeenCalledWith(
+            { key: 'requestedDeliveryDate.errorMessage' },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+          done();
+        },
+      });
+  });
+
+  it('should unsubscribe from subscription on component destruction', () => {
+    spyOn(component['subscription'], 'unsubscribe');
+    component.ngOnDestroy();
+    expect(component['subscription'].unsubscribe).toHaveBeenCalled();
+  });
+});
diff --git a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
new file mode 100644
index 00000000000..5911eedb6fa
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
@@ -0,0 +1,154 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpErrorResponse } from '@angular/common/http';
+import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
+import { Cart } from '@spartacus/cart/base/root';
+import { CheckoutSupportedDeliveryModesQueryReloadEvent } from '@spartacus/checkout/base/root';
+import {
+  CxDatePipe,
+  ErrorModel,
+  EventService,
+  GlobalMessageService,
+  GlobalMessageType,
+  TranslationService,
+} from '@spartacus/core';
+import { Card, OutletContextData } from '@spartacus/storefront';
+import { Observable, Subscription } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+import { RequestedDeliveryDateFacade } from '../../facade/requested-delivery-date.facade';
+import { DateValidationService } from '../shared/date-validation.service';
+
+@Component({
+  selector: 'cx-request-delivery-date',
+  templateUrl: './delivery-mode-date-picker.component.html',
+  providers: [CxDatePipe],
+})
+export class DeliveryModeDatePickerComponent implements OnInit, OnDestroy {
+  constructor(
+    protected datePipe: CxDatePipe,
+    protected requestedDelDateFacade: RequestedDeliveryDateFacade,
+    protected dateValidationService: DateValidationService,
+    protected eventService: EventService,
+    protected translation: TranslationService,
+    protected globalMessageService: GlobalMessageService,
+    @Optional() protected deliveryOutlet?: OutletContextData
+  ) {}
+
+  protected cartEntry: Cart = {};
+  protected subscription = new Subscription();
+
+  protected earliestRetrievalAt: string | undefined;
+  protected requestedRetrievalAt: string | undefined;
+  protected form: FormGroup = new FormGroup({
+    requestDeliveryDate: new FormControl(),
+  });
+  protected isDatePickerReadOnly: boolean = true;
+
+  ngOnInit(): void {
+    if (this.deliveryOutlet?.context$) {
+      this.subscription.add(
+        this.deliveryOutlet.context$.subscribe((context) => {
+          this.cartEntry = context?.item;
+          this.isDatePickerReadOnly = context?.readonly || false;
+        })
+      );
+    }
+
+    if (this.isEarliestRetrievalDatePresent()) {
+      this.earliestRetrievalAt = this.cartEntry.earliestRetrievalAt;
+    }
+    if (this.isRequestedDeliveryDatePresent()) {
+      this.requestedRetrievalAt = this.cartEntry.requestedRetrievalAt;
+    } else {
+      //set the value of requestedRetrievalAt as earliestRetrievalAt and update occ.
+      this.requestedRetrievalAt = this.earliestRetrievalAt;
+      this.setRequestedDeliveryDate();
+    }
+    this.form.patchValue({
+      requestDeliveryDate: this.requestedRetrievalAt,
+    });
+  }
+
+  isEarliestRetrievalDatePresent(): boolean {
+    return this.dateValidationService.isDateStringValid(
+      this.cartEntry?.earliestRetrievalAt
+    );
+  }
+
+  isRequestedDeliveryDatePresent(): boolean {
+    return this.dateValidationService.isDateStringValid(
+      this.cartEntry?.requestedRetrievalAt
+    );
+  }
+
+  getRequestedDeliveryDateCardContent(
+    isoDate: string | null
+  ): Observable<Card> {
+    return this.translation
+      .translate('requestedDeliveryDate.readOnlyTextLabel')
+      .pipe(
+        filter(() => Boolean(isoDate)),
+        map((textTitle) => {
+          return {
+            text: [textTitle, isoDate],
+          } as Card;
+        })
+      );
+  }
+
+  setRequestedDeliveryDate() {
+    const userId = this.cartEntry?.user?.uid || '';
+    const cartId = this.cartEntry?.code || '';
+    const requestedDate =
+      this.form?.get('requestDeliveryDate')?.value ||
+      this.requestedRetrievalAt ||
+      '';
+
+    if (
+      userId.length === 0 ||
+      cartId.length === 0 ||
+      requestedDate.length === 0
+    ) {
+      return;
+    }
+    this.subscription.add(
+      this.requestedDelDateFacade
+        .setRequestedDeliveryDate(userId, cartId, requestedDate)
+        .subscribe({
+          next: () => {
+            this.eventService.dispatch(
+              {},
+              CheckoutSupportedDeliveryModesQueryReloadEvent
+            );
+            this.globalMessageService.add(
+              { key: 'requestedDeliveryDate.successMessage' },
+              GlobalMessageType.MSG_TYPE_INFO
+            );
+          },
+          error: (error: HttpErrorResponse) => {
+            if (error && this.getErrors(error)?.length) {
+              this.globalMessageService.add(
+                { key: 'requestedDeliveryDate.errorMessage' },
+                GlobalMessageType.MSG_TYPE_ERROR
+              );
+            }
+          },
+        })
+    );
+  }
+
+  getErrors(response: HttpErrorResponse): ErrorModel[] {
+    return (response.error?.errors).filter(
+      (error: any) => error?.type === 'UnknownResourceError'
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+}
diff --git a/feature-libs/requested-delivery-date/root/components/index.ts b/feature-libs/requested-delivery-date/root/components/index.ts
new file mode 100644
index 00000000000..d2c7af18ba0
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './delivery-mode-date-picker/delivery-mode-date-picker.component';
+export * from './order-overview-delivery-date/order-overview-delivery-date.component';
+export * from './requested-delivery-date-components.module';
diff --git a/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.html b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.html
new file mode 100644
index 00000000000..a85f0c6d637
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.html
@@ -0,0 +1,8 @@
+<ng-container *ngIf="order && isRequestedDeliveryDatePresent()">
+  <cx-card
+    [content]="
+      getRequestedDeliveryDateCardContent(order?.requestedRetrievalAt | cxDate)
+        | async
+    "
+  ></cx-card>
+</ng-container>
diff --git a/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.spec.ts b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.spec.ts
new file mode 100644
index 00000000000..9511956fff4
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.spec.ts
@@ -0,0 +1,69 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { I18nTestingModule, TranslationService } from '@spartacus/core';
+import { Card, OutletContextData } from '@spartacus/storefront';
+import { of } from 'rxjs';
+import { OrderOverviewDeliveryDateComponent } from './order-overview-delivery-date.component';
+
+describe('OrderOverviewDeliveryDateComponent', () => {
+  let component: OrderOverviewDeliveryDateComponent;
+  let fixture: ComponentFixture<OrderOverviewDeliveryDateComponent>;
+
+  const translationServiceMock = {
+    translate: jasmine
+      .createSpy('translate')
+      .and.returnValue(of('Translated Text')),
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [OrderOverviewDeliveryDateComponent],
+      imports: [I18nTestingModule],
+      providers: [
+        { provide: TranslationService, useValue: translationServiceMock },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrderOverviewDeliveryDateComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.destroy();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set order property when context changes', () => {
+    const order = { code: '123' } as any;
+    component['orderOutlet'] = {
+      context$: of({ item: order }),
+    } as OutletContextData<any>;
+    component.ngOnInit();
+    expect(component.order).toEqual(order);
+  });
+
+  it('should return card content with translated text and isoDate', () => {
+    const isoDate = '2022-01-01';
+    const expectedCard: Card = {
+      title: 'Translated Text',
+      text: [isoDate],
+    };
+
+    const result$ = component.getRequestedDeliveryDateCardContent(isoDate);
+
+    result$.subscribe((card) => {
+      expect(card).toEqual(expectedCard);
+    });
+  });
+
+  it('should unsubscribe from subscription on component destruction', () => {
+    spyOn(component['subscription'], 'unsubscribe');
+    component.ngOnDestroy();
+    expect(component['subscription'].unsubscribe).toHaveBeenCalled();
+  });
+});
diff --git a/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.ts b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.ts
new file mode 100644
index 00000000000..1520459a195
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/order-overview-delivery-date/order-overview-delivery-date.component.ts
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
+import { TranslationService } from '@spartacus/core';
+import { Order } from '@spartacus/order/root';
+import { Card, OutletContextData } from '@spartacus/storefront';
+import { Observable, Subscription } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+import { DateValidationService } from '../shared/date-validation.service';
+
+@Component({
+  selector: 'cx-order-overview-delivery-date',
+  templateUrl: './order-overview-delivery-date.component.html',
+})
+export class OrderOverviewDeliveryDateComponent implements OnInit, OnDestroy {
+  constructor(
+    protected dateValidationService: DateValidationService,
+    protected translation: TranslationService,
+    @Optional() protected orderOutlet?: OutletContextData
+  ) {}
+
+  protected subscription = new Subscription();
+  order: Order;
+
+  ngOnInit(): void {
+    if (this.orderOutlet?.context$) {
+      this.subscription.add(
+        this.orderOutlet.context$.subscribe(
+          (context) => (this.order = context?.item)
+        )
+      );
+    }
+  }
+
+  isRequestedDeliveryDatePresent(): boolean {
+    return this.dateValidationService.isDateStringValid(
+      this.order?.requestedRetrievalAt
+    );
+  }
+
+  getRequestedDeliveryDateCardContent(
+    isoDate: string | null
+  ): Observable<Card> {
+    return this.translation
+      .translate('requestedDeliveryDate.readOnlyTextLabel')
+      .pipe(
+        filter(() => Boolean(isoDate)),
+        map((textTitle) => {
+          return {
+            title: textTitle,
+            text: [isoDate],
+          } as Card;
+        })
+      );
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+}
diff --git a/feature-libs/requested-delivery-date/root/components/requested-delivery-date-components.module.ts b/feature-libs/requested-delivery-date/root/components/requested-delivery-date-components.module.ts
new file mode 100644
index 00000000000..a844ca1effc
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/requested-delivery-date-components.module.ts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { I18nModule } from '@spartacus/core';
+import { CardModule, DatePickerModule } from '@spartacus/storefront';
+import { DeliveryModeDatePickerComponent } from './delivery-mode-date-picker/delivery-mode-date-picker.component';
+import { OrderOverviewDeliveryDateComponent } from './order-overview-delivery-date/order-overview-delivery-date.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    DatePickerModule,
+    I18nModule,
+    ReactiveFormsModule,
+    CardModule,
+  ],
+  declarations: [
+    DeliveryModeDatePickerComponent,
+    OrderOverviewDeliveryDateComponent,
+  ],
+  exports: [
+    DeliveryModeDatePickerComponent,
+    OrderOverviewDeliveryDateComponent,
+  ],
+})
+export class RequestedDeliveryDateComponentsModule {}
diff --git a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
new file mode 100644
index 00000000000..5e947fcaca0
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
@@ -0,0 +1,35 @@
+import { TestBed } from '@angular/core/testing';
+import { DateValidationService } from './date-validation.service';
+
+const mockValidDate = '15-09-2023';
+const mockInvalidDate1 = '32-09-2023';
+const mockInvalidDate2 = '29-02-rddo';
+const mockInvalidDate3 = '';
+const mockInvalidDate4 = 'abcd';
+
+describe('DateValidationService', () => {
+  let service: DateValidationService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [DateValidationService],
+    });
+
+    service = TestBed.inject(DateValidationService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should validate correct Dates', () => {
+    expect(service.isDateStringValid(mockValidDate)).toBeTruthy();
+  });
+
+  it('should invalidate wrong Dates', () => {
+    expect(service.isDateStringValid(mockInvalidDate1)).toBeFalsy();
+    expect(service.isDateStringValid(mockInvalidDate2)).toBeFalsy();
+    expect(service.isDateStringValid(mockInvalidDate3)).toBeFalsy();
+    expect(service.isDateStringValid(mockInvalidDate4)).toBeFalsy();
+  });
+});
diff --git a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
new file mode 100644
index 00000000000..2410013bd29
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DateValidationService {
+  /**
+   * Validates if the string is containing a date string.
+   * @param value Date string in the format 'dd-mm-yyy'
+   * @returns true if valid, false if invalid
+   */
+  isDateStringValid(value: string | undefined): boolean {
+    return (
+      value != null &&
+      value !== undefined &&
+      value.length > 0 &&
+      !isNaN(
+        new Date(value.replace(/(\d{2})-(\d{2})-(\d{4})/, '$2/$1/$3')).getDate() //convert 'dd-mm-yyyy' into 'mm/dd/yyyy'
+      )
+    );
+  }
+}
diff --git a/feature-libs/requested-delivery-date/root/facade/index.ts b/feature-libs/requested-delivery-date/root/facade/index.ts
new file mode 100644
index 00000000000..e4a8bad6ac2
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/facade/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './requested-delivery-date.facade';
diff --git a/feature-libs/requested-delivery-date/root/facade/requested-delivery-date.facade.ts b/feature-libs/requested-delivery-date/root/facade/requested-delivery-date.facade.ts
new file mode 100644
index 00000000000..1fea680bbf3
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/facade/requested-delivery-date.facade.ts
@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { facadeFactory } from '@spartacus/core';
+import { Observable } from 'rxjs';
+import { REQUESTED_DELIVERY_DATE_FEATURE } from '../feature-name';
+
+export function requestedDeliveryDateFacadeFactory() {
+  return facadeFactory({
+    facade: RequestedDeliveryDateFacade,
+    feature: REQUESTED_DELIVERY_DATE_FEATURE,
+    methods: ['setRequestedDeliveryDate'],
+  });
+}
+
+@Injectable({
+  providedIn: 'root',
+  useFactory: requestedDeliveryDateFacadeFactory,
+})
+export abstract class RequestedDeliveryDateFacade {
+  /**
+   * Set the requested delivery date
+   */
+  abstract setRequestedDeliveryDate(
+    userId: string,
+    cartId: string,
+    requestedDate: string
+  ): Observable<{}>;
+}
diff --git a/feature-libs/requested-delivery-date/root/feature-name.ts b/feature-libs/requested-delivery-date/root/feature-name.ts
new file mode 100644
index 00000000000..de942fd4fbb
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/feature-name.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const REQUESTED_DELIVERY_DATE_FEATURE = 'requestedDeliveryDate';
+export const REQUESTED_DELIVERY_DATE_CORE_FEATURE = 'requestedDeliveryDateCore';
diff --git a/feature-libs/requested-delivery-date/root/model/augmented-core.model.ts b/feature-libs/requested-delivery-date/root/model/augmented-core.model.ts
new file mode 100644
index 00000000000..13494181400
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/model/augmented-core.model.ts
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import '@spartacus/cart/base/root';
+import '@spartacus/order/root';
+
+declare module '@spartacus/cart/base/root' {
+  interface Cart {
+    earliestRetrievalAt?: string;
+    requestedRetrievalAt?: string;
+  }
+}
+
+declare module '@spartacus/order/root' {
+  interface Order {
+    requestedRetrievalAt?: string;
+  }
+}
diff --git a/feature-libs/requested-delivery-date/root/model/index.ts b/feature-libs/requested-delivery-date/root/model/index.ts
new file mode 100644
index 00000000000..1b216202084
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/model/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Imported for side effects (module augmentation)
+import './augmented-core.model';
diff --git a/feature-libs/requested-delivery-date/root/ng-package.json b/feature-libs/requested-delivery-date/root/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/requested-delivery-date/root/public_api.ts b/feature-libs/requested-delivery-date/root/public_api.ts
new file mode 100644
index 00000000000..f20c3d9911d
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/public_api.ts
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './components/index'; //Make components available without being CMS driven
+export * from './facade/index';
+export * from './feature-name';
+export * from './model/index';
+export * from './requested-delivery-date-root.module';
diff --git a/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts b/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
new file mode 100644
index 00000000000..47fbc3bef9d
--- /dev/null
+++ b/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { CartOutlets } from '@spartacus/cart/base/root';
+import { CmsConfig, provideDefaultConfigFactory } from '@spartacus/core';
+import { OutletPosition, provideOutlet } from '@spartacus/storefront';
+import { DeliveryModeDatePickerComponent } from './components/delivery-mode-date-picker/delivery-mode-date-picker.component';
+import { OrderOverviewDeliveryDateComponent } from './components/order-overview-delivery-date/order-overview-delivery-date.component';
+import {
+  REQUESTED_DELIVERY_DATE_CORE_FEATURE,
+  REQUESTED_DELIVERY_DATE_FEATURE,
+} from './feature-name';
+
+export function defaultRequestedDeliveryDateComponentsConfig(): CmsConfig {
+  const config: CmsConfig = {
+    featureModules: {
+      [REQUESTED_DELIVERY_DATE_FEATURE]: {
+        cmsComponents: [
+          'DeliveryModeDatePickerComponent',
+          'OrderOverviewDeliveryDateComponent',
+        ],
+      },
+      // by default core is bundled together with components
+      [REQUESTED_DELIVERY_DATE_CORE_FEATURE]: REQUESTED_DELIVERY_DATE_FEATURE,
+    },
+  };
+
+  return config;
+}
+
+@NgModule({
+  providers: [
+    provideOutlet({
+      id: CartOutlets.DELIVERY_MODE,
+      position: OutletPosition.AFTER,
+      component: DeliveryModeDatePickerComponent,
+    }),
+    provideOutlet({
+      id: CartOutlets.ORDER_OVERVIEW,
+      position: OutletPosition.AFTER,
+      component: OrderOverviewDeliveryDateComponent,
+    }),
+    provideDefaultConfigFactory(defaultRequestedDeliveryDateComponentsConfig),
+  ],
+})
+export class RequestedDeliveryDateRootModule {}
diff --git a/feature-libs/requested-delivery-date/schematics/.gitignore b/feature-libs/requested-delivery-date/schematics/.gitignore
new file mode 100644
index 00000000000..c88f4d69e15
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/.gitignore
@@ -0,0 +1,18 @@
+# Outputs
+**/*.js
+**/*.js.map
+**/*.d.ts
+
+# IDEs
+.idea/
+jsconfig.json
+.vscode/
+
+# Misc
+node_modules/
+npm-debug.log*
+yarn-error.log*
+
+# Mac OSX Finder files.
+**/.DS_Store
+.DS_Store
diff --git a/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/__snapshots__/index_spec.ts.snap b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/__snapshots__/index_spec.ts.snap
new file mode 100644
index 00000000000..621f8c67463
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/__snapshots__/index_spec.ts.snap
@@ -0,0 +1,130 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Spartacus Requested Delivery Date schematics: ng-add Requested Delivery Date feature eager loading should import appropriate modules 1`] = `""`;
+
+exports[`Spartacus Requested Delivery Date schematics: ng-add Requested Delivery Date feature general setup should add the feature using the lazy loading syntax 1`] = `""`;
+
+exports[`Spartacus Requested Delivery Date schematics: ng-add Requested Delivery Date feature general setup styling should create a proper scss file 1`] = `
+"@import "../../styles-config";
+@import "@spartacus/requested-delivery-date";
+"
+`;
+
+exports[`Spartacus Requested Delivery Date schematics: ng-add Requested Delivery Date feature general setup styling should update angular.json 1`] = `
+"{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "",
+  "projects": {
+    "schematics-test": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/schematics-test",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss",
+              "src/styles/spartacus/requested-delivery-date.scss"
+            ],
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ]
+            }
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "2.5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "browserTarget": "schematics-test:build:production"
+            },
+            "development": {
+              "browserTarget": "schematics-test:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "schematics-test:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "tsConfig": "tsconfig.spec.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss",
+              "src/styles/spartacus/requested-delivery-date.scss"
+            ],
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}"
+`;
diff --git a/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index.ts b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index.ts
new file mode 100644
index 00000000000..36117e0edf7
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index.ts
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  chain,
+  Rule,
+  SchematicContext,
+  Tree,
+} from '@angular-devkit/schematics';
+import {
+  addFeatures,
+  addPackageJsonDependenciesForLibrary,
+  analyzeApplication,
+  analyzeCrossFeatureDependencies,
+  finalizeInstallation,
+  LibraryOptions as SpartacusRequestedDeliveryDateOptions,
+  readPackageJson,
+  validateSpartacusInstallation,
+} from '@spartacus/schematics';
+import { peerDependencies } from '../../package.json';
+
+export function addRequestedDeliveryDateFeature(
+  options: SpartacusRequestedDeliveryDateOptions
+): Rule {
+  return (tree: Tree, _context: SchematicContext): Rule => {
+    const packageJson = readPackageJson(tree);
+    validateSpartacusInstallation(packageJson);
+
+    const features = analyzeCrossFeatureDependencies(
+      options.features as string[]
+    );
+
+    return chain([
+      analyzeApplication(options, features),
+
+      addFeatures(options, features),
+      addPackageJsonDependenciesForLibrary(peerDependencies, options),
+
+      finalizeInstallation(options, features),
+    ]);
+  };
+}
diff --git a/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index_spec.ts b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index_spec.ts
new file mode 100644
index 00000000000..cff43d68f33
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/index_spec.ts
@@ -0,0 +1,181 @@
+/// <reference types="jest" />
+
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import {
+  Schema as ApplicationOptions,
+  Style,
+} from '@schematics/angular/application/schema';
+import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
+import {
+  LibraryOptions as RequestedDeliveryDateOptions,
+  requestedDeliveryDateFeatureModulePath,
+  REQUESTED_DELIVERY_DATE_FEATURE_NAME,
+  SpartacusOptions,
+  SPARTACUS_REQUESTED_DELIVERY_DATE,
+  SPARTACUS_SCHEMATICS,
+} from '@spartacus/schematics';
+import * as path from 'path';
+import { peerDependencies } from '../../package.json';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+const scssFilePath = 'src/styles/spartacus/requested-delivery-date.scss';
+
+describe('Spartacus Requested Delivery Date schematics: ng-add', () => {
+  const schematicRunner = new SchematicTestRunner(
+    SPARTACUS_REQUESTED_DELIVERY_DATE,
+    collectionPath
+  );
+
+  let appTree: UnitTestTree;
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    version: '0.5.0',
+  };
+
+  const appOptions: ApplicationOptions = {
+    name: 'schematics-test',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: false,
+    style: Style.Scss,
+    skipTests: false,
+    projectRoot: '',
+  };
+
+  const spartacusDefaultOptions: SpartacusOptions = {
+    project: 'schematics-test',
+    lazy: true,
+    features: [],
+  };
+
+  const libraryNoFeaturesOptions: RequestedDeliveryDateOptions = {
+    project: 'schematics-test',
+    lazy: true,
+    features: [],
+  };
+
+  const rddOptions: RequestedDeliveryDateOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [REQUESTED_DELIVERY_DATE_FEATURE_NAME],
+  };
+
+  beforeEach(async () => {
+    schematicRunner.registerCollection(
+      SPARTACUS_SCHEMATICS,
+      '../../projects/schematics/src/collection.json'
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'workspace',
+      workspaceOptions
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'application',
+      appOptions,
+      appTree
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      SPARTACUS_SCHEMATICS,
+      'ng-add',
+      { ...spartacusDefaultOptions, name: 'schematics-test' },
+      appTree
+    );
+  });
+
+  describe('Without features', () => {
+    beforeEach(async () => {
+      appTree = await schematicRunner.runSchematic(
+        'ng-add',
+        libraryNoFeaturesOptions,
+        appTree
+      );
+    });
+
+    it('should not create any of the feature modules', () => {
+      expect(
+        appTree.exists(requestedDeliveryDateFeatureModulePath)
+      ).toBeFalsy();
+    });
+
+    it('should install necessary Spartacus libraries', () => {
+      const packageJson = JSON.parse(appTree.readContent('package.json'));
+      let dependencies: Record<string, string> = {};
+      dependencies = { ...packageJson.dependencies };
+      dependencies = { ...dependencies, ...packageJson.devDependencies };
+
+      for (const toAdd in peerDependencies) {
+        // skip the SPARTACUS_SCHEMATICS, as those are added only when running by the Angular CLI, and not in the testing environment
+        if (
+          !peerDependencies.hasOwnProperty(toAdd) ||
+          toAdd === SPARTACUS_SCHEMATICS
+        ) {
+          continue;
+        }
+        // TODO: after 4.0: use this test, as we'll have synced versions between lib's and root package.json
+        // const expectedVersion = (peerDependencies as Record<
+        //   string,
+        //   string
+        // >)[toAdd];
+        const expectedDependency = dependencies[toAdd];
+        expect(expectedDependency).toBeTruthy();
+        // expect(expectedDependency).toEqual(expectedVersion);
+      }
+    });
+  });
+
+  describe('Requested Delivery Date feature', () => {
+    describe('general setup', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          rddOptions,
+          appTree
+        );
+      });
+
+      it('should add the feature using the lazy loading syntax', async () => {
+        const module = appTree.readContent(
+          requestedDeliveryDateFeatureModulePath
+        );
+        expect(module).toMatchSnapshot();
+      });
+
+      describe('styling', () => {
+        it('should create a proper scss file', () => {
+          const scssContent = appTree.readContent(scssFilePath);
+          expect(scssContent).toMatchSnapshot();
+        });
+
+        it('should update angular.json', async () => {
+          const content = appTree.readContent('/angular.json');
+          expect(content).toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('eager loading', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          { ...rddOptions, lazy: false },
+          appTree
+        );
+      });
+
+      it('should import appropriate modules', async () => {
+        const module = appTree.readContent(
+          requestedDeliveryDateFeatureModulePath
+        );
+        expect(module).toMatchSnapshot();
+      });
+    });
+  });
+});
diff --git a/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/schema.json b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/schema.json
new file mode 100644
index 00000000000..536d90100ba
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/add-requested-delivery-date/schema.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "RequestedDeliveryDateSchematics",
+  "title": "Requested Delivery Date Schematics",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "debug": {
+      "description": "Display additional details during the running process.",
+      "type": "boolean",
+      "default": false
+    },
+    "lazy": {
+      "type": "boolean",
+      "description": "Lazy load the Requested Delivery Date.",
+      "default": true
+    },
+    "features": {
+      "type": "array",
+      "uniqueItems": true,
+      "default": ["Requested-Delivery-Date"]
+    }
+  },
+  "required": []
+}
diff --git a/feature-libs/requested-delivery-date/schematics/collection.json b/feature-libs/requested-delivery-date/schematics/collection.json
new file mode 100644
index 00000000000..6c428a2907e
--- /dev/null
+++ b/feature-libs/requested-delivery-date/schematics/collection.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "factory": "./add-requested-delivery-date/index#addRequestedDeliveryDateFeature",
+      "description": "Add Requested Delivery Date feature",
+      "schema": "./add-requested-delivery-date/schema.json",
+      "private": true,
+      "hidden": true,
+      "aliases": ["install"]
+    },
+    "add": {
+      "factory": "./add-requested-delivery-date/index#addRequestedDeliveryDateFeature",
+      "description": "Add and configure Requested Delivery Date feature",
+      "schema": "./add-requested-delivery-date/schema.json"
+    }
+  }
+}
diff --git a/feature-libs/requested-delivery-date/setup-jest.ts b/feature-libs/requested-delivery-date/setup-jest.ts
new file mode 100644
index 00000000000..919fe8743ac
--- /dev/null
+++ b/feature-libs/requested-delivery-date/setup-jest.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import 'jest-preset-angular/setup-jest';
+import 'zone.js';
diff --git a/feature-libs/requested-delivery-date/styles/_index.scss b/feature-libs/requested-delivery-date/styles/_index.scss
new file mode 100644
index 00000000000..93340d0a5ca
--- /dev/null
+++ b/feature-libs/requested-delivery-date/styles/_index.scss
@@ -0,0 +1 @@
+@import './requested-delivery-date';
diff --git a/feature-libs/requested-delivery-date/styles/_requested-delivery-date.scss b/feature-libs/requested-delivery-date/styles/_requested-delivery-date.scss
new file mode 100644
index 00000000000..267824bf4bb
--- /dev/null
+++ b/feature-libs/requested-delivery-date/styles/_requested-delivery-date.scss
@@ -0,0 +1,25 @@
+cx-request-delivery-date {
+  form {
+    width: 100%;
+  }
+
+  cx-card {
+    .cx-card {
+      .card-body {
+        padding-top: 0;
+      }
+    }
+  }
+}
+
+// Avoid bottom padding in the delivery method, as the padding
+// would add extra space with the delivey mode date picker
+.cx-review-card-shipping {
+  cx-card {
+    .cx-card {
+      .card-body {
+        padding-bottom: 0;
+      }
+    }
+  }
+}
diff --git a/feature-libs/requested-delivery-date/test.ts b/feature-libs/requested-delivery-date/test.ts
new file mode 100644
index 00000000000..bd3bae74074
--- /dev/null
+++ b/feature-libs/requested-delivery-date/test.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  {
+    teardown: { destroyAfterEach: false },
+  }
+);
diff --git a/feature-libs/requested-delivery-date/tsconfig.lib.json b/feature-libs/requested-delivery-date/tsconfig.lib.json
new file mode 100644
index 00000000000..78d0becdbd7
--- /dev/null
+++ b/feature-libs/requested-delivery-date/tsconfig.lib.json
@@ -0,0 +1,124 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
+    "forceConsistentCasingInFileNames": true,
+    "target": "es2020",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "importHelpers": true,
+    "types": [],
+    "lib": ["dom", "esnext"],
+    "strict": true,
+    "paths": {
+      "@spartacus/cart/base/assets": ["dist/cart/base/assets"],
+      "@spartacus/cart/base/components/add-to-cart": [
+        "dist/cart/base/components/add-to-cart"
+      ],
+      "@spartacus/cart/base/components/mini-cart": [
+        "dist/cart/base/components/mini-cart"
+      ],
+      "@spartacus/cart/base/components": ["dist/cart/base/components"],
+      "@spartacus/cart/base/core": ["dist/cart/base/core"],
+      "@spartacus/cart/base": ["dist/cart/base"],
+      "@spartacus/cart/base/occ": ["dist/cart/base/occ"],
+      "@spartacus/cart/base/root": ["dist/cart/base/root"],
+      "@spartacus/cart/import-export/assets": [
+        "dist/cart/import-export/assets"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "dist/cart/import-export/components"
+      ],
+      "@spartacus/cart/import-export/core": ["dist/cart/import-export/core"],
+      "@spartacus/cart/import-export": ["dist/cart/import-export"],
+      "@spartacus/cart/import-export/root": ["dist/cart/import-export/root"],
+      "@spartacus/cart": ["dist/cart"],
+      "@spartacus/cart/quick-order/assets": ["dist/cart/quick-order/assets"],
+      "@spartacus/cart/quick-order/components": [
+        "dist/cart/quick-order/components"
+      ],
+      "@spartacus/cart/quick-order/core": ["dist/cart/quick-order/core"],
+      "@spartacus/cart/quick-order": ["dist/cart/quick-order"],
+      "@spartacus/cart/quick-order/root": ["dist/cart/quick-order/root"],
+      "@spartacus/cart/saved-cart/assets": ["dist/cart/saved-cart/assets"],
+      "@spartacus/cart/saved-cart/components": [
+        "dist/cart/saved-cart/components"
+      ],
+      "@spartacus/cart/saved-cart/core": ["dist/cart/saved-cart/core"],
+      "@spartacus/cart/saved-cart": ["dist/cart/saved-cart"],
+      "@spartacus/cart/saved-cart/occ": ["dist/cart/saved-cart/occ"],
+      "@spartacus/cart/saved-cart/root": ["dist/cart/saved-cart/root"],
+      "@spartacus/cart/wish-list/assets": ["dist/cart/wish-list/assets"],
+      "@spartacus/cart/wish-list/components/add-to-wishlist": [
+        "dist/cart/wish-list/components/add-to-wishlist"
+      ],
+      "@spartacus/cart/wish-list/components": [
+        "dist/cart/wish-list/components"
+      ],
+      "@spartacus/cart/wish-list/core": ["dist/cart/wish-list/core"],
+      "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
+      "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
+      "@spartacus/core": ["dist/core"],
+      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
+      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
+      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
+      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
+      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
+      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
+      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
+      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
+      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
+      "@spartacus/checkout/base": ["dist/checkout/base"],
+      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
+      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
+      "@spartacus/checkout": ["dist/checkout"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "dist/checkout/scheduled-replenishment/assets"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "dist/checkout/scheduled-replenishment/components"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "dist/checkout/scheduled-replenishment"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "dist/checkout/scheduled-replenishment/root"
+      ],
+      "@spartacus/order/assets": ["dist/order/assets"],
+      "@spartacus/order/components": ["dist/order/components"],
+      "@spartacus/order/core": ["dist/order/core"],
+      "@spartacus/order": ["dist/order"],
+      "@spartacus/order/occ": ["dist/order/occ"],
+      "@spartacus/order/root": ["dist/order/root"],
+      "@spartacus/storefront": ["dist/storefrontlib"],
+      "@spartacus/user/account/assets": ["dist/user/account/assets"],
+      "@spartacus/user/account/components": ["dist/user/account/components"],
+      "@spartacus/user/account/core": ["dist/user/account/core"],
+      "@spartacus/user/account": ["dist/user/account"],
+      "@spartacus/user/account/occ": ["dist/user/account/occ"],
+      "@spartacus/user/account/root": ["dist/user/account/root"],
+      "@spartacus/user": ["dist/user"],
+      "@spartacus/user/profile/assets": ["dist/user/profile/assets"],
+      "@spartacus/user/profile/components": ["dist/user/profile/components"],
+      "@spartacus/user/profile/core": ["dist/user/profile/core"],
+      "@spartacus/user/profile": ["dist/user/profile"],
+      "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
+      "@spartacus/user/profile/root": ["dist/user/profile/root"]
+    }
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true,
+    "strictInputAccessModifiers": true
+  },
+  "exclude": ["test.ts", "setup-jest.ts", "**/*.spec.ts"]
+}
diff --git a/feature-libs/requested-delivery-date/tsconfig.lib.prod.json b/feature-libs/requested-delivery-date/tsconfig.lib.prod.json
new file mode 100644
index 00000000000..0d1bf3896fa
--- /dev/null
+++ b/feature-libs/requested-delivery-date/tsconfig.lib.prod.json
@@ -0,0 +1,11 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
+  }
+}
diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
new file mode 100644
index 00000000000..bc2b2041ba7
--- /dev/null
+++ b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -0,0 +1,541 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "module": "CommonJs",
+    "types": ["jest"],
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "noUnusedLocals": true,
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "paths": {
+      "@spartacus/schematics": ["../../projects/schematics/index"],
+      "@spartacus/setup": ["../../core-libs/setup/public_api"],
+      "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/asm/assets": ["../../feature-libs/asm/assets/public_api"],
+      "@spartacus/asm/components": [
+        "../../feature-libs/asm/components/public_api"
+      ],
+      "@spartacus/asm/core": ["../../feature-libs/asm/core/public_api"],
+      "@spartacus/asm": ["../../feature-libs/asm/public_api"],
+      "@spartacus/asm/occ": ["../../feature-libs/asm/occ/public_api"],
+      "@spartacus/asm/root": ["../../feature-libs/asm/root/public_api"],
+      "@spartacus/cart/base/assets": [
+        "../../feature-libs/cart/base/assets/public_api"
+      ],
+      "@spartacus/cart/base/components/add-to-cart": [
+        "../../feature-libs/cart/base/components/add-to-cart/public_api"
+      ],
+      "@spartacus/cart/base/components/mini-cart": [
+        "../../feature-libs/cart/base/components/mini-cart/public_api"
+      ],
+      "@spartacus/cart/base/components": [
+        "../../feature-libs/cart/base/components/public_api"
+      ],
+      "@spartacus/cart/base/core": [
+        "../../feature-libs/cart/base/core/public_api"
+      ],
+      "@spartacus/cart/base": ["../../feature-libs/cart/base/public_api"],
+      "@spartacus/cart/base/occ": [
+        "../../feature-libs/cart/base/occ/public_api"
+      ],
+      "@spartacus/cart/base/root": [
+        "../../feature-libs/cart/base/root/public_api"
+      ],
+      "@spartacus/cart/import-export/assets": [
+        "../../feature-libs/cart/import-export/assets/public_api"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "../../feature-libs/cart/import-export/components/public_api"
+      ],
+      "@spartacus/cart/import-export/core": [
+        "../../feature-libs/cart/import-export/core/public_api"
+      ],
+      "@spartacus/cart/import-export": [
+        "../../feature-libs/cart/import-export/public_api"
+      ],
+      "@spartacus/cart/import-export/root": [
+        "../../feature-libs/cart/import-export/root/public_api"
+      ],
+      "@spartacus/cart": ["../../feature-libs/cart/public_api"],
+      "@spartacus/cart/quick-order/assets": [
+        "../../feature-libs/cart/quick-order/assets/public_api"
+      ],
+      "@spartacus/cart/quick-order/components": [
+        "../../feature-libs/cart/quick-order/components/public_api"
+      ],
+      "@spartacus/cart/quick-order/core": [
+        "../../feature-libs/cart/quick-order/core/public_api"
+      ],
+      "@spartacus/cart/quick-order": [
+        "../../feature-libs/cart/quick-order/public_api"
+      ],
+      "@spartacus/cart/quick-order/root": [
+        "../../feature-libs/cart/quick-order/root/public_api"
+      ],
+      "@spartacus/cart/saved-cart/assets": [
+        "../../feature-libs/cart/saved-cart/assets/public_api"
+      ],
+      "@spartacus/cart/saved-cart/components": [
+        "../../feature-libs/cart/saved-cart/components/public_api"
+      ],
+      "@spartacus/cart/saved-cart/core": [
+        "../../feature-libs/cart/saved-cart/core/public_api"
+      ],
+      "@spartacus/cart/saved-cart": [
+        "../../feature-libs/cart/saved-cart/public_api"
+      ],
+      "@spartacus/cart/saved-cart/occ": [
+        "../../feature-libs/cart/saved-cart/occ/public_api"
+      ],
+      "@spartacus/cart/saved-cart/root": [
+        "../../feature-libs/cart/saved-cart/root/public_api"
+      ],
+      "@spartacus/cart/wish-list/assets": [
+        "../../feature-libs/cart/wish-list/assets/public_api"
+      ],
+      "@spartacus/cart/wish-list/components/add-to-wishlist": [
+        "../../feature-libs/cart/wish-list/components/add-to-wishlist/public_api"
+      ],
+      "@spartacus/cart/wish-list/components": [
+        "../../feature-libs/cart/wish-list/components/public_api"
+      ],
+      "@spartacus/cart/wish-list/core": [
+        "../../feature-libs/cart/wish-list/core/public_api"
+      ],
+      "@spartacus/cart/wish-list": [
+        "../../feature-libs/cart/wish-list/public_api"
+      ],
+      "@spartacus/cart/wish-list/root": [
+        "../../feature-libs/cart/wish-list/root/public_api"
+      ],
+      "@spartacus/checkout/b2b/assets": [
+        "../../feature-libs/checkout/b2b/assets/public_api"
+      ],
+      "@spartacus/checkout/b2b/components": [
+        "../../feature-libs/checkout/b2b/components/public_api"
+      ],
+      "@spartacus/checkout/b2b/core": [
+        "../../feature-libs/checkout/b2b/core/public_api"
+      ],
+      "@spartacus/checkout/b2b": ["../../feature-libs/checkout/b2b/public_api"],
+      "@spartacus/checkout/b2b/occ": [
+        "../../feature-libs/checkout/b2b/occ/public_api"
+      ],
+      "@spartacus/checkout/b2b/root": [
+        "../../feature-libs/checkout/b2b/root/public_api"
+      ],
+      "@spartacus/checkout/base/assets": [
+        "../../feature-libs/checkout/base/assets/public_api"
+      ],
+      "@spartacus/checkout/base/components": [
+        "../../feature-libs/checkout/base/components/public_api"
+      ],
+      "@spartacus/checkout/base/core": [
+        "../../feature-libs/checkout/base/core/public_api"
+      ],
+      "@spartacus/checkout/base": [
+        "../../feature-libs/checkout/base/public_api"
+      ],
+      "@spartacus/checkout/base/occ": [
+        "../../feature-libs/checkout/base/occ/public_api"
+      ],
+      "@spartacus/checkout/base/root": [
+        "../../feature-libs/checkout/base/root/public_api"
+      ],
+      "@spartacus/checkout": ["../../feature-libs/checkout/public_api"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "../../feature-libs/checkout/scheduled-replenishment/assets/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "../../feature-libs/checkout/scheduled-replenishment/components/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "../../feature-libs/checkout/scheduled-replenishment/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "../../feature-libs/checkout/scheduled-replenishment/root/public_api"
+      ],
+      "@spartacus/customer-ticketing/assets": [
+        "../../feature-libs/customer-ticketing/assets/public_api"
+      ],
+      "@spartacus/customer-ticketing/components": [
+        "../../feature-libs/customer-ticketing/components/public_api"
+      ],
+      "@spartacus/customer-ticketing/core": [
+        "../../feature-libs/customer-ticketing/core/public_api"
+      ],
+      "@spartacus/customer-ticketing": [
+        "../../feature-libs/customer-ticketing/public_api"
+      ],
+      "@spartacus/customer-ticketing/occ": [
+        "../../feature-libs/customer-ticketing/occ/public_api"
+      ],
+      "@spartacus/customer-ticketing/root": [
+        "../../feature-libs/customer-ticketing/root/public_api"
+      ],
+      "@spartacus/order/assets": ["../../feature-libs/order/assets/public_api"],
+      "@spartacus/order/components": [
+        "../../feature-libs/order/components/public_api"
+      ],
+      "@spartacus/order/core": ["../../feature-libs/order/core/public_api"],
+      "@spartacus/order": ["../../feature-libs/order/public_api"],
+      "@spartacus/order/occ": ["../../feature-libs/order/occ/public_api"],
+      "@spartacus/order/root": ["../../feature-libs/order/root/public_api"],
+      "@spartacus/organization/account-summary/assets": [
+        "../../feature-libs/organization/account-summary/assets/public_api"
+      ],
+      "@spartacus/organization/account-summary/components": [
+        "../../feature-libs/organization/account-summary/components/public_api"
+      ],
+      "@spartacus/organization/account-summary/core": [
+        "../../feature-libs/organization/account-summary/core/public_api"
+      ],
+      "@spartacus/organization/account-summary": [
+        "../../feature-libs/organization/account-summary/public_api"
+      ],
+      "@spartacus/organization/account-summary/occ": [
+        "../../feature-libs/organization/account-summary/occ/public_api"
+      ],
+      "@spartacus/organization/account-summary/root": [
+        "../../feature-libs/organization/account-summary/root/public_api"
+      ],
+      "@spartacus/organization/administration/assets": [
+        "../../feature-libs/organization/administration/assets/public_api"
+      ],
+      "@spartacus/organization/administration/components": [
+        "../../feature-libs/organization/administration/components/public_api"
+      ],
+      "@spartacus/organization/administration/core": [
+        "../../feature-libs/organization/administration/core/public_api"
+      ],
+      "@spartacus/organization/administration": [
+        "../../feature-libs/organization/administration/public_api"
+      ],
+      "@spartacus/organization/administration/occ": [
+        "../../feature-libs/organization/administration/occ/public_api"
+      ],
+      "@spartacus/organization/administration/root": [
+        "../../feature-libs/organization/administration/root/public_api"
+      ],
+      "@spartacus/organization": ["../../feature-libs/organization/public_api"],
+      "@spartacus/organization/order-approval/assets": [
+        "../../feature-libs/organization/order-approval/assets/public_api"
+      ],
+      "@spartacus/organization/order-approval": [
+        "../../feature-libs/organization/order-approval/public_api"
+      ],
+      "@spartacus/organization/order-approval/root": [
+        "../../feature-libs/organization/order-approval/root/public_api"
+      ],
+      "@spartacus/organization/unit-order/assets": [
+        "../../feature-libs/organization/unit-order/assets/public_api"
+      ],
+      "@spartacus/organization/unit-order/components": [
+        "../../feature-libs/organization/unit-order/components/public_api"
+      ],
+      "@spartacus/organization/unit-order/core": [
+        "../../feature-libs/organization/unit-order/core/public_api"
+      ],
+      "@spartacus/organization/unit-order": [
+        "../../feature-libs/organization/unit-order/public_api"
+      ],
+      "@spartacus/organization/unit-order/occ": [
+        "../../feature-libs/organization/unit-order/occ/public_api"
+      ],
+      "@spartacus/organization/unit-order/root": [
+        "../../feature-libs/organization/unit-order/root/public_api"
+      ],
+      "@spartacus/organization/user-registration/assets": [
+        "../../feature-libs/organization/user-registration/assets/public_api"
+      ],
+      "@spartacus/organization/user-registration/components": [
+        "../../feature-libs/organization/user-registration/components/public_api"
+      ],
+      "@spartacus/organization/user-registration/core": [
+        "../../feature-libs/organization/user-registration/core/public_api"
+      ],
+      "@spartacus/organization/user-registration": [
+        "../../feature-libs/organization/user-registration/public_api"
+      ],
+      "@spartacus/organization/user-registration/occ": [
+        "../../feature-libs/organization/user-registration/occ/public_api"
+      ],
+      "@spartacus/organization/user-registration/root": [
+        "../../feature-libs/organization/user-registration/root/public_api"
+      ],
+      "@spartacus/pickup-in-store/assets": [
+        "../../feature-libs/pickup-in-store/assets/public_api"
+      ],
+      "@spartacus/pickup-in-store/components": [
+        "../../feature-libs/pickup-in-store/components/public_api"
+      ],
+      "@spartacus/pickup-in-store/core": [
+        "../../feature-libs/pickup-in-store/core/public_api"
+      ],
+      "@spartacus/pickup-in-store": [
+        "../../feature-libs/pickup-in-store/public_api"
+      ],
+      "@spartacus/pickup-in-store/occ": [
+        "../../feature-libs/pickup-in-store/occ/public_api"
+      ],
+      "@spartacus/pickup-in-store/root": [
+        "../../feature-libs/pickup-in-store/root/public_api"
+      ],
+      "@spartacus/product-configurator/common/assets": [
+        "../../feature-libs/product-configurator/common/assets/public_api"
+      ],
+      "@spartacus/product-configurator/common": [
+        "../../feature-libs/product-configurator/common/public_api"
+      ],
+      "@spartacus/product-configurator": [
+        "../../feature-libs/product-configurator/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/cpq": [
+        "../../feature-libs/product-configurator/rulebased/cpq/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased": [
+        "../../feature-libs/product-configurator/rulebased/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/root": [
+        "../../feature-libs/product-configurator/rulebased/root/public_api"
+      ],
+      "@spartacus/product-configurator/textfield": [
+        "../../feature-libs/product-configurator/textfield/public_api"
+      ],
+      "@spartacus/product-configurator/textfield/root": [
+        "../../feature-libs/product-configurator/textfield/root/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/assets": [
+        "../../feature-libs/product/bulk-pricing/assets/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/components": [
+        "../../feature-libs/product/bulk-pricing/components/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/core": [
+        "../../feature-libs/product/bulk-pricing/core/public_api"
+      ],
+      "@spartacus/product/bulk-pricing": [
+        "../../feature-libs/product/bulk-pricing/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/occ": [
+        "../../feature-libs/product/bulk-pricing/occ/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/root": [
+        "../../feature-libs/product/bulk-pricing/root/public_api"
+      ],
+      "@spartacus/product/future-stock/assets": [
+        "../../feature-libs/product/future-stock/assets/public_api"
+      ],
+      "@spartacus/product/future-stock/components": [
+        "../../feature-libs/product/future-stock/components/public_api"
+      ],
+      "@spartacus/product/future-stock/core": [
+        "../../feature-libs/product/future-stock/core/public_api"
+      ],
+      "@spartacus/product/future-stock": [
+        "../../feature-libs/product/future-stock/public_api"
+      ],
+      "@spartacus/product/future-stock/occ": [
+        "../../feature-libs/product/future-stock/occ/public_api"
+      ],
+      "@spartacus/product/future-stock/root": [
+        "../../feature-libs/product/future-stock/root/public_api"
+      ],
+      "@spartacus/product/image-zoom/assets": [
+        "../../feature-libs/product/image-zoom/assets/public_api"
+      ],
+      "@spartacus/product/image-zoom/components": [
+        "../../feature-libs/product/image-zoom/components/public_api"
+      ],
+      "@spartacus/product/image-zoom": [
+        "../../feature-libs/product/image-zoom/public_api"
+      ],
+      "@spartacus/product/image-zoom/root": [
+        "../../feature-libs/product/image-zoom/root/public_api"
+      ],
+      "@spartacus/product": ["../../feature-libs/product/public_api"],
+      "@spartacus/product/variants/assets": [
+        "../../feature-libs/product/variants/assets/public_api"
+      ],
+      "@spartacus/product/variants/components": [
+        "../../feature-libs/product/variants/components/public_api"
+      ],
+      "@spartacus/product/variants": [
+        "../../feature-libs/product/variants/public_api"
+      ],
+      "@spartacus/product/variants/occ": [
+        "../../feature-libs/product/variants/occ/public_api"
+      ],
+      "@spartacus/product/variants/root": [
+        "../../feature-libs/product/variants/root/public_api"
+      ],
+      "@spartacus/qualtrics/components": [
+        "../../feature-libs/qualtrics/components/public_api"
+      ],
+      "@spartacus/qualtrics": ["../../feature-libs/qualtrics/public_api"],
+      "@spartacus/qualtrics/root": [
+        "../../feature-libs/qualtrics/root/public_api"
+      ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
+      "@spartacus/smartedit/core": [
+        "../../feature-libs/smartedit/core/public_api"
+      ],
+      "@spartacus/smartedit": ["../../feature-libs/smartedit/public_api"],
+      "@spartacus/smartedit/root": [
+        "../../feature-libs/smartedit/root/public_api"
+      ],
+      "@spartacus/storefinder/assets": [
+        "../../feature-libs/storefinder/assets/public_api"
+      ],
+      "@spartacus/storefinder/components": [
+        "../../feature-libs/storefinder/components/public_api"
+      ],
+      "@spartacus/storefinder/core": [
+        "../../feature-libs/storefinder/core/public_api"
+      ],
+      "@spartacus/storefinder": ["../../feature-libs/storefinder/public_api"],
+      "@spartacus/storefinder/occ": [
+        "../../feature-libs/storefinder/occ/public_api"
+      ],
+      "@spartacus/storefinder/root": [
+        "../../feature-libs/storefinder/root/public_api"
+      ],
+      "@spartacus/tracking": ["../../feature-libs/tracking/public_api"],
+      "@spartacus/tracking/personalization/core": [
+        "../../feature-libs/tracking/personalization/core/public_api"
+      ],
+      "@spartacus/tracking/personalization": [
+        "../../feature-libs/tracking/personalization/public_api"
+      ],
+      "@spartacus/tracking/personalization/root": [
+        "../../feature-libs/tracking/personalization/root/public_api"
+      ],
+      "@spartacus/tracking/tms/aep": [
+        "../../feature-libs/tracking/tms/aep/public_api"
+      ],
+      "@spartacus/tracking/tms/core": [
+        "../../feature-libs/tracking/tms/core/public_api"
+      ],
+      "@spartacus/tracking/tms/gtm": [
+        "../../feature-libs/tracking/tms/gtm/public_api"
+      ],
+      "@spartacus/tracking/tms": ["../../feature-libs/tracking/tms/public_api"],
+      "@spartacus/user/account/assets": [
+        "../../feature-libs/user/account/assets/public_api"
+      ],
+      "@spartacus/user/account/components": [
+        "../../feature-libs/user/account/components/public_api"
+      ],
+      "@spartacus/user/account/core": [
+        "../../feature-libs/user/account/core/public_api"
+      ],
+      "@spartacus/user/account": ["../../feature-libs/user/account/public_api"],
+      "@spartacus/user/account/occ": [
+        "../../feature-libs/user/account/occ/public_api"
+      ],
+      "@spartacus/user/account/root": [
+        "../../feature-libs/user/account/root/public_api"
+      ],
+      "@spartacus/user": ["../../feature-libs/user/public_api"],
+      "@spartacus/user/profile/assets": [
+        "../../feature-libs/user/profile/assets/public_api"
+      ],
+      "@spartacus/user/profile/components": [
+        "../../feature-libs/user/profile/components/public_api"
+      ],
+      "@spartacus/user/profile/core": [
+        "../../feature-libs/user/profile/core/public_api"
+      ],
+      "@spartacus/user/profile": ["../../feature-libs/user/profile/public_api"],
+      "@spartacus/user/profile/occ": [
+        "../../feature-libs/user/profile/occ/public_api"
+      ],
+      "@spartacus/user/profile/root": [
+        "../../feature-libs/user/profile/root/public_api"
+      ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
+      "@spartacus/cdc/components": [
+        "../../integration-libs/cdc/components/public_api"
+      ],
+      "@spartacus/cdc/core": ["../../integration-libs/cdc/core/public_api"],
+      "@spartacus/cdc": ["../../integration-libs/cdc/public_api"],
+      "@spartacus/cdc/organization/administration": [
+        "../../integration-libs/cdc/organization/administration/public_api"
+      ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
+      "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
+      "@spartacus/cdc/user-account": [
+        "../../integration-libs/cdc/user-account/public_api"
+      ],
+      "@spartacus/cdc/user-profile": [
+        "../../integration-libs/cdc/user-profile/public_api"
+      ],
+      "@spartacus/cds": ["../../integration-libs/cds/public_api"],
+      "@spartacus/digital-payments/assets": [
+        "../../integration-libs/digital-payments/assets/public_api"
+      ],
+      "@spartacus/digital-payments": [
+        "../../integration-libs/digital-payments/public_api"
+      ],
+      "@spartacus/epd-visualization/assets": [
+        "../../integration-libs/epd-visualization/assets/public_api"
+      ],
+      "@spartacus/epd-visualization/components": [
+        "../../integration-libs/epd-visualization/components/public_api"
+      ],
+      "@spartacus/epd-visualization/core": [
+        "../../integration-libs/epd-visualization/core/public_api"
+      ],
+      "@spartacus/epd-visualization/epd-visualization-api": [
+        "../../integration-libs/epd-visualization/epd-visualization-api/public_api"
+      ],
+      "@spartacus/epd-visualization": [
+        "../../integration-libs/epd-visualization/public_api"
+      ],
+      "@spartacus/epd-visualization/root": [
+        "../../integration-libs/epd-visualization/root/public_api"
+      ],
+      "@spartacus/s4om/assets": [
+        "../../integration-libs/s4om/assets/public_api"
+      ],
+      "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
+      "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
+      "@spartacus/assets": ["../../projects/assets/src/public_api"],
+      "@spartacus/core": ["../../projects/core/public_api"],
+      "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
+    }
+  },
+  "include": ["schematics/**/*.ts"],
+  "exclude": ["schematics/*/files/**/*", "schematics/**/*_spec.ts"]
+}
diff --git a/feature-libs/requested-delivery-date/tsconfig.spec.json b/feature-libs/requested-delivery-date/tsconfig.spec.json
new file mode 100644
index 00000000000..9f660f8b0a1
--- /dev/null
+++ b/feature-libs/requested-delivery-date/tsconfig.spec.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "strict": false,
+    "module": "es2020",
+    "types": ["jasmine", "node"],
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  },
+  "files": ["test.ts"],
+  "include": ["**/*.spec.ts", "**/*.d.ts"]
+}
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/cdc/tsconfig.lib.json b/integration-libs/cdc/tsconfig.lib.json
index 334f8a94ce6..1568a835dd2 100644
--- a/integration-libs/cdc/tsconfig.lib.json
+++ b/integration-libs/cdc/tsconfig.lib.json
@@ -9,6 +9,7 @@
     "sourceMap": true,
     "inlineSources": true,
     "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
     "importHelpers": true,
     "strict": true,
     "types": [],
@@ -21,20 +22,6 @@
       "@spartacus/asm/occ": ["dist/asm/occ"],
       "@spartacus/asm/root": ["dist/asm/root"],
       "@spartacus/core": ["dist/core"],
-      "@spartacus/storefront": ["dist/storefrontlib"],
-      "@spartacus/user/account/assets": ["dist/user/account/assets"],
-      "@spartacus/user/account/components": ["dist/user/account/components"],
-      "@spartacus/user/account/core": ["dist/user/account/core"],
-      "@spartacus/user/account": ["dist/user/account"],
-      "@spartacus/user/account/occ": ["dist/user/account/occ"],
-      "@spartacus/user/account/root": ["dist/user/account/root"],
-      "@spartacus/user": ["dist/user"],
-      "@spartacus/user/profile/assets": ["dist/user/profile/assets"],
-      "@spartacus/user/profile/components": ["dist/user/profile/components"],
-      "@spartacus/user/profile/core": ["dist/user/profile/core"],
-      "@spartacus/user/profile": ["dist/user/profile"],
-      "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
-      "@spartacus/user/profile/root": ["dist/user/profile/root"],
       "@spartacus/organization/account-summary/assets": [
         "dist/organization/account-summary/assets"
       ],
@@ -115,6 +102,20 @@
       "@spartacus/organization/user-registration/root": [
         "dist/organization/user-registration/root"
       ],
+      "@spartacus/storefront": ["dist/storefrontlib"],
+      "@spartacus/user/account/assets": ["dist/user/account/assets"],
+      "@spartacus/user/account/components": ["dist/user/account/components"],
+      "@spartacus/user/account/core": ["dist/user/account/core"],
+      "@spartacus/user/account": ["dist/user/account"],
+      "@spartacus/user/account/occ": ["dist/user/account/occ"],
+      "@spartacus/user/account/root": ["dist/user/account/root"],
+      "@spartacus/user": ["dist/user"],
+      "@spartacus/user/profile/assets": ["dist/user/profile/assets"],
+      "@spartacus/user/profile/components": ["dist/user/profile/components"],
+      "@spartacus/user/profile/core": ["dist/user/profile/core"],
+      "@spartacus/user/profile": ["dist/user/profile"],
+      "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
+      "@spartacus/user/profile/root": ["dist/user/profile/root"],
       "@spartacus/cart/base/assets": ["dist/cart/base/assets"],
       "@spartacus/cart/base/components/add-to-cart": [
         "dist/cart/base/components/add-to-cart"
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index 780e4cdc0d9..0fbbe795fcc 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/digital-payments/tsconfig.lib.json b/integration-libs/digital-payments/tsconfig.lib.json
index e7b50e33065..ae852f43a4f 100644
--- a/integration-libs/digital-payments/tsconfig.lib.json
+++ b/integration-libs/digital-payments/tsconfig.lib.json
@@ -12,40 +12,6 @@
     "types": [],
     "lib": ["dom", "esnext"],
     "paths": {
-      "@spartacus/checkout": ["dist/checkout"],
-      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
-      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
-      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
-      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
-      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
-      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
-      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
-      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
-      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
-      "@spartacus/checkout/base": ["dist/checkout/base"],
-      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
-      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
-      "@spartacus/checkout/scheduled-replenishment/assets": [
-        "dist/checkout/scheduled-replenishment/assets"
-      ],
-      "@spartacus/checkout/scheduled-replenishment/components": [
-        "dist/checkout/scheduled-replenishment/components"
-      ],
-      "@spartacus/checkout/scheduled-replenishment": [
-        "dist/checkout/scheduled-replenishment"
-      ],
-      "@spartacus/checkout/scheduled-replenishment/root": [
-        "dist/checkout/scheduled-replenishment/root"
-      ],
-      "@spartacus/cart/import-export/assets": [
-        "dist/cart/import-export/assets"
-      ],
-      "@spartacus/cart/import-export/components": [
-        "dist/cart/import-export/components"
-      ],
-      "@spartacus/cart/import-export/core": ["dist/cart/import-export/core"],
-      "@spartacus/cart/import-export": ["dist/cart/import-export"],
-      "@spartacus/cart/import-export/root": ["dist/cart/import-export/root"],
       "@spartacus/cart/base/assets": ["dist/cart/base/assets"],
       "@spartacus/cart/base/components/add-to-cart": [
         "dist/cart/base/components/add-to-cart"
@@ -58,6 +24,15 @@
       "@spartacus/cart/base": ["dist/cart/base"],
       "@spartacus/cart/base/occ": ["dist/cart/base/occ"],
       "@spartacus/cart/base/root": ["dist/cart/base/root"],
+      "@spartacus/cart/import-export/assets": [
+        "dist/cart/import-export/assets"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "dist/cart/import-export/components"
+      ],
+      "@spartacus/cart/import-export/core": ["dist/cart/import-export/core"],
+      "@spartacus/cart/import-export": ["dist/cart/import-export"],
+      "@spartacus/cart/import-export/root": ["dist/cart/import-export/root"],
       "@spartacus/cart": ["dist/cart"],
       "@spartacus/cart/quick-order/assets": ["dist/cart/quick-order/assets"],
       "@spartacus/cart/quick-order/components": [
@@ -84,14 +59,33 @@
       "@spartacus/cart/wish-list/core": ["dist/cart/wish-list/core"],
       "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
+      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
+      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
+      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
+      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
+      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
+      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
+      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
+      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
+      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
+      "@spartacus/checkout/base": ["dist/checkout/base"],
+      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
+      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
+      "@spartacus/checkout": ["dist/checkout"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "dist/checkout/scheduled-replenishment/assets"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "dist/checkout/scheduled-replenishment/components"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "dist/checkout/scheduled-replenishment"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "dist/checkout/scheduled-replenishment/root"
+      ],
       "@spartacus/core": ["dist/core"],
       "@spartacus/storefront": ["dist/storefrontlib"],
-      "@spartacus/order/assets": ["dist/order/assets"],
-      "@spartacus/order/components": ["dist/order/components"],
-      "@spartacus/order/core": ["dist/order/core"],
-      "@spartacus/order": ["dist/order"],
-      "@spartacus/order/occ": ["dist/order/occ"],
-      "@spartacus/order/root": ["dist/order/root"],
       "@spartacus/user/account/assets": ["dist/user/account/assets"],
       "@spartacus/user/account/components": ["dist/user/account/components"],
       "@spartacus/user/account/core": ["dist/user/account/core"],
@@ -104,7 +98,13 @@
       "@spartacus/user/profile/core": ["dist/user/profile/core"],
       "@spartacus/user/profile": ["dist/user/profile"],
       "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
-      "@spartacus/user/profile/root": ["dist/user/profile/root"]
+      "@spartacus/user/profile/root": ["dist/user/profile/root"],
+      "@spartacus/order/assets": ["dist/order/assets"],
+      "@spartacus/order/components": ["dist/order/components"],
+      "@spartacus/order/core": ["dist/order/core"],
+      "@spartacus/order": ["dist/order"],
+      "@spartacus/order/occ": ["dist/order/occ"],
+      "@spartacus/order/root": ["dist/order/root"]
     }
   },
   "angularCompilerOptions": {
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index b2d3272ddc6..d0ddb7f36b9 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -25,6 +25,7 @@
     "@angular/core": "^15.2.4",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
+    "@spartacus/requested-delivery-date": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
     "@spartacus/styles": "6.3.0-1",
diff --git a/integration-libs/s4om/root/s4om-root.module.ts b/integration-libs/s4om/root/s4om-root.module.ts
index 8eb751b08b2..a176a2349d7 100644
--- a/integration-libs/s4om/root/s4om-root.module.ts
+++ b/integration-libs/s4om/root/s4om-root.module.ts
@@ -6,12 +6,16 @@
 
 import { NgModule } from '@angular/core';
 import { CartOutlets } from '@spartacus/cart/base/root';
+import { RequestedDeliveryDateComponentsModule } from '@spartacus/requested-delivery-date/root';
 import { OutletPosition, provideOutlet } from '@spartacus/storefront';
 import { ScheduleLinesComponent } from './components/schedule-lines/schedule-lines.component';
 import { ScheduleLinesModule } from './components/schedule-lines/schedule-lines.module';
 
 @NgModule({
-  imports: [ScheduleLinesModule],
+  imports: [
+    ScheduleLinesModule,
+    RequestedDeliveryDateComponentsModule, //Adding dependency with Requested Delivery Date so that the library gets installed along with S4OM
+  ],
   providers: [
     provideOutlet({
       id: CartOutlets.ITEM_DETAILS,
diff --git a/integration-libs/s4om/schematics/add-s4om/schema.json b/integration-libs/s4om/schematics/add-s4om/schema.json
index 8aa903b709f..19c66cb018b 100644
--- a/integration-libs/s4om/schematics/add-s4om/schema.json
+++ b/integration-libs/s4om/schematics/add-s4om/schema.json
@@ -24,7 +24,18 @@
     "features": {
       "type": "array",
       "uniqueItems": true,
-      "default": ["S4HANA-Order-Management"]
+      "default": ["S4HANA-Order-Management"],
+      "x-prompt": {
+        "message": "Which S/4 HANA Order Management features would you like to set up?",
+        "type": "list",
+        "items": [
+          { "value": "S4HANA-Order-Management", "label": "Schedule Lines" },
+          {
+            "value": "Requested-Delivery-Date",
+            "label": "Requested Delivery Date"
+          }
+        ]
+      }
     }
   },
   "required": []
diff --git a/integration-libs/s4om/tsconfig.lib.json b/integration-libs/s4om/tsconfig.lib.json
index 81f7bd8bf7e..1c370c142e5 100644
--- a/integration-libs/s4om/tsconfig.lib.json
+++ b/integration-libs/s4om/tsconfig.lib.json
@@ -62,6 +62,19 @@
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
       "@spartacus/core": ["dist/core"],
       "@spartacus/storefront": ["dist/storefrontlib"],
+      "@spartacus/requested-delivery-date/assets": [
+        "dist/requested-delivery-date/assets"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "dist/requested-delivery-date/core"
+      ],
+      "@spartacus/requested-delivery-date": ["dist/requested-delivery-date"],
+      "@spartacus/requested-delivery-date/occ": [
+        "dist/requested-delivery-date/occ"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "dist/requested-delivery-date/root"
+      ],
       "@spartacus/user/account/assets": ["dist/user/account/assets"],
       "@spartacus/user/account/components": ["dist/user/account/components"],
       "@spartacus/user/account/core": ["dist/user/account/core"],
@@ -74,7 +87,38 @@
       "@spartacus/user/profile/core": ["dist/user/profile/core"],
       "@spartacus/user/profile": ["dist/user/profile"],
       "@spartacus/user/profile/occ": ["dist/user/profile/occ"],
-      "@spartacus/user/profile/root": ["dist/user/profile/root"]
+      "@spartacus/user/profile/root": ["dist/user/profile/root"],
+      "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
+      "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
+      "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
+      "@spartacus/checkout/b2b": ["dist/checkout/b2b"],
+      "@spartacus/checkout/b2b/occ": ["dist/checkout/b2b/occ"],
+      "@spartacus/checkout/b2b/root": ["dist/checkout/b2b/root"],
+      "@spartacus/checkout/base/assets": ["dist/checkout/base/assets"],
+      "@spartacus/checkout/base/components": ["dist/checkout/base/components"],
+      "@spartacus/checkout/base/core": ["dist/checkout/base/core"],
+      "@spartacus/checkout/base": ["dist/checkout/base"],
+      "@spartacus/checkout/base/occ": ["dist/checkout/base/occ"],
+      "@spartacus/checkout/base/root": ["dist/checkout/base/root"],
+      "@spartacus/checkout": ["dist/checkout"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "dist/checkout/scheduled-replenishment/assets"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "dist/checkout/scheduled-replenishment/components"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "dist/checkout/scheduled-replenishment"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "dist/checkout/scheduled-replenishment/root"
+      ],
+      "@spartacus/order/assets": ["dist/order/assets"],
+      "@spartacus/order/components": ["dist/order/components"],
+      "@spartacus/order/core": ["dist/order/core"],
+      "@spartacus/order": ["dist/order"],
+      "@spartacus/order/occ": ["dist/order/occ"],
+      "@spartacus/order/root": ["dist/order/root"]
     },
     "resolveJsonModule": true,
     "esModuleInterop": true
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index 762073f61f1..1652ce2b588 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -372,6 +372,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/package.json b/package.json
index 24c65ec45a2..cf194e346ae 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "build:digital-payments": "npm --prefix integration-libs/digital-payments run build:schematics && nx build digital-payments --configuration production",
     "build:epd-visualization": "npm --prefix integration-libs/epd-visualization run build:schematics && nx build epd-visualization --configuration production",
     "build:order": "npm --prefix feature-libs/order run build:schematics && nx build order --configuration production",
-    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:product npm:build:product-configurator npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
+    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:product npm:build:product-configurator npm:build:requested-delivery-date npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
     "build:organization": "npm --prefix feature-libs/organization run build:schematics && nx build organization --configuration production",
     "build:pickup-in-store": "npm --prefix feature-libs/pickup-in-store run build:schematics && nx build pickup-in-store --configuration production",
     "build:product": "npm --prefix feature-libs/product run build:schematics && nx build product --configuration production",
@@ -30,6 +30,7 @@
     "build:s4om": "npm --prefix integration-libs/s4om run build:schematics && nx build s4om --configuration production",
     "build:segment-refs": "npm --prefix integration-libs/segment-refs run build:schematics && nx build segment-refs --configuration production",
     "build:qualtrics": "npm --prefix feature-libs/qualtrics run build:schematics && nx build qualtrics --configuration production",
+    "build:requested-delivery-date": "npm --prefix feature-libs/requested-delivery-date run build:schematics && nx build requested-delivery-date --configuration production",
     "build:schematics": "npm --prefix projects/schematics run build",
     "build:setup": "nx build setup --configuration production",
     "build:ssr": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx run storefrontapp:server:production",
@@ -81,7 +82,7 @@
     "start:prod": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx serve storefrontapp --configuration=production",
     "start:pwa": "cd ./dist/storefrontapp/ && http-server --silent --proxy http://localhost:4200? -p 4200",
     "test": "nx test",
-    "test:libs": "concurrently \"nx test core --code-coverage\" \"nx test storefrontlib --code-coverage\" \"nx test cart --code-coverage\" \"nx test organization --code-coverage\" \"nx test storefinder --code-coverage\" \"nx test smartedit --code-coverage\" \"nx test asm --code-coverage\" \"nx test qualtrics --code-coverage\" \"nx test product --code-coverage\" \"nx test product-configurator --code-coverage\" \"nx test customer-ticketing --code-coverage\" \"nx test cdc --code-coverage\" \"nx test setup --code-coverage\" \"nx test checkout --code-coverage\" \"nx test order --code-coverage\" \"nx test digital-payments --code-coverage\" \"nx test epd-visualization --code-coverage\" \"nx test pickup-in-store --code-coverage\"",
+    "test:libs": "concurrently \"nx test core --code-coverage\" \"nx test storefrontlib --code-coverage\" \"nx test cart --code-coverage\" \"nx test organization --code-coverage\" \"nx test storefinder --code-coverage\" \"nx test smartedit --code-coverage\" \"nx test asm --code-coverage\" \"nx test qualtrics --code-coverage\" \"nx test product --code-coverage\" \"nx test product-configurator --code-coverage\" \"nx test customer-ticketing --code-coverage\" \"nx test cdc --code-coverage\" \"nx test setup --code-coverage\" \"nx test checkout --code-coverage\" \"nx test order --code-coverage\" \"nx test digital-payments --code-coverage\" \"nx test epd-visualization --code-coverage\" \"nx test pickup-in-store --code-coverage\" \"nx test s4om --code-coverage\" \"nx test requested-delivery-date --code-coverage\"",
     "test:storefront:lib": "nx test storefrontlib --source-map --code-coverage",
     "dev:ssr": "env-cmd --no-override -e dev,b2c,$SPA_ENV cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nx run storefrontapp:serve-ssr",
     "serve:ssr": "node dist/storefrontapp-server/main.js",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index ef94a58cd77..69b9829e9b0 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -55,6 +55,7 @@
       "@spartacus/product",
       "@spartacus/product-configurator",
       "@spartacus/qualtrics",
+      "@spartacus/requested-delivery-date",
       "@spartacus/smartedit",
       "@spartacus/storefinder",
       "@spartacus/tracking",
@@ -64,6 +65,7 @@
       "@spartacus/cds",
       "@spartacus/digital-payments",
       "@spartacus/epd-visualization",
+      "@spartacus/s4om",
       "@spartacus/customer-ticketing"
     ]
   },
diff --git a/projects/schematics/src/add-spartacus/schema.json b/projects/schematics/src/add-spartacus/schema.json
index 02927e05dc3..f115637f01f 100644
--- a/projects/schematics/src/add-spartacus/schema.json
+++ b/projects/schematics/src/add-spartacus/schema.json
@@ -44,6 +44,7 @@
           "Textfield-Configurator",
           "CPQ-Configurator",
           "Qualtrics",
+          "Requested-Delivery-Date",
           "S4HANA-Order-Management",
           "SmartEdit",
           "Store-Finder",
@@ -186,6 +187,10 @@
             "value": "Qualtrics",
             "label": "Qualtrics"
           },
+          {
+            "value": "Requested-Delivery-Date",
+            "label": "Requested Delivery Date"
+          },
           {
             "value": "S4HANA-Order-Management",
             "label": "S/4HANA Order Management (b2b feature)"
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 9d4d2f7c75b..aecd2065dfd 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -211,6 +211,20 @@
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
+  "@spartacus/requested-delivery-date": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@angular/forms": "^15.2.4",
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/checkout": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "rxjs": "^6.6.0"
+  },
   "@spartacus/smartedit": {
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
@@ -322,6 +336,7 @@
     "@angular/core": "^15.2.4",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
+    "@spartacus/requested-delivery-date": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
     "@spartacus/styles": "6.3.0-1",
diff --git a/projects/schematics/src/shared/lib-configs/requested-delivery-date-schematics-config.ts b/projects/schematics/src/shared/lib-configs/requested-delivery-date-schematics-config.ts
new file mode 100644
index 00000000000..bdd9ffdca55
--- /dev/null
+++ b/projects/schematics/src/shared/lib-configs/requested-delivery-date-schematics-config.ts
@@ -0,0 +1,66 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  CART_BASE_FEATURE_NAME,
+  CHECKOUT_BASE_FEATURE_NAME,
+  ORDER_FEATURE_NAME,
+  REQUESTED_DELIVERY_DATE_FEATURE_NAME,
+  SPARTACUS_REQUESTED_DELIVERY_DATE,
+  SPARTACUS_REQUESTED_DELIVERY_DATE_ASSETS,
+  SPARTACUS_REQUESTED_DELIVERY_DATE_ROOT,
+} from '../libs-constants';
+import { SchematicConfig } from '../utils/lib-utils';
+
+export const REQUESTED_DELIVERY_DATE_FEATURE_NAME_CONSTANT =
+  'REQUESTED_DELIVERY_DATE_FEATURE';
+export const REQUESTED_DELIVERY_DATE_FOLDER_NAME = 'requested-delivery-date';
+export const REQUESTED_DELIVERY_DATE_TRANSLATIONS =
+  'requestedDeliveryDateTranslations';
+export const REQUESTED_DELIVERY_DATE_TRANSLATION_CHUNKS_CONFIG =
+  'requestedDeliveryDateTranslationChunksConfig';
+export const REQUESTED_DELIVERY_DATE_ROOT_MODULE =
+  'RequestedDeliveryDateRootModule';
+export const REQUESTED_DELIVERY_DATE_MODULE = 'RequestedDeliveryDateModule';
+
+export const REQUESTED_DELIVERY_DATE_SCSS_FILE_NAME =
+  'requested-delivery-date.scss';
+
+export const REQUESTED_DELIVERY_DATE_SCHEMATICS_CONFIG: SchematicConfig = {
+  library: {
+    featureName: REQUESTED_DELIVERY_DATE_FEATURE_NAME,
+    mainScope: SPARTACUS_REQUESTED_DELIVERY_DATE,
+  },
+  folderName: REQUESTED_DELIVERY_DATE_FOLDER_NAME,
+  moduleName: REQUESTED_DELIVERY_DATE_MODULE,
+  featureModule: {
+    name: REQUESTED_DELIVERY_DATE_MODULE,
+    importPath: SPARTACUS_REQUESTED_DELIVERY_DATE,
+  },
+  rootModule: {
+    name: REQUESTED_DELIVERY_DATE_ROOT_MODULE,
+    importPath: SPARTACUS_REQUESTED_DELIVERY_DATE_ROOT,
+  },
+  styles: {
+    scssFileName: REQUESTED_DELIVERY_DATE_SCSS_FILE_NAME,
+    importStyle: SPARTACUS_REQUESTED_DELIVERY_DATE,
+  },
+  lazyLoadingChunk: {
+    moduleSpecifier: SPARTACUS_REQUESTED_DELIVERY_DATE_ROOT,
+    namedImports: [REQUESTED_DELIVERY_DATE_FEATURE_NAME_CONSTANT],
+  },
+  i18n: {
+    resources: REQUESTED_DELIVERY_DATE_TRANSLATIONS,
+    chunks: REQUESTED_DELIVERY_DATE_TRANSLATION_CHUNKS_CONFIG,
+    importPath: SPARTACUS_REQUESTED_DELIVERY_DATE_ASSETS,
+  },
+  dependencyFeatures: [
+    CART_BASE_FEATURE_NAME,
+    CHECKOUT_BASE_FEATURE_NAME,
+    ORDER_FEATURE_NAME,
+  ],
+};
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index 29bc42e9e69..39faa1c6383 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -144,6 +144,10 @@ export const SPARTACUS_QUALTRICS = `@spartacus/qualtrics`;
 export const SPARTACUS_QUALTRICS_COMPONENTS = `@spartacus/qualtrics/components`;
 export const SPARTACUS_QUALTRICS_ROOT = `@spartacus/qualtrics/root`;
 
+export const SPARTACUS_REQUESTED_DELIVERY_DATE = `@spartacus/requested-delivery-date`;
+export const SPARTACUS_REQUESTED_DELIVERY_DATE_ROOT = `@spartacus/requested-delivery-date/root`;
+export const SPARTACUS_REQUESTED_DELIVERY_DATE_ASSETS = `@spartacus/requested-delivery-date/assets`;
+
 export const SPARTACUS_SMARTEDIT = `@spartacus/smartedit`;
 export const SPARTACUS_SMARTEDIT_ROOT = `@spartacus/smartedit/root`;
 
@@ -247,6 +251,8 @@ export const PRODUCT_CONFIGURATOR_CPQ_FEATURE_NAME = 'CPQ-Configurator';
 
 export const QUALTRICS_FEATURE_NAME = 'Qualtrics';
 
+export const REQUESTED_DELIVERY_DATE_FEATURE_NAME = 'Requested-Delivery-Date';
+
 export const SMARTEDIT_FEATURE_NAME = 'SmartEdit';
 
 export const STOREFINDER_FEATURE_NAME = 'Store-Finder';
diff --git a/projects/schematics/src/shared/schematics-config-mappings.ts b/projects/schematics/src/shared/schematics-config-mappings.ts
index b427f5e5493..0cb429e3a52 100644
--- a/projects/schematics/src/shared/schematics-config-mappings.ts
+++ b/projects/schematics/src/shared/schematics-config-mappings.ts
@@ -30,8 +30,8 @@ import {
   ORGANIZATION_ACCOUNT_SUMMARY_SCHEMATICS_CONFIG,
   ORGANIZATION_ADMINISTRATION_SCHEMATICS_CONFIG,
   ORGANIZATION_ORDER_APPROVAL_SCHEMATICS_CONFIG,
-  ORGANIZATION_USER_REGISTRATION_SCHEMATICS_CONFIG,
   ORGANIZATION_UNIT_ORDER_SCHEMATICS_CONFIG,
+  ORGANIZATION_USER_REGISTRATION_SCHEMATICS_CONFIG,
 } from './lib-configs/organization-schematics-config';
 import { PICKUP_IN_STORE_SCHEMATICS_CONFIG } from './lib-configs/pickup-in-store-schematics-config';
 import {
@@ -41,11 +41,12 @@ import {
 } from './lib-configs/product-configurator-schematics-config';
 import {
   PRODUCT_BULK_PRICING_SCHEMATICS_CONFIG,
+  PRODUCT_FUTURE_STOCK_SCHEMATICS_CONFIG,
   PRODUCT_IMAGE_ZOOM_SCHEMATICS_CONFIG,
   PRODUCT_VARIANTS_SCHEMATICS_CONFIG,
-  PRODUCT_FUTURE_STOCK_SCHEMATICS_CONFIG,
 } from './lib-configs/product-schematics-config';
 import { QUALTRICS_SCHEMATICS_CONFIG } from './lib-configs/qualtrics-schematics-config';
+import { REQUESTED_DELIVERY_DATE_SCHEMATICS_CONFIG } from './lib-configs/requested-delivery-date-schematics-config';
 import { SMARTEDIT_SCHEMATICS_CONFIG } from './lib-configs/smartedit-schematics-config';
 import { STOREFINDER_SCHEMATICS_CONFIG } from './lib-configs/storefinder-schematics-config';
 import {
@@ -57,7 +58,6 @@ import {
   USER_ACCOUNT_SCHEMATICS_CONFIG,
   USER_PROFILE_SCHEMATICS_CONFIG,
 } from './lib-configs/user-schematics-config';
-
 import { Module, SchematicConfig } from './utils/lib-utils';
 
 /**
@@ -99,6 +99,8 @@ export const SCHEMATICS_CONFIGS: SchematicConfig[] = [
 
   QUALTRICS_SCHEMATICS_CONFIG,
 
+  REQUESTED_DELIVERY_DATE_SCHEMATICS_CONFIG,
+
   SMARTEDIT_SCHEMATICS_CONFIG,
 
   STOREFINDER_SCHEMATICS_CONFIG,
diff --git a/projects/schematics/src/shared/utils/graph-utils_spec.ts b/projects/schematics/src/shared/utils/graph-utils_spec.ts
index ecda68acfa1..deaa8f366e0 100644
--- a/projects/schematics/src/shared/utils/graph-utils_spec.ts
+++ b/projects/schematics/src/shared/utils/graph-utils_spec.ts
@@ -15,6 +15,7 @@ import {
   SPARTACUS_PRODUCT,
   SPARTACUS_PRODUCT_CONFIGURATOR,
   SPARTACUS_QUALTRICS,
+  SPARTACUS_REQUESTED_DELIVERY_DATE,
   SPARTACUS_S4OM,
   SPARTACUS_SEGMENT_REFS,
   SPARTACUS_SMARTEDIT,
@@ -129,6 +130,7 @@ describe('Graph utils', () => {
         SPARTACUS_CART,
         SPARTACUS_ORDER,
         SPARTACUS_CHECKOUT,
+        SPARTACUS_REQUESTED_DELIVERY_DATE,
         SPARTACUS_TRACKING,
         SPARTACUS_ORGANIZATION,
         SPARTACUS_ASM,
@@ -184,6 +186,7 @@ describe('Graph utils', () => {
           "CDC",
           "Customer-Ticketing",
           "SmartEdit",
+          "Requested-Delivery-Date",
           "Qualtrics",
           "Future-Stock",
           "Product-Variants",
diff --git a/projects/schematics/src/shared/utils/test-utils.ts b/projects/schematics/src/shared/utils/test-utils.ts
index 65558722568..f6cdf7aedf3 100644
--- a/projects/schematics/src/shared/utils/test-utils.ts
+++ b/projects/schematics/src/shared/utils/test-utils.ts
@@ -69,6 +69,8 @@ export const productConfiguratorRulebasedWrapperModulePath =
   'src/app/spartacus/features/product-configurator/rulebased-configurator-wrapper.module.ts';
 export const qualtricsFeatureModulePath =
   'src/app/spartacus/features/qualtrics/qualtrics-feature.module.ts';
+export const requestedDeliveryDateFeatureModulePath =
+  'src/app/spartacus/features/requested-delivery-date/requested-delivery-date-feature.module.ts';
 export const smartEditFeatureModulePath =
   'src/app/spartacus/features/smartedit/smart-edit-feature.module.ts';
 export const storeFinderFeatureModulePath =
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
new file mode 100644
index 00000000000..21aa07b32f4
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
@@ -0,0 +1,168 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as b2bCheckout from '../../../helpers/b2b/b2b-checkout';
+import {
+  interceptOrdersEndpoint,
+  waitForResponse,
+} from '../../../helpers/order-history';
+import * as rddHelper from '../../../helpers/vendor/requested-delivery-date/requested-delivery-date';
+import * as s4Helper from '../../../helpers/vendor/s4om/s4om';
+import {
+  ORDER_REQUEST_ENDPOINT,
+  order_type,
+  POWERTOOLS_BASESITE,
+  USER_REQUEST_ENDPOINT,
+} from '../../../sample-data/b2b-checkout';
+import { isolateTestsBefore } from '../../../support/utils/test-isolation';
+
+//Set the date in mmm dd, yyyy format
+const formattedDate = new Date().toLocaleDateString('en', {
+  year: 'numeric',
+  month: 'short',
+  day: 'numeric',
+});
+const today = new Date();
+
+//Set the date in yyyy-mm-dd format
+const inputDate = `${today.getFullYear()}-${today.toLocaleString('default', {
+  month: '2-digit',
+})}-${today.toLocaleString('default', { day: '2-digit' })}`;
+
+describe('Requested Delivery Date', { testIsolation: false }, () => {
+  isolateTestsBefore();
+  before(() => {
+    cy.window().then((win) => win.sessionStorage.clear());
+    Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
+    Cypress.env('OCC_PREFIX_USER_ENDPOINT', USER_REQUEST_ENDPOINT);
+    Cypress.env('OCC_PREFIX_ORDER_ENDPOINT', ORDER_REQUEST_ENDPOINT);
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+
+  describe('Requested Delivery Date in Checkout Flow', () => {
+    it('should be able to login as a b2b user', () => {
+      s4Helper.loginS4OMB2bUser();
+    });
+
+    it('should add a S4 HANA product (TG-11) to cart', () => {
+      s4Helper.resetCart(); //clear the cart
+      s4Helper.addB2bS4ProductToCart(); //Ensure that the cart has only 1 S4 product
+    });
+
+    it('should proceed to checkout and select Account payment type', () => {
+      s4Helper.proceedtoCheckOutS4Product();
+      b2bCheckout.enterPONumber(rddHelper.poNumber);
+      b2bCheckout.selectAccountPayment();
+    });
+
+    it('should select shipping address', () => {
+      s4Helper.selectS4OMAccountShippingAddress();
+    });
+
+    it('should select delivery mode and display Request Delivery Date form', () => {
+      rddHelper.selectAccountDeliveryMode();
+    });
+
+    it('should show an error when an invalid delivery date is provided', () => {
+      rddHelper.updateRequestedDeliveryDate('1000-01-01');
+      rddHelper.verifyDeliveryDateErrorMessage();
+    });
+
+    it('should show an info message when the delivery date is updated', () => {
+      rddHelper.updateRequestedDeliveryDate(inputDate);
+      rddHelper.verifyDeliveryDateInfoMessage();
+    });
+
+    it('should review and display the Requested Delivery Date', () => {
+      rddHelper.proceedToOrderReviewPage();
+      rddHelper.verifyRDDOrderReviewPage(formattedDate);
+    });
+
+    it('should route back to the select delivery mode step when the edit button is clicked', () => {
+      rddHelper.editDeliveryMethodOrderReviewPage();
+      rddHelper.proceedToOrderReviewPage();
+    });
+
+    it('should place order', () => {
+      rddHelper.verifyRDDOrderReviewPage(formattedDate);
+      b2bCheckout.reviewB2bReviewOrderPage(
+        s4Helper.s4omB2bAccountShipToUser,
+        s4Helper.cartWithS4OMB2bProductAndPremiumShipping,
+        true,
+        order_type.PLACE_ORDER,
+        s4Helper.s4omTabbingOrderConfig,
+        rddHelper.poNumber,
+        s4Helper.s4omCostCenter,
+        s4Helper.s4omB2BUnit
+      );
+      b2bCheckout.placeOrder('/order-confirmation');
+    });
+
+    it('should display order confirmation summary page with Requested delivery date', () => {
+      s4Helper.reviewB2bOrderDetail(
+        s4Helper.s4omB2bAccountShipToUser,
+        s4Helper.s4omProduct,
+        s4Helper.cartWithS4OMB2bProductAndPremiumShipping,
+        true,
+        null,
+        rddHelper.poNumber,
+        s4Helper.s4omCostCenter,
+        s4Helper.s4omB2BUnit
+      );
+      rddHelper.verifyRDDOrderDetailPage(formattedDate);
+      s4Helper.setOrderConfirmationIdInSessionStorage('rddOrderId');
+    });
+  });
+
+  describe('Requested Delivery Date in Order History', () => {
+    it('should be able to view order in order history with PO# and Cost center', () => {
+      cy.visit('/my-account/orders');
+      const ordersAlias = interceptOrdersEndpoint();
+      waitForResponse(ordersAlias);
+
+      const rddOrderId = window.sessionStorage.getItem('rddOrderId');
+      cy.wrap(rddOrderId).should('not.be.null');
+      s4Helper.findRowInOrderHistoryTable(
+        ordersAlias,
+        rddOrderId,
+        rddHelper.poNumber
+      );
+    });
+
+    it('should be able to view a past order detail in order detail page with requested delivery date information', () => {
+      cy.intercept({
+        method: 'GET',
+        pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          'BASE_SITE'
+        )}/users/current/orders/*`,
+      }).as('getOrderDetail');
+
+      const rddOrderId = window.sessionStorage.getItem('rddOrderId');
+      cy.visit('/my-account/order/' + rddOrderId);
+      cy.wait('@getOrderDetail');
+
+      s4Helper.reviewB2bOrderDetail(
+        s4Helper.s4omB2bAccountShipToUser,
+        s4Helper.s4omProduct,
+        s4Helper.cartWithS4OMB2bProductAndPremiumShipping,
+        true,
+        null,
+        rddHelper.poNumber,
+        s4Helper.s4omCostCenter,
+        s4Helper.s4omB2BUnit,
+        false
+      );
+      rddHelper.verifyRDDOrderDetailPage(formattedDate);
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
index 2ad0229bac4..18547e65088 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
@@ -18,8 +18,10 @@ import {
   POWERTOOLS_BASESITE,
   USER_REQUEST_ENDPOINT,
 } from '../../../sample-data/b2b-checkout';
+import { isolateTestsBefore } from '../../../support/utils/test-isolation';
 
-describe('S4HANA Order management', () => {
+describe('S4HANA Order management', { testIsolation: false }, () => {
+  isolateTestsBefore();
   before(() => {
     cy.window().then((win) => win.sessionStorage.clear());
     Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
@@ -65,7 +67,7 @@ describe('S4HANA Order management', () => {
     });
 
     it('should select delivery mode', () => {
-      b2bCheckout.selectAccountDeliveryMode();
+      s4omHelper.selectAccountDeliveryMode();
     });
 
     it('should review and place order', () => {
@@ -87,10 +89,12 @@ describe('S4HANA Order management', () => {
         s4omHelper.cartWithS4OMB2bProductAndPremiumShipping,
         true,
         null,
+        s4omHelper.s4omPONumber,
         s4omHelper.s4omCostCenter,
         s4omHelper.s4omB2BUnit
       );
       s4omHelper.verifyScheduleLineInfo();
+      s4omHelper.setOrderConfirmationIdInSessionStorage('s4omOrderId');
     });
   });
   describe('Schedule lines in Order History', () => {
@@ -99,9 +103,14 @@ describe('S4HANA Order management', () => {
       const ordersAlias = interceptOrdersEndpoint();
       waitForResponse(ordersAlias);
 
-      cy.get('cx-order-history h2').should('contain', 'Order history');
-      cy.get('.cx-order-history-po a').should('contain', poNumber);
-      //cy.get('.cx-order-history-cost-center a').should('contain', s4omHelper.s4omCostCenter);
+      const s4omPastOrderId =
+        window.sessionStorage.getItem('s4omOrderId') || '103439';
+      cy.wrap(s4omPastOrderId).should('not.be.null');
+      s4omHelper.findRowInOrderHistoryTable(
+        ordersAlias,
+        s4omPastOrderId,
+        poNumber
+      );
     });
 
     it('should be able to view a past order detail in order detail page with schedule line delivery information', () => {
@@ -112,7 +121,11 @@ describe('S4HANA Order management', () => {
         )}/users/current/orders/*`,
       }).as('getOrderDetail');
 
-      cy.visit('/my-account/order/' + s4omHelper.s4omPastOrderId);
+      const s4omPastOrderId =
+        window.sessionStorage.getItem('s4omOrderId') ||
+        s4omHelper.s4omPastOrderId;
+      cy.wrap(s4omPastOrderId).should('not.be.null');
+      cy.visit('/my-account/order/' + s4omPastOrderId);
       cy.wait('@getOrderDetail');
 
       s4omHelper.reviewB2bOrderDetail(
@@ -121,6 +134,7 @@ describe('S4HANA Order management', () => {
         s4omHelper.cartWithS4OMB2bProductAndPremiumShipping,
         true,
         null,
+        s4omHelper.s4omPONumber,
         s4omHelper.s4omCostCenter,
         s4omHelper.s4omB2BUnit,
         false
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
index 3b0f90c1806..7937013ef08 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -158,14 +158,14 @@ export function addB2bProductToCart() {
   addCheapProductToCart(products[0]);
 }
 
-export function enterPONumber() {
+export function enterPONumber(poNum: string = poNumber) {
   cy.get('cx-payment-type .cx-payment-type-container').should(
     'contain',
     'Payment method'
   );
 
   cy.get('cx-payment-type').within(() => {
-    cy.get('.form-control').clear().type(poNumber);
+    cy.get('.form-control').clear().type(poNum);
   });
 
   // Accessibility
@@ -320,7 +320,10 @@ export function reviewB2bReviewOrderPage(
   cartData: SampleCartProduct,
   isAccount: boolean,
   orderType: string,
-  conf: TabbingOrderConfig = config
+  conf: TabbingOrderConfig = config,
+  poNum: string = poNumber,
+  costCtr: string = costCenter,
+  b2bUnt: string = b2bUnit
 ) {
   verifyReviewOrderPage();
 
@@ -329,7 +332,7 @@ export function reviewB2bReviewOrderPage(
       .contains('cx-card', 'Purchase Order Number')
       .find('.cx-card-container')
       .within(() => {
-        cy.findByText(poNumber);
+        cy.findByText(poNum);
       });
 
     cy.get('.cx-review-summary-card')
@@ -343,8 +346,8 @@ export function reviewB2bReviewOrderPage(
       .contains('cx-card', 'Cost Center')
       .find('.cx-card-container')
       .within(() => {
-        cy.findByText(costCenter);
-        cy.findByText(`(${b2bUnit})`);
+        cy.findByText(costCtr);
+        cy.findByText(`(${b2bUnt})`);
       });
   }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
new file mode 100644
index 00000000000..c3f8432f38b
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
@@ -0,0 +1,173 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  b2bDeliveryAddress,
+  b2bDeliveryModeStub,
+} from '../../../sample-data/b2b-checkout';
+import { interceptGet } from '../../../support/utils/intercept';
+import { tabbingOrderConfig } from '../../accessibility/b2b/tabbing-order.config';
+import { verifyTabbingOrder } from '../../accessibility/tabbing-order';
+import {
+  TabbingOrderConfig,
+  TabbingOrderTypes,
+} from '../../accessibility/tabbing-order.model';
+import {
+  interceptCheckoutB2BDetailsEndpoint,
+  interceptPutDeliveryModeEndpoint,
+} from '../../b2b/b2b-checkout';
+import { waitForPage } from '../../checkout-flow';
+import * as alerts from '../../global-message';
+
+export const poNumber = '777';
+
+export const rddDeliveryModeTabbingConfig: TabbingOrderConfig = {
+  ...tabbingOrderConfig,
+  deliveryMode: [
+    { value: 'Method ofPayment', type: TabbingOrderTypes.LINK },
+    { value: 'ShippingAddress', type: TabbingOrderTypes.LINK },
+    { value: 'deliveryModeId', type: TabbingOrderTypes.RADIO },
+    { value: 'deliveryModeId', type: TabbingOrderTypes.RADIO },
+    { value: 'requestedDeliveryDate', type: TabbingOrderTypes.GENERIC_INPUT },
+    { value: 'Back', type: TabbingOrderTypes.BUTTON },
+    { value: 'Continue', type: TabbingOrderTypes.BUTTON },
+  ],
+};
+
+export function selectAccountDeliveryMode() {
+  const getCheckoutDetails = interceptCheckoutB2BDetailsEndpoint(
+    b2bDeliveryModeStub,
+    b2bDeliveryAddress.id
+  );
+  const putDeliveryMode = interceptPutDeliveryModeEndpoint();
+
+  interceptGet(
+    'cart_refresh',
+    '/users/*/carts/*?fields=DEFAULT,potentialProductPromotions*'
+  );
+
+  cy.get('.cx-checkout-title').should('contain', 'Delivery Method');
+  cy.wait(`@${getCheckoutDetails}`)
+    .its('response.statusCode')
+    .should('eq', 200);
+  cy.get('cx-delivery-mode input').first().should('be.checked');
+  cy.get('cx-delivery-mode input').eq(1).click();
+
+  cy.wait(`@${putDeliveryMode}`).its('response.statusCode').should('eq', 200);
+  cy.get('cx-delivery-mode input').first().should('not.be.checked');
+
+  cy.get('input[type=radio][formcontrolname=deliveryModeId]').should(
+    'not.be.disabled'
+  );
+  cy.get(
+    'input[type=radio][formcontrolname=deliveryModeId]:not(:disabled)'
+  ).then(() => {
+    // Accessibility
+    verifyTabbingOrder(
+      'cx-page-layout.MultiStepCheckoutSummaryPageTemplate',
+      rddDeliveryModeTabbingConfig.deliveryMode
+    );
+  });
+  cy.wait(`@cart_refresh`).then((xhr) => {
+    expect(xhr.request.method).to.eq('GET');
+    expect(xhr.response.statusCode).to.eq(200);
+    if (xhr && xhr.response && xhr.response.body) {
+      if (!xhr.response.body.requestedRetrievalAt) {
+        const alert = alerts.getAlert();
+        alert.should('contain', 'Delivery Date updated successfully.');
+        cy.get('cx-global-message .alert', { timeout: 5000 }).should(
+          'not.exist'
+        );
+      }
+    }
+  });
+
+  verifyRDDDatePickerExists();
+}
+
+export function verifyRDDDatePickerExists() {
+  cy.get('cx-request-delivery-date').should('exist');
+  cy.get('cx-request-delivery-date').within(() => {
+    cy.get('cx-date-picker').should('exist');
+    cy.get('input[type="date"]', { timeout: 3000 }).should('not.be.disabled');
+  });
+}
+
+export function updateRequestedDeliveryDate(date: string) {
+  interceptPutRequestedRetrievalAtEndpoint();
+  cy.get('cx-date-picker').within(() => {
+    cy.get('input[type="date"]', { timeout: 3000 })
+      .should('not.be.disabled')
+      .type(date)
+      .trigger('update');
+  });
+}
+
+export function verifyDeliveryDateErrorMessage() {
+  cy.wait(`@putRetrievalAt`).its('response.statusCode').should('eq', 400);
+  //verify error message is shown.
+  const alert = alerts.getErrorAlert();
+  alert.should(
+    'contain',
+    'Something went wrong. Unable to update the requested date.'
+  );
+}
+
+export function verifyDeliveryDateInfoMessage() {
+  const getCheckoutDetails = interceptCheckoutB2BDetailsEndpoint(
+    b2bDeliveryModeStub,
+    b2bDeliveryAddress.id
+  );
+
+  cy.wait(`@${getCheckoutDetails}`)
+    .its('response.statusCode')
+    .should('eq', 200);
+
+  cy.wait(`@putRetrievalAt`).its('response.statusCode').should('eq', 200);
+  //verify info message is shown.
+  const alert = alerts.getAlert();
+  alert.should('contain', 'Delivery Date updated successfully.');
+}
+
+export function proceedToOrderReviewPage() {
+  const orderReview = waitForPage('/checkout/review-order', 'getReviewOrder');
+  cy.get('button.btn-primary').should('be.enabled').click();
+  cy.wait(`@${orderReview}`, { timeout: 30000 })
+    .its('response.statusCode')
+    .should('eq', 200);
+}
+
+export function verifyRDDOrderReviewPage(date: string) {
+  cy.get('.cx-review-summary-card')
+    .contains('cx-card', 'Delivery Method')
+    .get('cx-request-delivery-date')
+    .within(() => {
+      cy.findByText('Requested Delivery Date');
+      cy.findByText(date);
+    });
+}
+
+export function editDeliveryMethodOrderReviewPage() {
+  cy.get('.cx-review-card-shipping > .cx-review-summary-edit-step > a').click();
+  verifyRDDDatePickerExists();
+}
+
+export function verifyRDDOrderDetailPage(date: string) {
+  cy.get('cx-order-overview-delivery-date').should('exist');
+  cy.get('cx-order-overview-delivery-date').within(() => {
+    cy.findByText('Requested Delivery Date');
+    cy.findByText(date);
+  });
+}
+
+export function interceptPutRequestedRetrievalAtEndpoint() {
+  cy.intercept({
+    method: 'PUT',
+    path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+      'BASE_SITE'
+    )}/**/requestedretrievaldate?requestedRetrievalAt=*`,
+  }).as('putRetrievalAt');
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/s4om/s4om.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/s4om/s4om.ts
index be0ccfe1748..901eb81a8e2 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/s4om/s4om.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/s4om/s4om.ts
@@ -5,6 +5,8 @@
  */
 
 import {
+  b2bDeliveryAddress,
+  b2bDeliveryModeStub,
   cartWithB2bProductAndPremiumShipping,
   poNumber,
   POWERTOOLS_BASESITE,
@@ -16,18 +18,21 @@ import {
   SampleUser,
 } from '../../../sample-data/checkout-flow';
 import { AccountData } from '../../../support/require-logged-in.commands';
+import { interceptGet, interceptPost } from '../../../support/utils/intercept';
 import { tabbingOrderConfig } from '../../accessibility/b2b/tabbing-order.config';
 import { verifyTabbingOrder } from '../../accessibility/tabbing-order';
 import {
   TabbingOrderConfig,
   TabbingOrderTypes,
 } from '../../accessibility/tabbing-order.model';
-import { addProductToCart } from '../../applied-promotions';
 import { login } from '../../auth-forms';
-import { interceptPutDeliveryModeEndpoint } from '../../b2b/b2b-checkout';
+import {
+  interceptCheckoutB2BDetailsEndpoint,
+  interceptPutDeliveryModeEndpoint,
+} from '../../b2b/b2b-checkout';
 import { clearActiveCart, goToCart, validateEmptyCart } from '../../cart';
-//import { interceptPaymentTypesEndpoint } from "../../b2b/b2b-checkout";
 import { waitForPage, waitForProductPage } from '../../checkout-flow';
+import { LOCATORS } from '../../pickup-in-store-utils';
 
 export const s4omB2BUser: AccountData = {
   registrationData: {
@@ -46,14 +51,14 @@ export const s4omB2bAccountShipToUser: SampleUser = {
   fullName: 'James Weber',
   address: {
     city: 'Chicago',
-    line1: 'Sunset, 87654, California, Beverly Hills, 90210',
+    line1: 'Sunset',
   },
 };
 
 export const cartWithS4OMB2bProductAndPremiumShipping: SampleCartProduct = {
   estimatedShipping: '$16.99',
-  total: '$17.55',
-  totalAndShipping: '$34.54',
+  total: '$12.55',
+  totalAndShipping: '$30.72',
 };
 
 export const s4omProduct: SampleProduct = {
@@ -62,9 +67,10 @@ export const s4omProduct: SampleProduct = {
 };
 
 export const s4omProductLink: string = s4omProduct.code + '/multi-eco-33i';
-export const s4omCostCenter: string = '17100005_CC';
+export const s4omPONumber: string = poNumber;
+export const s4omCostCenter: string = '17100003_CC';
 export const s4omB2BUnit: string = 'Dell Bont Industries';
-export const s4omPastOrderId: string = '787';
+export const s4omPastOrderId: string = '103300';
 
 const acceptAndSubmitOrder = [
   {
@@ -80,7 +86,7 @@ const acceptAndSubmitOrder = [
 
 export const s4omAccountReviewOrderGeneral = [
   { value: 'Method ofPayment', type: TabbingOrderTypes.LINK },
-  { value: 'DeliveryAddress', type: TabbingOrderTypes.LINK },
+  { value: 'ShippingAddress', type: TabbingOrderTypes.LINK },
   { value: 'DeliveryMode', type: TabbingOrderTypes.LINK },
   {
     value: '/powertools-spa/en/USD/checkout/payment-type',
@@ -120,6 +126,19 @@ export const s4omAccountReviewOrderGeneral = [
   },
 ];
 
+export const s4omDeliveryModeTabbingConfig: TabbingOrderConfig = {
+  ...tabbingOrderConfig,
+  deliveryMode: [
+    { value: 'Method ofPayment', type: TabbingOrderTypes.LINK },
+    { value: 'ShippingAddress', type: TabbingOrderTypes.LINK },
+    { value: 'deliveryModeId', type: TabbingOrderTypes.RADIO },
+    { value: 'deliveryModeId', type: TabbingOrderTypes.RADIO },
+    { value: 'requestedDeliveryDate', type: TabbingOrderTypes.GENERIC_INPUT },
+    { value: 'Back', type: TabbingOrderTypes.BUTTON },
+    { value: 'Continue', type: TabbingOrderTypes.BUTTON },
+  ],
+};
+
 export const s4omTabbingOrderConfig: TabbingOrderConfig = {
   ...tabbingOrderConfig,
   checkoutReviewOrder: [
@@ -145,6 +164,7 @@ export function loginS4OMB2bUser() {
 
   cy.window().then((win) => win.sessionStorage.clear());
   cy.visit('/login');
+  cy.get(LOCATORS.ALLOW_COOKIES_BUTTON).click();
   login(
     s4omB2BUser.registrationData.email,
     s4omB2BUser.registrationData.password
@@ -165,7 +185,41 @@ export function addB2bS4ProductToCart() {
     cy.get('h1').should('contain', s4omProduct.name);
   });
 
-  addProductToCart();
+  interceptPost(`cart_entry`, `/orgUsers/current/carts/*/entries*`);
+
+  interceptGet(
+    'cart_refresh',
+    '/users/*/carts/*?fields=DEFAULT,potentialProductPromotions*'
+  );
+  cy.get('cx-add-to-cart')
+    .findByText(/Add To Cart/i)
+    .click();
+
+  //Obtain schedule line info from Cart Entry
+  cy.wait('@cart_entry')
+    .then((xhr) => {
+      expect(xhr.request.method).to.eq('POST');
+      if (
+        xhr &&
+        xhr.response &&
+        xhr.response.body &&
+        xhr.response.body.entry &&
+        xhr.response.body.entry.scheduleLines
+      ) {
+        window.sessionStorage.setItem(
+          'TG11-scheduleLines',
+          JSON.stringify(xhr.response.body.entry.scheduleLines)
+        );
+      }
+    })
+    .its('response.statusCode')
+    .should('eq', 200);
+
+  cy.wait(`@cart_refresh`);
+
+  cy.get('cx-added-to-cart-dialog').within(() => {
+    cy.get('.cx-name .cx-link').should('contain', s4omProduct.name);
+  });
 }
 
 export function resetCart() {
@@ -184,9 +238,29 @@ export function goToCart() {
 }
 
 export function verifyScheduleLineInfo() {
-  cy.get('[class="cx-schedule-line-info"]').within(() => {
-    cy.findByText('Quantity');
-  });
+  let scheduleLines = window.sessionStorage.getItem('TG11-scheduleLines');
+  cy.wrap('scheduleLines').should('not.be.null');
+
+  scheduleLines = JSON.parse(scheduleLines);
+  cy.wrap('scheduleLines').should('have.length.at.least', 1);
+
+  for (let i = 0; i < scheduleLines.length; i++) {
+    cy.get('[aria-describedby="cx-schedule-line-info-' + i + '"]').within(
+      () => {
+        const confirmedDate = new Date(
+          scheduleLines[i]['confirmedAt']
+        ).toLocaleDateString('en', {
+          year: 'numeric',
+          month: 'numeric',
+          day: 'numeric',
+        });
+
+        cy.contains(confirmedDate);
+        cy.contains('Qty');
+        cy.contains(scheduleLines[i]['confirmedQuantity']);
+      }
+    );
+  }
 }
 
 export function proceedtoCheckOutS4Product() {
@@ -200,7 +274,9 @@ export function proceedtoCheckOutS4Product() {
 
 export function selectS4OMAccountShippingAddress() {
   const putDeliveryMode = interceptPutDeliveryModeEndpoint();
-  cy.wait(7000); //delivery address loads slow
+  cy.get('.cx-delivery-address-card-inner > cx-card .card-header', {
+    timeout: 15000,
+  }).should('contain', 'Selected'); //delivery address loads slow
   cy.get('.cx-checkout-title').should('contain', 'Shipping Address');
   cy.get('cx-order-summary .cx-summary-partials .cx-summary-row')
     .first()
@@ -234,12 +310,53 @@ export function selectS4OMAccountShippingAddress() {
   cy.wait(`@${putDeliveryMode}`).its('response.statusCode').should('eq', 200);
 }
 
+export function selectAccountDeliveryMode() {
+  const getCheckoutDetails = interceptCheckoutB2BDetailsEndpoint(
+    b2bDeliveryModeStub,
+    b2bDeliveryAddress.id
+  );
+  const putDeliveryMode = interceptPutDeliveryModeEndpoint();
+
+  cy.get('.cx-checkout-title').should('contain', 'Delivery Method');
+
+  cy.get('cx-delivery-mode input').first().should('be.checked');
+  cy.get('cx-delivery-mode input').eq(1).click();
+
+  cy.wait(`@${putDeliveryMode}`).its('response.statusCode').should('eq', 200);
+  cy.wait(`@${getCheckoutDetails}`)
+    .its('response.statusCode')
+    .should('eq', 200);
+
+  cy.get('cx-delivery-mode input').first().should('not.be.checked');
+
+  cy.get(
+    'input[type=radio][formcontrolname=deliveryModeId]:not(:disabled)'
+  ).then(() => {
+    // Accessibility
+    verifyTabbingOrder(
+      'cx-page-layout.MultiStepCheckoutSummaryPageTemplate',
+      s4omDeliveryModeTabbingConfig.deliveryMode
+    );
+  });
+
+  const orderReview = waitForPage('/checkout/review-order', 'getReviewOrder');
+
+  cy.get('.cx-checkout-btns button.btn-primary')
+    .should('be.enabled')
+    .click({ force: true });
+
+  cy.wait(`@${orderReview}`, { timeout: 30000 })
+    .its('response.statusCode')
+    .should('eq', 200);
+}
+
 export function reviewB2bOrderDetail(
   sampleUser: SampleUser = s4omB2bAccountShipToUser,
   sampleProduct: SampleProduct = s4omProduct,
   cartData: SampleCartProduct,
   isAccount: boolean = true,
   replenishment?: string,
+  poNum: string = s4omPONumber,
   costCtr: string = s4omCostCenter,
   b2bUnt: string = s4omB2BUnit,
   isOrderConfirmation: boolean = true
@@ -253,14 +370,16 @@ export function reviewB2bOrderDetail(
 
   cy.get('cx-order-overview .container').within(() => {
     cy.get('.cx-summary-card:nth-child(1)').within(() => {
-      cy.get('cx-card:nth-child(1)').within(() => {
-        if (!replenishment) {
-          cy.get('.cx-card-title').should('contain', 'Order Number');
-        } else {
-          cy.get('.cx-card-title').should('contain', 'Replenishment #');
-        }
-        cy.get('.cx-card-label').should('not.be.empty');
-      });
+      cy.get('cx-card:nth-child(1)')
+        .first()
+        .within(() => {
+          if (!replenishment) {
+            cy.get('.cx-card-title').should('contain', 'Order Number');
+          } else {
+            cy.get('.cx-card-title').should('contain', 'Replenishment #');
+          }
+          cy.get('.cx-card-label').should('not.be.empty');
+        });
       if (!replenishment) {
         cy.get('cx-card:nth-child(2)').within(() => {
           cy.get('.cx-card-title').should('contain', 'Placed on');
@@ -279,15 +398,29 @@ export function reviewB2bOrderDetail(
     });
 
     if (!replenishment) {
-      cy.get('.cx-summary-card:nth-child(2) .cx-card').within(() => {
-        cy.contains(poNumber);
-        if (isAccount) {
-          cy.contains('Account');
-          cy.contains(costCtr);
-          cy.contains(`(${b2bUnt})`);
-        } else {
-          cy.contains('Credit Card');
-        }
+      cy.get('.cx-summary-card:nth-child(2)').within(() => {
+        cy.get('.cx-card')
+          .eq(0)
+          .within(() => {
+            cy.contains(poNum);
+          });
+        cy.get('.cx-card')
+          .eq(1)
+          .within(() => {
+            if (isAccount) {
+              cy.contains('Account');
+            } else {
+              cy.contains('Credit Card');
+            }
+          });
+        cy.get('.cx-card')
+          .eq(2)
+          .within(() => {
+            if (isAccount) {
+              cy.contains(costCtr);
+              cy.contains(`(${b2bUnt})`);
+            }
+          });
       });
     } else {
       cy.get('.cx-summary-card:nth-child(2) .cx-card').within(() => {
@@ -296,7 +429,7 @@ export function reviewB2bOrderDetail(
       });
 
       cy.get('.cx-summary-card:nth-child(3) .cx-card').within(() => {
-        cy.contains(poNumber);
+        cy.contains(poNum);
         if (isAccount) {
           cy.contains('Account');
           cy.contains(costCtr);
@@ -308,18 +441,25 @@ export function reviewB2bOrderDetail(
     }
 
     if (!replenishment) {
-      cy.get('.cx-summary-card:nth-child(3) .cx-card').within(() => {
-        cy.contains(sampleUser.fullName);
-        cy.contains(sampleUser.address.line1);
-
-        if (
-          cartData.estimatedShipping ===
-          cartWithB2bProductAndPremiumShipping.estimatedShipping
-        ) {
-          cy.contains('Premium Delivery');
-        } else {
-          cy.contains('Standard Delivery');
-        }
+      cy.get('.cx-summary-card:nth-child(3)').within(() => {
+        cy.get('.cx-card')
+          .eq(0)
+          .within(() => {
+            cy.contains(sampleUser.fullName);
+            cy.contains(sampleUser.address.line1);
+          });
+        cy.get('.cx-card')
+          .eq(1)
+          .within(() => {
+            if (
+              cartData.estimatedShipping ===
+              cartWithB2bProductAndPremiumShipping.estimatedShipping
+            ) {
+              cy.contains('Premium Delivery');
+            } else {
+              cy.contains('Standard Delivery');
+            }
+          });
       });
     } else {
       cy.get('.cx-summary-card:nth-child(4) .cx-card').within(() => {
@@ -345,3 +485,47 @@ export function reviewB2bOrderDetail(
     cartData.totalAndShipping
   );
 }
+
+export function setOrderConfirmationIdInSessionStorage(alias: string) {
+  cy.get('cx-order-overview .container').within(() => {
+    cy.get('.cx-summary-card:nth-child(1)').within(() => {
+      cy.get('cx-card:nth-child(1)')
+        .first()
+        .within(() => {
+          cy.get('.cx-card-title').should('contain', 'Order Number');
+          cy.get('.cx-card-label').then(($el) => {
+            window.sessionStorage.setItem(alias, $el.text().trim());
+          });
+        });
+    });
+  });
+  return alias;
+}
+
+export function findRowInOrderHistoryTable(
+  orderAPIAlias: string,
+  orderId: string,
+  poNum: string,
+  costCenter?: string
+) {
+  cy.get('cx-order-history h2').should('contain', 'Order history');
+
+  let index = 2; //start navigating from the second page
+  cy.get('#order-history-table').as('orderHistoryTable');
+  const goToNextPage = () => {
+    cy.get('@orderHistoryTable').then(($odt) => {
+      if ($odt.html().includes(orderId)) {
+        cy.get('.cx-order-history-code a').should('contain', orderId);
+        cy.get('.cx-order-history-po a').should('contain', poNum);
+        if (costCenter) {
+          cy.get('.cx-order-history-po a').should('contain', costCenter);
+        }
+      } else {
+        cy.get('cx-pagination').findByText(index).first().click();
+        index++;
+        cy.wait(`@${orderAPIAlias}`).then(goToNextPage);
+      }
+    });
+  };
+  goToNextPage();
+}
diff --git a/projects/storefrontapp/project.json b/projects/storefrontapp/project.json
index 36b2eb16a26..d52aecd7154 100644
--- a/projects/storefrontapp/project.json
+++ b/projects/storefrontapp/project.json
@@ -57,6 +57,10 @@
             "input": "projects/storefrontapp/src/styles/lib-qualtrics.scss",
             "bundleName": "qualtrics"
           },
+          {
+            "input": "projects/storefrontapp/src/styles/lib-requested-delivery-date.scss",
+            "bundleName": "requested-delivery-date"
+          },
           {
             "input": "projects/storefrontapp/src/styles/lib-cart.scss",
             "bundleName": "cart"
diff --git a/projects/storefrontapp/src/app/spartacus/features/requested-delivery-date/requested-delivery-date-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/requested-delivery-date/requested-delivery-date-feature.module.ts
new file mode 100644
index 00000000000..fe1dd2a6726
--- /dev/null
+++ b/projects/storefrontapp/src/app/spartacus/features/requested-delivery-date/requested-delivery-date-feature.module.ts
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { CmsConfig, I18nConfig, provideConfig } from '@spartacus/core';
+import {
+  requestedDeliveryDateTranslationChunksConfig,
+  requestedDeliveryDateTranslations,
+} from '@spartacus/requested-delivery-date/assets';
+import {
+  RequestedDeliveryDateRootModule,
+  REQUESTED_DELIVERY_DATE_FEATURE,
+} from '@spartacus/requested-delivery-date/root';
+
+@NgModule({
+  imports: [RequestedDeliveryDateRootModule],
+  providers: [
+    provideConfig(<CmsConfig>{
+      featureModules: {
+        [REQUESTED_DELIVERY_DATE_FEATURE]: {
+          module: () =>
+            import('@spartacus/requested-delivery-date').then(
+              (m) => m.RequestedDeliveryDateModule
+            ),
+        },
+      },
+    }),
+    provideConfig(<I18nConfig>{
+      i18n: {
+        resources: requestedDeliveryDateTranslations,
+        chunks: requestedDeliveryDateTranslationChunksConfig,
+      },
+    }),
+  ],
+})
+export class RequestedDeliveryDateFeatureModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 55a57924202..64a36f93193 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -37,16 +37,16 @@ import {
   NavigationEventModule,
   NavigationModule,
   NotificationPreferenceModule,
-  PDFModule,
   PageTitleModule,
   PaymentMethodsModule,
+  PDFModule,
   ProductCarouselModule,
   ProductDetailsPageModule,
   ProductFacetNavigationModule,
   ProductImagesModule,
   ProductIntroModule,
-  ProductListModule,
   ProductListingPageModule,
+  ProductListModule,
   ProductPageEventModule,
   ProductReferencesModule,
   ProductSummaryModule,
@@ -85,6 +85,7 @@ import { ImageZoomFeatureModule } from './features/product/product-image-zoom-fe
 import { VariantsFeatureModule } from './features/product/product-variants-feature.module';
 import { QualtricsFeatureModule } from './features/qualtrics/qualtrics-feature.module';
 import { OrganizationUserRegistrationFeatureModule } from './features/registration-feature.module';
+import { RequestedDeliveryDateFeatureModule } from './features/requested-delivery-date/requested-delivery-date-feature.module';
 import { S4OMFeatureModule } from './features/s4om/s4om-feature.module';
 import { SegmentRefsFeatureModule } from './features/segment-refs/segment-refs-feature.module';
 import { SmartEditFeatureModule } from './features/smartedit/smartedit-feature.module';
@@ -126,6 +127,9 @@ if (environment.s4om) {
 if (environment.segmentRefs) {
   featureModules.push(SegmentRefsFeatureModule);
 }
+if (environment.requestedDeliveryDate) {
+  featureModules.push(RequestedDeliveryDateFeatureModule);
+}
 
 @NgModule({
   imports: [
diff --git a/projects/storefrontapp/src/environments/environment.prod.ts b/projects/storefrontapp/src/environments/environment.prod.ts
index 79f9fbe2f07..52f3d2609ca 100644
--- a/projects/storefrontapp/src/environments/environment.prod.ts
+++ b/projects/storefrontapp/src/environments/environment.prod.ts
@@ -18,4 +18,5 @@ export const environment: Environment = {
   epdVisualization: buildProcess.env.CX_EPD_VISUALIZATION,
   s4om: buildProcess.env.CX_S4OM,
   segmentRefs: buildProcess.env.CX_SEGMENT_REFS,
+  requestedDeliveryDate: buildProcess.env.CX_REQUESTED_DELIVERY_DATE,
 };
diff --git a/projects/storefrontapp/src/environments/environment.ts b/projects/storefrontapp/src/environments/environment.ts
index b7a561e1809..18033dad14d 100644
--- a/projects/storefrontapp/src/environments/environment.ts
+++ b/projects/storefrontapp/src/environments/environment.ts
@@ -31,4 +31,5 @@ export const environment: Environment = {
   epdVisualization: buildProcess.env.CX_EPD_VISUALIZATION ?? false,
   s4om: buildProcess.env.CX_S4OM ?? false,
   segmentRefs: buildProcess.env.CX_SEGMENT_REFS ?? false,
+  requestedDeliveryDate: buildProcess.env.CX_REQUESTED_DELIVERY_DATE ?? false,
 };
diff --git a/projects/storefrontapp/src/environments/models/build.process.env.d.ts b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
index 0293384c55a..b6e0f46055d 100644
--- a/projects/storefrontapp/src/environments/models/build.process.env.d.ts
+++ b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
@@ -20,4 +20,5 @@ interface Env {
   CX_EPD_VISUALIZATION: boolean;
   CX_S4OM: boolean;
   CX_SEGMENT_REFS: boolean;
+  CX_REQUESTED_DELIVERY_DATE: boolean;
 }
diff --git a/projects/storefrontapp/src/environments/models/environment.model.ts b/projects/storefrontapp/src/environments/models/environment.model.ts
index 1a6cff360b6..4e6b60e944d 100644
--- a/projects/storefrontapp/src/environments/models/environment.model.ts
+++ b/projects/storefrontapp/src/environments/models/environment.model.ts
@@ -16,4 +16,5 @@ export interface Environment {
   epdVisualization: boolean;
   s4om: boolean;
   segmentRefs: boolean;
+  requestedDeliveryDate: boolean;
 }
diff --git a/projects/storefrontapp/src/styles/lib-requested-delivery-date.scss b/projects/storefrontapp/src/styles/lib-requested-delivery-date.scss
new file mode 100644
index 00000000000..e312d35ff2d
--- /dev/null
+++ b/projects/storefrontapp/src/styles/lib-requested-delivery-date.scss
@@ -0,0 +1,2 @@
+@import '../styles-config';
+@import '@spartacus/requested-delivery-date';
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index c604fd5b3dc..e0859d2d97d 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -255,6 +255,19 @@
       "@spartacus/qualtrics/components": ["dist/qualtrics/components"],
       "@spartacus/qualtrics": ["dist/qualtrics"],
       "@spartacus/qualtrics/root": ["dist/qualtrics/root"],
+      "@spartacus/requested-delivery-date/assets": [
+        "dist/requested-delivery-date/assets"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "dist/requested-delivery-date/core"
+      ],
+      "@spartacus/requested-delivery-date": ["dist/requested-delivery-date"],
+      "@spartacus/requested-delivery-date/occ": [
+        "dist/requested-delivery-date/occ"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "dist/requested-delivery-date/root"
+      ],
       "@spartacus/smartedit/core": ["dist/smartedit/core"],
       "@spartacus/smartedit": ["dist/smartedit"],
       "@spartacus/smartedit/root": ["dist/smartedit/root"],
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 5965f73caa8..6f403d19066 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -374,6 +374,21 @@
       "@spartacus/qualtrics/root": [
         "../../feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "../../feature-libs/smartedit/core/public_api"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index fb2a5bbf0df..9b61f0ef35b 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -286,6 +286,21 @@
       "@spartacus/qualtrics/components": ["../../dist/qualtrics/components"],
       "@spartacus/qualtrics": ["../../dist/qualtrics"],
       "@spartacus/qualtrics/root": ["../../dist/qualtrics/root"],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../dist/requested-delivery-date/assets"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../dist/requested-delivery-date/core"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../dist/requested-delivery-date"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../dist/requested-delivery-date/occ"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../dist/requested-delivery-date/root"
+      ],
       "@spartacus/smartedit/core": ["../../dist/smartedit/core"],
       "@spartacus/smartedit": ["../../dist/smartedit"],
       "@spartacus/smartedit/root": ["../../dist/smartedit/root"],
diff --git a/tools/schematics/testing.ts b/tools/schematics/testing.ts
index 802446eacfd..76f198673a0 100644
--- a/tools/schematics/testing.ts
+++ b/tools/schematics/testing.ts
@@ -21,6 +21,7 @@ const featureLibsFolders: string[] = [
   'product',
   'product-configurator',
   'qualtrics',
+  'requested-delivery-date',
   'smartedit',
   'storefinder',
   'tracking',
@@ -55,6 +56,7 @@ const commands = [
   'build s4om/schematics',
   'build segment-refs/schematics',
   'build qualtrics/schematics',
+  'build requested-delivery-date/schematics',
   'build smartedit/schematics',
   'build storefinder/schematics',
   'build tracking/schematics',
@@ -201,6 +203,7 @@ async function executeCommand(command: Command): Promise<void> {
     case 'build product/schematics':
     case 'build product-configurator/schematics':
     case 'build qualtrics/schematics':
+    case 'build requested-delivery-date/schematics':
     case 'build s4om/schematics':
     case 'build segment-refs/schematics':
     case 'build smartedit/schematics':
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index b43f2caf1a4..82f956d5202 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -428,6 +428,21 @@
       "@spartacus/qualtrics/root": [
         "feature-libs/qualtrics/root/public_api"
       ],
+      "@spartacus/requested-delivery-date/assets": [
+        "feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "feature-libs/requested-delivery-date/root/public_api"
+      ],
       "@spartacus/smartedit/core": [
         "feature-libs/smartedit/core/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 9cb8188087e..37eccea84ef 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,13 +9,8 @@
     "moduleResolution": "node",
     "experimentalDecorators": true,
     "target": "ES2022",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "ES2022",
-      "dom"
-    ],
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["ES2022", "dom"],
     "strictPropertyInitialization": false,
     "strict": true,
     "noUnusedLocals": true,
@@ -24,33 +19,15 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "paths": {
-      "@spartacus/schematics": [
-        "projects/schematics/index"
-      ],
-      "@spartacus/setup": [
-        "core-libs/setup/public_api"
-      ],
-      "@spartacus/setup/ssr": [
-        "core-libs/setup/ssr/public_api"
-      ],
-      "@spartacus/asm/assets": [
-        "feature-libs/asm/assets/public_api"
-      ],
-      "@spartacus/asm/components": [
-        "feature-libs/asm/components/public_api"
-      ],
-      "@spartacus/asm/core": [
-        "feature-libs/asm/core/public_api"
-      ],
-      "@spartacus/asm": [
-        "feature-libs/asm/public_api"
-      ],
-      "@spartacus/asm/occ": [
-        "feature-libs/asm/occ/public_api"
-      ],
-      "@spartacus/asm/root": [
-        "feature-libs/asm/root/public_api"
-      ],
+      "@spartacus/schematics": ["projects/schematics/index"],
+      "@spartacus/setup": ["core-libs/setup/public_api"],
+      "@spartacus/setup/ssr": ["core-libs/setup/ssr/public_api"],
+      "@spartacus/asm/assets": ["feature-libs/asm/assets/public_api"],
+      "@spartacus/asm/components": ["feature-libs/asm/components/public_api"],
+      "@spartacus/asm/core": ["feature-libs/asm/core/public_api"],
+      "@spartacus/asm": ["feature-libs/asm/public_api"],
+      "@spartacus/asm/occ": ["feature-libs/asm/occ/public_api"],
+      "@spartacus/asm/root": ["feature-libs/asm/root/public_api"],
       "@spartacus/cart/base/assets": [
         "feature-libs/cart/base/assets/public_api"
       ],
@@ -63,18 +40,10 @@
       "@spartacus/cart/base/components": [
         "feature-libs/cart/base/components/public_api"
       ],
-      "@spartacus/cart/base/core": [
-        "feature-libs/cart/base/core/public_api"
-      ],
-      "@spartacus/cart/base": [
-        "feature-libs/cart/base/public_api"
-      ],
-      "@spartacus/cart/base/occ": [
-        "feature-libs/cart/base/occ/public_api"
-      ],
-      "@spartacus/cart/base/root": [
-        "feature-libs/cart/base/root/public_api"
-      ],
+      "@spartacus/cart/base/core": ["feature-libs/cart/base/core/public_api"],
+      "@spartacus/cart/base": ["feature-libs/cart/base/public_api"],
+      "@spartacus/cart/base/occ": ["feature-libs/cart/base/occ/public_api"],
+      "@spartacus/cart/base/root": ["feature-libs/cart/base/root/public_api"],
       "@spartacus/cart/import-export/assets": [
         "feature-libs/cart/import-export/assets/public_api"
       ],
@@ -90,9 +59,7 @@
       "@spartacus/cart/import-export/root": [
         "feature-libs/cart/import-export/root/public_api"
       ],
-      "@spartacus/cart": [
-        "feature-libs/cart/public_api"
-      ],
+      "@spartacus/cart": ["feature-libs/cart/public_api"],
       "@spartacus/cart/quick-order/assets": [
         "feature-libs/cart/quick-order/assets/public_api"
       ],
@@ -117,9 +84,7 @@
       "@spartacus/cart/saved-cart/core": [
         "feature-libs/cart/saved-cart/core/public_api"
       ],
-      "@spartacus/cart/saved-cart": [
-        "feature-libs/cart/saved-cart/public_api"
-      ],
+      "@spartacus/cart/saved-cart": ["feature-libs/cart/saved-cart/public_api"],
       "@spartacus/cart/saved-cart/occ": [
         "feature-libs/cart/saved-cart/occ/public_api"
       ],
@@ -138,9 +103,7 @@
       "@spartacus/cart/wish-list/core": [
         "feature-libs/cart/wish-list/core/public_api"
       ],
-      "@spartacus/cart/wish-list": [
-        "feature-libs/cart/wish-list/public_api"
-      ],
+      "@spartacus/cart/wish-list": ["feature-libs/cart/wish-list/public_api"],
       "@spartacus/cart/wish-list/root": [
         "feature-libs/cart/wish-list/root/public_api"
       ],
@@ -153,9 +116,7 @@
       "@spartacus/checkout/b2b/core": [
         "feature-libs/checkout/b2b/core/public_api"
       ],
-      "@spartacus/checkout/b2b": [
-        "feature-libs/checkout/b2b/public_api"
-      ],
+      "@spartacus/checkout/b2b": ["feature-libs/checkout/b2b/public_api"],
       "@spartacus/checkout/b2b/occ": [
         "feature-libs/checkout/b2b/occ/public_api"
       ],
@@ -171,18 +132,14 @@
       "@spartacus/checkout/base/core": [
         "feature-libs/checkout/base/core/public_api"
       ],
-      "@spartacus/checkout/base": [
-        "feature-libs/checkout/base/public_api"
-      ],
+      "@spartacus/checkout/base": ["feature-libs/checkout/base/public_api"],
       "@spartacus/checkout/base/occ": [
         "feature-libs/checkout/base/occ/public_api"
       ],
       "@spartacus/checkout/base/root": [
         "feature-libs/checkout/base/root/public_api"
       ],
-      "@spartacus/checkout": [
-        "feature-libs/checkout/public_api"
-      ],
+      "@spartacus/checkout": ["feature-libs/checkout/public_api"],
       "@spartacus/checkout/scheduled-replenishment/assets": [
         "feature-libs/checkout/scheduled-replenishment/assets/public_api"
       ],
@@ -213,24 +170,14 @@
       "@spartacus/customer-ticketing/root": [
         "feature-libs/customer-ticketing/root/public_api"
       ],
-      "@spartacus/order/assets": [
-        "feature-libs/order/assets/public_api"
-      ],
+      "@spartacus/order/assets": ["feature-libs/order/assets/public_api"],
       "@spartacus/order/components": [
         "feature-libs/order/components/public_api"
       ],
-      "@spartacus/order/core": [
-        "feature-libs/order/core/public_api"
-      ],
-      "@spartacus/order": [
-        "feature-libs/order/public_api"
-      ],
-      "@spartacus/order/occ": [
-        "feature-libs/order/occ/public_api"
-      ],
-      "@spartacus/order/root": [
-        "feature-libs/order/root/public_api"
-      ],
+      "@spartacus/order/core": ["feature-libs/order/core/public_api"],
+      "@spartacus/order": ["feature-libs/order/public_api"],
+      "@spartacus/order/occ": ["feature-libs/order/occ/public_api"],
+      "@spartacus/order/root": ["feature-libs/order/root/public_api"],
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
       ],
@@ -267,9 +214,7 @@
       "@spartacus/organization/administration/root": [
         "feature-libs/organization/administration/root/public_api"
       ],
-      "@spartacus/organization": [
-        "feature-libs/organization/public_api"
-      ],
+      "@spartacus/organization": ["feature-libs/organization/public_api"],
       "@spartacus/organization/order-approval/assets": [
         "feature-libs/organization/order-approval/assets/public_api"
       ],
@@ -324,9 +269,7 @@
       "@spartacus/pickup-in-store/core": [
         "feature-libs/pickup-in-store/core/public_api"
       ],
-      "@spartacus/pickup-in-store": [
-        "feature-libs/pickup-in-store/public_api"
-      ],
+      "@spartacus/pickup-in-store": ["feature-libs/pickup-in-store/public_api"],
       "@spartacus/pickup-in-store/occ": [
         "feature-libs/pickup-in-store/occ/public_api"
       ],
@@ -405,9 +348,7 @@
       "@spartacus/product/image-zoom/root": [
         "feature-libs/product/image-zoom/root/public_api"
       ],
-      "@spartacus/product": [
-        "feature-libs/product/public_api"
-      ],
+      "@spartacus/product": ["feature-libs/product/public_api"],
       "@spartacus/product/variants/assets": [
         "feature-libs/product/variants/assets/public_api"
       ],
@@ -426,21 +367,26 @@
       "@spartacus/qualtrics/components": [
         "feature-libs/qualtrics/components/public_api"
       ],
-      "@spartacus/qualtrics": [
-        "feature-libs/qualtrics/public_api"
+      "@spartacus/qualtrics": ["feature-libs/qualtrics/public_api"],
+      "@spartacus/qualtrics/root": ["feature-libs/qualtrics/root/public_api"],
+      "@spartacus/requested-delivery-date/assets": [
+        "feature-libs/requested-delivery-date/assets/public_api"
       ],
-      "@spartacus/qualtrics/root": [
-        "feature-libs/qualtrics/root/public_api"
+      "@spartacus/requested-delivery-date/core": [
+        "feature-libs/requested-delivery-date/core/public_api"
       ],
-      "@spartacus/smartedit/core": [
-        "feature-libs/smartedit/core/public_api"
+      "@spartacus/requested-delivery-date": [
+        "feature-libs/requested-delivery-date/public_api"
       ],
-      "@spartacus/smartedit": [
-        "feature-libs/smartedit/public_api"
+      "@spartacus/requested-delivery-date/occ": [
+        "feature-libs/requested-delivery-date/occ/public_api"
       ],
-      "@spartacus/smartedit/root": [
-        "feature-libs/smartedit/root/public_api"
+      "@spartacus/requested-delivery-date/root": [
+        "feature-libs/requested-delivery-date/root/public_api"
       ],
+      "@spartacus/smartedit/core": ["feature-libs/smartedit/core/public_api"],
+      "@spartacus/smartedit": ["feature-libs/smartedit/public_api"],
+      "@spartacus/smartedit/root": ["feature-libs/smartedit/root/public_api"],
       "@spartacus/storefinder/assets": [
         "feature-libs/storefinder/assets/public_api"
       ],
@@ -450,18 +396,12 @@
       "@spartacus/storefinder/core": [
         "feature-libs/storefinder/core/public_api"
       ],
-      "@spartacus/storefinder": [
-        "feature-libs/storefinder/public_api"
-      ],
-      "@spartacus/storefinder/occ": [
-        "feature-libs/storefinder/occ/public_api"
-      ],
+      "@spartacus/storefinder": ["feature-libs/storefinder/public_api"],
+      "@spartacus/storefinder/occ": ["feature-libs/storefinder/occ/public_api"],
       "@spartacus/storefinder/root": [
         "feature-libs/storefinder/root/public_api"
       ],
-      "@spartacus/tracking": [
-        "feature-libs/tracking/public_api"
-      ],
+      "@spartacus/tracking": ["feature-libs/tracking/public_api"],
       "@spartacus/tracking/personalization/core": [
         "feature-libs/tracking/personalization/core/public_api"
       ],
@@ -480,9 +420,7 @@
       "@spartacus/tracking/tms/gtm": [
         "feature-libs/tracking/tms/gtm/public_api"
       ],
-      "@spartacus/tracking/tms": [
-        "feature-libs/tracking/tms/public_api"
-      ],
+      "@spartacus/tracking/tms": ["feature-libs/tracking/tms/public_api"],
       "@spartacus/user/account/assets": [
         "feature-libs/user/account/assets/public_api"
       ],
@@ -492,18 +430,14 @@
       "@spartacus/user/account/core": [
         "feature-libs/user/account/core/public_api"
       ],
-      "@spartacus/user/account": [
-        "feature-libs/user/account/public_api"
-      ],
+      "@spartacus/user/account": ["feature-libs/user/account/public_api"],
       "@spartacus/user/account/occ": [
         "feature-libs/user/account/occ/public_api"
       ],
       "@spartacus/user/account/root": [
         "feature-libs/user/account/root/public_api"
       ],
-      "@spartacus/user": [
-        "feature-libs/user/public_api"
-      ],
+      "@spartacus/user": ["feature-libs/user/public_api"],
       "@spartacus/user/profile/assets": [
         "feature-libs/user/profile/assets/public_api"
       ],
@@ -513,45 +447,33 @@
       "@spartacus/user/profile/core": [
         "feature-libs/user/profile/core/public_api"
       ],
-      "@spartacus/user/profile": [
-        "feature-libs/user/profile/public_api"
-      ],
+      "@spartacus/user/profile": ["feature-libs/user/profile/public_api"],
       "@spartacus/user/profile/occ": [
         "feature-libs/user/profile/occ/public_api"
       ],
       "@spartacus/user/profile/root": [
         "feature-libs/user/profile/root/public_api"
       ],
-      "@spartacus/cdc/assets": [
-        "integration-libs/cdc/assets/public_api"
-      ],
+      "@spartacus/cdc/assets": ["integration-libs/cdc/assets/public_api"],
       "@spartacus/cdc/components": [
         "integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/core": [
-        "integration-libs/cdc/core/public_api"
-      ],
-      "@spartacus/cdc": [
-        "integration-libs/cdc/public_api"
-      ],
+      "@spartacus/cdc/core": ["integration-libs/cdc/core/public_api"],
+      "@spartacus/cdc": ["integration-libs/cdc/public_api"],
       "@spartacus/cdc/organization/administration": [
         "integration-libs/cdc/organization/administration/public_api"
       ],
       "@spartacus/cdc/organization/user-registration": [
         "integration-libs/cdc/organization/user-registration/public_api"
       ],
-      "@spartacus/cdc/root": [
-        "integration-libs/cdc/root/public_api"
-      ],
+      "@spartacus/cdc/root": ["integration-libs/cdc/root/public_api"],
       "@spartacus/cdc/user-account": [
         "integration-libs/cdc/user-account/public_api"
       ],
       "@spartacus/cdc/user-profile": [
         "integration-libs/cdc/user-profile/public_api"
       ],
-      "@spartacus/cds": [
-        "integration-libs/cds/public_api"
-      ],
+      "@spartacus/cds": ["integration-libs/cds/public_api"],
       "@spartacus/digital-payments/assets": [
         "integration-libs/digital-payments/assets/public_api"
       ],
@@ -576,37 +498,20 @@
       "@spartacus/epd-visualization/root": [
         "integration-libs/epd-visualization/root/public_api"
       ],
-      "@spartacus/s4om/assets": [
-        "integration-libs/s4om/assets/public_api"
-      ],
-      "@spartacus/s4om": [
-        "integration-libs/s4om/public_api"
-      ],
-      "@spartacus/s4om/root": [
-        "integration-libs/s4om/root/public_api"
-      ],
-      "@spartacus/segment-refs": [
-        "integration-libs/segment-refs/public_api"
-      ],
+      "@spartacus/s4om/assets": ["integration-libs/s4om/assets/public_api"],
+      "@spartacus/s4om": ["integration-libs/s4om/public_api"],
+      "@spartacus/s4om/root": ["integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": ["integration-libs/segment-refs/public_api"],
       "@spartacus/segment-refs/root": [
         "integration-libs/segment-refs/root/public_api"
       ],
-      "@spartacus/assets": [
-        "projects/assets/src/public_api"
-      ],
-      "@spartacus/core": [
-        "projects/core/public_api"
-      ],
-      "@spartacus/storefront": [
-        "projects/storefrontlib/public_api"
-      ]
+      "@spartacus/assets": ["projects/assets/src/public_api"],
+      "@spartacus/core": ["projects/core/public_api"],
+      "@spartacus/storefront": ["projects/storefrontlib/public_api"]
     },
     "useDefineForClassFields": false
   },
-  "exclude": [
-    "./dist",
-    "./projects/storefrontapp-e2e-cypress"
-  ],
+  "exclude": ["./dist", "./projects/storefrontapp-e2e-cypress"],
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
@@ -616,4 +521,4 @@
     "strictTemplates": true,
     "strictInputAccessModifiers": true
   }
-}
\ No newline at end of file
+}

From 82b9b6cc04a46e677f8ccb3f56e9a26275f4b5bb Mon Sep 17 00:00:00 2001
From: Florent Letendre <florent.letendre01@sap.com>
Date: Thu, 10 Aug 2023 09:43:57 -0400
Subject: [PATCH 103/122] fix: blank guest registration form when no guest
 email (#17735)

Co-authored-by: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
---
 ...firmation-thank-you-message.component.html | 29 ++++++++++++++-----
 ...mation-thank-you-message.component.spec.ts |  2 ++
 .../order-confirmation.module.ts              | 10 +++++--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.html b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.html
index 65be1d3c180..d2def26d4ed 100644
--- a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.html
+++ b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.html
@@ -12,13 +12,28 @@ <h2>{{ 'checkoutOrderConfirmation.thankYou' | cxTranslate }}</h2>
       {{ 'checkoutOrderConfirmation.invoiceHasBeenSentByEmail' | cxTranslate }}
     </p>
   </div>
-
-  <div *ngIf="isGuestCustomer">
-    <cx-guest-register-form
-      [guid]="orderGuid"
-      [email]="order.paymentInfo.billingAddress.email"
-    ></cx-guest-register-form>
-  </div>
+  <ng-container *cxFeatureLevel="'6.4'">
+    <div
+      *ngIf="
+        isGuestCustomer &&
+        orderGuid &&
+        order?.paymentInfo?.billingAddress?.email
+      "
+    >
+      <cx-guest-register-form
+        [guid]="orderGuid"
+        [email]="order.paymentInfo.billingAddress.email"
+      ></cx-guest-register-form>
+    </div>
+  </ng-container>
+  <ng-container *cxFeatureLevel="'!6.4'">
+    <div *ngIf="isGuestCustomer">
+      <cx-guest-register-form
+        [guid]="orderGuid"
+        [email]="order.paymentInfo.billingAddress.email"
+      ></cx-guest-register-form>
+    </div>
+  </ng-container>
 
   <cx-add-to-home-screen-banner></cx-add-to-home-screen-banner>
 </ng-container>
diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts
index f28a7abb3dd..539817d23d0 100644
--- a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts
+++ b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts
@@ -7,6 +7,7 @@ import {
   I18nTestingModule,
   TranslationService,
 } from '@spartacus/core';
+import { MockFeatureLevelDirective } from 'projects/storefrontlib/shared/test/mock-feature-level-directive';
 import { OrderFacade } from '@spartacus/order/root';
 import { of } from 'rxjs';
 import { OrderConfirmationThankYouMessageComponent } from './order-confirmation-thank-you-message.component';
@@ -56,6 +57,7 @@ describe('OrderConfirmationThankYouMessageComponent', () => {
           OrderConfirmationThankYouMessageComponent,
           MockAddtoHomeScreenBannerComponent,
           MockGuestRegisterFormComponent,
+          MockFeatureLevelDirective,
         ],
         providers: [
           { provide: OrderFacade, useClass: MockOrderFacade },
diff --git a/feature-libs/order/components/order-confirmation/order-confirmation.module.ts b/feature-libs/order/components/order-confirmation/order-confirmation.module.ts
index 08a0fff09dc..941110deea2 100644
--- a/feature-libs/order/components/order-confirmation/order-confirmation.module.ts
+++ b/feature-libs/order/components/order-confirmation/order-confirmation.module.ts
@@ -7,7 +7,12 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  FeaturesConfigModule,
+  I18nModule,
+  provideDefaultConfig,
+} from '@spartacus/core';
 import {
   OrderConfirmationOrderEntriesContextToken,
   OrderFacade,
@@ -19,8 +24,8 @@ import {
   OutletModule,
   PasswordVisibilityToggleModule,
   PromotionsModule,
-  provideOutlet,
   PwaModule,
+  provideOutlet,
 } from '@spartacus/storefront';
 import { OrderConfirmationGuard } from '../guards/order-confirmation.guard';
 import { OrderDetailBillingComponent } from '../order-details/order-detail-billing/order-detail-billing.component';
@@ -52,6 +57,7 @@ const orderConfirmationComponents = [
     FormErrorsModule,
     OutletModule.forChild(),
     PasswordVisibilityToggleModule,
+    FeaturesConfigModule,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{

From f855bbd70ba9a0c3f8088d5c378d4902182d474e Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Fri, 11 Aug 2023 13:38:46 +0800
Subject: [PATCH 104/122] CXSPA-3902:  Remove outline border of input boxes in
 ASM (#17752)

---
 .../asm/styles/components/_asm-bind-cart.component.scss    | 7 ++-----
 .../styles/components/_csagent-login-form.component.scss   | 3 +++
 .../styles/components/_customer-selection.component.scss   | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/feature-libs/asm/styles/components/_asm-bind-cart.component.scss b/feature-libs/asm/styles/components/_asm-bind-cart.component.scss
index e431f2ef3a9..1646d57f297 100644
--- a/feature-libs/asm/styles/components/_asm-bind-cart.component.scss
+++ b/feature-libs/asm/styles/components/_asm-bind-cart.component.scss
@@ -78,7 +78,7 @@
   }
 
   .cx-asm-assignCart {
-    border: none;
+    border: 1px solid #eff1f2;
     border-radius: 4px;
     background-color: #eff1f2;
     box-shadow: 0px 4px 4px rgb(0 0 0 / 25%);
@@ -101,10 +101,7 @@
     &:active,
     &.active {
       background-color: #ffffff;
-      outline-style: solid;
-      outline-color: var(--cx-color-visual-focus);
-      outline-width: var(--cx-visual-focus-width, 2px);
-      outline-offset: 4px;
+      outline: none;
     }
 
     .cx-asm-reset {
diff --git a/feature-libs/asm/styles/components/_csagent-login-form.component.scss b/feature-libs/asm/styles/components/_csagent-login-form.component.scss
index c6ca609b80e..b5bf0bf44cd 100644
--- a/feature-libs/asm/styles/components/_csagent-login-form.component.scss
+++ b/feature-libs/asm/styles/components/_csagent-login-form.component.scss
@@ -21,6 +21,9 @@
 
       input {
         width: 100%;
+        &:focus {
+          outline: none;
+        }
       }
     }
   }
diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
index 825f8580c57..64b725f4be4 100644
--- a/feature-libs/asm/styles/components/_customer-selection.component.scss
+++ b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -59,6 +59,9 @@
 
       input {
         width: 100%;
+        &:focus {
+          outline: none;
+        }
       }
     }
 

From 0ccc0a16ec0ef8f8851cd535ed120cdf885836e9 Mon Sep 17 00:00:00 2001
From: Matthew <43279967+gladius-mtl@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:45:26 -0400
Subject: [PATCH 105/122] Update steps for working with tags (#17751)

---
 docs/assets/github-branch-selector.png      | Bin 96001 -> 0 bytes
 docs/self-publishing-spartacus-libraries.md |  47 ++++++++------------
 2 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 docs/assets/github-branch-selector.png

diff --git a/docs/assets/github-branch-selector.png b/docs/assets/github-branch-selector.png
deleted file mode 100644
index 88545b95b4d219cc0d41e384133e16d1663076d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96001
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

diff --git a/docs/self-publishing-spartacus-libraries.md b/docs/self-publishing-spartacus-libraries.md
index d8679751204..24dee4f7d70 100644
--- a/docs/self-publishing-spartacus-libraries.md
+++ b/docs/self-publishing-spartacus-libraries.md
@@ -35,22 +35,18 @@ For more information about using Verdaccio or another registry software, see the
     git clone https://github.com/SAP/spartacus.git && cd spartacus
     ```
 
-1. Use the branch or tag name to check out the branch of the required release version.
+1. Use the tag name to check out the required release version.
 
-    For example, the following command checks out the first code-frozen 5.0.0 release, which is in branch `release/5.0.0-CF1`:
+    For example, the following command checks out the 6.1.0 release:
 
     ```bash
-    git checkout release/5.0.0-CF1
+    git checkout 6.1.0
     ```
 
-    When choosing a tag or branch, use the specific major.minor.patch (for example, `5.0.0`) of the release you want to use. The latest release is always recommended.
+    When specifying the tag of the release version, use the specific major.minor.patch (for example, `6.1.0`) of the release you want to use. The latest release is always recommended.
 
     You can use the `git branch` command to confirm which branch you are on.
 
-    **Note:** You can use the dropdown menu for switching branches in the top left of the main page of the [Spartacus GitHub repository](https://github.com/SAP/spartacus) to see which releases are available. Click on **develop**, enter `release/5` in the search field that appears in the dropdown menu, and you will see all of the available releases for version 5.0.0 and newer, as shown in the following example:
-
-    ![GitHub Branch Selector](./assets/github-branch-selector.png)
-
 1. Run the following command to install packages and then build the libraries:
 
     ```bash
@@ -116,35 +112,32 @@ This procedure can be used to create a fresh application.
 
 ## Upgrading an Existing Spartacus App
 
-Before upgrading your Spartacus app to version 5.0, you first need to make sure your Angular libraries are up to date. Spartacus 5.0 requires Angular 14.
+Before upgrading your Spartacus app to version 6.0, you first need to make sure your Angular libraries are up to date. Spartacus 6.0 requires Angular 15.
 
 ### Upgrading Your Angular Libraries
 
-You can upgrade your application to Angular 14 as follows:
-
-- Start by upgrading Angular to version 13, and verify that all breaking changes have been addressed.
-- When you have updated to Angular 13, you can then upgrade to Angular 14.
-
-You might have to append the `--force` flag if you encounter a mismatch between peer dependencies during the migration. The following is an example command that upgrades Angular to version 13.
+When upgrading your Angular libraries to version 15, you might have to append the `--force` flag if you encounter a mismatch between peer dependencies during the migration. The following is an example command that upgrades Angular to version 15.
 
 ```bash
-ng update @angular/cli@13 --force
+ng update @angular/cli@15 --force
 ```
 
-Afterwards, you need to upgrade third party dependencies to the version that is compatible with Angular 14, such as `@ng-bootstrap/ng-bootstrap`, `@ng-select/ng-select` or `@ngrx/store`.
+Afterwards, you need to upgrade third party dependencies to the version that is compatible with Angular 15, such as `ngx-infinite-scroll`, `@ng-select/ng-select` or `@ngrx/store`.
 
 For more information, see the official [Angular Update Guide](https://update.angular.io/).
 
-### Upgrading Your Spartacus App to 5.0
+### Upgrading Your Spartacus App to 6.0
 
-Spartacus 5.0 includes many new features and fixes. Since this update is a major release, some of the updates may also be breaking changes for your application. In this case, additional work on your side may be required to fix issues that result from upgrading from 4.x to 5.0.
+Spartacus 6.0 includes many new features and fixes. Since this update is a major release, some of the updates may also be breaking changes for your application. In this case, additional work on your side may be required to fix issues that result from upgrading from 5.2 to 6.0.
+
+**Note:** You must start with a version 5.2 composable storefront app to be able to update to version 6.0.
 
 **Note:** In the following procedure, Verdaccio is used as an example of registry software, but you can use any proxy registry software that is similar to npm. These steps assume that your proxy registry is already running in a terminal window. For more information about using Verdaccio or another registry software, see the [Prerequisites](#prerequisites) section, above.
 
-1. To update your Spartacus app to version 5.0, run the following command in the workspace of your Angular application:
+1. To update your Spartacus app to version 6.0, run the following command in the workspace of your Angular application:
 
     ```bash
-    ng update @spartacus/schematics@latest
+    ng update @spartacus/schematics@6.0.0
     ```
 
 1. Follow the onscreen instructions that appear after running the command.
@@ -153,7 +146,11 @@ Spartacus 5.0 includes many new features and fixes. Since this update is a major
     If you are using Verdaccio, you can end the script by selecting `Exit`. Do not force-close the script; doing so will prevent cleanup from running, and as a result, the script may not run correctly in the future.
 1. Inspect your code for comments that begin with `// TODO:Spartacus`. For detailed information about each added comment, see the following:
 
-   - [Typescript Breaking Changes in Composable Storefront 5.0](https://help.sap.com/doc/typescript-breaking-changes-in-composable-storefront-50/5/en-US/typescript-changes-version-5.html)
+   - [Typescript Breaking Changes in Composable Storefront 6.0](https://help.sap.com/doc/typescript-breaking-changes-in-composable-storefront-60/6.0/en-US/typescript-changes-version-6.html)
+   - [Technical Changes in Composable Storefront 6.0](https://help.sap.com/docs/SAP_COMMERCE_COMPOSABLE_STOREFRONT/10a8bc7f635b4e3db6f6bb7880e58a7d/93ffb557d3c14922bda14dfc8b4250b4.html?locale=en-US&version=6.0#loio93ffb557d3c14922bda14dfc8b4250b4)
+   - [Changes to Styles in Composable Storefront 6.0](https://help.sap.com/docs/SAP_COMMERCE_COMPOSABLE_STOREFRONT/10a8bc7f635b4e3db6f6bb7880e58a7d/d008d0179ea141bf84fde6ec98244ae5.html?locale=en-US&version=6.0#loiod008d0179ea141bf84fde6ec98244ae5)
+   - [Changes to HTML in Composable Storefront 6.0](https://help.sap.com/docs/SAP_COMMERCE_COMPOSABLE_STOREFRONT/10a8bc7f635b4e3db6f6bb7880e58a7d/f6ecd8ecdc6042dca6552c0c16448e0c.html?locale=en-US&version=6.0#loiof6ecd8ecdc6042dca6552c0c16448e0c)
+   - [Changes to Sample Data in Composable Storefront 6.0](https://help.sap.com/docs/SAP_COMMERCE_COMPOSABLE_STOREFRONT/10a8bc7f635b4e3db6f6bb7880e58a7d/911c4c3a9e8c4d51a9ac4cc48cd4fda6.html?locale=en-US&version=6.0#loio911c4c3a9e8c4d51a9ac4cc48cd4fda6)
 
     **Note:** The process might also downgrade some dependencies (namely RxJS), because Spartacus does not yet support the newer version.
 
@@ -161,12 +158,6 @@ Spartacus 5.0 includes many new features and fixes. Since this update is a major
 
     You should now be running with the latest libraries installed. You can open `node_modules` and check the `@spartacus` libraries that were installed.
 
-### Additional Information
-
-There are other important details to be aware of when upgrading your Spartacus app to version 5.0, such as the removal of NG Bootstrap, the removal of ModalServices and related code, and the addition of new entry points to the `@spartacus/cart` and `@spartacus/checkout` libraries.
-
-For more information, see [Updating to Composable Storefront Version 5.0](https://help.sap.com/docs/SAP_COMMERCE_COMPOSABLE_STOREFRONT/6d285368b1014628aebbe0aa2c74cd9d/7266f6f01edb4328b4e09df299ea09be.html) on the SAP Help Portal.
-
 ## Sharing the Local Repository
 
 Other team members may want to consume the locally-available libraries. It is recommended that you set up a server where you can install the npm-like registry of your choice, and where you can publish locally-built Spartacus libraries.

From a4c9ed448943a02fc8034a9c785443fcc499884d Mon Sep 17 00:00:00 2001
From: Grace Dong <127385561+i53577@users.noreply.github.com>
Date: Fri, 18 Aug 2023 10:28:28 +0800
Subject: [PATCH 106/122] fix: agent starts customer emulation after creating
 new customer, a CONFIRMATION message popup (#17765)

---
 feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
index b9f71340635..2d4d0b83384 100644
--- a/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
+++ b/feature-libs/asm/components/asm-main-ui/asm-main-ui.component.ts
@@ -306,6 +306,7 @@ export class AsmMainUiComponent implements OnInit, OnDestroy {
       this.csAgentAuthService.startCustomerEmulationSession(customerId);
       this.startingCustomerSession = true;
       this.showCustomerEmulationInfoAlert = true;
+      this.showCreateCustomerSuccessfullyAlert = false;
       if (parameters) {
         // TODO(CXSPA-3090): Remove feature flag in 7.0
         if (this.featureConfig?.isLevel('6.3')) {

From 9d971ecb8893da895a04cd34517a4deb69e362ce Mon Sep 17 00:00:00 2001
From: Roman Chygryn <129765378+rmch91@users.noreply.github.com>
Date: Fri, 18 Aug 2023 17:50:00 +0200
Subject: [PATCH 107/122] Update full version in versioning.scss (#17768)

---
 projects/storefrontstyles/scss/_versioning.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index 250a70f79d2..5ba22c35349 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -24,7 +24,7 @@
 // or `$styleVersion` are enabled.
 $_fullVersion: (
   major: 6,
-  minor: 3,
+  minor: 4,
   patch: 0,
 );
 

From 566446adb745512ac9a847a098c42e3aa72bd6a8 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:09:58 +0200
Subject: [PATCH 108/122] Chore: Update latest webApplicationInjector.js
 (#17781)

---
 feature-libs/smartedit/assets/webApplicationInjector.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/feature-libs/smartedit/assets/webApplicationInjector.js b/feature-libs/smartedit/assets/webApplicationInjector.js
index 0e03ead7e02..8d6dcebe2d8 100644
--- a/feature-libs/smartedit/assets/webApplicationInjector.js
+++ b/feature-libs/smartedit/assets/webApplicationInjector.js
@@ -1,2 +1,3 @@
-/*! For license information please see webApplicationInjector.js.LICENSE.txt */
-(()=>{var t={874:(t,e,n)=>{var r,a,o;o=function(){var t,e,n=document,r=n.getElementsByTagName("head")[0],a=!1,o="push",i="readyState",s="onreadystatechange",c={},l={},d={},u={};function p(t,e){for(var n=0,r=t.length;n<r;++n)if(!e(t[n]))return a;return 1}function m(t,e){p(t,(function(t){return e(t),1}))}function f(e,n,r){e=e[o]?e:[e];var a=n&&n.call,i=a?n:r,s=a?e.join(""):n,h=e.length;function w(t){return t.call?t():c[t]}function S(){if(!--h)for(var t in c[s]=1,i&&i(),d)p(t.split("|"),w)&&!m(d[t],w)&&(d[t]=[])}return setTimeout((function(){m(e,(function e(n,r){return null===n?S():(r||/^https?:\/\//.test(n)||!t||(n=-1===n.indexOf(".js")?t+n+".js":t+n),u[n]?(s&&(l[s]=1),2==u[n]?S():setTimeout((function(){e(n,!0)}),0)):(u[n]=1,s&&(l[s]=1),void g(n,S)))}))}),0),f}function g(t,a){var o,c=n.createElement("script");c.onload=c.onerror=c[s]=function(){c[i]&&!/^c|loade/.test(c[i])||o||(c.onload=c[s]=null,o=1,u[t]=2,a())},c.async=1,c.src=e?t+(-1===t.indexOf("?")?"?":"&")+e:t,r.insertBefore(c,r.lastChild)}return f.get=g,f.order=function(t,e,n){!function r(a){a=t.shift(),t.length?f(a,r):f(a,e,n)}()},f.path=function(e){t=e},f.urlArgs=function(t){e=t},f.ready=function(t,e,n){t=t[o]?t:[t];var r,a=[];return!m(t,(function(t){c[t]||a[o](t)}))&&p(t,(function(t){return c[t]}))?e():(r=t.join("|"),d[r]=d[r]||[],d[r][o](e),n&&n(a)),f},f.done=function(t){f([null],t)},f},t.exports?t.exports=o():void 0===(a="function"==typeof(r=o)?r.call(e,n,e,t):r)||(t.exports=a)},597:(t,e)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Heartbeat=void 0;class n{static startSendingHeartBeatToIframe(t){const e=n.getHeartBeatInterval(t);setInterval((()=>{parent.postMessage({pk:Math.random(),gatewayId:"heartBeatGateway",eventId:"heartBeat",data:{location:document.location.href}},"*")}),e)}static getHeartBeatInterval(t){return parseInt(t.getAttribute("data-smartedit-heart-beat-interval")||n.DEFAULT_HEARTBEAT_INTERVAL,10)}}e.Heartbeat=n,n.DEFAULT_HEARTBEAT_INTERVAL="500"},167:(t,e,n)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0});const r=n(874);class a{static getWebappScriptElementFromDocument(t){if(t.currentScript){if(!(t.currentScript instanceof HTMLScriptElement))throw new Error("getWebappScriptElementFromDocument() found non html script element");return t.currentScript}const e=t.querySelector(`script#${a.webappScriptId}`);if(e)return e;const n=t.querySelectorAll(`script[src*=${a.webappScriptName}]`);if(1!==n.length)throw new Error(`SmartEdit unable to load - invalid ${a.webappScriptName} script tag`);return n.item(0)}static extractQueryParameter(t,e){const n={};return t.replace(/([?&])([^&=]+)=([^&]*)?/g,((t,e,r,a)=>(n[r]=a,""))),n[e]}static injectJS(t,e=0){t.length&&e<t.length&&a.getScriptJs()(t[e],(function(){a.injectJS(t,e+1)}))}static injectCSS(t,e){if(e)for(let n=0;n<e.length;n++){if(a.isFioriWithoutDark(e[n]))continue;let r=`themeCss${n}`;const o=e[n];e[n].includes("main.css")&&(r=a.smarteditMainCssId,document.getElementById(r))||a.injectCSSHelper(r,o,t)}}static removeThemeCSS(){const t=document.getElementById("themeCss0"),e=document.getElementById("themeCss1");t&&e&&(null==t||t.remove(),null==e||e.remove())}static getScriptJs(){return r}static injectCSSHelper(t,e,n){const r=document.createElement("link");r.rel="stylesheet",r.type="text/css",r.id=t,r.href=e,n.appendChild(r)}static isFioriWithoutDark(t){return t.includes("fiori")&&!t.includes("dark")}}e.default=a,a.webappScriptId="smartedit-injector",a.webappScriptName="webApplicationInjector",a.smarteditMainCssId="smarteditMainCss"},750:(t,e,n)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0});const r=n(167);class a{static convertWhitelistingToRegexp(t){return(t=t||[]).map((t=>{const e=t.trim();if(a.whitelistingConfigRegex.test(e)){const t=["^","$"].join(e.replace(/\./g,"\\.").replace(/\*/g,"[-a-zA-Z0-9]*"));return new RegExp(t)}throw new Error(a.whitelistingErrorMsg)}))}static getWhitelistFromScriptElement(t,e){let n=[a.getSanitizedHostFromLocation(e.location)];const o=t.getAttribute(a.allowOriginAttributeName)||"";o&&(n=n.concat(o.split(",")));let i="";const s=e.document.createElement("a");s.href=t.src;const c=r.default.extractQueryParameter(s.search,a.allowOriginQueryParamName);return c&&(i=decodeURI(c),i&&i.split(",").forEach((t=>n.push(t)))),n}static isAllowed(t,e,n){if(!/^(https?:)\/\/([-.a-zA-Z0-9]+(:[0-9]{1,5})?)$/.test(t))return!1;const r=e.document.createElement("a");return r.href=t,("https:"!==e.location.protocol||"https:"===r.protocol)&&n.some((t=>(t.lastIndex=0,t.test(a.getSanitizedHostFromLocation(r)))))}static getSanitizedHostFromLocation(t){const e=t.port||("https"===t.protocol.replace(/:/g,"")?"443":"80");return`${t.hostname}:${e}`}}e.default=a,a.whitelistingConfigRegex=new RegExp(/^(([-*a-zA-Z0-9]+[.])*([-a-zA-Z0-9]+[.]))?[-a-zA-Z0-9]+(:[0-9]{1,5})$/),a.allowOriginAttributeName="data-smartedit-allow-origin",a.allowOriginQueryParamName="allow-origin",a.whitelistingErrorMsg="\n\t\tAllowed whitelist characters are a-z, A-Z, 0-9, -, period, or *\n\t\tThe wildcard * can be used to represent a prefixed domain, Good example: *.domain.com:80\n\t\tbut not a suffix or port, Bad examples: subdomain.*.com subdomain.domain.com:*.\n\t\tEvery whitelisting must contain a specific port.\n\t"}},e={};function n(r){var a=e[r];if(void 0!==a)return a.exports;var o=e[r]={exports:{}};return t[r](o,o.exports,n),o.exports}(()=>{"use strict";const t=n(597),e=n(167),r=n(750),a="smartEditBootstrap",o=e.default.getWebappScriptElementFromDocument(document);if(!o)throw new Error("Unable to location webappInjector script");const i=r.default.getWhitelistFromScriptElement(o,window),s=r.default.convertWhitelistingToRegexp(i);parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"loading",data:{location:document.location.href}},"*"),window.addEventListener("load",(function(){parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"bootstrapSmartEdit",data:{location:document.location.href}},"*")})),window.addEventListener("message",(function(t){if(t.data.gatewayId===a&&"bundle"===t.data.eventId){if(!r.default.isAllowed(t.origin,window,s))throw new Error(t.origin+" is not allowed to override this storefront.");!function(t,n){if(window.smartedit=window.smartedit||{},parent.postMessage({gatewayId:a,eventId:"promiseAcknowledgement",data:{pk:t}},"*"),n){const t=document.getElementsByTagName("body")[0];!function(t){if(t.properties)for(const e in t.properties)t.properties.hasOwnProperty(e)&&(window.smartedit[e]=t.properties[e])}(n),function(t){if(!(t.js&&t.js.length>0))return;let n;n="string"==typeof t.js[0]?t.js:t.js.filter((t=>!t.namespaceToCheck||!window[t.namespaceToCheck])).map((t=>t.src)),e.default.injectJS(n)}(n),n.css&&n.css.length>0&&(e.default.removeThemeCSS(),e.default.injectCSS(t,n.css))}parent.postMessage({gatewayId:a,eventId:"promiseReturn",data:{pk:t,type:"success"}},"*")}(t.data.pk,t.data.data.resources)}}),!1),window.onbeforeunload=function(){parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"unloading",data:{location:document.location.href}},"*")},t.Heartbeat.startSendingHeartBeatToIframe(o)})()})();
\ No newline at end of file
+/*! For license information please see webApplicationInjector.js.LICENSE.txt
+Version: 0.0.3 */
+(()=>{var t={874:(t,e,n)=>{var r,a,o;o=function(){var t,e,n=document,r=n.getElementsByTagName("head")[0],a=!1,o="push",i="readyState",s="onreadystatechange",c={},l={},d={},u={};function p(t,e){for(var n=0,r=t.length;n<r;++n)if(!e(t[n]))return a;return 1}function m(t,e){p(t,(function(t){return e(t),1}))}function f(e,n,r){e=e[o]?e:[e];var a=n&&n.call,i=a?n:r,s=a?e.join(""):n,h=e.length;function w(t){return t.call?t():c[t]}function E(){if(! --h)for(var t in c[s]=1,i&&i(),d)p(t.split("|"),w)&&!m(d[t],w)&&(d[t]=[])}return setTimeout((function(){m(e,(function e(n,r){return null===n?E():(r||/^https?:\/\//.test(n)||!t||(n=-1===n.indexOf(".js")?t+n+".js":t+n),u[n]?(s&&(l[s]=1),2==u[n]?E():setTimeout((function(){e(n,!0)}),0)):(u[n]=1,s&&(l[s]=1),void g(n,E)))}))}),0),f}function g(t,a){var o,c=n.createElement("script");c.onload=c.onerror=c[s]=function(){c[i]&&!/^c|loade/.test(c[i])||o||(c.onload=c[s]=null,o=1,u[t]=2,a())},c.async=1,c.src=e?t+(-1===t.indexOf("?")?"?":"&")+e:t,r.insertBefore(c,r.lastChild)}return f.get=g,f.order=function(t,e,n){!function r(a){a=t.shift(),t.length?f(a,r):f(a,e,n)}()},f.path=function(e){t=e},f.urlArgs=function(t){e=t},f.ready=function(t,e,n){t=t[o]?t:[t];var r,a=[];return!m(t,(function(t){c[t]||a[o](t)}))&&p(t,(function(t){return c[t]}))?e():(r=t.join("|"),d[r]=d[r]||[],d[r][o](e),n&&n(a)),f},f.done=function(t){f([null],t)},f},t.exports?t.exports=o():void 0===(a="function"==typeof(r=o)?r.call(e,n,e,t):r)||(t.exports=a)},977:(t,e)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.Heartbeat=void 0;class n{static startSendingHeartBeatToIframe(t){const e=n.getHeartBeatInterval(t);setInterval((()=>{parent.postMessage({pk:Math.random(),gatewayId:"heartBeatGateway",eventId:"heartBeat",data:{location:document.location.href}},"*")}),e)}static getHeartBeatInterval(t){return parseInt(t.getAttribute("data-smartedit-heart-beat-interval")||n.DEFAULT_HEARTBEAT_INTERVAL,10)}}e.Heartbeat=n,n.DEFAULT_HEARTBEAT_INTERVAL="500"},986:(t,e,n)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0});const r=n(874);class a{static getWebappScriptElementFromDocument(t){if(t.currentScript){if(!(t.currentScript instanceof HTMLScriptElement))throw new Error("getWebappScriptElementFromDocument() found non html script element");return t.currentScript}const e=t.querySelector(`script#${a.webappScriptId}`);if(e)return e;const n=t.querySelectorAll(`script[src*=${a.webappScriptName}]`);if(1!==n.length)throw new Error(`SmartEdit unable to load - invalid ${a.webappScriptName} script tag`);return n.item(0)}static extractQueryParameter(t,e){const n={};return t.replace(/([?&])([^&=]+)=([^&]*)?/g,((t,e,r,a)=>(n[r]=a,""))),n[e]}static injectJS(t,e=0){t.length&&e<t.length&&a.getScriptJs()(t[e],(function(){a.injectJS(t,e+1)}))}static injectCSS(t,e){if(!t||!e)return;const n=t.getElementsByTagName("link");for(const r of e)if(!this.findLinkByHref(n,r)){const e=document.createElement("link");e.rel="stylesheet",e.type="text/css",e.href=r,t.appendChild(e)}}static injectThemeCSS(t,e){if(!e||e.length<2)return;const n=t.getElementsByTagName("link");for(let r=0;r<e.length;r++)if(!this.findLinkByHref(n,e[r])){const n=document.createElement("link");n.rel="stylesheet",n.type="text/css",n.id=`themeCss${r}`,n.href=e[r],t.appendChild(n)}}static findLinkByHref(t,e){let n=0,r=t.item(n),a=!1;for(;null!==r;){if(r.href===e){a=!0;break}n++,r=t.item(n)}return a}static updateThemeCss(t){if(!t||t.length<2)return;const e=document.getElementById("themeCss0"),n=document.getElementById("themeCss1");e&&n&&(e.href=t[0],n.href=t[1])}static getScriptJs(){return r}}e.default=a,a.webappScriptId="smartedit-injector",a.webappScriptName="webApplicationInjector",a.smarteditMainCssId="smarteditMainCss"},810:(t,e,n)=>{"use strict";Object.defineProperty(e,"__esModule",{value:!0});const r=n(986);class a{static convertWhitelistingToRegexp(t){return(t=t||[]).map((t=>{const e=t.trim();if(a.whitelistingConfigRegex.test(e)){const t=["^","$"].join(e.replace(/\./g,"\\.").replace(/\*/g,"[-a-zA-Z0-9]*"));return new RegExp(t)}throw new Error(a.whitelistingErrorMsg)}))}static getWhitelistFromScriptElement(t,e){let n=[a.getSanitizedHostFromLocation(e.location)];const o=t.getAttribute(a.allowOriginAttributeName)||"";o&&(n=n.concat(o.split(",")));let i="";const s=e.document.createElement("a");s.href=t.src;const c=r.default.extractQueryParameter(s.search,a.allowOriginQueryParamName);return c&&(i=decodeURI(c),i&&i.split(",").forEach((t=>n.push(t)))),n}static isAllowed(t,e,n){if(!/^(https?:)\/\/([-.a-zA-Z0-9]+(:[0-9]{1,5})?)$/.test(t))return!1;const r=e.document.createElement("a");return r.href=t,("https:"!==e.location.protocol||"https:"===r.protocol)&&n.some((t=>(t.lastIndex=0,t.test(a.getSanitizedHostFromLocation(r)))))}static getSanitizedHostFromLocation(t){const e=t.port||("https"===t.protocol.replace(/:/g,"")?"443":"80");return`${t.hostname}:${e}`}}e.default=a,a.whitelistingConfigRegex=new RegExp(/^(([-*a-zA-Z0-9]+[.])*([-a-zA-Z0-9]+[.]))?[-a-zA-Z0-9]+(:[0-9]{1,5})$/),a.allowOriginAttributeName="data-smartedit-allow-origin",a.allowOriginQueryParamName="allow-origin",a.whitelistingErrorMsg="\n\t\tAllowed whitelist characters are a-z, A-Z, 0-9, -, period, or *\n\t\tThe wildcard * can be used to represent a prefixed domain, Good example: *.domain.com:80\n\t\tbut not a suffix or port, Bad examples: subdomain.*.com subdomain.domain.com:*.\n\t\tEvery whitelisting must contain a specific port.\n\t"}},e={};function n(r){var a=e[r];if(void 0!==a)return a.exports;var o=e[r]={exports:{}};return t[r](o,o.exports,n),o.exports}(()=>{"use strict";const t=n(977),e=n(986),r=n(810),a="smartEditBootstrap",o=e.default.getWebappScriptElementFromDocument(document);if(!o)throw new Error("Unable to location webappInjector script");const i=r.default.getWhitelistFromScriptElement(o,window),s=r.default.convertWhitelistingToRegexp(i);function c(t){parent.postMessage({gatewayId:a,eventId:"promiseAcknowledgement",data:{pk:t}},"*")}function l(t){parent.postMessage({gatewayId:a,eventId:"promiseReturn",data:{pk:t,type:"success"}},"*")}parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"loading",data:{location:document.location.href,version:"0.0.3"}},"*"),window.addEventListener("load",(function(){parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"bootstrapSmartEdit",data:{location:document.location.href}},"*")})),window.addEventListener("message",(function(t){if(!r.default.isAllowed(t.origin,window,s))throw new Error(t.origin+" is not allowed to override this storefront.");if(t.data.gatewayId===a&&"bundle"===t.data.eventId)return void function(t,n){if(window.smartedit=window.smartedit||{},c(t),n){const t=document.getElementsByTagName("head")[0];!function(t){if(!t.properties)return;for(const e in t.properties)t.properties.hasOwnProperty(e)&&(window.smartedit[e]=t.properties[e])}(n),function(t){if(!(t.js&&t.js.length>0))return;let n;n="string"==typeof t.js[0]?t.js:t.js.filter((t=>!t.namespaceToCheck||!window[t.namespaceToCheck])).map((t=>t.src));e.default.injectJS(n)}(n),n.css&&n.css.length>0&&e.default.injectCSS(t,n.css),n.themeCss&&n.themeCss.length>0&&e.default.injectThemeCSS(t,n.themeCss)}l(t)}(t.data.pk,t.data.data.resources);t.data.gatewayId===a&&"theme"===t.data.eventId&&(n=t.data.pk,o=t.data.data.resources,c(n),e.default.updateThemeCss(o.themeCss),l(n));var n,o}),!1),window.onbeforeunload=function(){parent.postMessage({pk:Math.random(),gatewayId:a,eventId:"unloading",data:{location:document.location.href}},"*")},t.Heartbeat.startSendingHeartBeatToIframe(o)})()})();

From 0402fcd97059d9f6c8481a5527e9c96eb3428a4f Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Mon, 4 Sep 2023 12:37:38 +0200
Subject: [PATCH 109/122] fix: entity id type (#17800)

---
 .../entity-loader/entity-loader.action.ts     | 22 ++++++++-----------
 .../src/state/utils/entity/entity.action.ts   | 16 +++++---------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/projects/core/src/state/utils/entity-loader/entity-loader.action.ts b/projects/core/src/state/utils/entity-loader/entity-loader.action.ts
index bf9347e25c1..4e222f5f7c9 100644
--- a/projects/core/src/state/utils/entity-loader/entity-loader.action.ts
+++ b/projects/core/src/state/utils/entity-loader/entity-loader.action.ts
@@ -5,7 +5,7 @@
  */
 
 import { Action } from '@ngrx/store';
-import { entityMeta, EntityMeta } from '../entity/entity.action';
+import { EntityId, entityMeta, EntityMeta } from '../entity/entity.action';
 import {
   failMeta,
   LoaderMeta,
@@ -28,7 +28,7 @@ export interface EntityLoaderAction extends Action {
 
 export function entityLoadMeta(
   entityType: string,
-  id: string | string[] | null
+  id: EntityId
 ): EntityLoaderMeta {
   return {
     ...loadMeta(entityType),
@@ -38,7 +38,7 @@ export function entityLoadMeta(
 
 export function entityFailMeta(
   entityType: string,
-  id: string | string[] | null,
+  id: EntityId,
   error?: any
 ): EntityLoaderMeta {
   return {
@@ -49,7 +49,7 @@ export function entityFailMeta(
 
 export function entitySuccessMeta(
   entityType: string,
-  id: string | string[] | null
+  id: EntityId
 ): EntityLoaderMeta {
   return {
     ...successMeta(entityType),
@@ -59,7 +59,7 @@ export function entitySuccessMeta(
 
 export function entityResetMeta(
   entityType: string,
-  id?: string | string[] | null
+  id?: EntityId
 ): EntityLoaderMeta {
   return {
     ...resetMeta(entityType),
@@ -70,7 +70,7 @@ export function entityResetMeta(
 export class EntityLoadAction implements EntityLoaderAction {
   type = ENTITY_LOAD_ACTION;
   readonly meta: EntityLoaderMeta;
-  constructor(entityType: string, id: string | string[] | null) {
+  constructor(entityType: string, id: EntityId) {
     this.meta = entityLoadMeta(entityType, id);
   }
 }
@@ -78,7 +78,7 @@ export class EntityLoadAction implements EntityLoaderAction {
 export class EntityFailAction implements EntityLoaderAction {
   type = ENTITY_FAIL_ACTION;
   readonly meta: EntityLoaderMeta;
-  constructor(entityType: string, id: string | string[] | null, error?: any) {
+  constructor(entityType: string, id: EntityId, error?: any) {
     this.meta = entityFailMeta(entityType, id, error);
   }
 }
@@ -86,11 +86,7 @@ export class EntityFailAction implements EntityLoaderAction {
 export class EntitySuccessAction implements EntityLoaderAction {
   type = ENTITY_SUCCESS_ACTION;
   readonly meta: EntityLoaderMeta;
-  constructor(
-    entityType: string,
-    id: string | string[] | null,
-    public payload?: any
-  ) {
+  constructor(entityType: string, id: EntityId, public payload?: any) {
     this.meta = entitySuccessMeta(entityType, id);
   }
 }
@@ -98,7 +94,7 @@ export class EntitySuccessAction implements EntityLoaderAction {
 export class EntityLoaderResetAction implements EntityLoaderAction {
   type = ENTITY_RESET_ACTION;
   readonly meta: EntityLoaderMeta;
-  constructor(entityType: string, id: string | string[] | null) {
+  constructor(entityType: string, id: EntityId) {
     this.meta = entityResetMeta(entityType, id);
   }
 }
diff --git a/projects/core/src/state/utils/entity/entity.action.ts b/projects/core/src/state/utils/entity/entity.action.ts
index 066576c55bb..0ef2e395d43 100644
--- a/projects/core/src/state/utils/entity/entity.action.ts
+++ b/projects/core/src/state/utils/entity/entity.action.ts
@@ -9,26 +9,22 @@ import { Action } from '@ngrx/store';
 export const ENTITY_REMOVE_ACTION = '[ENTITY] REMOVE';
 export const ENTITY_REMOVE_ALL_ACTION = '[ENTITY] REMOVE ALL';
 
+export type EntityId = string | string[] | null;
+
 export interface EntityMeta {
   entityType: string;
-  entityId?: string | string[] | null;
+  entityId?: EntityId;
   entityRemove?: boolean;
 }
 
-export function entityMeta(
-  type: string,
-  id?: string | string[] | null
-): EntityMeta {
+export function entityMeta(type: string, id?: EntityId): EntityMeta {
   return {
     entityType: type,
     entityId: id,
   };
 }
 
-export function entityRemoveMeta(
-  type: string,
-  id: string | string[] | null
-): EntityMeta {
+export function entityRemoveMeta(type: string, id: EntityId): EntityMeta {
   return {
     entityId: id,
     entityType: type,
@@ -52,7 +48,7 @@ export interface EntityAction extends Action {
 export class EntityRemoveAction implements EntityAction {
   type = ENTITY_REMOVE_ACTION;
   readonly meta: EntityMeta;
-  constructor(entityType: string, id: string | string[] | null) {
+  constructor(entityType: string, id: EntityId) {
     this.meta = entityRemoveMeta(entityType, id);
   }
 }

From 4ca9969cc841c089797a5b882fb16c1bbaadb1d3 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Tue, 5 Sep 2023 15:54:26 +0200
Subject: [PATCH 110/122] fix: PostProduct review error is now normalized
 (#17810)

---
 .../assets/src/translations/en/product.ts     |  2 +
 .../actions/product-references.action.ts      |  2 +-
 .../store/actions/product-reviews.action.ts   |  6 +--
 .../effects/product-references.effect.ts      | 14 ++++---
 .../effects/product-reviews.effect.spec.ts    | 38 ++++++++++---------
 .../store/effects/product-reviews.effect.ts   | 36 ++++++++++++++----
 6 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/projects/assets/src/translations/en/product.ts b/projects/assets/src/translations/en/product.ts
index a22582bfd6d..3e324c5b76a 100644
--- a/projects/assets/src/translations/en/product.ts
+++ b/projects/assets/src/translations/en/product.ts
@@ -80,6 +80,8 @@ export const product = {
     less: 'Show Less Reviews',
     thankYouForReview:
       'Thank you for the review! Note that reviews may require review before appearing here.',
+    postReviewFail:
+      'Something went wrong while posting your review. Please try again later.',
   },
   productCarousel: {
     carouselLabel: 'Carousel, {{title}}',
diff --git a/projects/core/src/product/store/actions/product-references.action.ts b/projects/core/src/product/store/actions/product-references.action.ts
index a823d671b1f..78feecbdfca 100644
--- a/projects/core/src/product/store/actions/product-references.action.ts
+++ b/projects/core/src/product/store/actions/product-references.action.ts
@@ -28,7 +28,7 @@ export class LoadProductReferences implements Action {
 
 export class LoadProductReferencesFail implements Action {
   readonly type = LOAD_PRODUCT_REFERENCES_FAIL;
-  constructor(public payload: ErrorModel) {}
+  constructor(public payload?: ErrorModel) {}
 }
 
 export class LoadProductReferencesSuccess implements Action {
diff --git a/projects/core/src/product/store/actions/product-reviews.action.ts b/projects/core/src/product/store/actions/product-reviews.action.ts
index a40d3851578..a2cd3e0234b 100644
--- a/projects/core/src/product/store/actions/product-reviews.action.ts
+++ b/projects/core/src/product/store/actions/product-reviews.action.ts
@@ -5,7 +5,7 @@
  */
 
 import { Action } from '@ngrx/store';
-import { ErrorModel } from '../../../model/misc.model';
+import { ErrorModel, HttpErrorModel } from '../../../model/misc.model';
 import { Review } from '../../../model/product.model';
 
 export const LOAD_PRODUCT_REVIEWS = '[Product] Load Product Reviews Data';
@@ -25,7 +25,7 @@ export class LoadProductReviews implements Action {
 
 export class LoadProductReviewsFail implements Action {
   readonly type = LOAD_PRODUCT_REVIEWS_FAIL;
-  constructor(public payload: ErrorModel) {}
+  constructor(public payload?: ErrorModel) {}
 }
 
 export class LoadProductReviewsSuccess implements Action {
@@ -40,7 +40,7 @@ export class PostProductReview implements Action {
 
 export class PostProductReviewFail implements Action {
   readonly type = POST_PRODUCT_REVIEW_FAIL;
-  constructor(public payload: string) {}
+  constructor(public payload?: HttpErrorModel) {}
 }
 
 export class PostProductReviewSuccess implements Action {
diff --git a/projects/core/src/product/store/effects/product-references.effect.ts b/projects/core/src/product/store/effects/product-references.effect.ts
index 630a755d639..01f026fa708 100644
--- a/projects/core/src/product/store/effects/product-references.effect.ts
+++ b/projects/core/src/product/store/effects/product-references.effect.ts
@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
-import { ErrorModel } from '../../../model/misc.model';
 import { ProductReferencesConnector } from '../../connectors/references/product-references.connector';
 import { ProductActions } from '../actions/index';
+import { normalizeHttpError } from '../../../util/normalize-http-error';
+import { LoggerService } from '../../../logger';
 
 @Injectable()
 export class ProductReferencesEffects {
+  protected logger = inject(LoggerService);
   loadProductReferences$: Observable<
     | ProductActions.LoadProductReferencesSuccess
     | ProductActions.LoadProductReferencesFail
@@ -31,11 +33,11 @@ export class ProductReferencesEffects {
                 list: data,
               });
             }),
-            catchError((_error) =>
+            catchError((error) =>
               of(
-                new ProductActions.LoadProductReferencesFail({
-                  message: payload.productCode,
-                } as ErrorModel)
+                new ProductActions.LoadProductReferencesFail(
+                  normalizeHttpError(error, this.logger)
+                )
               )
             )
           );
diff --git a/projects/core/src/product/store/effects/product-reviews.effect.spec.ts b/projects/core/src/product/store/effects/product-reviews.effect.spec.ts
index b2f0cc81c6c..ec8ac6a5bd9 100644
--- a/projects/core/src/product/store/effects/product-reviews.effect.spec.ts
+++ b/projects/core/src/product/store/effects/product-reviews.effect.spec.ts
@@ -9,12 +9,12 @@ import {
 import { cold, hot } from 'jasmine-marbles';
 import { Observable, of } from 'rxjs';
 import { Review } from '../../../model/product.model';
-import { defaultOccProductConfig } from '../../../occ/adapters/product/default-occ-product-config';
-import { OccConfig } from '../../../occ/config/occ-config';
 import { ProductActions } from '../actions/index';
 import * as fromEffects from '../effects/product-reviews.effect';
-import { ProductReviewsConnector } from '../../connectors/index';
+import { defaultOccProductConfig } from '../../../occ/adapters/product/default-occ-product-config';
 import createSpy = jasmine.createSpy;
+import { OccConfig } from '../../../occ/config/occ-config';
+import { ProductReviewsConnector } from '../../connectors/reviews/product-reviews.connector';
 
 const reviewData: Review[] = [
   {
@@ -27,21 +27,13 @@ const reviewData: Review[] = [
   },
 ];
 
-const MockOccModuleConfig: OccConfig = {
-  backend: {
-    occ: {
-      baseUrl: '',
-      prefix: '',
-    },
-  },
-};
+class GlobalMessageServiceMock {
+  add(_message: GlobalMessage): void {}
+}
 
 class MockProductReviewsConnector {
   get = createSpy('getList').and.returnValue(of(reviewData));
-}
-
-class GlobalMessageServiceMock {
-  add(_message: GlobalMessage): void {}
+  add = createSpy('addReview').and.returnValue(of({}));
 }
 
 describe('Product reviews effect', () => {
@@ -56,7 +48,6 @@ describe('Product reviews effect', () => {
           provide: ProductReviewsConnector,
           useClass: MockProductReviewsConnector,
         },
-        { provide: OccConfig, useValue: MockOccModuleConfig },
         { provide: OccConfig, useValue: defaultOccProductConfig },
         fromEffects.ProductReviewsEffects,
         provideMockActions(() => actions$),
@@ -68,7 +59,7 @@ describe('Product reviews effect', () => {
   });
 
   describe('loadProductReviews$', () => {
-    it('should return specified product reviews', () => {
+    it('should return specified product reviews on success', () => {
       const productCode = '12345';
       const action = new ProductActions.LoadProductReviews(productCode);
       const completion = new ProductActions.LoadProductReviewsSuccess({
@@ -82,4 +73,17 @@ describe('Product reviews effect', () => {
       expect(effects.loadProductReviews$).toBeObservable(expected);
     });
   });
+
+  describe('postProductReview', () => {
+    it('should post a product review and return success action on success', () => {
+      const reviewPayload = { productCode: '12345', review: {} };
+      const action = new ProductActions.PostProductReview(reviewPayload);
+      const completion = new ProductActions.PostProductReviewSuccess({});
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.postProductReview).toBeObservable(expected);
+    });
+  });
 });
diff --git a/projects/core/src/product/store/effects/product-reviews.effect.ts b/projects/core/src/product/store/effects/product-reviews.effect.ts
index c9aad4da941..81b1cfdd3bf 100644
--- a/projects/core/src/product/store/effects/product-reviews.effect.ts
+++ b/projects/core/src/product/store/effects/product-reviews.effect.ts
@@ -4,20 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Observable, of } from 'rxjs';
 import { catchError, map, mergeMap, tap } from 'rxjs/operators';
-import { ErrorModel } from '../../../model/misc.model';
 import { ProductReviewsConnector } from '../../connectors/reviews/product-reviews.connector';
 import { ProductActions } from '../actions/index';
 import {
   GlobalMessageService,
   GlobalMessageType,
 } from '../../../global-message/index';
+import { normalizeHttpError } from '../../../util/normalize-http-error';
+import { LoggerService } from '../../../logger';
 
 @Injectable()
 export class ProductReviewsEffects {
+  protected logger = inject(LoggerService);
   loadProductReviews$: Observable<
     | ProductActions.LoadProductReviewsSuccess
     | ProductActions.LoadProductReviewsFail
@@ -33,11 +35,11 @@ export class ProductReviewsEffects {
               list: data,
             });
           }),
-          catchError((_error) =>
+          catchError((error) =>
             of(
-              new ProductActions.LoadProductReviewsFail({
-                message: productCode,
-              } as ErrorModel)
+              new ProductActions.LoadProductReviewsFail(
+                normalizeHttpError(error, this.logger)
+              )
             )
           )
         );
@@ -61,8 +63,12 @@ export class ProductReviewsEffects {
                 reviewResponse
               );
             }),
-            catchError((_error) =>
-              of(new ProductActions.PostProductReviewFail(payload.productCode))
+            catchError((error) =>
+              of(
+                new ProductActions.PostProductReviewFail(
+                  normalizeHttpError(error, this.logger)
+                )
+              )
             )
           );
       })
@@ -83,6 +89,20 @@ export class ProductReviewsEffects {
     { dispatch: false }
   );
 
+  showGlobalMessageOnPostProductReviewFail$ = createEffect(
+    () =>
+      this.actions$.pipe(
+        ofType(ProductActions.POST_PRODUCT_REVIEW_FAIL),
+        tap(() => {
+          this.globalMessageService.add(
+            { key: 'productReview.postReviewFail' },
+            GlobalMessageType.MSG_TYPE_ERROR
+          );
+        })
+      ),
+    { dispatch: false }
+  );
+
   constructor(
     private actions$: Actions,
     private productReviewsConnector: ProductReviewsConnector,

From 880ab6323d6429fd8069b23093667376346e3e18 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Wed, 6 Sep 2023 16:11:29 +0200
Subject: [PATCH 111/122] feat: Default rendering strategy resolver (#17801)

---
 core-libs/setup/ssr/optimized-engine/index.ts |  2 +
 .../optimized-ssr-engine.spec.ts              | 37 ++++++-----
 .../rendering-strategy-resolver-options.ts    | 16 +++++
 .../rendering-strategy-resolver.spec.ts       | 62 ++++++++++++++++++
 .../rendering-strategy-resolver.ts            | 64 +++++++++++++++++++
 .../ssr-optimization-options.ts               | 10 ++-
 6 files changed, 175 insertions(+), 16 deletions(-)
 create mode 100644 core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
 create mode 100644 core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.spec.ts
 create mode 100644 core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.ts

diff --git a/core-libs/setup/ssr/optimized-engine/index.ts b/core-libs/setup/ssr/optimized-engine/index.ts
index e3d0af3c739..b162debc6c5 100644
--- a/core-libs/setup/ssr/optimized-engine/index.ts
+++ b/core-libs/setup/ssr/optimized-engine/index.ts
@@ -7,3 +7,5 @@
 export * from './optimized-ssr-engine';
 export * from './rendering-cache';
 export * from './ssr-optimization-options';
+export * from './rendering-strategy-resolver';
+export * from './rendering-strategy-resolver-options';
diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
index ac97df28ba5..02b175d50df 100644
--- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
+++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
@@ -1194,6 +1194,7 @@ describe('OptimizedSsrEngine', () => {
               "maxRenderTime": 300000,
               "reuseCurrentRendering": true,
               "debug": false,
+              "renderingStrategyResolver": "(request) => {\\n    return shouldFallbackToCsr(request, options)\\n        ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR\\n        : ssr_optimization_options_1.RenderingStrategy.DEFAULT;\\n}",
               "logger": true
             }
           }
@@ -1206,20 +1207,25 @@ describe('OptimizedSsrEngine', () => {
         logger: new MockExpressServerLogger() as ExpressServerLogger,
       });
       expect(consoleLogSpy.mock.lastCall).toMatchInlineSnapshot(`
-              [
-                "[spartacus] SSR optimization engine initialized",
-                {
-                  "options": {
-                    "concurrency": 10,
-                    "debug": false,
-                    "forcedSsrTimeout": 60000,
-                    "logger": "MockExpressServerLogger",
-                    "maxRenderTime": 300000,
-                    "reuseCurrentRendering": true,
-                    "timeout": 3000,
-                  },
-                },
-              ]
+    [
+      "[spartacus] SSR optimization engine initialized",
+      {
+        "options": {
+          "concurrency": 10,
+          "debug": false,
+          "forcedSsrTimeout": 60000,
+          "logger": "MockExpressServerLogger",
+          "maxRenderTime": 300000,
+          "renderingStrategyResolver": "(request) => {
+        return shouldFallbackToCsr(request, options)
+            ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR
+            : ssr_optimization_options_1.RenderingStrategy.DEFAULT;
+    }",
+          "reuseCurrentRendering": true,
+          "timeout": 3000,
+        },
+      },
+    ]
             `);
     });
     it('should use the legacy server logger, if logger option not specified', () => {
@@ -1232,7 +1238,8 @@ describe('OptimizedSsrEngine', () => {
           "forcedSsrTimeout": 60000,
           "maxRenderTime": 300000,
           "reuseCurrentRendering": true,
-          "debug": false
+          "debug": false,
+          "renderingStrategyResolver": "(request) => {\\n    return shouldFallbackToCsr(request, options)\\n        ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR\\n        : ssr_optimization_options_1.RenderingStrategy.DEFAULT;\\n}"
         }",
         ]
       `);
diff --git a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
new file mode 100644
index 00000000000..90035dd14c8
--- /dev/null
+++ b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface RenderingStrategyResolverOptions {
+  excludedUrls?: string[];
+  excludedParams?: string[];
+}
+
+export const defaultRenderingStrategyResolverOptions: RenderingStrategyResolverOptions =
+  {
+    excludedUrls: ['checkout', 'my-account'],
+    excludedParams: ['asm'],
+  };
diff --git a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.spec.ts b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.spec.ts
new file mode 100644
index 00000000000..fa5b6a11977
--- /dev/null
+++ b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.spec.ts
@@ -0,0 +1,62 @@
+/// <reference types="jest" />
+
+import { RenderingStrategy } from './ssr-optimization-options';
+import { Request } from 'express';
+
+import { defaultRenderingStrategyResolver } from './rendering-strategy-resolver';
+
+describe('RenderingStrategyResolver', () => {
+  let resolver: (req: Request) => RenderingStrategy =
+    defaultRenderingStrategyResolver({
+      excludedUrls: ['checkout', 'my-account'],
+      excludedParams: ['asm'],
+    });
+
+  it('should return DEFAULT rendering strategy if no excluded parameters or URLs match', () => {
+    const request: Partial<Request> = {
+      query: {},
+      url: '/some-page',
+    };
+
+    const strategy = resolver(request as Request);
+
+    expect(strategy).toBe(RenderingStrategy.DEFAULT);
+  });
+
+  it('should return ALWAYS_CSR rendering strategy if an excluded parameter matches', () => {
+    const request: Partial<Request> = {
+      query: {
+        asm: 'true',
+      },
+      url: '/some-page',
+    };
+
+    const strategy = resolver(request as Request);
+
+    expect(strategy).toBe(RenderingStrategy.ALWAYS_CSR);
+  });
+
+  it('should return ALWAYS_CSR rendering strategy if the URL matches an excluded URL', () => {
+    const request: Partial<Request> = {
+      query: {},
+      url: '/checkout/confirm',
+    };
+
+    const strategy = resolver(request as Request);
+
+    expect(strategy).toBe(RenderingStrategy.ALWAYS_CSR);
+  });
+
+  it('should return ALWAYS_CSR rendering strategy if both excluded parameters and URLs match', () => {
+    const request: Partial<Request> = {
+      query: {
+        asm: 'true',
+      },
+      url: '/checkout/confirm',
+    };
+
+    const strategy = resolver(request as Request);
+
+    expect(strategy).toBe(RenderingStrategy.ALWAYS_CSR);
+  });
+});
diff --git a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.ts b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.ts
new file mode 100644
index 00000000000..4253b92a17a
--- /dev/null
+++ b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver.ts
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Request } from 'express';
+import { RenderingStrategy } from './ssr-optimization-options';
+import { RenderingStrategyResolverOptions } from './rendering-strategy-resolver-options';
+
+const hasExcludedParams = (
+  request: Request,
+  excludedParams: string[] | undefined
+): boolean => {
+  const params: string[] = request.query
+    ? Object.getOwnPropertyNames(request.query)
+    : [];
+
+  if (!excludedParams) {
+    return false;
+  }
+
+  return excludedParams.some((excludedParam: string) =>
+    params.some((param: string): boolean => excludedParam === param)
+  );
+};
+
+const hasExcludedUrl = (
+  request: Request,
+  excludedUrls: string[] | undefined
+) => {
+  return request.url && excludedUrls
+    ? excludedUrls.some((url) => request.url.search(url) > -1)
+    : false;
+};
+
+const shouldFallbackToCsr = (
+  request: Request,
+  { excludedParams, excludedUrls }: RenderingStrategyResolverOptions
+) => {
+  return (
+    hasExcludedParams(request, excludedParams) ||
+    hasExcludedUrl(request, excludedUrls)
+  );
+};
+
+/**
+ * Creates a rendering strategy resolver function with the specified options.
+ *
+ * @function
+ * @param  options - The options to configure the rendering strategy resolver.
+ * @param [options.excludedUrls] - An optional array of URLs for which server-side rendering (SSR) should be disabled.
+ * @param [options.excludedParams] - An optional array of Query parameters for which SSR should be disabled.
+ * @returns A rendering strategy resolver function that takes a Request object
+ * as a parameter and returns the rendering strategy to be applied for the request, which can be either
+ * `RenderingStrategy.ALWAYS_CSR` or `RenderingStrategy.DEFAULT`.
+ */
+export const defaultRenderingStrategyResolver =
+  (options: RenderingStrategyResolverOptions) =>
+  (request: Request): RenderingStrategy => {
+    return shouldFallbackToCsr(request, options)
+      ? RenderingStrategy.ALWAYS_CSR
+      : RenderingStrategy.DEFAULT;
+  };
diff --git a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
index c63159bab8e..4dbdcc5b620 100644
--- a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
+++ b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
@@ -6,6 +6,8 @@
 
 import { Request } from 'express';
 import { ExpressServerLogger } from '../logger';
+import { defaultRenderingStrategyResolver } from './rendering-strategy-resolver';
+import { defaultRenderingStrategyResolverOptions } from './rendering-strategy-resolver-options';
 
 export interface SsrOptimizationOptions {
   /**
@@ -54,7 +56,10 @@ export interface SsrOptimizationOptions {
   renderKeyResolver?: (req: Request) => string;
 
   /**
-   * Allows defining custom rendering strategy per request
+   * This function allows for the definition of a custom rendering strategy on a per-request basis.
+   * By default, we provide a defaultRenderingStrategyResolver,
+   * which has a default parameter defaultRenderingStrategyResolverOptions.
+   * This default option disables server-side rendering (SSR) on pages such as 'checkout' and 'my-account'.
    *
    * @param req
    */
@@ -139,6 +144,9 @@ export const defaultSsrOptimizationOptions: SsrOptimizationOptions = {
   maxRenderTime: 300_000,
   reuseCurrentRendering: true,
   debug: false,
+  renderingStrategyResolver: defaultRenderingStrategyResolver(
+    defaultRenderingStrategyResolverOptions
+  ),
   //CXSPA-3680 - set ExpressServerLogger as default
   //logger: new ExpressServerLogger(),
 };

From 5d9976a78872a5ac6808fcf1ea9b79993b3c7748 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Tue, 12 Sep 2023 11:02:08 +0530
Subject: [PATCH 112/122] CXINT-2325: Allow Register Org with empty phone
 number (#17822)

---
 .../root/config/default-cdc-routing-config.ts |   9 +-
 .../cdc/root/service/cdc-js.service.spec.ts   | 136 ++++++++++++++++++
 .../cdc/root/service/cdc-js.service.ts        |  31 ++--
 .../cdc/b2b/b2b-register-org.core-e2e.cy.ts   |  41 ++++--
 .../helpers/b2b/b2b-user-registration.ts      |   4 +-
 5 files changed, 199 insertions(+), 22 deletions(-)

diff --git a/integration-libs/cdc/root/config/default-cdc-routing-config.ts b/integration-libs/cdc/root/config/default-cdc-routing-config.ts
index dbce5a577ae..0dc857d4663 100644
--- a/integration-libs/cdc/root/config/default-cdc-routing-config.ts
+++ b/integration-libs/cdc/root/config/default-cdc-routing-config.ts
@@ -9,12 +9,17 @@ import { RoutesConfig, RoutingConfig } from '@spartacus/core';
 export const cdcRoutesConfig: RoutesConfig = {
   cdcLogin: {
     paths: ['/cdc/login'],
-    protected: true,
+    protected: false,
     authFlow: true,
   },
   cdcCheckoutLogin: {
     paths: ['/cdc/checkout-login'],
-    protected: true,
+    protected: false,
+    authFlow: true,
+  },
+  cdcOrgRegistration: {
+    paths: ['/cdc/register-org'],
+    protected: false,
     authFlow: true,
   },
 };
diff --git a/integration-libs/cdc/root/service/cdc-js.service.spec.ts b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
index fe6ce38d4b2..b14609491e9 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.spec.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
@@ -10,6 +10,7 @@ import {
   User,
   WindowRef,
 } from '@spartacus/core';
+import { OrganizationUserRegistrationForm } from '@spartacus/organization/user-registration/root';
 import { UserProfileFacade } from '@spartacus/user/profile/root';
 import { EMPTY, Observable, of, Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -97,6 +98,7 @@ class MockSubscription {
 const b2b = {
   getOrganizationContext: () => {},
   openDelegatedAdminLogin: () => {},
+  registerOrganization: () => {},
 };
 
 const gigya = {
@@ -1208,4 +1210,138 @@ describe('CdcJsService', () => {
       expect(service.getSiteConsentDetails).toBeTruthy();
     });
   });
+
+  describe('registerOrganisationWithoutScreenSet', () => {
+    it('should not call accounts.b2b.registerOrganization', (done) => {
+      spyOn(
+        service['gigyaSDK'].accounts.b2b,
+        'registerOrganization'
+      ).and.callFake((options: { callback: Function }) => {
+        options.callback({ status: 'OK' });
+      });
+      expect(service.registerOrganisationWithoutScreenSet).toBeTruthy();
+      const wrongOrgInfo: OrganizationUserRegistrationForm = {
+        companyName: '',
+        email: '',
+        firstName: '',
+        lastName: '',
+      };
+      service.registerOrganisationWithoutScreenSet(wrongOrgInfo).subscribe({
+        error: (error) => {
+          expect(error).toEqual('Organization details not provided');
+          done();
+        },
+      });
+      expect(
+        service['gigyaSDK'].accounts.b2b.registerOrganization
+      ).not.toHaveBeenCalled();
+    });
+
+    it('should call accounts.b2b.registerOrganization', (done) => {
+      spyOn(
+        service['gigyaSDK'].accounts.b2b,
+        'registerOrganization'
+      ).and.callFake((options: { callback: Function }) => {
+        options.callback({ status: 'OK' });
+      });
+
+      expect(service.registerOrganisationWithoutScreenSet).toBeTruthy();
+      const correctOrgInfo: OrganizationUserRegistrationForm = {
+        companyName: 'ABC',
+        email: 'abc@mail.com',
+        firstName: 'A',
+        lastName: 'User',
+        addressLine1: 'Line 1',
+        addressLine2: 'Line 2',
+        postalCode: '12312',
+        town: 'town',
+        region: 'region',
+        country: 'India',
+        phoneNumber: '+911234567890',
+        message: 'department: Dept;\nposition: Pos',
+      };
+
+      service
+        .registerOrganisationWithoutScreenSet(correctOrgInfo)
+        .subscribe(() => {
+          expect(
+            service['gigyaSDK'].accounts.b2b.registerOrganization
+          ).toHaveBeenCalledWith({
+            organization: {
+              name: correctOrgInfo.companyName,
+              street_address:
+                correctOrgInfo.addressLine1 + ' ' + correctOrgInfo.addressLine2,
+              city: correctOrgInfo.town,
+              state: correctOrgInfo.region,
+              zip_code: correctOrgInfo.postalCode,
+              country: correctOrgInfo.country,
+            },
+            requester: {
+              firstName: correctOrgInfo.firstName,
+              lastName: correctOrgInfo.lastName,
+              email: correctOrgInfo.email,
+              phone: correctOrgInfo.phoneNumber,
+              department: 'Dept',
+              jobFunction: 'Pos',
+            },
+            regSource: 'https://spartacus.cx',
+            callback: jasmine.any(Function),
+          });
+          done();
+        });
+    });
+
+    it('should call accounts.b2b.registerOrganization and not pass phone number if empty', (done) => {
+      spyOn(
+        service['gigyaSDK'].accounts.b2b,
+        'registerOrganization'
+      ).and.callFake((options: { callback: Function }) => {
+        options.callback({ status: 'OK' });
+      });
+
+      expect(service.registerOrganisationWithoutScreenSet).toBeTruthy();
+      const correctOrgInfo: OrganizationUserRegistrationForm = {
+        companyName: 'ABC',
+        email: 'abc@mail.com',
+        firstName: 'A',
+        lastName: 'User',
+        addressLine1: 'Line 1',
+        addressLine2: 'Line 2',
+        postalCode: '12312',
+        town: 'town',
+        region: 'region',
+        country: 'India',
+        phoneNumber: '',
+        message: 'department: Dept;\nposition: Pos',
+      };
+
+      service
+        .registerOrganisationWithoutScreenSet(correctOrgInfo)
+        .subscribe(() => {
+          expect(
+            service['gigyaSDK'].accounts.b2b.registerOrganization
+          ).toHaveBeenCalledWith({
+            organization: {
+              name: correctOrgInfo.companyName,
+              street_address:
+                correctOrgInfo.addressLine1 + ' ' + correctOrgInfo.addressLine2,
+              city: correctOrgInfo.town,
+              state: correctOrgInfo.region,
+              zip_code: correctOrgInfo.postalCode,
+              country: correctOrgInfo.country,
+            },
+            requester: {
+              firstName: correctOrgInfo.firstName,
+              lastName: correctOrgInfo.lastName,
+              email: correctOrgInfo.email,
+              department: 'Dept',
+              jobFunction: 'Pos',
+            },
+            regSource: 'https://spartacus.cx',
+            callback: jasmine.any(Function),
+          });
+          done();
+        });
+    });
+  });
 });
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index a86e511b464..abfb2de8e7e 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -305,21 +305,14 @@ export class CdcJsService implements OnDestroy {
       !orgInfo?.firstName ||
       !orgInfo?.lastName
     ) {
-      return throwError(null);
+      return throwError('Organization details not provided');
     } else {
       const regSource: string = this.winRef.nativeWindow?.location?.href || '';
       const message = orgInfo.message;
       let department = null;
       let position = null;
       if (message) {
-        const msgList = message.replace('\n', '').split(';');
-        for (const msg of msgList) {
-          if (msg.trim().toLowerCase().search('department') === 0) {
-            department = msg.split(':')[1].trim();
-          } else if (msg.trim().toLowerCase().search('position') === 0) {
-            position = msg.split(':')[1].trim();
-          }
-        }
+        ({ department, position } = this.parseMessage(message));
       }
 
       return this.invokeAPI('accounts.b2b.registerOrganization', {
@@ -335,7 +328,8 @@ export class CdcJsService implements OnDestroy {
           firstName: orgInfo.firstName,
           lastName: orgInfo.lastName,
           email: orgInfo.email,
-          phone: orgInfo.phoneNumber,
+          ...(orgInfo.phoneNumber &&
+            orgInfo.phoneNumber.length > 0 && { phone: orgInfo.phoneNumber }),
           department: department,
           jobFunction: position,
         },
@@ -422,6 +416,23 @@ export class CdcJsService implements OnDestroy {
     return of(defaultSessionTimeOut);
   }
 
+  private parseMessage(message: string): {
+    department: string;
+    position: string;
+  } {
+    const msgList = message.replace('\n', '').split(';');
+    let department = '';
+    let position = '';
+    for (const msg of msgList) {
+      if (msg.trim().toLowerCase().search('department') === 0) {
+        department = msg.split(':')[1].trim();
+      } else if (msg.trim().toLowerCase().search('position') === 0) {
+        position = msg.split(':')[1].trim();
+      }
+    }
+    return { department, position };
+  }
+
   private getCurrentBaseSite(): string {
     let baseSite: string = '';
     this.baseSiteService
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
index 216ba80a3d4..73362483372 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/cdc/b2b/b2b-register-org.core-e2e.cy.ts
@@ -4,22 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as cdc from '../../../../helpers/vendor/cdc/cdc';
-import {
-  user,
-  organisation,
-  getSampleUser,
-} from '../../../../sample-data/checkout-flow';
-import { isolateTests } from '../../../../support/utils/test-isolation';
 import {
   fillOrganizationUserRegistrationForm,
   navigateToOrganizationUserRegisterPage,
-  submitOrganizationUserRegistrationForm,
   verifyFormErrors,
   verifyGlobalMessageAfterRegistration,
-  verifyRedirectionToLoginPage,
   verifyTabbingOrder,
 } from '../../../../helpers/b2b/b2b-user-registration';
+import * as cdc from '../../../../helpers/vendor/cdc/cdc';
+import {
+  getSampleUser,
+  organisation,
+  user,
+} from '../../../../sample-data/checkout-flow';
+import { isolateTests } from '../../../../support/utils/test-isolation';
 
 describe('Register B2B Organisation when CDC enabled', () => {
   describe('Register B2B Organisation with Screenset', () => {
@@ -74,6 +72,31 @@ describe('Register B2B Organisation when CDC enabled', () => {
         //   cdc.verifyOrgRegistrationRequestReceived();
       });
 
+      describe('Register Organization without phone number (CXINT-2325)', () => {
+        before(() => {
+          cy.window().then((win) => win.sessionStorage.clear());
+          cy.visit('/');
+        });
+
+        it('should display validation errors if form is empty', () => {
+          navigateToOrganizationUserRegisterPage();
+          let sampleB2BUser = getSampleUser();
+          sampleB2BUser.phone = '';
+          fillOrganizationUserRegistrationForm(
+            sampleB2BUser,
+            'Please register my account'
+          );
+
+          cy.get('cx-user-registration-form').within(() => {
+            cy.get('button[type=submit]').click();
+          });
+
+          const message =
+            'Thank you for registering! A representative will contact you shortly and confirm your access information.';
+          verifyGlobalMessageAfterRegistration(message);
+        });
+      });
+
       describe('Form errors', () => {
         before(() => {
           cy.window().then((win) => win.sessionStorage.clear());
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-user-registration.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-user-registration.ts
index 4f8e9d0c873..fca268aed94 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-user-registration.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-user-registration.ts
@@ -54,7 +54,9 @@ export function fillOrganizationUserRegistrationForm(
       cy.get('#region-select').ngSelect(address?.state);
     }
 
-    cy.get('[formcontrolname="phoneNumber"]').type(phone);
+    if (phone) {
+      cy.get('[formcontrolname="phoneNumber"]').type(phone);
+    }
 
     if (message) {
       cy.get('[formcontrolname="message"]').type(message);

From 4246b614510f900f66c52e617c873d7741bac097 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Thu, 14 Sep 2023 17:30:36 +0530
Subject: [PATCH 113/122] fix: CXINT-2321 and CXINT-2322 Bug fixes (#17832)

---
 ...elivery-mode-date-picker.component.spec.ts | 71 +++++++++++++++++++
 .../delivery-mode-date-picker.component.ts    | 15 ++--
 .../shared/date-validation.service.spec.ts    | 42 +++++++++--
 .../shared/date-validation.service.ts         | 26 ++++++-
 .../requested-delivery-date.e2e.cy.ts         |  2 +-
 .../requested-delivery-date.ts                |  4 +-
 6 files changed, 145 insertions(+), 15 deletions(-)

diff --git a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
index 2341afccc78..0fdab67fe5c 100644
--- a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
+++ b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.spec.ts
@@ -229,6 +229,77 @@ describe('DeliveryModeDatePickerComponent', () => {
       });
   });
 
+  it('should NOT call setRequestedDeliveryDate when a date less than earliestRetrievalAt is provided', () => {
+    spyOn(component, 'setRequestedDeliveryDate');
+
+    component['requestedDelDateFacade'].setRequestedDeliveryDate = jasmine
+      .createSpy('setRequestedDeliveryDate')
+      .and.returnValue(of({}));
+
+    const requestedRetrievalAt = '2023-05-03';
+    const earliestRetrievalAt = '2023-09-15';
+    const data = TestBed.inject(OutletContextData);
+    data.context$ = of({
+      item: {
+        requestedRetrievalAt,
+        earliestRetrievalAt,
+        code: '123',
+        user: {
+          uid: 'current',
+        },
+      },
+      readonly: false,
+    });
+
+    component.ngOnInit();
+    fixture.detectChanges();
+    const newRequestedRetrievalAt = '2023-01-01';
+    component['form'].patchValue({
+      requestDeliveryDate: newRequestedRetrievalAt,
+    });
+
+    //Manually trigger change event for date picker.
+    const event = new Event('update');
+    const datePickerEl: HTMLInputElement = fixture.debugElement.query(
+      By.css('cx-date-picker')
+    )?.nativeElement;
+    datePickerEl.dispatchEvent(event);
+
+    expect(component['setRequestedDeliveryDate']).toHaveBeenCalled();
+    expect(
+      component['requestedDelDateFacade'].setRequestedDeliveryDate
+    ).not.toHaveBeenCalled();
+  });
+
+  it('should NOT show the date picker when the component outlet value is read only', () => {
+    spyOn(component, 'setRequestedDeliveryDate');
+    const requestedRetrievalAt = '2023-05-03';
+    const earliestRetrievalAt = '2023-09-15';
+    const data = TestBed.inject(OutletContextData);
+    data.context$ = of({
+      item: {
+        requestedRetrievalAt,
+        earliestRetrievalAt,
+        code: '123',
+        user: {
+          uid: 'current',
+        },
+      },
+      readonly: true,
+    });
+
+    component.ngOnInit();
+    fixture.detectChanges();
+    const datePickerEl: HTMLInputElement = fixture.debugElement.query(
+      By.css('cx-date-picker')
+    )?.nativeElement;
+    expect(datePickerEl).toBeUndefined();
+    const datePickerReadOnlyEl: HTMLInputElement = fixture.debugElement.query(
+      By.css('cx-card')
+    )?.nativeElement;
+    expect(datePickerReadOnlyEl.innerHTML).not.toBeNull();
+  });
+
   it('should show error message when backend OCC API returns UnknownResourceError', (done) => {
     spyOn(component['globalMessageService'], 'add');
 
diff --git a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
index 5911eedb6fa..853008fd95f 100644
--- a/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
+++ b/feature-libs/requested-delivery-date/root/components/delivery-mode-date-picker/delivery-mode-date-picker.component.ts
@@ -67,6 +67,9 @@ export class DeliveryModeDatePickerComponent implements OnInit, OnDestroy {
     } else {
       //set the value of requestedRetrievalAt as earliestRetrievalAt and update occ.
       this.requestedRetrievalAt = this.earliestRetrievalAt;
+      this.form.patchValue({
+        requestDeliveryDate: this.requestedRetrievalAt,
+      });
       this.setRequestedDeliveryDate();
     }
     this.form.patchValue({
@@ -104,15 +107,17 @@ export class DeliveryModeDatePickerComponent implements OnInit, OnDestroy {
   setRequestedDeliveryDate() {
     const userId = this.cartEntry?.user?.uid || '';
     const cartId = this.cartEntry?.code || '';
-    const requestedDate =
-      this.form?.get('requestDeliveryDate')?.value ||
-      this.requestedRetrievalAt ||
-      '';
+    const requestedDate = this.form?.get('requestDeliveryDate')?.value || '';
 
     if (
       userId.length === 0 ||
       cartId.length === 0 ||
-      requestedDate.length === 0
+      requestedDate.length === 0 ||
+      !this.dateValidationService.isDateStringValid(requestedDate) ||
+      !this.dateValidationService.isDateGreaterOrEqual(
+        requestedDate,
+        this.earliestRetrievalAt || ''
+      )
     ) {
       return;
     }
diff --git a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
index 5e947fcaca0..f23ff8db9e9 100644
--- a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
+++ b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.spec.ts
@@ -6,6 +6,8 @@ const mockInvalidDate1 = '32-09-2023';
 const mockInvalidDate2 = '29-02-rddo';
 const mockInvalidDate3 = '';
 const mockInvalidDate4 = 'abcd';
+const mockValidGreaterDate = '31-12-2023';
+const mockValidLesserDate = '01-01-2023';
 
 describe('DateValidationService', () => {
   let service: DateValidationService;
@@ -22,14 +24,40 @@ describe('DateValidationService', () => {
     expect(service).toBeTruthy();
   });
 
-  it('should validate correct Dates', () => {
-    expect(service.isDateStringValid(mockValidDate)).toBeTruthy();
+  describe('isDateStringValid', () => {
+    it('should validate correct Dates', () => {
+      expect(service.isDateStringValid(mockValidDate)).toBeTruthy();
+    });
+
+    it('should invalidate wrong Dates', () => {
+      expect(service.isDateStringValid(mockInvalidDate1)).toBeFalsy();
+      expect(service.isDateStringValid(mockInvalidDate2)).toBeFalsy();
+      expect(service.isDateStringValid(mockInvalidDate3)).toBeFalsy();
+      expect(service.isDateStringValid(mockInvalidDate4)).toBeFalsy();
+    });
   });
 
-  it('should invalidate wrong Dates', () => {
-    expect(service.isDateStringValid(mockInvalidDate1)).toBeFalsy();
-    expect(service.isDateStringValid(mockInvalidDate2)).toBeFalsy();
-    expect(service.isDateStringValid(mockInvalidDate3)).toBeFalsy();
-    expect(service.isDateStringValid(mockInvalidDate4)).toBeFalsy();
+  describe('isDateGreaterOrEqual', () => {
+    it('should return false for invalid dates', () => {
+      expect(service.isDateGreaterOrEqual(mockValidDate, '')).toBeFalsy();
+    });
+
+    it('should return false when source date is less than target', () => {
+      expect(
+        service.isDateGreaterOrEqual(mockValidLesserDate, mockValidDate)
+      ).toBeFalsy();
+    });
+
+    it('should return true for equal dates', () => {
+      expect(
+        service.isDateGreaterOrEqual(mockValidDate, mockValidDate)
+      ).toBeTruthy();
+    });
+
+    it('should return true when source date is greater than target', () => {
+      expect(
+        service.isDateGreaterOrEqual(mockValidGreaterDate, mockValidDate)
+      ).toBeTruthy();
+    });
   });
 });
diff --git a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
index 2410013bd29..e6b9bd681cf 100644
--- a/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
+++ b/feature-libs/requested-delivery-date/root/components/shared/date-validation.service.ts
@@ -21,8 +21,32 @@ export class DateValidationService {
       value !== undefined &&
       value.length > 0 &&
       !isNaN(
-        new Date(value.replace(/(\d{2})-(\d{2})-(\d{4})/, '$2/$1/$3')).getDate() //convert 'dd-mm-yyyy' into 'mm/dd/yyyy'
+        this.getDateFromDateString(value).getDate() //convert 'dd-mm-yyyy' into 'mm/dd/yyyy'
       )
     );
   }
+
+  /**
+   * Returns a Date object from a date string in the format 'dd-mm-yyy'
+   * @param value Date string in the format 'dd-mm-yyy'
+   */
+  getDateFromDateString(value: string): Date {
+    return new Date(value.replace(/(\d{2})-(\d{2})-(\d{4})/, '$2/$1/$3'));
+  }
+
+  /**
+   * Checks if the source date is greater than or equal to the target
+   * @param source Date string in the format 'dd-mm-yyy'
+   * @param target Date string in the format 'dd-mm-yyy'
+   * @returns true if `source` date is greater than or equal to `target` date
+   */
+  isDateGreaterOrEqual(source: string, target: string): boolean {
+    if (source.length === 0 || target.length === 0) {
+      return false;
+    }
+    const d1 = this.getDateFromDateString(source);
+    const d2 = this.getDateFromDateString(target);
+
+    return d1 < d2 ? false : true;
+  }
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
index 21aa07b32f4..d430d0c141a 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
@@ -74,7 +74,7 @@ describe('Requested Delivery Date', { testIsolation: false }, () => {
     });
 
     it('should show an error when an invalid delivery date is provided', () => {
-      rddHelper.updateRequestedDeliveryDate('1000-01-01');
+      rddHelper.updateRequestedDeliveryDate('10000-01-01');
       rddHelper.verifyDeliveryDateErrorMessage();
     });
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
index c3f8432f38b..a074c5f26c9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/requested-delivery-date/requested-delivery-date.ts
@@ -99,8 +99,10 @@ export function verifyRDDDatePickerExists() {
 export function updateRequestedDeliveryDate(date: string) {
   interceptPutRequestedRetrievalAtEndpoint();
   cy.get('cx-date-picker').within(() => {
-    cy.get('input[type="date"]', { timeout: 3000 })
+    cy.get('input', { timeout: 3000 })
       .should('not.be.disabled')
+      .invoke('removeAttr', 'type')
+      .clear()
       .type(date)
       .trigger('update');
   });

From b519cbcabcc03e967b4bee7a16af3a1228a6ab60 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Thu, 14 Sep 2023 22:35:20 +0530
Subject: [PATCH 114/122] feat: CXINT-1851: PDF Invoices feature library
 (#17807)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .env-cmdrc                                    |   7 +-
 core-libs/setup/tsconfig.spec.json            |  16 +
 extra-webpack.config.js                       |   4 +
 feature-libs/asm/tsconfig.schematics.json     |  16 +
 feature-libs/cart/tsconfig.schematics.json    |  16 +
 .../checkout/tsconfig.schematics.json         |  16 +
 .../tsconfig.schematics.json                  |  16 +
 feature-libs/order/tsconfig.schematics.json   |  16 +
 .../organization/tsconfig.schematics.json     |  16 +
 feature-libs/pdf-invoices/.eslintrc.json      |   4 +
 feature-libs/pdf-invoices/README.md           |   4 +
 feature-libs/pdf-invoices/_index.scss         |   2 +
 .../pdf-invoices/assets/ng-package.json       |   6 +
 .../pdf-invoices/assets/public_api.ts         |   7 +
 .../assets/translations/en/index.ts           |  11 +
 .../assets/translations/en/pdf-invoices.ts    |  39 ++
 .../assets/translations/translations.ts       |  16 +
 feature-libs/pdf-invoices/components/index.ts |   7 +
 .../invoices-list.component.html              | 191 ++++++
 .../invoices-list.component.spec.ts           | 474 +++++++++++++++
 .../invoices-list/invoices-list.component.ts  | 195 ++++++
 .../pdf-invoices/components/ng-package.json   |   6 +
 .../pdf-invoices-components.module.ts         |  51 ++
 .../pdf-invoices/components/public_api.ts     |   8 +
 .../core/connectors/converters.ts             |  13 +
 .../pdf-invoices/core/connectors/index.ts     |   9 +
 .../core/connectors/pdf-invoices.adapter.ts   |  39 ++
 .../connectors/pdf-invoices.connector.spec.ts | 121 ++++
 .../core/connectors/pdf-invoices.connector.ts |  42 ++
 .../pdf-invoices-badrequest.handler.spec.ts   |  96 +++
 .../pdf-invoices-badrequest.handler.ts        |  91 +++
 .../core/http-interceptors/index.ts           |   7 +
 .../pdf-invoices/core/ng-package.json         |   6 +
 .../core/pdf-invoices-core.module.ts          |  30 +
 feature-libs/pdf-invoices/core/public_api.ts  |  10 +
 .../pdf-invoices/core/services/index.ts       |   7 +
 .../services/pdf-invoices.service.spec.ts     | 186 ++++++
 .../core/services/pdf-invoices.service.ts     |  81 +++
 .../pdf-invoices/jest.schematics.config.js    |  35 ++
 feature-libs/pdf-invoices/karma.conf.js       |  47 ++
 feature-libs/pdf-invoices/ng-package.json     |   8 +
 .../pdf-invoices/occ/adapters/index.ts        |   7 +
 .../adapters/occ-pdf-invoices.adapter.spec.ts | 251 ++++++++
 .../occ/adapters/occ-pdf-invoices.adapter.ts  |  97 +++
 .../config/default-occ-pdf-invoices-config.ts |  19 +
 feature-libs/pdf-invoices/occ/model/index.ts  |   8 +
 .../occ/model/occ-pdf-invoices.model.ts       |  27 +
 feature-libs/pdf-invoices/occ/ng-package.json |   6 +
 .../occ/pdf-invoices-occ.module.ts            |  24 +
 feature-libs/pdf-invoices/occ/public_api.ts   |   9 +
 feature-libs/pdf-invoices/package.json        |  42 ++
 .../pdf-invoices/pdf-invoices.module.ts       |  20 +
 feature-libs/pdf-invoices/project.json        |  40 ++
 feature-libs/pdf-invoices/public_api.ts       |  10 +
 .../pdf-invoices/root/facade/index.ts         |   7 +
 .../root/facade/pdf-invoices.facade.ts        |  54 ++
 .../pdf-invoices/root/feature-name.ts         |   8 +
 feature-libs/pdf-invoices/root/model/index.ts |   7 +
 .../root/model/pdf-invoices.model.ts          |  50 ++
 .../pdf-invoices/root/ng-package.json         |   6 +
 .../root/pdf-invoices-root.module.ts          |  34 ++
 feature-libs/pdf-invoices/root/public_api.ts  |  10 +
 .../pdf-invoices/schematics/.gitignore        |  18 +
 .../__snapshots__/index_spec.ts.snap          | 130 ++++
 .../schematics/add-pdf-invoices/index.ts      |  46 ++
 .../schematics/add-pdf-invoices/index_spec.ts | 174 ++++++
 .../schematics/add-pdf-invoices/schema.json   |  31 +
 .../pdf-invoices/schematics/collection.json   |  18 +
 feature-libs/pdf-invoices/setup-jest.ts       |   8 +
 feature-libs/pdf-invoices/styles/_index.scss  |   1 +
 .../pdf-invoices/styles/_pdf-invoices.scss    | 237 ++++++++
 feature-libs/pdf-invoices/test.ts             |  22 +
 feature-libs/pdf-invoices/tsconfig.lib.json   |  33 ++
 .../pdf-invoices/tsconfig.lib.prod.json       |  11 +
 .../pdf-invoices/tsconfig.schematics.json     | 557 ++++++++++++++++++
 feature-libs/pdf-invoices/tsconfig.spec.json  |  14 +
 .../pickup-in-store/tsconfig.schematics.json  |  16 +
 .../tsconfig.schematics.json                  |  16 +
 feature-libs/product/tsconfig.schematics.json |  16 +
 .../qualtrics/tsconfig.schematics.json        |  16 +
 .../requested-delivery-date/tsconfig.lib.json |   2 +-
 .../tsconfig.schematics.json                  |  16 +
 .../smartedit/tsconfig.schematics.json        |  16 +
 .../storefinder/tsconfig.schematics.json      |  16 +
 .../tracking/tsconfig.schematics.json         |  16 +
 feature-libs/user/tsconfig.schematics.json    |  16 +
 integration-libs/cdc/tsconfig.schematics.json |  16 +
 integration-libs/cds/tsconfig.schematics.json |  16 +
 .../digital-payments/tsconfig.schematics.json |  16 +
 .../tsconfig.schematics.json                  |  16 +
 integration-libs/s4om/README.md               |   7 +-
 integration-libs/s4om/package.json            |   1 +
 .../s4om/root/s4om-root.module.ts             |   2 +
 .../s4om/schematics/add-s4om/schema.json      |   4 +
 integration-libs/s4om/tsconfig.lib.json       |  10 +-
 .../s4om/tsconfig.schematics.json             |  16 +
 .../segment-refs/tsconfig.schematics.json     |  16 +
 package.json                                  |   5 +-
 projects/schematics/package.json              |   1 +
 .../schematics/src/add-spartacus/schema.json  |   5 +
 projects/schematics/src/dependencies.json     |  12 +
 .../s4om-schematics-config.ts                 |   9 +-
 .../pdf-invoices-schematics-config.ts         |  57 ++
 .../schematics/src/shared/libs-constants.ts   |   6 +
 .../src/shared/schematics-config-mappings.ts  |   3 +
 .../src/shared/utils/graph-utils_spec.ts      |   5 +-
 .../schematics/src/shared/utils/test-utils.ts |   2 +
 .../pdf-invoices/pdf-invoices.e2e.cy.ts       | 142 +++++
 .../requested-delivery-date.e2e.cy.ts         |  24 +-
 .../vendor/s4om/s4om-schedule-lines.e2e.cy.ts |  22 +-
 .../vendor/pdf-invoices/pdf-invoices.ts       | 474 +++++++++++++++
 projects/storefrontapp/project.json           |   4 +
 .../pdf-invoices-feature.module.ts            |  38 ++
 .../spartacus/spartacus-features.module.ts    |   4 +
 .../src/environments/environment.prod.ts      |   1 +
 .../src/environments/environment.ts           |   1 +
 .../models/build.process.env.d.ts             |   1 +
 .../environments/models/environment.model.ts  |   1 +
 .../src/styles/lib-pdf-invoices.scss          |   2 +
 projects/storefrontapp/tsconfig.app.prod.json |   6 +
 projects/storefrontapp/tsconfig.server.json   |  16 +
 .../storefrontapp/tsconfig.server.prod.json   |   8 +
 scripts/install/functions.sh                  |  28 +
 tools/schematics/testing.ts                   |   3 +
 tsconfig.compodoc.json                        |  18 +
 tsconfig.json                                 |  18 +
 126 files changed, 5157 insertions(+), 33 deletions(-)
 create mode 100644 feature-libs/pdf-invoices/.eslintrc.json
 create mode 100644 feature-libs/pdf-invoices/README.md
 create mode 100644 feature-libs/pdf-invoices/_index.scss
 create mode 100644 feature-libs/pdf-invoices/assets/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/assets/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/assets/translations/en/index.ts
 create mode 100644 feature-libs/pdf-invoices/assets/translations/en/pdf-invoices.ts
 create mode 100644 feature-libs/pdf-invoices/assets/translations/translations.ts
 create mode 100644 feature-libs/pdf-invoices/components/index.ts
 create mode 100644 feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.html
 create mode 100644 feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.spec.ts
 create mode 100644 feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.ts
 create mode 100644 feature-libs/pdf-invoices/components/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/components/pdf-invoices-components.module.ts
 create mode 100644 feature-libs/pdf-invoices/components/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/core/connectors/converters.ts
 create mode 100644 feature-libs/pdf-invoices/core/connectors/index.ts
 create mode 100644 feature-libs/pdf-invoices/core/connectors/pdf-invoices.adapter.ts
 create mode 100644 feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.spec.ts
 create mode 100644 feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.ts
 create mode 100644 feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.spec.ts
 create mode 100644 feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.ts
 create mode 100644 feature-libs/pdf-invoices/core/http-interceptors/index.ts
 create mode 100644 feature-libs/pdf-invoices/core/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/core/pdf-invoices-core.module.ts
 create mode 100644 feature-libs/pdf-invoices/core/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/core/services/index.ts
 create mode 100644 feature-libs/pdf-invoices/core/services/pdf-invoices.service.spec.ts
 create mode 100644 feature-libs/pdf-invoices/core/services/pdf-invoices.service.ts
 create mode 100644 feature-libs/pdf-invoices/jest.schematics.config.js
 create mode 100644 feature-libs/pdf-invoices/karma.conf.js
 create mode 100644 feature-libs/pdf-invoices/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/occ/adapters/index.ts
 create mode 100644 feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.spec.ts
 create mode 100644 feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.ts
 create mode 100644 feature-libs/pdf-invoices/occ/config/default-occ-pdf-invoices-config.ts
 create mode 100644 feature-libs/pdf-invoices/occ/model/index.ts
 create mode 100644 feature-libs/pdf-invoices/occ/model/occ-pdf-invoices.model.ts
 create mode 100644 feature-libs/pdf-invoices/occ/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/occ/pdf-invoices-occ.module.ts
 create mode 100644 feature-libs/pdf-invoices/occ/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/package.json
 create mode 100644 feature-libs/pdf-invoices/pdf-invoices.module.ts
 create mode 100644 feature-libs/pdf-invoices/project.json
 create mode 100644 feature-libs/pdf-invoices/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/root/facade/index.ts
 create mode 100644 feature-libs/pdf-invoices/root/facade/pdf-invoices.facade.ts
 create mode 100644 feature-libs/pdf-invoices/root/feature-name.ts
 create mode 100644 feature-libs/pdf-invoices/root/model/index.ts
 create mode 100644 feature-libs/pdf-invoices/root/model/pdf-invoices.model.ts
 create mode 100644 feature-libs/pdf-invoices/root/ng-package.json
 create mode 100644 feature-libs/pdf-invoices/root/pdf-invoices-root.module.ts
 create mode 100644 feature-libs/pdf-invoices/root/public_api.ts
 create mode 100644 feature-libs/pdf-invoices/schematics/.gitignore
 create mode 100644 feature-libs/pdf-invoices/schematics/add-pdf-invoices/__snapshots__/index_spec.ts.snap
 create mode 100644 feature-libs/pdf-invoices/schematics/add-pdf-invoices/index.ts
 create mode 100644 feature-libs/pdf-invoices/schematics/add-pdf-invoices/index_spec.ts
 create mode 100644 feature-libs/pdf-invoices/schematics/add-pdf-invoices/schema.json
 create mode 100644 feature-libs/pdf-invoices/schematics/collection.json
 create mode 100644 feature-libs/pdf-invoices/setup-jest.ts
 create mode 100644 feature-libs/pdf-invoices/styles/_index.scss
 create mode 100644 feature-libs/pdf-invoices/styles/_pdf-invoices.scss
 create mode 100644 feature-libs/pdf-invoices/test.ts
 create mode 100644 feature-libs/pdf-invoices/tsconfig.lib.json
 create mode 100644 feature-libs/pdf-invoices/tsconfig.lib.prod.json
 create mode 100644 feature-libs/pdf-invoices/tsconfig.schematics.json
 create mode 100644 feature-libs/pdf-invoices/tsconfig.spec.json
 create mode 100644 projects/schematics/src/shared/lib-configs/pdf-invoices-schematics-config.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/pdf-invoices/pdf-invoices.e2e.cy.ts
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/pdf-invoices/pdf-invoices.ts
 create mode 100644 projects/storefrontapp/src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts
 create mode 100644 projects/storefrontapp/src/styles/lib-pdf-invoices.scss

diff --git a/.env-cmdrc b/.env-cmdrc
index a8bec18cc0b..21292fe4220 100644
--- a/.env-cmdrc
+++ b/.env-cmdrc
@@ -49,10 +49,15 @@
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_B2B": "true",
     "CX_S4OM": "true",
-    "CX_REQUESTED_DELIVERY_DATE": "true"
+    "CX_REQUESTED_DELIVERY_DATE": "true",
+    "CX_PDF_INVOICES": "true"
   },
   "requested-delivery-date": {
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_REQUESTED_DELIVERY_DATE": "true"
+  },
+  "pdf-invoices": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
+    "CX_PDF_INVOICES": "true"
   }
 }
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index a186e6ab397..87b97044e31 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -262,6 +262,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/extra-webpack.config.js b/extra-webpack.config.js
index 663f036087e..ebf83056b8c 100644
--- a/extra-webpack.config.js
+++ b/extra-webpack.config.js
@@ -29,6 +29,10 @@ module.exports = {
         __dirname,
         'feature-libs/organization'
       ),
+      '@spartacus/pdf-invoices': path.join(
+        __dirname,
+        'feature-libs/pdf-invoices'
+      ),
       '@spartacus/product': path.join(__dirname, 'feature-libs/product'),
       '@spartacus/product-configurator': path.join(
         __dirname,
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index bc2b2041ba7..125e28e522d 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -272,6 +272,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/pdf-invoices/.eslintrc.json b/feature-libs/pdf-invoices/.eslintrc.json
new file mode 100644
index 00000000000..862b5a870b0
--- /dev/null
+++ b/feature-libs/pdf-invoices/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../.eslintrc.json",
+  "ignorePatterns": ["schematics/**/*.d.ts"]
+}
diff --git a/feature-libs/pdf-invoices/README.md b/feature-libs/pdf-invoices/README.md
new file mode 100644
index 00000000000..b1cac7c8742
--- /dev/null
+++ b/feature-libs/pdf-invoices/README.md
@@ -0,0 +1,4 @@
+# PDF Invoices
+
+This feature allows users to view invoices for their orders and download PDF invoices using `Invoices` APIs.
+When the user selects an invoice, the backend returns a byte array, which is converted to PDF and downloaded.
\ No newline at end of file
diff --git a/feature-libs/pdf-invoices/_index.scss b/feature-libs/pdf-invoices/_index.scss
new file mode 100644
index 00000000000..86f72a0df42
--- /dev/null
+++ b/feature-libs/pdf-invoices/_index.scss
@@ -0,0 +1,2 @@
+@import '@spartacus/styles/scss/core';
+@import './styles/index';
diff --git a/feature-libs/pdf-invoices/assets/ng-package.json b/feature-libs/pdf-invoices/assets/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/pdf-invoices/assets/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/assets/public_api.ts b/feature-libs/pdf-invoices/assets/public_api.ts
new file mode 100644
index 00000000000..f3d8f426ab4
--- /dev/null
+++ b/feature-libs/pdf-invoices/assets/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './translations/translations';
diff --git a/feature-libs/pdf-invoices/assets/translations/en/index.ts b/feature-libs/pdf-invoices/assets/translations/en/index.ts
new file mode 100644
index 00000000000..702a8063b58
--- /dev/null
+++ b/feature-libs/pdf-invoices/assets/translations/en/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { pdfInvoices } from './pdf-invoices';
+
+export const en = {
+  pdfInvoices,
+};
diff --git a/feature-libs/pdf-invoices/assets/translations/en/pdf-invoices.ts b/feature-libs/pdf-invoices/assets/translations/en/pdf-invoices.ts
new file mode 100644
index 00000000000..808a173b3bc
--- /dev/null
+++ b/feature-libs/pdf-invoices/assets/translations/en/pdf-invoices.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const pdfInvoices = {
+  pdfInvoices: {
+    featureNotEnabled:
+      'Unable to obtain invoices, ensure that SAP Invoice and API for Invoices are enabled.',
+    invoicesLoadingError:
+      'Something went wrong. Unable to display invoices for the order',
+    invoicesTable: {
+      header: 'Invoices',
+      label: 'Invoices Table',
+      invoiceId: 'Invoice #',
+      createdAt: 'Date',
+      netAmount: 'Net Amount',
+      totalAmount: 'Total Amount',
+      attachment: 'Download Invoice',
+      download: 'Download',
+      attachmentDescription: 'Download PDF for invoice {{id}}.',
+      noneFound: 'No Invoices Found',
+    },
+    downloadPDFError: 'Something went wrong. Unable to obtain the invoice PDF.',
+    sortBy: 'Sort by',
+    sortInvoices: 'Sort invoices',
+    sorts: {
+      byCreatedAtAsc: 'Date Ascending',
+      byCreatedAtDesc: 'Date Descending',
+      byInvoiceIdAsc: 'Invoice Number Ascending',
+      byInvoiceIdDesc: 'Invoice Number Descending',
+      byNetAmountAsc: 'Net Amount Ascending',
+      byNetAmountDesc: 'Net Amount Descending',
+      byTotalAmountAsc: 'Total Amount Ascending',
+      byTotalAmountDesc: 'Total Amount Descending',
+    },
+  },
+};
diff --git a/feature-libs/pdf-invoices/assets/translations/translations.ts b/feature-libs/pdf-invoices/assets/translations/translations.ts
new file mode 100644
index 00000000000..5c3d46cc2b6
--- /dev/null
+++ b/feature-libs/pdf-invoices/assets/translations/translations.ts
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TranslationChunksConfig, TranslationResources } from '@spartacus/core';
+import { en } from './en/index';
+
+export const pdfInvoicesTranslations: TranslationResources = {
+  en,
+};
+
+export const pdfInvoicesTranslationChunksConfig: TranslationChunksConfig = {
+  pdfInvoices: ['pdfInvoices'],
+};
diff --git a/feature-libs/pdf-invoices/components/index.ts b/feature-libs/pdf-invoices/components/index.ts
new file mode 100644
index 00000000000..8da193365a3
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './pdf-invoices-components.module';
diff --git a/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.html b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.html
new file mode 100644
index 00000000000..823bd4d5cd1
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.html
@@ -0,0 +1,191 @@
+<ng-container *ngIf="invoicesList$ | async as invoicesList">
+  <ng-container
+    *ngIf="
+      invoicesList.pagination &&
+      invoicesList.pagination.totalCount &&
+      invoicesList.pagination.totalCount > 0
+    "
+  >
+    <div>
+      <!-- HEADER -->
+      <div class="cx-invoices-list-header">
+        <h2>
+          {{ 'pdfInvoices.invoicesTable.header' | cxTranslate }}
+        </h2>
+      </div>
+
+      <!-- BODY -->
+      <div class="cx-invoices-list-body">
+        <div class="cx-invoices-list-sort top">
+          <label class="cx-invoices-list-form-group form-group">
+            <span>
+              {{ 'pdfInvoices.sortBy' | cxTranslate }}
+            </span>
+            <cx-sorting
+              [sortOptions]="sortOptions"
+              (sortListEvent)="sortChange($event)"
+              [selectedOption]="sort"
+              placeholder="{{ 'pdfInvoices.sortBy' | cxTranslate }}"
+              [ariaLabel]="'pdfInvoices.sortInvoices' | cxTranslate"
+              ariaControls="cx-invoices-list-table"
+            ></cx-sorting>
+          </label>
+          <div
+            class="cx-invoices-list-pagination"
+            *ngIf="
+              invoicesList.pagination &&
+              invoicesList.pagination.totalPages &&
+              invoicesList.pagination.totalPages > 1
+            "
+          >
+            <cx-pagination
+              [pagination]="pagination"
+              (viewPageEvent)="pageChange($event)"
+            ></cx-pagination>
+          </div>
+        </div>
+
+        <!-- TABLE -->
+        <table
+          id="cx-invoices-list-table"
+          class="table cx-invoices-list-table"
+          attr.aria-label="{{
+            'pdfInvoices.invoicesTable.label' | cxTranslate
+          }}"
+        >
+          <thead class="cx-invoices-list-thead-mobile">
+            <th scope="col">
+              {{ 'pdfInvoices.invoicesTable.invoiceId' | cxTranslate }}
+            </th>
+            <th scope="col">
+              {{ 'pdfInvoices.invoicesTable.createdAt' | cxTranslate }}
+            </th>
+            <th scope="col">
+              {{ 'pdfInvoices.invoicesTable.netAmount' | cxTranslate }}
+            </th>
+            <th scope="col">
+              {{ 'pdfInvoices.invoicesTable.totalAmount' | cxTranslate }}
+            </th>
+            <th scope="col">
+              <cx-icon
+                [type]="ICON_TYPE.DOWNLOAD"
+                class="cx-invoices-list-attachment-icon"
+                title="{{
+                  'pdfInvoices.invoicesTable.attachment' | cxTranslate
+                }}"
+              ></cx-icon>
+            </th>
+          </thead>
+          <tbody>
+            <tr
+              *ngFor="let invoice of invoicesList.invoices"
+              class="cx-invoices-list-row"
+            >
+              <td class="cx-invoices-list-code">
+                <div class="cx-invoices-list-label">
+                  {{ 'pdfInvoices.invoicesTable.invoiceId' | cxTranslate }}
+                </div>
+                <div class="cx-invoices-list-value">
+                  {{ invoice.invoiceId }}
+                </div>
+              </td>
+              <td class="cx-invoices-list-date">
+                <div class="cx-invoices-list-label">
+                  {{ 'pdfInvoices.invoicesTable.createdAt' | cxTranslate }}
+                </div>
+                <div class="cx-invoices-list-value">
+                  {{ invoice.createdAt | cxDate: 'longDate' }}
+                </div>
+              </td>
+              <td class="cx-invoices-list-monetary">
+                <div class="cx-invoices-list-label">
+                  {{ 'pdfInvoices.invoicesTable.netAmount' | cxTranslate }}
+                </div>
+                <div class="cx-invoices-list-value">
+                  {{
+                    invoice.netAmount?.formattedValue
+                      ? invoice.netAmount?.formattedValue
+                      : invoice.netAmount?.currencyIso +
+                        '&nbsp;' +
+                        invoice.netAmount?.value
+                  }}
+                </div>
+              </td>
+              <td class="cx-invoices-list-monetary">
+                <div class="cx-invoices-list-label">
+                  {{ 'pdfInvoices.invoicesTable.totalAmount' | cxTranslate }}
+                </div>
+                <div class="cx-invoices-list-value">
+                  {{
+                    invoice.totalAmount?.formattedValue
+                      ? invoice.totalAmount?.formattedValue
+                      : invoice.totalAmount?.currencyIso +
+                        '&nbsp;' +
+                        invoice.totalAmount?.value
+                  }}
+                </div>
+              </td>
+              <td class="cx-invoices-list-attachment">
+                <div class="cx-invoices-list-label">
+                  {{ 'pdfInvoices.invoicesTable.attachment' | cxTranslate }}
+                </div>
+                <div class="cx-invoices-list-value">
+                  <button
+                    *ngIf="invoice.invoiceId"
+                    class="cx-invoices-list-attachment-btn"
+                    (click)="
+                      downloadPDFInvoice(
+                        invoice.invoiceId,
+                        invoice.externalSystemId
+                      )
+                    "
+                    attr.aria-label="{{
+                      'pdfInvoices.invoicesTable.attachmentDescription'
+                        | cxTranslate
+                          : {
+                              id: invoice.invoiceId
+                            }
+                    }}"
+                  >
+                    <cx-icon
+                      [type]="ICON_TYPE.FILE"
+                      class="cx-invoices-list-attachment-icon"
+                      title="{{
+                        'pdfInvoices.invoicesTable.download' | cxTranslate
+                      }}"
+                    >
+                    </cx-icon>
+                    <span
+                      class="cx-invoices-list-attachment-text"
+                      [innerText]="
+                        'pdfInvoices.invoicesTable.download' | cxTranslate
+                      "
+                    >
+                    </span>
+                  </button>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+
+        <!-- Select Form and Pagination Bottom -->
+        <div class="cx-invoices-list-sort bottom">
+          <div
+            class="cx-invoices-list-pagination"
+            *ngIf="
+              invoicesList.pagination &&
+              invoicesList.pagination.totalPages &&
+              invoicesList.pagination.totalPages > 1
+            "
+          >
+            <cx-pagination
+              [pagination]="pagination"
+              (viewPageEvent)="pageChange($event)"
+            ></cx-pagination>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.spec.ts b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.spec.ts
new file mode 100644
index 00000000000..04848888b74
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.spec.ts
@@ -0,0 +1,474 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  GlobalMessageEntities,
+  GlobalMessageService,
+  GlobalMessageType,
+  HttpErrorModel,
+  I18nTestingModule,
+  LanguageService,
+  Translatable,
+  TranslationService,
+} from '@spartacus/core';
+import {
+  InvoiceQueryParams,
+  InvoicesFields,
+  OrderInvoiceList,
+  PDFInvoicesFacade,
+} from '@spartacus/pdf-invoices/root';
+import { FileDownloadService, IconTestingModule } from '@spartacus/storefront';
+import { EMPTY, Observable, of, throwError } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { InvoicesListComponent } from './invoices-list.component';
+import createSpy = jasmine.createSpy;
+
+const blob = new Blob();
+
+const mockOrderInvoiceList: OrderInvoiceList = {
+  invoices: [
+    {
+      createdAt: new Date('2023-09-15T18:29:59+0000'),
+      invoiceId: '200000a',
+      netAmount: {
+        currencyIso: 'USD',
+        value: 115,
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 117,
+      },
+    },
+    {
+      createdAt: new Date('2023-08-31T18:29:59+0000'),
+      invoiceId: '200000b',
+      netAmount: {
+        currencyIso: 'USD',
+        value: 118,
+        formattedValue: '$118', //to test formatted value in UI
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 120,
+        formattedValue: '$120', //to test formatted value in UI
+      },
+    },
+    {
+      createdAt: new Date('2023-07-20T18:29:59+0000'),
+      invoiceId: '200000c',
+      netAmount: {
+        currencyIso: 'USD',
+        value: 398,
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 400,
+      },
+    },
+    {
+      createdAt: new Date('2023-06-22T18:29:59+0000'),
+      externalSystemId: 'S4SALES', //to test external id being passed for download
+      invoiceId: '200000d',
+      netAmount: {
+        currencyIso: 'USD',
+        value: 115,
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 117,
+      },
+    },
+    {
+      createdAt: new Date('2023-05-11T18:29:59+0000'),
+      invoiceId: '200000e',
+      netAmount: {
+        currencyIso: 'USD',
+        value: 118,
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 120,
+      },
+    },
+  ],
+  pagination: {
+    count: 5,
+    page: 0,
+    totalCount: 16,
+    totalPages: 4,
+  },
+  sorts: [
+    {
+      asc: true,
+      code: 'invoiceId',
+    },
+  ],
+};
+
+@Component({
+  template: '',
+  selector: 'cx-pagination',
+})
+class MockPaginationComponent {
+  @Input() pagination: any;
+  @Output() viewPageEvent = new EventEmitter<string>();
+}
+@Component({
+  template: '',
+  selector: 'cx-sorting',
+})
+class MockSortingComponent {
+  @Input() sortOptions: any;
+  @Input() sortLabels: any;
+  @Input() selectedOption: any;
+  @Input() placeholder: any;
+  @Output() sortListEvent = new EventEmitter<string>();
+}
+
+class MockPDFInvoicesFacade implements Partial<PDFInvoicesFacade> {
+  getInvoicesForOrder(
+    params: InvoiceQueryParams,
+    _userId?: string,
+    _orderId?: string
+  ): Observable<OrderInvoiceList> {
+    return of(params ? mockOrderInvoiceList : {});
+  }
+  getInvoicePDF(
+    invoiceId: string,
+    _externalSystemId?: string,
+    _userId?: string,
+    _orderId?: string
+  ): Observable<Blob> {
+    if (invoiceId) {
+      return of(blob);
+    } else {
+      return EMPTY;
+    }
+  }
+}
+
+class MockFileDownloadService {
+  download = createSpy('MockFileDownloadService.download Spy');
+}
+
+class MockLanguageService {
+  getActive(): Observable<string> {
+    return of('en');
+  }
+}
+
+class MockTranslationService implements Partial<TranslationService> {
+  translate(value: string, options: any) {
+    return of(value + Object.values(options));
+  }
+}
+
+class MockGlobalMessageService implements Partial<GlobalMessageService> {
+  get(): Observable<GlobalMessageEntities> {
+    return of({});
+  }
+  add(_: string | Translatable, __: GlobalMessageType, ___?: number): void {}
+  remove(_: GlobalMessageType, __?: number): void {}
+}
+
+const mockInvoicesNotEnabledError: HttpErrorModel = {
+  details: [
+    {
+      message:
+        'There is no resource for path /occ/v2/powertools-spa/users/userId1/orders/15092023/invoices',
+      type: 'UnknownResourceError',
+    },
+  ],
+};
+
+describe('InvoicesListComponent', () => {
+  let component: InvoicesListComponent;
+  let fixture: ComponentFixture<InvoicesListComponent>;
+  let pdfInvoicesFacade: PDFInvoicesFacade;
+  let translationService: TranslationService;
+  let downloadService: FileDownloadService;
+  let globalMessageService: GlobalMessageService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [I18nTestingModule, IconTestingModule],
+      declarations: [
+        InvoicesListComponent,
+        MockPaginationComponent,
+        MockSortingComponent,
+      ],
+      providers: [
+        { provide: PDFInvoicesFacade, useClass: MockPDFInvoicesFacade },
+        { provide: FileDownloadService, useClass: MockFileDownloadService },
+        { provide: LanguageService, useClass: MockLanguageService },
+        { provide: TranslationService, useClass: MockTranslationService },
+        { provide: GlobalMessageService, useClass: MockGlobalMessageService },
+      ],
+    }).compileComponents();
+    pdfInvoicesFacade = TestBed.inject(PDFInvoicesFacade);
+    translationService = TestBed.inject(TranslationService);
+    downloadService = TestBed.inject(FileDownloadService);
+    globalMessageService = TestBed.inject(GlobalMessageService);
+
+    spyOn(globalMessageService, 'add').and.callThrough();
+    spyOn(translationService, 'translate').and.returnValue(of('test'));
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(InvoicesListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show feature not enabled error when the API returns error', () => {
+    spyOn(pdfInvoicesFacade, 'getInvoicesForOrder').and.returnValue(
+      throwError(mockInvoicesNotEnabledError)
+    );
+    spyOn(component, 'getNotEnabledError').and.callThrough();
+
+    // Change the page
+    const newPage = 3;
+    component.pageChange(newPage);
+    expect(component.getNotEnabledError).toHaveBeenCalled();
+    expect(globalMessageService.add).toHaveBeenCalledWith(
+      { key: 'pdfInvoices.featureNotEnabled' },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+  });
+
+  it('should read document list', (done) => {
+    let orderInvoiceList: OrderInvoiceList = {};
+    let queryParams: InvoiceQueryParams = {};
+    component.invoicesList$
+      .pipe(take(1))
+      .subscribe((value: OrderInvoiceList) => {
+        orderInvoiceList = value;
+      });
+    expect(orderInvoiceList).toEqual(mockOrderInvoiceList);
+    expect(component.pagination).toEqual({
+      currentPage: 0,
+      pageSize: 5,
+      totalPages: 4,
+      totalResults: 16,
+      sort: 'invoiceId:asc',
+    });
+    component.queryParams$
+      .pipe(take(1))
+      .subscribe((value: InvoiceQueryParams) => {
+        queryParams = value;
+        done();
+      });
+    expect(queryParams).toEqual({
+      currentPage: 0,
+      pageSize: 5,
+      fields: InvoicesFields.FULL,
+      sort: 'invoiceId:asc',
+    });
+  });
+
+  it('Should change page and invoke the API', () => {
+    // Spy functions to ensure new invoices are being fetched
+    spyOn<any>(component, 'updateQueryParams').and.callThrough();
+    spyOn(pdfInvoicesFacade, 'getInvoicesForOrder').and.callThrough();
+
+    // By default currentPage will be 0
+    expect(component._initQueryParams.currentPage).toEqual(0);
+
+    // Change the page
+    const newPage = 3;
+    component.pageChange(newPage);
+
+    // The query params should be updated with the new page
+    expect(component['updateQueryParams']).toHaveBeenCalled();
+    expect(component._initQueryParams.currentPage).toEqual(newPage);
+
+    // A new call with updated parameters is made to PDF Invoices Facade
+    expect(pdfInvoicesFacade.getInvoicesForOrder).toHaveBeenCalledWith({
+      ...component._initQueryParams,
+      currentPage: newPage,
+      fields: InvoicesFields.DEFAULT,
+    });
+  });
+
+  it('Should change sort and invoke the API', () => {
+    // Spy functions to ensure new invoices are being fetched
+    spyOn<any>(component, 'updateQueryParams').and.callThrough();
+    spyOn(pdfInvoicesFacade, 'getInvoicesForOrder').and.callThrough();
+    // Getting ready to change sort, make sure that current sort is different and should be one of the sortOptions key
+    const newSortCode = 'byTotalAmountAsc';
+    expect(component._initQueryParams.sort).not.toEqual(newSortCode);
+
+    // Change the sort
+    component.sortChange(newSortCode);
+
+    // Expect sort to be updated and currentPage to be set back to 0
+    expect(component._initQueryParams.sort).toEqual(
+      component['sortMapping'][newSortCode]
+    );
+    const newPage = 3;
+    expect(component._initQueryParams.currentPage).not.toEqual(newPage);
+    expect(component._initQueryParams.currentPage).toEqual(0);
+
+    expect(pdfInvoicesFacade.getInvoicesForOrder).toHaveBeenCalledWith({
+      ...component._initQueryParams,
+      sort: component['sortMapping'][newSortCode],
+      currentPage: 0,
+      fields: InvoicesFields.DEFAULT,
+    });
+  });
+
+  it('Should populate sort options with translations', () => {
+    // By default there are 8 sort options
+    expect(component.sortOptions?.length).toEqual(8);
+
+    // Expect that translate was called for each of the sort Mappings
+    expect(component.sortOptions?.length).toEqual(8);
+    // Expect that the length of sortOptions is 2
+    expect(translationService['translate']).toHaveBeenCalledTimes(8);
+    // Expect that names have been assigned
+    component.sortOptions.forEach((sort) => {
+      expect(sort?.code && component['sortMapping'][sort?.code]).not.toBeNull();
+      expect(sort.name).toEqual('test');
+    });
+  });
+
+  it('Should have table headers', () => {
+    const tableElement = fixture.debugElement.query(
+      By.css('.cx-invoices-list-table')
+    );
+
+    const tableHeaders = tableElement.queryAll(By.css('th'));
+    expect(tableHeaders?.length).toEqual(5);
+    expect(tableHeaders[0].properties.innerText).toEqual(
+      'pdfInvoices.invoicesTable.invoiceId'
+    );
+    expect(tableHeaders[1].properties.innerText).toEqual(
+      'pdfInvoices.invoicesTable.createdAt'
+    );
+    expect(tableHeaders[2].properties.innerText).toEqual(
+      'pdfInvoices.invoicesTable.netAmount'
+    );
+    expect(tableHeaders[3].properties.innerText).toEqual(
+      'pdfInvoices.invoicesTable.totalAmount'
+    );
+    expect(tableHeaders[4].children[0].attributes.title).toEqual(
+      'pdfInvoices.invoicesTable.attachment'
+    );
+  });
+
+  it('Should have populated table data', () => {
+    const isDate = (formattedDate: string): boolean =>
+      /[a-zA-Z]+ \d{1,2}, \d{4}/gm.test(formattedDate);
+
+    const tableElement = fixture.debugElement.query(
+      By.css('.cx-invoices-list-table')
+    );
+
+    const tableRows = tableElement.queryAll(By.css('tr'));
+    expect(tableRows?.length).toEqual(5);
+
+    tableRows?.forEach((row, rowNumber) => {
+      const tableCells = row.queryAll(By.css('.cx-invoices-list-value'));
+
+      expect(tableCells?.length).toEqual(5);
+
+      expect(tableCells[0].nativeElement.innerText).toEqual(
+        mockOrderInvoiceList.invoices?.[rowNumber]?.invoiceId
+      );
+
+      expect(isDate(tableCells[1].nativeElement.innerText)).toEqual(
+        !!mockOrderInvoiceList.invoices?.[rowNumber]?.createdAt
+      );
+
+      if (
+        mockOrderInvoiceList.invoices?.[rowNumber]?.netAmount?.formattedValue
+      ) {
+        expect(tableCells[2].nativeElement.innerText).toEqual(
+          mockOrderInvoiceList.invoices?.[rowNumber]?.netAmount?.formattedValue
+        );
+      } else {
+        expect(tableCells[2].nativeElement.innerHTML).toEqual(
+          ` ${mockOrderInvoiceList.invoices?.[rowNumber]?.netAmount?.currencyIso}&nbsp;${mockOrderInvoiceList.invoices?.[rowNumber]?.netAmount?.value} `
+        );
+      }
+
+      if (
+        mockOrderInvoiceList.invoices?.[rowNumber]?.totalAmount?.formattedValue
+      ) {
+        expect(tableCells[3].nativeElement.innerText).toEqual(
+          mockOrderInvoiceList.invoices?.[rowNumber]?.totalAmount
+            ?.formattedValue
+        );
+      } else {
+        expect(tableCells[3].nativeElement.innerHTML).toEqual(
+          ` ${mockOrderInvoiceList.invoices?.[rowNumber]?.totalAmount?.currencyIso}&nbsp;${mockOrderInvoiceList.invoices?.[rowNumber]?.totalAmount?.value} `
+        );
+      }
+
+      expect(!!tableCells[4].query(By.css('cx-icon'))).toEqual(
+        !!mockOrderInvoiceList.invoices?.[rowNumber]
+      );
+    });
+  });
+
+  it('should download the invoice file', async () => {
+    const invoicePDF = (mockOrderInvoiceList.invoices &&
+      mockOrderInvoiceList.invoices[0]) || {
+      invoiceId: '',
+      externalSystemId: '',
+    };
+
+    spyOn(pdfInvoicesFacade, 'getInvoicePDF').and.returnValue(of(blob));
+    const fakeUrl = 'blob:http://localhost:4321/15-09-2023-1234';
+    spyOn(URL, 'createObjectURL').and.returnValue(fakeUrl);
+
+    expect(invoicePDF).not.toBeUndefined();
+    component.downloadPDFInvoice(
+      invoicePDF.invoiceId || '',
+      invoicePDF.externalSystemId
+    );
+    fixture.detectChanges();
+
+    expect(pdfInvoicesFacade.getInvoicePDF).toHaveBeenCalledWith(
+      invoicePDF.invoiceId,
+      undefined
+    );
+
+    expect(downloadService.download).toHaveBeenCalledWith(
+      fakeUrl,
+      `${invoicePDF.invoiceId}.pdf`
+    );
+  });
+
+  it('should download the attachment file with external system id', async () => {
+    const invoicePDF = (mockOrderInvoiceList.invoices &&
+      mockOrderInvoiceList.invoices[0]) || {
+      invoiceId: '',
+      externalSystemId: '',
+    };
+
+    spyOn(pdfInvoicesFacade, 'getInvoicePDF').and.returnValue(of(blob));
+    const fakeUrl = 'blob:http://localhost:4321/15-09-2023-1234';
+    spyOn(URL, 'createObjectURL').and.returnValue(fakeUrl);
+
+    component.downloadPDFInvoice(
+      invoicePDF.invoiceId || '',
+      invoicePDF.externalSystemId
+    );
+    fixture.detectChanges();
+
+    expect(pdfInvoicesFacade.getInvoicePDF).toHaveBeenCalledWith(
+      invoicePDF.invoiceId,
+      invoicePDF.externalSystemId
+    );
+
+    expect(downloadService.download).toHaveBeenCalledWith(
+      fakeUrl,
+      `${invoicePDF.invoiceId}.pdf`
+    );
+  });
+});
diff --git a/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.ts b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.ts
new file mode 100644
index 00000000000..59df4a89e1e
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.ts
@@ -0,0 +1,195 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ErrorModel,
+  GlobalMessageService,
+  GlobalMessageType,
+  HttpErrorModel,
+  LanguageService,
+  PaginationModel,
+  SortModel,
+  TranslationService,
+} from '@spartacus/core';
+import {
+  InvoiceQueryParams,
+  InvoicesFields,
+  OrderInvoiceList,
+  PDFInvoicesFacade,
+} from '@spartacus/pdf-invoices/root';
+import { FileDownloadService, ICON_TYPE } from '@spartacus/storefront';
+import {
+  BehaviorSubject,
+  combineLatest,
+  EMPTY,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { catchError, skip, switchMap, take, tap } from 'rxjs/operators';
+
+@Component({
+  selector: 'cx-invoices-list',
+  templateUrl: './invoices-list.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class InvoicesListComponent implements OnInit, OnDestroy {
+  /* For Enum use in HTML */
+  ICON_TYPE = ICON_TYPE;
+
+  protected PAGE_SIZE = 5; //Default page size
+
+  sortOptions: SortModel[];
+  sort = 'byInvoiceIdAsc';
+
+  protected sortMapping: { [key: string]: string } = {
+    byCreatedAtAsc: 'invoiceDate:asc', //TODO: (CXINT-2438) update the sort code after the API is changed
+    byCreatedAtDesc: 'invoiceDate:desc', //TODO: (CXINT-2438) update the sort code after the API is changed
+    byInvoiceIdAsc: 'invoiceId:asc',
+    byInvoiceIdDesc: 'invoiceId:desc',
+    byNetAmountAsc: 'netAmount:asc',
+    byNetAmountDesc: 'netAmount:desc',
+    byTotalAmountAsc: 'totalAmount:asc',
+    byTotalAmountDesc: 'totalAmount:desc',
+  };
+  pagination: PaginationModel;
+
+  // Contains the initial query parameters and will be updated with current state of filters
+  _initQueryParams: InvoiceQueryParams = {
+    currentPage: 0,
+    pageSize: this.PAGE_SIZE,
+    fields: InvoicesFields.FULL,
+    sort: this.sortMapping[this.sort], //backend supports sort codes like invoiceId:asc
+  };
+
+  // Triggers events on chaning the page, sort options
+  queryParams$ = new BehaviorSubject<InvoiceQueryParams>(this._initQueryParams);
+
+  // Used by template to subscribe to data from documents api
+  invoicesList$: Observable<OrderInvoiceList> = this.queryParams$.pipe(
+    switchMap((param) => this.pdfInvoicesFacade.getInvoicesForOrder(param)),
+    tap(
+      (invoicesList) =>
+        (this.pagination = {
+          currentPage: invoicesList.pagination?.page,
+          pageSize: invoicesList.pagination?.count,
+          totalPages: invoicesList.pagination?.totalPages,
+          totalResults: invoicesList.pagination?.totalCount,
+          sort: this.sortMapping[this.sort],
+        })
+    ),
+    catchError((error) => {
+      if (error && this.getNotEnabledError(error)?.length) {
+        this.globalMessageService.add(
+          { key: 'pdfInvoices.featureNotEnabled' },
+          GlobalMessageType.MSG_TYPE_ERROR
+        );
+      }
+      return EMPTY;
+    })
+  );
+
+  protected subscription = new Subscription();
+
+  constructor(
+    protected pdfInvoicesFacade: PDFInvoicesFacade,
+    protected translationService: TranslationService,
+    protected downloadService: FileDownloadService,
+    protected languageService: LanguageService,
+    protected globalMessageService: GlobalMessageService
+  ) {}
+
+  ngOnInit() {
+    this.subscription.add(
+      this.languageService
+        .getActive()
+        .pipe(skip(1))
+        .subscribe(() =>
+          this.updateQueryParams({ fields: InvoicesFields.FULL })
+        )
+    );
+
+    this.getSortOptions();
+  }
+
+  protected updateQueryParams(partialParams: InvoiceQueryParams) {
+    // Overwrite each value present in partialParams to _queryParams
+    Object.keys(partialParams).forEach(
+      (key) =>
+        ((this._initQueryParams as any)[key] = (partialParams as any)[key])
+    );
+
+    // Every request that doesn't specify fields should be set to DEFAULT
+    if (!partialParams.fields) {
+      this._initQueryParams.fields = InvoicesFields.DEFAULT;
+    }
+
+    this.queryParams$.next(this._initQueryParams);
+  }
+
+  pageChange(currentPage: number): void {
+    this.updateQueryParams({
+      currentPage: currentPage,
+    });
+  }
+
+  sortChange(sortCode: string): void {
+    this.sort = sortCode;
+    this.updateQueryParams({
+      sort: this.sortMapping[sortCode], //backend supports sort codes like invoiceId:asc
+      currentPage: 0,
+    });
+  }
+
+  downloadPDFInvoice(invoiceId: string, externalSystemId?: string): void {
+    this.pdfInvoicesFacade
+      .getInvoicePDF(invoiceId, externalSystemId)
+      .pipe(take(1))
+      .subscribe({
+        next: (data) => {
+          const file = new Blob([data], { type: data.type });
+          const url = URL.createObjectURL(file);
+          this.downloadService.download(url, `${invoiceId}.pdf`);
+        },
+      });
+  }
+
+  getSortOptions() {
+    this.sortOptions = [];
+    Object.keys(this.sortMapping).forEach((sortKey) =>
+      this.sortOptions.push({ code: sortKey, selected: false })
+    );
+
+    const translations = this.sortOptions.map((sort) =>
+      this.translationService.translate(`pdfInvoices.sorts.${sort.code}`)
+    );
+
+    combineLatest(translations)
+      .pipe(take(1))
+      .subscribe((translated) =>
+        this.sortOptions.forEach(
+          (sort, index) => (sort.name = translated[index])
+        )
+      );
+  }
+
+  getNotEnabledError(response: HttpErrorModel): ErrorModel[] {
+    return response?.details
+      ? response.details.filter(
+          (error: any) => error?.type === 'UnknownResourceError'
+        )
+      : [];
+  }
+
+  ngOnDestroy(): void {
+    this.subscription.unsubscribe();
+  }
+}
diff --git a/feature-libs/pdf-invoices/components/ng-package.json b/feature-libs/pdf-invoices/components/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/components/pdf-invoices-components.module.ts b/feature-libs/pdf-invoices/components/pdf-invoices-components.module.ts
new file mode 100644
index 00000000000..a287b23521e
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/pdf-invoices-components.module.ts
@@ -0,0 +1,51 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import {
+  AuthGuard,
+  CmsConfig,
+  I18nModule,
+  provideDefaultConfig,
+  UrlModule,
+} from '@spartacus/core';
+import {
+  DatePickerModule,
+  IconModule,
+  ListNavigationModule,
+  MediaModule,
+  SpinnerModule,
+} from '@spartacus/storefront';
+import { InvoicesListComponent } from './invoices-list/invoices-list.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    DatePickerModule,
+    I18nModule,
+    ReactiveFormsModule,
+    ListNavigationModule,
+    UrlModule,
+    IconModule,
+    MediaModule,
+    SpinnerModule,
+  ],
+  declarations: [InvoicesListComponent],
+  exports: [InvoicesListComponent],
+  providers: [
+    provideDefaultConfig(<CmsConfig>{
+      cmsComponents: {
+        AccountOrderDetailsPDFInvoicesComponent: {
+          component: InvoicesListComponent,
+          guards: [AuthGuard],
+        },
+      },
+    }),
+  ],
+})
+export class PDFInvoicesComponentsModule {}
diff --git a/feature-libs/pdf-invoices/components/public_api.ts b/feature-libs/pdf-invoices/components/public_api.ts
new file mode 100644
index 00000000000..cf302ad77cc
--- /dev/null
+++ b/feature-libs/pdf-invoices/components/public_api.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './invoices-list/invoices-list.component';
+export * from './pdf-invoices-components.module';
diff --git a/feature-libs/pdf-invoices/core/connectors/converters.ts b/feature-libs/pdf-invoices/core/connectors/converters.ts
new file mode 100644
index 00000000000..5edf9d429d6
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/connectors/converters.ts
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { InjectionToken } from '@angular/core';
+import { Converter } from '@spartacus/core';
+import { OrderInvoiceList } from '@spartacus/pdf-invoices/root';
+
+export const PDF_INVOICES_LIST_INVOICES_NORMALIZER = new InjectionToken<
+  Converter<any, OrderInvoiceList>
+>('PDFInvoicesListInvoices');
diff --git a/feature-libs/pdf-invoices/core/connectors/index.ts b/feature-libs/pdf-invoices/core/connectors/index.ts
new file mode 100644
index 00000000000..d9d500d499a
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/connectors/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './converters';
+export * from './pdf-invoices.adapter';
+export * from './pdf-invoices.connector';
diff --git a/feature-libs/pdf-invoices/core/connectors/pdf-invoices.adapter.ts b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.adapter.ts
new file mode 100644
index 00000000000..a9659b4fda8
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.adapter.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  InvoiceQueryParams,
+  OrderInvoiceList,
+} from '@spartacus/pdf-invoices/root';
+import { Observable } from 'rxjs';
+
+export abstract class PDFInvoicesAdapter {
+  /**
+   * Abstract method used to get the PDF invoices for an order
+   * @param userId Logged in user id
+   * @param orderId If provided, it will be used, otherwise it will use orderId from router state.
+   * @param queryParams Additional query parameters used in the API request
+   */
+  abstract getInvoicesForOrder(
+    userId: string,
+    orderId: string,
+    queryParams: InvoiceQueryParams
+  ): Observable<OrderInvoiceList>;
+
+  /**
+   * Returns the document blob for given invoiceId, orderId and externalSystemId
+   * @param userId Logged in user id
+   * @param orderId If provided, it will be used, otherwise it will use orderId from router state.
+   * @param invoiceId The id of the invoice to be downloaded
+   * @param externalSystemId External system that provides the invoice PDF
+   */
+  abstract getInvoicePDF(
+    userId: string,
+    orderId: string,
+    invoiceId: string,
+    externalSystemId?: string
+  ): Observable<Blob>;
+}
diff --git a/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.spec.ts b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.spec.ts
new file mode 100644
index 00000000000..33dca995e83
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.spec.ts
@@ -0,0 +1,121 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  InvoiceQueryParams,
+  InvoicesFields,
+} from '@spartacus/pdf-invoices/root';
+import { of } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { PDFInvoicesAdapter } from './pdf-invoices.adapter';
+import { PDFInvoicesConnector } from './pdf-invoices.connector';
+
+import createSpy = jasmine.createSpy;
+
+const mockUserId = 'userId1';
+const mockOrderId = '15092023';
+const mockExternalSystemId = 'IMPERIAL';
+const mockInvoiceId = 'Invoice-15-09-2023';
+const mockInvoiceQueryParams: InvoiceQueryParams = {
+  currentPage: 0,
+  pageSize: 10,
+  sort: 'invoiceID:asc',
+  fields: InvoicesFields.FULL,
+};
+
+class MockPDFInvoicesAdapter implements Partial<PDFInvoicesAdapter> {
+  getInvoicesForOrder = createSpy(
+    'PDFInvoicesAdapter.getInvoicesForOrder'
+  ).and.callFake(
+    (_userId: string, _orderId: string, _queryParams: InvoiceQueryParams) =>
+      of({})
+  );
+  getInvoicePDF = createSpy('PDFInvoicesAdapter.getInvoicePDF').and.callFake(
+    (
+      _userId: string,
+      _orderId: string,
+      _invoiceId: string,
+      _externalSystemId?: string
+    ) => of({})
+  );
+}
+
+describe('PDFInvoicesConnector', () => {
+  let pdfInvoicesConnector: PDFInvoicesConnector;
+  let adapter: PDFInvoicesAdapter;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      providers: [
+        PDFInvoicesConnector,
+        {
+          provide: PDFInvoicesAdapter,
+          useClass: MockPDFInvoicesAdapter,
+        },
+      ],
+    });
+
+    pdfInvoicesConnector = TestBed.inject(PDFInvoicesConnector);
+    adapter = TestBed.inject(PDFInvoicesAdapter);
+  });
+
+  it('should be created', () => {
+    expect(pdfInvoicesConnector).toBeTruthy();
+  });
+
+  it('should call adapter when getInvoicesForOrder is invoked', (done) => {
+    let result;
+    pdfInvoicesConnector
+      .getInvoicesForOrder(mockUserId, mockOrderId, mockInvoiceQueryParams)
+      .pipe(take(1))
+      .subscribe((res: any) => {
+        result = res;
+        expect(result).toEqual({});
+        done();
+      });
+    expect(adapter.getInvoicesForOrder).toHaveBeenCalledWith(
+      mockUserId,
+      mockOrderId,
+      mockInvoiceQueryParams
+    );
+  });
+
+  it('should call adapter when getInvoicePDF is invoked', (done) => {
+    let result;
+    pdfInvoicesConnector
+      .getInvoicePDF(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceId,
+        mockExternalSystemId
+      )
+      .pipe(take(1))
+      .subscribe((res: any) => {
+        result = res;
+        expect(result).toEqual({});
+        done();
+      });
+    expect(adapter.getInvoicePDF).toHaveBeenCalledWith(
+      mockUserId,
+      mockOrderId,
+      mockInvoiceId,
+      mockExternalSystemId
+    );
+  });
+
+  it('should call adapter when getInvoicePDF is invoked without externalSystemId', (done) => {
+    let result;
+    pdfInvoicesConnector
+      .getInvoicePDF(mockUserId, mockOrderId, mockInvoiceId)
+      .pipe(take(1))
+      .subscribe((res: any) => {
+        result = res;
+        expect(result).toEqual({});
+        done();
+      });
+    expect(adapter.getInvoicePDF).toHaveBeenCalledWith(
+      mockUserId,
+      mockOrderId,
+      mockInvoiceId,
+      undefined
+    );
+  });
+});
diff --git a/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.ts b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.ts
new file mode 100644
index 00000000000..f9493eacc6b
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/connectors/pdf-invoices.connector.ts
@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import {
+  InvoiceQueryParams,
+  OrderInvoiceList,
+} from '@spartacus/pdf-invoices/root';
+import { Observable } from 'rxjs';
+import { PDFInvoicesAdapter } from './pdf-invoices.adapter';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PDFInvoicesConnector {
+  constructor(protected adapter: PDFInvoicesAdapter) {}
+
+  public getInvoicesForOrder(
+    userId: string,
+    orderId: string,
+    queryParams: InvoiceQueryParams
+  ): Observable<OrderInvoiceList> {
+    return this.adapter.getInvoicesForOrder(userId, orderId, queryParams);
+  }
+
+  public getInvoicePDF(
+    userId: string,
+    orderId: string,
+    invoiceId: string,
+    externalSystemId?: string
+  ): Observable<Blob> {
+    return this.adapter.getInvoicePDF(
+      userId,
+      orderId,
+      invoiceId,
+      externalSystemId
+    );
+  }
+}
diff --git a/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.spec.ts b/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.spec.ts
new file mode 100644
index 00000000000..dcb34f903fa
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.spec.ts
@@ -0,0 +1,96 @@
+import { HttpErrorResponse, HttpRequest } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import {
+  GlobalMessageService,
+  GlobalMessageType,
+  HttpResponseStatus,
+} from '@spartacus/core';
+import { PDFInvoicesBadRequestHandler } from './pdf-invoices-badrequest.handler';
+
+class MockGlobalMessageService {
+  add() {}
+}
+
+const MockRequest = {} as HttpRequest<any>;
+
+const MockNoOrderIdBadRequestResponse = {
+  error: {
+    errors: [
+      {
+        message:
+          'Order with guid [15092023] not found for current user in current BaseStore',
+        type: 'UnknownIdentifierError',
+      },
+    ],
+  },
+} as HttpErrorResponse;
+
+const MockDownloadPDFBadRequestResponse = {
+  error: {
+    errors: [
+      {
+        message: 'Invoice with id [Imperial] not found for order [15092023]',
+        type: 'UnknownIdentifierError',
+      },
+    ],
+  },
+} as HttpErrorResponse;
+
+describe('PDFInvoicesDateBadRequestHandler', () => {
+  let pdfInvoicesBRHandler: PDFInvoicesBadRequestHandler;
+  let globalMessageService: GlobalMessageService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        PDFInvoicesBadRequestHandler,
+        {
+          provide: GlobalMessageService,
+          useClass: MockGlobalMessageService,
+        },
+      ],
+    });
+    pdfInvoicesBRHandler = TestBed.inject(PDFInvoicesBadRequestHandler);
+    globalMessageService = TestBed.inject(GlobalMessageService);
+  });
+
+  it('should be created', () => {
+    expect(pdfInvoicesBRHandler).toBeTruthy();
+  });
+
+  it('should register 400 responseStatus ', () => {
+    expect(pdfInvoicesBRHandler.responseStatus).toEqual(
+      HttpResponseStatus.BAD_REQUEST
+    );
+  });
+
+  it('should handle invalid order id bad request', () => {
+    spyOn(globalMessageService, 'add');
+    pdfInvoicesBRHandler.handleError(
+      MockRequest,
+      MockNoOrderIdBadRequestResponse
+    );
+
+    expect(globalMessageService.add).toHaveBeenCalledWith(
+      {
+        key: 'pdfInvoices.invoicesLoadingError',
+      },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+  });
+
+  it('should handle invoice download bad request', () => {
+    spyOn(globalMessageService, 'add');
+    pdfInvoicesBRHandler.handleError(
+      MockRequest,
+      MockDownloadPDFBadRequestResponse
+    );
+
+    expect(globalMessageService.add).toHaveBeenCalledWith(
+      {
+        key: 'pdfInvoices.downloadPDFError',
+      },
+      GlobalMessageType.MSG_TYPE_ERROR
+    );
+  });
+});
diff --git a/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.ts b/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.ts
new file mode 100644
index 00000000000..7451ae27146
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/http-interceptors/bad-request/pdf-invoices-badrequest.handler.ts
@@ -0,0 +1,91 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpErrorResponse, HttpRequest } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  ErrorModel,
+  GlobalMessageType,
+  HttpErrorHandler,
+  HttpResponseStatus,
+  Priority,
+} from '@spartacus/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PDFInvoicesBadRequestHandler extends HttpErrorHandler {
+  responseStatus = HttpResponseStatus.BAD_REQUEST;
+
+  hasMatch(errorResponse: HttpErrorResponse): boolean {
+    return (
+      super.hasMatch(errorResponse) && this.getErrors(errorResponse)?.length > 0
+    );
+  }
+
+  handleError(request: HttpRequest<any>, response: HttpErrorResponse): void {
+    this.handleInvoicesListError(request, response);
+    this.handlePDFDownloadError(request, response);
+  }
+
+  protected handleInvoicesListError(
+    _request: HttpRequest<any>,
+    response: HttpErrorResponse
+  ) {
+    this.getErrors(response)
+      .filter((e) => this.isInvoicesListNotFoundError(e))
+      .forEach(() => {
+        this.globalMessageService.add(
+          { key: 'pdfInvoices.invoicesLoadingError' },
+          GlobalMessageType.MSG_TYPE_ERROR
+        );
+      });
+  }
+
+  protected handlePDFDownloadError(
+    _request: HttpRequest<any>,
+    response: HttpErrorResponse
+  ) {
+    this.getErrors(response)
+      .filter((e) => this.isDownloadInvoiceError(e))
+      .forEach(() => {
+        this.globalMessageService.add(
+          {
+            key: 'pdfInvoices.downloadPDFError',
+          },
+          GlobalMessageType.MSG_TYPE_ERROR
+        );
+      });
+  }
+
+  protected isInvoicesListNotFoundError(error: ErrorModel): boolean {
+    return (
+      error?.type === 'UnknownIdentifierError' &&
+      error?.message != null &&
+      error?.message.includes('Order')
+    );
+  }
+
+  protected isDownloadInvoiceError(error: ErrorModel): boolean {
+    return (
+      error?.type === 'UnknownIdentifierError' &&
+      error?.message != null &&
+      error?.message.includes('Invoice')
+    );
+  }
+
+  protected getErrors(response: HttpErrorResponse): ErrorModel[] {
+    return (response.error?.errors).filter(
+      (error: any) =>
+        this.isInvoicesListNotFoundError(error) ||
+        this.isDownloadInvoiceError(error)
+    );
+  }
+
+  getPriority(): Priority {
+    return Priority.NORMAL;
+  }
+}
diff --git a/feature-libs/pdf-invoices/core/http-interceptors/index.ts b/feature-libs/pdf-invoices/core/http-interceptors/index.ts
new file mode 100644
index 00000000000..90d44b0abd5
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/http-interceptors/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './bad-request/pdf-invoices-badrequest.handler';
diff --git a/feature-libs/pdf-invoices/core/ng-package.json b/feature-libs/pdf-invoices/core/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/core/pdf-invoices-core.module.ts b/feature-libs/pdf-invoices/core/pdf-invoices-core.module.ts
new file mode 100644
index 00000000000..ba1d175d054
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/pdf-invoices-core.module.ts
@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { HttpErrorHandler } from '@spartacus/core';
+import { PDFInvoicesFacade } from '@spartacus/pdf-invoices/root';
+import { PDFInvoicesConnector } from './connectors/pdf-invoices.connector';
+import { PDFInvoicesBadRequestHandler } from './http-interceptors/bad-request/pdf-invoices-badrequest.handler';
+import { PDFInvoicesService } from './services';
+
+@NgModule({
+  imports: [],
+  providers: [
+    PDFInvoicesService,
+    {
+      provide: PDFInvoicesFacade,
+      useExisting: PDFInvoicesService,
+    },
+    {
+      provide: HttpErrorHandler,
+      useExisting: PDFInvoicesBadRequestHandler,
+      multi: true,
+    },
+    PDFInvoicesConnector,
+  ],
+})
+export class PDFInvoicesCoreModule {}
diff --git a/feature-libs/pdf-invoices/core/public_api.ts b/feature-libs/pdf-invoices/core/public_api.ts
new file mode 100644
index 00000000000..210f757f8dd
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './connectors/index';
+export * from './http-interceptors/index';
+export * from './pdf-invoices-core.module';
+export * from './services/index';
diff --git a/feature-libs/pdf-invoices/core/services/index.ts b/feature-libs/pdf-invoices/core/services/index.ts
new file mode 100644
index 00000000000..7eb1d8cce75
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './pdf-invoices.service';
diff --git a/feature-libs/pdf-invoices/core/services/pdf-invoices.service.spec.ts b/feature-libs/pdf-invoices/core/services/pdf-invoices.service.spec.ts
new file mode 100644
index 00000000000..4901d71386a
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/services/pdf-invoices.service.spec.ts
@@ -0,0 +1,186 @@
+import { TestBed } from '@angular/core/testing';
+import { RoutingService, UserIdService } from '@spartacus/core';
+import {
+  InvoiceQueryParams,
+  InvoicesFields,
+} from '@spartacus/pdf-invoices/root';
+import { of } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { PDFInvoicesConnector } from '../connectors/pdf-invoices.connector';
+import { PDFInvoicesService } from './pdf-invoices.service';
+
+import createSpy = jasmine.createSpy;
+
+const mockUserId = 'userId1';
+const mockOrderId = '15092023';
+const mockExternalSystemId = 'IMPERIAL';
+const mockInvoiceId = 'Invoice-15-09-2023';
+const mockInvoiceQueryParams: InvoiceQueryParams = {
+  currentPage: 0,
+  pageSize: 10,
+  sort: 'invoiceID:asc',
+  fields: InvoicesFields.FULL,
+};
+
+const blob = new Blob();
+
+class MockPDFInvoicesConnector implements Partial<PDFInvoicesConnector> {
+  getInvoicesForOrder = createSpy(
+    'PDFInvoicesConnector.getInvoicesForOrder'
+  ).and.callFake(
+    (_userId: string, _orderId: string, _queryParams: InvoiceQueryParams) =>
+      of({})
+  );
+  getInvoicePDF = createSpy('PDFInvoicesConnector.getInvoicePDF').and.callFake(
+    (
+      _userId: string,
+      _orderId: string,
+      _invoiceId: string,
+      _externalSystemId?: string
+    ) => of(blob)
+  );
+}
+
+class MockUserIdService implements Partial<UserIdService> {
+  takeUserId = createSpy('UserIdService.takeUserId').and.returnValue(
+    of(mockUserId)
+  );
+}
+
+class MockRoutingService implements Partial<RoutingService> {
+  getRouterState = createSpy('RoutingService.getRouterState').and.returnValue(
+    of({
+      state: {
+        semanticRoute: 'orders',
+        params: { orderCode: mockOrderId },
+      },
+    })
+  );
+}
+
+describe('PDFInvoicesService', () => {
+  let pdfInvoicesService: PDFInvoicesService;
+  let connector: PDFInvoicesConnector;
+
+  describe('Current user', () => {
+    beforeEach(() => {
+      TestBed.configureTestingModule({
+        providers: [
+          PDFInvoicesService,
+          {
+            provide: PDFInvoicesConnector,
+            useClass: MockPDFInvoicesConnector,
+          },
+          {
+            provide: UserIdService,
+            useClass: MockUserIdService,
+          },
+          {
+            provide: RoutingService,
+            useClass: MockRoutingService,
+          },
+        ],
+      });
+
+      pdfInvoicesService = TestBed.inject(PDFInvoicesService);
+      connector = TestBed.inject(PDFInvoicesConnector);
+    });
+
+    it('should be created', () => {
+      expect(pdfInvoicesService).toBeTruthy();
+    });
+
+    it('should call connector when getInvoicesForOrder is invoked', (done) => {
+      let result;
+      pdfInvoicesService
+        .getInvoicesForOrder(mockInvoiceQueryParams, mockUserId, mockOrderId)
+        .pipe(take(1))
+        .subscribe((res: any) => {
+          result = res;
+          expect(result).toEqual({});
+          done();
+        });
+      expect(connector.getInvoicesForOrder).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceQueryParams
+      );
+    });
+
+    it('should set userId, orderId and call connector when getInvoicesForOrder is invoked without userId and orderId', (done) => {
+      let result;
+      pdfInvoicesService
+        .getInvoicesForOrder(mockInvoiceQueryParams)
+        .pipe(take(1))
+        .subscribe((res: any) => {
+          result = res;
+          expect(result).toEqual({});
+          done();
+        });
+      expect(connector.getInvoicesForOrder).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceQueryParams
+      );
+    });
+
+    it('should call connector when getInvoicePDF is invoked', (done) => {
+      let result;
+      pdfInvoicesService
+        .getInvoicePDF(
+          mockInvoiceId,
+          mockExternalSystemId,
+          mockUserId,
+          mockOrderId
+        )
+        .pipe(take(1))
+        .subscribe((res: any) => {
+          result = res;
+          expect(result).toEqual(blob);
+          done();
+        });
+      expect(connector.getInvoicePDF).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceId,
+        mockExternalSystemId
+      );
+    });
+
+    it('should call connector when getInvoicePDF is invoked without externalSystemId', (done) => {
+      let result;
+      pdfInvoicesService
+        .getInvoicePDF(mockInvoiceId, undefined, mockUserId, mockOrderId)
+        .pipe(take(1))
+        .subscribe((res: any) => {
+          result = res;
+          expect(result).toEqual(blob);
+          done();
+        });
+      expect(connector.getInvoicePDF).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceId,
+        undefined
+      );
+    });
+
+    it('should set userId, orderId and call connector when getInvoicePDF is invoked without userId, orderId, externalSystemId', (done) => {
+      let result;
+      pdfInvoicesService
+        .getInvoicePDF(mockInvoiceId)
+        .pipe(take(1))
+        .subscribe((res: any) => {
+          result = res;
+          expect(result).toEqual(blob);
+          done();
+        });
+      expect(connector.getInvoicePDF).toHaveBeenCalledWith(
+        mockUserId,
+        mockOrderId,
+        mockInvoiceId,
+        undefined
+      );
+    });
+  });
+});
diff --git a/feature-libs/pdf-invoices/core/services/pdf-invoices.service.ts b/feature-libs/pdf-invoices/core/services/pdf-invoices.service.ts
new file mode 100644
index 00000000000..d643db7d05a
--- /dev/null
+++ b/feature-libs/pdf-invoices/core/services/pdf-invoices.service.ts
@@ -0,0 +1,81 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable, OnDestroy } from '@angular/core';
+import { RoutingService, UserIdService } from '@spartacus/core';
+import {
+  InvoiceQueryParams,
+  OrderInvoiceList,
+  PDFInvoicesFacade,
+} from '@spartacus/pdf-invoices/root';
+import { Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
+import { PDFInvoicesConnector } from '../connectors/pdf-invoices.connector';
+
+@Injectable()
+export class PDFInvoicesService implements PDFInvoicesFacade, OnDestroy {
+  protected subscriptions = new Subscription();
+
+  userId: string;
+  orderId: string;
+
+  constructor(
+    private routingService: RoutingService,
+    private userIdService: UserIdService,
+    protected pdfInvoicesConnector: PDFInvoicesConnector
+  ) {
+    this.subscriptions.add(
+      this.userIdService
+        .takeUserId()
+        .subscribe((userId) => (this.userId = userId))
+    );
+    this.subscriptions.add(
+      this.getOrderId().subscribe((orderId) => (this.orderId = orderId))
+    );
+  }
+
+  getInvoicesForOrder(
+    queryParams: InvoiceQueryParams,
+    userId?: string,
+    orderId?: string
+  ): Observable<OrderInvoiceList> {
+    return this.pdfInvoicesConnector
+      .getInvoicesForOrder(
+        userId || this.userId,
+        orderId || this.orderId,
+        queryParams
+      )
+      .pipe(shareReplay(1));
+  }
+
+  getInvoicePDF(
+    invoiceId: string,
+    externalSystemId?: string,
+    userId?: string,
+    orderId?: string
+  ): Observable<Blob> {
+    return this.pdfInvoicesConnector
+      .getInvoicePDF(
+        userId || this.userId,
+        orderId || this.orderId,
+        invoiceId,
+        externalSystemId
+      )
+      .pipe(shareReplay(1));
+  }
+
+  protected getOrderId(): Observable<string> {
+    return this.routingService.getRouterState().pipe(
+      map((routingData) => routingData.state.params),
+      distinctUntilChanged(),
+      map((params) => params.orderCode)
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.unsubscribe();
+  }
+}
diff --git a/feature-libs/pdf-invoices/jest.schematics.config.js b/feature-libs/pdf-invoices/jest.schematics.config.js
new file mode 100644
index 00000000000..85a061c3966
--- /dev/null
+++ b/feature-libs/pdf-invoices/jest.schematics.config.js
@@ -0,0 +1,35 @@
+const { pathsToModuleNameMapper } = require('ts-jest');
+const { compilerOptions } = require('./tsconfig.schematics.json');
+const { defaultTransformerOptions } = require('jest-preset-angular/presets');
+
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
+module.exports = {
+  preset: 'jest-preset-angular',
+  globalSetup: 'jest-preset-angular/global-setup',
+  moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths || {}, {
+    prefix: '<rootDir>/',
+  }),
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
+  testMatch: ['**/+(*_)+(spec).+(ts)'],
+  transform: {
+    '^.+\\.(ts|js|mjs|html|svg)$': [
+      'jest-preset-angular',
+      {
+        ...defaultTransformerOptions,
+        tsconfig: '<rootDir>/tsconfig.schematics.json',
+      },
+    ],
+  },
+
+  collectCoverage: false,
+  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  coverageDirectory: '<rootDir>/../../coverage/pdf-invoices/schematics',
+  coverageThreshold: {
+    global: {
+      statements: 90,
+      branches: 90,
+      functions: 90,
+      lines: 90,
+    },
+  },
+};
diff --git a/feature-libs/pdf-invoices/karma.conf.js b/feature-libs/pdf-invoices/karma.conf.js
new file mode 100644
index 00000000000..aed99ee7cec
--- /dev/null
+++ b/feature-libs/pdf-invoices/karma.conf.js
@@ -0,0 +1,47 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['parallel', 'jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-parallel'),
+      require('karma-jasmine'),
+      require('karma-coverage'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    parallelOptions: {
+      executors: 2,
+      shardStrategy: 'round-robin',
+    },
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+      jasmine: {
+        random: false,
+      },
+    },
+    reporters: ['progress', 'kjhtml', 'dots'],
+    coverageReporter: {
+      dir: require('path').join(__dirname, '../../coverage/pdf-invoices'),
+      reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }],
+      check: {
+        global: {
+          statements: 90,
+          lines: 90,
+          branches: 75,
+          functions: 85,
+        },
+      },
+    },
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true,
+  });
+};
diff --git a/feature-libs/pdf-invoices/ng-package.json b/feature-libs/pdf-invoices/ng-package.json
new file mode 100644
index 00000000000..7ba32570a26
--- /dev/null
+++ b/feature-libs/pdf-invoices/ng-package.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/pdf-invoices",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  },
+  "assets": ["**/*.scss", "schematics/**/*.json", "schematics/**/*.js"]
+}
diff --git a/feature-libs/pdf-invoices/occ/adapters/index.ts b/feature-libs/pdf-invoices/occ/adapters/index.ts
new file mode 100644
index 00000000000..1b932c5c19b
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/adapters/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './occ-pdf-invoices.adapter';
diff --git a/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.spec.ts b/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.spec.ts
new file mode 100644
index 00000000000..440d11c68a4
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.spec.ts
@@ -0,0 +1,251 @@
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
+import {
+  HttpErrorModel,
+  normalizeHttpError,
+  OccConfig,
+  OccEndpoints,
+} from '@spartacus/core';
+import {
+  InvoiceQueryParams,
+  InvoicesFields,
+  OrderInvoiceList,
+} from '@spartacus/pdf-invoices/root';
+import { throwError } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { OccPDFInvoicesAdapter } from './occ-pdf-invoices.adapter';
+
+const mockUserId = 'userId1';
+const mockOrderId = '15092023';
+const mockExternalSystemId = 'IMPERIAL';
+const mockInvoiceId = 'Invoice-15-09-2023';
+const mockInvoiceQueryParams: InvoiceQueryParams = {
+  currentPage: 0,
+  pageSize: 10,
+  sort: 'invoiceID:asc',
+  fields: InvoicesFields.FULL,
+};
+
+const mockInvoicesList: OrderInvoiceList = {
+  invoices: [
+    {
+      invoiceId: '123',
+      externalSystemId: mockExternalSystemId,
+      createdAt: new Date(),
+      netAmount: {
+        currencyIso: 'USD',
+        value: 123,
+      },
+      totalAmount: {
+        currencyIso: 'USD',
+        value: 123,
+      },
+    },
+  ],
+};
+
+const MockOccModuleConfig: OccConfig = {
+  backend: {
+    occ: {
+      baseUrl: '',
+      prefix: '',
+      endpoints: {
+        pdfInvoicesListInvoices: 'users/${userId}/orders/${orderId}/invoices',
+        pdfInvoicesDownloadInvoicePDF:
+          'users/${userId}/orders/${orderId}/invoices/${invoiceId}/download',
+      } as OccEndpoints,
+    },
+  },
+  context: {
+    baseSite: [''],
+  },
+};
+
+const mockNoOrderIdBadRequestResponse = new HttpErrorResponse({
+  error: {
+    errors: [
+      {
+        message:
+          'Order with guid [15092023] not found for current user in current BaseStore',
+        type: 'UnknownIdentifierError',
+      },
+    ],
+  },
+});
+
+const mockDownloadPDFBadRequestResponse = new HttpErrorResponse({
+  error: {
+    errors: [
+      {
+        message: 'Invoice with id [Imperial] not found for order [15092023]',
+        type: 'UnknownIdentifierError',
+      },
+    ],
+  },
+});
+
+describe('OccPDFInvoicesAdapter', () => {
+  let occPDFInvoicesAdapter: OccPDFInvoicesAdapter;
+  let httpClient: HttpClient;
+  let httpMock: HttpTestingController;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+      providers: [
+        OccPDFInvoicesAdapter,
+        { provide: OccConfig, useValue: MockOccModuleConfig },
+      ],
+    });
+    occPDFInvoicesAdapter = TestBed.inject(OccPDFInvoicesAdapter);
+    httpClient = TestBed.inject(HttpClient);
+    httpMock = TestBed.inject(HttpTestingController);
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  it('should be created', () => {
+    expect(occPDFInvoicesAdapter).toBeTruthy();
+  });
+
+  describe(`get invoices for an order`, () => {
+    it(`should show PDF Invoices for given user id, order id`, (done) => {
+      occPDFInvoicesAdapter
+        .getInvoicesForOrder(mockUserId, mockOrderId, mockInvoiceQueryParams)
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toEqual(mockInvoicesList);
+          done();
+        });
+
+      const mockReq = httpMock.expectOne((req) => {
+        return (
+          req.method === 'GET' &&
+          req.url ===
+            `users/${mockUserId}/orders/${mockOrderId}/invoices?currentPage=${
+              mockInvoiceQueryParams.currentPage
+            }&pageSize=${
+              mockInvoiceQueryParams.pageSize
+            }&sort=${encodeURIComponent(mockInvoiceQueryParams.sort)}&fields=${
+              mockInvoiceQueryParams.fields
+            }`
+        );
+      });
+
+      expect(mockReq.cancelled).toBeFalsy();
+      mockReq.flush(mockInvoicesList);
+      expect(mockReq.request.responseType).toEqual('json');
+    });
+
+    it(`should result in error when Error is thrown`, (done) => {
+      spyOn(httpClient, 'get').and.returnValue(
+        throwError(mockNoOrderIdBadRequestResponse)
+      );
+
+      let result: HttpErrorModel | undefined;
+      const subscription = occPDFInvoicesAdapter
+        .getInvoicesForOrder(mockUserId, mockOrderId, mockInvoiceQueryParams)
+        .pipe(take(1))
+        .subscribe({
+          error: (err: any) => {
+            result = err;
+            done();
+          },
+        });
+
+      expect(result).toEqual(
+        normalizeHttpError(mockNoOrderIdBadRequestResponse)
+      );
+
+      subscription.unsubscribe();
+    });
+  });
+
+  describe(`get invoice PDF for an invoice id`, () => {
+    const mockFile: File = new File([], 'MockOrderInvoice', {
+      type: 'application/pdf',
+    });
+    it(`should download PDF Invoices for given user id, order id`, (done) => {
+      occPDFInvoicesAdapter
+        .getInvoicePDF(mockUserId, mockOrderId, mockInvoiceId)
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toEqual(mockFile);
+          done();
+        });
+
+      const mockReq = httpMock.expectOne((req) => {
+        return (
+          req.method === 'GET' &&
+          req.url ===
+            `users/${mockUserId}/orders/${mockOrderId}/invoices/${mockInvoiceId}/download`
+        );
+      });
+
+      expect(mockReq.cancelled).toBeFalsy();
+      expect(mockReq.request.responseType).toEqual('blob');
+      mockReq.flush(mockFile);
+    });
+
+    it(`should download PDF Invoices for given user id, order id and external system id`, (done) => {
+      occPDFInvoicesAdapter
+        .getInvoicePDF(
+          mockUserId,
+          mockOrderId,
+          mockInvoiceId,
+          mockExternalSystemId
+        )
+        .pipe(take(1))
+        .subscribe((result) => {
+          expect(result).toEqual(mockFile);
+          done();
+        });
+
+      const mockReq = httpMock.expectOne((req) => {
+        return (
+          req.method === 'GET' &&
+          req.url ===
+            `users/${mockUserId}/orders/${mockOrderId}/invoices/${mockInvoiceId}/download?externalSystemId=${mockExternalSystemId}`
+        );
+      });
+
+      expect(mockReq.cancelled).toBeFalsy();
+      mockReq.flush(mockFile);
+      expect(mockReq.request.responseType).toEqual('blob');
+    });
+
+    it(`should result in error when Invoice download Error is thrown`, (done) => {
+      spyOn(httpClient, 'get').and.returnValue(
+        throwError(mockDownloadPDFBadRequestResponse)
+      );
+
+      let result: HttpErrorModel | undefined;
+      const subscription = occPDFInvoicesAdapter
+        .getInvoicePDF(
+          mockUserId,
+          mockOrderId,
+          mockInvoiceId,
+          mockExternalSystemId
+        )
+        .pipe(take(1))
+        .subscribe({
+          error: (err: any) => {
+            result = err;
+            done();
+          },
+        });
+
+      expect(result).toEqual(
+        normalizeHttpError(mockDownloadPDFBadRequestResponse)
+      );
+
+      subscription.unsubscribe();
+    });
+  });
+});
diff --git a/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.ts b/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.ts
new file mode 100644
index 00000000000..6655d21bd5a
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/adapters/occ-pdf-invoices.adapter.ts
@@ -0,0 +1,97 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { inject, Injectable } from '@angular/core';
+import {
+  ConverterService,
+  LoggerService,
+  normalizeHttpError,
+  OccEndpointsService,
+} from '@spartacus/core';
+import {
+  PDFInvoicesAdapter,
+  PDF_INVOICES_LIST_INVOICES_NORMALIZER,
+} from '@spartacus/pdf-invoices/core';
+import {
+  InvoiceQueryParams,
+  OrderInvoiceList,
+} from '@spartacus/pdf-invoices/root';
+import { Observable, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+
+@Injectable()
+export class OccPDFInvoicesAdapter implements PDFInvoicesAdapter {
+  protected logger = inject(LoggerService);
+
+  constructor(
+    protected http: HttpClient,
+    protected occEndpoints: OccEndpointsService,
+    protected converter: ConverterService
+  ) {}
+
+  getInvoicesForOrder(
+    userId: string,
+    orderId: string,
+    queryParams: InvoiceQueryParams
+  ): Observable<OrderInvoiceList> {
+    return this.http
+      .get<OrderInvoiceList>(
+        this.buildInvoiceListUrl(userId, orderId, queryParams)
+      )
+      .pipe(
+        catchError((error: HttpErrorResponse) =>
+          throwError(normalizeHttpError(error, this.logger))
+        ),
+        this.converter.pipeable(PDF_INVOICES_LIST_INVOICES_NORMALIZER)
+      );
+  }
+
+  getInvoicePDF(
+    userId: string,
+    orderId: string,
+    invoiceId: string,
+    externalSystemId?: string
+  ): Observable<Blob> {
+    const options = {
+      responseType: 'blob' as 'json',
+    };
+
+    return this.http
+      .get<Blob>(
+        this.buildInvoicePDFUrl(userId, orderId, invoiceId, externalSystemId),
+        options
+      )
+      .pipe(
+        catchError((error: HttpErrorResponse) =>
+          throwError(normalizeHttpError(error, this.logger))
+        )
+      );
+  }
+
+  private buildInvoiceListUrl(
+    userId: string,
+    orderId: string,
+    queryParams: InvoiceQueryParams
+  ): string {
+    return this.occEndpoints.buildUrl('pdfInvoicesListInvoices', {
+      urlParams: { userId, orderId },
+      queryParams,
+    });
+  }
+
+  private buildInvoicePDFUrl(
+    userId: string,
+    orderId: string,
+    invoiceId: string,
+    externalSystemId?: string
+  ): string {
+    return this.occEndpoints.buildUrl('pdfInvoicesDownloadInvoicePDF', {
+      urlParams: { userId, orderId, invoiceId },
+      queryParams: externalSystemId ? { externalSystemId } : undefined,
+    });
+  }
+}
diff --git a/feature-libs/pdf-invoices/occ/config/default-occ-pdf-invoices-config.ts b/feature-libs/pdf-invoices/occ/config/default-occ-pdf-invoices-config.ts
new file mode 100644
index 00000000000..8bd3af1fd8d
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/config/default-occ-pdf-invoices-config.ts
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccConfig } from '@spartacus/core';
+
+export const defaultOccPDFInvoicesConfig: OccConfig = {
+  backend: {
+    occ: {
+      endpoints: {
+        pdfInvoicesListInvoices: 'users/${userId}/orders/${orderId}/invoices',
+        pdfInvoicesDownloadInvoicePDF:
+          'users/${userId}/orders/${orderId}/invoices/${invoiceId}/download',
+      },
+    },
+  },
+};
diff --git a/feature-libs/pdf-invoices/occ/model/index.ts b/feature-libs/pdf-invoices/occ/model/index.ts
new file mode 100644
index 00000000000..7627afce6a4
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/model/index.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Imported for side effects (module augmentation)
+import './occ-pdf-invoices.model';
diff --git a/feature-libs/pdf-invoices/occ/model/occ-pdf-invoices.model.ts b/feature-libs/pdf-invoices/occ/model/occ-pdf-invoices.model.ts
new file mode 100644
index 00000000000..c7665f3fdaa
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/model/occ-pdf-invoices.model.ts
@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccEndpoint } from '@spartacus/core';
+
+declare module '@spartacus/core' {
+  interface OccEndpoints {
+    /**
+     * Get the list of invoices for an order
+     *
+     * @member {string} [pdfInvoicesListInvoices]
+     */
+
+    pdfInvoicesListInvoices?: string | OccEndpoint;
+
+    /**
+     * Get the invoice document as a PDF file
+     *
+     * @member {string} [pdfInvoicesDownloadInvoicePDF]
+     */
+
+    pdfInvoicesDownloadInvoicePDF?: string | OccEndpoint;
+  }
+}
diff --git a/feature-libs/pdf-invoices/occ/ng-package.json b/feature-libs/pdf-invoices/occ/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/occ/pdf-invoices-occ.module.ts b/feature-libs/pdf-invoices/occ/pdf-invoices-occ.module.ts
new file mode 100644
index 00000000000..11568e8402e
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/pdf-invoices-occ.module.ts
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
+import { PDFInvoicesAdapter } from '@spartacus/pdf-invoices/core';
+import { OccPDFInvoicesAdapter } from './adapters/occ-pdf-invoices.adapter';
+import { defaultOccPDFInvoicesConfig } from './config/default-occ-pdf-invoices-config';
+
+@NgModule({
+  imports: [CommonModule],
+  providers: [
+    provideDefaultConfig(defaultOccPDFInvoicesConfig),
+    {
+      provide: PDFInvoicesAdapter,
+      useClass: OccPDFInvoicesAdapter,
+    },
+  ],
+})
+export class PDFInvoicesOccModule {}
diff --git a/feature-libs/pdf-invoices/occ/public_api.ts b/feature-libs/pdf-invoices/occ/public_api.ts
new file mode 100644
index 00000000000..a2e4710de7a
--- /dev/null
+++ b/feature-libs/pdf-invoices/occ/public_api.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './adapters/index';
+export * from './model/index';
+export * from './pdf-invoices-occ.module';
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
new file mode 100644
index 00000000000..18aa684ce24
--- /dev/null
+++ b/feature-libs/pdf-invoices/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@spartacus/pdf-invoices",
+  "version": "6.3.0-1",
+  "description": "Invoices library for Spartacus",
+  "keywords": [
+    "spartacus",
+    "framework",
+    "storefront",
+    "pdf-invoices"
+  ],
+  "homepage": "https://github.com/SAP/spartacus",
+  "repository": "https://github.com/SAP/spartacus/tree/develop/feature-libs/pdf-invoices",
+  "license": "Apache-2.0",
+  "exports": {
+    ".": {
+      "sass": "./_index.scss"
+    }
+  },
+  "scripts": {
+    "build:schematics": "npm run clean:schematics && ../../node_modules/.bin/tsc -p ./tsconfig.schematics.json",
+    "clean:schematics": "../../node_modules/.bin/rimraf --glob \"schematics/**/*.js\" \"schematics/**/*.js.map\" \"schematics/**/*.d.ts\"",
+    "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
+  },
+  "dependencies": {
+    "tslib": "^2.4.0"
+  },
+  "peerDependencies": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@angular/forms": "^15.2.4",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "rxjs": "^6.6.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "schematics": "./schematics/collection.json"
+}
diff --git a/feature-libs/pdf-invoices/pdf-invoices.module.ts b/feature-libs/pdf-invoices/pdf-invoices.module.ts
new file mode 100644
index 00000000000..db2440d4336
--- /dev/null
+++ b/feature-libs/pdf-invoices/pdf-invoices.module.ts
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { PDFInvoicesComponentsModule } from '@spartacus/pdf-invoices/components';
+import { PDFInvoicesCoreModule } from '@spartacus/pdf-invoices/core';
+import { PDFInvoicesOccModule } from '@spartacus/pdf-invoices/occ';
+
+@NgModule({
+  imports: [
+    PDFInvoicesComponentsModule,
+    PDFInvoicesCoreModule,
+    PDFInvoicesOccModule,
+  ],
+})
+export class PDFInvoicesModule {}
diff --git a/feature-libs/pdf-invoices/project.json b/feature-libs/pdf-invoices/project.json
new file mode 100644
index 00000000000..1221fe4d75d
--- /dev/null
+++ b/feature-libs/pdf-invoices/project.json
@@ -0,0 +1,40 @@
+{
+  "name": "pdf-invoices",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "feature-libs/pdf-invoices",
+  "prefix": "cx",
+  "targets": {
+    "build": {
+      "executor": "./tools/build-lib:augmented-types",
+      "options": {
+        "tsConfig": "feature-libs/pdf-invoices/tsconfig.lib.json",
+        "project": "feature-libs/pdf-invoices/ng-package.json"
+      },
+      "configurations": {
+        "production": {
+          "tsConfig": "feature-libs/pdf-invoices/tsconfig.lib.prod.json"
+        }
+      }
+    },
+    "test": {
+      "executor": "@angular-devkit/build-angular:karma",
+      "options": {
+        "main": "feature-libs/pdf-invoices/test.ts",
+        "tsConfig": "feature-libs/pdf-invoices/tsconfig.spec.json",
+        "polyfills": ["zone.js", "zone.js/testing"],
+        "karmaConfig": "feature-libs/pdf-invoices/karma.conf.js"
+      }
+    },
+    "lint": {
+      "executor": "@angular-eslint/builder:lint",
+      "options": {
+        "lintFilePatterns": [
+          "feature-libs/pdf-invoices/**/*.ts",
+          "feature-libs/pdf-invoices/**/*.html"
+        ]
+      }
+    }
+  },
+  "tags": ["type:feature"]
+}
diff --git a/feature-libs/pdf-invoices/public_api.ts b/feature-libs/pdf-invoices/public_api.ts
new file mode 100644
index 00000000000..6ee849cfe47
--- /dev/null
+++ b/feature-libs/pdf-invoices/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Public API Surface of pdf-invoices
+ */
+export * from './pdf-invoices.module';
diff --git a/feature-libs/pdf-invoices/root/facade/index.ts b/feature-libs/pdf-invoices/root/facade/index.ts
new file mode 100644
index 00000000000..8cadd659ae0
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/facade/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './pdf-invoices.facade';
diff --git a/feature-libs/pdf-invoices/root/facade/pdf-invoices.facade.ts b/feature-libs/pdf-invoices/root/facade/pdf-invoices.facade.ts
new file mode 100644
index 00000000000..140f23fd448
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/facade/pdf-invoices.facade.ts
@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { facadeFactory } from '@spartacus/core';
+import { Observable } from 'rxjs';
+import { PDF_INVOICES_FEATURE } from '../feature-name';
+import {
+  InvoiceQueryParams,
+  OrderInvoiceList,
+} from '../model/pdf-invoices.model';
+
+export function pdfInvoicesFacadeFactory() {
+  return facadeFactory({
+    facade: PDFInvoicesFacade,
+    feature: PDF_INVOICES_FEATURE,
+    methods: ['getInvoicesForOrder', 'getInvoicePDF'],
+  });
+}
+
+@Injectable({
+  providedIn: 'root',
+  useFactory: pdfInvoicesFacadeFactory,
+})
+export abstract class PDFInvoicesFacade {
+  /**
+   * Abstract method used to get the PDF invoices for an order
+   * @param userId Logged in user id
+   * @param orderId If provided, it will be used, otherwise it will use orderId from router state.
+   * @param queryParams Additional query parameters used in the API request
+   */
+  abstract getInvoicesForOrder(
+    queryParams: InvoiceQueryParams,
+    userId?: string,
+    orderId?: string
+  ): Observable<OrderInvoiceList>;
+
+  /**
+   * Returns the document blob for given invoiceId, orderId and externalSystemId
+   * @param userId Logged in user id
+   * @param orderId If provided, it will be used, otherwise it will use orderId from router state.
+   * @param invoiceId The id of the invoice to be downloaded
+   * @param externalSystemId External system that provides the invoice PDF
+   */
+  abstract getInvoicePDF(
+    invoiceId: string,
+    externalSystemId?: string,
+    userId?: string,
+    orderId?: string
+  ): Observable<Blob>;
+}
diff --git a/feature-libs/pdf-invoices/root/feature-name.ts b/feature-libs/pdf-invoices/root/feature-name.ts
new file mode 100644
index 00000000000..d2a42807361
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/feature-name.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const PDF_INVOICES_FEATURE = 'pdfInvoices';
+export const PDF_INVOICES_CORE_FEATURE = 'pdfInvoicesCore';
diff --git a/feature-libs/pdf-invoices/root/model/index.ts b/feature-libs/pdf-invoices/root/model/index.ts
new file mode 100644
index 00000000000..d81983e9057
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/model/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './pdf-invoices.model';
diff --git a/feature-libs/pdf-invoices/root/model/pdf-invoices.model.ts b/feature-libs/pdf-invoices/root/model/pdf-invoices.model.ts
new file mode 100644
index 00000000000..dfede29f369
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/model/pdf-invoices.model.ts
@@ -0,0 +1,50 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+interface Amount {
+  currencyIso?: string;
+  value?: number;
+  formattedValue?: string;
+}
+
+export enum InvoicesFields {
+  BASIC = 'BASIC',
+  DEFAULT = 'DEFAULT',
+  FULL = 'FULL',
+}
+
+export interface OrderInvoice {
+  invoiceId: string;
+  externalSystemId?: string;
+  createdAt: Date;
+  netAmount: Amount;
+  totalAmount: Amount;
+}
+
+export interface OrderInvoiceList {
+  invoices?: OrderInvoice[];
+  pagination?: Pagination;
+  sorts?: Sort[];
+}
+
+export interface InvoiceQueryParams {
+  currentPage?: number;
+  pageSize?: number;
+  sort?: string;
+  fields?: InvoicesFields;
+}
+
+interface Sort {
+  asc?: boolean;
+  code?: string;
+}
+
+interface Pagination {
+  count?: number;
+  page?: number;
+  totalCount?: number;
+  totalPages?: number;
+}
diff --git a/feature-libs/pdf-invoices/root/ng-package.json b/feature-libs/pdf-invoices/root/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/root/pdf-invoices-root.module.ts b/feature-libs/pdf-invoices/root/pdf-invoices-root.module.ts
new file mode 100644
index 00000000000..b5d80f34844
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/pdf-invoices-root.module.ts
@@ -0,0 +1,34 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { CmsConfig, provideDefaultConfigFactory } from '@spartacus/core';
+import {
+  PDF_INVOICES_CORE_FEATURE,
+  PDF_INVOICES_FEATURE,
+} from './feature-name';
+
+export function defaultRequestedDeliveryDateComponentsConfig(): CmsConfig {
+  const config: CmsConfig = {
+    featureModules: {
+      [PDF_INVOICES_FEATURE]: {
+        cmsComponents: ['AccountOrderDetailsPDFInvoicesComponent'],
+      },
+      // by default core is bundled together with components
+      [PDF_INVOICES_CORE_FEATURE]: PDF_INVOICES_FEATURE,
+    },
+  };
+
+  return config;
+}
+
+@NgModule({
+  providers: [
+    provideDefaultConfigFactory(defaultRequestedDeliveryDateComponentsConfig),
+  ],
+})
+export class PDFInvoicesRootModule {}
diff --git a/feature-libs/pdf-invoices/root/public_api.ts b/feature-libs/pdf-invoices/root/public_api.ts
new file mode 100644
index 00000000000..071a714f4b0
--- /dev/null
+++ b/feature-libs/pdf-invoices/root/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './facade/index';
+export * from './feature-name';
+export * from './model/index';
+export * from './pdf-invoices-root.module';
diff --git a/feature-libs/pdf-invoices/schematics/.gitignore b/feature-libs/pdf-invoices/schematics/.gitignore
new file mode 100644
index 00000000000..c88f4d69e15
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/.gitignore
@@ -0,0 +1,18 @@
+# Outputs
+**/*.js
+**/*.js.map
+**/*.d.ts
+
+# IDEs
+.idea/
+jsconfig.json
+.vscode/
+
+# Misc
+node_modules/
+npm-debug.log*
+yarn-error.log*
+
+# Mac OSX Finder files.
+**/.DS_Store
+.DS_Store
diff --git a/feature-libs/pdf-invoices/schematics/add-pdf-invoices/__snapshots__/index_spec.ts.snap b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/__snapshots__/index_spec.ts.snap
new file mode 100644
index 00000000000..3cd99de4d80
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/__snapshots__/index_spec.ts.snap
@@ -0,0 +1,130 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Spartacus PDF Invoices schematics: ng-add PDF Invoices feature eager loading should import appropriate modules 1`] = `""`;
+
+exports[`Spartacus PDF Invoices schematics: ng-add PDF Invoices feature general setup should add the feature using the lazy loading syntax 1`] = `""`;
+
+exports[`Spartacus PDF Invoices schematics: ng-add PDF Invoices feature general setup styling should create a proper scss file 1`] = `
+"@import "../../styles-config";
+@import "@spartacus/pdf-invoices";
+"
+`;
+
+exports[`Spartacus PDF Invoices schematics: ng-add PDF Invoices feature general setup styling should update angular.json 1`] = `
+"{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "",
+  "projects": {
+    "schematics-test": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/schematics-test",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss",
+              "src/styles/spartacus/pdf-invoices.scss"
+            ],
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ]
+            }
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "2.5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "browserTarget": "schematics-test:build:production"
+            },
+            "development": {
+              "browserTarget": "schematics-test:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "schematics-test:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "tsConfig": "tsconfig.spec.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss",
+              "src/styles/spartacus/pdf-invoices.scss"
+            ],
+            "scripts": [],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}"
+`;
diff --git a/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index.ts b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index.ts
new file mode 100644
index 00000000000..5a246702af3
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index.ts
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  chain,
+  Rule,
+  SchematicContext,
+  Tree,
+} from '@angular-devkit/schematics';
+import {
+  addFeatures,
+  addPackageJsonDependenciesForLibrary,
+  analyzeApplication,
+  analyzeCrossFeatureDependencies,
+  finalizeInstallation,
+  LibraryOptions as SpartacusPDFInvoicesOptions,
+  readPackageJson,
+  validateSpartacusInstallation,
+} from '@spartacus/schematics';
+import { peerDependencies } from '../../package.json';
+
+export function addPDFInvoicesFeature(
+  options: SpartacusPDFInvoicesOptions
+): Rule {
+  return (tree: Tree, _context: SchematicContext): Rule => {
+    const packageJson = readPackageJson(tree);
+    validateSpartacusInstallation(packageJson);
+
+    const features = analyzeCrossFeatureDependencies(
+      options.features as string[]
+    );
+
+    return chain([
+      analyzeApplication(options, features),
+
+      addFeatures(options, features),
+      addPackageJsonDependenciesForLibrary(peerDependencies, options),
+
+      finalizeInstallation(options, features),
+    ]);
+  };
+}
diff --git a/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index_spec.ts b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index_spec.ts
new file mode 100644
index 00000000000..2657523862e
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/index_spec.ts
@@ -0,0 +1,174 @@
+/// <reference types="jest" />
+
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import {
+  Schema as ApplicationOptions,
+  Style,
+} from '@schematics/angular/application/schema';
+import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema';
+import {
+  LibraryOptions as PDFInvoicesOptions,
+  pdfInvoicesFeatureModulePath,
+  PDF_INVOICES_FEATURE_NAME,
+  SpartacusOptions,
+  SPARTACUS_PDF_INVOICES,
+  SPARTACUS_SCHEMATICS,
+} from '@spartacus/schematics';
+import * as path from 'path';
+import { peerDependencies } from '../../package.json';
+
+const collectionPath = path.join(__dirname, '../collection.json');
+const scssFilePath = 'src/styles/spartacus/pdf-invoices.scss';
+
+describe('Spartacus PDF Invoices schematics: ng-add', () => {
+  const schematicRunner = new SchematicTestRunner(
+    SPARTACUS_PDF_INVOICES,
+    collectionPath
+  );
+
+  let appTree: UnitTestTree;
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    version: '0.5.0',
+  };
+
+  const appOptions: ApplicationOptions = {
+    name: 'schematics-test',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: false,
+    style: Style.Scss,
+    skipTests: false,
+    projectRoot: '',
+  };
+
+  const spartacusDefaultOptions: SpartacusOptions = {
+    project: 'schematics-test',
+    lazy: true,
+    features: [],
+  };
+
+  const libraryNoFeaturesOptions: PDFInvoicesOptions = {
+    project: 'schematics-test',
+    lazy: true,
+    features: [],
+  };
+
+  const rddOptions: PDFInvoicesOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [PDF_INVOICES_FEATURE_NAME],
+  };
+
+  beforeEach(async () => {
+    schematicRunner.registerCollection(
+      SPARTACUS_SCHEMATICS,
+      '../../projects/schematics/src/collection.json'
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'workspace',
+      workspaceOptions
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      '@schematics/angular',
+      'application',
+      appOptions,
+      appTree
+    );
+
+    appTree = await schematicRunner.runExternalSchematic(
+      SPARTACUS_SCHEMATICS,
+      'ng-add',
+      { ...spartacusDefaultOptions, name: 'schematics-test' },
+      appTree
+    );
+  });
+
+  describe('Without features', () => {
+    beforeEach(async () => {
+      appTree = await schematicRunner.runSchematic(
+        'ng-add',
+        libraryNoFeaturesOptions,
+        appTree
+      );
+    });
+
+    it('should not create any of the feature modules', () => {
+      expect(appTree.exists(pdfInvoicesFeatureModulePath)).toBeFalsy();
+    });
+
+    it('should install necessary Spartacus libraries', () => {
+      const packageJson = JSON.parse(appTree.readContent('package.json'));
+      let dependencies: Record<string, string> = {};
+      dependencies = { ...packageJson.dependencies };
+      dependencies = { ...dependencies, ...packageJson.devDependencies };
+
+      for (const toAdd in peerDependencies) {
+        // skip the SPARTACUS_SCHEMATICS, as those are added only when running by the Angular CLI, and not in the testing environment
+        if (
+          !peerDependencies.hasOwnProperty(toAdd) ||
+          toAdd === SPARTACUS_SCHEMATICS
+        ) {
+          continue;
+        }
+        // TODO: after 4.0: use this test, as we'll have synced versions between lib's and root package.json
+        // const expectedVersion = (peerDependencies as Record<
+        //   string,
+        //   string
+        // >)[toAdd];
+        const expectedDependency = dependencies[toAdd];
+        expect(expectedDependency).toBeTruthy();
+      }
+    });
+  });
+
+  describe('PDF Invoices feature', () => {
+    describe('general setup', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          rddOptions,
+          appTree
+        );
+      });
+
+      it('should add the feature using the lazy loading syntax', async () => {
+        const module = appTree.readContent(pdfInvoicesFeatureModulePath);
+        expect(module).toMatchSnapshot();
+      });
+
+      describe('styling', () => {
+        it('should create a proper scss file', () => {
+          const scssContent = appTree.readContent(scssFilePath);
+          expect(scssContent).toMatchSnapshot();
+        });
+
+        it('should update angular.json', async () => {
+          const content = appTree.readContent('/angular.json');
+          expect(content).toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('eager loading', () => {
+      beforeEach(async () => {
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          { ...rddOptions, lazy: false },
+          appTree
+        );
+      });
+
+      it('should import appropriate modules', async () => {
+        const module = appTree.readContent(pdfInvoicesFeatureModulePath);
+        expect(module).toMatchSnapshot();
+      });
+    });
+  });
+});
diff --git a/feature-libs/pdf-invoices/schematics/add-pdf-invoices/schema.json b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/schema.json
new file mode 100644
index 00000000000..5940aa3c67f
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/add-pdf-invoices/schema.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "PDFInvoicesSchematics",
+  "title": "PDF Invoices Schematics",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "debug": {
+      "description": "Display additional details during the running process.",
+      "type": "boolean",
+      "default": false
+    },
+    "lazy": {
+      "type": "boolean",
+      "description": "Lazy load the PDF Invoices library.",
+      "default": true
+    },
+    "features": {
+      "type": "array",
+      "uniqueItems": true,
+      "default": ["PDF-Invoices"]
+    }
+  },
+  "required": []
+}
diff --git a/feature-libs/pdf-invoices/schematics/collection.json b/feature-libs/pdf-invoices/schematics/collection.json
new file mode 100644
index 00000000000..a77410d0e50
--- /dev/null
+++ b/feature-libs/pdf-invoices/schematics/collection.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
+  "schematics": {
+    "ng-add": {
+      "factory": "./add-pdf-invoices/index#addPDFInvoicesFeature",
+      "description": "Add PDF Invoices feature",
+      "schema": "./add-pdf-invoices/schema.json",
+      "private": true,
+      "hidden": true,
+      "aliases": ["install"]
+    },
+    "add": {
+      "factory": "./add-pdf-invoices/index#addPDFInvoicesFeature",
+      "description": "Add and configure PDF Invoices feature",
+      "schema": "./add-pdf-invoices/schema.json"
+    }
+  }
+}
diff --git a/feature-libs/pdf-invoices/setup-jest.ts b/feature-libs/pdf-invoices/setup-jest.ts
new file mode 100644
index 00000000000..919fe8743ac
--- /dev/null
+++ b/feature-libs/pdf-invoices/setup-jest.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import 'jest-preset-angular/setup-jest';
+import 'zone.js';
diff --git a/feature-libs/pdf-invoices/styles/_index.scss b/feature-libs/pdf-invoices/styles/_index.scss
new file mode 100644
index 00000000000..17c0aa6bccd
--- /dev/null
+++ b/feature-libs/pdf-invoices/styles/_index.scss
@@ -0,0 +1 @@
+@import './pdf-invoices';
diff --git a/feature-libs/pdf-invoices/styles/_pdf-invoices.scss b/feature-libs/pdf-invoices/styles/_pdf-invoices.scss
new file mode 100644
index 00000000000..2c572e9181e
--- /dev/null
+++ b/feature-libs/pdf-invoices/styles/_pdf-invoices.scss
@@ -0,0 +1,237 @@
+cx-invoices-list {
+  .cx-invoices-list {
+    @include media-breakpoint-down(md) {
+      max-width: 100%;
+      padding: 0;
+    }
+  }
+
+  .cx-invoices-list-table {
+    padding: 1.5rem 0 1.125rem 0;
+    margin-bottom: 0;
+    border-top: 1px solid var(--cx-color-light);
+    border-bottom: 1px solid var(--cx-color-light);
+
+    th {
+      padding: 1.5rem 0 1.125rem 0;
+      text-align: start;
+
+      &:last-child {
+        text-align: end;
+      }
+    }
+
+    td {
+      padding: 1.625rem 0;
+
+      @include media-breakpoint-up(md) {
+        text-align: start;
+      }
+
+      @include media-breakpoint-down(md) {
+        width: 100%;
+        display: flex;
+        border-width: 0;
+        padding: 0 1.25rem;
+
+        &:first-child {
+          padding-top: 1.25rem;
+        }
+
+        &:last-child {
+          padding-bottom: 1.25rem;
+        }
+      }
+    }
+  }
+
+  .cx-invoices-list-header {
+    padding: 40px 0 0 0;
+    color: var(--cx-color-text);
+
+    @include media-breakpoint-down(md) {
+      padding-top: 40px;
+      padding-inline-end: 20px;
+      padding-bottom: 0;
+      padding-inline-start: 20px;
+    }
+  }
+
+  .cx-invoices-list-thead-mobile {
+    @include media-breakpoint-down(md) {
+      display: none;
+    }
+  }
+
+  .cx-invoices-list-code {
+    .cx-invoices-list-value {
+      text-decoration: none;
+    }
+  }
+
+  .cx-invoices-list-externalSystem {
+    .cx-invoices-list-value {
+      text-decoration: none;
+    }
+  }
+
+  .cx-invoices-list-attachment {
+    .cx-invoices-list-value {
+      text-decoration: underline;
+      text-align: end;
+      color: var(--cx-color-primary);
+    }
+  }
+
+  .cx-invoices-list-date {
+    text-align: center;
+
+    @include media-breakpoint-down(md) {
+      text-align: start;
+    }
+  }
+
+  .cx-invoices-list-status {
+    text-align: center;
+    text-transform: capitalize;
+
+    @include media-breakpoint-down(md) {
+      text-align: start;
+    }
+
+    .status-open {
+      color: var(--cx-color-success);
+    }
+
+    .status-closed {
+      color: var(--cx-color-secondary);
+    }
+  }
+
+  .cx-invoices-list-monetary {
+    text-align: end;
+
+    @include media-breakpoint-down(md) {
+      text-align: start;
+    }
+  }
+
+  .cx-invoices-list-label {
+    color: var(--cx-color-secondary);
+
+    @include media-breakpoint-up(lg) {
+      display: none;
+    }
+
+    @include media-breakpoint-down(md) {
+      @include type('8');
+      min-width: 200px;
+      min-height: 48px;
+    }
+  }
+
+  .cx-invoices-list-value {
+    color: var(--cx-color-text);
+
+    @include media-breakpoint-down(md) {
+      @include type('5');
+      font-weight: $font-weight-normal;
+    }
+  }
+
+  .cx-invoices-list-form-group {
+    padding: 0;
+    margin-bottom: 0;
+    align-items: center;
+    display: flex;
+    width: 40%;
+
+    span {
+      margin-inline-end: 0.5rem;
+      flex: none;
+    }
+
+    cx-sorting {
+      width: 100%;
+    }
+
+    @include media-breakpoint-down(md) {
+      padding: 1.25rem;
+      width: 100%;
+    }
+  }
+
+  .cx-invoices-list-sort {
+    &.top {
+      display: flex;
+      justify-content: space-between;
+      padding: 1rem 0;
+      margin: 0;
+
+      @include media-breakpoint-down(md) {
+        flex-direction: column;
+        padding-top: 0;
+      }
+    }
+
+    &.bottom {
+      display: flex;
+      justify-content: flex-end;
+      padding: 1rem 0 1rem 0;
+      margin: 0;
+
+      @include media-breakpoint-down(sm) {
+        flex-direction: column;
+      }
+    }
+  }
+
+  .cx-invoices-list-pagination {
+    @include media-breakpoint-down(md) {
+      margin: 0 auto;
+    }
+  }
+
+  .cx-invoices-list-no-document {
+    display: flex;
+    flex-wrap: wrap;
+    @include type('5');
+    font-weight: $font-weight-normal;
+    min-height: 415px;
+    padding-top: 2rem;
+    border-top: 1px solid var(--cx-color-light);
+    justify-content: center;
+
+    @include media-breakpoint-down(sm) {
+      min-height: 474px;
+      padding-inline-start: 1.25rem;
+      padding-inline-end: 1.25rem;
+    }
+  }
+
+  .cx-invoices-list-row {
+    &:nth-child(odd) {
+      @include media-breakpoint-down(md) {
+        background-color: var(--cx-color-background);
+      }
+    }
+  }
+
+  .cx-invoices-list-attachment-btn {
+    color: var(--cx-color-primary);
+    background-color: inherit;
+    border: 0;
+  }
+
+  .cx-invoices-list-attachment-icon {
+    font-size: 1.4rem;
+  }
+
+  .cx-invoices-list-attachment-text {
+    font-weight: var(--cx-font-weight-bold);
+    padding-inline-start: 0.5rem;
+    @include media-breakpoint-up(lg) {
+      display: none;
+    }
+  }
+}
diff --git a/feature-libs/pdf-invoices/test.ts b/feature-libs/pdf-invoices/test.ts
new file mode 100644
index 00000000000..bd3bae74074
--- /dev/null
+++ b/feature-libs/pdf-invoices/test.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  {
+    teardown: { destroyAfterEach: false },
+  }
+);
diff --git a/feature-libs/pdf-invoices/tsconfig.lib.json b/feature-libs/pdf-invoices/tsconfig.lib.json
new file mode 100644
index 00000000000..e36a15b522e
--- /dev/null
+++ b/feature-libs/pdf-invoices/tsconfig.lib.json
@@ -0,0 +1,33 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "declarationMap": true,
+    "forceConsistentCasingInFileNames": true,
+    "target": "es2020",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "importHelpers": true,
+    "types": [],
+    "lib": ["dom", "esnext"],
+    "strict": true,
+    "paths": {
+      "@spartacus/core": ["dist/core"],
+      "@spartacus/storefront": ["dist/storefrontlib"]
+    }
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true,
+    "strictInputAccessModifiers": true
+  },
+  "exclude": ["test.ts", "setup-jest.ts", "**/*.spec.ts"]
+}
diff --git a/feature-libs/pdf-invoices/tsconfig.lib.prod.json b/feature-libs/pdf-invoices/tsconfig.lib.prod.json
new file mode 100644
index 00000000000..0d1bf3896fa
--- /dev/null
+++ b/feature-libs/pdf-invoices/tsconfig.lib.prod.json
@@ -0,0 +1,11 @@
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+
+{
+  "extends": "./tsconfig.lib.json",
+  "compilerOptions": {
+    "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
+  }
+}
diff --git a/feature-libs/pdf-invoices/tsconfig.schematics.json b/feature-libs/pdf-invoices/tsconfig.schematics.json
new file mode 100644
index 00000000000..125e28e522d
--- /dev/null
+++ b/feature-libs/pdf-invoices/tsconfig.schematics.json
@@ -0,0 +1,557 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "module": "CommonJs",
+    "types": ["jest"],
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "noUnusedLocals": true,
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "strictNullChecks": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "paths": {
+      "@spartacus/schematics": ["../../projects/schematics/index"],
+      "@spartacus/setup": ["../../core-libs/setup/public_api"],
+      "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/asm/assets": ["../../feature-libs/asm/assets/public_api"],
+      "@spartacus/asm/components": [
+        "../../feature-libs/asm/components/public_api"
+      ],
+      "@spartacus/asm/core": ["../../feature-libs/asm/core/public_api"],
+      "@spartacus/asm": ["../../feature-libs/asm/public_api"],
+      "@spartacus/asm/occ": ["../../feature-libs/asm/occ/public_api"],
+      "@spartacus/asm/root": ["../../feature-libs/asm/root/public_api"],
+      "@spartacus/cart/base/assets": [
+        "../../feature-libs/cart/base/assets/public_api"
+      ],
+      "@spartacus/cart/base/components/add-to-cart": [
+        "../../feature-libs/cart/base/components/add-to-cart/public_api"
+      ],
+      "@spartacus/cart/base/components/mini-cart": [
+        "../../feature-libs/cart/base/components/mini-cart/public_api"
+      ],
+      "@spartacus/cart/base/components": [
+        "../../feature-libs/cart/base/components/public_api"
+      ],
+      "@spartacus/cart/base/core": [
+        "../../feature-libs/cart/base/core/public_api"
+      ],
+      "@spartacus/cart/base": ["../../feature-libs/cart/base/public_api"],
+      "@spartacus/cart/base/occ": [
+        "../../feature-libs/cart/base/occ/public_api"
+      ],
+      "@spartacus/cart/base/root": [
+        "../../feature-libs/cart/base/root/public_api"
+      ],
+      "@spartacus/cart/import-export/assets": [
+        "../../feature-libs/cart/import-export/assets/public_api"
+      ],
+      "@spartacus/cart/import-export/components": [
+        "../../feature-libs/cart/import-export/components/public_api"
+      ],
+      "@spartacus/cart/import-export/core": [
+        "../../feature-libs/cart/import-export/core/public_api"
+      ],
+      "@spartacus/cart/import-export": [
+        "../../feature-libs/cart/import-export/public_api"
+      ],
+      "@spartacus/cart/import-export/root": [
+        "../../feature-libs/cart/import-export/root/public_api"
+      ],
+      "@spartacus/cart": ["../../feature-libs/cart/public_api"],
+      "@spartacus/cart/quick-order/assets": [
+        "../../feature-libs/cart/quick-order/assets/public_api"
+      ],
+      "@spartacus/cart/quick-order/components": [
+        "../../feature-libs/cart/quick-order/components/public_api"
+      ],
+      "@spartacus/cart/quick-order/core": [
+        "../../feature-libs/cart/quick-order/core/public_api"
+      ],
+      "@spartacus/cart/quick-order": [
+        "../../feature-libs/cart/quick-order/public_api"
+      ],
+      "@spartacus/cart/quick-order/root": [
+        "../../feature-libs/cart/quick-order/root/public_api"
+      ],
+      "@spartacus/cart/saved-cart/assets": [
+        "../../feature-libs/cart/saved-cart/assets/public_api"
+      ],
+      "@spartacus/cart/saved-cart/components": [
+        "../../feature-libs/cart/saved-cart/components/public_api"
+      ],
+      "@spartacus/cart/saved-cart/core": [
+        "../../feature-libs/cart/saved-cart/core/public_api"
+      ],
+      "@spartacus/cart/saved-cart": [
+        "../../feature-libs/cart/saved-cart/public_api"
+      ],
+      "@spartacus/cart/saved-cart/occ": [
+        "../../feature-libs/cart/saved-cart/occ/public_api"
+      ],
+      "@spartacus/cart/saved-cart/root": [
+        "../../feature-libs/cart/saved-cart/root/public_api"
+      ],
+      "@spartacus/cart/wish-list/assets": [
+        "../../feature-libs/cart/wish-list/assets/public_api"
+      ],
+      "@spartacus/cart/wish-list/components/add-to-wishlist": [
+        "../../feature-libs/cart/wish-list/components/add-to-wishlist/public_api"
+      ],
+      "@spartacus/cart/wish-list/components": [
+        "../../feature-libs/cart/wish-list/components/public_api"
+      ],
+      "@spartacus/cart/wish-list/core": [
+        "../../feature-libs/cart/wish-list/core/public_api"
+      ],
+      "@spartacus/cart/wish-list": [
+        "../../feature-libs/cart/wish-list/public_api"
+      ],
+      "@spartacus/cart/wish-list/root": [
+        "../../feature-libs/cart/wish-list/root/public_api"
+      ],
+      "@spartacus/checkout/b2b/assets": [
+        "../../feature-libs/checkout/b2b/assets/public_api"
+      ],
+      "@spartacus/checkout/b2b/components": [
+        "../../feature-libs/checkout/b2b/components/public_api"
+      ],
+      "@spartacus/checkout/b2b/core": [
+        "../../feature-libs/checkout/b2b/core/public_api"
+      ],
+      "@spartacus/checkout/b2b": ["../../feature-libs/checkout/b2b/public_api"],
+      "@spartacus/checkout/b2b/occ": [
+        "../../feature-libs/checkout/b2b/occ/public_api"
+      ],
+      "@spartacus/checkout/b2b/root": [
+        "../../feature-libs/checkout/b2b/root/public_api"
+      ],
+      "@spartacus/checkout/base/assets": [
+        "../../feature-libs/checkout/base/assets/public_api"
+      ],
+      "@spartacus/checkout/base/components": [
+        "../../feature-libs/checkout/base/components/public_api"
+      ],
+      "@spartacus/checkout/base/core": [
+        "../../feature-libs/checkout/base/core/public_api"
+      ],
+      "@spartacus/checkout/base": [
+        "../../feature-libs/checkout/base/public_api"
+      ],
+      "@spartacus/checkout/base/occ": [
+        "../../feature-libs/checkout/base/occ/public_api"
+      ],
+      "@spartacus/checkout/base/root": [
+        "../../feature-libs/checkout/base/root/public_api"
+      ],
+      "@spartacus/checkout": ["../../feature-libs/checkout/public_api"],
+      "@spartacus/checkout/scheduled-replenishment/assets": [
+        "../../feature-libs/checkout/scheduled-replenishment/assets/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/components": [
+        "../../feature-libs/checkout/scheduled-replenishment/components/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment": [
+        "../../feature-libs/checkout/scheduled-replenishment/public_api"
+      ],
+      "@spartacus/checkout/scheduled-replenishment/root": [
+        "../../feature-libs/checkout/scheduled-replenishment/root/public_api"
+      ],
+      "@spartacus/customer-ticketing/assets": [
+        "../../feature-libs/customer-ticketing/assets/public_api"
+      ],
+      "@spartacus/customer-ticketing/components": [
+        "../../feature-libs/customer-ticketing/components/public_api"
+      ],
+      "@spartacus/customer-ticketing/core": [
+        "../../feature-libs/customer-ticketing/core/public_api"
+      ],
+      "@spartacus/customer-ticketing": [
+        "../../feature-libs/customer-ticketing/public_api"
+      ],
+      "@spartacus/customer-ticketing/occ": [
+        "../../feature-libs/customer-ticketing/occ/public_api"
+      ],
+      "@spartacus/customer-ticketing/root": [
+        "../../feature-libs/customer-ticketing/root/public_api"
+      ],
+      "@spartacus/order/assets": ["../../feature-libs/order/assets/public_api"],
+      "@spartacus/order/components": [
+        "../../feature-libs/order/components/public_api"
+      ],
+      "@spartacus/order/core": ["../../feature-libs/order/core/public_api"],
+      "@spartacus/order": ["../../feature-libs/order/public_api"],
+      "@spartacus/order/occ": ["../../feature-libs/order/occ/public_api"],
+      "@spartacus/order/root": ["../../feature-libs/order/root/public_api"],
+      "@spartacus/organization/account-summary/assets": [
+        "../../feature-libs/organization/account-summary/assets/public_api"
+      ],
+      "@spartacus/organization/account-summary/components": [
+        "../../feature-libs/organization/account-summary/components/public_api"
+      ],
+      "@spartacus/organization/account-summary/core": [
+        "../../feature-libs/organization/account-summary/core/public_api"
+      ],
+      "@spartacus/organization/account-summary": [
+        "../../feature-libs/organization/account-summary/public_api"
+      ],
+      "@spartacus/organization/account-summary/occ": [
+        "../../feature-libs/organization/account-summary/occ/public_api"
+      ],
+      "@spartacus/organization/account-summary/root": [
+        "../../feature-libs/organization/account-summary/root/public_api"
+      ],
+      "@spartacus/organization/administration/assets": [
+        "../../feature-libs/organization/administration/assets/public_api"
+      ],
+      "@spartacus/organization/administration/components": [
+        "../../feature-libs/organization/administration/components/public_api"
+      ],
+      "@spartacus/organization/administration/core": [
+        "../../feature-libs/organization/administration/core/public_api"
+      ],
+      "@spartacus/organization/administration": [
+        "../../feature-libs/organization/administration/public_api"
+      ],
+      "@spartacus/organization/administration/occ": [
+        "../../feature-libs/organization/administration/occ/public_api"
+      ],
+      "@spartacus/organization/administration/root": [
+        "../../feature-libs/organization/administration/root/public_api"
+      ],
+      "@spartacus/organization": ["../../feature-libs/organization/public_api"],
+      "@spartacus/organization/order-approval/assets": [
+        "../../feature-libs/organization/order-approval/assets/public_api"
+      ],
+      "@spartacus/organization/order-approval": [
+        "../../feature-libs/organization/order-approval/public_api"
+      ],
+      "@spartacus/organization/order-approval/root": [
+        "../../feature-libs/organization/order-approval/root/public_api"
+      ],
+      "@spartacus/organization/unit-order/assets": [
+        "../../feature-libs/organization/unit-order/assets/public_api"
+      ],
+      "@spartacus/organization/unit-order/components": [
+        "../../feature-libs/organization/unit-order/components/public_api"
+      ],
+      "@spartacus/organization/unit-order/core": [
+        "../../feature-libs/organization/unit-order/core/public_api"
+      ],
+      "@spartacus/organization/unit-order": [
+        "../../feature-libs/organization/unit-order/public_api"
+      ],
+      "@spartacus/organization/unit-order/occ": [
+        "../../feature-libs/organization/unit-order/occ/public_api"
+      ],
+      "@spartacus/organization/unit-order/root": [
+        "../../feature-libs/organization/unit-order/root/public_api"
+      ],
+      "@spartacus/organization/user-registration/assets": [
+        "../../feature-libs/organization/user-registration/assets/public_api"
+      ],
+      "@spartacus/organization/user-registration/components": [
+        "../../feature-libs/organization/user-registration/components/public_api"
+      ],
+      "@spartacus/organization/user-registration/core": [
+        "../../feature-libs/organization/user-registration/core/public_api"
+      ],
+      "@spartacus/organization/user-registration": [
+        "../../feature-libs/organization/user-registration/public_api"
+      ],
+      "@spartacus/organization/user-registration/occ": [
+        "../../feature-libs/organization/user-registration/occ/public_api"
+      ],
+      "@spartacus/organization/user-registration/root": [
+        "../../feature-libs/organization/user-registration/root/public_api"
+      ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
+      "@spartacus/pickup-in-store/assets": [
+        "../../feature-libs/pickup-in-store/assets/public_api"
+      ],
+      "@spartacus/pickup-in-store/components": [
+        "../../feature-libs/pickup-in-store/components/public_api"
+      ],
+      "@spartacus/pickup-in-store/core": [
+        "../../feature-libs/pickup-in-store/core/public_api"
+      ],
+      "@spartacus/pickup-in-store": [
+        "../../feature-libs/pickup-in-store/public_api"
+      ],
+      "@spartacus/pickup-in-store/occ": [
+        "../../feature-libs/pickup-in-store/occ/public_api"
+      ],
+      "@spartacus/pickup-in-store/root": [
+        "../../feature-libs/pickup-in-store/root/public_api"
+      ],
+      "@spartacus/product-configurator/common/assets": [
+        "../../feature-libs/product-configurator/common/assets/public_api"
+      ],
+      "@spartacus/product-configurator/common": [
+        "../../feature-libs/product-configurator/common/public_api"
+      ],
+      "@spartacus/product-configurator": [
+        "../../feature-libs/product-configurator/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/cpq": [
+        "../../feature-libs/product-configurator/rulebased/cpq/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased": [
+        "../../feature-libs/product-configurator/rulebased/public_api"
+      ],
+      "@spartacus/product-configurator/rulebased/root": [
+        "../../feature-libs/product-configurator/rulebased/root/public_api"
+      ],
+      "@spartacus/product-configurator/textfield": [
+        "../../feature-libs/product-configurator/textfield/public_api"
+      ],
+      "@spartacus/product-configurator/textfield/root": [
+        "../../feature-libs/product-configurator/textfield/root/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/assets": [
+        "../../feature-libs/product/bulk-pricing/assets/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/components": [
+        "../../feature-libs/product/bulk-pricing/components/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/core": [
+        "../../feature-libs/product/bulk-pricing/core/public_api"
+      ],
+      "@spartacus/product/bulk-pricing": [
+        "../../feature-libs/product/bulk-pricing/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/occ": [
+        "../../feature-libs/product/bulk-pricing/occ/public_api"
+      ],
+      "@spartacus/product/bulk-pricing/root": [
+        "../../feature-libs/product/bulk-pricing/root/public_api"
+      ],
+      "@spartacus/product/future-stock/assets": [
+        "../../feature-libs/product/future-stock/assets/public_api"
+      ],
+      "@spartacus/product/future-stock/components": [
+        "../../feature-libs/product/future-stock/components/public_api"
+      ],
+      "@spartacus/product/future-stock/core": [
+        "../../feature-libs/product/future-stock/core/public_api"
+      ],
+      "@spartacus/product/future-stock": [
+        "../../feature-libs/product/future-stock/public_api"
+      ],
+      "@spartacus/product/future-stock/occ": [
+        "../../feature-libs/product/future-stock/occ/public_api"
+      ],
+      "@spartacus/product/future-stock/root": [
+        "../../feature-libs/product/future-stock/root/public_api"
+      ],
+      "@spartacus/product/image-zoom/assets": [
+        "../../feature-libs/product/image-zoom/assets/public_api"
+      ],
+      "@spartacus/product/image-zoom/components": [
+        "../../feature-libs/product/image-zoom/components/public_api"
+      ],
+      "@spartacus/product/image-zoom": [
+        "../../feature-libs/product/image-zoom/public_api"
+      ],
+      "@spartacus/product/image-zoom/root": [
+        "../../feature-libs/product/image-zoom/root/public_api"
+      ],
+      "@spartacus/product": ["../../feature-libs/product/public_api"],
+      "@spartacus/product/variants/assets": [
+        "../../feature-libs/product/variants/assets/public_api"
+      ],
+      "@spartacus/product/variants/components": [
+        "../../feature-libs/product/variants/components/public_api"
+      ],
+      "@spartacus/product/variants": [
+        "../../feature-libs/product/variants/public_api"
+      ],
+      "@spartacus/product/variants/occ": [
+        "../../feature-libs/product/variants/occ/public_api"
+      ],
+      "@spartacus/product/variants/root": [
+        "../../feature-libs/product/variants/root/public_api"
+      ],
+      "@spartacus/qualtrics/components": [
+        "../../feature-libs/qualtrics/components/public_api"
+      ],
+      "@spartacus/qualtrics": ["../../feature-libs/qualtrics/public_api"],
+      "@spartacus/qualtrics/root": [
+        "../../feature-libs/qualtrics/root/public_api"
+      ],
+      "@spartacus/requested-delivery-date/assets": [
+        "../../feature-libs/requested-delivery-date/assets/public_api"
+      ],
+      "@spartacus/requested-delivery-date/core": [
+        "../../feature-libs/requested-delivery-date/core/public_api"
+      ],
+      "@spartacus/requested-delivery-date": [
+        "../../feature-libs/requested-delivery-date/public_api"
+      ],
+      "@spartacus/requested-delivery-date/occ": [
+        "../../feature-libs/requested-delivery-date/occ/public_api"
+      ],
+      "@spartacus/requested-delivery-date/root": [
+        "../../feature-libs/requested-delivery-date/root/public_api"
+      ],
+      "@spartacus/smartedit/core": [
+        "../../feature-libs/smartedit/core/public_api"
+      ],
+      "@spartacus/smartedit": ["../../feature-libs/smartedit/public_api"],
+      "@spartacus/smartedit/root": [
+        "../../feature-libs/smartedit/root/public_api"
+      ],
+      "@spartacus/storefinder/assets": [
+        "../../feature-libs/storefinder/assets/public_api"
+      ],
+      "@spartacus/storefinder/components": [
+        "../../feature-libs/storefinder/components/public_api"
+      ],
+      "@spartacus/storefinder/core": [
+        "../../feature-libs/storefinder/core/public_api"
+      ],
+      "@spartacus/storefinder": ["../../feature-libs/storefinder/public_api"],
+      "@spartacus/storefinder/occ": [
+        "../../feature-libs/storefinder/occ/public_api"
+      ],
+      "@spartacus/storefinder/root": [
+        "../../feature-libs/storefinder/root/public_api"
+      ],
+      "@spartacus/tracking": ["../../feature-libs/tracking/public_api"],
+      "@spartacus/tracking/personalization/core": [
+        "../../feature-libs/tracking/personalization/core/public_api"
+      ],
+      "@spartacus/tracking/personalization": [
+        "../../feature-libs/tracking/personalization/public_api"
+      ],
+      "@spartacus/tracking/personalization/root": [
+        "../../feature-libs/tracking/personalization/root/public_api"
+      ],
+      "@spartacus/tracking/tms/aep": [
+        "../../feature-libs/tracking/tms/aep/public_api"
+      ],
+      "@spartacus/tracking/tms/core": [
+        "../../feature-libs/tracking/tms/core/public_api"
+      ],
+      "@spartacus/tracking/tms/gtm": [
+        "../../feature-libs/tracking/tms/gtm/public_api"
+      ],
+      "@spartacus/tracking/tms": ["../../feature-libs/tracking/tms/public_api"],
+      "@spartacus/user/account/assets": [
+        "../../feature-libs/user/account/assets/public_api"
+      ],
+      "@spartacus/user/account/components": [
+        "../../feature-libs/user/account/components/public_api"
+      ],
+      "@spartacus/user/account/core": [
+        "../../feature-libs/user/account/core/public_api"
+      ],
+      "@spartacus/user/account": ["../../feature-libs/user/account/public_api"],
+      "@spartacus/user/account/occ": [
+        "../../feature-libs/user/account/occ/public_api"
+      ],
+      "@spartacus/user/account/root": [
+        "../../feature-libs/user/account/root/public_api"
+      ],
+      "@spartacus/user": ["../../feature-libs/user/public_api"],
+      "@spartacus/user/profile/assets": [
+        "../../feature-libs/user/profile/assets/public_api"
+      ],
+      "@spartacus/user/profile/components": [
+        "../../feature-libs/user/profile/components/public_api"
+      ],
+      "@spartacus/user/profile/core": [
+        "../../feature-libs/user/profile/core/public_api"
+      ],
+      "@spartacus/user/profile": ["../../feature-libs/user/profile/public_api"],
+      "@spartacus/user/profile/occ": [
+        "../../feature-libs/user/profile/occ/public_api"
+      ],
+      "@spartacus/user/profile/root": [
+        "../../feature-libs/user/profile/root/public_api"
+      ],
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
+      "@spartacus/cdc/components": [
+        "../../integration-libs/cdc/components/public_api"
+      ],
+      "@spartacus/cdc/core": ["../../integration-libs/cdc/core/public_api"],
+      "@spartacus/cdc": ["../../integration-libs/cdc/public_api"],
+      "@spartacus/cdc/organization/administration": [
+        "../../integration-libs/cdc/organization/administration/public_api"
+      ],
+      "@spartacus/cdc/organization/user-registration": [
+        "../../integration-libs/cdc/organization/user-registration/public_api"
+      ],
+      "@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
+      "@spartacus/cdc/user-account": [
+        "../../integration-libs/cdc/user-account/public_api"
+      ],
+      "@spartacus/cdc/user-profile": [
+        "../../integration-libs/cdc/user-profile/public_api"
+      ],
+      "@spartacus/cds": ["../../integration-libs/cds/public_api"],
+      "@spartacus/digital-payments/assets": [
+        "../../integration-libs/digital-payments/assets/public_api"
+      ],
+      "@spartacus/digital-payments": [
+        "../../integration-libs/digital-payments/public_api"
+      ],
+      "@spartacus/epd-visualization/assets": [
+        "../../integration-libs/epd-visualization/assets/public_api"
+      ],
+      "@spartacus/epd-visualization/components": [
+        "../../integration-libs/epd-visualization/components/public_api"
+      ],
+      "@spartacus/epd-visualization/core": [
+        "../../integration-libs/epd-visualization/core/public_api"
+      ],
+      "@spartacus/epd-visualization/epd-visualization-api": [
+        "../../integration-libs/epd-visualization/epd-visualization-api/public_api"
+      ],
+      "@spartacus/epd-visualization": [
+        "../../integration-libs/epd-visualization/public_api"
+      ],
+      "@spartacus/epd-visualization/root": [
+        "../../integration-libs/epd-visualization/root/public_api"
+      ],
+      "@spartacus/s4om/assets": [
+        "../../integration-libs/s4om/assets/public_api"
+      ],
+      "@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
+      "@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
+      "@spartacus/segment-refs": [
+        "../../integration-libs/segment-refs/public_api"
+      ],
+      "@spartacus/segment-refs/root": [
+        "../../integration-libs/segment-refs/root/public_api"
+      ],
+      "@spartacus/assets": ["../../projects/assets/src/public_api"],
+      "@spartacus/core": ["../../projects/core/public_api"],
+      "@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
+    }
+  },
+  "include": ["schematics/**/*.ts"],
+  "exclude": ["schematics/*/files/**/*", "schematics/**/*_spec.ts"]
+}
diff --git a/feature-libs/pdf-invoices/tsconfig.spec.json b/feature-libs/pdf-invoices/tsconfig.spec.json
new file mode 100644
index 00000000000..9f660f8b0a1
--- /dev/null
+++ b/feature-libs/pdf-invoices/tsconfig.spec.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/spec",
+    "strict": false,
+    "module": "es2020",
+    "types": ["jasmine", "node"],
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true
+  },
+  "files": ["test.ts"],
+  "include": ["**/*.spec.ts", "**/*.d.ts"]
+}
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index a6671c2be12..c911138c2e9 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -275,6 +275,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/requested-delivery-date/tsconfig.lib.json b/feature-libs/requested-delivery-date/tsconfig.lib.json
index 78d0becdbd7..6aa05ab39be 100644
--- a/feature-libs/requested-delivery-date/tsconfig.lib.json
+++ b/feature-libs/requested-delivery-date/tsconfig.lib.json
@@ -64,7 +64,6 @@
       "@spartacus/cart/wish-list/core": ["dist/cart/wish-list/core"],
       "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
-      "@spartacus/core": ["dist/core"],
       "@spartacus/checkout/b2b/assets": ["dist/checkout/b2b/assets"],
       "@spartacus/checkout/b2b/components": ["dist/checkout/b2b/components"],
       "@spartacus/checkout/b2b/core": ["dist/checkout/b2b/core"],
@@ -90,6 +89,7 @@
       "@spartacus/checkout/scheduled-replenishment/root": [
         "dist/checkout/scheduled-replenishment/root"
       ],
+      "@spartacus/core": ["dist/core"],
       "@spartacus/order/assets": ["dist/order/assets"],
       "@spartacus/order/components": ["dist/order/components"],
       "@spartacus/order/core": ["dist/order/core"],
diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
index bc2b2041ba7..125e28e522d 100644
--- a/feature-libs/requested-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -272,6 +272,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index 0fbbe795fcc..4749caf728c 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/s4om/README.md b/integration-libs/s4om/README.md
index 1b3443de9f4..0640be5488a 100644
--- a/integration-libs/s4om/README.md
+++ b/integration-libs/s4om/README.md
@@ -4,8 +4,11 @@ This library provides S/4 HANA Synchronous Order Management capabilities to Spar
 
 
 The features supported are:
-- scheduleLines: Display a table of scheduled delivery dates and product quantity for each item in the B2B Cart using information from S/4 HANA system.
+- Schedule Lines: Display a table of scheduled delivery dates and product quantity for each item in the B2B Cart using information from S/4 HANA system.
 
 
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 13.2.0.
+- Requested Delivery Date: Allow customers to provide a delivery date for which the item would be needed. The minimum date would be fetched from the S/4 HANA system and used along with the Order.
+
+- PDF Invoices: View invoices for their orders and download PDF invoices using `Invoices` APIs. When the user selects an invoice, the backend returns a byte array, which is converted to PDF and downloaded.
+
 
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index d0ddb7f36b9..505231bebd5 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -25,6 +25,7 @@
     "@angular/core": "^15.2.4",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
+    "@spartacus/pdf-invoices": "6.3.0-1",
     "@spartacus/requested-delivery-date": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
diff --git a/integration-libs/s4om/root/s4om-root.module.ts b/integration-libs/s4om/root/s4om-root.module.ts
index a176a2349d7..be62fe178f1 100644
--- a/integration-libs/s4om/root/s4om-root.module.ts
+++ b/integration-libs/s4om/root/s4om-root.module.ts
@@ -6,6 +6,7 @@
 
 import { NgModule } from '@angular/core';
 import { CartOutlets } from '@spartacus/cart/base/root';
+import { PDFInvoicesComponentsModule } from '@spartacus/pdf-invoices/components';
 import { RequestedDeliveryDateComponentsModule } from '@spartacus/requested-delivery-date/root';
 import { OutletPosition, provideOutlet } from '@spartacus/storefront';
 import { ScheduleLinesComponent } from './components/schedule-lines/schedule-lines.component';
@@ -15,6 +16,7 @@ import { ScheduleLinesModule } from './components/schedule-lines/schedule-lines.
   imports: [
     ScheduleLinesModule,
     RequestedDeliveryDateComponentsModule, //Adding dependency with Requested Delivery Date so that the library gets installed along with S4OM
+    PDFInvoicesComponentsModule, //Adding dependency with PDF Invoices so that the library gets installed along with S4OM
   ],
   providers: [
     provideOutlet({
diff --git a/integration-libs/s4om/schematics/add-s4om/schema.json b/integration-libs/s4om/schematics/add-s4om/schema.json
index 19c66cb018b..b9e70316943 100644
--- a/integration-libs/s4om/schematics/add-s4om/schema.json
+++ b/integration-libs/s4om/schematics/add-s4om/schema.json
@@ -33,6 +33,10 @@
           {
             "value": "Requested-Delivery-Date",
             "label": "Requested Delivery Date"
+          },
+          {
+            "value": "PDF-Invoices",
+            "label": "PDF Invoices"
           }
         ]
       }
diff --git a/integration-libs/s4om/tsconfig.lib.json b/integration-libs/s4om/tsconfig.lib.json
index 1c370c142e5..9e5cf8bd8b1 100644
--- a/integration-libs/s4om/tsconfig.lib.json
+++ b/integration-libs/s4om/tsconfig.lib.json
@@ -61,7 +61,6 @@
       "@spartacus/cart/wish-list": ["dist/cart/wish-list"],
       "@spartacus/cart/wish-list/root": ["dist/cart/wish-list/root"],
       "@spartacus/core": ["dist/core"],
-      "@spartacus/storefront": ["dist/storefrontlib"],
       "@spartacus/requested-delivery-date/assets": [
         "dist/requested-delivery-date/assets"
       ],
@@ -75,6 +74,7 @@
       "@spartacus/requested-delivery-date/root": [
         "dist/requested-delivery-date/root"
       ],
+      "@spartacus/storefront": ["dist/storefrontlib"],
       "@spartacus/user/account/assets": ["dist/user/account/assets"],
       "@spartacus/user/account/components": ["dist/user/account/components"],
       "@spartacus/user/account/core": ["dist/user/account/core"],
@@ -118,7 +118,13 @@
       "@spartacus/order/core": ["dist/order/core"],
       "@spartacus/order": ["dist/order"],
       "@spartacus/order/occ": ["dist/order/occ"],
-      "@spartacus/order/root": ["dist/order/root"]
+      "@spartacus/order/root": ["dist/order/root"],
+      "@spartacus/pdf-invoices/assets": ["dist/pdf-invoices/assets"],
+      "@spartacus/pdf-invoices/components": ["dist/pdf-invoices/components"],
+      "@spartacus/pdf-invoices/core": ["dist/pdf-invoices/core"],
+      "@spartacus/pdf-invoices": ["dist/pdf-invoices"],
+      "@spartacus/pdf-invoices/occ": ["dist/pdf-invoices/occ"],
+      "@spartacus/pdf-invoices/root": ["dist/pdf-invoices/root"]
     },
     "resolveJsonModule": true,
     "esModuleInterop": true
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index 1652ce2b588..f737af1f63b 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/package.json b/package.json
index cf194e346ae..2997943cf75 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,9 @@
     "build:digital-payments": "npm --prefix integration-libs/digital-payments run build:schematics && nx build digital-payments --configuration production",
     "build:epd-visualization": "npm --prefix integration-libs/epd-visualization run build:schematics && nx build epd-visualization --configuration production",
     "build:order": "npm --prefix feature-libs/order run build:schematics && nx build order --configuration production",
-    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:product npm:build:product-configurator npm:build:requested-delivery-date npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
+    "build:libs": "nx build core --configuration production && nx build storefrontlib --configuration production && concurrently --kill-others-on-fail npm:build:schematics npm:build:user && npm run build:cart && npm run build:order && concurrently --kill-others-on-fail npm:build:checkout npm:build:asm npm:build:tracking npm:build:customer-ticketing && concurrently --kill-others-on-fail npm:build:organization npm:build:pdf-invoices npm:build:product npm:build:product-configurator npm:build:requested-delivery-date npm:build:storefinder && concurrently --kill-others-on-fail npm:build:smartedit npm:build:qualtrics npm:build:assets npm:build:cds npm:build:cdc npm:build:digital-payments npm:build:epd-visualization npm:build:s4om npm:build:segment-refs npm:build:pickup-in-store && npm run build:setup",
     "build:organization": "npm --prefix feature-libs/organization run build:schematics && nx build organization --configuration production",
+    "build:pdf-invoices": "npm --prefix feature-libs/pdf-invoices run build:schematics && nx build pdf-invoices --configuration production",
     "build:pickup-in-store": "npm --prefix feature-libs/pickup-in-store run build:schematics && nx build pickup-in-store --configuration production",
     "build:product": "npm --prefix feature-libs/product run build:schematics && nx build product --configuration production",
     "build:product-configurator": "npm --prefix feature-libs/product-configurator run build:schematics && nx build product-configurator --configuration production",
@@ -82,7 +83,7 @@
     "start:prod": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx serve storefrontapp --configuration=production",
     "start:pwa": "cd ./dist/storefrontapp/ && http-server --silent --proxy http://localhost:4200? -p 4200",
     "test": "nx test",
-    "test:libs": "concurrently \"nx test core --code-coverage\" \"nx test storefrontlib --code-coverage\" \"nx test cart --code-coverage\" \"nx test organization --code-coverage\" \"nx test storefinder --code-coverage\" \"nx test smartedit --code-coverage\" \"nx test asm --code-coverage\" \"nx test qualtrics --code-coverage\" \"nx test product --code-coverage\" \"nx test product-configurator --code-coverage\" \"nx test customer-ticketing --code-coverage\" \"nx test cdc --code-coverage\" \"nx test setup --code-coverage\" \"nx test checkout --code-coverage\" \"nx test order --code-coverage\" \"nx test digital-payments --code-coverage\" \"nx test epd-visualization --code-coverage\" \"nx test pickup-in-store --code-coverage\" \"nx test s4om --code-coverage\" \"nx test requested-delivery-date --code-coverage\"",
+    "test:libs": "concurrently \"nx test core --code-coverage\" \"nx test storefrontlib --code-coverage\" \"nx test cart --code-coverage\" \"nx test organization --code-coverage\" \"nx test storefinder --code-coverage\" \"nx test smartedit --code-coverage\" \"nx test asm --code-coverage\" \"nx test qualtrics --code-coverage\" \"nx test product --code-coverage\" \"nx test product-configurator --code-coverage\" \"nx test customer-ticketing --code-coverage\" \"nx test cdc --code-coverage\" \"nx test setup --code-coverage\" \"nx test checkout --code-coverage\" \"nx test order --code-coverage\" \"nx test digital-payments --code-coverage\" \"nx test epd-visualization --code-coverage\" \"nx test pickup-in-store --code-coverage\" \"nx test s4om --code-coverage\" \"nx test requested-delivery-date --code-coverage\" \"nx test pdf-invoices --code-coverage\"",
     "test:storefront:lib": "nx test storefrontlib --source-map --code-coverage",
     "dev:ssr": "env-cmd --no-override -e dev,b2c,$SPA_ENV cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nx run storefrontapp:serve-ssr",
     "serve:ssr": "node dist/storefrontapp-server/main.js",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 69b9829e9b0..e2cde80e9ed 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -52,6 +52,7 @@
       "@spartacus/checkout",
       "@spartacus/order",
       "@spartacus/organization",
+      "@spartacus/pdf-invoices",
       "@spartacus/product",
       "@spartacus/product-configurator",
       "@spartacus/qualtrics",
diff --git a/projects/schematics/src/add-spartacus/schema.json b/projects/schematics/src/add-spartacus/schema.json
index f115637f01f..353cb657729 100644
--- a/projects/schematics/src/add-spartacus/schema.json
+++ b/projects/schematics/src/add-spartacus/schema.json
@@ -39,6 +39,7 @@
           "Bulk-Pricing",
           "Image-Zoom",
           "Future-Stock",
+          "PDF-Invoices",
           "Product-Variants",
           "VC-Configurator",
           "Textfield-Configurator",
@@ -183,6 +184,10 @@
             "value": "CPQ-Configurator",
             "label": "Product Configurator - CPQ Configurator (b2b feature)"
           },
+          {
+            "value": "PDF-Invoices",
+            "label": "PDF Invoices"
+          },
           {
             "value": "Qualtrics",
             "label": "Qualtrics"
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index aecd2065dfd..acfb2abaf1e 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -152,6 +152,17 @@
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
+  "@spartacus/pdf-invoices": {
+    "@angular-devkit/schematics": "^15.2.4",
+    "@angular/common": "^15.2.4",
+    "@angular/core": "^15.2.4",
+    "@angular/forms": "^15.2.4",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/styles": "6.3.0-1",
+    "rxjs": "^6.6.0"
+  },
   "@spartacus/pickup-in-store": {
     "@angular-devkit/schematics": "^15.2.4",
     "@angular/common": "^15.2.4",
@@ -336,6 +347,7 @@
     "@angular/core": "^15.2.4",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
+    "@spartacus/pdf-invoices": "6.3.0-1",
     "@spartacus/requested-delivery-date": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/s4om-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/s4om-schematics-config.ts
index c6231296800..b6466041d5e 100644
--- a/projects/schematics/src/shared/lib-configs/integration-libs/s4om-schematics-config.ts
+++ b/projects/schematics/src/shared/lib-configs/integration-libs/s4om-schematics-config.ts
@@ -7,6 +7,8 @@
 import {
   CART_BASE_FEATURE_NAME,
   ORDER_FEATURE_NAME,
+  PDF_INVOICES_FEATURE_NAME,
+  REQUESTED_DELIVERY_DATE_FEATURE_NAME,
   S4OM_FEATURE_NAME,
   SPARTACUS_S4OM,
   SPARTACUS_S4OM_ASSETS,
@@ -48,5 +50,10 @@ export const S4OM_SCHEMATICS_CONFIG: SchematicConfig = {
     chunks: S4OM_TRANSLATION_CHUNKS_CONFIG,
     importPath: SPARTACUS_S4OM_ASSETS,
   },
-  dependencyFeatures: [CART_BASE_FEATURE_NAME, ORDER_FEATURE_NAME],
+  dependencyFeatures: [
+    CART_BASE_FEATURE_NAME,
+    ORDER_FEATURE_NAME,
+    REQUESTED_DELIVERY_DATE_FEATURE_NAME,
+    PDF_INVOICES_FEATURE_NAME,
+  ],
 };
diff --git a/projects/schematics/src/shared/lib-configs/pdf-invoices-schematics-config.ts b/projects/schematics/src/shared/lib-configs/pdf-invoices-schematics-config.ts
new file mode 100644
index 00000000000..7e75d23cd1c
--- /dev/null
+++ b/projects/schematics/src/shared/lib-configs/pdf-invoices-schematics-config.ts
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2022 SAP Spartacus team <spartacus-team@sap.com>
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  PDF_INVOICES_FEATURE_NAME,
+  SPARTACUS_PDF_INVOICES,
+  SPARTACUS_PDF_INVOICES_ASSETS,
+  SPARTACUS_PDF_INVOICES_ROOT,
+  SPARTACUS_REQUESTED_DELIVERY_DATE,
+  USER_PROFILE_FEATURE_NAME,
+} from '../libs-constants';
+import { SchematicConfig } from '../utils/lib-utils';
+
+export const PDF_INVOICES_FEATURE_NAME_CONSTANT = 'PDF_INVOICES_FEATURE';
+export const PDF_INVOICES_FOLDER_NAME = 'pdf-invoices';
+export const PDF_INVOICES_TRANSLATIONS = 'pdfInvoicesTranslations';
+export const PDF_INVOICES_TRANSLATION_CHUNKS_CONFIG =
+  'pdfInvoicesTranslationChunksConfig';
+export const PDF_INVOICES_ROOT_MODULE = 'PDFInvoicesRootModule';
+export const PDF_INVOICES_MODULE = 'PDFInvoicesModule';
+
+export const PDF_INVOICES_SCSS_FILE_NAME = 'pdf-invoices.scss';
+
+export const PDF_INVOICES_SCHEMATICS_CONFIG: SchematicConfig = {
+  library: {
+    featureName: PDF_INVOICES_FEATURE_NAME,
+    mainScope: SPARTACUS_REQUESTED_DELIVERY_DATE,
+  },
+  folderName: PDF_INVOICES_FOLDER_NAME,
+  moduleName: PDF_INVOICES_MODULE,
+  featureModule: {
+    name: PDF_INVOICES_MODULE,
+    importPath: SPARTACUS_PDF_INVOICES,
+  },
+  rootModule: {
+    name: PDF_INVOICES_ROOT_MODULE,
+    importPath: SPARTACUS_PDF_INVOICES_ROOT,
+  },
+  styles: {
+    scssFileName: PDF_INVOICES_SCSS_FILE_NAME,
+    importStyle: SPARTACUS_PDF_INVOICES,
+  },
+  lazyLoadingChunk: {
+    moduleSpecifier: SPARTACUS_PDF_INVOICES_ROOT,
+    namedImports: [PDF_INVOICES_FEATURE_NAME_CONSTANT],
+  },
+  i18n: {
+    resources: PDF_INVOICES_TRANSLATIONS,
+    chunks: PDF_INVOICES_TRANSLATION_CHUNKS_CONFIG,
+    importPath: SPARTACUS_PDF_INVOICES_ASSETS,
+  },
+  dependencyFeatures: [USER_PROFILE_FEATURE_NAME],
+};
diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
index 39faa1c6383..89e48f70e69 100644
--- a/projects/schematics/src/shared/libs-constants.ts
+++ b/projects/schematics/src/shared/libs-constants.ts
@@ -131,6 +131,10 @@ export const SPARTACUS_FUTURE_STOCK = `@spartacus/product/future-stock`;
 export const SPARTACUS_FUTURE_STOCK_ROOT = `@spartacus/product/future-stock/root`;
 export const SPARTACUS_FUTURE_STOCK_ASSETS = `@spartacus/product/future-stock/assets`;
 
+export const SPARTACUS_PDF_INVOICES = `@spartacus/pdf-invoices`;
+export const SPARTACUS_PDF_INVOICES_ROOT = `@spartacus/pdf-invoices/root`;
+export const SPARTACUS_PDF_INVOICES_ASSETS = `@spartacus/pdf-invoices/assets`;
+
 export const SPARTACUS_PRODUCT_CONFIGURATOR = `@spartacus/product-configurator`;
 export const SPARTACUS_PRODUCT_CONFIGURATOR_COMMON = `@spartacus/product-configurator/common`;
 export const SPARTACUS_PRODUCT_CONFIGURATOR_ASSETS = `@spartacus/product-configurator/common/assets`;
@@ -261,6 +265,8 @@ export const TRACKING_PERSONALIZATION_FEATURE_NAME = 'Personalization';
 export const TRACKING_TMS_GTM_FEATURE_NAME = 'TMS-GTM';
 export const TRACKING_TMS_AEP_FEATURE_NAME = 'TMS-AEPL';
 
+export const PDF_INVOICES_FEATURE_NAME = 'PDF-Invoices';
+
 export const USER_ACCOUNT_FEATURE_NAME = 'User-Account';
 export const USER_PROFILE_FEATURE_NAME = 'User-Profile';
 
diff --git a/projects/schematics/src/shared/schematics-config-mappings.ts b/projects/schematics/src/shared/schematics-config-mappings.ts
index 0cb429e3a52..83dd318ac7d 100644
--- a/projects/schematics/src/shared/schematics-config-mappings.ts
+++ b/projects/schematics/src/shared/schematics-config-mappings.ts
@@ -33,6 +33,7 @@ import {
   ORGANIZATION_UNIT_ORDER_SCHEMATICS_CONFIG,
   ORGANIZATION_USER_REGISTRATION_SCHEMATICS_CONFIG,
 } from './lib-configs/organization-schematics-config';
+import { PDF_INVOICES_SCHEMATICS_CONFIG } from './lib-configs/pdf-invoices-schematics-config';
 import { PICKUP_IN_STORE_SCHEMATICS_CONFIG } from './lib-configs/pickup-in-store-schematics-config';
 import {
   PRODUCT_CONFIGURATOR_CPQ_SCHEMATICS_CONFIG,
@@ -97,6 +98,8 @@ export const SCHEMATICS_CONFIGS: SchematicConfig[] = [
   PRODUCT_VARIANTS_SCHEMATICS_CONFIG,
   PRODUCT_FUTURE_STOCK_SCHEMATICS_CONFIG,
 
+  PDF_INVOICES_SCHEMATICS_CONFIG,
+
   QUALTRICS_SCHEMATICS_CONFIG,
 
   REQUESTED_DELIVERY_DATE_SCHEMATICS_CONFIG,
diff --git a/projects/schematics/src/shared/utils/graph-utils_spec.ts b/projects/schematics/src/shared/utils/graph-utils_spec.ts
index deaa8f366e0..a11097ec6d2 100644
--- a/projects/schematics/src/shared/utils/graph-utils_spec.ts
+++ b/projects/schematics/src/shared/utils/graph-utils_spec.ts
@@ -11,6 +11,7 @@ import {
   SPARTACUS_EPD_VISUALIZATION,
   SPARTACUS_ORDER,
   SPARTACUS_ORGANIZATION,
+  SPARTACUS_PDF_INVOICES,
   SPARTACUS_PICKUP_IN_STORE,
   SPARTACUS_PRODUCT,
   SPARTACUS_PRODUCT_CONFIGURATOR,
@@ -131,6 +132,7 @@ describe('Graph utils', () => {
         SPARTACUS_ORDER,
         SPARTACUS_CHECKOUT,
         SPARTACUS_REQUESTED_DELIVERY_DATE,
+        SPARTACUS_PDF_INVOICES,
         SPARTACUS_TRACKING,
         SPARTACUS_ORGANIZATION,
         SPARTACUS_ASM,
@@ -169,6 +171,8 @@ describe('Graph utils', () => {
           "Personalization",
           "TMS-AEPL",
           "TMS-GTM",
+          "PDF-Invoices",
+          "Requested-Delivery-Date",
           "Organization-User-Registration",
           "Administration",
           "Account-Summary",
@@ -186,7 +190,6 @@ describe('Graph utils', () => {
           "CDC",
           "Customer-Ticketing",
           "SmartEdit",
-          "Requested-Delivery-Date",
           "Qualtrics",
           "Future-Stock",
           "Product-Variants",
diff --git a/projects/schematics/src/shared/utils/test-utils.ts b/projects/schematics/src/shared/utils/test-utils.ts
index f6cdf7aedf3..7d2117870b7 100644
--- a/projects/schematics/src/shared/utils/test-utils.ts
+++ b/projects/schematics/src/shared/utils/test-utils.ts
@@ -55,6 +55,8 @@ export const organizationUnitOrderFeatureModulePath =
   'src/app/spartacus/features/organization/organization-unit-order-feature.module.ts';
 export const organizationAccountSummaryFeatureModulePath =
   'src/app/spartacus/features/organization/organization-account-summary-feature.module.ts';
+export const pdfInvoicesFeatureModulePath =
+  'src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts';
 export const productBulkPricingFeatureModulePath =
   'src/app/spartacus/features/product/product-bulk-pricing-feature.module.ts';
 export const productImageZoomFeatureModulePath =
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/pdf-invoices/pdf-invoices.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/pdf-invoices/pdf-invoices.e2e.cy.ts
new file mode 100644
index 00000000000..8f49844f2bc
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/pdf-invoices/pdf-invoices.e2e.cy.ts
@@ -0,0 +1,142 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  interceptOrdersEndpoint,
+  waitForResponse,
+} from '../../../helpers/order-history';
+import * as pdfInvoicesHelper from '../../../helpers/vendor/pdf-invoices/pdf-invoices';
+import * as s4Helper from '../../../helpers/vendor/s4om/s4om';
+import {
+  ORDER_REQUEST_ENDPOINT,
+  POWERTOOLS_BASESITE,
+  USER_REQUEST_ENDPOINT,
+} from '../../../sample-data/b2b-checkout';
+import { isolateTestsBefore } from '../../../support/utils/test-isolation';
+
+describe('PDF Invoices', { testIsolation: false }, () => {
+  isolateTestsBefore();
+  before(() => {
+    cy.window().then((win) => win.sessionStorage.clear());
+    Cypress.env('BASE_SITE', POWERTOOLS_BASESITE);
+    Cypress.env('OCC_PREFIX_USER_ENDPOINT', USER_REQUEST_ENDPOINT);
+    Cypress.env('OCC_PREFIX_ORDER_ENDPOINT', ORDER_REQUEST_ENDPOINT);
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+
+  describe('PDF Invoices in Order History', () => {
+    it('should be able to login as a b2b user (CXINT-1851)', () => {
+      s4Helper.loginS4OMB2bUser();
+    });
+
+    it('should be able to view order in order history with PO# (CXINT-1851)', () => {
+      cy.visit('/my-account/orders');
+      const ordersAlias = interceptOrdersEndpoint();
+      waitForResponse(ordersAlias);
+
+      const pdfInvoicesOrderId = pdfInvoicesHelper.pdfInvoicesPastOrderId;
+      cy.wrap(pdfInvoicesOrderId).should('not.be.null');
+      s4Helper.findRowInOrderHistoryTable(
+        ordersAlias,
+        pdfInvoicesOrderId,
+        pdfInvoicesHelper.poNumber
+      );
+    });
+
+    it('should be able to view a past order detail in order detail page with requested delivery date information (CXINT-1851)', () => {
+      cy.intercept({
+        method: 'GET',
+        pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          'BASE_SITE'
+        )}/users/current/orders/*`,
+      }).as('getOrderDetail');
+
+      cy.intercept({
+        method: 'GET',
+        path: `**/users/current/orders/**/invoices?**`,
+      }).as('getInvoices');
+
+      const pdfInvoicesOrderId = pdfInvoicesHelper.pdfInvoicesPastOrderId;
+      cy.visit('/my-account/order/' + pdfInvoicesOrderId);
+      cy.wait('@getOrderDetail');
+      cy.wait('@getInvoices').its('response.statusCode').should('eq', 200);
+
+      s4Helper.reviewB2bOrderDetail(
+        pdfInvoicesHelper.pdfInvoicesB2bAccountShipToUser,
+        pdfInvoicesHelper.pdfInvoicesProduct,
+        pdfInvoicesHelper.cartWithB2bProductAndStandardShipping,
+        true,
+        null,
+        pdfInvoicesHelper.poNumber,
+        s4Helper.s4omCostCenter,
+        s4Helper.s4omB2BUnit,
+        false
+      );
+
+      pdfInvoicesHelper.verifyPDFInvoicesOrderDetailPage();
+    });
+
+    it('should be able to traverse pages (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTablePagination();
+    });
+
+    it('should be able to sort invoices by date ascending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByDateAscending();
+    });
+
+    it('should be able to sort invoices by date descending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByDateDescending();
+    });
+
+    it('should be able to sort invoices by net amount ascending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByNetAmountAscending();
+    });
+
+    it('should be able to sort invoices by net amount descending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByNetAmountDescending();
+    });
+
+    it('should be able to sort invoices by total amount ascending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByTotalAmountAscending();
+    });
+
+    it('should be able to sort invoices by total amount descending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByTotalAmountDescending();
+    });
+
+    it('should be able to sort invoices by Invoice Number ascending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByInvoiceNumAscending();
+    });
+
+    it('should be able to sort invoices by Invoice Number descending (CXINT-1851)', () => {
+      pdfInvoicesHelper.verifyInvoicesTableSortByInvoiceNumDescending();
+    });
+
+    it('should be able to download first invoice (CXINT-1851)', () => {
+      cy.intercept({
+        method: 'GET',
+        path: `**/users/current/orders/**/invoices?**`,
+      }).as('getInvoices');
+
+      const pdfInvoicesOrderId = pdfInvoicesHelper.pdfInvoicesPastOrderId;
+      cy.visit('/my-account/order/' + pdfInvoicesOrderId);
+      cy.wait('@getInvoices').its('response.statusCode').should('eq', 200);
+
+      pdfInvoicesHelper.downloadFirstInvoice();
+    });
+
+    it('should be able to download first invoice (CXINT-1851)', () => {
+      pdfInvoicesHelper.downloadLastInvoiceAcrossPages();
+    });
+  });
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
index d430d0c141a..4f591da89a3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/requested-delivery-date/requested-delivery-date.e2e.cy.ts
@@ -50,45 +50,45 @@ describe('Requested Delivery Date', { testIsolation: false }, () => {
   });
 
   describe('Requested Delivery Date in Checkout Flow', () => {
-    it('should be able to login as a b2b user', () => {
+    it('should be able to login as a b2b user (CXINT-1850)', () => {
       s4Helper.loginS4OMB2bUser();
     });
 
-    it('should add a S4 HANA product (TG-11) to cart', () => {
+    it('should add a S4 HANA product (TG-11) to cart (CXINT-1850)', () => {
       s4Helper.resetCart(); //clear the cart
       s4Helper.addB2bS4ProductToCart(); //Ensure that the cart has only 1 S4 product
     });
 
-    it('should proceed to checkout and select Account payment type', () => {
+    it('should proceed to checkout and select Account payment type (CXINT-1850)', () => {
       s4Helper.proceedtoCheckOutS4Product();
       b2bCheckout.enterPONumber(rddHelper.poNumber);
       b2bCheckout.selectAccountPayment();
     });
 
-    it('should select shipping address', () => {
+    it('should select shipping address (CXINT-1850)', () => {
       s4Helper.selectS4OMAccountShippingAddress();
     });
 
-    it('should select delivery mode and display Request Delivery Date form', () => {
+    it('should select delivery mode and display Request Delivery Date form (CXINT-1850)', () => {
       rddHelper.selectAccountDeliveryMode();
     });
 
-    it('should show an error when an invalid delivery date is provided', () => {
+    it('should show an error when an invalid delivery date is provided (CXINT-1850)', () => {
       rddHelper.updateRequestedDeliveryDate('10000-01-01');
       rddHelper.verifyDeliveryDateErrorMessage();
     });
 
-    it('should show an info message when the delivery date is updated', () => {
+    it('should show an info message when the delivery date is updated (CXINT-1850)', () => {
       rddHelper.updateRequestedDeliveryDate(inputDate);
       rddHelper.verifyDeliveryDateInfoMessage();
     });
 
-    it('should review and display the Requested Delivery Date', () => {
+    it('should review and display the Requested Delivery Date (CXINT-1850)', () => {
       rddHelper.proceedToOrderReviewPage();
       rddHelper.verifyRDDOrderReviewPage(formattedDate);
     });
 
-    it('should route back to the select delivery mode step when the edit button is clicked', () => {
+    it('should route back to the select delivery mode step when the edit button is clicked (CXINT-1850)', () => {
       rddHelper.editDeliveryMethodOrderReviewPage();
       rddHelper.proceedToOrderReviewPage();
     });
@@ -108,7 +108,7 @@ describe('Requested Delivery Date', { testIsolation: false }, () => {
       b2bCheckout.placeOrder('/order-confirmation');
     });
 
-    it('should display order confirmation summary page with Requested delivery date', () => {
+    it('should display order confirmation summary page with Requested delivery date (CXINT-1850)', () => {
       s4Helper.reviewB2bOrderDetail(
         s4Helper.s4omB2bAccountShipToUser,
         s4Helper.s4omProduct,
@@ -125,7 +125,7 @@ describe('Requested Delivery Date', { testIsolation: false }, () => {
   });
 
   describe('Requested Delivery Date in Order History', () => {
-    it('should be able to view order in order history with PO# and Cost center', () => {
+    it('should be able to view order in order history with PO# and Cost center (CXINT-1850)', () => {
       cy.visit('/my-account/orders');
       const ordersAlias = interceptOrdersEndpoint();
       waitForResponse(ordersAlias);
@@ -139,7 +139,7 @@ describe('Requested Delivery Date', { testIsolation: false }, () => {
       );
     });
 
-    it('should be able to view a past order detail in order detail page with requested delivery date information', () => {
+    it('should be able to view a past order detail in order detail page with requested delivery date information (CXINT-1850)', () => {
       cy.intercept({
         method: 'GET',
         pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
index 18547e65088..e4eaae27eed 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/s4om/s4om-schedule-lines.e2e.cy.ts
@@ -38,39 +38,39 @@ describe('S4HANA Order management', { testIsolation: false }, () => {
   });
 
   describe('Schedule Lines in Checkout Flow', () => {
-    it('should be able to login as a b2b user', () => {
+    it('should be able to login as a b2b user (CXINT-472)', () => {
       s4omHelper.loginS4OMB2bUser();
     });
 
-    it('should add a S4 HANA product (TG-11) to cart', () => {
+    it('should add a S4 HANA product (TG-11) to cart (CXINT-472)', () => {
       s4omHelper.resetCart(); //clear the cart
       s4omHelper.addB2bS4ProductToCart(); //Ensure that the cart has only 1 S4OM product
     });
 
-    it('should show S4 HANA schedule lines in the add to cart popup', () => {
+    it('should show S4 HANA schedule lines in the add to cart popup (CXINT-472)', () => {
       s4omHelper.verifyScheduleLineInfo();
     });
 
-    it('should show S4 HANA schedule lines in the Cart page', () => {
+    it('should show S4 HANA schedule lines in the Cart page (CXINT-472)', () => {
       s4omHelper.goToCart();
       s4omHelper.verifyScheduleLineInfo();
     });
 
-    it('should proceed to checkout and select Account payment type', () => {
+    it('should proceed to checkout and select Account payment type (CXINT-472)', () => {
       s4omHelper.proceedtoCheckOutS4Product();
       b2bCheckout.enterPONumber();
       b2bCheckout.selectAccountPayment();
     });
 
-    it('should select shipping address', () => {
+    it('should select shipping address (CXINT-472)', () => {
       s4omHelper.selectS4OMAccountShippingAddress();
     });
 
-    it('should select delivery mode', () => {
+    it('should select delivery mode (CXINT-472)', () => {
       s4omHelper.selectAccountDeliveryMode();
     });
 
-    it('should review and place order', () => {
+    it('should review and place order (CXINT-472)', () => {
       b2bCheckout.reviewB2bReviewOrderPage(
         b2bAccountShipToUser,
         s4omHelper.cartWithS4OMB2bProductAndPremiumShipping,
@@ -82,7 +82,7 @@ describe('S4HANA Order management', { testIsolation: false }, () => {
       b2bCheckout.placeOrder('/order-confirmation');
     });
 
-    it('should display order confirmation summary page with delivery schedule lines', () => {
+    it('should display order confirmation summary page with delivery schedule lines (CXINT-472)', () => {
       s4omHelper.reviewB2bOrderDetail(
         s4omHelper.s4omB2bAccountShipToUser,
         s4omHelper.s4omProduct,
@@ -98,7 +98,7 @@ describe('S4HANA Order management', { testIsolation: false }, () => {
     });
   });
   describe('Schedule lines in Order History', () => {
-    it('should be able to view order in order history with PO# and Cost center', () => {
+    it('should be able to view order in order history with PO# and Cost center (CXINT-472)', () => {
       cy.visit('/my-account/orders');
       const ordersAlias = interceptOrdersEndpoint();
       waitForResponse(ordersAlias);
@@ -113,7 +113,7 @@ describe('S4HANA Order management', { testIsolation: false }, () => {
       );
     });
 
-    it('should be able to view a past order detail in order detail page with schedule line delivery information', () => {
+    it('should be able to view a past order detail in order detail page with schedule line delivery information (CXINT-472)', () => {
       cy.intercept({
         method: 'GET',
         pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/pdf-invoices/pdf-invoices.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/pdf-invoices/pdf-invoices.ts
new file mode 100644
index 00000000000..d0156b8cd65
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/vendor/pdf-invoices/pdf-invoices.ts
@@ -0,0 +1,474 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  SampleCartProduct,
+  SampleProduct,
+  SampleUser,
+} from '../../../sample-data/checkout-flow';
+
+export const pdfInvoicesPastOrderId: string = '200000';
+export const poNumber: string = '111';
+
+export const pdfInvoicesB2bAccountShipToUser: SampleUser = {
+  email: 'james.weber@harvestlive.inc',
+  password: 'welcome',
+  fullName: 'Stefan Reviewer',
+  address: {
+    city: 'Washington, 200000',
+    line1: 'Address line0, Washington',
+  },
+};
+
+export const cartWithB2bProductAndStandardShipping: SampleCartProduct = {
+  estimatedShipping: '$5.26',
+  total: '$2,094.97',
+  totalAndShipping: '$2,100.23',
+};
+
+export const pdfInvoicesProduct: SampleProduct = {
+  name: 'Plier Set (3 Pack)',
+  code: '637227',
+};
+
+export const invoiceA = {
+  createdAt: '2023-09-16T18:29:59+0000',
+  invoiceId: '200000a',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceB = {
+  createdAt: '2023-09-01T18:29:59+0000',
+  invoiceId: '200000b',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const invoiceC = {
+  createdAt: '2023-07-21T18:29:59+0000',
+  invoiceId: '200000c',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 398,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 400,
+  },
+};
+
+export const invoiceD = {
+  createdAt: '2023-06-23T18:29:59+0000',
+  invoiceId: '200000d',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceE = {
+  createdAt: '2023-05-12T18:29:59+0000',
+  invoiceId: '200000e',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const invoiceF = {
+  createdAt: '2022-12-11T18:29:59+0000',
+  invoiceId: '200000f',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 398,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 400,
+  },
+};
+
+export const invoiceG = {
+  createdAt: '2022-11-08T04:59:59+0000',
+  invoiceId: '200000g',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceH = {
+  createdAt: '2022-10-06T03:59:59+0000',
+  invoiceId: '200000h',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const invoiceI = {
+  createdAt: '2022-06-05T03:59:59+0000',
+  invoiceId: '200000i',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 398,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 400,
+  },
+};
+
+export const invoiceJ = {
+  createdAt: '2022-05-04T03:59:59+0000',
+  invoiceId: '200000j',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceK = {
+  createdAt: '2021-04-06T03:59:59+0000',
+  invoiceId: '200000k',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const invoiceL = {
+  createdAt: '2021-02-02T04:59:59+0000',
+  invoiceId: '200000l',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 398,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 400,
+  },
+};
+
+export const invoiceM = {
+  createdAt: '2019-11-18T04:59:59+0000',
+  invoiceId: '200000m',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceN = {
+  createdAt: '2018-12-01T04:59:59+0000',
+  invoiceId: '200000n',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const invoiceO = {
+  createdAt: '2017-11-22T04:59:59+0000',
+  invoiceId: '200000o',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 398,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 400,
+  },
+};
+
+export const invoiceP = {
+  createdAt: '2016-11-20T04:59:59+0000',
+  invoiceId: '200000p',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 115,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 117,
+  },
+};
+
+export const invoiceQ = {
+  createdAt: '2016-11-18T04:59:59+0000',
+  invoiceId: '200000q',
+  netAmount: {
+    currencyIso: 'USD',
+    value: 118,
+  },
+  totalAmount: {
+    currencyIso: 'USD',
+    value: 120,
+  },
+};
+
+export const initialInvoicesData = {
+  page1: [invoiceA, invoiceB, invoiceC, invoiceD, invoiceE],
+  page2: [invoiceF, invoiceG, invoiceH, invoiceI, invoiceJ],
+  page3: [invoiceK, invoiceL, invoiceM, invoiceN, invoiceO],
+  page4: [invoiceP, invoiceQ],
+};
+
+export const sortByDateAscInvoicesData = {
+  page1: [invoiceQ, invoiceP, invoiceO, invoiceN, invoiceM],
+  page2: [invoiceL, invoiceK, invoiceJ, invoiceI, invoiceH],
+  page3: [invoiceG, invoiceF, invoiceE, invoiceD, invoiceC],
+  page4: [invoiceB, invoiceA],
+};
+
+export const sortByDateDescInvoicesData = {
+  ...initialInvoicesData,
+};
+
+export const sortByNetAmtAscInvoicesData = {
+  page1: [invoiceP, invoiceA, invoiceD, invoiceJ, invoiceG],
+  page2: [invoiceM, invoiceE, invoiceK, invoiceH, invoiceB],
+  page3: [invoiceN, invoiceQ, invoiceO, invoiceC, invoiceI],
+  page4: [invoiceL, invoiceF],
+};
+
+export const sortByNetAmtDescInvoicesData = {
+  page1: [invoiceO, invoiceC, invoiceI, invoiceL, invoiceF],
+  page2: [invoiceE, invoiceK, invoiceH, invoiceB, invoiceN],
+  page3: [invoiceQ, invoiceP, invoiceA, invoiceD, invoiceJ],
+  page4: [invoiceG, invoiceM],
+};
+
+export const sortByTotalAmtAscInvoicesData = {
+  ...sortByNetAmtAscInvoicesData,
+};
+
+export const sortByTotalAmtDescInvoicesData = {
+  ...sortByNetAmtDescInvoicesData,
+};
+
+export const sortByInvoiceIdAscInvoicesData = {
+  ...initialInvoicesData,
+};
+
+export const sortByInvoiceIdDescInvoicesData = {
+  page1: [invoiceQ, invoiceP, invoiceO, invoiceN, invoiceM],
+  page2: [invoiceL, invoiceK, invoiceJ, invoiceI, invoiceH],
+  page3: [invoiceG, invoiceF, invoiceE, invoiceD, invoiceC],
+  page4: [invoiceB, invoiceA],
+};
+
+export function verifyPDFInvoicesOrderDetailPage() {
+  checkTableData(initialInvoicesData.page1);
+}
+
+export function verifyInvoicesTablePagination(
+  invoicesData = initialInvoicesData
+) {
+  let index = 2;
+
+  for (let invoiceData in invoicesData) {
+    checkTableData(invoicesData[invoiceData]);
+    if (index <= 4) {
+      moveToNextPage(index);
+      index += 1;
+    }
+  }
+}
+export function verifyInvoicesTableDownlodPDF() {
+  throw new Error('Function not implemented.');
+}
+
+export function verifyInvoicesTableSortByDateAscending() {
+  clickOnSortOptions('Date Ascending');
+  verifyInvoicesTablePagination(sortByDateAscInvoicesData);
+}
+
+export function verifyInvoicesTableSortByDateDescending() {
+  clickOnSortOptions('Date Descending');
+  verifyInvoicesTablePagination(sortByDateDescInvoicesData);
+}
+
+export function verifyInvoicesTableSortByInvoiceNumAscending() {
+  clickOnSortOptions('Invoice Number Ascending');
+  verifyInvoicesTablePagination(sortByInvoiceIdAscInvoicesData);
+}
+
+export function verifyInvoicesTableSortByInvoiceNumDescending() {
+  clickOnSortOptions('Invoice Number Descending');
+  verifyInvoicesTablePagination(sortByInvoiceIdDescInvoicesData);
+}
+
+export function verifyInvoicesTableSortByNetAmountAscending() {
+  clickOnSortOptions('Net Amount Ascending');
+  verifyInvoicesTablePagination(sortByNetAmtAscInvoicesData);
+}
+
+export function verifyInvoicesTableSortByNetAmountDescending() {
+  clickOnSortOptions('Net Amount Descending');
+  verifyInvoicesTablePagination(sortByNetAmtDescInvoicesData);
+}
+
+export function verifyInvoicesTableSortByTotalAmountAscending() {
+  clickOnSortOptions('Total Amount Ascending');
+  verifyInvoicesTablePagination(sortByTotalAmtAscInvoicesData);
+}
+
+export function verifyInvoicesTableSortByTotalAmountDescending() {
+  clickOnSortOptions('Total Amount Descending');
+  verifyInvoicesTablePagination(sortByTotalAmtDescInvoicesData);
+}
+
+export function clickOnSortOptions(sortOptionText: string) {
+  cy.get('cx-sorting').click();
+  cy.get('.ng-option').contains(sortOptionText).click();
+}
+
+export function checkTableData(
+  rows: Array<{
+    invoiceId?: string;
+    externalSystemId?: string;
+    createdAt?: string;
+    netAmount?: {
+      currencyIso?: string;
+      value?: number;
+      formattedValue?: string;
+    };
+    totalAmount?: {
+      currencyIso?: string;
+      value?: number;
+      formattedValue?: string;
+    };
+  }>
+) {
+  cy.get('.cx-invoices-list-row').its('length').should('eq', rows.length);
+
+  const columns: Array<{
+    field: string;
+    class: string;
+    occurrence: number;
+  }> = [
+    { field: 'invoiceId', class: 'code', occurrence: 0 },
+    { field: 'createdAt', class: 'date', occurrence: 0 },
+    { field: 'netAmount', class: 'monetary', occurrence: 0 },
+    { field: 'totalAmount', class: 'monetary', occurrence: 1 },
+  ];
+  // For each row, check each column
+  rows.forEach((row, rowNumber) => {
+    columns.forEach((column) => {
+      //Handle amount fields separately
+      if (
+        (column.field === 'netAmount' || column.field === 'totalAmount') &&
+        row[column.field]
+      ) {
+        //handle amount fields
+        if (row[column.field].formattedValue) {
+          cy.get('.cx-invoices-list-row')
+            .eq(rowNumber)
+            .find(`.cx-invoices-list-${column.class}`)
+            .eq(column.occurrence)
+            .contains(row[column.field].formattedValue);
+        } else {
+          cy.get('.cx-invoices-list-row')
+            .eq(rowNumber)
+            .find(`.cx-invoices-list-${column.class}`)
+            .eq(column.occurrence)
+            .contains(
+              `${row[column.field].currencyIso} ${row[column.field].value}`
+            );
+        }
+      } else if (column.field === 'createdAt' && row[column.field]) {
+        //handle date fields
+        cy.get('.cx-invoices-list-row')
+          .eq(rowNumber)
+          .find(`.cx-invoices-list-${column.class}`)
+          .eq(column.occurrence)
+          .contains(formatDateToLongLocaleDate(row[column.field]));
+      } else if (row[column.field]) {
+        //handle other fields
+        cy.get('.cx-invoices-list-row')
+          .eq(rowNumber)
+          .find(`.cx-invoices-list-${column.class}`)
+          .eq(column.occurrence)
+          .contains(row[column.field]);
+      }
+    });
+  });
+}
+
+export function downloadFirstInvoice() {
+  cy.intercept({
+    method: 'GET',
+    path: `**/users/current/**/invoices/**/download**`,
+  }).as('getAttachments');
+  cy.get('.cx-invoices-list-row button').first().click();
+  cy.wait('@getAttachments').its('response.statusCode').should('eq', 200);
+}
+
+export function downloadLastInvoiceAcrossPages() {
+  for (let index = 2; index <= 4; index++) {
+    downloadFirstInvoice();
+    moveToNextPage(index);
+  }
+}
+
+//Format the date into a long date, eg. September 15, 2023
+export function formatDateToLongLocaleDate(date: string) {
+  return new Date(date).toLocaleDateString('en', {
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+  });
+}
+
+export function moveToNextPage(index: number) {
+  cy.get('cx-pagination').findByText(index).first().click();
+}
diff --git a/projects/storefrontapp/project.json b/projects/storefrontapp/project.json
index d52aecd7154..6380eb5e505 100644
--- a/projects/storefrontapp/project.json
+++ b/projects/storefrontapp/project.json
@@ -49,6 +49,10 @@
             "input": "projects/storefrontapp/src/styles/lib-storefinder.scss",
             "bundleName": "storefinder"
           },
+          {
+            "input": "projects/storefrontapp/src/styles/lib-pdf-invoices.scss",
+            "bundleName": "pdf-invoices"
+          },
           {
             "input": "projects/storefrontapp/src/styles/lib-product.scss",
             "bundleName": "product"
diff --git a/projects/storefrontapp/src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts
new file mode 100644
index 00000000000..cfd2e9e6e84
--- /dev/null
+++ b/projects/storefrontapp/src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { CmsConfig, I18nConfig, provideConfig } from '@spartacus/core';
+import {
+  pdfInvoicesTranslationChunksConfig,
+  pdfInvoicesTranslations,
+} from '@spartacus/pdf-invoices/assets';
+import {
+  PDFInvoicesRootModule,
+  PDF_INVOICES_FEATURE,
+} from '@spartacus/pdf-invoices/root';
+
+@NgModule({
+  imports: [PDFInvoicesRootModule],
+  providers: [
+    provideConfig(<CmsConfig>{
+      featureModules: {
+        [PDF_INVOICES_FEATURE]: {
+          module: () =>
+            import('@spartacus/pdf-invoices').then((m) => m.PDFInvoicesModule),
+        },
+      },
+    }),
+    provideConfig(<I18nConfig>{
+      i18n: {
+        resources: pdfInvoicesTranslations,
+        chunks: pdfInvoicesTranslationChunksConfig,
+        fallbackLang: 'en',
+      },
+    }),
+  ],
+})
+export class PDFInvoicesFeatureModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 64a36f93193..d910c0d57fb 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -76,6 +76,7 @@ import { AccountSummaryFeatureModule } from './features/organization/organizatio
 import { AdministrationFeatureModule } from './features/organization/organization-administration-feature.module';
 import { OrderApprovalFeatureModule } from './features/organization/organization-order-approval-feature.module';
 import { UnitOrderFeatureModule } from './features/organization/organization-unit-order-feature.module';
+import { PDFInvoicesFeatureModule } from './features/pdf-invoices/pdf-invoices-feature.module';
 import { PickupInStoreFeatureModule } from './features/pickup-in-store/pickup-in-store-feature.module';
 import { ProductConfiguratorRulebasedFeatureModule } from './features/product-configurator/product-configurator-rulebased-feature.module';
 import { ProductConfiguratorTextfieldFeatureModule } from './features/product-configurator/product-configurator-textfield-feature.module';
@@ -121,6 +122,9 @@ if (environment.digitalPayments) {
 if (environment.epdVisualization) {
   featureModules.push(EpdVisualizationFeatureModule);
 }
+if (environment.pdfInvoices) {
+  featureModules.push(PDFInvoicesFeatureModule);
+}
 if (environment.s4om) {
   featureModules.push(S4OMFeatureModule);
 }
diff --git a/projects/storefrontapp/src/environments/environment.prod.ts b/projects/storefrontapp/src/environments/environment.prod.ts
index 52f3d2609ca..017295dc574 100644
--- a/projects/storefrontapp/src/environments/environment.prod.ts
+++ b/projects/storefrontapp/src/environments/environment.prod.ts
@@ -19,4 +19,5 @@ export const environment: Environment = {
   s4om: buildProcess.env.CX_S4OM,
   segmentRefs: buildProcess.env.CX_SEGMENT_REFS,
   requestedDeliveryDate: buildProcess.env.CX_REQUESTED_DELIVERY_DATE,
+  pdfInvoices: buildProcess.env.CX_PDF_INVOICES,
 };
diff --git a/projects/storefrontapp/src/environments/environment.ts b/projects/storefrontapp/src/environments/environment.ts
index 18033dad14d..0e0579d6f5e 100644
--- a/projects/storefrontapp/src/environments/environment.ts
+++ b/projects/storefrontapp/src/environments/environment.ts
@@ -32,4 +32,5 @@ export const environment: Environment = {
   s4om: buildProcess.env.CX_S4OM ?? false,
   segmentRefs: buildProcess.env.CX_SEGMENT_REFS ?? false,
   requestedDeliveryDate: buildProcess.env.CX_REQUESTED_DELIVERY_DATE ?? false,
+  pdfInvoices: buildProcess.env.CX_PDF_INVOICES ?? false,
 };
diff --git a/projects/storefrontapp/src/environments/models/build.process.env.d.ts b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
index b6e0f46055d..9a5d54a6df2 100644
--- a/projects/storefrontapp/src/environments/models/build.process.env.d.ts
+++ b/projects/storefrontapp/src/environments/models/build.process.env.d.ts
@@ -21,4 +21,5 @@ interface Env {
   CX_S4OM: boolean;
   CX_SEGMENT_REFS: boolean;
   CX_REQUESTED_DELIVERY_DATE: boolean;
+  CX_PDF_INVOICES: boolean;
 }
diff --git a/projects/storefrontapp/src/environments/models/environment.model.ts b/projects/storefrontapp/src/environments/models/environment.model.ts
index 4e6b60e944d..afca9e66a89 100644
--- a/projects/storefrontapp/src/environments/models/environment.model.ts
+++ b/projects/storefrontapp/src/environments/models/environment.model.ts
@@ -17,4 +17,5 @@ export interface Environment {
   s4om: boolean;
   segmentRefs: boolean;
   requestedDeliveryDate: boolean;
+  pdfInvoices: boolean;
 }
diff --git a/projects/storefrontapp/src/styles/lib-pdf-invoices.scss b/projects/storefrontapp/src/styles/lib-pdf-invoices.scss
new file mode 100644
index 00000000000..07362c045b4
--- /dev/null
+++ b/projects/storefrontapp/src/styles/lib-pdf-invoices.scss
@@ -0,0 +1,2 @@
+@import '../styles-config';
+@import '@spartacus/pdf-invoices';
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index e0859d2d97d..b7fbdaf7666 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -178,6 +178,12 @@
       "@spartacus/organization/user-registration/root": [
         "dist/organization/user-registration/root"
       ],
+      "@spartacus/pdf-invoices/assets": ["dist/pdf-invoices/assets"],
+      "@spartacus/pdf-invoices/components": ["dist/pdf-invoices/components"],
+      "@spartacus/pdf-invoices/core": ["dist/pdf-invoices/core"],
+      "@spartacus/pdf-invoices": ["dist/pdf-invoices"],
+      "@spartacus/pdf-invoices/occ": ["dist/pdf-invoices/occ"],
+      "@spartacus/pdf-invoices/root": ["dist/pdf-invoices/root"],
       "@spartacus/pickup-in-store/assets": ["dist/pickup-in-store/assets"],
       "@spartacus/pickup-in-store/components": [
         "dist/pickup-in-store/components"
diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
index 6f403d19066..60f59fa3fb3 100644
--- a/projects/storefrontapp/tsconfig.server.json
+++ b/projects/storefrontapp/tsconfig.server.json
@@ -261,6 +261,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
index 9b61f0ef35b..877a6287450 100644
--- a/projects/storefrontapp/tsconfig.server.prod.json
+++ b/projects/storefrontapp/tsconfig.server.prod.json
@@ -199,6 +199,14 @@
       "@spartacus/organization/user-registration/root": [
         "../../dist/organization/user-registration/root"
       ],
+      "@spartacus/pdf-invoices/assets": ["../../dist/pdf-invoices/assets"],
+      "@spartacus/pdf-invoices/components": [
+        "../../dist/pdf-invoices/components"
+      ],
+      "@spartacus/pdf-invoices/core": ["../../dist/pdf-invoices/core"],
+      "@spartacus/pdf-invoices": ["../../dist/pdf-invoices"],
+      "@spartacus/pdf-invoices/occ": ["../../dist/pdf-invoices/occ"],
+      "@spartacus/pdf-invoices/root": ["../../dist/pdf-invoices/root"],
       "@spartacus/pickup-in-store/assets": [
         "../../dist/pickup-in-store/assets"
       ],
diff --git a/scripts/install/functions.sh b/scripts/install/functions.sh
index 43ec075e050..df92a810142 100644
--- a/scripts/install/functions.sh
+++ b/scripts/install/functions.sh
@@ -130,6 +130,18 @@ function add_s4om {
     fi
 }
 
+function add_requested_delivery_date {
+  if [ "$ADD_REQUESTED_DELIVERY_DATE" = true ] ; then
+        ng add --skip-confirmation @spartacus/requested-delivery-date@${SPARTACUS_VERSION} --interactive false
+    fi
+}
+
+function add_pdf_invoices {
+  if [ "$ADD_PDF_INVOICES" = true ] ; then
+        ng add --skip-confirmation @spartacus/pdf-invoices@${SPARTACUS_VERSION} --interactive false
+    fi
+}
+
 # Don't install b2b features here (use add_b2b function for that)
 function add_feature_libs {
   ng add @spartacus/tracking@${SPARTACUS_VERSION} --skip-confirmation --no-interactive
@@ -157,6 +169,8 @@ function add_spartacus_csr {
     add_epd_visualization
     add_product_configurator
     add_s4om
+    add_requested_delivery_date
+    add_pdf_invoices
     remove_npmrc
     )
 }
@@ -179,6 +193,8 @@ function add_spartacus_ssr {
     add_epd_visualization
     add_product_configurator
     add_s4om
+    add_requested_delivery_date
+    add_pdf_invoices
     remove_npmrc
     )
 }
@@ -200,6 +216,8 @@ function add_spartacus_ssr_pwa {
     add_epd_visualization
     add_product_configurator
     add_s4om
+    add_requested_delivery_date
+    add_pdf_invoices
     remove_npmrc
     )
 }
@@ -704,6 +722,16 @@ function parseInstallArgs {
                 echo "➖ Added S4OM"
                 shift
                 ;;
+            rdd)
+                ADD_REQUESTED_DELIVERY_DATE=true
+                echo "➖ Added Requested Delivery Date"
+                shift
+                ;;
+            invoices)
+                ADD_PDF_INVOICES=true
+                echo "➖ Added PDF Invoices"
+                shift
+                ;;
             -*|--*)
                 echo "Unknown option $1"
                 exit 1
diff --git a/tools/schematics/testing.ts b/tools/schematics/testing.ts
index 76f198673a0..10f7ca29806 100644
--- a/tools/schematics/testing.ts
+++ b/tools/schematics/testing.ts
@@ -17,6 +17,7 @@ const featureLibsFolders: string[] = [
   'order',
   'checkout',
   'organization',
+  'pdf-invoices',
   'pickup-in-store',
   'product',
   'product-configurator',
@@ -50,6 +51,7 @@ const commands = [
   'build digital-payments/schematics',
   'build epd-visualization/schematics',
   'build organization/schematics',
+  'build pdf-invoices/schematics',
   'build pickup-in-store/schematics',
   'build product/schematics',
   'build product-configurator/schematics',
@@ -199,6 +201,7 @@ async function executeCommand(command: Command): Promise<void> {
     case 'build digital-payments/schematics':
     case 'build epd-visualization/schematics':
     case 'build organization/schematics':
+    case 'build pdf-invoices/schematics':
     case 'build pickup-in-store/schematics':
     case 'build product/schematics':
     case 'build product-configurator/schematics':
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index 82f956d5202..e8b78ac66f1 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -311,6 +311,24 @@
       "@spartacus/organization/user-registration/root": [
         "feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": [
+        "feature-libs/pdf-invoices/public_api"
+      ],
+      "@spartacus/pdf-invoices/occ": [
+        "feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "feature-libs/pickup-in-store/assets/public_api"
       ],
diff --git a/tsconfig.json b/tsconfig.json
index 37eccea84ef..c6a9539cecc 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -260,6 +260,24 @@
       "@spartacus/organization/user-registration/root": [
         "feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": [
+        "feature-libs/pdf-invoices/public_api"
+      ],
+      "@spartacus/pdf-invoices/occ": [
+        "feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "feature-libs/pickup-in-store/assets/public_api"
       ],

From b5f836aa284627358b0d421b0c86c747828e6039 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Sep 2023 18:16:22 -0400
Subject: [PATCH 115/122] chore(deps): bump @cypress/request,
 @testing-library/cypress and cypress in /projects/storefrontapp-e2e-cypress
 (#17834)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
---
 .../package-lock.json                         | 1336 ++++++++++++++---
 .../storefrontapp-e2e-cypress/package.json    |    4 +-
 2 files changed, 1163 insertions(+), 177 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/package-lock.json b/projects/storefrontapp-e2e-cypress/package-lock.json
index 1701d2bd87f..a10f3517be8 100644
--- a/projects/storefrontapp-e2e-cypress/package-lock.json
+++ b/projects/storefrontapp-e2e-cypress/package-lock.json
@@ -12,9 +12,9 @@
         "@babel/core": "^7.14.3",
         "@babel/preset-env": "^7.14.2",
         "@cypress/webpack-preprocessor": "^5.9.1",
-        "@testing-library/cypress": "9.0.0",
+        "@testing-library/cypress": "10.0.1",
         "babel-loader": "^8.2.2",
-        "cypress": "12.6.0",
+        "cypress": "13.2.0",
         "cypress-file-upload": "^5.0.8",
         "ts-loader": "^9.4.2",
         "typescript": "^4.2.4",
@@ -1630,9 +1630,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.10",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-      "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -1648,9 +1648,9 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
+        "qs": "6.10.4",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -1766,39 +1766,39 @@
       }
     },
     "node_modules/@testing-library/cypress": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-9.0.0.tgz",
-      "integrity": "sha512-c1XiCGeHGGTWn0LAU12sFUfoX3qfId5gcSE2yHode+vsyHDWraxDPALjVnHd4/Fa3j4KBcc5k++Ccy6A9qnkMA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-10.0.1.tgz",
+      "integrity": "sha512-e8uswjTZIBhaIXjzEcrQQ8nHRWHgZH7XBxKuIWxZ/T7FxfWhCR48nFhUX5nfPizjVOKSThEfOSv67jquc1ASkw==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.14.6",
-        "@testing-library/dom": "^8.1.0"
+        "@testing-library/dom": "^9.0.0"
       },
       "engines": {
         "node": ">=12",
         "npm": ">=6"
       },
       "peerDependencies": {
-        "cypress": "^12.0.0"
+        "cypress": "^12.0.0 || ^13.0.0"
       }
     },
     "node_modules/@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+      "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
+        "lz-string": "^1.5.0",
         "pretty-format": "^27.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       }
     },
     "node_modules/@testing-library/dom/node_modules/ansi-styles": {
@@ -1872,9 +1872,9 @@
       }
     },
     "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "node_modules/@types/eslint": {
@@ -1910,9 +1910,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "14.18.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.18.tgz",
-      "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==",
+      "version": "18.17.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz",
+      "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==",
       "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -2220,12 +2220,25 @@
       ]
     },
     "node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6.0"
+      "dependencies": {
+        "deep-equal": "^2.0.5"
+      }
+    },
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/asn1": {
@@ -2276,6 +2289,18 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -2286,9 +2311,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true
     },
     "node_modules/babel-loader": {
@@ -2671,9 +2696,9 @@
       }
     },
     "node_modules/commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
       "engines": {
         "node": ">= 6"
@@ -2735,7 +2760,7 @@
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
     "node_modules/cross-spawn": {
@@ -2753,15 +2778,15 @@
       }
     },
     "node_modules/cypress": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.6.0.tgz",
-      "integrity": "sha512-WdHSVaS1lumSd5XpVTslZd8ui9GIGphrzvXq9+3DtVhqjRZC5M70gu5SW/Y/SLPq3D1wiXGZoHC6HJ7ESVE2lw==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -2773,7 +2798,7 @@
         "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
-        "commander": "^5.1.0",
+        "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
         "debug": "^4.3.4",
@@ -2791,12 +2816,13 @@
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -2806,7 +2832,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
+        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/cypress-file-upload": {
@@ -2898,9 +2924,9 @@
       }
     },
     "node_modules/cypress/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2930,7 +2956,7 @@
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
@@ -2962,12 +2988,56 @@
         }
       }
     },
+    "node_modules/deep-equal": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
+      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
+      "dev": true,
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "dependencies": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -2981,22 +3051,22 @@
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/dom-accessibility-api": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz",
-      "integrity": "sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "dependencies": {
         "jsbn": "~0.1.0",
@@ -3058,6 +3128,26 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
@@ -3213,7 +3303,7 @@
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -3297,10 +3387,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true,
       "engines": {
         "node": "*"
@@ -3347,6 +3446,15 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -3357,13 +3465,14 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -3397,7 +3506,7 @@
     "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
@@ -3453,6 +3562,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -3471,6 +3592,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -3492,6 +3622,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -3504,6 +3646,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -3581,6 +3738,90 @@
         "node": ">=10"
       }
     },
+    "node_modules/internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-ci": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
@@ -3605,6 +3846,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -3630,6 +3886,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -3639,6 +3904,21 @@
         "node": ">=0.12.0"
       }
     },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -3648,6 +3928,43 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -3660,10 +3977,55 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.11"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
     "node_modules/is-unicode-supported": {
@@ -3678,6 +4040,34 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -3687,7 +4077,7 @@
     "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true
     },
     "node_modules/jest-worker": {
@@ -3737,7 +4127,7 @@
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM= sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
     "node_modules/jsesc": {
@@ -3773,7 +4163,7 @@
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true
     },
     "node_modules/json5": {
@@ -4085,9 +4475,9 @@
       }
     },
     "node_modules/lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
       "bin": {
         "lz-string": "bin/bin.js"
@@ -4170,10 +4560,13 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/ms": {
       "version": "2.1.2",
@@ -4205,6 +4598,31 @@
         "node": ">=8"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -4355,7 +4773,7 @@
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
     "node_modules/picocolors": {
@@ -4435,6 +4853,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -4442,9 +4869,9 @@
       "dev": true
     },
     "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "node_modules/pump": {
@@ -4467,14 +4894,26 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "version": "6.10.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+      "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -4523,6 +4962,23 @@
         "@babel/runtime": "^7.8.4"
       }
     },
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "set-function-name": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regexpu-core": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
@@ -4576,6 +5032,12 @@
         "throttleit": "^1.0.0"
       }
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -4684,6 +5146,20 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4705,6 +5181,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -4799,7 +5289,19 @@
         "sshpk-verify": "bin/sshpk-verify"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "dependencies": {
+        "internal-slot": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/string-width": {
@@ -4992,16 +5494,27 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
     "node_modules/ts-loader": {
@@ -5117,7 +5630,7 @@
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
@@ -5129,7 +5642,7 @@
     "node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true
     },
     "node_modules/type-fest": {
@@ -5250,6 +5763,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -5262,7 +5785,7 @@
     "node_modules/verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "engines": [
         "node >=0.6.0"
@@ -5375,6 +5898,56 @@
         "node": ">= 8"
       }
     },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
+      "dependencies": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -6567,9 +7140,9 @@
       "optional": true
     },
     "@cypress/request": {
-      "version": "2.88.10",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-      "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -6585,9 +7158,9 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
+        "qs": "6.10.4",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       }
@@ -6686,28 +7259,28 @@
       }
     },
     "@testing-library/cypress": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-9.0.0.tgz",
-      "integrity": "sha512-c1XiCGeHGGTWn0LAU12sFUfoX3qfId5gcSE2yHode+vsyHDWraxDPALjVnHd4/Fa3j4KBcc5k++Ccy6A9qnkMA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/cypress/-/cypress-10.0.1.tgz",
+      "integrity": "sha512-e8uswjTZIBhaIXjzEcrQQ8nHRWHgZH7XBxKuIWxZ/T7FxfWhCR48nFhUX5nfPizjVOKSThEfOSv67jquc1ASkw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.14.6",
-        "@testing-library/dom": "^8.1.0"
+        "@testing-library/dom": "^9.0.0"
       }
     },
     "@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz",
+      "integrity": "sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.1.3",
         "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
+        "lz-string": "^1.5.0",
         "pretty-format": "^27.0.2"
       },
       "dependencies": {
@@ -6763,9 +7336,9 @@
       }
     },
     "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz",
+      "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==",
       "dev": true
     },
     "@types/eslint": {
@@ -6801,9 +7374,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.18.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.18.tgz",
-      "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==",
+      "version": "18.17.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz",
+      "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==",
       "dev": true
     },
     "@types/sinonjs__fake-timers": {
@@ -7065,10 +7638,23 @@
       "dev": true
     },
     "aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-      "dev": true
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "dev": true,
+      "requires": {
+        "deep-equal": "^2.0.5"
+      }
+    },
+    "array-buffer-byte-length": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "is-array-buffer": "^3.0.1"
+      }
     },
     "asn1": {
       "version": "0.2.6",
@@ -7109,6 +7695,12 @@
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true
     },
+    "available-typed-arrays": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true
+    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -7116,9 +7708,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
       "dev": true
     },
     "babel-loader": {
@@ -7387,9 +7979,9 @@
       }
     },
     "commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true
     },
     "common-tags": {
@@ -7440,7 +8032,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
     "cross-spawn": {
@@ -7455,14 +8047,14 @@
       }
     },
     "cypress": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.6.0.tgz",
-      "integrity": "sha512-WdHSVaS1lumSd5XpVTslZd8ui9GIGphrzvXq9+3DtVhqjRZC5M70gu5SW/Y/SLPq3D1wiXGZoHC6HJ7ESVE2lw==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "requires": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -7474,7 +8066,7 @@
         "check-more-types": "^2.24.0",
         "cli-cursor": "^3.1.0",
         "cli-table3": "~0.6.1",
-        "commander": "^5.1.0",
+        "commander": "^6.2.1",
         "common-tags": "^1.8.0",
         "dayjs": "^1.10.4",
         "debug": "^4.3.4",
@@ -7492,12 +8084,13 @@
         "listr2": "^3.8.3",
         "lodash": "^4.17.21",
         "log-symbols": "^4.0.0",
-        "minimist": "^1.2.6",
+        "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -7562,9 +8155,9 @@
           "dev": true
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -7591,7 +8184,7 @@
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
@@ -7612,12 +8205,50 @@
         "ms": "2.1.2"
       }
     },
+    "deep-equal": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz",
+      "integrity": "sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==",
+      "dev": true,
+      "requires": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.1",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.0",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.9"
+      }
+    },
+    "define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "requires": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       }
@@ -7625,19 +8256,19 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk= sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "dev": true
     },
     "dom-accessibility-api": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz",
-      "integrity": "sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true
     },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
       "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
@@ -7690,6 +8321,23 @@
         "ansi-colors": "^4.1.1"
       }
     },
+    "es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
+      }
+    },
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
@@ -7806,7 +8454,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
       "dev": true
     },
     "fast-deep-equal": {
@@ -7869,10 +8517,19 @@
         "path-exists": "^4.0.0"
       }
     },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.3"
+      }
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
       "dev": true
     },
     "form-data": {
@@ -7910,6 +8567,12 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -7917,13 +8580,14 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-      "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -7948,7 +8612,7 @@
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
@@ -7989,6 +8653,15 @@
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -8004,6 +8677,12 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -8019,12 +8698,27 @@
         "get-intrinsic": "^1.1.1"
       }
     },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
     "http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -8076,6 +8770,63 @@
       "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true
     },
+    "internal-slot": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-array-buffer": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.0",
+        "is-typed-array": "^1.1.10"
+      }
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true
+    },
     "is-ci": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
@@ -8094,6 +8845,15 @@
         "has": "^1.0.3"
       }
     },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -8110,28 +8870,95 @@
         "is-path-inside": "^3.0.2"
       }
     },
+    "is-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+      "dev": true
+    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-path-inside": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true
     },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-set": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "dev": true
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
     "is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true
     },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
+      "requires": {
+        "which-typed-array": "^1.1.11"
+      }
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
     "is-unicode-supported": {
@@ -8140,6 +8967,28 @@
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
+    "is-weakmap": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "dev": true
+    },
+    "is-weakset": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -8149,7 +8998,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
       "dev": true
     },
     "jest-worker": {
@@ -8189,7 +9038,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM= sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
       "dev": true
     },
     "jsesc": {
@@ -8219,7 +9068,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true
     },
     "json5": {
@@ -8447,9 +9296,9 @@
       }
     },
     "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true
     },
     "make-dir": {
@@ -8508,9 +9357,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
     "ms": {
@@ -8540,6 +9389,22 @@
         "path-key": "^3.0.0"
       }
     },
+    "object-inspect": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true
+    },
+    "object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -8648,7 +9513,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
     "picocolors": {
@@ -8703,6 +9568,12 @@
         }
       }
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true
+    },
     "proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -8710,9 +9581,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
       "dev": true
     },
     "pump": {
@@ -8732,9 +9603,18 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "version": "6.10.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+      "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
     "randombytes": {
@@ -8782,6 +9662,17 @@
         "@babel/runtime": "^7.8.4"
       }
     },
+    "regexp.prototype.flags": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "set-function-name": "^2.0.0"
+      }
+    },
     "regexpu-core": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
@@ -8828,6 +9719,12 @@
         "throttleit": "^1.0.0"
       }
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -8911,6 +9808,17 @@
         "randombytes": "^2.1.0"
       }
     },
+    "set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "requires": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      }
+    },
     "shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -8926,6 +9834,17 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -9002,6 +9921,15 @@
         "tweetnacl": "~0.14.0"
       }
     },
+    "stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "requires": {
+        "internal-slot": "^1.0.4"
+      }
+    },
     "string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -9132,13 +10060,23 @@
       }
     },
     "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "dev": true
+        }
       }
     },
     "ts-loader": {
@@ -9222,7 +10160,7 @@
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
@@ -9231,7 +10169,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
       "dev": true
     },
     "type-fest": {
@@ -9305,6 +10243,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -9314,7 +10262,7 @@
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
       "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
@@ -9392,6 +10340,44 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-collection": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "dev": true,
+      "requires": {
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
+      }
+    },
+    "which-typed-array": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.5",
+        "call-bind": "^1.0.2",
+        "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
diff --git a/projects/storefrontapp-e2e-cypress/package.json b/projects/storefrontapp-e2e-cypress/package.json
index 28f54557686..9b05314ba7d 100644
--- a/projects/storefrontapp-e2e-cypress/package.json
+++ b/projects/storefrontapp-e2e-cypress/package.json
@@ -37,9 +37,9 @@
     "@babel/core": "^7.14.3",
     "@babel/preset-env": "^7.14.2",
     "@cypress/webpack-preprocessor": "^5.9.1",
-    "@testing-library/cypress": "9.0.0",
+    "@testing-library/cypress": "10.0.1",
     "babel-loader": "^8.2.2",
-    "cypress": "12.6.0",
+    "cypress": "13.2.0",
     "cypress-file-upload": "^5.0.8",
     "ts-loader": "^9.4.2",
     "typescript": "^4.2.4",

From 30e51f88b22da12b803840b0a2d34f38977c4e04 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Fri, 15 Sep 2023 01:25:59 +0200
Subject: [PATCH 116/122] chore: package update (#17818)

Co-authored-by: Giancarlo Cordero Ortiz <46171897+giancorderoortiz@users.noreply.github.com>
Co-authored-by: Giancarlo Cordero Ortiz <giancarlo.cordero.ortiz@sap.com>
---
 core-libs/setup/package.json                  |   6 +-
 feature-libs/asm/package.json                 |  10 +-
 feature-libs/cart/package.json                |  12 +-
 feature-libs/checkout/package.json            |  12 +-
 feature-libs/customer-ticketing/package.json  |  12 +-
 feature-libs/order/package.json               |  12 +-
 feature-libs/organization/package.json        |  12 +-
 feature-libs/pdf-invoices/package.json        |  10 +-
 feature-libs/pickup-in-store/package.json     |  12 +-
 .../product-configurator/package.json         |  12 +-
 feature-libs/product/package.json             |  10 +-
 feature-libs/qualtrics/package.json           |   8 +-
 .../requested-delivery-date/package.json      |  10 +-
 feature-libs/smartedit/package.json           |   8 +-
 feature-libs/storefinder/package.json         |  12 +-
 feature-libs/tracking/package.json            |   8 +-
 feature-libs/user/package.json                |  12 +-
 integration-libs/cdc/package.json             |  12 +-
 integration-libs/cds/package.json             |  10 +-
 .../digital-payments/package.json             |  12 +-
 .../epd-visualization/package.json            |  12 +-
 integration-libs/s4om/package.json            |   8 +-
 integration-libs/segment-refs/package.json    |   8 +-
 package-lock.json                             | 449 +++++++++---------
 package.json                                  |  52 +-
 projects/assets/package.json                  |   2 +-
 projects/core/package.json                    |  14 +-
 projects/schematics/package.json              |  12 +-
 projects/schematics/src/dependencies.json     | 252 +++++-----
 .../ng-add/__snapshots__/index_spec.ts.snap   |  14 +-
 projects/storefrontlib/package.json           |  14 +-
 projects/storefrontstyles/package.json        |   2 +-
 32 files changed, 528 insertions(+), 523 deletions(-)

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 77c1944a24a..692e12f3014 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -16,17 +16,17 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular/core": "^15.2.4",
+    "@angular/core": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/order": "6.3.0-1",
     "@spartacus/user": "6.3.0-1"
   },
   "optionalDependencies": {
-    "@angular/platform-server": "^15.2.4",
+    "@angular/platform-server": "^15.2.9",
     "@nguniversal/express-engine": "^15.2.0",
     "express": "^4.18.2"
   },
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index 84a145d3190..64c84cc199c 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -22,13 +22,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index 43dbc51e2a3..0dfb8e5a8e2 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -26,14 +26,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index add1c29d462..bc05b2e6000 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 3acb2256931..e5ec380652b 100644
--- a/feature-libs/customer-ticketing/package.json
+++ b/feature-libs/customer-ticketing/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index ef8e96d979d..f8616c1b3ec 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index 38f89ae0f91..4f4c39f2d47 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index 18aa684ce24..fc5428f187a 100644
--- a/feature-libs/pdf-invoices/package.json
+++ b/feature-libs/pdf-invoices/package.json
@@ -22,13 +22,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index 1ffe58a0192..015fa71428c 100644
--- a/feature-libs/pickup-in-store/package.json
+++ b/feature-libs/pickup-in-store/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index c92560dfcd8..a6bfebd786e 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index d05fcea3c57..517c771c5a0 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -22,13 +22,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index d957fc0a4fa..9245da0237e 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -24,12 +24,12 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/styles": "6.3.0-1",
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index cbeacc85e4a..c97e2c4a6ac 100644
--- a/feature-libs/requested-delivery-date/package.json
+++ b/feature-libs/requested-delivery-date/package.json
@@ -22,13 +22,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/checkout": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index b56b5b3f661..5740fa0a2fd 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -17,12 +17,12 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index 33507e7151a..fc64dbba441 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@spartacus/core": "6.3.0-1",
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 957912bb9f7..4d1866111fb 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -21,12 +21,12 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index dbd2f380bfb..7db8fb1b361 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
     "@spartacus/core": "6.3.0-1",
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 39dd392508b..5fca4c0987b 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -19,14 +19,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index 3821b1a1a00..85180e6bfb7 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -20,13 +20,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 726b83f117f..6fb40bb5f5b 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -18,14 +18,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/checkout": "6.3.0-1",
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 23a84e541d2..1d6906fe4e3 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -29,14 +29,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@sapui5/ts-types-esm": "1.108.14",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 505231bebd5..8d20f0810f9 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -17,12 +17,12 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/pdf-invoices": "6.3.0-1",
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 005fa7301d6..3e5ba2bd03d 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -17,12 +17,12 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
diff --git a/package-lock.json b/package-lock.json
index cded6608585..a15cbf50258 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,53 +10,53 @@
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular/animations": "^15.2.4",
-        "@angular/common": "^15.2.4",
-        "@angular/compiler": "^15.2.4",
-        "@angular/core": "^15.2.4",
-        "@angular/forms": "^15.2.4",
-        "@angular/platform-browser": "^15.2.4",
-        "@angular/platform-browser-dynamic": "^15.2.4",
-        "@angular/platform-server": "^15.2.4",
-        "@angular/pwa": "^15.2.4",
-        "@angular/router": "^15.2.4",
-        "@angular/service-worker": "^15.2.4",
+        "@angular/animations": "^15.2.9",
+        "@angular/common": "^15.2.9",
+        "@angular/compiler": "^15.2.9",
+        "@angular/core": "^15.2.9",
+        "@angular/forms": "^15.2.9",
+        "@angular/platform-browser": "^15.2.9",
+        "@angular/platform-browser-dynamic": "^15.2.9",
+        "@angular/platform-server": "^15.2.9",
+        "@angular/pwa": "^15.2.9",
+        "@angular/router": "^15.2.9",
+        "@angular/service-worker": "^15.2.9",
         "@fontsource/open-sans": "^4.5.14",
-        "@fortawesome/fontawesome-free": "5.8.1",
+        "@fortawesome/fontawesome-free": "6.4.2",
         "@ng-select/ng-select": "^10.0.3",
         "@ngrx/effects": "^15.3.0",
         "@ngrx/router-store": "^15.3.0",
         "@ngrx/store": "^15.3.0",
         "@nguniversal/express-engine": "^15.2.0",
-        "@types/google.maps": "^3.49.2",
+        "@types/google.maps": "^3.54.0",
         "angular-oauth2-oidc": "^15.0.1",
         "bootstrap": "^4.6.2",
         "comment-json": "^4.2.3",
         "express": "^4.18.2",
         "hamburgers": "^1.2.1",
-        "i18next": "^21.9.1",
-        "i18next-http-backend": "^1.4.1",
+        "i18next": "^21.10.0",
+        "i18next-http-backend": "^1.4.5",
         "i18next-resources-to-backend": "^1.1.2",
         "ngx-infinite-scroll": "^15.0.0",
         "rxjs": "^6.6.0",
-        "ts-loader": "^9.3.1",
-        "tslib": "^2.4.0",
-        "zone.js": "~0.11.8"
+        "ts-loader": "^9.4.4",
+        "tslib": "^2.6.2",
+        "zone.js": "~0.12.0"
       },
       "devDependencies": {
         "@angular-builders/custom-webpack": "^15.0.0",
-        "@angular-devkit/build-angular": "^15.2.4",
-        "@angular-devkit/core": "^15.2.4",
-        "@angular-devkit/schematics": "^15.2.4",
+        "@angular-devkit/build-angular": "^15.2.9",
+        "@angular-devkit/core": "^15.2.9",
+        "@angular-devkit/schematics": "^15.2.9",
         "@angular-eslint/builder": "^15.2.0",
         "@angular-eslint/eslint-plugin": "^15.2.0",
         "@angular-eslint/eslint-plugin-template": "^15.2.0",
         "@angular-eslint/schematics": "^15.2.0",
         "@angular-eslint/template-parser": "^15.2.0",
         "@angular-eslint/utils": "^15.2.0",
-        "@angular/cli": "^15.2.4",
-        "@angular/compiler-cli": "^15.2.4",
-        "@angular/language-service": "^15.2.4",
+        "@angular/cli": "^15.2.9",
+        "@angular/compiler-cli": "^15.2.9",
+        "@angular/language-service": "^15.2.9",
         "@babel/runtime": "^7.18.9",
         "@ngrx/store-devtools": "^15.3.0",
         "@nguniversal/builders": "^15.2.0",
@@ -66,7 +66,7 @@
         "@nrwl/jest": "^15.9.2",
         "@nrwl/workspace": "15.9.2",
         "@sapui5/ts-types-esm": "1.108.14",
-        "@schematics/angular": "^15.2.4",
+        "@schematics/angular": "^15.2.9",
         "@types/express": "^4.17.17",
         "@types/fs-extra": "^11.0.1",
         "@types/i18next": "^13.0.0",
@@ -127,7 +127,7 @@
         "webpack-cli": "^4.10.0"
       },
       "engines": {
-        "node": "^14.20.0 || ^16.13.0 || ^18.10.0"
+        "node": "^16.13.0 || ^18.10.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -163,11 +163,12 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1502.4",
+      "version": "0.1502.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.9.tgz",
+      "integrity": "sha512-CFn+LbtYeLG7WqO+BBSjogl764StHpwgfJnNAXQ/3UouUktZ92z4lxhUm0PwIPb5k0lILsf81ubcS1vzwoXEEg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/core": "15.2.4",
+        "@angular-devkit/core": "15.2.9",
         "rxjs": "6.6.7"
       },
       "engines": {
@@ -177,14 +178,15 @@
       }
     },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "15.2.4",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.9.tgz",
+      "integrity": "sha512-djOo2Q22zLrxPccSbINz93hD+pES/nNPoze4Ys/0IdtMlLmxO/YGsA+FG5eNeNAf2jK/JRoNydaYOh7XpGoCzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "2.2.0",
-        "@angular-devkit/architect": "0.1502.4",
-        "@angular-devkit/build-webpack": "0.1502.4",
-        "@angular-devkit/core": "15.2.4",
+        "@angular-devkit/architect": "0.1502.9",
+        "@angular-devkit/build-webpack": "0.1502.9",
+        "@angular-devkit/core": "15.2.9",
         "@babel/core": "7.20.12",
         "@babel/generator": "7.20.14",
         "@babel/helper-annotate-as-pure": "7.18.6",
@@ -196,7 +198,7 @@
         "@babel/runtime": "7.20.13",
         "@babel/template": "7.20.7",
         "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "15.2.4",
+        "@ngtools/webpack": "15.2.9",
         "ansi-colors": "4.1.3",
         "autoprefixer": "10.4.13",
         "babel-loader": "9.1.2",
@@ -229,7 +231,7 @@
         "rxjs": "6.6.7",
         "sass": "1.58.1",
         "sass-loader": "13.2.0",
-        "semver": "7.3.8",
+        "semver": "7.5.3",
         "source-map-loader": "4.0.1",
         "source-map-support": "0.5.21",
         "terser": "5.16.3",
@@ -287,8 +289,9 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
       "version": "7.20.13",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
+      "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.13.11"
       },
@@ -298,13 +301,15 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/estree": {
       "version": "0.0.51",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "dev": true
     },
     "node_modules/@angular-devkit/build-angular/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -318,24 +323,27 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/eslint-scope": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -346,16 +354,18 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/estraverse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/glob": {
       "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -372,24 +382,15 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@angular-devkit/build-angular/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/@angular-devkit/build-angular/node_modules/minimatch": {
       "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -399,6 +400,8 @@
     },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
       "version": "8.4.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
       "dev": true,
       "funding": [
         {
@@ -410,7 +413,6 @@
           "url": "https://tidelift.com/funding/github/npm/postcss"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.4",
         "picocolors": "^1.0.0",
@@ -421,9 +423,10 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/schema-utils": {
-      "version": "3.1.1",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.8",
         "ajv": "^6.12.5",
@@ -437,24 +440,17 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/semver": {
-      "version": "7.3.8",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+      "dev": true
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
       "version": "5.76.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+      "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^0.0.51",
@@ -497,17 +493,13 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1502.4",
+      "version": "0.1502.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.9.tgz",
+      "integrity": "sha512-VzMXoZjrbL1XlcSegqpZCBDbVvKFGPs3cKp4bXDD5ht95jcCyJPk5FA/wrh0pGGwbOF8ae/XOWFcPRzctC35iA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1502.4",
+        "@angular-devkit/architect": "0.1502.9",
         "rxjs": "6.6.7"
       },
       "engines": {
@@ -521,8 +513,9 @@
       }
     },
     "node_modules/@angular-devkit/core": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz",
+      "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==",
       "dependencies": {
         "ajv": "8.12.0",
         "ajv-formats": "2.1.1",
@@ -545,10 +538,11 @@
       }
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.9.tgz",
+      "integrity": "sha512-o08nE8sTpfq/Fknrr1rzBsM8vY36BDox+8dOo9Zc/KqcVPwDy94YKRzHb+xxVaU9jy1VYeCjy63mkyELy7Z3zQ==",
       "dependencies": {
-        "@angular-devkit/core": "15.2.4",
+        "@angular-devkit/core": "15.2.9",
         "jsonc-parser": "3.2.0",
         "magic-string": "0.29.0",
         "ora": "5.4.1",
@@ -646,8 +640,9 @@
       }
     },
     "node_modules/@angular/animations": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.2.9.tgz",
+      "integrity": "sha512-GQujLhI0cQFcl4Q8y0oSYKSRnW23GIeSL+Arl4eFufziJ9hGAAQNuesaNs/7i+9UlTHDMkPH3kd5ScXuYYz6wg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -655,18 +650,19 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "15.2.4"
+        "@angular/core": "15.2.9"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "15.2.4",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.2.9.tgz",
+      "integrity": "sha512-mI6hkGyIJDKd8MRiBl3p5chsUhgnluwmpsq3g1FFPw+wv+eXsPYgCiHqXS/OsK+shFxii9XMxoZQO28bJ4NAOQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
-        "@angular-devkit/architect": "0.1502.4",
-        "@angular-devkit/core": "15.2.4",
-        "@angular-devkit/schematics": "15.2.4",
-        "@schematics/angular": "15.2.4",
+        "@angular-devkit/architect": "0.1502.9",
+        "@angular-devkit/core": "15.2.9",
+        "@angular-devkit/schematics": "15.2.9",
+        "@schematics/angular": "15.2.9",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "3.0.1",
@@ -678,7 +674,7 @@
         "ora": "5.4.1",
         "pacote": "15.1.0",
         "resolve": "1.22.1",
-        "semver": "7.3.8",
+        "semver": "7.5.3",
         "symbol-observable": "4.0.0",
         "yargs": "17.6.2"
       },
@@ -691,39 +687,10 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "devOptional": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/semver": {
-      "version": "7.3.8",
-      "devOptional": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@angular/cli/node_modules/yallist": {
-      "version": "4.0.0",
-      "devOptional": true,
-      "license": "ISC"
-    },
     "node_modules/@angular/common": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.2.9.tgz",
+      "integrity": "sha512-LM9/UHG2dRrOzlu2KovrFwWIziFMjRxHzSP3Igw6Symw/wIl0kXGq8Fn6RpFP78zmLqnv+IQOoRiby9MCXsI4g==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -731,13 +698,14 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "15.2.4",
+        "@angular/core": "15.2.9",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.2.9.tgz",
+      "integrity": "sha512-MoKugbjk+E0wRBj12uvIyDLELlVLonnqjA2+XiF+7FxALIeyds3/qQeEoMmYIqAbN3NnTT5pV92RxWwG4tHFwA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -745,7 +713,7 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/core": "15.2.4"
+        "@angular/core": "15.2.9"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -754,9 +722,10 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "15.2.4",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.2.9.tgz",
+      "integrity": "sha512-zsbI8G2xHOeYWI0hjFzrI//ZhZV9il/uQW5dAimfwJp06KZDeXZ3PdwY9JQslf6F+saLwOObxy6QMrIVvfjy9w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/core": "7.19.3",
         "@jridgewell/sourcemap-codec": "^1.4.14",
@@ -778,7 +747,7 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "15.2.4",
+        "@angular/compiler": "15.2.9",
         "typescript": ">=4.8.2 <5.0"
       }
     },
@@ -831,8 +800,9 @@
       }
     },
     "node_modules/@angular/core": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.2.9.tgz",
+      "integrity": "sha512-w46Z1yUXCQfKV7XfnamOoLA2VD0MVUUYVrUjO73mHSskDXSXxfZAEHO9kfUS71Cj35PvhP3mbkqWscpea2WeYg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -845,8 +815,9 @@
       }
     },
     "node_modules/@angular/forms": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.2.9.tgz",
+      "integrity": "sha512-sk0pC2EFi2Ohg5J0q0NYptbT+2WOkoiERSMYA39ncDvlSZBWsNlxpkbGUSck7NIxjK2QfcVN1ldGbHlZTFvtqg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -854,23 +825,25 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "15.2.4",
-        "@angular/core": "15.2.4",
-        "@angular/platform-browser": "15.2.4",
+        "@angular/common": "15.2.9",
+        "@angular/core": "15.2.9",
+        "@angular/platform-browser": "15.2.9",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "15.2.4",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-15.2.9.tgz",
+      "integrity": "sha512-B7lP4q/eHge2lZezOXS96EYzVf4stMCWfOnz7+pUUi0HbF+A5QCV65SWQddS/M+NM2jj8N2L/j+6UCH8lJjTQA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.9.tgz",
+      "integrity": "sha512-ufCHeSX+U6d43YOMkn3igwfqtlozoCXADcbyfUEG8m2y9XASobqmCKvdSk/zfl62oyiA8msntWBJVBE2l4xKXg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -878,9 +851,9 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/animations": "15.2.4",
-        "@angular/common": "15.2.4",
-        "@angular/core": "15.2.4"
+        "@angular/animations": "15.2.9",
+        "@angular/common": "15.2.9",
+        "@angular/core": "15.2.9"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -889,8 +862,9 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.9.tgz",
+      "integrity": "sha512-ZIYDM6MShblb8OyV1m4+18lJJ2LCeICmeg2uSbpFYptYBSOClrTiYOOFVDJvn7HLvNzljLs16XPrgyaYVqNpcw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -898,15 +872,16 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "15.2.4",
-        "@angular/compiler": "15.2.4",
-        "@angular/core": "15.2.4",
-        "@angular/platform-browser": "15.2.4"
+        "@angular/common": "15.2.9",
+        "@angular/compiler": "15.2.9",
+        "@angular/core": "15.2.9",
+        "@angular/platform-browser": "15.2.9"
       }
     },
     "node_modules/@angular/platform-server": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-15.2.9.tgz",
+      "integrity": "sha512-GOjRSCpqN9WPi5ROvsVo9G4gACZ4Z6J2GYBFUOzUY/PaQkuGtigZhp0zPDU19vteabIa0p6C3jqOHw0+jHolgw==",
       "dependencies": {
         "domino": "^2.1.2",
         "tslib": "^2.3.0",
@@ -916,20 +891,21 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/animations": "15.2.4",
-        "@angular/common": "15.2.4",
-        "@angular/compiler": "15.2.4",
-        "@angular/core": "15.2.4",
-        "@angular/platform-browser": "15.2.4",
-        "@angular/platform-browser-dynamic": "15.2.4"
+        "@angular/animations": "15.2.9",
+        "@angular/common": "15.2.9",
+        "@angular/compiler": "15.2.9",
+        "@angular/core": "15.2.9",
+        "@angular/platform-browser": "15.2.9",
+        "@angular/platform-browser-dynamic": "15.2.9"
       }
     },
     "node_modules/@angular/pwa": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/pwa/-/pwa-15.2.9.tgz",
+      "integrity": "sha512-5WRHStoooHDg6o82zomHUu5uZqoK2QNFJrQ40mgvYv2/rK/NikQBQlARl9aYkwER4qRIu0aO/kmfCuAXPve17A==",
       "dependencies": {
-        "@angular-devkit/schematics": "15.2.4",
-        "@schematics/angular": "15.2.4",
+        "@angular-devkit/schematics": "15.2.9",
+        "@schematics/angular": "15.2.9",
         "parse5-html-rewriting-stream": "7.0.0"
       },
       "engines": {
@@ -947,8 +923,9 @@
       }
     },
     "node_modules/@angular/router": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.2.9.tgz",
+      "integrity": "sha512-UCbh5DLSDhybv0xKYT7kGQMfOVdyhHIHOZz5EYVebbhste6S+W1LE57vTHq7QtxJsyKBa/WSkaUkCLXD6ntCAg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -956,15 +933,16 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "15.2.4",
-        "@angular/core": "15.2.4",
-        "@angular/platform-browser": "15.2.4",
+        "@angular/common": "15.2.9",
+        "@angular/core": "15.2.9",
+        "@angular/platform-browser": "15.2.9",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/service-worker": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-15.2.9.tgz",
+      "integrity": "sha512-qM/lcrjaxIfpKj174mMWedtGfLNgLl5m7p9mPNODFjqp5lQj3fTTS643ix5Pr0onwbvbNbXu4g67/WXJqap0eA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -975,8 +953,8 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/common": "15.2.4",
-        "@angular/core": "15.2.4"
+        "@angular/common": "15.2.9",
+        "@angular/core": "15.2.9"
       }
     },
     "node_modules/@assemblyscript/loader": {
@@ -2936,8 +2914,10 @@
       "license": "MIT"
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "5.8.1",
-      "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz",
+      "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==",
+      "hasInstallScript": true,
       "engines": {
         "node": ">=6"
       }
@@ -3398,9 +3378,10 @@
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "15.2.4",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.9.tgz",
+      "integrity": "sha512-nOXUGqKkAEMlCcrhkDwWDzcVdKNH7MNRUXfNzsFc9zdeR/5p3qt6SVMN7OOE3NREyI7P6nzARc3S+6QDBjf3Jg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
@@ -5858,11 +5839,12 @@
       }
     },
     "node_modules/@schematics/angular": {
-      "version": "15.2.4",
-      "license": "MIT",
+      "version": "15.2.9",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.9.tgz",
+      "integrity": "sha512-0Lit6TLNUwcAYiEkXgZp3vY9xAO1cnZCBXuUcp+6v+Ddnrt2w/YOiGe74p21cYe0StkTpTljsqsKBTiX7TMjQg==",
       "dependencies": {
-        "@angular-devkit/core": "15.2.4",
-        "@angular-devkit/schematics": "15.2.4",
+        "@angular-devkit/core": "15.2.9",
+        "@angular-devkit/schematics": "15.2.9",
         "jsonc-parser": "3.2.0"
       },
       "engines": {
@@ -6143,8 +6125,9 @@
       }
     },
     "node_modules/@types/google.maps": {
-      "version": "3.52.0",
-      "license": "MIT"
+      "version": "3.54.0",
+      "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.54.0.tgz",
+      "integrity": "sha512-b1MBy2eGrZoEFLnzq1RrlHbfzuWHz+Nitgqbb5N+MFA0kAUv0kYPmAXtczpb4dHlFZyu58EYzcKXtWNqSInyXg=="
     },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.6",
@@ -7351,8 +7334,9 @@
     },
     "node_modules/adjust-sourcemap-loader": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
@@ -7363,8 +7347,9 @@
     },
     "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -9053,8 +9038,9 @@
     },
     "node_modules/copy-webpack-plugin": {
       "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "glob-parent": "^6.0.1",
@@ -9076,8 +9062,9 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -9086,13 +9073,14 @@
       }
     },
     "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "13.1.3",
+      "version": "13.2.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
+      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.11",
-        "ignore": "^5.2.0",
+        "fast-glob": "^3.3.0",
+        "ignore": "^5.2.4",
         "merge2": "^1.4.1",
         "slash": "^4.0.0"
       },
@@ -9105,8 +9093,9 @@
     },
     "node_modules/copy-webpack-plugin/node_modules/slash": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -11262,9 +11251,10 @@
       "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.2.12",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -14855,8 +14845,9 @@
     },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "source-map-support": "^0.5.5"
       }
@@ -15178,8 +15169,9 @@
     },
     "node_modules/loader-utils": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 12.13.0"
       }
@@ -15877,8 +15869,9 @@
     },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
+      "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0"
       },
@@ -17844,8 +17837,9 @@
     },
     "node_modules/postcss-loader": {
       "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz",
+      "integrity": "sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cosmiconfig": "^7.0.0",
         "klona": "^2.0.5",
@@ -18840,8 +18834,9 @@
     },
     "node_modules/regex-parser": {
       "version": "2.2.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
+      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+      "dev": true
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
@@ -19005,8 +19000,9 @@
     },
     "node_modules/resolve-url-loader": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
@@ -19020,8 +19016,9 @@
     },
     "node_modules/resolve-url-loader/node_modules/loader-utils": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -19033,8 +19030,9 @@
     },
     "node_modules/resolve-url-loader/node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -19291,8 +19289,9 @@
     },
     "node_modules/sass-loader": {
       "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz",
+      "integrity": "sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "klona": "^2.0.4",
         "neo-async": "^2.6.2"
@@ -19459,9 +19458,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
+      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -19986,8 +19985,9 @@
     },
     "node_modules/source-map-loader": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz",
+      "integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "iconv-lite": "^0.6.3",
@@ -20006,8 +20006,9 @@
     },
     "node_modules/source-map-loader/node_modules/iconv-lite": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -21170,8 +21171,9 @@
       }
     },
     "node_modules/ts-loader": {
-      "version": "9.4.2",
-      "license": "MIT",
+      "version": "9.4.4",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz",
+      "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==",
       "dependencies": {
         "chalk": "^4.1.0",
         "enhanced-resolve": "^5.0.0",
@@ -21274,8 +21276,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.5.0",
-      "license": "0BSD"
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -21992,8 +21995,9 @@
     },
     "node_modules/webpack-dev-middleware": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.0.1.tgz",
+      "integrity": "sha512-PZPZ6jFinmqVPJZbisfggDiC+2EeGZ1ZByyMP5sOFJcPPWSexalISz+cvm+j+oYPT7FIJyxT76esjnw9DhE5sw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.12",
@@ -22543,8 +22547,9 @@
       }
     },
     "node_modules/zone.js": {
-      "version": "0.11.8",
-      "license": "MIT",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.12.0.tgz",
+      "integrity": "sha512-XtC+I5dXU14HrzidAKBNMqneIVUykLEAA1x+v4KVrd6AUPWlwYORF8KgsVqvgdHiKZ4BkxxjvYi/ksEixTPR0Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       }
diff --git a/package.json b/package.json
index 2997943cf75..eca5dd81729 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "license": "Apache-2.0",
   "author": "SAP, Spartacus team",
   "engines": {
-    "node": "^14.20.0 || ^16.13.0 || ^18.10.0"
+    "node": "^16.13.0 || ^18.10.0"
   },
   "scripts": {
     "build:analyze": "npm run build --stats-json && npx --yes webpack-bundle-analyzer dist/storefrontapp/stats.json",
@@ -101,53 +101,53 @@
   },
   "private": false,
   "dependencies": {
-    "@angular/animations": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/compiler": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/platform-browser-dynamic": "^15.2.4",
-    "@angular/platform-server": "^15.2.4",
-    "@angular/pwa": "^15.2.4",
-    "@angular/router": "^15.2.4",
-    "@angular/service-worker": "^15.2.4",
+    "@angular/animations": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/compiler": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/platform-browser-dynamic": "^15.2.9",
+    "@angular/platform-server": "^15.2.9",
+    "@angular/pwa": "^15.2.9",
+    "@angular/router": "^15.2.9",
+    "@angular/service-worker": "^15.2.9",
     "@fontsource/open-sans": "^4.5.14",
-    "@fortawesome/fontawesome-free": "5.8.1",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@nguniversal/express-engine": "^15.2.0",
-    "@types/google.maps": "^3.49.2",
+    "@types/google.maps": "^3.54.0",
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "comment-json": "^4.2.3",
     "express": "^4.18.2",
     "hamburgers": "^1.2.1",
-    "i18next": "^21.9.1",
-    "i18next-http-backend": "^1.4.1",
+    "i18next": "^21.10.0",
+    "i18next-http-backend": "^1.4.5",
     "i18next-resources-to-backend": "^1.1.2",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0",
-    "ts-loader": "^9.3.1",
-    "tslib": "^2.4.0",
-    "zone.js": "~0.11.8"
+    "ts-loader": "^9.4.4",
+    "tslib": "^2.6.2",
+    "zone.js": "~0.12.0"
   },
   "devDependencies": {
     "@angular-builders/custom-webpack": "^15.0.0",
-    "@angular-devkit/build-angular": "^15.2.4",
-    "@angular-devkit/core": "^15.2.4",
-    "@angular-devkit/schematics": "^15.2.4",
+    "@angular-devkit/build-angular": "^15.2.9",
+    "@angular-devkit/core": "^15.2.9",
+    "@angular-devkit/schematics": "^15.2.9",
     "@angular-eslint/builder": "^15.2.0",
     "@angular-eslint/eslint-plugin": "^15.2.0",
     "@angular-eslint/eslint-plugin-template": "^15.2.0",
     "@angular-eslint/schematics": "^15.2.0",
     "@angular-eslint/template-parser": "^15.2.0",
     "@angular-eslint/utils": "^15.2.0",
-    "@angular/cli": "^15.2.4",
-    "@angular/compiler-cli": "^15.2.4",
-    "@angular/language-service": "^15.2.4",
+    "@angular/cli": "^15.2.9",
+    "@angular/compiler-cli": "^15.2.9",
+    "@angular/language-service": "^15.2.9",
     "@babel/runtime": "^7.18.9",
     "@ngrx/store-devtools": "^15.3.0",
     "@nguniversal/builders": "^15.2.0",
@@ -157,7 +157,7 @@
     "@nrwl/jest": "^15.9.2",
     "@nrwl/workspace": "15.9.2",
     "@sapui5/ts-types-esm": "1.108.14",
-    "@schematics/angular": "^15.2.4",
+    "@schematics/angular": "^15.2.9",
     "@types/express": "^4.17.17",
     "@types/fs-extra": "^11.0.1",
     "@types/i18next": "^13.0.0",
diff --git a/projects/assets/package.json b/projects/assets/package.json
index 7d083ba55f6..22f2561fe78 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -10,7 +10,7 @@
     "generate:translations:ts-2-properties": "ts-node ./generate-translations-ts-2-properties"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "publishConfig": {
     "access": "public"
diff --git a/projects/core/package.json b/projects/core/package.json
index d4326fac941..a26de809049 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -12,19 +12,19 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/core",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "angular-oauth2-oidc": "^15.0.1",
-    "i18next": "^21.9.1",
-    "i18next-http-backend": "^1.4.1",
+    "i18next": "^21.10.0",
+    "i18next-http-backend": "^1.4.5",
     "i18next-resources-to-backend": "^1.1.2",
     "rxjs": "^6.6.0"
   },
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index e2cde80e9ed..ce220c5b58a 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -16,17 +16,17 @@
     "test": "npm run clean && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "@angular/pwa": "^15.2.4",
+    "@angular/pwa": "^15.2.9",
     "@nguniversal/express-engine": "^15.2.0",
     "semver": "^7.5.2",
     "ts-morph": "^9.1.0",
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/core": "^15.2.4",
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/compiler": "^15.2.4",
-    "@schematics/angular": "^15.2.4",
+    "@angular-devkit/core": "^15.2.9",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/compiler": "^15.2.9",
+    "@schematics/angular": "^15.2.9",
     "jsonc-parser": "^3.2.0",
     "parse5": "^6.0.1",
     "typescript": "^4.8.2"
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index acfb2abaf1e..1ea027a9d46 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -1,36 +1,36 @@
 {
   "@spartacus/assets": {},
   "@spartacus/core": {
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "angular-oauth2-oidc": "^15.0.1",
-    "i18next": "^21.9.1",
-    "i18next-http-backend": "^1.4.1",
+    "i18next": "^21.10.0",
+    "i18next-http-backend": "^1.4.5",
     "i18next-resources-to-backend": "^1.1.2",
     "rxjs": "^6.6.0"
   },
   "@spartacus/schematics": {
-    "@angular-devkit/core": "^15.2.4",
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/compiler": "^15.2.4",
-    "@schematics/angular": "^15.2.4",
+    "@angular-devkit/core": "^15.2.9",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/compiler": "^15.2.9",
+    "@schematics/angular": "^15.2.9",
     "jsonc-parser": "^3.2.0",
     "parse5": "^6.0.1",
     "typescript": "^4.8.2"
   },
   "storefrontapp-e2e-cypress": {},
   "@spartacus/storefront": {
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/router": "^15.2.4",
-    "@angular/service-worker": "^15.2.4",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/router": "^15.2.9",
+    "@angular/service-worker": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
@@ -41,22 +41,22 @@
   },
   "@spartacus/styles": {
     "@fontsource/open-sans": "^4.5.14",
-    "@fortawesome/fontawesome-free": "5.8.1",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@ng-select/ng-select": "^10.0.3",
     "bootstrap": "^4.6.2"
   },
   "@spartacus/setup": {
-    "@angular/core": "^15.2.4",
+    "@angular/core": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/order": "6.3.0-1",
     "@spartacus/user": "6.3.0-1"
   },
   "@spartacus/asm": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -69,11 +69,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/cart": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -86,11 +86,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/checkout": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
@@ -104,11 +104,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/customer-ticketing": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
@@ -117,11 +117,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/order": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -134,11 +134,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/organization": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -164,11 +164,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/pickup-in-store": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
@@ -183,10 +183,10 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/product": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/storefront": "6.3.0-1",
@@ -195,11 +195,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/product-configurator": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -213,9 +213,9 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/qualtrics": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "@spartacus/styles": "6.3.0-1",
@@ -223,10 +223,10 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/requested-delivery-date": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/checkout": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
@@ -237,19 +237,19 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/smartedit": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/storefinder": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@spartacus/core": "6.3.0-1",
@@ -260,19 +260,19 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/tracking": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/user": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
     "@spartacus/core": "6.3.0-1",
@@ -282,11 +282,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/cdc": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
@@ -299,10 +299,10 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/cds": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
@@ -313,11 +313,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/digital-payments": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/checkout": "6.3.0-1",
@@ -327,11 +327,11 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/epd-visualization": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@sapui5/ts-types-esm": "1.108.14",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
@@ -342,9 +342,9 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/s4om": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/pdf-invoices": "6.3.0-1",
@@ -355,45 +355,45 @@
     "rxjs": "^6.6.0"
   },
   "@spartacus/segment-refs": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",
     "rxjs": "^6.6.0"
   },
   "storefrontapp": {
-    "@angular/animations": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/compiler": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/platform-browser-dynamic": "^15.2.4",
-    "@angular/platform-server": "^15.2.4",
-    "@angular/pwa": "^15.2.4",
-    "@angular/router": "^15.2.4",
-    "@angular/service-worker": "^15.2.4",
+    "@angular/animations": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/compiler": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/platform-browser-dynamic": "^15.2.9",
+    "@angular/platform-server": "^15.2.9",
+    "@angular/pwa": "^15.2.9",
+    "@angular/router": "^15.2.9",
+    "@angular/service-worker": "^15.2.9",
     "@fontsource/open-sans": "^4.5.14",
-    "@fortawesome/fontawesome-free": "5.8.1",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@nguniversal/express-engine": "^15.2.0",
-    "@types/google.maps": "^3.49.2",
+    "@types/google.maps": "^3.54.0",
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "comment-json": "^4.2.3",
     "express": "^4.18.2",
     "hamburgers": "^1.2.1",
-    "i18next": "^21.9.1",
-    "i18next-http-backend": "^1.4.1",
+    "i18next": "^21.10.0",
+    "i18next-http-backend": "^1.4.5",
     "i18next-resources-to-backend": "^1.1.2",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0",
-    "ts-loader": "^9.3.1",
-    "tslib": "^2.4.0",
+    "ts-loader": "^9.4.4",
+    "tslib": "^2.6.2",
     "zone.js": "~0.11.8"
   }
 }
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
index 0167385ada7..b6451fe9068 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -53,11 +53,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@angular/forms": "^15.2.0",
     "@angular/platform-browser": "^15.2.0",
     "@angular/platform-browser-dynamic": "^15.2.0",
-    "@angular/platform-server": "^15.2.4",
+    "@angular/platform-server": "^15.2.9",
     "@angular/router": "^15.2.0",
-    "@angular/service-worker": "^15.2.4",
+    "@angular/service-worker": "^15.2.9",
     "@fontsource/open-sans": "^4.5.14",
-    "@fortawesome/fontawesome-free": "5.8.1",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
@@ -71,17 +71,17 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.15.2",
-    "i18next": "^21.9.1",
-    "i18next-http-backend": "^1.4.1",
+    "i18next": "^21.10.0",
+    "i18next-http-backend": "^1.4.5",
     "i18next-resources-to-backend": "^1.1.2",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0",
-    "ts-loader": "^9.3.1",
+    "ts-loader": "^9.4.4",
     "tslib": "^2.3.0",
     "zone.js": "~0.12.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.2.4",
+    "@angular-devkit/build-angular": "^15.2.9",
     "@angular/cli": "~0.5.0",
     "@angular/compiler-cli": "^15.2.0",
     "@nguniversal/builders": "^15.2.0",
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index ce778e85755..56b2c7fcd77 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -10,15 +10,15 @@
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/storefrontlib",
   "license": "Apache-2.0",
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
-    "@angular/router": "^15.2.4",
-    "@angular/service-worker": "^15.2.4",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
+    "@angular/router": "^15.2.9",
+    "@angular/service-worker": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index c8fc024414f..dfdd9ebbd93 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {},
   "peerDependencies": {
     "@fontsource/open-sans": "^4.5.14",
-    "@fortawesome/fontawesome-free": "5.8.1",
+    "@fortawesome/fontawesome-free": "6.4.2",
     "@ng-select/ng-select": "^10.0.3",
     "bootstrap": "^4.6.2"
   },

From 588d622db63ae4250c24eb959a700e5725f7970f Mon Sep 17 00:00:00 2001
From: Radhep Sabapathipillai <34665674+RadhepS@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:20:26 -0400
Subject: [PATCH 117/122] chore: increase karma timeouts (#17837)

The karma tests have their timeouts increased to avoid timeout failures on the release pipeline

closes: https://jira.tools.sap/browse/CXSPA-4725
---
 feature-libs/asm/karma.conf.js                     | 4 ++++
 feature-libs/cart/karma.conf.js                    | 4 ++++
 feature-libs/checkout/karma.conf.js                | 4 ++++
 feature-libs/customer-ticketing/karma.conf.js      | 4 ++++
 feature-libs/order/karma.conf.js                   | 4 ++++
 feature-libs/organization/karma.conf.js            | 4 ++++
 feature-libs/pdf-invoices/karma.conf.js            | 4 ++++
 feature-libs/pickup-in-store/karma.conf.js         | 4 ++++
 feature-libs/product-configurator/karma.conf.js    | 4 ++++
 feature-libs/product/karma.conf.js                 | 4 ++++
 feature-libs/qualtrics/karma.conf.js               | 4 ++++
 feature-libs/requested-delivery-date/karma.conf.js | 4 ++++
 feature-libs/smartedit/karma.conf.js               | 4 ++++
 feature-libs/storefinder/karma.conf.js             | 4 ++++
 feature-libs/tracking/karma.conf.js                | 4 ++++
 feature-libs/user/karma.conf.js                    | 4 ++++
 integration-libs/cdc/karma.conf.js                 | 4 ++++
 integration-libs/cds/karma.conf.js                 | 4 ++++
 integration-libs/digital-payments/karma.conf.js    | 4 ++++
 integration-libs/epd-visualization/karma.conf.js   | 4 ++++
 integration-libs/s4om/karma.conf.js                | 4 ++++
 integration-libs/segment-refs/karma.conf.js        | 4 ++++
 projects/core/karma.conf.js                        | 4 ++++
 projects/storefrontapp/karma.conf.js               | 4 ++++
 projects/storefrontlib/karma.conf.js               | 4 ++++
 25 files changed, 100 insertions(+)

diff --git a/feature-libs/asm/karma.conf.js b/feature-libs/asm/karma.conf.js
index e3461fcbb60..3fe7e8cffb4 100644
--- a/feature-libs/asm/karma.conf.js
+++ b/feature-libs/asm/karma.conf.js
@@ -42,6 +42,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/cart/karma.conf.js b/feature-libs/cart/karma.conf.js
index 9a580445bf6..a84400380c0 100644
--- a/feature-libs/cart/karma.conf.js
+++ b/feature-libs/cart/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/checkout/karma.conf.js b/feature-libs/checkout/karma.conf.js
index 0b54f0947bf..a717dc45679 100644
--- a/feature-libs/checkout/karma.conf.js
+++ b/feature-libs/checkout/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/customer-ticketing/karma.conf.js b/feature-libs/customer-ticketing/karma.conf.js
index 2ba14b12752..aa436f39398 100644
--- a/feature-libs/customer-ticketing/karma.conf.js
+++ b/feature-libs/customer-ticketing/karma.conf.js
@@ -36,6 +36,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/order/karma.conf.js b/feature-libs/order/karma.conf.js
index ce76e1edcea..b5601c34956 100644
--- a/feature-libs/order/karma.conf.js
+++ b/feature-libs/order/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/organization/karma.conf.js b/feature-libs/organization/karma.conf.js
index 822cf311160..27293165aea 100644
--- a/feature-libs/organization/karma.conf.js
+++ b/feature-libs/organization/karma.conf.js
@@ -42,6 +42,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/pdf-invoices/karma.conf.js b/feature-libs/pdf-invoices/karma.conf.js
index aed99ee7cec..b1ea719a64b 100644
--- a/feature-libs/pdf-invoices/karma.conf.js
+++ b/feature-libs/pdf-invoices/karma.conf.js
@@ -36,6 +36,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/pickup-in-store/karma.conf.js b/feature-libs/pickup-in-store/karma.conf.js
index 2e5b72c7df4..5154d9516d0 100644
--- a/feature-libs/pickup-in-store/karma.conf.js
+++ b/feature-libs/pickup-in-store/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/product-configurator/karma.conf.js b/feature-libs/product-configurator/karma.conf.js
index f7ea355dfaf..d57a13f41d8 100644
--- a/feature-libs/product-configurator/karma.conf.js
+++ b/feature-libs/product-configurator/karma.conf.js
@@ -45,6 +45,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/product/karma.conf.js b/feature-libs/product/karma.conf.js
index cf500675a9c..58cabf6bcb4 100644
--- a/feature-libs/product/karma.conf.js
+++ b/feature-libs/product/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/qualtrics/karma.conf.js b/feature-libs/qualtrics/karma.conf.js
index cf4314b55b0..ad54b8d4f69 100644
--- a/feature-libs/qualtrics/karma.conf.js
+++ b/feature-libs/qualtrics/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/requested-delivery-date/karma.conf.js b/feature-libs/requested-delivery-date/karma.conf.js
index e451c881c40..a143424cf73 100644
--- a/feature-libs/requested-delivery-date/karma.conf.js
+++ b/feature-libs/requested-delivery-date/karma.conf.js
@@ -39,6 +39,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/smartedit/karma.conf.js b/feature-libs/smartedit/karma.conf.js
index b94d1f2a71c..e0fbf2282a3 100644
--- a/feature-libs/smartedit/karma.conf.js
+++ b/feature-libs/smartedit/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/storefinder/karma.conf.js b/feature-libs/storefinder/karma.conf.js
index 9575997ae09..1a217c828b3 100644
--- a/feature-libs/storefinder/karma.conf.js
+++ b/feature-libs/storefinder/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/tracking/karma.conf.js b/feature-libs/tracking/karma.conf.js
index 50417459311..2e80be331c5 100644
--- a/feature-libs/tracking/karma.conf.js
+++ b/feature-libs/tracking/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/feature-libs/user/karma.conf.js b/feature-libs/user/karma.conf.js
index f727f4eb1bc..6c9c9aff463 100644
--- a/feature-libs/user/karma.conf.js
+++ b/feature-libs/user/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/cdc/karma.conf.js b/integration-libs/cdc/karma.conf.js
index 4f3777d80c9..9f40841f4ae 100644
--- a/integration-libs/cdc/karma.conf.js
+++ b/integration-libs/cdc/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/cds/karma.conf.js b/integration-libs/cds/karma.conf.js
index ba9601acb3a..c08af0b3aeb 100644
--- a/integration-libs/cds/karma.conf.js
+++ b/integration-libs/cds/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/digital-payments/karma.conf.js b/integration-libs/digital-payments/karma.conf.js
index 7156e0d7406..399eaae94e1 100644
--- a/integration-libs/digital-payments/karma.conf.js
+++ b/integration-libs/digital-payments/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/epd-visualization/karma.conf.js b/integration-libs/epd-visualization/karma.conf.js
index bcd9271db68..9da0a2cf80c 100644
--- a/integration-libs/epd-visualization/karma.conf.js
+++ b/integration-libs/epd-visualization/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/s4om/karma.conf.js b/integration-libs/s4om/karma.conf.js
index 6a9e6e21ebb..839449226ad 100644
--- a/integration-libs/s4om/karma.conf.js
+++ b/integration-libs/s4om/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/integration-libs/segment-refs/karma.conf.js b/integration-libs/segment-refs/karma.conf.js
index c784a91dad0..c054668810e 100644
--- a/integration-libs/segment-refs/karma.conf.js
+++ b/integration-libs/segment-refs/karma.conf.js
@@ -34,6 +34,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/projects/core/karma.conf.js b/projects/core/karma.conf.js
index 20bb029fff1..9a5b7b752c0 100644
--- a/projects/core/karma.conf.js
+++ b/projects/core/karma.conf.js
@@ -42,6 +42,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/projects/storefrontapp/karma.conf.js b/projects/storefrontapp/karma.conf.js
index 7e89609a52e..a9b06fd3c31 100644
--- a/projects/storefrontapp/karma.conf.js
+++ b/projects/storefrontapp/karma.conf.js
@@ -28,6 +28,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
diff --git a/projects/storefrontlib/karma.conf.js b/projects/storefrontlib/karma.conf.js
index 4d348dcb88e..6e9d815e8b5 100644
--- a/projects/storefrontlib/karma.conf.js
+++ b/projects/storefrontlib/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

From 9dcb262e54ed89e62e766557a1d1f2a2f122a438 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Mon, 18 Sep 2023 16:21:44 +0200
Subject: [PATCH 118/122] feat: disable SSR in smartedit (#17825)

---
 .../ssr/optimized-engine/rendering-strategy-resolver-options.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
index 90035dd14c8..26e69ec7802 100644
--- a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
+++ b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
@@ -11,6 +11,6 @@ export interface RenderingStrategyResolverOptions {
 
 export const defaultRenderingStrategyResolverOptions: RenderingStrategyResolverOptions =
   {
-    excludedUrls: ['checkout', 'my-account'],
+    excludedUrls: ['checkout', 'my-account', 'cx-preview'],
     excludedParams: ['asm'],
   };

From c933a6c3b040e53d21dfbb210356a212857666c3 Mon Sep 17 00:00:00 2001
From: Radhep Sabapathipillai <34665674+RadhepS@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:23:48 -0400
Subject: [PATCH 119/122] chore: update CI to use node 18 (#17842)

chore: update the CI to use node 18

closes: https://jira.tools.sap/browse/CXSPA-4599
---
 .github/workflows/cache-node-modules.yml        | 2 +-
 .github/workflows/ci-continuous-integration.yml | 2 +-
 .github/workflows/ci-merge-checks.yml           | 2 +-
 .github/workflows/ci.yml                        | 2 +-
 .github/workflows/lighthouse.yml                | 2 +-
 ci-scripts/e2e-cypress.sh                       | 2 ++
 ci-scripts/lhci.sh                              | 1 +
 projects/schematics/src/dependencies.json       | 2 +-
 tools/config/const.ts                           | 2 +-
 9 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cache-node-modules.yml b/.github/workflows/cache-node-modules.yml
index d50a013d50a..dba6da3e70e 100644
--- a/.github/workflows/cache-node-modules.yml
+++ b/.github/workflows/cache-node-modules.yml
@@ -8,7 +8,7 @@ on:
 name: Cache node modules
 
 env:
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 jobs:
   cacheNodeModules:   
diff --git a/.github/workflows/ci-continuous-integration.yml b/.github/workflows/ci-continuous-integration.yml
index c9f062b1607..2044ac9fa45 100644
--- a/.github/workflows/ci-continuous-integration.yml
+++ b/.github/workflows/ci-continuous-integration.yml
@@ -10,7 +10,7 @@ on:
     # empty as it is used only to manually trigger the workflow
   
 env:
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
   NX_BASE: origin/${{ github.event.pull_request.base.ref }}
   NX_HEAD: origin/${{ github.event.pull_request.head.ref }}
 
diff --git a/.github/workflows/ci-merge-checks.yml b/.github/workflows/ci-merge-checks.yml
index 70ba22a5607..773ebe1b4a8 100644
--- a/.github/workflows/ci-merge-checks.yml
+++ b/.github/workflows/ci-merge-checks.yml
@@ -11,7 +11,7 @@ on:
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
   GH_TOKEN: ${{ github.token }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency: 
   group: ci-merge-checks-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b22cc1447d1..de47f5387ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency:
   group: ci-${{ github.head_ref || github.run_id }}
diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
index 621d247b4cc..cc200ae2293 100644
--- a/.github/workflows/lighthouse.yml
+++ b/.github/workflows/lighthouse.yml
@@ -9,7 +9,7 @@ on:
     # empty as it is used only to manually trigger the workflow
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency: 
   group: lighthouse-${{ github.head_ref || github.run_id }}
diff --git a/ci-scripts/e2e-cypress.sh b/ci-scripts/e2e-cypress.sh
index 0af88a94591..8b2fd427c11 100755
--- a/ci-scripts/e2e-cypress.sh
+++ b/ci-scripts/e2e-cypress.sh
@@ -57,6 +57,8 @@ fi
 echo '-----'
 echo "Building Spartacus libraries"
 
+export NODE_OPTIONS=--dns-result-order=ipv4first
+
 npm ci
 
 (cd projects/storefrontapp-e2e-cypress && npm ci)
diff --git a/ci-scripts/lhci.sh b/ci-scripts/lhci.sh
index a067632a482..172c3d1d43a 100755
--- a/ci-scripts/lhci.sh
+++ b/ci-scripts/lhci.sh
@@ -2,6 +2,7 @@
 set -e
 
 export SPA_ENV='lighthouse'
+export NODE_OPTIONS=--dns-result-order=ipv4first
 
 npm install -g @lhci/cli@0.8.x
 
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index 1ea027a9d46..b563cc10f57 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -394,6 +394,6 @@
     "rxjs": "^6.6.0",
     "ts-loader": "^9.4.4",
     "tslib": "^2.6.2",
-    "zone.js": "~0.11.8"
+    "zone.js": "~0.12.0"
   }
 }
diff --git a/tools/config/const.ts b/tools/config/const.ts
index c923a002212..6ae750650b3 100644
--- a/tools/config/const.ts
+++ b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '6.3.0-1';
+export const PUBLISHING_VERSION = '';

From 87a65ec4effe703a8cc74f2a21f8ff53af350729 Mon Sep 17 00:00:00 2001
From: kpawelczak <42094017+kpawelczak@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:29:54 +0200
Subject: [PATCH 120/122] fix: 'this' is undefined in
 ProductEffects.productLoadEffect (#17853)

---
 projects/core/src/product/store/effects/product.effect.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/core/src/product/store/effects/product.effect.ts b/projects/core/src/product/store/effects/product.effect.ts
index 87582569f82..3192d8fe193 100644
--- a/projects/core/src/product/store/effects/product.effect.ts
+++ b/projects/core/src/product/store/effects/product.effect.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Injectable, inject } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Action } from '@ngrx/store';
-import { Observable, merge, of } from 'rxjs';
+import { merge, Observable, of } from 'rxjs';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 import { AuthActions } from '../../../auth/user-auth/store/actions';
 import { LoggerService } from '../../../logger';
@@ -49,7 +49,7 @@ export class ProductEffects {
             merge(
               ...this.productConnector
                 .getMany(products)
-                .map(this.productLoadEffect)
+                .map((productLoad) => this.productLoadEffect(productLoad))
             )
           ),
           withdrawOn(this.contextChange$)

From 6d2251fe4c28f629b7be6d794b659fd7ba16cca1 Mon Sep 17 00:00:00 2001
From: Roman Chygryn <129765378+rmch91@users.noreply.github.com>
Date: Thu, 21 Sep 2023 12:00:20 +0200
Subject: [PATCH 121/122] Release 6.5.0 1 (#17863)

---
 core-libs/setup/package.json                  |  10 +-
 feature-libs/asm/package.json                 |  14 +-
 feature-libs/cart/package.json                |  12 +-
 feature-libs/checkout/package.json            |  16 +-
 .../__snapshots__/index_spec.ts.snap          |   4 +-
 feature-libs/customer-ticketing/package.json  |  12 +-
 feature-libs/order/package.json               |  14 +-
 feature-libs/organization/package.json        |  16 +-
 .../__snapshots__/index_spec.ts.snap          |  10 +-
 feature-libs/pdf-invoices/package.json        |  10 +-
 feature-libs/pickup-in-store/package.json     |  18 +-
 .../product-configurator/package.json         |  16 +-
 .../__snapshots__/index_spec.ts.snap          |   6 +-
 feature-libs/product/package.json             |  10 +-
 .../__snapshots__/index_spec.ts.snap          |   4 +-
 feature-libs/qualtrics/package.json           |   8 +-
 .../requested-delivery-date/package.json      |  16 +-
 feature-libs/smartedit/package.json           |   6 +-
 feature-libs/storefinder/package.json         |  10 +-
 feature-libs/tracking/package.json            |   6 +-
 feature-libs/user/package.json                |  10 +-
 integration-libs/cdc/package.json             |  14 +-
 integration-libs/cds/package.json             |  14 +-
 .../digital-payments/package.json             |  12 +-
 .../epd-visualization/package.json            |  12 +-
 integration-libs/s4om/package.json            |  16 +-
 integration-libs/segment-refs/package.json    |   6 +-
 projects/assets/package.json                  |   2 +-
 projects/core/package.json                    |   2 +-
 projects/schematics/package.json              |   2 +-
 projects/schematics/src/dependencies.json     | 242 +++++++++---------
 .../schematics/src/migrations/migrations.json |  20 +-
 .../ng-add/__snapshots__/index_spec.ts.snap   |  10 +-
 projects/storefrontlib/package.json           |   4 +-
 projects/storefrontstyles/package.json        |   2 +-
 .../storefrontstyles/scss/_versioning.scss    |   2 +-
 tools/config/const.ts                         |   2 +-
 37 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index 692e12f3014..2902e642dec 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -20,10 +20,10 @@
   },
   "peerDependencies": {
     "@angular/core": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1"
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^15.2.9",
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index 64c84cc199c..2b0dd49201b 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,12 +32,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index 0dfb8e5a8e2..16c604e51da 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index bc05b2e6000..a89a39383b2 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
index 27cc71fa3f2..72a254fbe1c 100644
--- a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
@@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -506,7 +506,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index e5ec380652b..cbbeadcda3d 100644
--- a/feature-libs/customer-ticketing/package.json
+++ b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,11 +30,11 @@
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index f8616c1b3ec..9e2da427d5a 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,12 +33,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index 4f4c39f2d47..55dc6558ba6 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
index 0d0d33778be..8d9dd423c77 100644
--- a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -266,7 +266,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -481,7 +481,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -696,7 +696,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -911,7 +911,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index fc5428f187a..4c147f7b38d 100644
--- a/feature-libs/pdf-invoices/package.json
+++ b/feature-libs/pdf-invoices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pdf-invoices",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Invoices library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index 015fa71428c..6b5a478bb78 100644
--- a/feature-libs/pickup-in-store/package.json
+++ b/feature-libs/pickup-in-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pickup-in-store",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefinder": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefinder": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index a6bfebd786e..1a2bac6a4d3 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-configurator",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Product configurator feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
index 19148ba7c82..f51dc2e0a31 100644
--- a/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product-configurator/schematics/add-product-configurator/__snapshots__/index_spec.ts.snap
@@ -58,7 +58,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -303,7 +303,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -534,7 +534,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   })]
 })
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index 517c771c5a0..f8f5b17f7cf 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Product library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/router": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
index c64f861dfdd..1f089ce53e0 100644
--- a/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
+++ b/feature-libs/product/schematics/add-product/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -266,7 +266,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index 9245da0237e..dcce0fbc96e 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Qualtrics library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,9 +30,9 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index c97e2c4a6ac..48bc5689330 100644
--- a/feature-libs/requested-delivery-date/package.json
+++ b/feature-libs/requested-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/requested-delivery-date",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Requested Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,13 +29,13 @@
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index 5740fa0a2fd..09a55b499a3 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Smart Edit feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index fc64dbba441..c888554bb06 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Store finder feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 4d1866111fb..c7b6f08f3b3 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Spartacus tracking and personalization library",
   "keywords": [
     "spartacus",
@@ -27,8 +27,8 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index 7db8fb1b361..577ba072b24 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "User feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index 5fca4c0987b..e7fcc601152 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Customer Data Cloud Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/asm": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/organization": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/asm": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/organization": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index 85180e6bfb7..b5e02f5529f 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Context Driven Service library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular/core": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/tracking": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/tracking": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index 6fb40bb5f5b..a1e1e32d33a 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/digital-payments",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Digital Payments Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -27,11 +27,11 @@
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index 1d6906fe4e3..32479eeef12 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/epd-visualization",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "SAP Enterprise Product Development Visualization integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -38,11 +38,11 @@
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@sapui5/ts-types-esm": "1.108.14",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 8d20f0810f9..c50a8ac267e 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "S/4HANA Order Management (b2b feature)",
   "keywords": [
     "spartacus",
@@ -23,13 +23,13 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/pdf-invoices": "6.3.0-1",
-    "@spartacus/requested-delivery-date": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/pdf-invoices": "6.5.0-1",
+    "@spartacus/requested-delivery-date": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 3e5ba2bd03d..9de2d251ff6 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/segment-refs",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "segment-refs",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {
diff --git a/projects/assets/package.json b/projects/assets/package.json
index 22f2561fe78..470dea8bb63 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
diff --git a/projects/core/package.json b/projects/core/package.json
index a26de809049..87acd73c2ae 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Spartacus - the core framework",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index ce220c5b58a..eb81a19cbad 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index b563cc10f57..f7390376483 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -35,7 +35,7 @@
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0"
   },
@@ -47,10 +47,10 @@
   },
   "@spartacus/setup": {
     "@angular/core": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1"
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1"
   },
   "@spartacus/asm": {
     "@angular-devkit/schematics": "^15.2.9",
@@ -60,12 +60,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cart": {
@@ -77,11 +77,11 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -93,13 +93,13 @@
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -109,11 +109,11 @@
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/order": {
@@ -125,12 +125,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/organization": {
@@ -142,25 +142,25 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
   "@spartacus/pdf-invoices": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/pickup-in-store": {
@@ -171,14 +171,14 @@
     "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefinder": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefinder": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -187,10 +187,10 @@
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/router": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -203,22 +203,22 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/qualtrics": {
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -227,21 +227,21 @@
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
     "@angular/forms": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/smartedit": {
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/storefinder": {
@@ -252,10 +252,10 @@
     "@angular/router": "^15.2.9",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -263,8 +263,8 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/user": {
@@ -275,10 +275,10 @@
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cdc": {
@@ -290,12 +290,12 @@
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/asm": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/organization": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/asm": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/organization": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/cds": {
@@ -304,12 +304,12 @@
     "@angular/core": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/tracking": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/tracking": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/digital-payments": {
@@ -319,11 +319,11 @@
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/checkout": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/checkout": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/epd-visualization": {
@@ -333,11 +333,11 @@
     "@angular/forms": "^15.2.9",
     "@angular/router": "^15.2.9",
     "@sapui5/ts-types-esm": "1.108.14",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },
@@ -345,21 +345,21 @@
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/pdf-invoices": "6.3.0-1",
-    "@spartacus/requested-delivery-date": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/pdf-invoices": "6.5.0-1",
+    "@spartacus/requested-delivery-date": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "@spartacus/segment-refs": {
     "@angular-devkit/schematics": "^15.2.9",
     "@angular/common": "^15.2.9",
     "@angular/core": "^15.2.9",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "storefrontapp": {
diff --git a/projects/schematics/src/migrations/migrations.json b/projects/schematics/src/migrations/migrations.json
index 01112d36515..f8815c12d67 100644
--- a/projects/schematics/src/migrations/migrations.json
+++ b/projects/schematics/src/migrations/migrations.json
@@ -139,52 +139,52 @@
     },
 
     "00-migration-v6-ssr": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/ssr/ssr#migrate",
       "description": "Updates the SSR setup"
     },
     "01-migration-v6-config-deprecations": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/config-deprecations/config-deprecations#migrate",
       "description": "Handle deprecated configuration properties"
     },
     "02-migration-v6-constructor-deprecations": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/constructor-deprecations/constructor-deprecations#migrate",
       "description": "Add or remove constructor parameters"
     },
     "03-migration-v6-css": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/css/css#migrate",
       "description": "Handle deprecated CSS"
     },
     "04-migration-v6-dependency-management": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/dependency-management/dependency-management#migrate",
       "description": "Update dependencies"
     },
     "05-migration-v6-methods-and-properties-deprecations": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/methods-and-properties-deprecations/methods-and-properties-deprecations#migrate",
       "description": "Comment about usage of removed public methods or properties"
     },
     "06-migration-v6-missing-packages": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/missing-packages/missing-packages#migrate",
       "description": "Check missing packages"
     },
     "07-migration-v6-removed-public-api-deprecations": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/removed-public-api-deprecations/removed-public-api-deprecations#migrate",
       "description": "Comment about usage of removed public api"
     },
     "08-migration-v6-rename-symbol": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/rename-symbol/rename-symbol#migrate",
       "description": "Rename import symbols that were moved/changed in majors"
     },
     "09-migration-v6-angular-json-styling": {
-      "version": "6.3.0-1",
+      "version": "6.5.0-1",
       "factory": "./6_0/angular-json-styles/angular-json-styles#migrate",
       "description": "Update the angular.json with the style preprocessor options"
     }
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
index b6451fe9068..f0720fff3e4 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -63,11 +63,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
     "@nguniversal/express-engine": "^15.2.0",
-    "@spartacus/assets": "~6.3.0-1",
-    "@spartacus/core": "~6.3.0-1",
-    "@spartacus/setup": "~6.3.0-1",
-    "@spartacus/storefront": "~6.3.0-1",
-    "@spartacus/styles": "~6.3.0-1",
+    "@spartacus/assets": "~6.5.0-1",
+    "@spartacus/core": "~6.5.0-1",
+    "@spartacus/setup": "~6.5.0-1",
+    "@spartacus/storefront": "~6.5.0-1",
+    "@spartacus/styles": "~6.5.0-1",
     "angular-oauth2-oidc": "^15.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.15.2",
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 56b2c7fcd77..d45d0d961e9 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "keywords": [
     "spartacus",
     "storefront",
@@ -23,7 +23,7 @@
     "@ngrx/effects": "^15.3.0",
     "@ngrx/router-store": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
     "ngx-infinite-scroll": "^15.0.0",
     "rxjs": "^6.6.0"
   },
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index dfdd9ebbd93..eb7e3b9434d 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
diff --git a/projects/storefrontstyles/scss/_versioning.scss b/projects/storefrontstyles/scss/_versioning.scss
index 5ba22c35349..a8a375e9cef 100644
--- a/projects/storefrontstyles/scss/_versioning.scss
+++ b/projects/storefrontstyles/scss/_versioning.scss
@@ -24,7 +24,7 @@
 // or `$styleVersion` are enabled.
 $_fullVersion: (
   major: 6,
-  minor: 4,
+  minor: 5,
   patch: 0,
 );
 
diff --git a/tools/config/const.ts b/tools/config/const.ts
index 6ae750650b3..76c8e4131b5 100644
--- a/tools/config/const.ts
+++ b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '';
+export const PUBLISHING_VERSION = '6.5.0-1';

From ae83fd2dc9053336526b7dad2c86e09d43542fae Mon Sep 17 00:00:00 2001
From: Florent Letendre <florent.letendre01@sap.com>
Date: Mon, 25 Sep 2023 09:58:46 -0400
Subject: [PATCH 122/122] fix: install failing due to mismatch version (#17870)

CXSPA-4403

Spartacus_version specified in install config file now overwrites publishing_version.
---
 scripts/install/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install/functions.sh b/scripts/install/functions.sh
index df92a810142..a224fb13b9f 100644
--- a/scripts/install/functions.sh
+++ b/scripts/install/functions.sh
@@ -82,7 +82,7 @@ function update_projects_versions {
     fi
 
     printh "Updating all library versions to ${SPARTACUS_VERSION}"
-    (cd "${CLONE_DIR}/tools/config" && pwd && sed -i -E 's/PUBLISHING_VERSION = '\'\''/PUBLISHING_VERSION = '\'"${SPARTACUS_VERSION}"\''/g' const.ts);
+    (cd "${CLONE_DIR}/tools/config" && pwd && sed -i -E 's/PUBLISHING_VERSION = '\'.*\''/PUBLISHING_VERSION = '\'"${SPARTACUS_VERSION}"\''/g' const.ts);
     (cd "${CLONE_DIR}" && pwd && npm run config:update -- --generate-deps);
 
 }