From 82addf5aec2c0af316a71d83f975447948b00d45 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 22 Jul 2026 15:24:27 +0800
Subject: [PATCH 01/60] draft

draft
---
 .../b2b-unit-selection/assets/public_api.ts   |   7 +
 .../translations/en/b2b-unit-selection.json   |  13 ++
 .../assets/translations/en/index.ts           |   9 +
 .../assets/translations/translations.ts       |  14 ++
 .../b2b-unit-selection.module.ts              |  19 ++
 .../b2b-unit-selection-components.module.ts   |  23 +++
 .../b2b-unit-selection-dialog.component.html  |  52 +++++
 .../b2b-unit-selection-dialog.component.ts    | 114 +++++++++++
 .../b2b-unit-selector-outlet.component.ts     |  26 +++
 .../b2b-unit-selector.component.html          |  19 ++
 .../b2b-unit-selector.component.ts            |  45 +++++
 ...efault-b2b-unit-selection-layout.config.ts |  24 +++
 .../components/public_api.ts                  |  11 ++
 .../core/b2b-unit-selection-core.module.ts    |  15 ++
 .../connectors/b2b-unit-selection.adapter.ts  |  26 +++
 .../b2b-unit-selection.connector.ts           |  27 +++
 .../b2b-unit-selection/core/public_api.ts     |  11 ++
 .../b2b-unit-selector-state.service.ts        |  36 ++++
 .../actions/b2b-unit-selection.actions.ts     |  62 ++++++
 .../core/store/actions/index.ts               |   7 +
 .../store/b2b-unit-selection-store.module.ts  |  14 ++
 .../effects/b2b-unit-selection.effects.ts     | 179 ++++++++++++++++++
 .../occ-b2b-unit-selection.adapter.ts         |  72 +++++++
 .../occ/b2b-unit-selection-occ.module.ts      |  22 +++
 .../default-occ-b2b-unit-selection-config.ts  |  19 ++
 .../b2b-unit-selection/occ/model/index.ts     |   7 +
 .../occ-b2b-unit-selection-endpoints.model.ts |  31 +++
 .../b2b-unit-selection/occ/public_api.ts      |  10 +
 .../b2b-unit-selection/public_api.ts          |  11 ++
 .../root/b2b-aware-auth-redirect.service.ts   |  32 ++++
 .../root/b2b-login-meta-reducer.ts            |  46 +++++
 .../root/b2b-redirect-coordinator.service.ts  |  43 +++++
 .../root/b2b-redirect-patcher.ts              |  78 ++++++++
 .../root/b2b-unit-selection-root.module.ts    |  53 ++++++
 .../b2b-unit-selection/root/feature-name.ts   |   8 +
 .../root/model/augmented-core.model.ts        |  15 ++
 .../b2b-unit-selection/root/model/index.ts    |   7 +
 .../b2b-unit-selection/root/public_api.ts     |   9 +
 .../storefrontapp/src/app/app.component.ts    |   8 +-
 ...ation-b2b-unit-selection-feature.module.ts |  39 ++++
 .../spartacus/spartacus-features.module.ts    |   2 +
 tsconfig.json                                 |  18 ++
 42 files changed, 1281 insertions(+), 2 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/assets/public_api.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/assets/translations/en/index.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/assets/translations/translations.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/b2b-unit-selection.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/public_api.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/public_api.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/config/default-occ-b2b-unit-selection-config.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/model/index.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/public_api.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/public_api.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/feature-name.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/model/index.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/public_api.ts
 create mode 100644 projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts

diff --git a/feature-libs/organization/b2b-unit-selection/assets/public_api.ts b/feature-libs/organization/b2b-unit-selection/assets/public_api.ts
new file mode 100644
index 00000000000..bae44a4d359
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/assets/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './translations/translations';
diff --git a/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
new file mode 100644
index 00000000000..e939868adb1
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
@@ -0,0 +1,13 @@
+{
+  "b2bUnitSelection": {
+    "dialog": {
+      "title": "Confirm B2B Unit",
+      "description": "Confirm the B2B unit you want to act on behalf of.",
+      "unitLabel": "B2B Unit",
+      "confirm": "Confirm"
+    },
+    "selector": {
+      "label": "Company"
+    }
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/assets/translations/en/index.ts b/feature-libs/organization/b2b-unit-selection/assets/translations/en/index.ts
new file mode 100644
index 00000000000..3bf9d093d05
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/assets/translations/en/index.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import b2bUnitSelection from './b2b-unit-selection.json';
+
+export const en = { b2bUnitSelection };
diff --git a/feature-libs/organization/b2b-unit-selection/assets/translations/translations.ts b/feature-libs/organization/b2b-unit-selection/assets/translations/translations.ts
new file mode 100644
index 00000000000..026cb2a5dbc
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/assets/translations/translations.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TranslationChunksConfig } from '@spartacus/core';
+
+export const b2bUnitSelectionTranslationChunksConfig: TranslationChunksConfig =
+  {
+    b2bUnitSelection: ['b2bUnitSelection'],
+  };
+
+export { en as b2bUnitSelectionTranslationsEn } from './en/index';
diff --git a/feature-libs/organization/b2b-unit-selection/b2b-unit-selection.module.ts b/feature-libs/organization/b2b-unit-selection/b2b-unit-selection.module.ts
new file mode 100644
index 00000000000..3f22dcaabe1
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/b2b-unit-selection.module.ts
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { B2bUnitSelectionCoreModule } from './core/b2b-unit-selection-core.module';
+import { B2bUnitSelectionOccModule } from './occ/b2b-unit-selection-occ.module';
+import { B2bUnitSelectionComponentsModule } from './components/b2b-unit-selection-components.module';
+
+@NgModule({
+  imports: [
+    B2bUnitSelectionCoreModule,
+    B2bUnitSelectionOccModule,
+    B2bUnitSelectionComponentsModule,
+  ],
+})
+export class B2bUnitSelectionModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
new file mode 100644
index 00000000000..f6ecf08a8db
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
+import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
+import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
+import { B2bUnitSelectorOutletComponent } from './b2b-unit-selector-outlet/b2b-unit-selector-outlet.component';
+import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selection-layout.config';
+
+@NgModule({
+  imports: [
+    B2bUnitSelectionDialogComponent,
+    B2bUnitSelectorComponent,
+    B2bUnitSelectorOutletComponent,
+  ],
+  exports: [B2bUnitSelectorOutletComponent],
+  providers: [provideDefaultConfig(defaultB2bUnitSelectionLayoutConfig)],
+})
+export class B2bUnitSelectionComponentsModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
new file mode 100644
index 00000000000..97addbd91bb
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
@@ -0,0 +1,52 @@
+<div
+  class="cx-b2b-unit-selection-dialog cx-modal-container"
+  role="dialog"
+  [attr.aria-labelledby]="'b2b-unit-selection-title'"
+  [cxFocus]="focusConfig"
+>
+  <div class="cx-modal-content">
+    <!-- Header -->
+    <div class="cx-dialog-header modal-header">
+      <h2 id="b2b-unit-selection-title" class="modal-title">
+        {{ 'b2bUnitSelection.dialog.title' | cxTranslate }}
+      </h2>
+    </div>
+
+    <!-- Body -->
+    <div class="cx-dialog-body modal-body" [formGroup]="form">
+      <p class="cx-dialog-description">
+        {{ 'b2bUnitSelection.dialog.description' | cxTranslate }}
+      </p>
+
+      <div class="form-group">
+        <label for="b2b-unit-select" class="cx-required-field">
+          {{ 'b2bUnitSelection.dialog.unitLabel' | cxTranslate }}
+        </label>
+        <select
+          id="b2b-unit-select"
+          class="form-control"
+          formControlName="selectedUnit"
+          [attr.aria-required]="true"
+        >
+          <option *ngFor="let unit of orgUnits" [value]="unit.name">
+            {{ unit.name }}
+          </option>
+        </select>
+        <cx-form-errors
+          [control]="form.get('selectedUnit')"
+        ></cx-form-errors>
+      </div>
+    </div>
+
+    <!-- Footer -->
+    <div class="cx-dialog-footer modal-footer">
+      <button
+        type="button"
+        class="btn btn-primary btn-block"
+        (click)="confirm()"
+      >
+        {{ 'b2bUnitSelection.dialog.confirm' | cxTranslate }}
+      </button>
+    </div>
+  </div>
+</div>
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
new file mode 100644
index 00000000000..18f4047f0d0
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -0,0 +1,114 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CommonModule } from '@angular/common';
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  FormControl,
+  FormGroup,
+  ReactiveFormsModule,
+  Validators,
+} from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { B2BUnit, TranslatePipe, UserIdService } from '@spartacus/core';
+import {
+  FocusConfig,
+  FocusDirective,
+  FormErrorsModule,
+  LaunchDialogService,
+} from '@spartacus/storefront';
+import { Subscription } from 'rxjs';
+import { take } from 'rxjs/operators';
+import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+
+@Component({
+  selector: 'cx-b2b-unit-selection-dialog',
+  templateUrl: './b2b-unit-selection-dialog.component.html',
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    FocusDirective,
+    TranslatePipe,
+    FormErrorsModule,
+  ],
+})
+export class B2bUnitSelectionDialogComponent
+  implements OnInit, AfterViewInit, OnDestroy
+{
+  orgUnits: B2BUnit[] = [];
+  /** ngOnInit 中计算好，ngAfterViewInit 中使用（届时 *ngFor 已完成渲染）。 */
+  private preselectUid: string | null = null;
+  protected subscriptions = new Subscription();
+
+  focusConfig: FocusConfig = {
+    trap: true,
+    block: true,
+    autofocus: 'select',
+    focusOnEscape: false,
+  };
+
+  form = new FormGroup({
+    selectedUnit: new FormControl<string | null>(null, [Validators.required]),
+  });
+
+  constructor(
+    protected launchDialogService: LaunchDialogService,
+    protected userIdService: UserIdService,
+    protected store: Store,
+    private changeDetectorRef: ChangeDetectorRef
+  ) {}
+
+  ngOnInit(): void {
+    this.subscriptions.add(
+      this.launchDialogService.data$.pipe(take(1)).subscribe(
+        (data: { orgUnits: B2BUnit[]; defaultUnitUid?: string }) => {
+          this.orgUnits = data?.orgUnits ?? [];
+          // OCC /orgUsers/{userId}/orgUnits 只返回 name，不含 uid。
+          // 用 GET /orgUsers/{userId} 返回的 orgUnit.name（即 defaultUnitUid 字段，
+          // 现在存的是 name）与列表中的 name 做匹配来确定预选项。
+          const matched = this.orgUnits.find(
+            (u) => u.name === data?.defaultUnitUid
+          );
+          this.preselectUid = matched?.name ?? this.orgUnits[0]?.name ?? null;
+        }
+      )
+    );
+  }
+
+  ngAfterViewInit(): void {
+    // 视图初始化完成后 *ngFor 已将所有 <option> 渲染进 DOM，
+    // 此时调用 setValue 才能正确匹配并选中对应选项。
+    // detectChanges() 防止开发模式下的 ExpressionChangedAfterItHasBeenCheckedError。
+    if (this.preselectUid !== null) {
+      this.form.get('selectedUnit')?.setValue(this.preselectUid);
+      this.changeDetectorRef.detectChanges();
+    }
+  }
+
+  confirm(): void {
+    if (this.form.invalid) {
+      this.form.markAllAsTouched();
+      return;
+    }
+    const unitUid = this.form.value.selectedUnit!;
+    this.userIdService
+      .takeUserId(true)
+      .pipe(take(1))
+      .subscribe((userId) => {
+        this.store.dispatch(new SetDefaultOrgUnit({ userId, unitUid }));
+      });
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.unsubscribe();
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
new file mode 100644
index 00000000000..e44ec4db770
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Component } from '@angular/core';
+import { OutletRefDirective } from '@spartacus/storefront';
+import { B2bUnitSelectorComponent } from '../b2b-unit-selector/b2b-unit-selector.component';
+
+/**
+ * 通过 Spartacus Outlet 系统将 Company 选择器注入到 SiteContext slot 内，
+ * 紧排在 Language / Currency / Theme 之后。
+ *
+ * 需要在 AppComponent 中挂载此组件，使 outlet 模板始终向 OutletService 注册。
+ */
+@Component({
+  selector: 'cx-b2b-unit-selector-outlet',
+  template: `
+    <ng-template cxOutletRef="SiteContext" cxOutletPos="after">
+      <cx-b2b-unit-selector></cx-b2b-unit-selector>
+    </ng-template>
+  `,
+  imports: [OutletRefDirective, B2bUnitSelectorComponent],
+})
+export class B2bUnitSelectorOutletComponent {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
new file mode 100644
index 00000000000..5e8de11f74f
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -0,0 +1,19 @@
+<!--
+  SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+
+  SPDX-License-Identifier: Apache-2.0
+-->
+
+<label *ngIf="(orgUnits$ | async)?.length ?? 0 > 1">
+  <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}:</span>
+  <div class="cx-select-wrapper">
+    <select (change)="onChange($any($event).target.value)">
+      <option
+        *ngFor="let unit of orgUnits$ | async"
+        [value]="unit.name"
+        [selected]="(activeUnitName$ | async) === unit.name"
+      >{{ unit.name }}</option>
+    </select>
+    <cx-icon aria-hidden="true" [type]="iconTypes.CARET_DOWN" class="small" />
+  </div>
+</label>
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
new file mode 100644
index 00000000000..9ea976711fd
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AsyncPipe, NgFor, NgIf } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+} from '@angular/core';
+import { Store } from '@ngrx/store';
+import { UserIdService } from '@spartacus/core';
+import { IconComponent, ICON_TYPE } from '@spartacus/storefront';
+import { TranslatePipe } from '@spartacus/core';
+import { take } from 'rxjs/operators';
+import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
+
+@Component({
+  selector: 'cx-b2b-unit-selector',
+  templateUrl: './b2b-unit-selector.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [NgIf, NgFor, AsyncPipe, IconComponent, TranslatePipe],
+})
+export class B2bUnitSelectorComponent {
+  iconTypes = ICON_TYPE;
+
+  private stateService = inject(B2bUnitSelectorStateService);
+  private store = inject(Store);
+  private userIdService = inject(UserIdService);
+
+  orgUnits$ = this.stateService.orgUnits$;
+  activeUnitName$ = this.stateService.activeUnitName$;
+
+  onChange(name: string): void {
+    this.userIdService
+      .takeUserId(true)
+      .pipe(take(1))
+      .subscribe((userId) => {
+        this.store.dispatch(new SetDefaultOrgUnit({ userId, unitUid: name }));
+      });
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
new file mode 100644
index 00000000000..77a148e1bc3
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
@@ -0,0 +1,24 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  DIALOG_TYPE,
+  LAUNCH_CALLER,
+  LayoutConfig,
+} from '@spartacus/storefront';
+import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
+// Side-effect import：确保 LAUNCH_CALLER.B2B_UNIT_SELECTION 在 config 常量求值前已被赋值
+import '../root/model/augmented-core.model';
+
+export const defaultB2bUnitSelectionLayoutConfig: LayoutConfig = {
+  launch: {
+    [LAUNCH_CALLER.B2B_UNIT_SELECTION]: {
+      inlineRoot: true,
+      component: B2bUnitSelectionDialogComponent,
+      dialogType: DIALOG_TYPE.DIALOG,
+    },
+  },
+};
diff --git a/feature-libs/organization/b2b-unit-selection/components/public_api.ts b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
new file mode 100644
index 00000000000..76cf1f09891
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './b2b-unit-selection-components.module';
+export * from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
+export * from './b2b-unit-selector/b2b-unit-selector.component';
+export * from './b2b-unit-selector-outlet/b2b-unit-selector-outlet.component';
+export * from './default-b2b-unit-selection-layout.config';
diff --git a/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
new file mode 100644
index 00000000000..818d6c18d66
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { B2bUnitSelectionConnector } from './connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectionStoreModule } from './store/b2b-unit-selection-store.module';
+
+@NgModule({
+  imports: [B2bUnitSelectionStoreModule],
+  providers: [B2bUnitSelectionConnector],
+})
+export class B2bUnitSelectionCoreModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
new file mode 100644
index 00000000000..2204aea7fed
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { B2BUnit } from '@spartacus/core';
+import { Observable } from 'rxjs';
+
+export abstract class B2bUnitSelectionAdapter {
+  /**
+   * 获取当前 B2B 用户个人信息，返回默认 org unit 的 uid。
+   * 对应 GET /{baseSiteId}/orgUsers/{userId}
+   */
+  abstract loadDefaultOrgUnitUid(userId: string): Observable<string | undefined>;
+
+  /**
+   * 获取当前 B2B 用户被分配的所有 org units
+   */
+  abstract loadOrgUnits(userId: string): Observable<B2BUnit[]>;
+
+  /**
+   * 设置当前 B2B 用户的默认 org unit
+   */
+  abstract setDefaultOrgUnit(userId: string, unitUid: string): Observable<void>;
+}
diff --git a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
new file mode 100644
index 00000000000..eb6d95352e3
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { B2BUnit } from '@spartacus/core';
+import { Observable } from 'rxjs';
+import { B2bUnitSelectionAdapter } from './b2b-unit-selection.adapter';
+
+@Injectable()
+export class B2bUnitSelectionConnector {
+  constructor(protected adapter: B2bUnitSelectionAdapter) {}
+
+  loadDefaultOrgUnitUid(userId: string): Observable<string | undefined> {
+    return this.adapter.loadDefaultOrgUnitUid(userId);
+  }
+
+  loadOrgUnits(userId: string): Observable<B2BUnit[]> {
+    return this.adapter.loadOrgUnits(userId);
+  }
+
+  setDefaultOrgUnit(userId: string, unitUid: string): Observable<void> {
+    return this.adapter.setDefaultOrgUnit(userId, unitUid);
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/core/public_api.ts b/feature-libs/organization/b2b-unit-selection/core/public_api.ts
new file mode 100644
index 00000000000..3867e4c07e9
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/public_api.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './b2b-unit-selection-core.module';
+export * from './connectors/b2b-unit-selection.adapter';
+export * from './connectors/b2b-unit-selection.connector';
+export * from './services/b2b-unit-selector-state.service';
+export * from './store/actions/index';
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
new file mode 100644
index 00000000000..ee1c988c7f8
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { B2BUnit } from '@spartacus/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+/**
+ * 轻量级状态服务：在 B2B unit 选择 Dialog 及常驻 Company 选择器之间共享状态。
+ *
+ * 数据由 B2bUnitSelectionEffects 在登录后写入，组件直接订阅，无需重复调用 API。
+ */
+@Injectable({ providedIn: 'root' })
+export class B2bUnitSelectorStateService {
+  private _orgUnits$ = new BehaviorSubject<B2BUnit[]>([]);
+  private _activeUnitName$ = new BehaviorSubject<string | null>(null);
+
+  /** 当前用户被分配的所有 org units */
+  readonly orgUnits$: Observable<B2BUnit[]> =
+    this._orgUnits$.asObservable();
+
+  /** 当前激活（默认）unit 的 name */
+  readonly activeUnitName$: Observable<string | null> =
+    this._activeUnitName$.asObservable();
+
+  setOrgUnits(units: B2BUnit[]): void {
+    this._orgUnits$.next(units);
+  }
+
+  setActiveUnit(name: string | null): void {
+    this._activeUnitName$.next(name);
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
new file mode 100644
index 00000000000..f9450b437ab
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Action } from '@ngrx/store';
+import { B2BUnit } from '@spartacus/core';
+
+// ── Load Org Units ────────────────────────────────────────────────────────────
+
+export const LOAD_USER_ORG_UNITS = '[B2BUnitSelection] Load User Org Units';
+export const LOAD_USER_ORG_UNITS_SUCCESS =
+  '[B2BUnitSelection] Load User Org Units Success';
+export const LOAD_USER_ORG_UNITS_FAIL =
+  '[B2BUnitSelection] Load User Org Units Fail';
+
+export class LoadUserOrgUnits implements Action {
+  readonly type = LOAD_USER_ORG_UNITS;
+  constructor(public payload: { userId: string }) {}
+}
+
+export class LoadUserOrgUnitsSuccess implements Action {
+  readonly type = LOAD_USER_ORG_UNITS_SUCCESS;
+  constructor(public payload: B2BUnit[]) {}
+}
+
+export class LoadUserOrgUnitsFail implements Action {
+  readonly type = LOAD_USER_ORG_UNITS_FAIL;
+  constructor(public payload: any) {}
+}
+
+// ── Set Default Org Unit ──────────────────────────────────────────────────────
+
+export const SET_DEFAULT_ORG_UNIT =
+  '[B2BUnitSelection] Set Default Org Unit';
+export const SET_DEFAULT_ORG_UNIT_SUCCESS =
+  '[B2BUnitSelection] Set Default Org Unit Success';
+export const SET_DEFAULT_ORG_UNIT_FAIL =
+  '[B2BUnitSelection] Set Default Org Unit Fail';
+
+export class SetDefaultOrgUnit implements Action {
+  readonly type = SET_DEFAULT_ORG_UNIT;
+  constructor(public payload: { userId: string; unitUid: string }) {}
+}
+
+export class SetDefaultOrgUnitSuccess implements Action {
+  readonly type = SET_DEFAULT_ORG_UNIT_SUCCESS;
+}
+
+export class SetDefaultOrgUnitFail implements Action {
+  readonly type = SET_DEFAULT_ORG_UNIT_FAIL;
+  constructor(public payload: any) {}
+}
+
+export type B2bUnitSelectionAction =
+  | LoadUserOrgUnits
+  | LoadUserOrgUnitsSuccess
+  | LoadUserOrgUnitsFail
+  | SetDefaultOrgUnit
+  | SetDefaultOrgUnitSuccess
+  | SetDefaultOrgUnitFail;
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
new file mode 100644
index 00000000000..310be832ef1
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './b2b-unit-selection.actions';
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts b/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
new file mode 100644
index 00000000000..b36d4c65df6
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+import { B2bUnitSelectionEffects } from './effects/b2b-unit-selection.effects';
+
+@NgModule({
+  imports: [EffectsModule.forFeature([B2bUnitSelectionEffects])],
+})
+export class B2bUnitSelectionStoreModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
new file mode 100644
index 00000000000..2895232c802
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -0,0 +1,179 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { HttpErrorResponse } from '@angular/common/http';
+import { ApplicationRef, inject, Injectable } from '@angular/core';
+import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  AuthActions,
+  B2BUnit,
+  LoggerService,
+  tryNormalizeHttpError,
+  UserIdService,
+} from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+import { EMPTY, forkJoin, Observable, of } from 'rxjs';
+import {
+  catchError,
+  exhaustMap,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
+import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
+import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
+
+@Injectable()
+export class B2bUnitSelectionEffects {
+  protected logger = inject(LoggerService);
+  private coordinator = inject(B2bRedirectCoordinator);
+  private applicationRef = inject(ApplicationRef);
+  private stateService = inject(B2bUnitSelectorStateService);
+
+  /**
+   * 监听 LOGIN action，获取用户所属 org units 及默认 unit。
+   *
+   * 有两种触发场景：
+   * 1. 手动登录（ROPC，用户在 Spartacus login 页填表提交）：
+   *    ApplicationRef.components 已有挂载组件，可直接开 dialog。
+   *
+   * 2. OAuth Code Flow 登录或页面刷新自动还原 token：
+   *    ApplicationRef.components 可能为空，需轮询等待 AppComponent 挂载后再开 dialog。
+   */
+  checkOrgUnitsOnLogin$: Observable<
+    | B2bUnitSelectionActions.LoadUserOrgUnitsSuccess
+    | B2bUnitSelectionActions.LoadUserOrgUnitsFail
+  > = createEffect(() =>
+    this.actions$.pipe(
+      ofType<AuthActions.Login>(AuthActions.LOGIN),
+      exhaustMap(() =>
+        this.userIdService.takeUserId(true).pipe(
+          switchMap((userId) =>
+            forkJoin({
+              orgUnits: this.connector.loadOrgUnits(userId),
+              // 获取用户默认 unit 失败时降级为 undefined，不阻断主流程
+              defaultUnitUid: this.connector
+                .loadDefaultOrgUnitUid(userId)
+                .pipe(catchError(() => of(undefined))),
+            }).pipe(
+              tap(({ orgUnits, defaultUnitUid }) => {
+                // 无论 unit 数量多少，都写入状态服务，供 Company 选择器使用
+                this.stateService.setOrgUnits(orgUnits);
+                this.stateService.setActiveUnit(defaultUnitUid ?? null);
+                if (orgUnits.length > 1) {
+                  this.openDialogWhenReady(orgUnits, defaultUnitUid);
+                } else {
+                  this.coordinator.allowRedirect();
+                }
+              }),
+              map(
+                ({ orgUnits }) =>
+                  new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(orgUnits)
+              ),
+              catchError((error: HttpErrorResponse) => {
+                this.coordinator.allowRedirect();
+                return of(
+                  new B2bUnitSelectionActions.LoadUserOrgUnitsFail(
+                    tryNormalizeHttpError(error, this.logger)
+                  )
+                );
+              })
+            )
+          ),
+          catchError(() => {
+            this.coordinator.allowRedirect();
+            return EMPTY;
+          })
+        )
+      )
+    )
+  );
+
+  /**
+   * 监听 SET_DEFAULT_ORG_UNIT action，调用 PUT API 设置默认 unit。
+   * 成功后放行 redirect 并关闭 dialog。
+   */
+  setDefaultOrgUnit$: Observable<
+    | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
+    | B2bUnitSelectionActions.SetDefaultOrgUnitFail
+  > = createEffect(() =>
+    this.actions$.pipe(
+      ofType<B2bUnitSelectionActions.SetDefaultOrgUnit>(
+        B2bUnitSelectionActions.SET_DEFAULT_ORG_UNIT
+      ),
+      map(
+        (action: B2bUnitSelectionActions.SetDefaultOrgUnit) => action.payload
+      ),
+      switchMap(({ userId, unitUid }) =>
+        this.connector.setDefaultOrgUnit(userId, unitUid).pipe(
+          tap(() => {
+            this.coordinator.allowRedirect();
+            this.launchDialogService.closeDialog('CONFIRMED');
+            this.stateService.setActiveUnit(unitUid);
+          }),
+          map(() => new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess()),
+          catchError((error: HttpErrorResponse) =>
+            of(
+              new B2bUnitSelectionActions.SetDefaultOrgUnitFail(
+                tryNormalizeHttpError(error, this.logger)
+              )
+            )
+          )
+        )
+      )
+    )
+  );
+
+  constructor(
+    private actions$: Actions,
+    private connector: B2bUnitSelectionConnector,
+    private userIdService: UserIdService,
+    private launchDialogService: LaunchDialogService
+  ) {}
+
+  /**
+   * 根据 AppComponent 是否已挂载决定打开 dialog 的时机。
+   *
+   * InlineRootRenderStrategy 需要 ApplicationRef.components[0] 存在才能渲染 dialog。
+   * 以 components.length > 0 作为判断依据，直接对应该前提条件：
+   * - components 已就绪（手动登录：用户在页面上操作）：立即打开。
+   * - components 尚未就绪（APP_INITIALIZER 阶段自动还原 token）：等 Angular
+   *   bootstrap 完成（isStable 首次为 true）后再打开。
+   *
+   * 注意：不再使用 coordinator.isBlocked() 判断，因为 MetaReducer 在所有
+   * LOGIN dispatch 时都会设置 blocked（包括页面刷新场景），会导致误判。
+   */
+  private openDialogWhenReady(
+    orgUnits: B2BUnit[],
+    defaultUnitUid: string | undefined
+  ): void {
+    const open = () => {
+      this.launchDialogService.openDialogAndSubscribe(
+        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        undefined,
+        { orgUnits, defaultUnitUid }
+      );
+    };
+
+    if (this.applicationRef.components.length > 0) {
+      // 手动登录 / AppComponent 已挂载：立即打开
+      open();
+    } else {
+      // OAuth Code Flow / APP_INITIALIZER 阶段：轮询直到 AppComponent 挂载
+      // 比 isStable 更快，避免等待所有 HTTP 请求完成
+      const poll = () => {
+        if (this.applicationRef.components.length > 0) {
+          open();
+        } else {
+          requestAnimationFrame(poll);
+        }
+      };
+      requestAnimationFrame(poll);
+    }
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
new file mode 100644
index 00000000000..1c2e42a0338
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -0,0 +1,72 @@
+/*
+ * SPDX-FileCopyrightText: 2026 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 {
+  B2BUnit,
+  LoggerService,
+  OccEndpointsService,
+  tryNormalizeHttpError,
+} from '@spartacus/core';
+import { B2bUnitSelectionAdapter } from '../../core/connectors/b2b-unit-selection.adapter';
+import { Observable } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+// 注册 OccEndpoints module augmentation
+import '../model/occ-b2b-unit-selection-endpoints.model';
+
+@Injectable()
+export class OccB2bUnitSelectionAdapter implements B2bUnitSelectionAdapter {
+  protected logger = inject(LoggerService);
+
+  constructor(
+    protected http: HttpClient,
+    protected occEndpoints: OccEndpointsService
+  ) {}
+
+  loadDefaultOrgUnitUid(userId: string): Observable<string | undefined> {
+    return this.http
+      .get<{ orgUnit?: { name?: string } }>(
+        this.occEndpoints.buildUrl('orgUser', { urlParams: { userId } })
+      )
+      .pipe(
+        map((response) => response?.orgUnit?.name),
+        catchError((error: HttpErrorResponse) => {
+          throw tryNormalizeHttpError(error, this.logger);
+        })
+      );
+  }
+
+  loadOrgUnits(userId: string): Observable<B2BUnit[]> {
+    return this.http
+      .get<{ orgUnits: B2BUnit[] }>(
+        this.occEndpoints.buildUrl('orgUserUnits', {
+          urlParams: { userId },
+        })
+      )
+      .pipe(
+        map((response) => response?.orgUnits ?? []),
+        catchError((error: HttpErrorResponse) => {
+          throw tryNormalizeHttpError(error, this.logger);
+        })
+      );
+  }
+
+  setDefaultOrgUnit(userId: string, unitUid: string): Observable<void> {
+    return this.http
+      .put<void>(
+        this.occEndpoints.buildUrl('orgUserDefaultUnit', {
+          urlParams: { userId },
+        }),
+        { uid: unitUid }
+      )
+      .pipe(
+        catchError((error: HttpErrorResponse) => {
+          throw tryNormalizeHttpError(error, this.logger);
+        })
+      );
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
new file mode 100644
index 00000000000..03d993b2de9
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
+import { B2bUnitSelectionAdapter } from '../core/connectors/b2b-unit-selection.adapter';
+import { OccB2bUnitSelectionAdapter } from './adapters/occ-b2b-unit-selection.adapter';
+import { defaultOccB2bUnitSelectionConfig } from './config/default-occ-b2b-unit-selection-config';
+
+@NgModule({
+  providers: [
+    provideDefaultConfig(defaultOccB2bUnitSelectionConfig),
+    {
+      provide: B2bUnitSelectionAdapter,
+      useClass: OccB2bUnitSelectionAdapter,
+    },
+  ],
+})
+export class B2bUnitSelectionOccModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/occ/config/default-occ-b2b-unit-selection-config.ts b/feature-libs/organization/b2b-unit-selection/occ/config/default-occ-b2b-unit-selection-config.ts
new file mode 100644
index 00000000000..41cb61986c3
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/config/default-occ-b2b-unit-selection-config.ts
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccConfig } from '@spartacus/core';
+
+export const defaultOccB2bUnitSelectionConfig: OccConfig = {
+  backend: {
+    occ: {
+      endpoints: {
+        orgUser: 'orgUsers/${userId}',
+        orgUserUnits: 'orgUsers/${userId}/orgUnits',
+        orgUserDefaultUnit: 'orgUsers/${userId}/defaultOrgUnit',
+      },
+    },
+  },
+};
diff --git a/feature-libs/organization/b2b-unit-selection/occ/model/index.ts b/feature-libs/organization/b2b-unit-selection/occ/model/index.ts
new file mode 100644
index 00000000000..2db5d68ad45
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/model/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './occ-b2b-unit-selection-endpoints.model';
diff --git a/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts b/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
new file mode 100644
index 00000000000..91fc04f0305
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccEndpoint } from '@spartacus/core';
+
+export interface B2bUnitSelectionOccEndpoints {
+  /**
+   * 获取当前 B2B 用户个人信息（含 orgUnit 默认 unit）
+   * GET /{baseSiteId}/orgUsers/{userId}
+   */
+  orgUser?: string | OccEndpoint;
+
+  /**
+   * 获取当前 B2B 用户所被分配的所有 org units
+   * GET /{baseSiteId}/orgUsers/{userId}/orgUnits
+   */
+  orgUserUnits?: string | OccEndpoint;
+
+  /**
+   * 设置当前 B2B 用户的默认 org unit
+   * PUT /{baseSiteId}/orgUsers/{userId}/defaultOrgUnit
+   */
+  orgUserDefaultUnit?: string | OccEndpoint;
+}
+
+declare module '@spartacus/core' {
+  interface OccEndpoints extends B2bUnitSelectionOccEndpoints {}
+}
diff --git a/feature-libs/organization/b2b-unit-selection/occ/public_api.ts b/feature-libs/organization/b2b-unit-selection/occ/public_api.ts
new file mode 100644
index 00000000000..d82019fc6f0
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/public_api.ts
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './adapters/occ-b2b-unit-selection.adapter';
+export * from './b2b-unit-selection-occ.module';
+export * from './config/default-occ-b2b-unit-selection-config';
+export * from './model/index';
diff --git a/feature-libs/organization/b2b-unit-selection/public_api.ts b/feature-libs/organization/b2b-unit-selection/public_api.ts
new file mode 100644
index 00000000000..bba9db72d21
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/public_api.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './b2b-unit-selection.module';
+export * from './components/public_api';
+export * from './core/public_api';
+export * from './occ/public_api';
+export * from './root/public_api';
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
new file mode 100644
index 00000000000..edfddd22410
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { inject, Injectable } from '@angular/core';
+import { AuthRedirectService } from '@spartacus/core';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+
+/**
+ * 拦截 AuthRedirectService.redirect()：
+ * 若 B2B unit 选择流程正在进行（coordinator.isBlocked），
+ * 则等待 coordinator.whenAllowed$() 信号后再执行实际跳转。
+ *
+ * 通过 MetaReducer 在 LOGIN action dispatch 时同步设置 blocked 状态，
+ * 确保此处能在 redirect() 调用时感知到拦截标志。
+ */
+@Injectable()
+export class B2bAwareAuthRedirectService extends AuthRedirectService {
+  private coordinator = inject(B2bRedirectCoordinator);
+
+  override redirect(): void {
+    if (!this.coordinator.isBlocked()) {
+      super.redirect();
+      return;
+    }
+    this.coordinator.whenAllowed$().subscribe(() => {
+      super.redirect();
+    });
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
new file mode 100644
index 00000000000..7434a144763
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ActionReducer } from '@ngrx/store';
+import { AuthActions } from '@spartacus/core';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+
+/**
+ * 在模块加载时（早于所有 APP_INITIALIZER）捕获原始 URL。
+ * angular-oauth2-oidc 在 APP_INITIALIZER 阶段处理 OAuth callback 时会清除
+ * URL 中的 ?code=... 参数，因此必须在此之前捕获。
+ */
+const _hrefAtModuleLoad =
+  typeof window !== 'undefined' ? window.location.href : '';
+
+/**
+ * MetaReducer 工厂函数：仅在"真正登录"场景调用 blockRedirect()，跳过 token 还原。
+ *
+ * 判断依据（优先级由高到低）：
+ *   1. 模块加载时 URL 含 ?code=...&state=... → Authorization Code Flow 回调
+ *   2. 当前 URL 含 /login → ROPC（用户在 Spartacus login 页填表提交）
+ *   3. 其余情况 → token 还原或非登录场景，不拦截
+ */
+export function createB2bLoginMetaReducer(
+  coordinator: B2bRedirectCoordinator
+): (reducer: ActionReducer<any>) => ActionReducer<any> {
+  const hasFreshOAuthCode =
+    _hrefAtModuleLoad.includes('code=') && _hrefAtModuleLoad.includes('state=');
+
+  return (reducer) =>
+    (state, action) => {
+      if (action.type === AuthActions.LOGIN) {
+        const currentHref =
+          typeof window !== 'undefined' ? window.location.href : '';
+        const isOnLoginPage = currentHref.includes('/login');
+        const isFreshLogin = hasFreshOAuthCode || isOnLoginPage;
+        if (isFreshLogin) {
+          coordinator.blockRedirect();
+        }
+      }
+      return reducer(state, action);
+    };
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
new file mode 100644
index 00000000000..61098b9298a
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
@@ -0,0 +1,43 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { filter, take } from 'rxjs/operators';
+
+/**
+ * 协调 B2B unit 选择与 login redirect 的时序。
+ *
+ * 工作流程：
+ * 1. MetaReducer 在 LOGIN action dispatch 的瞬间（同步）调用 blockRedirect()
+ * 2. AuthRedirectService.redirect() 检测到 blocked 状态后挂起，等待 whenAllowed$
+ * 3. Effect 完成 org units 加载并打开 dialog
+ * 4. 用户确认 unit 后，effect 调用 allowRedirect() → 挂起的 redirect 执行
+ */
+@Injectable({ providedIn: 'root' })
+export class B2bRedirectCoordinator {
+  private allowed$ = new BehaviorSubject<boolean>(true);
+
+  blockRedirect(): void {
+    this.allowed$.next(false);
+  }
+
+  allowRedirect(): void {
+    this.allowed$.next(true);
+  }
+
+  isBlocked(): boolean {
+    return !this.allowed$.getValue();
+  }
+
+  /** 等待 gate 打开（只取第一次 true 信号） */
+  whenAllowed$(): Observable<boolean> {
+    return this.allowed$.pipe(
+      filter((v) => v),
+      take(1)
+    );
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
new file mode 100644
index 00000000000..64a8030632a
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
@@ -0,0 +1,78 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ApplicationRef } from '@angular/core';
+import { Router } from '@angular/router';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+
+/**
+ * APP_INITIALIZER 工厂：在 bootstrap 阶段直接 patch Angular Router 内部的
+ * scheduleNavigation() 方法——所有路由跳转（包括 Guard UrlTree 重定向）的
+ * 唯一真正入口。
+ *
+ * 调用链（所有路径最终都汇聚到此方法）：
+ *   router.navigate()       → router.navigateByUrl() → scheduleNavigation()
+ *   router.navigateByUrl()                           → scheduleNavigation()
+ *   Guard 返回 UrlTree      → RedirectRequest 事件   → scheduleNavigation()
+ *   浏览器触发的历史导航                              → scheduleNavigation()
+ *
+ * 拦截条件（两个条件同时满足才拦截）：
+ *   1. coordinator.isBlocked()：MetaReducer 已在 dispatch(Login) 时同步设置。
+ *   2. applicationRef.components.length > 0：AppComponent 已挂载，表明这是
+ *      用户主动登录场景（而非页面刷新时的 token 自动恢复场景）。
+ *
+ * 区分两种 LOGIN 场景：
+ *   - 页面刷新（token 自动恢复）：LOGIN 在 APP_INITIALIZER 阶段 dispatch，
+ *     此时 AppComponent 尚未挂载（components.length = 0），不拦截导航，
+ *     页面正常加载；dialog 通过 ApplicationRef.isStable 延迟打开。
+ *   - 手动登录（用户填写表单）：LOGIN 在用户交互后 dispatch，
+ *     此时 AppComponent 已挂载（components.length > 0），拦截 redirect，
+ *     用户停留在 login 页面，等待 B2B unit 选择完成后再跳转。
+ */
+export function createB2bRedirectPatcher(
+  router: Router,
+  coordinator: B2bRedirectCoordinator,
+  appRef: ApplicationRef
+): () => void {
+  return (): void => {
+    const originalScheduleNavigation: (...args: any[]) => Promise<boolean> = (
+      router as any
+    ).scheduleNavigation.bind(router);
+
+    (router as any).scheduleNavigation = (
+      rawUrl: any,
+      source: any,
+      restoredState: any,
+      extras: any,
+      priorPromise?: any
+    ): Promise<boolean> => {
+      const blocked = coordinator.isBlocked();
+      const componentsLen = appRef.components.length;
+      // 仅在手动登录场景（AppComponent 已挂载）时拦截，
+      // 页面刷新 token 恢复场景（components.length = 0）直接放行
+      if (!blocked || componentsLen === 0) {
+        return originalScheduleNavigation(
+          rawUrl,
+          source,
+          restoredState,
+          extras,
+          priorPromise
+        );
+      }
+      // B2B unit 选择进行中：挂起导航，待 allowRedirect() 后执行
+      coordinator.whenAllowed$().subscribe(() => {
+        originalScheduleNavigation(
+          rawUrl,
+          source,
+          restoredState,
+          extras,
+          priorPromise
+        );
+      });
+      return Promise.resolve(false);
+    };
+  };
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
new file mode 100644
index 00000000000..ad437466bba
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { APP_INITIALIZER, ApplicationRef, NgModule } from '@angular/core';
+import { Router } from '@angular/router';
+import { META_REDUCERS } from '@ngrx/store';
+import { AuthRedirectService } from '@spartacus/core';
+import { B2bAwareAuthRedirectService } from './b2b-aware-auth-redirect.service';
+import { createB2bLoginMetaReducer } from './b2b-login-meta-reducer';
+import { createB2bRedirectPatcher } from './b2b-redirect-patcher';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+// 确保 LAUNCH_CALLER 扩展在应用启动时生效
+import './model/augmented-core.model';
+
+@NgModule({
+  providers: [
+    /**
+     * 覆盖 AuthRedirectService：在 B2B unit 选择进行中时延迟 redirect()。
+     * 这是拦截 post-login redirect 最精准的切入点，只影响 redirect() 调用，
+     * 不影响其他任何导航。
+     */
+    {
+      provide: AuthRedirectService,
+      useClass: B2bAwareAuthRedirectService,
+    },
+    /**
+     * MetaReducer：LOGIN action dispatch 时在 reducer pipeline 中同步调用
+     * blockRedirect()。MetaReducer 在 dispatch() 内部同步执行，早于
+     * AuthService.loginWithCredentials() 中紧随 dispatch() 的 redirect() 调用。
+     * 确保 redirect() 和 NotAuthGuard.canActivate() 到达时 blocked 标志已就绪。
+     */
+    {
+      provide: META_REDUCERS,
+      useFactory: createB2bLoginMetaReducer,
+      deps: [B2bRedirectCoordinator],
+      multi: true,
+    },
+    /**
+     * APP_INITIALIZER：patch scheduleNavigation 作为安全兜底，
+     * 拦截 NotAuthGuard UrlTree 等不经过 AuthRedirectService 的路由跳转。
+     */
+    {
+      provide: APP_INITIALIZER,
+      useFactory: createB2bRedirectPatcher,
+      deps: [Router, B2bRedirectCoordinator, ApplicationRef],
+      multi: true,
+    },
+  ],
+})
+export class B2bUnitSelectionRootModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/root/feature-name.ts b/feature-libs/organization/b2b-unit-selection/root/feature-name.ts
new file mode 100644
index 00000000000..8d502669eb0
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/feature-name.ts
@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const ORGANIZATION_B2B_UNIT_SELECTION_FEATURE =
+  'organizationB2BUnitSelection';
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
new file mode 100644
index 00000000000..00b39679b56
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LAUNCH_CALLER } from '@spartacus/storefront';
+
+declare module '@spartacus/storefront' {
+  enum LAUNCH_CALLER {
+    B2B_UNIT_SELECTION = 'B2B_UNIT_SELECTION',
+  }
+}
+
+(LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/index.ts b/feature-libs/organization/b2b-unit-selection/root/model/index.ts
new file mode 100644
index 00000000000..20ab831a93c
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/model/index.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './augmented-core.model';
diff --git a/feature-libs/organization/b2b-unit-selection/root/public_api.ts b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
new file mode 100644
index 00000000000..3843d1182a1
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './b2b-unit-selection-root.module';
+export * from './feature-name';
+export * from './model/index';
diff --git a/projects/storefrontapp/src/app/app.component.ts b/projects/storefrontapp/src/app/app.component.ts
index b47e67dc3f9..a5a76b86145 100644
--- a/projects/storefrontapp/src/app/app.component.ts
+++ b/projects/storefrontapp/src/app/app.component.ts
@@ -5,6 +5,7 @@
  */
 
 import { Component } from '@angular/core';
+import { B2bUnitSelectorOutletComponent } from '@spartacus/organization/b2b-unit-selection';
 import { StorefrontComponent } from '@spartacus/storefront';
 
 /**
@@ -13,7 +14,10 @@ import { StorefrontComponent } from '@spartacus/storefront';
  */
 @Component({
   selector: 'app-root',
-  template: `<cx-storefront></cx-storefront>`,
-  imports: [StorefrontComponent],
+  template: `
+    <cx-storefront></cx-storefront>
+    <cx-b2b-unit-selector-outlet></cx-b2b-unit-selector-outlet>
+  `,
+  imports: [StorefrontComponent, B2bUnitSelectorOutletComponent],
 })
 export class AppComponent {}
diff --git a/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
new file mode 100644
index 00000000000..701952a008f
--- /dev/null
+++ b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { NgModule } from '@angular/core';
+import { I18nConfig, provideConfig } from '@spartacus/core';
+import {
+  b2bUnitSelectionTranslationChunksConfig,
+  b2bUnitSelectionTranslationsEn,
+} from '@spartacus/organization/b2b-unit-selection/assets';
+import { B2bUnitSelectionModule } from '@spartacus/organization/b2b-unit-selection';
+import { B2bUnitSelectionRootModule } from '@spartacus/organization/b2b-unit-selection/root';
+
+/**
+ * B2B Unit Selection 功能模块。
+ *
+ * 注意：此模块必须 eager-load（不能使用 featureModules 懒加载），
+ * 因为 B2bUnitSelectionEffects 需要在应用启动时注册，
+ * 以便监听 AuthActions.LOGIN 事件。
+ */
+@NgModule({
+  imports: [
+    B2bUnitSelectionRootModule,
+    B2bUnitSelectionModule,
+  ],
+  providers: [
+    provideConfig(<I18nConfig>{
+      i18n: {
+        resources: {
+          en: b2bUnitSelectionTranslationsEn,
+        },
+        chunks: b2bUnitSelectionTranslationChunksConfig,
+      },
+    }),
+  ],
+})
+export class OrganizationB2bUnitSelectionFeatureModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 7504b05c3e8..ea3b56908c6 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 { OrderDocumentFlowFeatureModule } from './features/order/order-document-
 import { OrderFeatureModule } from './features/order/order-feature.module';
 import { AccountSummaryFeatureModule } from './features/organization/organization-account-summary-feature.module';
 import { AdministrationFeatureModule } from './features/organization/organization-administration-feature.module';
+import { OrganizationB2bUnitSelectionFeatureModule } from './features/organization/organization-b2b-unit-selection-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';
@@ -120,6 +121,7 @@ if (environment.b2b) {
     AccountSummaryFeatureModule,
     BulkPricingFeatureModule,
     OrderApprovalFeatureModule,
+    OrganizationB2bUnitSelectionFeatureModule,
     OrganizationUserRegistrationFeatureModule,
     UnitOrderFeatureModule,
     FutureStockFeatureModule
diff --git a/tsconfig.json b/tsconfig.json
index c302d9723d8..810164f7ba2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -455,6 +455,24 @@
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/order": [
         "feature-libs/order/public_api"
       ],

From 1bf9e98c65863dedc97a2681f98ee3a5f78ab21e Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:08:50 +0800
Subject: [PATCH 02/60] fix

fix
---
 feature-libs/organization/_index.scss         |   1 +
 .../b2b-unit-selection-components.module.ts   |  19 +--
 .../b2b-unit-selection-dialog.component.html  |  23 ++--
 .../b2b-unit-selection-dialog.component.ts    |  52 +++-----
 .../b2b-unit-selector-outlet.component.ts     |  26 ----
 .../abstract-b2b-unit-selector.component.ts   |  89 +++++++++++++
 .../b2b-unit-selector.component.html          |  28 ++--
 .../b2b-unit-selector.component.ts            |  45 ++-----
 .../components/public_api.ts                  |   2 +-
 .../actions/b2b-unit-selection.actions.ts     |   9 +-
 .../effects/b2b-unit-selection.effects.ts     |  33 ++++-
 .../styles/_b2b-unit-selector.scss            | 123 ++++++++++++++++++
 .../b2b-unit-selection/styles/_index.scss     |   1 +
 .../storefrontapp/src/app/app.component.ts    |   8 +-
 14 files changed, 333 insertions(+), 126 deletions(-)
 delete mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
 create mode 100644 feature-libs/organization/b2b-unit-selection/styles/_index.scss

diff --git a/feature-libs/organization/_index.scss b/feature-libs/organization/_index.scss
index 6b2812e89c7..937cd2a9ad0 100644
--- a/feature-libs/organization/_index.scss
+++ b/feature-libs/organization/_index.scss
@@ -13,3 +13,4 @@
 @import './user-registration/index';
 @import './account-summary/index';
 @import './unit-order/index';
+@import './b2b-unit-selection/styles/index';
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
index f6ecf08a8db..0921d386fb8 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
@@ -5,19 +5,22 @@
  */
 
 import { NgModule } from '@angular/core';
-import { provideDefaultConfig } from '@spartacus/core';
+import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
-import { B2bUnitSelectorOutletComponent } from './b2b-unit-selector-outlet/b2b-unit-selector-outlet.component';
 import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selection-layout.config';
 
 @NgModule({
-  imports: [
-    B2bUnitSelectionDialogComponent,
-    B2bUnitSelectorComponent,
-    B2bUnitSelectorOutletComponent,
+  imports: [B2bUnitSelectionDialogComponent, B2bUnitSelectorComponent],
+  providers: [
+    provideDefaultConfig(defaultB2bUnitSelectionLayoutConfig),
+    provideDefaultConfig(<CmsConfig>{
+      cmsComponents: {
+        B2bUnitSelectorComponent: {
+          component: B2bUnitSelectorComponent,
+        },
+      },
+    }),
   ],
-  exports: [B2bUnitSelectorOutletComponent],
-  providers: [provideDefaultConfig(defaultB2bUnitSelectionLayoutConfig)],
 })
 export class B2bUnitSelectionComponentsModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
index 97addbd91bb..3b7aa7b5544 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
@@ -1,3 +1,9 @@
+<!--
+  SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+
+  SPDX-License-Identifier: Apache-2.0
+-->
+
 <div
   class="cx-b2b-unit-selection-dialog cx-modal-container"
   role="dialog"
@@ -22,16 +28,15 @@ <h2 id="b2b-unit-selection-title" class="modal-title">
         <label for="b2b-unit-select" class="cx-required-field">
           {{ 'b2bUnitSelection.dialog.unitLabel' | cxTranslate }}
         </label>
-        <select
-          id="b2b-unit-select"
-          class="form-control"
+        <ng-select
+          inputId="b2b-unit-select"
           formControlName="selectedUnit"
-          [attr.aria-required]="true"
-        >
-          <option *ngFor="let unit of orgUnits" [value]="unit.name">
-            {{ unit.name }}
-          </option>
-        </select>
+          [items]="orgUnits"
+          bindLabel="name"
+          [clearable]="false"
+          [searchable]="false"
+          [cxNgSelectA11y]="{ ariaLabel: 'b2bUnitSelection.dialog.unitLabel' | cxTranslate }"
+        ></ng-select>
         <cx-form-errors
           [control]="form.get('selectedUnit')"
         ></cx-form-errors>
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 18f4047f0d0..b86b4d9791f 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -4,10 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommonModule } from '@angular/common';
 import {
-  AfterViewInit,
-  ChangeDetectorRef,
+  ChangeDetectionStrategy,
   Component,
   OnDestroy,
   OnInit,
@@ -25,7 +23,9 @@ import {
   FocusDirective,
   FormErrorsModule,
   LaunchDialogService,
+  NgSelectA11yDirective,
 } from '@spartacus/storefront';
+import { NgSelectComponent } from '@ng-select/ng-select';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
@@ -33,38 +33,35 @@ import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.a
 @Component({
   selector: 'cx-b2b-unit-selection-dialog',
   templateUrl: './b2b-unit-selection-dialog.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
-    CommonModule,
     ReactiveFormsModule,
     FocusDirective,
     TranslatePipe,
     FormErrorsModule,
+    NgSelectComponent,
+    NgSelectA11yDirective,
   ],
 })
-export class B2bUnitSelectionDialogComponent
-  implements OnInit, AfterViewInit, OnDestroy
-{
+export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
   orgUnits: B2BUnit[] = [];
-  /** ngOnInit 中计算好，ngAfterViewInit 中使用（届时 *ngFor 已完成渲染）。 */
-  private preselectUid: string | null = null;
   protected subscriptions = new Subscription();
 
   focusConfig: FocusConfig = {
     trap: true,
     block: true,
-    autofocus: 'select',
+    autofocus: 'ng-select',
     focusOnEscape: false,
   };
 
   form = new FormGroup({
-    selectedUnit: new FormControl<string | null>(null, [Validators.required]),
+    selectedUnit: new FormControl<B2BUnit | null>(null, [Validators.required]),
   });
 
   constructor(
     protected launchDialogService: LaunchDialogService,
     protected userIdService: UserIdService,
-    protected store: Store,
-    private changeDetectorRef: ChangeDetectorRef
+    protected store: Store
   ) {}
 
   ngOnInit(): void {
@@ -72,39 +69,30 @@ export class B2bUnitSelectionDialogComponent
       this.launchDialogService.data$.pipe(take(1)).subscribe(
         (data: { orgUnits: B2BUnit[]; defaultUnitUid?: string }) => {
           this.orgUnits = data?.orgUnits ?? [];
-          // OCC /orgUsers/{userId}/orgUnits 只返回 name，不含 uid。
-          // 用 GET /orgUsers/{userId} 返回的 orgUnit.name（即 defaultUnitUid 字段，
-          // 现在存的是 name）与列表中的 name 做匹配来确定预选项。
-          const matched = this.orgUnits.find(
-            (u) => u.name === data?.defaultUnitUid
-          );
-          this.preselectUid = matched?.name ?? this.orgUnits[0]?.name ?? null;
+          // OCC /orgUsers/{userId}/orgUnits 只返回 name，不含 uid，以 name 做匹配预选。
+          const matched =
+            this.orgUnits.find((u) => u.name === data?.defaultUnitUid) ??
+            this.orgUnits[0] ??
+            null;
+          this.form.get('selectedUnit')?.setValue(matched);
         }
       )
     );
   }
 
-  ngAfterViewInit(): void {
-    // 视图初始化完成后 *ngFor 已将所有 <option> 渲染进 DOM，
-    // 此时调用 setValue 才能正确匹配并选中对应选项。
-    // detectChanges() 防止开发模式下的 ExpressionChangedAfterItHasBeenCheckedError。
-    if (this.preselectUid !== null) {
-      this.form.get('selectedUnit')?.setValue(this.preselectUid);
-      this.changeDetectorRef.detectChanges();
-    }
-  }
-
   confirm(): void {
     if (this.form.invalid) {
       this.form.markAllAsTouched();
       return;
     }
-    const unitUid = this.form.value.selectedUnit!;
+    const unit = this.form.value.selectedUnit!;
     this.userIdService
       .takeUserId(true)
       .pipe(take(1))
       .subscribe((userId) => {
-        this.store.dispatch(new SetDefaultOrgUnit({ userId, unitUid }));
+        this.store.dispatch(
+          new SetDefaultOrgUnit({ userId, unitUid: unit.name ?? '' })
+        );
       });
   }
 
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
deleted file mode 100644
index e44ec4db770..00000000000
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector-outlet/b2b-unit-selector-outlet.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Component } from '@angular/core';
-import { OutletRefDirective } from '@spartacus/storefront';
-import { B2bUnitSelectorComponent } from '../b2b-unit-selector/b2b-unit-selector.component';
-
-/**
- * 通过 Spartacus Outlet 系统将 Company 选择器注入到 SiteContext slot 内，
- * 紧排在 Language / Currency / Theme 之后。
- *
- * 需要在 AppComponent 中挂载此组件，使 outlet 模板始终向 OutletService 注册。
- */
-@Component({
-  selector: 'cx-b2b-unit-selector-outlet',
-  template: `
-    <ng-template cxOutletRef="SiteContext" cxOutletPos="after">
-      <cx-b2b-unit-selector></cx-b2b-unit-selector>
-    </ng-template>
-  `,
-  imports: [OutletRefDirective, B2bUnitSelectorComponent],
-})
-export class B2bUnitSelectorOutletComponent {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
new file mode 100644
index 00000000000..7c012bf6f1f
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -0,0 +1,89 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { computed, Directive, inject, OnInit } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { Store } from '@ngrx/store';
+import { B2BUnit, UserIdService } from '@spartacus/core';
+import { forkJoin, of } from 'rxjs';
+import { catchError, take } from 'rxjs/operators';
+import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
+import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+
+/**
+ * 抽象基类：封装 Company 选择器的状态与交互逻辑。
+ * 子类只需提供 selector 与模板。
+ *
+ * 初始化时若 stateService 无数据（例如页面刷新后 effects 尚未写入），
+ * 则主动调用 connector 加载，确保选择器在任何场景下都能正确显示。
+ */
+@Directive()
+export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
+  protected stateService = inject(B2bUnitSelectorStateService);
+  protected store = inject(Store);
+  protected userIdService = inject(UserIdService);
+  protected connector = inject(B2bUnitSelectionConnector);
+
+  private _orgUnits = toSignal(this.stateService.orgUnits$, {
+    initialValue: [] as B2BUnit[],
+  });
+  private _activeUnitName = toSignal(this.stateService.activeUnitName$, {
+    initialValue: null as string | null,
+  });
+
+  /** 所有可选 B2B units */
+  readonly items = computed(() => this._orgUnits());
+
+  /** 仅当 unit 数量 ≥ 2 时才显示选择器 */
+  readonly hasMultipleUnits = computed(() => this._orgUnits().length > 1);
+
+  /** 有任意 unit 时显示选择器（含单 unit 禁用态） */
+  readonly hasAnyUnit = computed(() => this._orgUnits().length > 0);
+
+  /** 当前激活 unit 的 name */
+  readonly activeUnitName = computed(() => this._activeUnitName());
+
+  ngOnInit(): void {
+    // 页面刷新后 BehaviorSubject 为空（effects 可能尚未写入），主动补充加载一次
+    this.stateService.orgUnits$.pipe(take(1)).subscribe((units) => {
+      if (units.length === 0) {
+        this.loadAndPopulateState();
+      }
+    });
+  }
+
+  /** 用户切换 unit 后调用 PUT /defaultOrgUnit，成功后跳转首页 */
+  onSelect(unitName: string): void {
+    this.userIdService
+      .takeUserId(true)
+      .pipe(take(1))
+      .subscribe((userId) => {
+        this.store.dispatch(
+          new SetDefaultOrgUnit({ userId, unitUid: unitName, redirectToHome: true })
+        );
+      });
+  }
+
+  private loadAndPopulateState(): void {
+    this.userIdService
+      .takeUserId(true)
+      .pipe(take(1))
+      .subscribe((userId) => {
+        forkJoin({
+          orgUnits: this.connector.loadOrgUnits(userId),
+          defaultUnitUid: this.connector
+            .loadDefaultOrgUnitUid(userId)
+            .pipe(catchError(() => of(undefined))),
+        })
+          .pipe(take(1))
+          .subscribe(({ orgUnits, defaultUnitUid }) => {
+            this.stateService.setOrgUnits(orgUnits);
+            this.stateService.setActiveUnit(defaultUnitUid ?? null);
+          });
+      });
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index 5e8de11f74f..5f951310add 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -4,16 +4,26 @@
   SPDX-License-Identifier: Apache-2.0
 -->
 
-<label *ngIf="(orgUnits$ | async)?.length ?? 0 > 1">
+<label *ngIf="hasAnyUnit()">
   <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}:</span>
   <div class="cx-select-wrapper">
-    <select (change)="onChange($any($event).target.value)">
-      <option
-        *ngFor="let unit of orgUnits$ | async"
-        [value]="unit.name"
-        [selected]="(activeUnitName$ | async) === unit.name"
-      >{{ unit.name }}</option>
-    </select>
-    <cx-icon aria-hidden="true" [type]="iconTypes.CARET_DOWN" class="small" />
+    <ng-select
+      [items]="items()"
+      bindLabel="name"
+      bindValue="name"
+      [ngModel]="activeUnitName()"
+      [clearable]="false"
+      [searchable]="false"
+      [disabled]="!hasMultipleUnits()"
+      appendTo="cx-b2b-unit-selector"
+      (ngModelChange)="onSelect($event)"
+      [cxNgSelectA11y]="{ ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate }"
+    ></ng-select>
+    <cx-icon
+      *ngIf="hasMultipleUnits()"
+      aria-hidden="true"
+      [type]="iconTypes.CARET_DOWN"
+      class="small"
+    ></cx-icon>
   </div>
 </label>
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
index 9ea976711fd..09e6f476477 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -4,42 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AsyncPipe, NgFor, NgIf } from '@angular/common';
-import {
-  ChangeDetectionStrategy,
-  Component,
-  inject,
-} from '@angular/core';
-import { Store } from '@ngrx/store';
-import { UserIdService } from '@spartacus/core';
-import { IconComponent, ICON_TYPE } from '@spartacus/storefront';
+import { NgIf } from '@angular/common';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { NgSelectComponent } from '@ng-select/ng-select';
 import { TranslatePipe } from '@spartacus/core';
-import { take } from 'rxjs/operators';
-import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
-import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
+import { IconComponent, ICON_TYPE, NgSelectA11yDirective } from '@spartacus/storefront';
+import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.component';
 
+/**
+ * Company（B2B Unit）选择器。
+ * 注册为 CMS Flex 组件（flexType: B2bUnitSelectorComponent），
+ * 通过 ImpEx 放置于 SiteContextSlot。
+ */
 @Component({
   selector: 'cx-b2b-unit-selector',
   templateUrl: './b2b-unit-selector.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [NgIf, NgFor, AsyncPipe, IconComponent, TranslatePipe],
+  imports: [NgIf, FormsModule, NgSelectComponent, NgSelectA11yDirective, IconComponent, TranslatePipe],
 })
-export class B2bUnitSelectorComponent {
-  iconTypes = ICON_TYPE;
-
-  private stateService = inject(B2bUnitSelectorStateService);
-  private store = inject(Store);
-  private userIdService = inject(UserIdService);
-
-  orgUnits$ = this.stateService.orgUnits$;
-  activeUnitName$ = this.stateService.activeUnitName$;
-
-  onChange(name: string): void {
-    this.userIdService
-      .takeUserId(true)
-      .pipe(take(1))
-      .subscribe((userId) => {
-        this.store.dispatch(new SetDefaultOrgUnit({ userId, unitUid: name }));
-      });
-  }
+export class B2bUnitSelectorComponent extends AbstractB2bUnitSelectorComponent {
+  readonly iconTypes = ICON_TYPE;
 }
diff --git a/feature-libs/organization/b2b-unit-selection/components/public_api.ts b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
index 76cf1f09891..34411684e3a 100644
--- a/feature-libs/organization/b2b-unit-selection/components/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
@@ -6,6 +6,6 @@
 
 export * from './b2b-unit-selection-components.module';
 export * from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
+export * from './b2b-unit-selector/abstract-b2b-unit-selector.component';
 export * from './b2b-unit-selector/b2b-unit-selector.component';
-export * from './b2b-unit-selector-outlet/b2b-unit-selector-outlet.component';
 export * from './default-b2b-unit-selection-layout.config';
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
index f9450b437ab..daf990e2e1b 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -41,7 +41,14 @@ export const SET_DEFAULT_ORG_UNIT_FAIL =
 
 export class SetDefaultOrgUnit implements Action {
   readonly type = SET_DEFAULT_ORG_UNIT;
-  constructor(public payload: { userId: string; unitUid: string }) {}
+  constructor(
+    public payload: {
+      userId: string;
+      unitUid: string;
+      /** true = 来自 header 选择器切换，成功后跳转首页；false/undefined = 来自 dialog */
+      redirectToHome?: boolean;
+    }
+  ) {}
 }
 
 export class SetDefaultOrgUnitSuccess implements Action {
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 2895232c802..bc396bd9c77 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -11,6 +11,8 @@ import {
   AuthActions,
   B2BUnit,
   LoggerService,
+  OAuthLibWrapperService,
+  RoutingService,
   tryNormalizeHttpError,
   UserIdService,
 } from '@spartacus/core';
@@ -34,6 +36,8 @@ export class B2bUnitSelectionEffects {
   private coordinator = inject(B2bRedirectCoordinator);
   private applicationRef = inject(ApplicationRef);
   private stateService = inject(B2bUnitSelectorStateService);
+  private routingService = inject(RoutingService);
+  private oAuthLibWrapperService = inject(OAuthLibWrapperService);
 
   /**
    * 监听 LOGIN action，获取用户所属 org units 及默认 unit。
@@ -65,7 +69,7 @@ export class B2bUnitSelectionEffects {
                 // 无论 unit 数量多少，都写入状态服务，供 Company 选择器使用
                 this.stateService.setOrgUnits(orgUnits);
                 this.stateService.setActiveUnit(defaultUnitUid ?? null);
-                if (orgUnits.length > 1) {
+                if (orgUnits.length > 0) {
                   this.openDialogWhenReady(orgUnits, defaultUnitUid);
                 } else {
                   this.coordinator.allowRedirect();
@@ -96,7 +100,8 @@ export class B2bUnitSelectionEffects {
 
   /**
    * 监听 SET_DEFAULT_ORG_UNIT action，调用 PUT API 设置默认 unit。
-   * 成功后放行 redirect 并关闭 dialog。
+   * 成功后刷新 token（使新 unit 权限立即生效），再放行 redirect 并关闭 dialog。
+   * token 刷新失败时降级处理，不阻断主流程。
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
@@ -109,12 +114,19 @@ export class B2bUnitSelectionEffects {
       map(
         (action: B2bUnitSelectionActions.SetDefaultOrgUnit) => action.payload
       ),
-      switchMap(({ userId, unitUid }) =>
+      switchMap(({ userId, unitUid, redirectToHome }) =>
         this.connector.setDefaultOrgUnit(userId, unitUid).pipe(
           tap(() => {
+            // 刷新 token，使新 unit 的权限上下文立即生效（fire-and-forget）
+            this.oAuthLibWrapperService.refreshToken();
             this.coordinator.allowRedirect();
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitUid);
+            // 仅 header 选择器切换（redirectToHome=true）才跳首页；
+            // dialog 确认走 coordinator 原有的 post-login redirect 逻辑
+            if (redirectToHome) {
+              this.routingService.go({ cxRoute: 'home' });
+            }
           }),
           map(() => new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess()),
           catchError((error: HttpErrorResponse) =>
@@ -129,6 +141,21 @@ export class B2bUnitSelectionEffects {
     )
   );
 
+  /**
+   * 监听 LOGOUT action，清空 stateService，确保退出登录后 Company 选择器隐藏。
+   */
+  clearOnLogout$ = createEffect(
+    () =>
+      this.actions$.pipe(
+        ofType<AuthActions.Logout>(AuthActions.LOGOUT),
+        tap(() => {
+          this.stateService.setOrgUnits([]);
+          this.stateService.setActiveUnit(null);
+        })
+      ),
+    { dispatch: false }
+  );
+
   constructor(
     private actions$: Actions,
     private connector: B2bUnitSelectionConnector,
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
new file mode 100644
index 00000000000..a41fb015576
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -0,0 +1,123 @@
+$b2b-unit-selector-caret-size: 7px;
+
+cx-b2b-unit-selector {
+  display: inline-block;
+  position: relative;
+  margin-top: 14px;
+  margin-inline-end: 17px;
+  margin-bottom: 14px;
+  margin-inline-start: 0;
+
+  @include media-breakpoint-down(md) {
+    &:first-child {
+      margin-inline-start: 0;
+    }
+    &:not(:first-child) {
+      padding-inline-start: 16px;
+      border-inline-start: 1px solid var(--cx-color-secondary);
+    }
+  }
+
+  label {
+    display: flex;
+    margin: 0;
+
+    span {
+      color: var(--cx-color-text);
+      margin-inline-end: 5px;
+      white-space: nowrap;
+    }
+  }
+
+  // 与 site-context-selector 的 .cx-select-wrapper 结构保持一致
+  .cx-select-wrapper {
+    display: flex;
+    align-items: flex-start;
+
+    cx-icon {
+      margin-inline-start: -#{$b2b-unit-selector-caret-size * 2};
+      margin-top: -12px;
+      z-index: 1;
+      pointer-events: none;
+      color: var(--cx-color-text);
+    }
+  }
+
+  ng-select {
+    margin-top: -12px;
+    // 自适应宽度：收缩至选中值宽度，超出 max-width 时由 text-overflow:ellipsis 截断
+    max-width: 130px;
+
+    // 覆盖 ng-select default.theme.css：
+    //   .ng-select .ng-select-container                  { background-color:#fff; min-height:36px }
+    //   .ng-select.ng-select-single .ng-select-container { height:36px }
+    //   .ng-select .ng-select-container .ng-value-container { padding-left:10px }
+    .ng-select-container {
+      height: auto !important;
+      min-height: unset !important;
+      background-color: transparent !important;
+      border: none !important;
+      border-radius: 0;
+      box-shadow: none !important;
+      cursor: pointer;
+      padding: 0 4px 2px 0;
+
+      .ng-value-container {
+        // ng-select default theme 优先级（3 class）高于我们的规则，
+        // 需要 !important 才能覆盖 padding-left: 10px
+        padding: 0 !important;
+        padding-inline-end: #{$b2b-unit-selector-caret-size * 2} !important;
+        // 贴顶对齐，消除 ng-select-container align-items:center 导致的下移
+        align-self: flex-start;
+
+        .ng-value {
+          color: var(--cx-color-text);
+          font-weight: var(--cx-font-weight-semi);
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          max-width: 100%;
+        }
+
+        // 单选模式下 ng-select 对 .ng-input 设置 top:5px，需清零
+        .ng-input {
+          top: 0 !important;
+          padding: 0 !important;
+
+          > input {
+            cursor: pointer;
+          }
+        }
+      }
+
+      .ng-arrow-wrapper {
+        display: none;
+      }
+    }
+
+    &.ng-select-focused .ng-select-container,
+    &.ng-select-opened .ng-select-container {
+      background-color: transparent !important;
+      border: none !important;
+      box-shadow: none !important;
+    }
+
+    // 单 unit 禁用态：不可交互，光标还原
+    &.ng-select-disabled .ng-select-container {
+      cursor: default;
+
+      .ng-value-container .ng-value {
+        opacity: 0.6;
+      }
+    }
+  }
+
+  // appendTo="cx-b2b-unit-selector" 使 panel 挂在宿主元素下，
+  // 而非 ng-select 内部，故选择器须在 ng-select {} 块之外
+  .ng-dropdown-panel {
+    // ng-select 通过内联样式将 panel 宽度设为控件宽度，
+    // !important 覆盖内联样式，让 panel 按选项内容自行决定宽度
+    width: auto !important;
+    min-width: max-content;
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_index.scss b/feature-libs/organization/b2b-unit-selection/styles/_index.scss
new file mode 100644
index 00000000000..c294fe143bf
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/styles/_index.scss
@@ -0,0 +1 @@
+@import './b2b-unit-selector';
diff --git a/projects/storefrontapp/src/app/app.component.ts b/projects/storefrontapp/src/app/app.component.ts
index a5a76b86145..b47e67dc3f9 100644
--- a/projects/storefrontapp/src/app/app.component.ts
+++ b/projects/storefrontapp/src/app/app.component.ts
@@ -5,7 +5,6 @@
  */
 
 import { Component } from '@angular/core';
-import { B2bUnitSelectorOutletComponent } from '@spartacus/organization/b2b-unit-selection';
 import { StorefrontComponent } from '@spartacus/storefront';
 
 /**
@@ -14,10 +13,7 @@ import { StorefrontComponent } from '@spartacus/storefront';
  */
 @Component({
   selector: 'app-root',
-  template: `
-    <cx-storefront></cx-storefront>
-    <cx-b2b-unit-selector-outlet></cx-b2b-unit-selector-outlet>
-  `,
-  imports: [StorefrontComponent, B2bUnitSelectorOutletComponent],
+  template: `<cx-storefront></cx-storefront>`,
+  imports: [StorefrontComponent],
 })
 export class AppComponent {}

From 1c21ffdf92ad157f12ef16c83bcd515b3a5bccc2 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:36:19 +0800
Subject: [PATCH 03/60] fix

fix
---
 .../abstract-b2b-unit-selector.component.ts   |  6 +++++
 .../effects/b2b-unit-selection.effects.ts     | 15 ++++++++---
 .../root/b2b-unit-selection-root.module.ts    |  4 ++-
 .../root/config/b2b-unit-selection.config.ts  | 26 +++++++++++++++++++
 .../default-b2b-unit-selection-config.ts      | 13 ++++++++++
 .../b2b-unit-selection/root/public_api.ts     |  2 ++
 .../styles/_b2b-unit-selector.scss            |  6 +----
 projects/storefrontapp/src/app/app.config.ts  |  7 +++++
 8 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/config/default-b2b-unit-selection-config.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 7c012bf6f1f..69fd3c86cc4 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -13,6 +13,7 @@ import { catchError, take } from 'rxjs/operators';
 import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
 import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { B2bUnitSelectionConfig } from '../../root/config/b2b-unit-selection.config';
 
 /**
  * 抽象基类：封装 Company 选择器的状态与交互逻辑。
@@ -27,6 +28,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected store = inject(Store);
   protected userIdService = inject(UserIdService);
   protected connector = inject(B2bUnitSelectionConnector);
+  private config = inject(B2bUnitSelectionConfig);
 
   private _orgUnits = toSignal(this.stateService.orgUnits$, {
     initialValue: [] as B2BUnit[],
@@ -48,6 +50,10 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   readonly activeUnitName = computed(() => this._activeUnitName());
 
   ngOnInit(): void {
+    // feature toggle：未启用时不加载数据，组件保持空态（hasAnyUnit() = false，不渲染）
+    if (!this.config.b2bUnitSelection?.enabled) {
+      return;
+    }
     // 页面刷新后 BehaviorSubject 为空（effects 可能尚未写入），主动补充加载一次
     this.stateService.orgUnits$.pipe(take(1)).subscribe((units) => {
       if (units.length === 0) {
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index bc396bd9c77..36d3d52ea66 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -25,6 +25,7 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
+import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
 import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
@@ -33,6 +34,7 @@ import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions'
 @Injectable()
 export class B2bUnitSelectionEffects {
   protected logger = inject(LoggerService);
+  private config = inject(B2bUnitSelectionConfig);
   private coordinator = inject(B2bRedirectCoordinator);
   private applicationRef = inject(ApplicationRef);
   private stateService = inject(B2bUnitSelectorStateService);
@@ -55,8 +57,13 @@ export class B2bUnitSelectionEffects {
   > = createEffect(() =>
     this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
-      exhaustMap(() =>
-        this.userIdService.takeUserId(true).pipe(
+      exhaustMap(() => {
+        // feature toggle：未启用时放行 redirect，不执行后续逻辑
+        if (!this.config.b2bUnitSelection?.enabled) {
+          this.coordinator.allowRedirect();
+          return EMPTY;
+        }
+        return this.userIdService.takeUserId(true).pipe(
           switchMap((userId) =>
             forkJoin({
               orgUnits: this.connector.loadOrgUnits(userId),
@@ -93,8 +100,8 @@ export class B2bUnitSelectionEffects {
             this.coordinator.allowRedirect();
             return EMPTY;
           })
-        )
-      )
+        );
+      })
     )
   );
 
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
index ad437466bba..5a3f6815d8f 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
@@ -7,8 +7,9 @@
 import { APP_INITIALIZER, ApplicationRef, NgModule } from '@angular/core';
 import { Router } from '@angular/router';
 import { META_REDUCERS } from '@ngrx/store';
-import { AuthRedirectService } from '@spartacus/core';
+import { AuthRedirectService, provideDefaultConfig } from '@spartacus/core';
 import { B2bAwareAuthRedirectService } from './b2b-aware-auth-redirect.service';
+import { defaultB2bUnitSelectionConfig } from './config/default-b2b-unit-selection-config';
 import { createB2bLoginMetaReducer } from './b2b-login-meta-reducer';
 import { createB2bRedirectPatcher } from './b2b-redirect-patcher';
 import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
@@ -17,6 +18,7 @@ import './model/augmented-core.model';
 
 @NgModule({
   providers: [
+    provideDefaultConfig(defaultB2bUnitSelectionConfig),
     /**
      * 覆盖 AuthRedirectService：在 B2B unit 选择进行中时延迟 redirect()。
      * 这是拦截 post-login redirect 最精准的切入点，只影响 redirect() 调用，
diff --git a/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts b/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
new file mode 100644
index 00000000000..4232f4eb53e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2026 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 B2bUnitSelectionConfig {
+  b2bUnitSelection?: {
+    /**
+     * 是否启用 B2B Unit 选择功能（登录后弹窗 + header Company 选择器）。
+     * 默认 false，客户通过 provideConfig() 显式开启。
+     */
+    enabled?: boolean;
+  };
+}
+
+declare module '@spartacus/core' {
+  interface Config extends B2bUnitSelectionConfig {}
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/config/default-b2b-unit-selection-config.ts b/feature-libs/organization/b2b-unit-selection/root/config/default-b2b-unit-selection-config.ts
new file mode 100644
index 00000000000..664bf0d9e5f
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/config/default-b2b-unit-selection-config.ts
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { B2bUnitSelectionConfig } from './b2b-unit-selection.config';
+
+export const defaultB2bUnitSelectionConfig: B2bUnitSelectionConfig = {
+  b2bUnitSelection: {
+    enabled: false,
+  },
+};
diff --git a/feature-libs/organization/b2b-unit-selection/root/public_api.ts b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
index 3843d1182a1..5c98906df94 100644
--- a/feature-libs/organization/b2b-unit-selection/root/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
@@ -5,5 +5,7 @@
  */
 
 export * from './b2b-unit-selection-root.module';
+export * from './config/b2b-unit-selection.config';
+export * from './config/default-b2b-unit-selection-config';
 export * from './feature-name';
 export * from './model/index';
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index a41fb015576..1db54b681b3 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -102,13 +102,9 @@ cx-b2b-unit-selector {
       box-shadow: none !important;
     }
 
-    // 单 unit 禁用态：不可交互，光标还原
+    // 单 unit 禁用态：不可交互，光标还原，字色保持不变
     &.ng-select-disabled .ng-select-container {
       cursor: default;
-
-      .ng-value-container .ng-value {
-        opacity: 0.6;
-      }
     }
   }
 
diff --git a/projects/storefrontapp/src/app/app.config.ts b/projects/storefrontapp/src/app/app.config.ts
index 8b660c3c43a..33eb133f359 100644
--- a/projects/storefrontapp/src/app/app.config.ts
+++ b/projects/storefrontapp/src/app/app.config.ts
@@ -22,6 +22,8 @@ import {
   withNoHttpTransferCache,
 } from '@angular/platform-browser';
 import { AppModule } from './app.module';
+import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection';
+import { provideConfig } from '@spartacus/core';
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -29,6 +31,11 @@ export const appConfig: ApplicationConfig = {
     provideClientHydration(withEventReplay(), withNoHttpTransferCache()),
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideBrowserGlobalErrorListeners(),
+    provideConfig({                                                                                                                                                
+    b2bUnitSelection: {                                                                                                                                          
+      enabled: true,                                                                                                                                             
+    },                                                                                                                                                           
+  } as B2bUnitSelectionConfig),
 
     importProvidersFrom(AppModule),
   ],

From 88aead5af32d93b7b1016e64bbf67f0ade4bb608 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:36:55 +0800
Subject: [PATCH 04/60] fix

fix
---
 projects/storefrontapp/src/app/app.config.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/projects/storefrontapp/src/app/app.config.ts b/projects/storefrontapp/src/app/app.config.ts
index 33eb133f359..8b660c3c43a 100644
--- a/projects/storefrontapp/src/app/app.config.ts
+++ b/projects/storefrontapp/src/app/app.config.ts
@@ -22,8 +22,6 @@ import {
   withNoHttpTransferCache,
 } from '@angular/platform-browser';
 import { AppModule } from './app.module';
-import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection';
-import { provideConfig } from '@spartacus/core';
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -31,11 +29,6 @@ export const appConfig: ApplicationConfig = {
     provideClientHydration(withEventReplay(), withNoHttpTransferCache()),
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideBrowserGlobalErrorListeners(),
-    provideConfig({                                                                                                                                                
-    b2bUnitSelection: {                                                                                                                                          
-      enabled: true,                                                                                                                                             
-    },                                                                                                                                                           
-  } as B2bUnitSelectionConfig),
 
     importProvidersFrom(AppModule),
   ],

From 5195bfa46a914c20ab00ed502064b8c301232505 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:28:02 +0800
Subject: [PATCH 05/60] add tests

add tests
---
 ...stract-b2b-unit-selector.component.spec.ts | 157 +++++++++
 .../abstract-b2b-unit-selector.component.ts   |  64 ++--
 .../b2b-unit-selector.component.ts            |   6 +-
 ...efault-b2b-unit-selection-layout.config.ts |   3 +-
 .../b2b-unit-selector-state.service.spec.ts   |  79 +++++
 .../b2b-unit-selector-state.service.ts        |  10 +-
 .../b2b-unit-selection.effects.spec.ts        | 305 ++++++++++++++++++
 .../effects/b2b-unit-selection.effects.ts     |  59 ++--
 .../occ-b2b-unit-selection.adapter.spec.ts    | 204 ++++++++++++
 .../occ-b2b-unit-selection.adapter.ts         |   2 +-
 .../b2b-aware-auth-redirect.service.spec.ts   | 111 +++++++
 .../root/b2b-aware-auth-redirect.service.ts   |   9 +-
 .../root/b2b-login-meta-reducer.spec.ts       |  69 ++++
 .../root/b2b-login-meta-reducer.ts            |  22 +-
 .../b2b-redirect-coordinator.service.spec.ts  |  76 +++++
 .../root/b2b-redirect-coordinator.service.ts  |  15 +-
 .../root/b2b-redirect-patcher.spec.ts         | 131 ++++++++
 .../root/b2b-redirect-patcher.ts              |  48 ++-
 18 files changed, 1254 insertions(+), 116 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
new file mode 100644
index 00000000000..d8794962adf
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -0,0 +1,157 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Store } from '@ngrx/store';
+import { B2BUnit, UserIdService } from '@spartacus/core';
+import { of, throwError } from 'rxjs';
+import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
+import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { B2bUnitSelectionConfig } from '../../root/config/b2b-unit-selection.config';
+import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.component';
+import createSpy = jasmine.createSpy;
+
+const mockUnits: B2BUnit[] = [
+  { uid: 'unit-1', name: 'Rustic' },
+  { uid: 'unit-2', name: 'Rustic Services' },
+];
+const mockUserId = 'current';
+const mockDefaultUid = 'Rustic';
+
+/** Minimal concrete subclass for testing. */
+@Component({
+  selector: 'cx-test-selector',
+  template: '',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+class TestB2bUnitSelectorComponent extends AbstractB2bUnitSelectorComponent {}
+
+class MockB2bUnitSelectorStateService {
+  private _orgUnitsValue: B2BUnit[] = [];
+  private _activeUnitNameValue: string | null = null;
+
+  orgUnits$ = of(this._orgUnitsValue);
+  activeUnitName$ = of(this._activeUnitNameValue);
+
+  setOrgUnits = createSpy('setOrgUnits').and.callFake((units: B2BUnit[]) => {
+    this._orgUnitsValue = units;
+    this.orgUnits$ = of(units);
+  });
+  setActiveUnit = createSpy('setActiveUnit');
+}
+
+class MockB2bUnitSelectionConnector {
+  loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
+  loadDefaultOrgUnitUid = createSpy('loadDefaultOrgUnitUid').and.returnValue(
+    of(mockDefaultUid)
+  );
+}
+
+class MockUserIdService {
+  takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
+}
+
+class MockStore {
+  dispatch = createSpy('dispatch');
+}
+
+describe('AbstractB2bUnitSelectorComponent', () => {
+  let component: TestB2bUnitSelectorComponent;
+  let fixture: ComponentFixture<TestB2bUnitSelectorComponent>;
+  let stateService: MockB2bUnitSelectorStateService;
+  let connector: MockB2bUnitSelectionConnector;
+  let store: MockStore;
+
+  function createComponent(enabled = true, initialUnits: B2BUnit[] = []): void {
+    stateService = new MockB2bUnitSelectorStateService();
+    stateService.orgUnits$ = of(initialUnits);
+
+    TestBed.configureTestingModule({
+      declarations: [TestB2bUnitSelectorComponent],
+      providers: [
+        { provide: B2bUnitSelectorStateService, useValue: stateService },
+        { provide: B2bUnitSelectionConnector, useClass: MockB2bUnitSelectionConnector },
+        { provide: UserIdService, useClass: MockUserIdService },
+        { provide: Store, useClass: MockStore },
+        {
+          provide: B2bUnitSelectionConfig,
+          useValue: { b2bUnitSelection: { enabled } },
+        },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TestB2bUnitSelectorComponent);
+    component = fixture.componentInstance;
+    connector = TestBed.inject(B2bUnitSelectionConnector) as any;
+    store = TestBed.inject(Store) as any;
+  }
+
+  describe('computed signals', () => {
+    beforeEach(() => createComponent());
+
+    it('hasMultipleUnits should be false when items is empty', () => {
+      expect(component.hasMultipleUnits()).toBeFalse();
+    });
+
+    it('hasAnyUnit should be false when items is empty', () => {
+      expect(component.hasAnyUnit()).toBeFalse();
+    });
+  });
+
+  describe('ngOnInit()', () => {
+    it('should NOT load units when feature is disabled', () => {
+      createComponent(false, []);
+      fixture.detectChanges();
+      expect(connector.loadOrgUnits).not.toHaveBeenCalled();
+    });
+
+    it('should NOT load units when state already has data', () => {
+      createComponent(true, mockUnits);
+      fixture.detectChanges();
+      expect(connector.loadOrgUnits).not.toHaveBeenCalled();
+    });
+
+    it('should load units and populate state when state is empty', () => {
+      createComponent(true, []);
+      fixture.detectChanges();
+
+      expect(connector.loadOrgUnits).toHaveBeenCalledWith(mockUserId);
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith(mockUnits);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
+    });
+
+    it('should set active unit to null when loadDefaultOrgUnitUid fails', () => {
+      createComponent(true, []);
+      connector.loadDefaultOrgUnitUid.and.returnValue(
+        throwError(() => new Error('not found'))
+      );
+      fixture.detectChanges();
+
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+  });
+
+  describe('onSelect()', () => {
+    beforeEach(() => {
+      createComponent(true, mockUnits);
+      fixture.detectChanges();
+    });
+
+    it('should dispatch SetDefaultOrgUnit with correct payload', () => {
+      component.onSelect('Rustic Services');
+
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new SetDefaultOrgUnit({
+          userId: mockUserId,
+          unitUid: 'Rustic Services',
+          redirectToHome: true,
+        })
+      );
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 69fd3c86cc4..db00019f729 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -9,18 +9,18 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { Store } from '@ngrx/store';
 import { B2BUnit, UserIdService } from '@spartacus/core';
 import { forkJoin, of } from 'rxjs';
-import { catchError, take } from 'rxjs/operators';
+import { catchError, switchMap, take } from 'rxjs/operators';
 import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
 import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
 import { B2bUnitSelectionConfig } from '../../root/config/b2b-unit-selection.config';
 
 /**
- * 抽象基类：封装 Company 选择器的状态与交互逻辑。
- * 子类只需提供 selector 与模板。
+ * Abstract base class encapsulating state and interaction logic for the Company selector.
+ * Subclasses only need to provide the selector and template.
  *
- * 初始化时若 stateService 无数据（例如页面刷新后 effects 尚未写入），
- * 则主动调用 connector 加载，确保选择器在任何场景下都能正确显示。
+ * On init, if the stateService holds no data (e.g. after a page refresh before effects
+ * have written), it proactively calls the connector to ensure the selector renders correctly.
  */
 @Directive()
 export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
@@ -30,31 +30,28 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected connector = inject(B2bUnitSelectionConnector);
   private config = inject(B2bUnitSelectionConfig);
 
-  private _orgUnits = toSignal(this.stateService.orgUnits$, {
+  /** All assignable B2B units for the current user. */
+  readonly items = toSignal(this.stateService.orgUnits$, {
     initialValue: [] as B2BUnit[],
   });
-  private _activeUnitName = toSignal(this.stateService.activeUnitName$, {
+
+  /** Currently active (default) unit name. */
+  readonly activeUnitName = toSignal(this.stateService.activeUnitName$, {
     initialValue: null as string | null,
   });
 
-  /** 所有可选 B2B units */
-  readonly items = computed(() => this._orgUnits());
-
-  /** 仅当 unit 数量 ≥ 2 时才显示选择器 */
-  readonly hasMultipleUnits = computed(() => this._orgUnits().length > 1);
-
-  /** 有任意 unit 时显示选择器（含单 unit 禁用态） */
-  readonly hasAnyUnit = computed(() => this._orgUnits().length > 0);
+  /** True when the user has more than one unit — selector is interactive. */
+  readonly hasMultipleUnits = computed(() => this.items().length > 1);
 
-  /** 当前激活 unit 的 name */
-  readonly activeUnitName = computed(() => this._activeUnitName());
+  /** True when the user has at least one unit — selector is rendered (disabled for single unit). */
+  readonly hasAnyUnit = computed(() => this.items().length > 0);
 
   ngOnInit(): void {
-    // feature toggle：未启用时不加载数据，组件保持空态（hasAnyUnit() = false，不渲染）
     if (!this.config.b2bUnitSelection?.enabled) {
       return;
     }
-    // 页面刷新后 BehaviorSubject 为空（effects 可能尚未写入），主动补充加载一次
+    // After a page refresh the BehaviorSubject is empty (effects may not have written yet).
+    // Proactively load once to ensure the selector is populated.
     this.stateService.orgUnits$.pipe(take(1)).subscribe((units) => {
       if (units.length === 0) {
         this.loadAndPopulateState();
@@ -62,7 +59,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
     });
   }
 
-  /** 用户切换 unit 后调用 PUT /defaultOrgUnit，成功后跳转首页 */
+  /** Dispatches SetDefaultOrgUnit when the user switches units via the header selector. */
   onSelect(unitName: string): void {
     this.userIdService
       .takeUserId(true)
@@ -77,19 +74,20 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   private loadAndPopulateState(): void {
     this.userIdService
       .takeUserId(true)
-      .pipe(take(1))
-      .subscribe((userId) => {
-        forkJoin({
-          orgUnits: this.connector.loadOrgUnits(userId),
-          defaultUnitUid: this.connector
-            .loadDefaultOrgUnitUid(userId)
-            .pipe(catchError(() => of(undefined))),
-        })
-          .pipe(take(1))
-          .subscribe(({ orgUnits, defaultUnitUid }) => {
-            this.stateService.setOrgUnits(orgUnits);
-            this.stateService.setActiveUnit(defaultUnitUid ?? null);
-          });
+      .pipe(
+        take(1),
+        switchMap((userId) =>
+          forkJoin({
+            orgUnits: this.connector.loadOrgUnits(userId),
+            defaultUnitUid: this.connector
+              .loadDefaultOrgUnitUid(userId)
+              .pipe(catchError(() => of(undefined))),
+          })
+        )
+      )
+      .subscribe(({ orgUnits, defaultUnitUid }) => {
+        this.stateService.setOrgUnits(orgUnits);
+        this.stateService.setActiveUnit(defaultUnitUid ?? null);
       });
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
index 09e6f476477..0e24d23feb4 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -13,9 +13,9 @@ import { IconComponent, ICON_TYPE, NgSelectA11yDirective } from '@spartacus/stor
 import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.component';
 
 /**
- * Company（B2B Unit）选择器。
- * 注册为 CMS Flex 组件（flexType: B2bUnitSelectorComponent），
- * 通过 ImpEx 放置于 SiteContextSlot。
+ * Company (B2B Unit) selector component.
+ * Registered as a CMS Flex component (flexType: B2bUnitSelectorComponent)
+ * and placed in SiteContextSlot via ImpEx.
  */
 @Component({
   selector: 'cx-b2b-unit-selector',
diff --git a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
index 77a148e1bc3..a44a5bb141d 100644
--- a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
@@ -10,7 +10,8 @@ import {
   LayoutConfig,
 } from '@spartacus/storefront';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
-// Side-effect import：确保 LAUNCH_CALLER.B2B_UNIT_SELECTION 在 config 常量求值前已被赋值
+// Side-effect import: ensures LAUNCH_CALLER.B2B_UNIT_SELECTION is assigned
+// before this config constant is evaluated.
 import '../root/model/augmented-core.model';
 
 export const defaultB2bUnitSelectionLayoutConfig: LayoutConfig = {
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.spec.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.spec.ts
new file mode 100644
index 00000000000..41cb40de48e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.spec.ts
@@ -0,0 +1,79 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TestBed } from '@angular/core/testing';
+import { B2BUnit } from '@spartacus/core';
+import { B2bUnitSelectorStateService } from './b2b-unit-selector-state.service';
+
+const mockUnits: B2BUnit[] = [
+  { uid: 'unit-1', name: 'Rustic' },
+  { uid: 'unit-2', name: 'Rustic Services' },
+];
+
+describe('B2bUnitSelectorStateService', () => {
+  let service: B2bUnitSelectorStateService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(B2bUnitSelectorStateService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('orgUnits$', () => {
+    it('should emit an empty array as initial value', (done) => {
+      service.orgUnits$.subscribe((units) => {
+        expect(units).toEqual([]);
+        done();
+      });
+    });
+
+    it('should emit the updated list after setOrgUnits()', (done) => {
+      service.setOrgUnits(mockUnits);
+      service.orgUnits$.subscribe((units) => {
+        expect(units).toEqual(mockUnits);
+        done();
+      });
+    });
+
+    it('should emit an empty array when reset via setOrgUnits([])', (done) => {
+      service.setOrgUnits(mockUnits);
+      service.setOrgUnits([]);
+      service.orgUnits$.subscribe((units) => {
+        expect(units).toEqual([]);
+        done();
+      });
+    });
+  });
+
+  describe('activeUnitName$', () => {
+    it('should emit null as initial value', (done) => {
+      service.activeUnitName$.subscribe((name) => {
+        expect(name).toBeNull();
+        done();
+      });
+    });
+
+    it('should emit the updated name after setActiveUnit()', (done) => {
+      service.setActiveUnit('Rustic');
+      service.activeUnitName$.subscribe((name) => {
+        expect(name).toBe('Rustic');
+        done();
+      });
+    });
+
+    it('should emit null when reset via setActiveUnit(null)', (done) => {
+      service.setActiveUnit('Rustic');
+      service.setActiveUnit(null);
+      service.activeUnitName$.subscribe((name) => {
+        expect(name).toBeNull();
+        done();
+      });
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
index ee1c988c7f8..c0a53b03bc7 100644
--- a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
@@ -9,20 +9,22 @@ import { B2BUnit } from '@spartacus/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
 /**
- * 轻量级状态服务：在 B2B unit 选择 Dialog 及常驻 Company 选择器之间共享状态。
+ * Lightweight state service that shares B2B unit data between the unit-selection
+ * dialog and the persistent Company selector in the header.
  *
- * 数据由 B2bUnitSelectionEffects 在登录后写入，组件直接订阅，无需重复调用 API。
+ * Data is written by B2bUnitSelectionEffects after login; components subscribe
+ * directly without issuing additional API calls.
  */
 @Injectable({ providedIn: 'root' })
 export class B2bUnitSelectorStateService {
   private _orgUnits$ = new BehaviorSubject<B2BUnit[]>([]);
   private _activeUnitName$ = new BehaviorSubject<string | null>(null);
 
-  /** 当前用户被分配的所有 org units */
+  /** All org units assigned to the current user. */
   readonly orgUnits$: Observable<B2BUnit[]> =
     this._orgUnits$.asObservable();
 
-  /** 当前激活（默认）unit 的 name */
+  /** The name of the currently active (default) org unit. */
   readonly activeUnitName$: Observable<string | null> =
     this._activeUnitName$.asObservable();
 
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
new file mode 100644
index 00000000000..769a229e74b
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -0,0 +1,305 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  HttpErrorResponse,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { ApplicationRef } from '@angular/core';
+import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { Action } from '@ngrx/store';
+import {
+  AuthActions,
+  B2BUnit,
+  LoggerService,
+  OAuthLibWrapperService,
+  RoutingService,
+  UserIdService,
+  tryNormalizeHttpError,
+} from '@spartacus/core';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+// Side-effect import: registers LAUNCH_CALLER.B2B_UNIT_SELECTION enum extension.
+import '../../../root/model/augmented-core.model';
+import { cold, hot } from 'jasmine-marbles';
+import { Observable, of, throwError } from 'rxjs';
+import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
+import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
+import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
+import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
+import { B2bUnitSelectionEffects } from './b2b-unit-selection.effects';
+import createSpy = jasmine.createSpy;
+
+const mockUnits: B2BUnit[] = [
+  { uid: 'unit-1', name: 'Rustic' },
+  { uid: 'unit-2', name: 'Rustic Services' },
+];
+const mockUserId = 'current';
+const mockDefaultUid = 'Rustic';
+const mockError = new HttpErrorResponse({ error: 'test-error' });
+
+class MockLoggerService {
+  log(): void {}
+  warn(): void {}
+  error(): void {}
+  info(): void {}
+  debug(): void {}
+}
+
+class MockB2bUnitSelectionConnector {
+  loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
+  loadDefaultOrgUnitUid = createSpy('loadDefaultOrgUnitUid').and.returnValue(
+    of(mockDefaultUid)
+  );
+  setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(of(void 0));
+}
+
+class MockB2bUnitSelectorStateService {
+  setOrgUnits = createSpy('setOrgUnits');
+  setActiveUnit = createSpy('setActiveUnit');
+}
+
+class MockLaunchDialogService {
+  openDialogAndSubscribe = createSpy('openDialogAndSubscribe');
+  closeDialog = createSpy('closeDialog');
+}
+
+class MockUserIdService {
+  takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
+}
+
+class MockRoutingService {
+  go = createSpy('go');
+}
+
+class MockB2bRedirectCoordinator {
+  allowRedirect = createSpy('allowRedirect');
+  isBlocked = createSpy('isBlocked').and.returnValue(false);
+}
+
+class MockOAuthLibWrapperService {
+  refreshToken = createSpy('refreshToken');
+}
+
+describe('B2bUnitSelectionEffects', () => {
+  let effects: B2bUnitSelectionEffects;
+  let connector: MockB2bUnitSelectionConnector;
+  let stateService: MockB2bUnitSelectorStateService;
+  let launchDialogService: MockLaunchDialogService;
+  let coordinator: MockB2bRedirectCoordinator;
+  let routingService: MockRoutingService;
+  let oAuthLibWrapperService: MockOAuthLibWrapperService;
+  let actions$: Observable<Action>;
+  let applicationRef: any;
+
+  beforeEach(() => {
+    applicationRef = {
+      components: [{}] as any[],
+      afterTick: { subscribe: jasmine.createSpy().and.returnValue({ unsubscribe: () => {} }) },
+    };
+
+    TestBed.configureTestingModule({
+      providers: [
+        B2bUnitSelectionEffects,
+        { provide: B2bUnitSelectionConnector, useClass: MockB2bUnitSelectionConnector },
+        { provide: B2bUnitSelectorStateService, useClass: MockB2bUnitSelectorStateService },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: UserIdService, useClass: MockUserIdService },
+        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: B2bRedirectCoordinator, useClass: MockB2bRedirectCoordinator },
+        { provide: OAuthLibWrapperService, useClass: MockOAuthLibWrapperService },
+        { provide: ApplicationRef, useValue: applicationRef },
+        { provide: LoggerService, useClass: MockLoggerService },
+        {
+          provide: B2bUnitSelectionConfig,
+          useValue: { b2bUnitSelection: { enabled: true } },
+        },
+        provideMockActions(() => actions$),
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
+    });
+
+    effects = TestBed.inject(B2bUnitSelectionEffects);
+    connector = TestBed.inject(B2bUnitSelectionConnector) as any;
+    stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
+    launchDialogService = TestBed.inject(LaunchDialogService) as any;
+    coordinator = TestBed.inject(B2bRedirectCoordinator) as any;
+    routingService = TestBed.inject(RoutingService) as any;
+    oAuthLibWrapperService = TestBed.inject(OAuthLibWrapperService) as any;
+  });
+
+  // ── checkOrgUnitsOnLogin$ ─────────────────────────────────────────────────
+
+  describe('checkOrgUnitsOnLogin$', () => {
+    it('should dispatch LoadUserOrgUnitsSuccess on successful login with multiple units', () => {
+      const action = new AuthActions.Login();
+      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(mockUnits);
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+    });
+
+    it('should write units and active unit to the state service', () => {
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+
+      effects.checkOrgUnitsOnLogin$.subscribe();
+
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith(mockUnits);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
+    });
+
+    it('should open the dialog when orgUnits.length > 0', fakeAsync(() => {
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+
+      effects.checkOrgUnitsOnLogin$.subscribe();
+      tick();
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
+        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        undefined,
+        { orgUnits: mockUnits, defaultUnitUid: mockDefaultUid }
+      );
+    }));
+
+    it('should call allowRedirect() when orgUnits is empty', () => {
+      connector.loadOrgUnits.and.returnValue(of([]));
+      connector.loadDefaultOrgUnitUid.and.returnValue(of(undefined));
+
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+
+      effects.checkOrgUnitsOnLogin$.subscribe();
+
+      expect(coordinator.allowRedirect).toHaveBeenCalled();
+      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
+    });
+
+    it('should dispatch LoadUserOrgUnitsFail and call allowRedirect() on connector error', () => {
+      connector.loadOrgUnits.and.returnValue(throwError(() => mockError));
+
+      const action = new AuthActions.Login();
+      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsFail(
+        tryNormalizeHttpError(mockError, new MockLoggerService())
+      );
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+    });
+
+    it('should degrade gracefully when loadDefaultOrgUnitUid fails', () => {
+      connector.loadDefaultOrgUnitUid.and.returnValue(throwError(() => mockError));
+
+      const action = new AuthActions.Login();
+      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(mockUnits);
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+
+    it('should return EMPTY and call allowRedirect() when feature is disabled', () => {
+      TestBed.overrideProvider(B2bUnitSelectionConfig, {
+        useValue: { b2bUnitSelection: { enabled: false } },
+      });
+      effects = TestBed.inject(B2bUnitSelectionEffects);
+
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-');
+
+      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+    });
+  });
+
+  // ── setDefaultOrgUnit$ ────────────────────────────────────────────────────
+
+  describe('setDefaultOrgUnit$', () => {
+    const payload = { userId: mockUserId, unitUid: 'Rustic Services' };
+
+    it('should dispatch SetDefaultOrgUnitSuccess', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
+      const completion = new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess();
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
+    });
+
+    it('should refresh token, allow redirect, close dialog, and update state', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
+      actions$ = hot('-a', { a: action });
+
+      effects.setDefaultOrgUnit$.subscribe();
+
+      expect(oAuthLibWrapperService.refreshToken).toHaveBeenCalled();
+      expect(coordinator.allowRedirect).toHaveBeenCalled();
+      expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitUid);
+    });
+
+    it('should navigate to home when redirectToHome is true', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
+        ...payload,
+        redirectToHome: true,
+      });
+      actions$ = hot('-a', { a: action });
+
+      effects.setDefaultOrgUnit$.subscribe();
+
+      expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'home' });
+    });
+
+    it('should NOT navigate to home when redirectToHome is false/undefined', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
+      actions$ = hot('-a', { a: action });
+
+      effects.setDefaultOrgUnit$.subscribe();
+
+      expect(routingService.go).not.toHaveBeenCalled();
+    });
+
+    it('should dispatch SetDefaultOrgUnitFail on connector error', () => {
+      connector.setDefaultOrgUnit.and.returnValue(throwError(() => mockError));
+
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
+      const completion = new B2bUnitSelectionActions.SetDefaultOrgUnitFail(
+        tryNormalizeHttpError(mockError, new MockLoggerService())
+      );
+
+      actions$ = hot('-a', { a: action });
+      const expected = cold('-b', { b: completion });
+
+      expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
+    });
+  });
+
+  // ── clearOnLogout$ ────────────────────────────────────────────────────────
+
+  describe('clearOnLogout$', () => {
+    it('should clear state service on LOGOUT', () => {
+      const action = new AuthActions.Logout();
+      actions$ = hot('-a', { a: action });
+
+      effects.clearOnLogout$.subscribe();
+
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 36d3d52ea66..92411c818df 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -42,14 +42,15 @@ export class B2bUnitSelectionEffects {
   private oAuthLibWrapperService = inject(OAuthLibWrapperService);
 
   /**
-   * 监听 LOGIN action，获取用户所属 org units 及默认 unit。
+   * Listens for the LOGIN action and loads the user's org units and default unit.
    *
-   * 有两种触发场景：
-   * 1. 手动登录（ROPC，用户在 Spartacus login 页填表提交）：
-   *    ApplicationRef.components 已有挂载组件，可直接开 dialog。
+   * Two login scenarios are handled:
+   * 1. Manual login (ROPC — user submits the Spartacus login form):
+   *    ApplicationRef.components already has mounted components; the dialog opens immediately.
    *
-   * 2. OAuth Code Flow 登录或页面刷新自动还原 token：
-   *    ApplicationRef.components 可能为空，需轮询等待 AppComponent 挂载后再开 dialog。
+   * 2. OAuth Authorization Code Flow or page-refresh token restore:
+   *    ApplicationRef.components may be empty; polling waits for AppComponent to mount
+   *    before opening the dialog.
    */
   checkOrgUnitsOnLogin$: Observable<
     | B2bUnitSelectionActions.LoadUserOrgUnitsSuccess
@@ -58,7 +59,7 @@ export class B2bUnitSelectionEffects {
     this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
       exhaustMap(() => {
-        // feature toggle：未启用时放行 redirect，不执行后续逻辑
+        // Feature toggle: release the redirect immediately when the feature is disabled.
         if (!this.config.b2bUnitSelection?.enabled) {
           this.coordinator.allowRedirect();
           return EMPTY;
@@ -67,13 +68,13 @@ export class B2bUnitSelectionEffects {
           switchMap((userId) =>
             forkJoin({
               orgUnits: this.connector.loadOrgUnits(userId),
-              // 获取用户默认 unit 失败时降级为 undefined，不阻断主流程
+              // Gracefully degrade if loading the default unit fails — do not block the main flow.
               defaultUnitUid: this.connector
                 .loadDefaultOrgUnitUid(userId)
                 .pipe(catchError(() => of(undefined))),
             }).pipe(
               tap(({ orgUnits, defaultUnitUid }) => {
-                // 无论 unit 数量多少，都写入状态服务，供 Company 选择器使用
+                // Always write to the state service so the Company header selector is populated.
                 this.stateService.setOrgUnits(orgUnits);
                 this.stateService.setActiveUnit(defaultUnitUid ?? null);
                 if (orgUnits.length > 0) {
@@ -106,9 +107,10 @@ export class B2bUnitSelectionEffects {
   );
 
   /**
-   * 监听 SET_DEFAULT_ORG_UNIT action，调用 PUT API 设置默认 unit。
-   * 成功后刷新 token（使新 unit 权限立即生效），再放行 redirect 并关闭 dialog。
-   * token 刷新失败时降级处理，不阻断主流程。
+   * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
+   * On success, refreshes the token so the new unit's permissions take effect immediately,
+   * then releases the redirect and closes the dialog.
+   * Token refresh failures are swallowed so they do not block the main flow.
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
@@ -124,13 +126,13 @@ export class B2bUnitSelectionEffects {
       switchMap(({ userId, unitUid, redirectToHome }) =>
         this.connector.setDefaultOrgUnit(userId, unitUid).pipe(
           tap(() => {
-            // 刷新 token，使新 unit 的权限上下文立即生效（fire-and-forget）
+            // Refresh the token so the new unit's permission context takes effect (fire-and-forget).
             this.oAuthLibWrapperService.refreshToken();
             this.coordinator.allowRedirect();
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitUid);
-            // 仅 header 选择器切换（redirectToHome=true）才跳首页；
-            // dialog 确认走 coordinator 原有的 post-login redirect 逻辑
+            // Only navigate home for header selector switches (redirectToHome=true);
+            // dialog confirmations rely on the coordinator's existing post-login redirect.
             if (redirectToHome) {
               this.routingService.go({ cxRoute: 'home' });
             }
@@ -149,7 +151,8 @@ export class B2bUnitSelectionEffects {
   );
 
   /**
-   * 监听 LOGOUT action，清空 stateService，确保退出登录后 Company 选择器隐藏。
+   * Listens for LOGOUT and clears the state service so the Company selector
+   * is hidden after the user logs out.
    */
   clearOnLogout$ = createEffect(
     () =>
@@ -171,16 +174,18 @@ export class B2bUnitSelectionEffects {
   ) {}
 
   /**
-   * 根据 AppComponent 是否已挂载决定打开 dialog 的时机。
+   * Determines when to open the unit-selection dialog based on whether
+   * AppComponent has already been mounted.
    *
-   * InlineRootRenderStrategy 需要 ApplicationRef.components[0] 存在才能渲染 dialog。
-   * 以 components.length > 0 作为判断依据，直接对应该前提条件：
-   * - components 已就绪（手动登录：用户在页面上操作）：立即打开。
-   * - components 尚未就绪（APP_INITIALIZER 阶段自动还原 token）：等 Angular
-   *   bootstrap 完成（isStable 首次为 true）后再打开。
+   * InlineRootRenderStrategy requires ApplicationRef.components[0] to be present.
+   * Using components.length > 0 directly maps to that prerequisite:
+   * - Already mounted (manual login — user interaction on the page): open immediately.
+   * - Not yet mounted (token restore during APP_INITIALIZER): poll via requestAnimationFrame
+   *   until Angular bootstraps and mounts AppComponent.
    *
-   * 注意：不再使用 coordinator.isBlocked() 判断，因为 MetaReducer 在所有
-   * LOGIN dispatch 时都会设置 blocked（包括页面刷新场景），会导致误判。
+   * Note: coordinator.isBlocked() is not used here because the MetaReducer sets
+   * the blocked state for all LOGIN dispatches (including page refresh), which
+   * would produce false positives.
    */
   private openDialogWhenReady(
     orgUnits: B2BUnit[],
@@ -195,11 +200,11 @@ export class B2bUnitSelectionEffects {
     };
 
     if (this.applicationRef.components.length > 0) {
-      // 手动登录 / AppComponent 已挂载：立即打开
+      // Manual login / AppComponent already mounted: open immediately.
       open();
     } else {
-      // OAuth Code Flow / APP_INITIALIZER 阶段：轮询直到 AppComponent 挂载
-      // 比 isStable 更快，避免等待所有 HTTP 请求完成
+      // OAuth Code Flow / APP_INITIALIZER phase: poll until AppComponent mounts.
+      // Faster than isStable, which waits for all pending HTTP requests to settle.
       const poll = () => {
         if (this.applicationRef.components.length > 0) {
           open();
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
new file mode 100644
index 00000000000..09081e0a08f
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
@@ -0,0 +1,204 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  HttpRequest,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
+  HttpTestingController,
+  provideHttpClientTesting,
+} from '@angular/common/http/testing';
+import { fakeAsync, TestBed } from '@angular/core/testing';
+import { LoggerService, OccEndpointsService } from '@spartacus/core';
+import { MockOccEndpointsService } from 'core-libs/core/src/occ/adapters/user/unit-test.helper';
+import { OccB2bUnitSelectionAdapter } from './occ-b2b-unit-selection.adapter';
+
+const userId = 'current';
+const unitUid = 'Rustic';
+
+class MockLoggerService {
+  log(): void {}
+  warn(): void {}
+  error(): void {}
+  info(): void {}
+  debug(): void {}
+}
+
+describe('OccB2bUnitSelectionAdapter', () => {
+  let adapter: OccB2bUnitSelectionAdapter;
+  let httpMock: HttpTestingController;
+  let occEndpointsService: OccEndpointsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        OccB2bUnitSelectionAdapter,
+        { provide: OccEndpointsService, useClass: MockOccEndpointsService },
+        { provide: LoggerService, useClass: MockLoggerService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
+    });
+
+    adapter = TestBed.inject(OccB2bUnitSelectionAdapter);
+    httpMock = TestBed.inject(HttpTestingController);
+    occEndpointsService = TestBed.inject(OccEndpointsService);
+    spyOn(occEndpointsService, 'buildUrl').and.callThrough();
+  });
+
+  afterEach(() => {
+    httpMock.verify();
+  });
+
+  // ── loadDefaultOrgUnitUid ────────────────────────────────────────────────
+
+  describe('loadDefaultOrgUnitUid()', () => {
+    it('should call the orgUser endpoint', fakeAsync(() => {
+      adapter.loadDefaultOrgUnitUid(userId).subscribe();
+
+      httpMock.expectOne((req: HttpRequest<void>) => req.method === 'GET');
+
+      expect(occEndpointsService.buildUrl).toHaveBeenCalledWith('orgUser', {
+        urlParams: { userId },
+      });
+    }));
+
+    it('should return the orgUnit name from the response', (done) => {
+      adapter.loadDefaultOrgUnitUid(userId).subscribe((name) => {
+        expect(name).toBe('Rustic');
+        done();
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush({ orgUnit: { name: 'Rustic' } });
+    });
+
+    it('should return undefined when orgUnit is missing from response', (done) => {
+      adapter.loadDefaultOrgUnitUid(userId).subscribe((name) => {
+        expect(name).toBeUndefined();
+        done();
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush({});
+    });
+
+    it('should rethrow a normalised error on HTTP failure', (done) => {
+      adapter.loadDefaultOrgUnitUid(userId).subscribe({
+        error: (err) => {
+          expect(err).toBeDefined();
+          done();
+        },
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush('error', { status: 500, statusText: 'Server Error' });
+    });
+  });
+
+  // ── loadOrgUnits ─────────────────────────────────────────────────────────
+
+  describe('loadOrgUnits()', () => {
+    it('should call the orgUserUnits endpoint', fakeAsync(() => {
+      adapter.loadOrgUnits(userId).subscribe();
+
+      httpMock.expectOne((req: HttpRequest<void>) => req.method === 'GET');
+
+      expect(occEndpointsService.buildUrl).toHaveBeenCalledWith('orgUserUnits', {
+        urlParams: { userId },
+      });
+    }));
+
+    it('should return the units array from the response', (done) => {
+      const mockUnits = [{ uid: 'unit-1', name: 'Rustic' }];
+
+      adapter.loadOrgUnits(userId).subscribe((units) => {
+        expect(units).toEqual(mockUnits);
+        done();
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush({ orgUnits: mockUnits });
+    });
+
+    it('should return an empty array when orgUnits is missing', (done) => {
+      adapter.loadOrgUnits(userId).subscribe((units) => {
+        expect(units).toEqual([]);
+        done();
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush({});
+    });
+
+    it('should rethrow a normalised error on HTTP failure', (done) => {
+      adapter.loadOrgUnits(userId).subscribe({
+        error: (err) => {
+          expect(err).toBeDefined();
+          done();
+        },
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<void>) => req.method === 'GET')
+        .flush('error', { status: 404, statusText: 'Not Found' });
+    });
+  });
+
+  // ── setDefaultOrgUnit ────────────────────────────────────────────────────
+
+  describe('setDefaultOrgUnit()', () => {
+    it('should call the orgUserDefaultUnit endpoint with PUT', fakeAsync(() => {
+      adapter.setDefaultOrgUnit(userId, unitUid).subscribe();
+
+      const req = httpMock.expectOne(
+        (r: HttpRequest<any>) => r.method === 'PUT'
+      );
+      expect(req.request.body).toEqual({ uid: unitUid });
+
+      expect(occEndpointsService.buildUrl).toHaveBeenCalledWith(
+        'orgUserDefaultUnit',
+        { urlParams: { userId } }
+      );
+    }));
+
+    it('should complete without a value on success', (done) => {
+      let nextCalled = false;
+
+      adapter.setDefaultOrgUnit(userId, unitUid).subscribe({
+        next: () => (nextCalled = true),
+        complete: () => {
+          expect(nextCalled).toBeFalse();
+          done();
+        },
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<any>) => req.method === 'PUT')
+        .flush(null);
+    });
+
+    it('should rethrow a normalised error on HTTP failure', (done) => {
+      adapter.setDefaultOrgUnit(userId, unitUid).subscribe({
+        error: (err) => {
+          expect(err).toBeDefined();
+          done();
+        },
+      });
+
+      httpMock
+        .expectOne((req: HttpRequest<any>) => req.method === 'PUT')
+        .flush('error', { status: 400, statusText: 'Bad Request' });
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
index 1c2e42a0338..61cf61c8a85 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -15,7 +15,7 @@ import {
 import { B2bUnitSelectionAdapter } from '../../core/connectors/b2b-unit-selection.adapter';
 import { Observable } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
-// 注册 OccEndpoints module augmentation
+// Side-effect import: registers the OccEndpoints module augmentation.
 import '../model/occ-b2b-unit-selection-endpoints.model';
 
 @Injectable()
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
new file mode 100644
index 00000000000..cd9075dbade
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
@@ -0,0 +1,111 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TestBed } from '@angular/core/testing';
+import {
+  AuthFlowRoutesService,
+  AuthRedirectService,
+  AuthRedirectStorageService,
+  FeatureToggles,
+  RoutingService,
+} from '@spartacus/core';
+import { Router } from '@angular/router';
+import { SiteContextUrlSerializer } from '@spartacus/core';
+import { BehaviorSubject, Observable, EMPTY } from 'rxjs';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+import { B2bAwareAuthRedirectService } from './b2b-aware-auth-redirect.service';
+
+describe('B2bAwareAuthRedirectService', () => {
+  let service: B2bAwareAuthRedirectService;
+  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
+
+  beforeEach(() => {
+    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
+      'isBlocked',
+      'whenAllowed$',
+    ]);
+
+    TestBed.configureTestingModule({
+      providers: [
+        B2bAwareAuthRedirectService,
+        { provide: B2bRedirectCoordinator, useValue: coordinator },
+        { provide: RoutingService, useValue: { go: jasmine.createSpy() } },
+        // Router.events must be an Observable so AuthRedirectService.init() doesn't crash.
+        { provide: Router, useValue: { events: EMPTY } },
+        {
+          provide: AuthRedirectStorageService,
+          useValue: { getRedirectUrl: () => undefined, setRedirectUrl: () => {} },
+        },
+        {
+          provide: AuthFlowRoutesService,
+          useValue: { isAuthFlow: () => false },
+        },
+        {
+          provide: SiteContextUrlSerializer,
+          useValue: {},
+        },
+        {
+          provide: FeatureToggles,
+          useValue: {},
+        },
+      ],
+    });
+
+    service = TestBed.inject(B2bAwareAuthRedirectService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('redirect()', () => {
+    it('should call super.redirect() immediately when not blocked', () => {
+      coordinator.isBlocked.and.returnValue(false);
+      const superSpy = spyOn(
+        AuthRedirectService.prototype,
+        'redirect'
+      ).and.callFake(() => {});
+
+      service.redirect();
+
+      expect(superSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it('should NOT call super.redirect() immediately when blocked', () => {
+      const deferred$ = new BehaviorSubject<boolean>(false);
+      coordinator.isBlocked.and.returnValue(true);
+      coordinator.whenAllowed$.and.returnValue(
+        deferred$.asObservable() as Observable<boolean>
+      );
+      const superSpy = spyOn(
+        AuthRedirectService.prototype,
+        'redirect'
+      ).and.callFake(() => {});
+
+      service.redirect();
+
+      expect(superSpy).not.toHaveBeenCalled();
+    });
+
+    it('should call super.redirect() once whenAllowed$ emits', () => {
+      const deferred$ = new BehaviorSubject<boolean>(false);
+      coordinator.isBlocked.and.returnValue(true);
+      coordinator.whenAllowed$.and.returnValue(
+        deferred$.asObservable() as Observable<boolean>
+      );
+      const superSpy = spyOn(
+        AuthRedirectService.prototype,
+        'redirect'
+      ).and.callFake(() => {});
+
+      service.redirect();
+      expect(superSpy).not.toHaveBeenCalled();
+
+      deferred$.next(true);
+      expect(superSpy).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
index edfddd22410..e4104a81d39 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
@@ -9,12 +9,11 @@ import { AuthRedirectService } from '@spartacus/core';
 import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
 
 /**
- * 拦截 AuthRedirectService.redirect()：
- * 若 B2B unit 选择流程正在进行（coordinator.isBlocked），
- * 则等待 coordinator.whenAllowed$() 信号后再执行实际跳转。
+ * Overrides AuthRedirectService.redirect() to defer the post-login navigation
+ * while a B2B unit selection is in progress.
  *
- * 通过 MetaReducer 在 LOGIN action dispatch 时同步设置 blocked 状态，
- * 确保此处能在 redirect() 调用时感知到拦截标志。
+ * The coordinator is set to blocked synchronously inside the LOGIN MetaReducer,
+ * guaranteeing that this guard is already active when redirect() is first called.
  */
 @Injectable()
 export class B2bAwareAuthRedirectService extends AuthRedirectService {
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
new file mode 100644
index 00000000000..1e8cf131a77
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ActionReducer } from '@ngrx/store';
+import { AuthActions } from '@spartacus/core';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+import { createB2bLoginMetaReducer } from './b2b-login-meta-reducer';
+
+describe('createB2bLoginMetaReducer', () => {
+  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
+  let mockReducer: jasmine.Spy;
+
+  const state = {};
+  const loginAction = { type: AuthActions.LOGIN };
+  const otherAction = { type: '[Other] Some Action' };
+
+  beforeEach(() => {
+    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
+      'blockRedirect',
+    ]);
+    mockReducer = jasmine.createSpy('reducer').and.returnValue(state);
+  });
+
+  function buildMetaReducer(): ActionReducer<any> {
+    return createB2bLoginMetaReducer(coordinator)(mockReducer);
+  }
+
+  it('should always delegate to the inner reducer', () => {
+    const metaReducer = buildMetaReducer();
+    metaReducer(state, otherAction);
+    expect(mockReducer).toHaveBeenCalledWith(state, otherAction);
+  });
+
+  it('should return the result of the inner reducer', () => {
+    const expectedState = { key: 'value' };
+    mockReducer.and.returnValue(expectedState);
+    const metaReducer = buildMetaReducer();
+    const result = metaReducer(state, otherAction);
+    expect(result).toBe(expectedState);
+  });
+
+  it('should NOT call blockRedirect() for non-LOGIN actions', () => {
+    const metaReducer = buildMetaReducer();
+    metaReducer(state, otherAction);
+    expect(coordinator.blockRedirect).not.toHaveBeenCalled();
+  });
+
+  describe('LOGIN action', () => {
+    it('should NOT call blockRedirect() when URL is a plain page (no /login, no OAuth code)', () => {
+      // In Karma, window.location.href is something like "http://localhost:9876/context.html"
+      // — it contains neither "/login" nor "?code=...&state=...", so no block should occur.
+      const metaReducer = buildMetaReducer();
+      metaReducer(state, loginAction);
+
+      // The module-load snapshot (captured at import time) also does not contain
+      // code= / state= in a normal test run, so blockRedirect() should not be called.
+      expect(coordinator.blockRedirect).not.toHaveBeenCalled();
+    });
+
+    it('should still call the inner reducer on LOGIN', () => {
+      const metaReducer = buildMetaReducer();
+      metaReducer(state, loginAction);
+      expect(mockReducer).toHaveBeenCalledWith(state, loginAction);
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
index 7434a144763..aa06af97d4c 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
@@ -9,20 +9,22 @@ import { AuthActions } from '@spartacus/core';
 import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
 
 /**
- * 在模块加载时（早于所有 APP_INITIALIZER）捕获原始 URL。
- * angular-oauth2-oidc 在 APP_INITIALIZER 阶段处理 OAuth callback 时会清除
- * URL 中的 ?code=... 参数，因此必须在此之前捕获。
+ * Captured at module load time — before any APP_INITIALIZER runs.
+ * angular-oauth2-oidc strips ?code=...&state=... query params during its
+ * APP_INITIALIZER phase, so we must snapshot the href here to detect OAuth
+ * Code Flow callbacks reliably.
  */
 const _hrefAtModuleLoad =
   typeof window !== 'undefined' ? window.location.href : '';
 
 /**
- * MetaReducer 工厂函数：仅在"真正登录"场景调用 blockRedirect()，跳过 token 还原。
+ * MetaReducer factory that calls blockRedirect() only for genuine login events,
+ * not for token restoration on page refresh.
  *
- * 判断依据（优先级由高到低）：
- *   1. 模块加载时 URL 含 ?code=...&state=... → Authorization Code Flow 回调
- *   2. 当前 URL 含 /login → ROPC（用户在 Spartacus login 页填表提交）
- *   3. 其余情况 → token 还原或非登录场景，不拦截
+ * Detection logic (evaluated in order):
+ *   1. Module-load href contains ?code=...&state=... → Authorization Code Flow callback
+ *   2. Current href contains /login               → ROPC (user submitted the login form)
+ *   3. Anything else                              → token restore or unrelated, no block
  */
 export function createB2bLoginMetaReducer(
   coordinator: B2bRedirectCoordinator
@@ -35,8 +37,8 @@ export function createB2bLoginMetaReducer(
       if (action.type === AuthActions.LOGIN) {
         const currentHref =
           typeof window !== 'undefined' ? window.location.href : '';
-        const isOnLoginPage = currentHref.includes('/login');
-        const isFreshLogin = hasFreshOAuthCode || isOnLoginPage;
+        const isFreshLogin =
+          hasFreshOAuthCode || currentHref.includes('/login');
         if (isFreshLogin) {
           coordinator.blockRedirect();
         }
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
new file mode 100644
index 00000000000..f897a4e3aec
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
@@ -0,0 +1,76 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TestBed } from '@angular/core/testing';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+
+describe('B2bRedirectCoordinator', () => {
+  let service: B2bRedirectCoordinator;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(B2bRedirectCoordinator);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('initial state', () => {
+    it('should start in the allowed (unblocked) state', () => {
+      expect(service.isBlocked()).toBeFalse();
+    });
+  });
+
+  describe('blockRedirect()', () => {
+    it('should transition to blocked state', () => {
+      service.blockRedirect();
+      expect(service.isBlocked()).toBeTrue();
+    });
+  });
+
+  describe('allowRedirect()', () => {
+    it('should transition back to allowed state after blocking', () => {
+      service.blockRedirect();
+      service.allowRedirect();
+      expect(service.isBlocked()).toBeFalse();
+    });
+  });
+
+  describe('whenAllowed$()', () => {
+    it('should emit immediately when already allowed', (done) => {
+      let emitted = false;
+      service.whenAllowed$().subscribe(() => {
+        emitted = true;
+        done();
+      });
+      expect(emitted).toBeTrue();
+    });
+
+    it('should not emit while blocked, then emit once after allowRedirect()', () => {
+      service.blockRedirect();
+      const values: boolean[] = [];
+      const sub = service.whenAllowed$().subscribe((v) => values.push(v));
+
+      expect(values.length).toBe(0);
+
+      service.allowRedirect();
+      expect(values).toEqual([true]);
+
+      // Verify take(1): a second allowRedirect() should not cause another emission.
+      service.allowRedirect();
+      expect(values.length).toBe(1);
+
+      sub.unsubscribe();
+    });
+
+    it('should complete after emitting once', () => {
+      let completed = false;
+      service.whenAllowed$().subscribe({ complete: () => (completed = true) });
+      expect(completed).toBeTrue();
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
index 61098b9298a..e9b6b1344aa 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
@@ -9,13 +9,14 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, take } from 'rxjs/operators';
 
 /**
- * 协调 B2B unit 选择与 login redirect 的时序。
+ * Coordinates the timing between B2B unit selection and the post-login redirect.
  *
- * 工作流程：
- * 1. MetaReducer 在 LOGIN action dispatch 的瞬间（同步）调用 blockRedirect()
- * 2. AuthRedirectService.redirect() 检测到 blocked 状态后挂起，等待 whenAllowed$
- * 3. Effect 完成 org units 加载并打开 dialog
- * 4. 用户确认 unit 后，effect 调用 allowRedirect() → 挂起的 redirect 执行
+ * Flow:
+ *   1. MetaReducer calls blockRedirect() synchronously on LOGIN dispatch.
+ *   2. AuthRedirectService.redirect() detects the blocked state and suspends.
+ *   3. The effect loads org units and opens the dialog.
+ *   4. After the user confirms a unit, allowRedirect() is called and
+ *      the suspended redirect executes.
  */
 @Injectable({ providedIn: 'root' })
 export class B2bRedirectCoordinator {
@@ -33,7 +34,7 @@ export class B2bRedirectCoordinator {
     return !this.allowed$.getValue();
   }
 
-  /** 等待 gate 打开（只取第一次 true 信号） */
+  /** Emits once when the gate opens, then completes. */
   whenAllowed$(): Observable<boolean> {
     return this.allowed$.pipe(
       filter((v) => v),
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts
new file mode 100644
index 00000000000..25af181fdf5
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts
@@ -0,0 +1,131 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TestBed } from '@angular/core/testing';
+import { ApplicationRef } from '@angular/core';
+import { Router } from '@angular/router';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
+import { createB2bRedirectPatcher } from './b2b-redirect-patcher';
+
+describe('createB2bRedirectPatcher', () => {
+  let router: any;
+  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
+  let appRef: Partial<ApplicationRef>;
+  let originalScheduleNavigation: jasmine.Spy;
+  let whenAllowed$: BehaviorSubject<boolean>;
+
+  const rawUrl = {} as any;
+  const source = 'imperative' as any;
+  const restoredState = null as any;
+  const extras = {} as any;
+
+  beforeEach(() => {
+    originalScheduleNavigation = jasmine
+      .createSpy('scheduleNavigation')
+      .and.returnValue(Promise.resolve(true));
+
+    whenAllowed$ = new BehaviorSubject<boolean>(true);
+
+    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
+      'isBlocked',
+      'whenAllowed$',
+    ]);
+    coordinator.whenAllowed$.and.returnValue(
+      whenAllowed$.asObservable() as Observable<boolean>
+    );
+
+    router = { scheduleNavigation: originalScheduleNavigation };
+    appRef = { components: [] as any[] };
+
+    TestBed.configureTestingModule({});
+  });
+
+  function patch(): void {
+    createB2bRedirectPatcher(router as Router, coordinator, appRef as ApplicationRef)();
+  }
+
+  describe('when not blocked', () => {
+    beforeEach(() => {
+      coordinator.isBlocked.and.returnValue(false);
+    });
+
+    it('should call originalScheduleNavigation immediately', () => {
+      patch();
+      router.scheduleNavigation(rawUrl, source, restoredState, extras);
+      expect(originalScheduleNavigation).toHaveBeenCalledWith(
+        rawUrl,
+        source,
+        restoredState,
+        extras,
+        undefined
+      );
+    });
+  });
+
+  describe('when blocked but AppComponent not yet mounted (token restore)', () => {
+    beforeEach(() => {
+      coordinator.isBlocked.and.returnValue(true);
+      (appRef as any).components = [];
+    });
+
+    it('should call originalScheduleNavigation immediately (page-refresh path)', () => {
+      patch();
+      router.scheduleNavigation(rawUrl, source, restoredState, extras);
+      expect(originalScheduleNavigation).toHaveBeenCalledWith(
+        rawUrl,
+        source,
+        restoredState,
+        extras,
+        undefined
+      );
+    });
+  });
+
+  describe('when blocked and AppComponent is mounted (interactive login)', () => {
+    beforeEach(() => {
+      coordinator.isBlocked.and.returnValue(true);
+      (appRef as any).components = [{}]; // AppComponent mounted
+    });
+
+    it('should NOT call originalScheduleNavigation immediately', () => {
+      patch();
+      router.scheduleNavigation(rawUrl, source, restoredState, extras);
+      expect(originalScheduleNavigation).not.toHaveBeenCalled();
+    });
+
+    it('should return Promise.resolve(false)', async () => {
+      patch();
+      const result = await router.scheduleNavigation(
+        rawUrl,
+        source,
+        restoredState,
+        extras
+      );
+      expect(result).toBeFalse();
+    });
+
+    it('should call originalScheduleNavigation after whenAllowed$ emits', () => {
+      const deferred$ = new BehaviorSubject<boolean>(false);
+      coordinator.whenAllowed$.and.returnValue(
+        deferred$.asObservable() as Observable<boolean>
+      );
+
+      patch();
+      router.scheduleNavigation(rawUrl, source, restoredState, extras);
+      expect(originalScheduleNavigation).not.toHaveBeenCalled();
+
+      deferred$.next(true);
+      expect(originalScheduleNavigation).toHaveBeenCalledWith(
+        rawUrl,
+        source,
+        restoredState,
+        extras,
+        undefined
+      );
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
index 64a8030632a..9e01cf04090 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
@@ -9,28 +9,28 @@ import { Router } from '@angular/router';
 import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
 
 /**
- * APP_INITIALIZER 工厂：在 bootstrap 阶段直接 patch Angular Router 内部的
- * scheduleNavigation() 方法——所有路由跳转（包括 Guard UrlTree 重定向）的
- * 唯一真正入口。
+ * APP_INITIALIZER factory that patches the Angular Router's internal
+ * scheduleNavigation() method — the single entry point for every navigation,
+ * including Guard UrlTree redirects.
  *
- * 调用链（所有路径最终都汇聚到此方法）：
- *   router.navigate()       → router.navigateByUrl() → scheduleNavigation()
- *   router.navigateByUrl()                           → scheduleNavigation()
- *   Guard 返回 UrlTree      → RedirectRequest 事件   → scheduleNavigation()
- *   浏览器触发的历史导航                              → scheduleNavigation()
+ * Call chain (all paths converge here):
+ *   router.navigate()     → router.navigateByUrl() → scheduleNavigation()
+ *   router.navigateByUrl()                         → scheduleNavigation()
+ *   Guard returns UrlTree → RedirectRequest event  → scheduleNavigation()
+ *   Browser history navigation                     → scheduleNavigation()
  *
- * 拦截条件（两个条件同时满足才拦截）：
- *   1. coordinator.isBlocked()：MetaReducer 已在 dispatch(Login) 时同步设置。
- *   2. applicationRef.components.length > 0：AppComponent 已挂载，表明这是
- *      用户主动登录场景（而非页面刷新时的 token 自动恢复场景）。
+ * Intercept conditions (both must be true):
+ *   1. coordinator.isBlocked() — set synchronously by the MetaReducer on LOGIN.
+ *   2. appRef.components.length > 0 — AppComponent is mounted, indicating an
+ *      interactive login rather than a token restore on page refresh.
  *
- * 区分两种 LOGIN 场景：
- *   - 页面刷新（token 自动恢复）：LOGIN 在 APP_INITIALIZER 阶段 dispatch，
- *     此时 AppComponent 尚未挂载（components.length = 0），不拦截导航，
- *     页面正常加载；dialog 通过 ApplicationRef.isStable 延迟打开。
- *   - 手动登录（用户填写表单）：LOGIN 在用户交互后 dispatch，
- *     此时 AppComponent 已挂载（components.length > 0），拦截 redirect，
- *     用户停留在 login 页面，等待 B2B unit 选择完成后再跳转。
+ * Two LOGIN scenarios distinguished:
+ *   - Page refresh (token restore): LOGIN dispatched in APP_INITIALIZER phase
+ *     while components.length === 0; navigation is not intercepted and the page
+ *     loads normally. The dialog opens later via requestAnimationFrame polling.
+ *   - Manual login (user submits form): LOGIN dispatched after user interaction
+ *     while components.length > 0; navigation is intercepted and the user stays
+ *     on the login page until B2B unit selection completes.
  */
 export function createB2bRedirectPatcher(
   router: Router,
@@ -49,11 +49,9 @@ export function createB2bRedirectPatcher(
       extras: any,
       priorPromise?: any
     ): Promise<boolean> => {
-      const blocked = coordinator.isBlocked();
-      const componentsLen = appRef.components.length;
-      // 仅在手动登录场景（AppComponent 已挂载）时拦截，
-      // 页面刷新 token 恢复场景（components.length = 0）直接放行
-      if (!blocked || componentsLen === 0) {
+      // Only intercept during interactive login (AppComponent already mounted).
+      // Token restore on page refresh (components.length === 0) passes through.
+      if (!coordinator.isBlocked() || appRef.components.length === 0) {
         return originalScheduleNavigation(
           rawUrl,
           source,
@@ -62,7 +60,7 @@ export function createB2bRedirectPatcher(
           priorPromise
         );
       }
-      // B2B unit 选择进行中：挂起导航，待 allowRedirect() 后执行
+      // B2B unit selection in progress: defer navigation until allowRedirect().
       coordinator.whenAllowed$().subscribe(() => {
         originalScheduleNavigation(
           rawUrl,

From 74dc812fab50056b68f652e0ca092daf12c0a34f Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 15:29:01 +0800
Subject: [PATCH 06/60] fix

fix
---
 .../effects/b2b-unit-selection.effects.spec.ts  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 769a229e74b..8833f8bce0f 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -26,7 +26,7 @@ import {
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 // Side-effect import: registers LAUNCH_CALLER.B2B_UNIT_SELECTION enum extension.
 import '../../../root/model/augmented-core.model';
-import { cold, hot } from 'jasmine-marbles';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { Observable, of, throwError } from 'rxjs';
 import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
 import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
@@ -153,24 +153,25 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.checkOrgUnitsOnLogin$.subscribe();
+      getTestScheduler().flush();
 
       expect(stateService.setOrgUnits).toHaveBeenCalledWith(mockUnits);
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
     });
 
-    it('should open the dialog when orgUnits.length > 0', fakeAsync(() => {
+    it('should open the dialog when orgUnits.length > 0', () => {
       const action = new AuthActions.Login();
       actions$ = hot('-a', { a: action });
 
       effects.checkOrgUnitsOnLogin$.subscribe();
-      tick();
+      getTestScheduler().flush();
 
       expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
         LAUNCH_CALLER.B2B_UNIT_SELECTION,
         undefined,
         { orgUnits: mockUnits, defaultUnitUid: mockDefaultUid }
       );
-    }));
+    });
 
     it('should call allowRedirect() when orgUnits is empty', () => {
       connector.loadOrgUnits.and.returnValue(of([]));
@@ -180,6 +181,7 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.checkOrgUnitsOnLogin$.subscribe();
+      getTestScheduler().flush();
 
       expect(coordinator.allowRedirect).toHaveBeenCalled();
       expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
@@ -223,6 +225,10 @@ describe('B2bUnitSelectionEffects', () => {
       const expected = cold('-');
 
       expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+
+      // allowRedirect() is called synchronously inside the exhaustMap guard.
+      getTestScheduler().flush();
+      expect(coordinator.allowRedirect).toHaveBeenCalled();
     });
   });
 
@@ -246,6 +252,7 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
+      getTestScheduler().flush();
 
       expect(oAuthLibWrapperService.refreshToken).toHaveBeenCalled();
       expect(coordinator.allowRedirect).toHaveBeenCalled();
@@ -261,6 +268,7 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
+      getTestScheduler().flush();
 
       expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'home' });
     });
@@ -270,6 +278,7 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
+      getTestScheduler().flush();
 
       expect(routingService.go).not.toHaveBeenCalled();
     });

From c81fe9ec75a940bfaa96dce6da0ee496d71503fa Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:16:37 +0800
Subject: [PATCH 07/60] fix

fix
---
 .../b2b-unit-selection-dialog.component.html  |   8 +-
 .../b2b-unit-selection-dialog.component.ts    |   9 +-
 ...stract-b2b-unit-selector.component.spec.ts |   9 +-
 .../abstract-b2b-unit-selector.component.ts   |   6 +-
 .../b2b-unit-selector.component.html          |   4 +-
 .../b2b-unit-selector.component.ts            |  15 +-
 .../connectors/b2b-unit-selection.adapter.ts  |  12 +-
 .../b2b-unit-selector-state.service.ts        |   3 +-
 .../actions/b2b-unit-selection.actions.ts     |   5 +-
 .../b2b-unit-selection.effects.spec.ts        | 134 ++++++++++++------
 .../effects/b2b-unit-selection.effects.ts     |  52 ++-----
 .../occ-b2b-unit-selection.adapter.spec.ts    |  20 ++-
 .../occ-b2b-unit-selection.adapter.ts         |   6 +-
 .../occ-b2b-unit-selection-endpoints.model.ts |   6 +-
 .../b2b-aware-auth-redirect.service.spec.ts   | 111 ---------------
 .../root/b2b-aware-auth-redirect.service.ts   |  31 ----
 .../root/b2b-login-meta-reducer.spec.ts       |  69 ---------
 .../root/b2b-login-meta-reducer.ts            |  48 -------
 .../b2b-redirect-coordinator.service.spec.ts  |  76 ----------
 .../root/b2b-redirect-coordinator.service.ts  |  44 ------
 .../root/b2b-redirect-patcher.spec.ts         | 131 -----------------
 .../root/b2b-redirect-patcher.ts              |  76 ----------
 .../root/b2b-unit-selection-root.module.ts    |  47 +-----
 .../root/config/b2b-unit-selection.config.ts  |   5 +-
 .../styles/_b2b-unit-selector.scss            |  25 ++--
 ...ation-b2b-unit-selection-feature.module.ts |  10 +-
 26 files changed, 190 insertions(+), 772 deletions(-)
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
index 3b7aa7b5544..1b063d5abb4 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
@@ -35,11 +35,11 @@ <h2 id="b2b-unit-selection-title" class="modal-title">
           bindLabel="name"
           [clearable]="false"
           [searchable]="false"
-          [cxNgSelectA11y]="{ ariaLabel: 'b2bUnitSelection.dialog.unitLabel' | cxTranslate }"
+          [cxNgSelectA11y]="{
+            ariaLabel: 'b2bUnitSelection.dialog.unitLabel' | cxTranslate,
+          }"
         ></ng-select>
-        <cx-form-errors
-          [control]="form.get('selectedUnit')"
-        ></cx-form-errors>
+        <cx-form-errors [control]="form.get('selectedUnit')"></cx-form-errors>
       </div>
     </div>
 
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index b86b4d9791f..085a5ae3180 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -66,17 +66,16 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.subscriptions.add(
-      this.launchDialogService.data$.pipe(take(1)).subscribe(
-        (data: { orgUnits: B2BUnit[]; defaultUnitUid?: string }) => {
+      this.launchDialogService.data$
+        .pipe(take(1))
+        .subscribe((data: { orgUnits: B2BUnit[]; defaultUnitUid?: string }) => {
           this.orgUnits = data?.orgUnits ?? [];
-          // OCC /orgUsers/{userId}/orgUnits 只返回 name，不含 uid，以 name 做匹配预选。
           const matched =
             this.orgUnits.find((u) => u.name === data?.defaultUnitUid) ??
             this.orgUnits[0] ??
             null;
           this.form.get('selectedUnit')?.setValue(matched);
-        }
-      )
+        })
     );
   }
 
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
index d8794962adf..7ff4c31f9db 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -25,6 +25,7 @@ const mockDefaultUid = 'Rustic';
 
 /** Minimal concrete subclass for testing. */
 @Component({
+  standalone: true,
   selector: 'cx-test-selector',
   template: '',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -72,10 +73,13 @@ describe('AbstractB2bUnitSelectorComponent', () => {
     stateService.orgUnits$ = of(initialUnits);
 
     TestBed.configureTestingModule({
-      declarations: [TestB2bUnitSelectorComponent],
+      imports: [TestB2bUnitSelectorComponent],
       providers: [
         { provide: B2bUnitSelectorStateService, useValue: stateService },
-        { provide: B2bUnitSelectionConnector, useClass: MockB2bUnitSelectionConnector },
+        {
+          provide: B2bUnitSelectionConnector,
+          useClass: MockB2bUnitSelectionConnector,
+        },
         { provide: UserIdService, useClass: MockUserIdService },
         { provide: Store, useClass: MockStore },
         {
@@ -127,6 +131,7 @@ describe('AbstractB2bUnitSelectorComponent', () => {
 
     it('should set active unit to null when loadDefaultOrgUnitUid fails', () => {
       createComponent(true, []);
+      connector = TestBed.inject(B2bUnitSelectionConnector) as any;
       connector.loadDefaultOrgUnitUid.and.returnValue(
         throwError(() => new Error('not found'))
       );
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index db00019f729..9e5c0207562 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -66,7 +66,11 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
       .pipe(take(1))
       .subscribe((userId) => {
         this.store.dispatch(
-          new SetDefaultOrgUnit({ userId, unitUid: unitName, redirectToHome: true })
+          new SetDefaultOrgUnit({
+            userId,
+            unitUid: unitName,
+            redirectToHome: true,
+          })
         );
       });
   }
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index 5f951310add..704f718d477 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -17,7 +17,9 @@
       [disabled]="!hasMultipleUnits()"
       appendTo="cx-b2b-unit-selector"
       (ngModelChange)="onSelect($event)"
-      [cxNgSelectA11y]="{ ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate }"
+      [cxNgSelectA11y]="{
+        ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate,
+      }"
     ></ng-select>
     <cx-icon
       *ngIf="hasMultipleUnits()"
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
index 0e24d23feb4..14fd9b1723c 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -9,7 +9,11 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { TranslatePipe } from '@spartacus/core';
-import { IconComponent, ICON_TYPE, NgSelectA11yDirective } from '@spartacus/storefront';
+import {
+  IconComponent,
+  ICON_TYPE,
+  NgSelectA11yDirective,
+} from '@spartacus/storefront';
 import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.component';
 
 /**
@@ -21,7 +25,14 @@ import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.c
   selector: 'cx-b2b-unit-selector',
   templateUrl: './b2b-unit-selector.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [NgIf, FormsModule, NgSelectComponent, NgSelectA11yDirective, IconComponent, TranslatePipe],
+  imports: [
+    NgIf,
+    FormsModule,
+    NgSelectComponent,
+    NgSelectA11yDirective,
+    IconComponent,
+    TranslatePipe,
+  ],
 })
 export class B2bUnitSelectorComponent extends AbstractB2bUnitSelectorComponent {
   readonly iconTypes = ICON_TYPE;
diff --git a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
index 2204aea7fed..f01fa494b83 100644
--- a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
@@ -9,18 +9,20 @@ import { Observable } from 'rxjs';
 
 export abstract class B2bUnitSelectionAdapter {
   /**
-   * 获取当前 B2B 用户个人信息，返回默认 org unit 的 uid。
-   * 对应 GET /{baseSiteId}/orgUsers/{userId}
+   * Fetches the current B2B user profile and returns the default org unit uid.
+   * Corresponds to GET /{baseSiteId}/orgUsers/{userId}
    */
-  abstract loadDefaultOrgUnitUid(userId: string): Observable<string | undefined>;
+  abstract loadDefaultOrgUnitUid(
+    userId: string
+  ): Observable<string | undefined>;
 
   /**
-   * 获取当前 B2B 用户被分配的所有 org units
+   * Fetches all org units assigned to the current B2B user.
    */
   abstract loadOrgUnits(userId: string): Observable<B2BUnit[]>;
 
   /**
-   * 设置当前 B2B 用户的默认 org unit
+   * Sets the default org unit for the current B2B user.
    */
   abstract setDefaultOrgUnit(userId: string, unitUid: string): Observable<void>;
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
index c0a53b03bc7..0c0023b881b 100644
--- a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
@@ -21,8 +21,7 @@ export class B2bUnitSelectorStateService {
   private _activeUnitName$ = new BehaviorSubject<string | null>(null);
 
   /** All org units assigned to the current user. */
-  readonly orgUnits$: Observable<B2BUnit[]> =
-    this._orgUnits$.asObservable();
+  readonly orgUnits$: Observable<B2BUnit[]> = this._orgUnits$.asObservable();
 
   /** The name of the currently active (default) org unit. */
   readonly activeUnitName$: Observable<string | null> =
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
index daf990e2e1b..27fbb494c25 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -32,8 +32,7 @@ export class LoadUserOrgUnitsFail implements Action {
 
 // ── Set Default Org Unit ──────────────────────────────────────────────────────
 
-export const SET_DEFAULT_ORG_UNIT =
-  '[B2BUnitSelection] Set Default Org Unit';
+export const SET_DEFAULT_ORG_UNIT = '[B2BUnitSelection] Set Default Org Unit';
 export const SET_DEFAULT_ORG_UNIT_SUCCESS =
   '[B2BUnitSelection] Set Default Org Unit Success';
 export const SET_DEFAULT_ORG_UNIT_FAIL =
@@ -45,7 +44,7 @@ export class SetDefaultOrgUnit implements Action {
     public payload: {
       userId: string;
       unitUid: string;
-      /** true = 来自 header 选择器切换，成功后跳转首页；false/undefined = 来自 dialog */
+      /** true = triggered from the header selector (navigates home on success); false/undefined = triggered from the dialog */
       redirectToHome?: boolean;
     }
   ) {}
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 8833f8bce0f..a79bc928bd4 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ApplicationRef } from '@angular/core';
-import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Action } from '@ngrx/store';
 import {
@@ -29,7 +29,6 @@ import '../../../root/model/augmented-core.model';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { Observable, of, throwError } from 'rxjs';
 import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
-import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
 import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
@@ -57,7 +56,9 @@ class MockB2bUnitSelectionConnector {
   loadDefaultOrgUnitUid = createSpy('loadDefaultOrgUnitUid').and.returnValue(
     of(mockDefaultUid)
   );
-  setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(of(void 0));
+  setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(
+    of(void 0)
+  );
 }
 
 class MockB2bUnitSelectorStateService {
@@ -78,11 +79,6 @@ class MockRoutingService {
   go = createSpy('go');
 }
 
-class MockB2bRedirectCoordinator {
-  allowRedirect = createSpy('allowRedirect');
-  isBlocked = createSpy('isBlocked').and.returnValue(false);
-}
-
 class MockOAuthLibWrapperService {
   refreshToken = createSpy('refreshToken');
 }
@@ -92,7 +88,6 @@ describe('B2bUnitSelectionEffects', () => {
   let connector: MockB2bUnitSelectionConnector;
   let stateService: MockB2bUnitSelectorStateService;
   let launchDialogService: MockLaunchDialogService;
-  let coordinator: MockB2bRedirectCoordinator;
   let routingService: MockRoutingService;
   let oAuthLibWrapperService: MockOAuthLibWrapperService;
   let actions$: Observable<Action>;
@@ -101,19 +96,31 @@ describe('B2bUnitSelectionEffects', () => {
   beforeEach(() => {
     applicationRef = {
       components: [{}] as any[],
-      afterTick: { subscribe: jasmine.createSpy().and.returnValue({ unsubscribe: () => {} }) },
+      afterTick: {
+        subscribe: jasmine
+          .createSpy()
+          .and.returnValue({ unsubscribe: () => {} }),
+      },
     };
 
     TestBed.configureTestingModule({
       providers: [
         B2bUnitSelectionEffects,
-        { provide: B2bUnitSelectionConnector, useClass: MockB2bUnitSelectionConnector },
-        { provide: B2bUnitSelectorStateService, useClass: MockB2bUnitSelectorStateService },
+        {
+          provide: B2bUnitSelectionConnector,
+          useClass: MockB2bUnitSelectionConnector,
+        },
+        {
+          provide: B2bUnitSelectorStateService,
+          useClass: MockB2bUnitSelectorStateService,
+        },
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: UserIdService, useClass: MockUserIdService },
         { provide: RoutingService, useClass: MockRoutingService },
-        { provide: B2bRedirectCoordinator, useClass: MockB2bRedirectCoordinator },
-        { provide: OAuthLibWrapperService, useClass: MockOAuthLibWrapperService },
+        {
+          provide: OAuthLibWrapperService,
+          useClass: MockOAuthLibWrapperService,
+        },
         { provide: ApplicationRef, useValue: applicationRef },
         { provide: LoggerService, useClass: MockLoggerService },
         {
@@ -130,7 +137,6 @@ describe('B2bUnitSelectionEffects', () => {
     connector = TestBed.inject(B2bUnitSelectionConnector) as any;
     stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
     launchDialogService = TestBed.inject(LaunchDialogService) as any;
-    coordinator = TestBed.inject(B2bRedirectCoordinator) as any;
     routingService = TestBed.inject(RoutingService) as any;
     oAuthLibWrapperService = TestBed.inject(OAuthLibWrapperService) as any;
   });
@@ -140,7 +146,9 @@ describe('B2bUnitSelectionEffects', () => {
   describe('checkOrgUnitsOnLogin$', () => {
     it('should dispatch LoadUserOrgUnitsSuccess on successful login with multiple units', () => {
       const action = new AuthActions.Login();
-      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(mockUnits);
+      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(
+        mockUnits
+      );
 
       actions$ = hot('-a', { a: action });
       const expected = cold('-b', { b: completion });
@@ -173,7 +181,7 @@ describe('B2bUnitSelectionEffects', () => {
       );
     });
 
-    it('should call allowRedirect() when orgUnits is empty', () => {
+    it('should NOT open the dialog when orgUnits is empty', () => {
       connector.loadOrgUnits.and.returnValue(of([]));
       connector.loadDefaultOrgUnitUid.and.returnValue(of(undefined));
 
@@ -183,11 +191,10 @@ describe('B2bUnitSelectionEffects', () => {
       effects.checkOrgUnitsOnLogin$.subscribe();
       getTestScheduler().flush();
 
-      expect(coordinator.allowRedirect).toHaveBeenCalled();
       expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
     });
 
-    it('should dispatch LoadUserOrgUnitsFail and call allowRedirect() on connector error', () => {
+    it('should dispatch LoadUserOrgUnitsFail on connector error', () => {
       connector.loadOrgUnits.and.returnValue(throwError(() => mockError));
 
       const action = new AuthActions.Login();
@@ -202,10 +209,14 @@ describe('B2bUnitSelectionEffects', () => {
     });
 
     it('should degrade gracefully when loadDefaultOrgUnitUid fails', () => {
-      connector.loadDefaultOrgUnitUid.and.returnValue(throwError(() => mockError));
+      connector.loadDefaultOrgUnitUid.and.returnValue(
+        throwError(() => mockError)
+      );
 
       const action = new AuthActions.Login();
-      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(mockUnits);
+      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(
+        mockUnits
+      );
 
       actions$ = hot('-a', { a: action });
       const expected = cold('-b', { b: completion });
@@ -213,23 +224,6 @@ describe('B2bUnitSelectionEffects', () => {
       expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
     });
-
-    it('should return EMPTY and call allowRedirect() when feature is disabled', () => {
-      TestBed.overrideProvider(B2bUnitSelectionConfig, {
-        useValue: { b2bUnitSelection: { enabled: false } },
-      });
-      effects = TestBed.inject(B2bUnitSelectionEffects);
-
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-');
-
-      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
-
-      // allowRedirect() is called synchronously inside the exhaustMap guard.
-      getTestScheduler().flush();
-      expect(coordinator.allowRedirect).toHaveBeenCalled();
-    });
   });
 
   // ── setDefaultOrgUnit$ ────────────────────────────────────────────────────
@@ -247,7 +241,7 @@ describe('B2bUnitSelectionEffects', () => {
       expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
     });
 
-    it('should refresh token, allow redirect, close dialog, and update state', () => {
+    it('should refresh token, close dialog, and update state', () => {
       const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
       actions$ = hot('-a', { a: action });
 
@@ -255,7 +249,6 @@ describe('B2bUnitSelectionEffects', () => {
       getTestScheduler().flush();
 
       expect(oAuthLibWrapperService.refreshToken).toHaveBeenCalled();
-      expect(coordinator.allowRedirect).toHaveBeenCalled();
       expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitUid);
     });
@@ -306,9 +299,70 @@ describe('B2bUnitSelectionEffects', () => {
       actions$ = hot('-a', { a: action });
 
       effects.clearOnLogout$.subscribe();
+      getTestScheduler().flush();
 
       expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
     });
   });
 });
+
+// ── B2bUnitSelectionEffects (feature disabled) ────────────────────────────
+// Isolated top-level describe so TestBed can be freshly configured without
+// interference from the parent describe's beforeEach which calls inject().
+
+describe('B2bUnitSelectionEffects (feature disabled)', () => {
+  let effects: B2bUnitSelectionEffects;
+  let actions$: Observable<Action>;
+
+  beforeEach(() => {
+    const appRef: any = {
+      components: [{}] as any[],
+      afterTick: {
+        subscribe: jasmine
+          .createSpy()
+          .and.returnValue({ unsubscribe: () => {} }),
+      },
+    };
+
+    TestBed.configureTestingModule({
+      providers: [
+        B2bUnitSelectionEffects,
+        {
+          provide: B2bUnitSelectionConnector,
+          useClass: MockB2bUnitSelectionConnector,
+        },
+        {
+          provide: B2bUnitSelectorStateService,
+          useClass: MockB2bUnitSelectorStateService,
+        },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: UserIdService, useClass: MockUserIdService },
+        { provide: RoutingService, useClass: MockRoutingService },
+        {
+          provide: OAuthLibWrapperService,
+          useClass: MockOAuthLibWrapperService,
+        },
+        { provide: ApplicationRef, useValue: appRef },
+        { provide: LoggerService, useClass: MockLoggerService },
+        {
+          provide: B2bUnitSelectionConfig,
+          useValue: { b2bUnitSelection: { enabled: false } },
+        },
+        provideMockActions(() => actions$),
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
+    });
+
+    effects = TestBed.inject(B2bUnitSelectionEffects);
+  });
+
+  it('checkOrgUnitsOnLogin$ should return EMPTY when the feature is disabled', () => {
+    const action = new AuthActions.Login();
+    actions$ = hot('-a', { a: action });
+    const expected = cold('-');
+
+    expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 92411c818df..0d682447475 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -18,15 +18,8 @@ import {
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { EMPTY, forkJoin, Observable, of } from 'rxjs';
-import {
-  catchError,
-  exhaustMap,
-  map,
-  switchMap,
-  tap,
-} from 'rxjs/operators';
+import { catchError, exhaustMap, map, switchMap, tap } from 'rxjs/operators';
 import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
-import { B2bRedirectCoordinator } from '../../../root/b2b-redirect-coordinator.service';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
 import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
@@ -35,7 +28,6 @@ import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions'
 export class B2bUnitSelectionEffects {
   protected logger = inject(LoggerService);
   private config = inject(B2bUnitSelectionConfig);
-  private coordinator = inject(B2bRedirectCoordinator);
   private applicationRef = inject(ApplicationRef);
   private stateService = inject(B2bUnitSelectorStateService);
   private routingService = inject(RoutingService);
@@ -43,6 +35,7 @@ export class B2bUnitSelectionEffects {
 
   /**
    * Listens for the LOGIN action and loads the user's org units and default unit.
+   * Opens the unit-selection dialog when the user belongs to more than one unit.
    *
    * Two login scenarios are handled:
    * 1. Manual login (ROPC — user submits the Spartacus login form):
@@ -59,9 +52,7 @@ export class B2bUnitSelectionEffects {
     this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
       exhaustMap(() => {
-        // Feature toggle: release the redirect immediately when the feature is disabled.
         if (!this.config.b2bUnitSelection?.enabled) {
-          this.coordinator.allowRedirect();
           return EMPTY;
         }
         return this.userIdService.takeUserId(true).pipe(
@@ -79,28 +70,22 @@ export class B2bUnitSelectionEffects {
                 this.stateService.setActiveUnit(defaultUnitUid ?? null);
                 if (orgUnits.length > 0) {
                   this.openDialogWhenReady(orgUnits, defaultUnitUid);
-                } else {
-                  this.coordinator.allowRedirect();
                 }
               }),
               map(
                 ({ orgUnits }) =>
                   new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(orgUnits)
               ),
-              catchError((error: HttpErrorResponse) => {
-                this.coordinator.allowRedirect();
-                return of(
+              catchError((error: HttpErrorResponse) =>
+                of(
                   new B2bUnitSelectionActions.LoadUserOrgUnitsFail(
                     tryNormalizeHttpError(error, this.logger)
                   )
-                );
-              })
+                )
+              )
             )
           ),
-          catchError(() => {
-            this.coordinator.allowRedirect();
-            return EMPTY;
-          })
+          catchError(() => EMPTY)
         );
       })
     )
@@ -109,8 +94,7 @@ export class B2bUnitSelectionEffects {
   /**
    * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
    * On success, refreshes the token so the new unit's permissions take effect immediately,
-   * then releases the redirect and closes the dialog.
-   * Token refresh failures are swallowed so they do not block the main flow.
+   * then closes the dialog and updates the header selector state.
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
@@ -128,11 +112,10 @@ export class B2bUnitSelectionEffects {
           tap(() => {
             // Refresh the token so the new unit's permission context takes effect (fire-and-forget).
             this.oAuthLibWrapperService.refreshToken();
-            this.coordinator.allowRedirect();
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitUid);
             // Only navigate home for header selector switches (redirectToHome=true);
-            // dialog confirmations rely on the coordinator's existing post-login redirect.
+            // dialog confirmations stay on the current page.
             if (redirectToHome) {
               this.routingService.go({ cxRoute: 'home' });
             }
@@ -174,18 +157,12 @@ export class B2bUnitSelectionEffects {
   ) {}
 
   /**
-   * Determines when to open the unit-selection dialog based on whether
-   * AppComponent has already been mounted.
+   * Opens the unit-selection dialog once AppComponent is mounted.
    *
    * InlineRootRenderStrategy requires ApplicationRef.components[0] to be present.
-   * Using components.length > 0 directly maps to that prerequisite:
-   * - Already mounted (manual login — user interaction on the page): open immediately.
-   * - Not yet mounted (token restore during APP_INITIALIZER): poll via requestAnimationFrame
-   *   until Angular bootstraps and mounts AppComponent.
-   *
-   * Note: coordinator.isBlocked() is not used here because the MetaReducer sets
-   * the blocked state for all LOGIN dispatches (including page refresh), which
-   * would produce false positives.
+   * - Already mounted (manual login): open immediately.
+   * - Not yet mounted (OAuth Code Flow / token restore during APP_INITIALIZER):
+   *   poll via requestAnimationFrame until Angular bootstraps AppComponent.
    */
   private openDialogWhenReady(
     orgUnits: B2BUnit[],
@@ -200,11 +177,8 @@ export class B2bUnitSelectionEffects {
     };
 
     if (this.applicationRef.components.length > 0) {
-      // Manual login / AppComponent already mounted: open immediately.
       open();
     } else {
-      // OAuth Code Flow / APP_INITIALIZER phase: poll until AppComponent mounts.
-      // Faster than isStable, which waits for all pending HTTP requests to settle.
       const poll = () => {
         if (this.applicationRef.components.length > 0) {
           open();
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
index 09081e0a08f..01ec3490df2 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
@@ -112,9 +112,12 @@ describe('OccB2bUnitSelectionAdapter', () => {
 
       httpMock.expectOne((req: HttpRequest<void>) => req.method === 'GET');
 
-      expect(occEndpointsService.buildUrl).toHaveBeenCalledWith('orgUserUnits', {
-        urlParams: { userId },
-      });
+      expect(occEndpointsService.buildUrl).toHaveBeenCalledWith(
+        'orgUserUnits',
+        {
+          urlParams: { userId },
+        }
+      );
     }));
 
     it('should return the units array from the response', (done) => {
@@ -172,15 +175,10 @@ describe('OccB2bUnitSelectionAdapter', () => {
       );
     }));
 
-    it('should complete without a value on success', (done) => {
-      let nextCalled = false;
-
+    it('should complete (and not error) on success', (done) => {
       adapter.setDefaultOrgUnit(userId, unitUid).subscribe({
-        next: () => (nextCalled = true),
-        complete: () => {
-          expect(nextCalled).toBeFalse();
-          done();
-        },
+        error: () => fail('should not error'),
+        complete: done,
       });
 
       httpMock
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
index 61cf61c8a85..8972dc506c0 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -29,9 +29,9 @@ export class OccB2bUnitSelectionAdapter implements B2bUnitSelectionAdapter {
 
   loadDefaultOrgUnitUid(userId: string): Observable<string | undefined> {
     return this.http
-      .get<{ orgUnit?: { name?: string } }>(
-        this.occEndpoints.buildUrl('orgUser', { urlParams: { userId } })
-      )
+      .get<{
+        orgUnit?: { name?: string };
+      }>(this.occEndpoints.buildUrl('orgUser', { urlParams: { userId } }))
       .pipe(
         map((response) => response?.orgUnit?.name),
         catchError((error: HttpErrorResponse) => {
diff --git a/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts b/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
index 91fc04f0305..f99a29e438c 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/model/occ-b2b-unit-selection-endpoints.model.ts
@@ -8,19 +8,19 @@ import { OccEndpoint } from '@spartacus/core';
 
 export interface B2bUnitSelectionOccEndpoints {
   /**
-   * 获取当前 B2B 用户个人信息（含 orgUnit 默认 unit）
+   * Fetches current B2B user profile (includes the default orgUnit).
    * GET /{baseSiteId}/orgUsers/{userId}
    */
   orgUser?: string | OccEndpoint;
 
   /**
-   * 获取当前 B2B 用户所被分配的所有 org units
+   * Fetches all org units assigned to the current B2B user.
    * GET /{baseSiteId}/orgUsers/{userId}/orgUnits
    */
   orgUserUnits?: string | OccEndpoint;
 
   /**
-   * 设置当前 B2B 用户的默认 org unit
+   * Sets the default org unit for the current B2B user.
    * PUT /{baseSiteId}/orgUsers/{userId}/defaultOrgUnit
    */
   orgUserDefaultUnit?: string | OccEndpoint;
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
deleted file mode 100644
index cd9075dbade..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.spec.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TestBed } from '@angular/core/testing';
-import {
-  AuthFlowRoutesService,
-  AuthRedirectService,
-  AuthRedirectStorageService,
-  FeatureToggles,
-  RoutingService,
-} from '@spartacus/core';
-import { Router } from '@angular/router';
-import { SiteContextUrlSerializer } from '@spartacus/core';
-import { BehaviorSubject, Observable, EMPTY } from 'rxjs';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-import { B2bAwareAuthRedirectService } from './b2b-aware-auth-redirect.service';
-
-describe('B2bAwareAuthRedirectService', () => {
-  let service: B2bAwareAuthRedirectService;
-  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
-
-  beforeEach(() => {
-    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
-      'isBlocked',
-      'whenAllowed$',
-    ]);
-
-    TestBed.configureTestingModule({
-      providers: [
-        B2bAwareAuthRedirectService,
-        { provide: B2bRedirectCoordinator, useValue: coordinator },
-        { provide: RoutingService, useValue: { go: jasmine.createSpy() } },
-        // Router.events must be an Observable so AuthRedirectService.init() doesn't crash.
-        { provide: Router, useValue: { events: EMPTY } },
-        {
-          provide: AuthRedirectStorageService,
-          useValue: { getRedirectUrl: () => undefined, setRedirectUrl: () => {} },
-        },
-        {
-          provide: AuthFlowRoutesService,
-          useValue: { isAuthFlow: () => false },
-        },
-        {
-          provide: SiteContextUrlSerializer,
-          useValue: {},
-        },
-        {
-          provide: FeatureToggles,
-          useValue: {},
-        },
-      ],
-    });
-
-    service = TestBed.inject(B2bAwareAuthRedirectService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-
-  describe('redirect()', () => {
-    it('should call super.redirect() immediately when not blocked', () => {
-      coordinator.isBlocked.and.returnValue(false);
-      const superSpy = spyOn(
-        AuthRedirectService.prototype,
-        'redirect'
-      ).and.callFake(() => {});
-
-      service.redirect();
-
-      expect(superSpy).toHaveBeenCalledTimes(1);
-    });
-
-    it('should NOT call super.redirect() immediately when blocked', () => {
-      const deferred$ = new BehaviorSubject<boolean>(false);
-      coordinator.isBlocked.and.returnValue(true);
-      coordinator.whenAllowed$.and.returnValue(
-        deferred$.asObservable() as Observable<boolean>
-      );
-      const superSpy = spyOn(
-        AuthRedirectService.prototype,
-        'redirect'
-      ).and.callFake(() => {});
-
-      service.redirect();
-
-      expect(superSpy).not.toHaveBeenCalled();
-    });
-
-    it('should call super.redirect() once whenAllowed$ emits', () => {
-      const deferred$ = new BehaviorSubject<boolean>(false);
-      coordinator.isBlocked.and.returnValue(true);
-      coordinator.whenAllowed$.and.returnValue(
-        deferred$.asObservable() as Observable<boolean>
-      );
-      const superSpy = spyOn(
-        AuthRedirectService.prototype,
-        'redirect'
-      ).and.callFake(() => {});
-
-      service.redirect();
-      expect(superSpy).not.toHaveBeenCalled();
-
-      deferred$.next(true);
-      expect(superSpy).toHaveBeenCalledTimes(1);
-    });
-  });
-});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
deleted file mode 100644
index e4104a81d39..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-aware-auth-redirect.service.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { inject, Injectable } from '@angular/core';
-import { AuthRedirectService } from '@spartacus/core';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-
-/**
- * Overrides AuthRedirectService.redirect() to defer the post-login navigation
- * while a B2B unit selection is in progress.
- *
- * The coordinator is set to blocked synchronously inside the LOGIN MetaReducer,
- * guaranteeing that this guard is already active when redirect() is first called.
- */
-@Injectable()
-export class B2bAwareAuthRedirectService extends AuthRedirectService {
-  private coordinator = inject(B2bRedirectCoordinator);
-
-  override redirect(): void {
-    if (!this.coordinator.isBlocked()) {
-      super.redirect();
-      return;
-    }
-    this.coordinator.whenAllowed$().subscribe(() => {
-      super.redirect();
-    });
-  }
-}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
deleted file mode 100644
index 1e8cf131a77..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.spec.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ActionReducer } from '@ngrx/store';
-import { AuthActions } from '@spartacus/core';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-import { createB2bLoginMetaReducer } from './b2b-login-meta-reducer';
-
-describe('createB2bLoginMetaReducer', () => {
-  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
-  let mockReducer: jasmine.Spy;
-
-  const state = {};
-  const loginAction = { type: AuthActions.LOGIN };
-  const otherAction = { type: '[Other] Some Action' };
-
-  beforeEach(() => {
-    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
-      'blockRedirect',
-    ]);
-    mockReducer = jasmine.createSpy('reducer').and.returnValue(state);
-  });
-
-  function buildMetaReducer(): ActionReducer<any> {
-    return createB2bLoginMetaReducer(coordinator)(mockReducer);
-  }
-
-  it('should always delegate to the inner reducer', () => {
-    const metaReducer = buildMetaReducer();
-    metaReducer(state, otherAction);
-    expect(mockReducer).toHaveBeenCalledWith(state, otherAction);
-  });
-
-  it('should return the result of the inner reducer', () => {
-    const expectedState = { key: 'value' };
-    mockReducer.and.returnValue(expectedState);
-    const metaReducer = buildMetaReducer();
-    const result = metaReducer(state, otherAction);
-    expect(result).toBe(expectedState);
-  });
-
-  it('should NOT call blockRedirect() for non-LOGIN actions', () => {
-    const metaReducer = buildMetaReducer();
-    metaReducer(state, otherAction);
-    expect(coordinator.blockRedirect).not.toHaveBeenCalled();
-  });
-
-  describe('LOGIN action', () => {
-    it('should NOT call blockRedirect() when URL is a plain page (no /login, no OAuth code)', () => {
-      // In Karma, window.location.href is something like "http://localhost:9876/context.html"
-      // — it contains neither "/login" nor "?code=...&state=...", so no block should occur.
-      const metaReducer = buildMetaReducer();
-      metaReducer(state, loginAction);
-
-      // The module-load snapshot (captured at import time) also does not contain
-      // code= / state= in a normal test run, so blockRedirect() should not be called.
-      expect(coordinator.blockRedirect).not.toHaveBeenCalled();
-    });
-
-    it('should still call the inner reducer on LOGIN', () => {
-      const metaReducer = buildMetaReducer();
-      metaReducer(state, loginAction);
-      expect(mockReducer).toHaveBeenCalledWith(state, loginAction);
-    });
-  });
-});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
deleted file mode 100644
index aa06af97d4c..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-login-meta-reducer.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ActionReducer } from '@ngrx/store';
-import { AuthActions } from '@spartacus/core';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-
-/**
- * Captured at module load time — before any APP_INITIALIZER runs.
- * angular-oauth2-oidc strips ?code=...&state=... query params during its
- * APP_INITIALIZER phase, so we must snapshot the href here to detect OAuth
- * Code Flow callbacks reliably.
- */
-const _hrefAtModuleLoad =
-  typeof window !== 'undefined' ? window.location.href : '';
-
-/**
- * MetaReducer factory that calls blockRedirect() only for genuine login events,
- * not for token restoration on page refresh.
- *
- * Detection logic (evaluated in order):
- *   1. Module-load href contains ?code=...&state=... → Authorization Code Flow callback
- *   2. Current href contains /login               → ROPC (user submitted the login form)
- *   3. Anything else                              → token restore or unrelated, no block
- */
-export function createB2bLoginMetaReducer(
-  coordinator: B2bRedirectCoordinator
-): (reducer: ActionReducer<any>) => ActionReducer<any> {
-  const hasFreshOAuthCode =
-    _hrefAtModuleLoad.includes('code=') && _hrefAtModuleLoad.includes('state=');
-
-  return (reducer) =>
-    (state, action) => {
-      if (action.type === AuthActions.LOGIN) {
-        const currentHref =
-          typeof window !== 'undefined' ? window.location.href : '';
-        const isFreshLogin =
-          hasFreshOAuthCode || currentHref.includes('/login');
-        if (isFreshLogin) {
-          coordinator.blockRedirect();
-        }
-      }
-      return reducer(state, action);
-    };
-}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
deleted file mode 100644
index f897a4e3aec..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TestBed } from '@angular/core/testing';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-
-describe('B2bRedirectCoordinator', () => {
-  let service: B2bRedirectCoordinator;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(B2bRedirectCoordinator);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-
-  describe('initial state', () => {
-    it('should start in the allowed (unblocked) state', () => {
-      expect(service.isBlocked()).toBeFalse();
-    });
-  });
-
-  describe('blockRedirect()', () => {
-    it('should transition to blocked state', () => {
-      service.blockRedirect();
-      expect(service.isBlocked()).toBeTrue();
-    });
-  });
-
-  describe('allowRedirect()', () => {
-    it('should transition back to allowed state after blocking', () => {
-      service.blockRedirect();
-      service.allowRedirect();
-      expect(service.isBlocked()).toBeFalse();
-    });
-  });
-
-  describe('whenAllowed$()', () => {
-    it('should emit immediately when already allowed', (done) => {
-      let emitted = false;
-      service.whenAllowed$().subscribe(() => {
-        emitted = true;
-        done();
-      });
-      expect(emitted).toBeTrue();
-    });
-
-    it('should not emit while blocked, then emit once after allowRedirect()', () => {
-      service.blockRedirect();
-      const values: boolean[] = [];
-      const sub = service.whenAllowed$().subscribe((v) => values.push(v));
-
-      expect(values.length).toBe(0);
-
-      service.allowRedirect();
-      expect(values).toEqual([true]);
-
-      // Verify take(1): a second allowRedirect() should not cause another emission.
-      service.allowRedirect();
-      expect(values.length).toBe(1);
-
-      sub.unsubscribe();
-    });
-
-    it('should complete after emitting once', () => {
-      let completed = false;
-      service.whenAllowed$().subscribe({ complete: () => (completed = true) });
-      expect(completed).toBeTrue();
-    });
-  });
-});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
deleted file mode 100644
index e9b6b1344aa..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-coordinator.service.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
-
-/**
- * Coordinates the timing between B2B unit selection and the post-login redirect.
- *
- * Flow:
- *   1. MetaReducer calls blockRedirect() synchronously on LOGIN dispatch.
- *   2. AuthRedirectService.redirect() detects the blocked state and suspends.
- *   3. The effect loads org units and opens the dialog.
- *   4. After the user confirms a unit, allowRedirect() is called and
- *      the suspended redirect executes.
- */
-@Injectable({ providedIn: 'root' })
-export class B2bRedirectCoordinator {
-  private allowed$ = new BehaviorSubject<boolean>(true);
-
-  blockRedirect(): void {
-    this.allowed$.next(false);
-  }
-
-  allowRedirect(): void {
-    this.allowed$.next(true);
-  }
-
-  isBlocked(): boolean {
-    return !this.allowed$.getValue();
-  }
-
-  /** Emits once when the gate opens, then completes. */
-  whenAllowed$(): Observable<boolean> {
-    return this.allowed$.pipe(
-      filter((v) => v),
-      take(1)
-    );
-  }
-}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts
deleted file mode 100644
index 25af181fdf5..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.spec.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TestBed } from '@angular/core/testing';
-import { ApplicationRef } from '@angular/core';
-import { Router } from '@angular/router';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-import { createB2bRedirectPatcher } from './b2b-redirect-patcher';
-
-describe('createB2bRedirectPatcher', () => {
-  let router: any;
-  let coordinator: jasmine.SpyObj<B2bRedirectCoordinator>;
-  let appRef: Partial<ApplicationRef>;
-  let originalScheduleNavigation: jasmine.Spy;
-  let whenAllowed$: BehaviorSubject<boolean>;
-
-  const rawUrl = {} as any;
-  const source = 'imperative' as any;
-  const restoredState = null as any;
-  const extras = {} as any;
-
-  beforeEach(() => {
-    originalScheduleNavigation = jasmine
-      .createSpy('scheduleNavigation')
-      .and.returnValue(Promise.resolve(true));
-
-    whenAllowed$ = new BehaviorSubject<boolean>(true);
-
-    coordinator = jasmine.createSpyObj('B2bRedirectCoordinator', [
-      'isBlocked',
-      'whenAllowed$',
-    ]);
-    coordinator.whenAllowed$.and.returnValue(
-      whenAllowed$.asObservable() as Observable<boolean>
-    );
-
-    router = { scheduleNavigation: originalScheduleNavigation };
-    appRef = { components: [] as any[] };
-
-    TestBed.configureTestingModule({});
-  });
-
-  function patch(): void {
-    createB2bRedirectPatcher(router as Router, coordinator, appRef as ApplicationRef)();
-  }
-
-  describe('when not blocked', () => {
-    beforeEach(() => {
-      coordinator.isBlocked.and.returnValue(false);
-    });
-
-    it('should call originalScheduleNavigation immediately', () => {
-      patch();
-      router.scheduleNavigation(rawUrl, source, restoredState, extras);
-      expect(originalScheduleNavigation).toHaveBeenCalledWith(
-        rawUrl,
-        source,
-        restoredState,
-        extras,
-        undefined
-      );
-    });
-  });
-
-  describe('when blocked but AppComponent not yet mounted (token restore)', () => {
-    beforeEach(() => {
-      coordinator.isBlocked.and.returnValue(true);
-      (appRef as any).components = [];
-    });
-
-    it('should call originalScheduleNavigation immediately (page-refresh path)', () => {
-      patch();
-      router.scheduleNavigation(rawUrl, source, restoredState, extras);
-      expect(originalScheduleNavigation).toHaveBeenCalledWith(
-        rawUrl,
-        source,
-        restoredState,
-        extras,
-        undefined
-      );
-    });
-  });
-
-  describe('when blocked and AppComponent is mounted (interactive login)', () => {
-    beforeEach(() => {
-      coordinator.isBlocked.and.returnValue(true);
-      (appRef as any).components = [{}]; // AppComponent mounted
-    });
-
-    it('should NOT call originalScheduleNavigation immediately', () => {
-      patch();
-      router.scheduleNavigation(rawUrl, source, restoredState, extras);
-      expect(originalScheduleNavigation).not.toHaveBeenCalled();
-    });
-
-    it('should return Promise.resolve(false)', async () => {
-      patch();
-      const result = await router.scheduleNavigation(
-        rawUrl,
-        source,
-        restoredState,
-        extras
-      );
-      expect(result).toBeFalse();
-    });
-
-    it('should call originalScheduleNavigation after whenAllowed$ emits', () => {
-      const deferred$ = new BehaviorSubject<boolean>(false);
-      coordinator.whenAllowed$.and.returnValue(
-        deferred$.asObservable() as Observable<boolean>
-      );
-
-      patch();
-      router.scheduleNavigation(rawUrl, source, restoredState, extras);
-      expect(originalScheduleNavigation).not.toHaveBeenCalled();
-
-      deferred$.next(true);
-      expect(originalScheduleNavigation).toHaveBeenCalledWith(
-        rawUrl,
-        source,
-        restoredState,
-        extras,
-        undefined
-      );
-    });
-  });
-});
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
deleted file mode 100644
index 9e01cf04090..00000000000
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-redirect-patcher.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ApplicationRef } from '@angular/core';
-import { Router } from '@angular/router';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-
-/**
- * APP_INITIALIZER factory that patches the Angular Router's internal
- * scheduleNavigation() method — the single entry point for every navigation,
- * including Guard UrlTree redirects.
- *
- * Call chain (all paths converge here):
- *   router.navigate()     → router.navigateByUrl() → scheduleNavigation()
- *   router.navigateByUrl()                         → scheduleNavigation()
- *   Guard returns UrlTree → RedirectRequest event  → scheduleNavigation()
- *   Browser history navigation                     → scheduleNavigation()
- *
- * Intercept conditions (both must be true):
- *   1. coordinator.isBlocked() — set synchronously by the MetaReducer on LOGIN.
- *   2. appRef.components.length > 0 — AppComponent is mounted, indicating an
- *      interactive login rather than a token restore on page refresh.
- *
- * Two LOGIN scenarios distinguished:
- *   - Page refresh (token restore): LOGIN dispatched in APP_INITIALIZER phase
- *     while components.length === 0; navigation is not intercepted and the page
- *     loads normally. The dialog opens later via requestAnimationFrame polling.
- *   - Manual login (user submits form): LOGIN dispatched after user interaction
- *     while components.length > 0; navigation is intercepted and the user stays
- *     on the login page until B2B unit selection completes.
- */
-export function createB2bRedirectPatcher(
-  router: Router,
-  coordinator: B2bRedirectCoordinator,
-  appRef: ApplicationRef
-): () => void {
-  return (): void => {
-    const originalScheduleNavigation: (...args: any[]) => Promise<boolean> = (
-      router as any
-    ).scheduleNavigation.bind(router);
-
-    (router as any).scheduleNavigation = (
-      rawUrl: any,
-      source: any,
-      restoredState: any,
-      extras: any,
-      priorPromise?: any
-    ): Promise<boolean> => {
-      // Only intercept during interactive login (AppComponent already mounted).
-      // Token restore on page refresh (components.length === 0) passes through.
-      if (!coordinator.isBlocked() || appRef.components.length === 0) {
-        return originalScheduleNavigation(
-          rawUrl,
-          source,
-          restoredState,
-          extras,
-          priorPromise
-        );
-      }
-      // B2B unit selection in progress: defer navigation until allowRedirect().
-      coordinator.whenAllowed$().subscribe(() => {
-        originalScheduleNavigation(
-          rawUrl,
-          source,
-          restoredState,
-          extras,
-          priorPromise
-        );
-      });
-      return Promise.resolve(false);
-    };
-  };
-}
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
index 5a3f6815d8f..8d982040d0d 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
@@ -4,52 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { APP_INITIALIZER, ApplicationRef, NgModule } from '@angular/core';
-import { Router } from '@angular/router';
-import { META_REDUCERS } from '@ngrx/store';
-import { AuthRedirectService, provideDefaultConfig } from '@spartacus/core';
-import { B2bAwareAuthRedirectService } from './b2b-aware-auth-redirect.service';
+import { NgModule } from '@angular/core';
+import { provideDefaultConfig } from '@spartacus/core';
 import { defaultB2bUnitSelectionConfig } from './config/default-b2b-unit-selection-config';
-import { createB2bLoginMetaReducer } from './b2b-login-meta-reducer';
-import { createB2bRedirectPatcher } from './b2b-redirect-patcher';
-import { B2bRedirectCoordinator } from './b2b-redirect-coordinator.service';
-// 确保 LAUNCH_CALLER 扩展在应用启动时生效
+// Side-effect import: ensures the LAUNCH_CALLER extension is registered at application startup.
 import './model/augmented-core.model';
 
 @NgModule({
-  providers: [
-    provideDefaultConfig(defaultB2bUnitSelectionConfig),
-    /**
-     * 覆盖 AuthRedirectService：在 B2B unit 选择进行中时延迟 redirect()。
-     * 这是拦截 post-login redirect 最精准的切入点，只影响 redirect() 调用，
-     * 不影响其他任何导航。
-     */
-    {
-      provide: AuthRedirectService,
-      useClass: B2bAwareAuthRedirectService,
-    },
-    /**
-     * MetaReducer：LOGIN action dispatch 时在 reducer pipeline 中同步调用
-     * blockRedirect()。MetaReducer 在 dispatch() 内部同步执行，早于
-     * AuthService.loginWithCredentials() 中紧随 dispatch() 的 redirect() 调用。
-     * 确保 redirect() 和 NotAuthGuard.canActivate() 到达时 blocked 标志已就绪。
-     */
-    {
-      provide: META_REDUCERS,
-      useFactory: createB2bLoginMetaReducer,
-      deps: [B2bRedirectCoordinator],
-      multi: true,
-    },
-    /**
-     * APP_INITIALIZER：patch scheduleNavigation 作为安全兜底，
-     * 拦截 NotAuthGuard UrlTree 等不经过 AuthRedirectService 的路由跳转。
-     */
-    {
-      provide: APP_INITIALIZER,
-      useFactory: createB2bRedirectPatcher,
-      deps: [Router, B2bRedirectCoordinator, ApplicationRef],
-      multi: true,
-    },
-  ],
+  providers: [provideDefaultConfig(defaultB2bUnitSelectionConfig)],
 })
 export class B2bUnitSelectionRootModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts b/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
index 4232f4eb53e..4b375f96005 100644
--- a/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/config/b2b-unit-selection.config.ts
@@ -14,8 +14,9 @@ import { Config } from '@spartacus/core';
 export abstract class B2bUnitSelectionConfig {
   b2bUnitSelection?: {
     /**
-     * 是否启用 B2B Unit 选择功能（登录后弹窗 + header Company 选择器）。
-     * 默认 false，客户通过 provideConfig() 显式开启。
+     * Whether to enable the B2B Unit selection feature
+     * (post-login dialog + header Company selector).
+     * Defaults to false; consumers opt in via provideConfig().
      */
     enabled?: boolean;
   };
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index 1db54b681b3..81d90639b59 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -29,7 +29,7 @@ cx-b2b-unit-selector {
     }
   }
 
-  // 与 site-context-selector 的 .cx-select-wrapper 结构保持一致
+  // Mirrors the .cx-select-wrapper structure used in site-context-selector.
   .cx-select-wrapper {
     display: flex;
     align-items: flex-start;
@@ -45,10 +45,11 @@ cx-b2b-unit-selector {
 
   ng-select {
     margin-top: -12px;
-    // 自适应宽度：收缩至选中值宽度，超出 max-width 时由 text-overflow:ellipsis 截断
+    // Adaptive width: shrinks to fit the selected value; text-overflow:ellipsis
+    // truncates when the value exceeds max-width.
     max-width: 130px;
 
-    // 覆盖 ng-select default.theme.css：
+    // Override ng-select default.theme.css rules:
     //   .ng-select .ng-select-container                  { background-color:#fff; min-height:36px }
     //   .ng-select.ng-select-single .ng-select-container { height:36px }
     //   .ng-select .ng-select-container .ng-value-container { padding-left:10px }
@@ -63,11 +64,11 @@ cx-b2b-unit-selector {
       padding: 0 4px 2px 0;
 
       .ng-value-container {
-        // ng-select default theme 优先级（3 class）高于我们的规则，
-        // 需要 !important 才能覆盖 padding-left: 10px
+        // ng-select default theme specificity (3 classes) is higher than our rules;
+        // !important is required to override padding-left: 10px.
         padding: 0 !important;
         padding-inline-end: #{$b2b-unit-selector-caret-size * 2} !important;
-        // 贴顶对齐，消除 ng-select-container align-items:center 导致的下移
+        // Align to the top to cancel the vertical offset caused by ng-select-container's align-items:center.
         align-self: flex-start;
 
         .ng-value {
@@ -79,7 +80,7 @@ cx-b2b-unit-selector {
           max-width: 100%;
         }
 
-        // 单选模式下 ng-select 对 .ng-input 设置 top:5px，需清零
+        // ng-select sets top:5px on .ng-input in single-select mode; reset to zero.
         .ng-input {
           top: 0 !important;
           padding: 0 !important;
@@ -102,17 +103,17 @@ cx-b2b-unit-selector {
       box-shadow: none !important;
     }
 
-    // 单 unit 禁用态：不可交互，光标还原，字色保持不变
+    // Disabled state for single-unit users: non-interactive, restore default cursor.
     &.ng-select-disabled .ng-select-container {
       cursor: default;
     }
   }
 
-  // appendTo="cx-b2b-unit-selector" 使 panel 挂在宿主元素下，
-  // 而非 ng-select 内部，故选择器须在 ng-select {} 块之外
+  // appendTo="cx-b2b-unit-selector" attaches the dropdown panel to the host element
+  // rather than inside ng-select, so this selector must live outside the ng-select {} block.
   .ng-dropdown-panel {
-    // ng-select 通过内联样式将 panel 宽度设为控件宽度，
-    // !important 覆盖内联样式，让 panel 按选项内容自行决定宽度
+    // ng-select sets panel width via inline style to match the control width;
+    // !important overrides the inline style, letting the panel size to its content.
     width: auto !important;
     min-width: max-content;
   }
diff --git a/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
index 701952a008f..58293d129f7 100644
--- a/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
@@ -14,17 +14,11 @@ import { B2bUnitSelectionModule } from '@spartacus/organization/b2b-unit-selecti
 import { B2bUnitSelectionRootModule } from '@spartacus/organization/b2b-unit-selection/root';
 
 /**
- * B2B Unit Selection 功能模块。
+ * Feature module for B2B Unit Selection.
  *
- * 注意：此模块必须 eager-load（不能使用 featureModules 懒加载），
- * 因为 B2bUnitSelectionEffects 需要在应用启动时注册，
- * 以便监听 AuthActions.LOGIN 事件。
  */
 @NgModule({
-  imports: [
-    B2bUnitSelectionRootModule,
-    B2bUnitSelectionModule,
-  ],
+  imports: [B2bUnitSelectionRootModule, B2bUnitSelectionModule],
   providers: [
     provideConfig(<I18nConfig>{
       i18n: {

From 4368e66a786e53ced1cdace2475fac1a5be79746 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:37:40 +0800
Subject: [PATCH 08/60] CXSPA-13801: Trigger Build


From 0953975ecc20f3e01b290b10b0f6bcc0cfd294ce Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 16:51:39 +0800
Subject: [PATCH 09/60] fix

fix
---
 tsconfig.json | 86 +++++++++++++++++++++------------------------------
 1 file changed, 36 insertions(+), 50 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 810164f7ba2..d01ad74514c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,12 +21,21 @@
       "@spartacus/schematics": [
         "core-libs/schematics/index"
       ],
+      "@spartacus/storefront": [
+        "core-libs/storefront/public_api"
+      ],
       "@spartacus/setup": [
         "core-libs/setup/public_api"
       ],
       "@spartacus/setup/ssr": [
         "core-libs/setup/ssr/public_api"
       ],
+      "@spartacus/core": [
+        "core-libs/core/public_api"
+      ],
+      "@spartacus/assets": [
+        "core-libs/assets/src/public_api"
+      ],
       "@spartacus/user": [
         "feature-libs/user/public_api"
       ],
@@ -243,29 +252,6 @@
       "@spartacus/product-configurator/common": [
         "feature-libs/product-configurator/common/public_api"
       ],
-      "@spartacus/opf/gift-card/components": [
-        "integration-libs/opf/gift-card/components/public_api"
-      ],
-      "@spartacus/opf/gift-card/core": [
-        "integration-libs/opf/gift-card/core/public_api"
-      ],
-      "@spartacus/opf/gift-card": [
-        "integration-libs/opf/gift-card/public_api"
-      ],
-      "@spartacus/opf/gift-card/occ": [
-        "integration-libs/opf/gift-card/occ/public_api"
-      ],
-      "@spartacus/opf/gift-card/root": [
-        "integration-libs/opf/gift-card/root/public_api"
-      ],
-      "@spartacus/opf/gift-card/assets": [
-        "integration-libs/opf/gift-card/assets/public_api"
-      ],
-      "@spartacus/opf": ["integration-libs/opf/public_api"],
-      "@spartacus/opf/order": ["integration-libs/opf/order/public_api"],
-      "@spartacus/opf/payment/assets": [
-        "integration-libs/opf/payment/assets/public_api"
-      ],
       "@spartacus/product-configurator/common/assets": [
         "feature-libs/product-configurator/common/assets/public_api"
       ],
@@ -455,24 +441,6 @@
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
       ],
-      "@spartacus/organization/b2b-unit-selection": [
-        "feature-libs/organization/b2b-unit-selection/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/root": [
-        "feature-libs/organization/b2b-unit-selection/root/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/core": [
-        "feature-libs/organization/b2b-unit-selection/core/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/occ": [
-        "feature-libs/organization/b2b-unit-selection/occ/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/components": [
-        "feature-libs/organization/b2b-unit-selection/components/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/assets": [
-        "feature-libs/organization/b2b-unit-selection/assets/public_api"
-      ],
       "@spartacus/order": [
         "feature-libs/order/public_api"
       ],
@@ -773,6 +741,9 @@
       "@spartacus/opps/root": [
         "integration-libs/opps/root/public_api"
       ],
+      "@spartacus/opf": [
+        "integration-libs/opf/public_api"
+      ],
       "@spartacus/opf/tokenisation": [
         "integration-libs/opf/tokenisation/public_api"
       ],
@@ -815,6 +786,12 @@
       "@spartacus/opf/payment/core": [
         "integration-libs/opf/payment/core/public_api"
       ],
+      "@spartacus/opf/payment/assets": [
+        "integration-libs/opf/payment/assets/public_api"
+      ],
+      "@spartacus/opf/order": [
+        "integration-libs/opf/order/public_api"
+      ],
       "@spartacus/opf/global-functions": [
         "integration-libs/opf/global-functions/public_api"
       ],
@@ -824,6 +801,24 @@
       "@spartacus/opf/global-functions/core": [
         "integration-libs/opf/global-functions/core/public_api"
       ],
+      "@spartacus/opf/gift-card": [
+        "integration-libs/opf/gift-card/public_api"
+      ],
+      "@spartacus/opf/gift-card/root": [
+        "integration-libs/opf/gift-card/root/public_api"
+      ],
+      "@spartacus/opf/gift-card/occ": [
+        "integration-libs/opf/gift-card/occ/public_api"
+      ],
+      "@spartacus/opf/gift-card/core": [
+        "integration-libs/opf/gift-card/core/public_api"
+      ],
+      "@spartacus/opf/gift-card/components": [
+        "integration-libs/opf/gift-card/components/public_api"
+      ],
+      "@spartacus/opf/gift-card/assets": [
+        "integration-libs/opf/gift-card/assets/public_api"
+      ],
       "@spartacus/opf/cta": [
         "integration-libs/opf/cta/public_api"
       ],
@@ -961,15 +956,6 @@
       ],
       "@spartacus/cdc/assets": [
         "integration-libs/cdc/assets/public_api"
-      ],
-      "@spartacus/storefront": [
-        "core-libs/storefront/public_api"
-      ],
-      "@spartacus/core": [
-        "core-libs/core/public_api"
-      ],
-      "@spartacus/assets": [
-        "core-libs/assets/src/public_api"
       ]
     },
     "useDefineForClassFields": false

From d2dd2c7d7a111332dfe7e84ab975d6f6ebcd057d Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 17:19:16 +0800
Subject: [PATCH 10/60] fix

fix
---
 .../b2b-unit-selection/assets/ng-package.json  |  6 ++++++
 .../components/ng-package.json                 |  6 ++++++
 .../b2b-unit-selection/core/ng-package.json    |  6 ++++++
 .../b2b-unit-selection/ng-package.json         |  6 ++++++
 .../b2b-unit-selection/occ/ng-package.json     |  6 ++++++
 .../root/model/augmented-core.model.ts         |  7 +++++--
 .../b2b-unit-selection/root/ng-package.json    |  6 ++++++
 .../styles/_b2b-unit-selector.scss             |  4 ----
 projects/storefrontapp/tsconfig.app.prod.json  | 18 ++++++++++++++++++
 tsconfig.json                                  | 18 ++++++++++++++++++
 10 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/assets/ng-package.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/ng-package.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/ng-package.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/ng-package.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/occ/ng-package.json
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/ng-package.json

diff --git a/feature-libs/organization/b2b-unit-selection/assets/ng-package.json b/feature-libs/organization/b2b-unit-selection/assets/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/components/ng-package.json b/feature-libs/organization/b2b-unit-selection/components/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/core/ng-package.json b/feature-libs/organization/b2b-unit-selection/core/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/ng-package.json b/feature-libs/organization/b2b-unit-selection/ng-package.json
new file mode 100644
index 00000000000..38e01ac17de
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/occ/ng-package.json b/feature-libs/organization/b2b-unit-selection/occ/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/root/model/augmented-core.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
index 00b39679b56..bfb13f20664 100644
--- a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { LAUNCH_CALLER } from '@spartacus/storefront';
+import * as storefront from '@spartacus/storefront';
 
 declare module '@spartacus/storefront' {
   enum LAUNCH_CALLER {
@@ -12,4 +12,7 @@ declare module '@spartacus/storefront' {
   }
 }
 
-(LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';
+// Runtime registration: extends the LAUNCH_CALLER enum at runtime.
+// Using namespace import avoids re-declaring LAUNCH_CALLER in the same scope,
+// which would trigger a variable-shadowing lint/Sonar violation.
+(storefront.LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';
diff --git a/feature-libs/organization/b2b-unit-selection/root/ng-package.json b/feature-libs/organization/b2b-unit-selection/root/ng-package.json
new file mode 100644
index 00000000000..2a9c6221b0e
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/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/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index 81d90639b59..c754a9491bc 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -49,10 +49,6 @@ cx-b2b-unit-selector {
     // truncates when the value exceeds max-width.
     max-width: 130px;
 
-    // Override ng-select default.theme.css rules:
-    //   .ng-select .ng-select-container                  { background-color:#fff; min-height:36px }
-    //   .ng-select.ng-select-single .ng-select-container { height:36px }
-    //   .ng-select .ng-select-container .ng-value-container { padding-left:10px }
     .ng-select-container {
       height: auto !important;
       min-height: unset !important;
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index 8e7e3e7acda..86e6fab68c5 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -271,6 +271,24 @@
       "@spartacus/organization/account-summary/assets": [
         "dist/organization/account-summary/assets"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "dist/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "dist/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "dist/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "dist/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "dist/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "dist/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/order": ["dist/order"],
       "@spartacus/order/root": ["dist/order/root"],
       "@spartacus/order/occ": ["dist/order/occ"],
diff --git a/tsconfig.json b/tsconfig.json
index d01ad74514c..38445bea7ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -441,6 +441,24 @@
       "@spartacus/organization/account-summary/assets": [
         "feature-libs/organization/account-summary/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/order": [
         "feature-libs/order/public_api"
       ],

From 0b7ba0772767f3ecfa33357607426419d74707c1 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 18:06:57 +0800
Subject: [PATCH 11/60] fix

fix
---
 core-libs/setup/tsconfig.spec.json            | 26 +++++--
 feature-libs/asm/tsconfig.schematics.json     | 26 +++++--
 feature-libs/cart/tsconfig.schematics.json    | 26 +++++--
 .../checkout/tsconfig.schematics.json         | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 feature-libs/order/tsconfig.schematics.json   | 26 +++++--
 .../b2b-unit-selection-dialog.component.html  |  4 +-
 .../b2b-unit-selection-dialog.component.ts    |  5 +-
 .../abstract-b2b-unit-selector.component.ts   |  2 +-
 .../b2b-unit-selector.component.html          | 53 +++++++-------
 .../b2b-unit-selector.component.ts            |  2 -
 ...efault-b2b-unit-selection-layout.config.ts |  4 +-
 .../actions/b2b-unit-selection.actions.ts     | 10 +--
 .../effects/b2b-unit-selection.effects.ts     | 20 +++---
 feature-libs/organization/tsconfig.lib.json   |  2 +-
 .../organization/tsconfig.schematics.json     | 26 +++++--
 .../pdf-invoices/tsconfig.schematics.json     | 26 +++++--
 .../pickup-in-store/tsconfig.schematics.json  | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 feature-libs/product/tsconfig.schematics.json | 26 +++++--
 .../qualtrics/tsconfig.schematics.json        | 26 +++++--
 feature-libs/quote/tsconfig.schematics.json   | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 .../smartedit/tsconfig.schematics.json        | 26 +++++--
 .../storefinder/tsconfig.schematics.json      | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 .../tracking/tsconfig.schematics.json         | 26 +++++--
 feature-libs/user/tsconfig.schematics.json    | 26 +++++--
 integration-libs/cdc/tsconfig.lib.json        | 18 +++++
 integration-libs/cdc/tsconfig.schematics.json | 26 +++++--
 integration-libs/cdp/tsconfig.schematics.json | 26 +++++--
 integration-libs/cds/tsconfig.schematics.json | 26 +++++--
 .../cpq-quote/tsconfig.schematics.json        | 26 +++++--
 .../digital-payments/tsconfig.schematics.json | 26 +++++--
 .../tsconfig.schematics.json                  | 26 +++++--
 integration-libs/omf/tsconfig.schematics.json | 26 +++++--
 integration-libs/opf/tsconfig.schematics.json | 26 +++++--
 .../opps/tsconfig.schematics.json             | 26 +++++--
 .../punchout/tsconfig.schematics.json         | 26 +++++--
 .../s4-service/tsconfig.schematics.json       | 26 +++++--
 .../s4om/tsconfig.schematics.json             | 26 +++++--
 .../segment-refs/tsconfig.schematics.json     | 26 +++++--
 projects/storefrontapp/tsconfig.app.prod.json | 44 ++++++------
 tsconfig.compodoc.json                        | 72 ++++++++++++-------
 46 files changed, 887 insertions(+), 233 deletions(-)

diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
index 7bc4c2b2d5b..bca543fa988 100644
--- a/core-libs/setup/tsconfig.spec.json
+++ b/core-libs/setup/tsconfig.spec.json
@@ -8,8 +8,11 @@
     "types": ["jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -347,6 +350,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -828,10 +849,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "moduleResolution": "bundler"
   },
diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/asm/tsconfig.schematics.json
+++ b/feature-libs/asm/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/cart/tsconfig.schematics.json
+++ b/feature-libs/cart/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/checkout/tsconfig.schematics.json
+++ b/feature-libs/checkout/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/feature-libs/customer-ticketing/tsconfig.schematics.json
+++ b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/estimated-delivery-date/tsconfig.schematics.json b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/feature-libs/estimated-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/order/tsconfig.schematics.json
+++ b/feature-libs/order/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
index 1b063d5abb4..0e7d8b6a19b 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
@@ -38,8 +38,8 @@ <h2 id="b2b-unit-selection-title" class="modal-title">
           [cxNgSelectA11y]="{
             ariaLabel: 'b2bUnitSelection.dialog.unitLabel' | cxTranslate,
           }"
-        ></ng-select>
-        <cx-form-errors [control]="form.get('selectedUnit')"></cx-form-errors>
+        />
+        <cx-form-errors [control]="form.get('selectedUnit')" />
       </div>
     </div>
 
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 085a5ae3180..fb9bdc2c4a2 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -84,7 +84,10 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       this.form.markAllAsTouched();
       return;
     }
-    const unit = this.form.value.selectedUnit!;
+    const unit = this.form.value.selectedUnit;
+    if (!unit) {
+      return;
+    }
     this.userIdService
       .takeUserId(true)
       .pipe(take(1))
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 9e5c0207562..b4e21675d4d 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -28,7 +28,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected store = inject(Store);
   protected userIdService = inject(UserIdService);
   protected connector = inject(B2bUnitSelectionConnector);
-  private config = inject(B2bUnitSelectionConfig);
+  protected config = inject(B2bUnitSelectionConfig);
 
   /** All assignable B2B units for the current user. */
   readonly items = toSignal(this.stateService.orgUnits$, {
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index 704f718d477..8240eab0289 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -4,28 +4,31 @@
   SPDX-License-Identifier: Apache-2.0
 -->
 
-<label *ngIf="hasAnyUnit()">
-  <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}:</span>
-  <div class="cx-select-wrapper">
-    <ng-select
-      [items]="items()"
-      bindLabel="name"
-      bindValue="name"
-      [ngModel]="activeUnitName()"
-      [clearable]="false"
-      [searchable]="false"
-      [disabled]="!hasMultipleUnits()"
-      appendTo="cx-b2b-unit-selector"
-      (ngModelChange)="onSelect($event)"
-      [cxNgSelectA11y]="{
-        ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate,
-      }"
-    ></ng-select>
-    <cx-icon
-      *ngIf="hasMultipleUnits()"
-      aria-hidden="true"
-      [type]="iconTypes.CARET_DOWN"
-      class="small"
-    ></cx-icon>
-  </div>
-</label>
+@if (hasAnyUnit()) {
+  <label>
+    <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}:</span>
+    <div class="cx-select-wrapper">
+      <ng-select
+        [items]="items()"
+        bindLabel="name"
+        bindValue="name"
+        [ngModel]="activeUnitName()"
+        [clearable]="false"
+        [searchable]="false"
+        [disabled]="!hasMultipleUnits()"
+        appendTo="cx-b2b-unit-selector"
+        (ngModelChange)="onSelect($event)"
+        [cxNgSelectA11y]="{
+          ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate,
+        }"
+      />
+      @if (hasMultipleUnits()) {
+        <cx-icon
+          aria-hidden="true"
+          [type]="iconTypes.CARET_DOWN"
+          class="small"
+        />
+      }
+    </div>
+  </label>
+}
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
index 14fd9b1723c..8078c800ef3 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { NgIf } from '@angular/common';
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgSelectComponent } from '@ng-select/ng-select';
@@ -26,7 +25,6 @@ import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.c
   templateUrl: './b2b-unit-selector.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
-    NgIf,
     FormsModule,
     NgSelectComponent,
     NgSelectA11yDirective,
diff --git a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
index a44a5bb141d..470a63a6d01 100644
--- a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
@@ -12,7 +12,9 @@ import {
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 // Side-effect import: ensures LAUNCH_CALLER.B2B_UNIT_SELECTION is assigned
 // before this config constant is evaluated.
-import '../root/model/augmented-core.model';
+// Imported via the root entry point to avoid cross-entry-point relative imports
+// (which break ng-packagr's secondary entry point compilation).
+import '@spartacus/organization/b2b-unit-selection/root';
 
 export const defaultB2bUnitSelectionLayoutConfig: LayoutConfig = {
   launch: {
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
index 27fbb494c25..006f04618d5 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -5,7 +5,7 @@
  */
 
 import { Action } from '@ngrx/store';
-import { B2BUnit } from '@spartacus/core';
+import { B2BUnit, ErrorAction } from '@spartacus/core';
 
 // ── Load Org Units ────────────────────────────────────────────────────────────
 
@@ -25,9 +25,9 @@ export class LoadUserOrgUnitsSuccess implements Action {
   constructor(public payload: B2BUnit[]) {}
 }
 
-export class LoadUserOrgUnitsFail implements Action {
+export class LoadUserOrgUnitsFail implements Action, ErrorAction {
   readonly type = LOAD_USER_ORG_UNITS_FAIL;
-  constructor(public payload: any) {}
+  constructor(public error: any) {}
 }
 
 // ── Set Default Org Unit ──────────────────────────────────────────────────────
@@ -54,9 +54,9 @@ export class SetDefaultOrgUnitSuccess implements Action {
   readonly type = SET_DEFAULT_ORG_UNIT_SUCCESS;
 }
 
-export class SetDefaultOrgUnitFail implements Action {
+export class SetDefaultOrgUnitFail implements Action, ErrorAction {
   readonly type = SET_DEFAULT_ORG_UNIT_FAIL;
-  constructor(public payload: any) {}
+  constructor(public error: any) {}
 }
 
 export type B2bUnitSelectionAction =
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 0d682447475..d7ed98b3d95 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -27,11 +27,11 @@ import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions'
 @Injectable()
 export class B2bUnitSelectionEffects {
   protected logger = inject(LoggerService);
-  private config = inject(B2bUnitSelectionConfig);
-  private applicationRef = inject(ApplicationRef);
-  private stateService = inject(B2bUnitSelectorStateService);
-  private routingService = inject(RoutingService);
-  private oAuthLibWrapperService = inject(OAuthLibWrapperService);
+  protected config = inject(B2bUnitSelectionConfig);
+  protected applicationRef = inject(ApplicationRef);
+  protected stateService = inject(B2bUnitSelectorStateService);
+  protected routingService = inject(RoutingService);
+  protected oAuthLibWrapperService = inject(OAuthLibWrapperService);
 
   /**
    * Listens for the LOGIN action and loads the user's org units and default unit.
@@ -150,10 +150,10 @@ export class B2bUnitSelectionEffects {
   );
 
   constructor(
-    private actions$: Actions,
-    private connector: B2bUnitSelectionConnector,
-    private userIdService: UserIdService,
-    private launchDialogService: LaunchDialogService
+    protected actions$: Actions,
+    protected connector: B2bUnitSelectionConnector,
+    protected userIdService: UserIdService,
+    protected launchDialogService: LaunchDialogService
   ) {}
 
   /**
@@ -164,7 +164,7 @@ export class B2bUnitSelectionEffects {
    * - Not yet mounted (OAuth Code Flow / token restore during APP_INITIALIZER):
    *   poll via requestAnimationFrame until Angular bootstraps AppComponent.
    */
-  private openDialogWhenReady(
+  protected openDialogWhenReady(
     orgUnits: B2BUnit[],
     defaultUnitUid: string | undefined
   ): void {
diff --git a/feature-libs/organization/tsconfig.lib.json b/feature-libs/organization/tsconfig.lib.json
index ae44010c97c..23349594710 100644
--- a/feature-libs/organization/tsconfig.lib.json
+++ b/feature-libs/organization/tsconfig.lib.json
@@ -78,7 +78,7 @@
       "@spartacus/order/core": ["dist/order/core"],
       "@spartacus/order/components": ["dist/order/components"],
       "@spartacus/order/assets": ["dist/order/assets"],
-      "@spartacus/storefront": ["dist/storefront"],
+      "@spartacus/storefront": ["dist/storefrontlib"],
       "@spartacus/user": ["dist/user"],
       "@spartacus/user/wishlist": ["dist/user/wishlist"],
       "@spartacus/user/wishlist/root": ["dist/user/wishlist/root"],
diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/organization/tsconfig.schematics.json
+++ b/feature-libs/organization/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/pdf-invoices/tsconfig.schematics.json b/feature-libs/pdf-invoices/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/feature-libs/pdf-invoices/tsconfig.schematics.json
+++ b/feature-libs/pdf-invoices/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
index b2e11ab77ca..5e51d7e471b 100644
--- a/feature-libs/pickup-in-store/tsconfig.schematics.json
+++ b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -20,8 +20,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -359,6 +362,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -840,10 +861,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/product-configurator/tsconfig.schematics.json
+++ b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/product-multi-dimensional/tsconfig.schematics.json b/feature-libs/product-multi-dimensional/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/product-multi-dimensional/tsconfig.schematics.json
+++ b/feature-libs/product-multi-dimensional/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/product/tsconfig.schematics.json
+++ b/feature-libs/product/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/qualtrics/tsconfig.schematics.json
+++ b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/quote/tsconfig.schematics.json b/feature-libs/quote/tsconfig.schematics.json
index b2e11ab77ca..5e51d7e471b 100644
--- a/feature-libs/quote/tsconfig.schematics.json
+++ b/feature-libs/quote/tsconfig.schematics.json
@@ -20,8 +20,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -359,6 +362,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -840,10 +861,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/feature-libs/requested-delivery-date/tsconfig.schematics.json
+++ b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/smartedit/tsconfig.schematics.json
+++ b/feature-libs/smartedit/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/storefinder/tsconfig.schematics.json
+++ b/feature-libs/storefinder/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/subscription-billing/tsconfig.schematics.json b/feature-libs/subscription-billing/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/feature-libs/subscription-billing/tsconfig.schematics.json
+++ b/feature-libs/subscription-billing/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/feature-libs/tracking/tsconfig.schematics.json
+++ b/feature-libs/tracking/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
index d36e2cff321..bc83778a38b 100644
--- a/feature-libs/user/tsconfig.schematics.json
+++ b/feature-libs/user/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/cdc/tsconfig.lib.json b/integration-libs/cdc/tsconfig.lib.json
index cb9e0e05d86..68b11c56743 100644
--- a/integration-libs/cdc/tsconfig.lib.json
+++ b/integration-libs/cdc/tsconfig.lib.json
@@ -74,6 +74,24 @@
       "@spartacus/organization/order-approval/assets": [
         "dist/organization/order-approval/assets"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "dist/organization/b2b-unit-selection"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "dist/organization/b2b-unit-selection/root"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "dist/organization/b2b-unit-selection/occ"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "dist/organization/b2b-unit-selection/core"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "dist/organization/b2b-unit-selection/components"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "dist/organization/b2b-unit-selection/assets"
+      ],
       "@spartacus/organization/administration": [
         "dist/organization/administration"
       ],
diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/cdc/tsconfig.schematics.json
+++ b/integration-libs/cdc/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/cdp/tsconfig.schematics.json b/integration-libs/cdp/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/cdp/tsconfig.schematics.json
+++ b/integration-libs/cdp/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
index a94515f8073..c2b651397b3 100644
--- a/integration-libs/cds/tsconfig.schematics.json
+++ b/integration-libs/cds/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/cpq-quote/tsconfig.schematics.json b/integration-libs/cpq-quote/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/integration-libs/cpq-quote/tsconfig.schematics.json
+++ b/integration-libs/cpq-quote/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/digital-payments/tsconfig.schematics.json
+++ b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/epd-visualization/tsconfig.schematics.json
+++ b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/omf/tsconfig.schematics.json b/integration-libs/omf/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/omf/tsconfig.schematics.json
+++ b/integration-libs/omf/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/opf/tsconfig.schematics.json b/integration-libs/opf/tsconfig.schematics.json
index 04d8579137a..bfb2c7f669f 100644
--- a/integration-libs/opf/tsconfig.schematics.json
+++ b/integration-libs/opf/tsconfig.schematics.json
@@ -21,8 +21,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -360,6 +363,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -841,10 +862,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/integration-libs/opps/tsconfig.schematics.json b/integration-libs/opps/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/opps/tsconfig.schematics.json
+++ b/integration-libs/opps/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/punchout/tsconfig.schematics.json b/integration-libs/punchout/tsconfig.schematics.json
index 8e6951eb2b6..202e1aa8f4f 100644
--- a/integration-libs/punchout/tsconfig.schematics.json
+++ b/integration-libs/punchout/tsconfig.schematics.json
@@ -18,8 +18,11 @@
     "esModuleInterop": true,
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -357,6 +360,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -838,10 +859,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     }
   },
   "include": ["schematics/**/*.ts"],
diff --git a/integration-libs/s4-service/tsconfig.schematics.json b/integration-libs/s4-service/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/s4-service/tsconfig.schematics.json
+++ b/integration-libs/s4-service/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/s4om/tsconfig.schematics.json
+++ b/integration-libs/s4om/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
index fd36e57a6a7..aeb8b48db81 100644
--- a/integration-libs/segment-refs/tsconfig.schematics.json
+++ b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -5,8 +5,11 @@
     "types": ["node", "jest"],
     "paths": {
       "@spartacus/schematics": ["../../core-libs/schematics/index"],
+      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
       "@spartacus/setup": ["../../core-libs/setup/public_api"],
       "@spartacus/setup/ssr": ["../../core-libs/setup/ssr/public_api"],
+      "@spartacus/core": ["../../core-libs/core/public_api"],
+      "@spartacus/assets": ["../../core-libs/assets/src/public_api"],
       "@spartacus/user": ["../../feature-libs/user/public_api"],
       "@spartacus/user/wishlist": [
         "../../feature-libs/user/wishlist/public_api"
@@ -344,6 +347,24 @@
       "@spartacus/organization/order-approval/assets": [
         "../../feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "../../feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "../../feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "../../feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "../../feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "../../feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "../../feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "../../feature-libs/organization/administration/public_api"
       ],
@@ -825,10 +846,7 @@
       "@spartacus/cdc/components": [
         "../../integration-libs/cdc/components/public_api"
       ],
-      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"],
-      "@spartacus/storefront": ["../../core-libs/storefront/public_api"],
-      "@spartacus/core": ["../../core-libs/core/public_api"],
-      "@spartacus/assets": ["../../core-libs/assets/src/public_api"]
+      "@spartacus/cdc/assets": ["../../integration-libs/cdc/assets/public_api"]
     },
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
index 86e6fab68c5..17ad33c767d 100644
--- a/projects/storefrontapp/tsconfig.app.prod.json
+++ b/projects/storefrontapp/tsconfig.app.prod.json
@@ -2,8 +2,11 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "paths": {
+      "@spartacus/storefront": ["dist/storefront"],
       "@spartacus/setup": ["dist/setup"],
       "@spartacus/setup/ssr": ["dist/setup/ssr"],
+      "@spartacus/core": ["dist/core"],
+      "@spartacus/assets": ["dist/assets"],
       "@spartacus/user": ["dist/user"],
       "@spartacus/user/wishlist": ["dist/user/wishlist"],
       "@spartacus/user/wishlist/root": ["dist/user/wishlist/root"],
@@ -235,6 +238,24 @@
       "@spartacus/organization/order-approval/assets": [
         "dist/organization/order-approval/assets"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "dist/organization/b2b-unit-selection"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "dist/organization/b2b-unit-selection/root"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "dist/organization/b2b-unit-selection/occ"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "dist/organization/b2b-unit-selection/core"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "dist/organization/b2b-unit-selection/components"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "dist/organization/b2b-unit-selection/assets"
+      ],
       "@spartacus/organization/administration": [
         "dist/organization/administration"
       ],
@@ -271,24 +292,6 @@
       "@spartacus/organization/account-summary/assets": [
         "dist/organization/account-summary/assets"
       ],
-      "@spartacus/organization/b2b-unit-selection": [
-        "dist/organization/b2b-unit-selection/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/root": [
-        "dist/organization/b2b-unit-selection/root/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/occ": [
-        "dist/organization/b2b-unit-selection/occ/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/core": [
-        "dist/organization/b2b-unit-selection/core/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/components": [
-        "dist/organization/b2b-unit-selection/components/public_api"
-      ],
-      "@spartacus/organization/b2b-unit-selection/assets": [
-        "dist/organization/b2b-unit-selection/assets/public_api"
-      ],
       "@spartacus/order": ["dist/order"],
       "@spartacus/order/root": ["dist/order/root"],
       "@spartacus/order/occ": ["dist/order/occ"],
@@ -518,10 +521,7 @@
       ],
       "@spartacus/cdc/core": ["dist/cdc/core"],
       "@spartacus/cdc/components": ["dist/cdc/components"],
-      "@spartacus/cdc/assets": ["dist/cdc/assets"],
-      "@spartacus/storefront": ["dist/storefront"],
-      "@spartacus/core": ["dist/core"],
-      "@spartacus/assets": ["dist/assets"]
+      "@spartacus/cdc/assets": ["dist/cdc/assets"]
     }
   }
 }
diff --git a/tsconfig.compodoc.json b/tsconfig.compodoc.json
index d249e2882b2..e7241cbb6c8 100644
--- a/tsconfig.compodoc.json
+++ b/tsconfig.compodoc.json
@@ -23,12 +23,21 @@
       "@spartacus/schematics": [
         "core-libs/schematics/index"
       ],
+      "@spartacus/storefront": [
+        "core-libs/storefront/public_api"
+      ],
       "@spartacus/setup": [
         "core-libs/setup/public_api"
       ],
       "@spartacus/setup/ssr": [
         "core-libs/setup/ssr/public_api"
       ],
+      "@spartacus/core": [
+        "core-libs/core/public_api"
+      ],
+      "@spartacus/assets": [
+        "core-libs/assets/src/public_api"
+      ],
       "@spartacus/user": [
         "feature-libs/user/public_api"
       ],
@@ -398,6 +407,24 @@
       "@spartacus/organization/order-approval/assets": [
         "feature-libs/organization/order-approval/assets/public_api"
       ],
+      "@spartacus/organization/b2b-unit-selection": [
+        "feature-libs/organization/b2b-unit-selection/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/root": [
+        "feature-libs/organization/b2b-unit-selection/root/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/occ": [
+        "feature-libs/organization/b2b-unit-selection/occ/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/core": [
+        "feature-libs/organization/b2b-unit-selection/core/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/components": [
+        "feature-libs/organization/b2b-unit-selection/components/public_api"
+      ],
+      "@spartacus/organization/b2b-unit-selection/assets": [
+        "feature-libs/organization/b2b-unit-selection/assets/public_api"
+      ],
       "@spartacus/organization/administration": [
         "feature-libs/organization/administration/public_api"
       ],
@@ -746,24 +773,6 @@
       "@spartacus/opf/tokenisation/core": [
         "integration-libs/opf/tokenisation/core/public_api"
       ],
-      "@spartacus/opf/gift-card": [
-        "integration-libs/opf/gift-card/public_api"
-      ],
-      "@spartacus/opf/gift-card/components": [
-        "integration-libs/opf/gift-card/components/public_api"
-      ],
-      "@spartacus/opf/gift-card/core": [
-        "integration-libs/opf/gift-card/core/public_api"
-      ],
-      "@spartacus/opf/gift-card/occ": [
-        "integration-libs/opf/gift-card/occ/public_api"
-      ],
-      "@spartacus/opf/gift-card/root": [
-        "integration-libs/opf/gift-card/root/public_api"
-      ],
-      "@spartacus/opf/gift-card/assets": [
-        "integration-libs/opf/gift-card/assets/public_api"
-      ],
       "@spartacus/opf/tokenisation/components": [
         "integration-libs/opf/tokenisation/components/public_api"
       ],
@@ -812,6 +821,24 @@
       "@spartacus/opf/global-functions/core": [
         "integration-libs/opf/global-functions/core/public_api"
       ],
+      "@spartacus/opf/gift-card": [
+        "integration-libs/opf/gift-card/public_api"
+      ],
+      "@spartacus/opf/gift-card/root": [
+        "integration-libs/opf/gift-card/root/public_api"
+      ],
+      "@spartacus/opf/gift-card/occ": [
+        "integration-libs/opf/gift-card/occ/public_api"
+      ],
+      "@spartacus/opf/gift-card/core": [
+        "integration-libs/opf/gift-card/core/public_api"
+      ],
+      "@spartacus/opf/gift-card/components": [
+        "integration-libs/opf/gift-card/components/public_api"
+      ],
+      "@spartacus/opf/gift-card/assets": [
+        "integration-libs/opf/gift-card/assets/public_api"
+      ],
       "@spartacus/opf/cta": [
         "integration-libs/opf/cta/public_api"
       ],
@@ -949,15 +976,6 @@
       ],
       "@spartacus/cdc/assets": [
         "integration-libs/cdc/assets/public_api"
-      ],
-      "@spartacus/storefront": [
-        "core-libs/storefront/public_api"
-      ],
-      "@spartacus/core": [
-        "core-libs/core/public_api"
-      ],
-      "@spartacus/assets": [
-        "core-libs/assets/src/public_api"
       ]
     }
   },

From 14ed4a88f42b48156fedfc37284cc690d71525d6 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 18:21:11 +0800
Subject: [PATCH 12/60] fix

fix
---
 feature-libs/organization/tsconfig.lib.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature-libs/organization/tsconfig.lib.json b/feature-libs/organization/tsconfig.lib.json
index 23349594710..ae44010c97c 100644
--- a/feature-libs/organization/tsconfig.lib.json
+++ b/feature-libs/organization/tsconfig.lib.json
@@ -78,7 +78,7 @@
       "@spartacus/order/core": ["dist/order/core"],
       "@spartacus/order/components": ["dist/order/components"],
       "@spartacus/order/assets": ["dist/order/assets"],
-      "@spartacus/storefront": ["dist/storefrontlib"],
+      "@spartacus/storefront": ["dist/storefront"],
       "@spartacus/user": ["dist/user"],
       "@spartacus/user/wishlist": ["dist/user/wishlist"],
       "@spartacus/user/wishlist/root": ["dist/user/wishlist/root"],

From 514e5296fc47af0ccfb77d982a15f306ecca6f98 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 18:30:28 +0800
Subject: [PATCH 13/60] CXSPA-13801: Trigger Build


From ef744c0f9cd25c24d0d12a1d7a1c5b383ee6f1f5 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 23 Jul 2026 19:16:23 +0800
Subject: [PATCH 14/60] fix

fix
---
 .../b2b-unit-selection-dialog.component.ts          |  2 +-
 .../abstract-b2b-unit-selector.component.ts         |  8 ++++----
 .../default-b2b-unit-selection-layout.config.ts     | 13 ++-----------
 .../store/effects/b2b-unit-selection.effects.ts     |  4 ++--
 .../occ/adapters/occ-b2b-unit-selection.adapter.ts  |  2 +-
 .../occ/b2b-unit-selection-occ.module.ts            |  2 +-
 .../root/model/augmented-core.model.ts              | 12 ++----------
 .../b2b-unit-selection/root/public_api.ts           |  1 -
 8 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index fb9bdc2c4a2..21db7945edc 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -28,7 +28,7 @@ import {
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/core';
 
 @Component({
   selector: 'cx-b2b-unit-selection-dialog',
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index b4e21675d4d..59700ab8124 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -10,10 +10,10 @@ import { Store } from '@ngrx/store';
 import { B2BUnit, UserIdService } from '@spartacus/core';
 import { forkJoin, of } from 'rxjs';
 import { catchError, switchMap, take } from 'rxjs/operators';
-import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
-import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
-import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
-import { B2bUnitSelectionConfig } from '../../root/config/b2b-unit-selection.config';
+import { B2bUnitSelectionConnector } from '@spartacus/organization/b2b-unit-selection/core';
+import { B2bUnitSelectorStateService } from '@spartacus/organization/b2b-unit-selection/core';
+import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/core';
+import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 
 /**
  * Abstract base class encapsulating state and interaction logic for the Company selector.
diff --git a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
index 470a63a6d01..5318ba0e5e3 100644
--- a/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/default-b2b-unit-selection-layout.config.ts
@@ -4,21 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  DIALOG_TYPE,
-  LAUNCH_CALLER,
-  LayoutConfig,
-} from '@spartacus/storefront';
+import { DIALOG_TYPE, LayoutConfig } from '@spartacus/storefront';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
-// Side-effect import: ensures LAUNCH_CALLER.B2B_UNIT_SELECTION is assigned
-// before this config constant is evaluated.
-// Imported via the root entry point to avoid cross-entry-point relative imports
-// (which break ng-packagr's secondary entry point compilation).
-import '@spartacus/organization/b2b-unit-selection/root';
 
 export const defaultB2bUnitSelectionLayoutConfig: LayoutConfig = {
   launch: {
-    [LAUNCH_CALLER.B2B_UNIT_SELECTION]: {
+    B2B_UNIT_SELECTION: {
       inlineRoot: true,
       component: B2bUnitSelectionDialogComponent,
       dialogType: DIALOG_TYPE.DIALOG,
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index d7ed98b3d95..7fe60928ea0 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -19,7 +19,7 @@ import {
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { EMPTY, forkJoin, Observable, of } from 'rxjs';
 import { catchError, exhaustMap, map, switchMap, tap } from 'rxjs/operators';
-import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
+import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
 import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
@@ -170,7 +170,7 @@ export class B2bUnitSelectionEffects {
   ): void {
     const open = () => {
       this.launchDialogService.openDialogAndSubscribe(
-        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
         undefined,
         { orgUnits, defaultUnitUid }
       );
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
index 8972dc506c0..eea20f79a8b 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -12,7 +12,7 @@ import {
   OccEndpointsService,
   tryNormalizeHttpError,
 } from '@spartacus/core';
-import { B2bUnitSelectionAdapter } from '../../core/connectors/b2b-unit-selection.adapter';
+import { B2bUnitSelectionAdapter } from '@spartacus/organization/b2b-unit-selection/core';
 import { Observable } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 // Side-effect import: registers the OccEndpoints module augmentation.
diff --git a/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
index 03d993b2de9..06f1172736b 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
@@ -6,7 +6,7 @@
 
 import { NgModule } from '@angular/core';
 import { provideDefaultConfig } from '@spartacus/core';
-import { B2bUnitSelectionAdapter } from '../core/connectors/b2b-unit-selection.adapter';
+import { B2bUnitSelectionAdapter } from '@spartacus/organization/b2b-unit-selection/core';
 import { OccB2bUnitSelectionAdapter } from './adapters/occ-b2b-unit-selection.adapter';
 import { defaultOccB2bUnitSelectionConfig } from './config/default-occ-b2b-unit-selection-config';
 
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
index bfb13f20664..a921bc63321 100644
--- a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
@@ -4,15 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as storefront from '@spartacus/storefront';
-
-declare module '@spartacus/storefront' {
-  enum LAUNCH_CALLER {
-    B2B_UNIT_SELECTION = 'B2B_UNIT_SELECTION',
-  }
-}
+import { LAUNCH_CALLER } from '@spartacus/storefront';
 
 // Runtime registration: extends the LAUNCH_CALLER enum at runtime.
-// Using namespace import avoids re-declaring LAUNCH_CALLER in the same scope,
-// which would trigger a variable-shadowing lint/Sonar violation.
-(storefront.LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';
+(LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';
diff --git a/feature-libs/organization/b2b-unit-selection/root/public_api.ts b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
index 5c98906df94..3b4ea46511c 100644
--- a/feature-libs/organization/b2b-unit-selection/root/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
@@ -8,4 +8,3 @@ export * from './b2b-unit-selection-root.module';
 export * from './config/b2b-unit-selection.config';
 export * from './config/default-b2b-unit-selection-config';
 export * from './feature-name';
-export * from './model/index';

From 92de3939e9976761336fec6903842d5059f59ba2 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Fri, 24 Jul 2026 09:51:00 +0800
Subject: [PATCH 15/60] fix

fix
---
 .../abstract-b2b-unit-selector.component.ts               | 8 +++++---
 .../core/store/effects/b2b-unit-selection.effects.spec.ts | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 59700ab8124..b68d0a94e7b 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -10,9 +10,11 @@ import { Store } from '@ngrx/store';
 import { B2BUnit, UserIdService } from '@spartacus/core';
 import { forkJoin, of } from 'rxjs';
 import { catchError, switchMap, take } from 'rxjs/operators';
-import { B2bUnitSelectionConnector } from '@spartacus/organization/b2b-unit-selection/core';
-import { B2bUnitSelectorStateService } from '@spartacus/organization/b2b-unit-selection/core';
-import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/core';
+import {
+  B2bUnitSelectionConnector,
+  B2bUnitSelectorStateService,
+  SetDefaultOrgUnit,
+} from '@spartacus/organization/b2b-unit-selection/core';
 import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 
 /**
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index a79bc928bd4..4ef77e1f85f 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -24,7 +24,7 @@ import {
   tryNormalizeHttpError,
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-// Side-effect import: registers LAUNCH_CALLER.B2B_UNIT_SELECTION enum extension.
+// Side-effect import: ensures the LAUNCH_CALLER runtime assignment runs before tests.
 import '../../../root/model/augmented-core.model';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { Observable, of, throwError } from 'rxjs';
@@ -175,7 +175,7 @@ describe('B2bUnitSelectionEffects', () => {
       getTestScheduler().flush();
 
       expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
-        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
         undefined,
         { orgUnits: mockUnits, defaultUnitUid: mockDefaultUid }
       );

From f9e2dacc9705642afeaffd281dd535ac57e967bd Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Fri, 24 Jul 2026 10:14:35 +0800
Subject: [PATCH 16/60] fix

fix
---
 .../translations/en/b2b-unit-selection.json   |  2 +-
 .../b2b-unit-selector.component.html          | 21 +++++++++----------
 .../b2b-unit-selector.component.ts            |  2 ++
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
index e939868adb1..a5f687dc4d2 100644
--- a/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
+++ b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
@@ -7,7 +7,7 @@
       "confirm": "Confirm"
     },
     "selector": {
-      "label": "Company"
+      "label": "Company:"
     }
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index 8240eab0289..523bb22ff8c 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -4,9 +4,9 @@
   SPDX-License-Identifier: Apache-2.0
 -->
 
-@if (hasAnyUnit()) {
+<ng-container *ngIf="hasAnyUnit()">
   <label>
-    <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}:</span>
+    <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}</span>
     <div class="cx-select-wrapper">
       <ng-select
         [items]="items()"
@@ -16,19 +16,18 @@
         [clearable]="false"
         [searchable]="false"
         [disabled]="!hasMultipleUnits()"
-        appendTo="cx-b2b-unit-selector"
+        [appendTo]="'cx-b2b-unit-selector'"
         (ngModelChange)="onSelect($event)"
         [cxNgSelectA11y]="{
           ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate,
         }"
       />
-      @if (hasMultipleUnits()) {
-        <cx-icon
-          aria-hidden="true"
-          [type]="iconTypes.CARET_DOWN"
-          class="small"
-        />
-      }
+      <cx-icon
+        *ngIf="hasMultipleUnits()"
+        aria-hidden="true"
+        [type]="iconTypes.CARET_DOWN"
+        class="small"
+      />
     </div>
   </label>
-}
+</ng-container>
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
index 8078c800ef3..584ef9daf15 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.ts
@@ -6,6 +6,7 @@
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
+import { NgIf } from '@angular/common';
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { TranslatePipe } from '@spartacus/core';
 import {
@@ -25,6 +26,7 @@ import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.c
   templateUrl: './b2b-unit-selector.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
+    NgIf,
     FormsModule,
     NgSelectComponent,
     NgSelectA11yDirective,

From 76ea79d7412eb099f9ada8d5fbfd1c2c7f261768 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Sat, 25 Jul 2026 22:46:15 +0800
Subject: [PATCH 17/60] fix UX issue

fix UX issue
---
 .../b2b-unit-selection-dialog.component.html  |  7 ++-
 .../styles/_b2b-unit-selection-dialog.scss    | 60 +++++++++++++++++++
 .../styles/_b2b-unit-selector.scss            | 32 ++++++----
 .../b2b-unit-selection/styles/_index.scss     |  1 +
 4 files changed, 85 insertions(+), 15 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
index 0e7d8b6a19b..db967786ce1 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.html
@@ -5,7 +5,7 @@
 -->
 
 <div
-  class="cx-b2b-unit-selection-dialog cx-modal-container"
+  class="cx-b2b-unit-selection-dialog"
   role="dialog"
   [attr.aria-labelledby]="'b2b-unit-selection-title'"
   [cxFocus]="focusConfig"
@@ -13,9 +13,9 @@
   <div class="cx-modal-content">
     <!-- Header -->
     <div class="cx-dialog-header modal-header">
-      <h2 id="b2b-unit-selection-title" class="modal-title">
+      <h3 id="b2b-unit-selection-title" class="modal-title">
         {{ 'b2bUnitSelection.dialog.title' | cxTranslate }}
-      </h2>
+      </h3>
     </div>
 
     <!-- Body -->
@@ -27,6 +27,7 @@ <h2 id="b2b-unit-selection-title" class="modal-title">
       <div class="form-group">
         <label for="b2b-unit-select" class="cx-required-field">
           {{ 'b2bUnitSelection.dialog.unitLabel' | cxTranslate }}
+          <span aria-hidden="true" class="cx-required-asterisk">*</span>
         </label>
         <ng-select
           inputId="b2b-unit-select"
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
new file mode 100644
index 00000000000..6a717222113
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
@@ -0,0 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Dialog width: narrower than the default modal width (768px) to suit a simple selection form.
+$b2b-unit-selection-dialog-width: 400px;
+
+.cx-b2b-unit-selection-dialog {
+  // Replaces .cx-modal-container layout so the base 768px !important rules don't apply.
+  display: flex;
+  align-items: center;
+  margin: auto;
+  height: 100%;
+  overflow-y: auto;
+  max-width: $b2b-unit-selection-dialog-width;
+  min-width: $b2b-unit-selection-dialog-width;
+
+  @include media-breakpoint-down(sm) {
+    max-width: 100%;
+    min-width: 100%;
+    height: 100%;
+  }
+}
+
+.cx-required-asterisk {
+  color: var(--cx-color-danger);
+  margin-inline-start: 2px;
+}
+
+// SiteContext: cx-page-slot defaults to flex-wrap: wrap (_common-template.scss), which causes
+// Company (cx-b2b-unit-selector) to wrap to a second line when Language + Theme +
+// Company together exceed the 50% slot width.
+//
+// flex-wrap: nowrap  – keeps all three items on a single row.
+// min-width: 0       – overrides the flex item's default min-width: auto.  Without this,
+//                      the browser widens SiteContext to fit its non-wrappable content,
+//                      pushing SiteLinks (Quick Order …) to a second row.
+// align-items: center – Language / Theme use a native <select> whose browser-rendered height
+//                      is larger than Company's borderless ng-select.  center aligns all three
+//                      items to the same vertical midline regardless of their individual heights.
+//
+// SiteLinks: cx-link <a> tags have margin: 8px which positions their text at the same midline
+// as Language / Theme via the default flex stretch — no align-items override needed here.
+//
+// Selector specificity:
+//   Core rule (SiteContext nowrap):  header .header .SiteContext              → (0, 2, 1)
+//   Our override:                   header cx-page-layout.header .SiteContext → (0, 2, 2) ← wins
+header {
+  @include media-breakpoint-up(lg) {
+    cx-page-layout.header {
+      .SiteContext {
+        flex-wrap: nowrap;
+        min-width: 0;
+        align-items: center;
+      }
+    }
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index c754a9491bc..3945ab31540 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -4,10 +4,14 @@ cx-b2b-unit-selector {
   display: inline-block;
   position: relative;
   margin-top: 14px;
-  margin-inline-end: 17px;
+  margin-inline-end: 24px;
   margin-bottom: 14px;
-  margin-inline-start: 0;
-
+  // The SiteContext slot contains a hidden cx-site-context-selector (currency) between
+  // Language and Theme when only one currency is configured.  That hidden host element
+  // still contributes its margin-inline-end: 17px, making the Language→Theme gap 34px.
+  // Setting margin-inline-start: 17px here gives Theme→Company the same 34px gap so
+  // all three selectors appear evenly spaced.
+  margin-inline-start: 17px;
   @include media-breakpoint-down(md) {
     &:first-child {
       margin-inline-start: 0;
@@ -20,6 +24,7 @@ cx-b2b-unit-selector {
 
   label {
     display: flex;
+    align-items: center;
     margin: 0;
 
     span {
@@ -32,11 +37,11 @@ cx-b2b-unit-selector {
   // Mirrors the .cx-select-wrapper structure used in site-context-selector.
   .cx-select-wrapper {
     display: flex;
-    align-items: flex-start;
+    align-items: center;
 
     cx-icon {
-      margin-inline-start: -#{$b2b-unit-selector-caret-size * 2};
-      margin-top: -12px;
+      // Match cx-site-context-selector / cx-site-theme-switcher which use -10px.
+      margin-inline-start: -10px;
       z-index: 1;
       pointer-events: none;
       color: var(--cx-color-text);
@@ -44,28 +49,31 @@ cx-b2b-unit-selector {
   }
 
   ng-select {
-    margin-top: -12px;
     // Adaptive width: shrinks to fit the selected value; text-overflow:ellipsis
     // truncates when the value exceeds max-width.
     max-width: 130px;
 
     .ng-select-container {
-      height: auto !important;
-      min-height: unset !important;
       background-color: transparent !important;
       border: none !important;
       border-radius: 0;
       box-shadow: none !important;
       cursor: pointer;
-      padding: 0 4px 2px 0;
+      // Force the ng-select-container to exactly the same height as the native <select>
+      // in cx-site-context-selector (padding: 2px 4px → height = line-height + 4px).
+      // height: auto leaves the door open for ng-select library styles (height: 36px,
+      // min-height: 36px) to affect layout; an explicit calc() value closes that gap
+      // so SiteContext height = Language/Theme height and align-items: center on
+      // SiteContext does not shift Language / Theme downward ("too low" effect).
+      height: calc(var(--cx-font-size, 0.875rem) * var(--cx-line-height, 1.2222) + 4px) !important;
+      min-height: unset !important;
+      padding: 2px 0 2px 0;
 
       .ng-value-container {
         // ng-select default theme specificity (3 classes) is higher than our rules;
         // !important is required to override padding-left: 10px.
         padding: 0 !important;
         padding-inline-end: #{$b2b-unit-selector-caret-size * 2} !important;
-        // Align to the top to cancel the vertical offset caused by ng-select-container's align-items:center.
-        align-self: flex-start;
 
         .ng-value {
           color: var(--cx-color-text);
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_index.scss b/feature-libs/organization/b2b-unit-selection/styles/_index.scss
index c294fe143bf..07273f8fc47 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_index.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_index.scss
@@ -1 +1,2 @@
 @import './b2b-unit-selector';
+@import './b2b-unit-selection-dialog';

From 4ceb404c3a4d28535b87f74708160fe00789d724 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 27 Jul 2026 09:21:34 +0800
Subject: [PATCH 18/60] fix

fix
---
 .../b2b-unit-selector.component.html          |  2 +-
 .../styles/_b2b-unit-selection-dialog.scss    | 28 +++++++++++++
 .../styles/_b2b-unit-selector.scss            | 42 +++++++++++++------
 3 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index 523bb22ff8c..e506a2d52ca 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -16,7 +16,7 @@
         [clearable]="false"
         [searchable]="false"
         [disabled]="!hasMultipleUnits()"
-        [appendTo]="'cx-b2b-unit-selector'"
+        [appendTo]="'body'"
         (ngModelChange)="onSelect($event)"
         [cxNgSelectA11y]="{
           ariaLabel: 'b2bUnitSelection.selector.label' | cxTranslate,
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
index 6a717222113..7f6f7852d6d 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
@@ -54,7 +54,35 @@ header {
         flex-wrap: nowrap;
         min-width: 0;
         align-items: center;
+        // Clip Company (cx-b2b-unit-selector) when it overflows the 50% slot boundary
+        // so it never bleeds visually into the SiteLinks region.
+        // Safe now that appendTo="body" renders the dropdown outside this element —
+        // ng-select positions the panel via getBoundingClientRect(), bypassing overflow.
+        overflow: hidden;
+
+        // ROOT CAUSE FIX: Core sets ".SiteContext > * { flex: none }" which expands to
+        // flex: 0 0 auto (flex-shrink: 0).  flex-shrink: 0 prevents cx-b2b-unit-selector
+        // from shrinking at all — our min-width: 0 on the host was therefore ignored.
+        // Override to flex: 0 1 auto (shrink allowed, no grow) so Company yields space
+        // to Language/Theme and does not overflow into the SiteLinks 50% region.
+        > cx-b2b-unit-selector {
+          flex: 0 1 auto;
+        }
       }
     }
   }
 }
+
+// ng-select uses appendTo="body", so the dropdown panel is rendered as a direct child
+// of <body> rather than inside cx-b2b-unit-selector.  This global rule styles the panel
+// for the B2B unit selector specifically (ng-select sets a data attribute or we can rely
+// on the panel appearing after the host in DOM order — using a broad rule is fine here
+// because all ng-select dropdowns benefit from auto-sizing).
+//
+// ng-select sets panel width via inline style to match the control width;
+// !important overrides the inline style, letting the panel size to its content.
+cx-b2b-unit-selector + .ng-dropdown-panel,
+body > .ng-dropdown-panel {
+  width: auto !important;
+  min-width: max-content;
+}
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index 3945ab31540..d09ed6d1b86 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -3,6 +3,12 @@ $b2b-unit-selector-caret-size: 7px;
 cx-b2b-unit-selector {
   display: inline-block;
   position: relative;
+  // min-width: 0 allows this flex item to shrink when SiteContext runs out of space
+  // (default min-width: auto would prevent shrinking entirely).
+  // DO NOT add overflow: hidden here — the cx-icon caret sits at the component's right
+  // edge and would be clipped first, making the arrow half-visible or invisible.
+  // Overflow clipping is handled at the SiteContext level instead.
+  min-width: 0;
   margin-top: 14px;
   margin-inline-end: 24px;
   margin-bottom: 14px;
@@ -38,10 +44,25 @@ cx-b2b-unit-selector {
   .cx-select-wrapper {
     display: flex;
     align-items: center;
+    // position: relative makes this the containing block for the absolutely-positioned icon.
+    // min-width: 0 allows the wrapper to shrink below its natural content width when the
+    // host flex item (cx-b2b-unit-selector) is squeezed in SiteContext.
+    // overflow: hidden clips ng-select value text at the wrapper boundary; the icon is
+    // safe because it is absolutely positioned and stays within the wrapper bounds.
+    position: relative;
+    min-width: 0;
+    overflow: hidden;
 
     cx-icon {
-      // Match cx-site-context-selector / cx-site-theme-switcher which use -10px.
-      margin-inline-start: -10px;
+      // Absolute positioning removes the icon from the flex flow so it never contributes
+      // to (or is displaced by) flex-shrink calculations.  It is pinned to the inline-end
+      // of the wrapper — always visible regardless of how much ng-select is shrunk.
+      // The ng-value-container's padding-inline-end (= caret-size * 2) still reserves
+      // space inside ng-select so the value text does not slide under the icon.
+      position: absolute;
+      inset-inline-end: 0;
+      top: 50%;
+      transform: translateY(-50%);
       z-index: 1;
       pointer-events: none;
       color: var(--cx-color-text);
@@ -49,9 +70,13 @@ cx-b2b-unit-selector {
   }
 
   ng-select {
-    // Adaptive width: shrinks to fit the selected value; text-overflow:ellipsis
-    // truncates when the value exceeds max-width.
+    // flex: 1 1 auto fills the full wrapper width (icon is out of flow); max-width caps
+    // the comfortable display size.  min-width: 0 allows ng-select to shrink below its
+    // content size — the internal overflow: hidden on .ng-select-container then clips
+    // the value text, producing the ellipsis truncation.
+    flex: 1 1 auto;
     max-width: 130px;
+    min-width: 0;
 
     .ng-select-container {
       background-color: transparent !important;
@@ -112,13 +137,4 @@ cx-b2b-unit-selector {
       cursor: default;
     }
   }
-
-  // appendTo="cx-b2b-unit-selector" attaches the dropdown panel to the host element
-  // rather than inside ng-select, so this selector must live outside the ng-select {} block.
-  .ng-dropdown-panel {
-    // ng-select sets panel width via inline style to match the control width;
-    // !important overrides the inline style, letting the panel size to its content.
-    width: auto !important;
-    min-width: max-content;
-  }
 }

From 5f779bcfe05bc963c2472848ee57b895c5f4c85c Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 27 Jul 2026 13:57:06 +0800
Subject: [PATCH 19/60] fix

fix
---
 .../assets/translations/en/b2b-unit-selection.json        | 2 +-
 .../b2b-unit-selector/b2b-unit-selector.component.html    | 2 +-
 .../core/store/effects/b2b-unit-selection.effects.ts      | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
index a5f687dc4d2..29fb8d9b5ff 100644
--- a/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
+++ b/feature-libs/organization/b2b-unit-selection/assets/translations/en/b2b-unit-selection.json
@@ -7,7 +7,7 @@
       "confirm": "Confirm"
     },
     "selector": {
-      "label": "Company:"
+      "label": "B2B Unit:"
     }
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
index e506a2d52ca..a2415dcf10b 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/b2b-unit-selector.component.html
@@ -7,7 +7,7 @@
 <ng-container *ngIf="hasAnyUnit()">
   <label>
     <span>{{ 'b2bUnitSelection.selector.label' | cxTranslate }}</span>
-    <div class="cx-select-wrapper">
+    <div class="cx-select-wrapper" [title]="activeUnitName() ?? ''">
       <ng-select
         [items]="items()"
         bindLabel="name"
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 7fe60928ea0..1d8d6f0b52e 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -11,7 +11,6 @@ import {
   AuthActions,
   B2BUnit,
   LoggerService,
-  OAuthLibWrapperService,
   RoutingService,
   tryNormalizeHttpError,
   UserIdService,
@@ -31,7 +30,6 @@ export class B2bUnitSelectionEffects {
   protected applicationRef = inject(ApplicationRef);
   protected stateService = inject(B2bUnitSelectorStateService);
   protected routingService = inject(RoutingService);
-  protected oAuthLibWrapperService = inject(OAuthLibWrapperService);
 
   /**
    * Listens for the LOGIN action and loads the user's org units and default unit.
@@ -93,8 +91,8 @@ export class B2bUnitSelectionEffects {
 
   /**
    * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
-   * On success, refreshes the token so the new unit's permissions take effect immediately,
-   * then closes the dialog and updates the header selector state.
+   * On success, closes the dialog, updates the header selector state, and navigates
+   * home when triggered from the header selector (redirectToHome = true).
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
@@ -110,8 +108,6 @@ export class B2bUnitSelectionEffects {
       switchMap(({ userId, unitUid, redirectToHome }) =>
         this.connector.setDefaultOrgUnit(userId, unitUid).pipe(
           tap(() => {
-            // Refresh the token so the new unit's permission context takes effect (fire-and-forget).
-            this.oAuthLibWrapperService.refreshToken();
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitUid);
             // Only navigate home for header selector switches (redirectToHome=true);

From 490c471598dd5079b5a20a9648c6d21be59fcfcd Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 27 Jul 2026 13:58:12 +0800
Subject: [PATCH 20/60] fix

fix
---
 .../styles/_b2b-unit-selection-dialog.scss                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
index 7f6f7852d6d..e5704872103 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selection-dialog.scss
@@ -1,8 +1,6 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
+// SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+//
+// SPDX-License-Identifier: Apache-2.0
 
 // Dialog width: narrower than the default modal width (768px) to suit a simple selection form.
 $b2b-unit-selection-dialog-width: 400px;

From 2f80ae48cab2696377c164d9b7d52d5d6715880d Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 27 Jul 2026 15:58:04 +0800
Subject: [PATCH 21/60] fix

fix
---
 .../effects/b2b-unit-selection.effects.spec.ts | 18 +-----------------
 .../styles/_b2b-unit-selector.scss             |  4 +++-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 4ef77e1f85f..24c067fb093 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -18,7 +18,6 @@ import {
   AuthActions,
   B2BUnit,
   LoggerService,
-  OAuthLibWrapperService,
   RoutingService,
   UserIdService,
   tryNormalizeHttpError,
@@ -79,17 +78,12 @@ class MockRoutingService {
   go = createSpy('go');
 }
 
-class MockOAuthLibWrapperService {
-  refreshToken = createSpy('refreshToken');
-}
-
 describe('B2bUnitSelectionEffects', () => {
   let effects: B2bUnitSelectionEffects;
   let connector: MockB2bUnitSelectionConnector;
   let stateService: MockB2bUnitSelectorStateService;
   let launchDialogService: MockLaunchDialogService;
   let routingService: MockRoutingService;
-  let oAuthLibWrapperService: MockOAuthLibWrapperService;
   let actions$: Observable<Action>;
   let applicationRef: any;
 
@@ -117,10 +111,6 @@ describe('B2bUnitSelectionEffects', () => {
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: UserIdService, useClass: MockUserIdService },
         { provide: RoutingService, useClass: MockRoutingService },
-        {
-          provide: OAuthLibWrapperService,
-          useClass: MockOAuthLibWrapperService,
-        },
         { provide: ApplicationRef, useValue: applicationRef },
         { provide: LoggerService, useClass: MockLoggerService },
         {
@@ -138,7 +128,6 @@ describe('B2bUnitSelectionEffects', () => {
     stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
     launchDialogService = TestBed.inject(LaunchDialogService) as any;
     routingService = TestBed.inject(RoutingService) as any;
-    oAuthLibWrapperService = TestBed.inject(OAuthLibWrapperService) as any;
   });
 
   // ── checkOrgUnitsOnLogin$ ─────────────────────────────────────────────────
@@ -241,14 +230,13 @@ describe('B2bUnitSelectionEffects', () => {
       expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
     });
 
-    it('should refresh token, close dialog, and update state', () => {
+    it('should close dialog and update state', () => {
       const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
       getTestScheduler().flush();
 
-      expect(oAuthLibWrapperService.refreshToken).toHaveBeenCalled();
       expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitUid);
     });
@@ -339,10 +327,6 @@ describe('B2bUnitSelectionEffects (feature disabled)', () => {
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: UserIdService, useClass: MockUserIdService },
         { provide: RoutingService, useClass: MockRoutingService },
-        {
-          provide: OAuthLibWrapperService,
-          useClass: MockOAuthLibWrapperService,
-        },
         { provide: ApplicationRef, useValue: appRef },
         { provide: LoggerService, useClass: MockLoggerService },
         {
diff --git a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
index d09ed6d1b86..fe33ebf799e 100644
--- a/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
+++ b/feature-libs/organization/b2b-unit-selection/styles/_b2b-unit-selector.scss
@@ -90,7 +90,9 @@ cx-b2b-unit-selector {
       // min-height: 36px) to affect layout; an explicit calc() value closes that gap
       // so SiteContext height = Language/Theme height and align-items: center on
       // SiteContext does not shift Language / Theme downward ("too low" effect).
-      height: calc(var(--cx-font-size, 0.875rem) * var(--cx-line-height, 1.2222) + 4px) !important;
+      height: calc(
+        var(--cx-font-size, 0.875rem) * var(--cx-line-height, 1.2222) + 4px
+      ) !important;
       min-height: unset !important;
       padding: 2px 0 2px 0;
 

From 77b6af20c3292e8d5f8919df543e2c0c975fd9d9 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:41:52 +0800
Subject: [PATCH 22/60] fix

fix
---
 .../b2b-unit-selector-state.service.ts        |  2 +-
 .../cypress/helpers/b2b/b2b-checkout.ts       |  2 ++
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 28 +++++++++++++++++++
 .../b2b/my-company/my-company.utils.ts        |  2 ++
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts

diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
index 0c0023b881b..1c049a2599c 100644
--- a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 
 /**
  * Lightweight state service that shares B2B unit data between the unit-selection
- * dialog and the persistent Company selector in the header.
+ * dialog and the persistent B2B Unit selector in the header.
  *
  * Data is written by B2bUnitSelectionEffects after login; components subscribe
  * directly without issuing additional API calls.
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 ff29b3b18e3..8b19f1a726b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -41,6 +41,7 @@ import {
   waitForProductPage,
 } from '../checkout-flow';
 import { waitForPage } from '../navigation';
+import { confirmB2bUnitSelectionDialogIfPresent } from './b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -67,6 +68,7 @@ export function loginB2bUser() {
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
+      confirmB2bUnitSelectionDialogIfPresent();
       visitHomePage();
       cy.get('.cx-login-greet').should('contain', user.fullName);
     });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
new file mode 100644
index 00000000000..893c78b7615
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
+
+/**
+ * Confirms the B2B Unit selection dialog if it is present.
+ *
+ * The dialog is shown after login when the feature `b2bUnitSelection.enabled` is true
+ * and the user belongs to at least one org unit.  E2E tests that do not specifically
+ * test this dialog should call this helper right after the B2B login step so that the
+ * dialog does not block subsequent test interactions.
+ *
+ * If the dialog is not present (feature disabled / user has no units) this helper is a
+ * no-op — no assertion is made on the dialog's absence.
+ */
+export function confirmB2bUnitSelectionDialogIfPresent(): void {
+  cy.get('body').then(($body) => {
+    if ($body.find(B2B_UNIT_SELECTION_DIALOG).length > 0) {
+      cy.get(B2B_UNIT_SELECTION_DIALOG)
+        .find('button.btn-primary')
+        .click();
+    }
+  });
+}
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
index edf709c87d4..5664e3cf3f0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
@@ -7,6 +7,7 @@
 import { POWERTOOLS_BASESITE } from '../../../sample-data/b2b-checkout';
 import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
+import { confirmB2bUnitSelectionDialogIfPresent } from '../b2b-unit-selection';
 import { ENTITY_UID_COOKIE_KEY, MyCompanyConfig } from './models/index';
 import {
   testCoreFeaturesFromConfig,
@@ -70,6 +71,7 @@ export function loginAsMyCompanyAdmin(): void {
   var maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
   cy.requireLoggedIn(myCompanyAdminUser);
+  confirmB2bUnitSelectionDialogIfPresent();
 }
 
 /**

From 06d6a6b6aba66a1414c15fdb3cf9a808780bf256 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 28 Jul 2026 11:34:15 +0800
Subject: [PATCH 23/60] format codes

format codes
---
 .../cypress/helpers/b2b/b2b-unit-selection.ts                 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index 893c78b7615..c2b1fe43420 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -20,9 +20,7 @@ const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 export function confirmB2bUnitSelectionDialogIfPresent(): void {
   cy.get('body').then(($body) => {
     if ($body.find(B2B_UNIT_SELECTION_DIALOG).length > 0) {
-      cy.get(B2B_UNIT_SELECTION_DIALOG)
-        .find('button.btn-primary')
-        .click();
+      cy.get(B2B_UNIT_SELECTION_DIALOG).find('button.btn-primary').click();
     }
   });
 }

From 6ef60799a48166ef5a575b973332acb353f34dd2 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 28 Jul 2026 15:35:27 +0800
Subject: [PATCH 24/60] fix

fix
---
 ...2b-unit-selection-dialog.component.spec.ts | 171 ++++++++++++++++++
 .../b2b-unit-selection-dialog.component.ts    |  20 +-
 ...stract-b2b-unit-selector.component.spec.ts |   8 +-
 .../abstract-b2b-unit-selector.component.ts   |  10 +-
 .../connectors/b2b-unit-selection.adapter.ts  |   9 +-
 .../b2b-unit-selection.connector.ts           |   8 +-
 .../actions/b2b-unit-selection.actions.ts     |   2 +-
 .../b2b-unit-selection.effects.spec.ts        |  82 ++++++---
 .../effects/b2b-unit-selection.effects.ts     |  79 +++++---
 .../occ-b2b-unit-selection.adapter.spec.ts    |  12 +-
 .../occ-b2b-unit-selection.adapter.ts         |   2 +-
 .../root/model/augmented-core.model.ts        |   6 +
 12 files changed, 324 insertions(+), 85 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
new file mode 100644
index 00000000000..c6f8ed85bd2
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
@@ -0,0 +1,171 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChangeDetectionStrategy, Directive, Input } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { Store } from '@ngrx/store';
+import { B2BUnit, I18nTestingModule, UserIdService } from '@spartacus/core';
+import {
+  FocusConfig,
+  FocusDirective,
+  FormErrorsModule,
+  LaunchDialogService,
+  NgSelectA11yDirective,
+} from '@spartacus/storefront';
+import { BehaviorSubject, of } from 'rxjs';
+import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog.component';
+import createSpy = jasmine.createSpy;
+
+const mockUnits: B2BUnit[] = [
+  { uid: 'unit-1', name: 'Rustic' },
+  { uid: 'unit-2', name: 'Rustic Services' },
+];
+const mockUserId = 'current';
+
+@Directive({ selector: '[cxFocus]' })
+class MockFocusDirective {
+  @Input('cxFocus') config: FocusConfig = {};
+}
+
+@Directive({ selector: '[cxNgSelectA11y]' })
+class MockNgSelectA11yDirective {
+  @Input() cxNgSelectA11y: { ariaLabel?: string } = {};
+}
+
+class MockUserIdService {
+  takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
+}
+
+class MockStore {
+  dispatch = createSpy('dispatch');
+}
+
+describe('B2bUnitSelectionDialogComponent', () => {
+  let component: B2bUnitSelectionDialogComponent;
+  let fixture: ComponentFixture<B2bUnitSelectionDialogComponent>;
+  let store: MockStore;
+  let data$: BehaviorSubject<any>;
+
+  function createComponent(dialogData: any = {}): void {
+    data$ = new BehaviorSubject(dialogData);
+
+    TestBed.configureTestingModule({
+      imports: [
+        B2bUnitSelectionDialogComponent,
+        ReactiveFormsModule,
+        NgSelectModule,
+        I18nTestingModule,
+        FormErrorsModule,
+      ],
+      providers: [
+        { provide: LaunchDialogService, useValue: { data$ } },
+        { provide: UserIdService, useClass: MockUserIdService },
+        { provide: Store, useClass: MockStore },
+      ],
+    })
+      .overrideComponent(B2bUnitSelectionDialogComponent, {
+        remove: { imports: [FocusDirective, NgSelectA11yDirective] },
+        add: {
+          imports: [MockFocusDirective, MockNgSelectA11yDirective],
+          changeDetection: ChangeDetectionStrategy.Default,
+        },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(B2bUnitSelectionDialogComponent);
+    component = fixture.componentInstance;
+    store = TestBed.inject(Store) as any;
+  }
+
+  // ── ngOnInit ──────────────────────────────────────────────────────────────
+
+  describe('ngOnInit()', () => {
+    it('should populate orgUnits from dialog data', waitForAsync(() => {
+      createComponent({ orgUnits: mockUnits, defaultUnitName: 'unit-1' });
+      fixture.detectChanges();
+
+      expect(component.orgUnits).toEqual(mockUnits);
+    }));
+
+    it('should pre-select the unit matching defaultUnitName', waitForAsync(() => {
+      createComponent({
+        orgUnits: mockUnits,
+        defaultUnitName: 'Rustic Services',
+      });
+      fixture.detectChanges();
+
+      expect(component.form.value.selectedUnit).toEqual(mockUnits[1]);
+    }));
+
+    it('should fall back to the first unit when defaultUnitName does not match', waitForAsync(() => {
+      createComponent({ orgUnits: mockUnits, defaultUnitName: 'unknown-name' });
+      fixture.detectChanges();
+
+      expect(component.form.value.selectedUnit).toEqual(mockUnits[0]);
+    }));
+
+    it('should set selectedUnit to null when orgUnits is empty', waitForAsync(() => {
+      createComponent({ orgUnits: [], defaultUnitName: undefined });
+      fixture.detectChanges();
+
+      expect(component.form.value.selectedUnit).toBeNull();
+    }));
+
+    it('should handle missing dialog data gracefully', waitForAsync(() => {
+      createComponent(null);
+      fixture.detectChanges();
+
+      expect(component.orgUnits).toEqual([]);
+      expect(component.form.value.selectedUnit).toBeNull();
+    }));
+  });
+
+  // ── confirm() ─────────────────────────────────────────────────────────────
+
+  describe('confirm()', () => {
+    beforeEach(waitForAsync(() => {
+      createComponent({ orgUnits: mockUnits, defaultUnitName: 'Rustic' });
+      fixture.detectChanges();
+    }));
+
+    it('should dispatch SetDefaultOrgUnit with correct payload', () => {
+      component.confirm();
+
+      expect(store.dispatch).toHaveBeenCalledWith(
+        new SetDefaultOrgUnit({ userId: mockUserId, unitName: 'Rustic' })
+      );
+    });
+
+    it('should mark form as touched and NOT dispatch when selectedUnit is null', () => {
+      component.form.get('selectedUnit')?.setValue(null);
+
+      component.confirm();
+
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(component.form.get('selectedUnit')?.touched).toBeTrue();
+    });
+  });
+
+  // ── ngOnDestroy ───────────────────────────────────────────────────────────
+
+  describe('ngOnDestroy()', () => {
+    it('should unsubscribe from all subscriptions', waitForAsync(() => {
+      createComponent({ orgUnits: mockUnits });
+      fixture.detectChanges();
+
+      const unsubscribeSpy = spyOn(
+        (component as any).subscriptions,
+        'unsubscribe'
+      );
+      component.ngOnDestroy();
+
+      expect(unsubscribeSpy).toHaveBeenCalled();
+    }));
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 21db7945edc..1d38be5762f 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -68,14 +68,16 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
     this.subscriptions.add(
       this.launchDialogService.data$
         .pipe(take(1))
-        .subscribe((data: { orgUnits: B2BUnit[]; defaultUnitUid?: string }) => {
-          this.orgUnits = data?.orgUnits ?? [];
-          const matched =
-            this.orgUnits.find((u) => u.name === data?.defaultUnitUid) ??
-            this.orgUnits[0] ??
-            null;
-          this.form.get('selectedUnit')?.setValue(matched);
-        })
+        .subscribe(
+          (data: { orgUnits: B2BUnit[]; defaultUnitName?: string }) => {
+            this.orgUnits = data?.orgUnits ?? [];
+            const matched =
+              this.orgUnits.find((u) => u.name === data?.defaultUnitName) ??
+              this.orgUnits[0] ??
+              null;
+            this.form.get('selectedUnit')?.setValue(matched);
+          }
+        )
     );
   }
 
@@ -93,7 +95,7 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       .pipe(take(1))
       .subscribe((userId) => {
         this.store.dispatch(
-          new SetDefaultOrgUnit({ userId, unitUid: unit.name ?? '' })
+          new SetDefaultOrgUnit({ userId, unitName: unit.name ?? '' })
         );
       });
   }
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
index 7ff4c31f9db..61d1b11c946 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -48,7 +48,7 @@ class MockB2bUnitSelectorStateService {
 
 class MockB2bUnitSelectionConnector {
   loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
-  loadDefaultOrgUnitUid = createSpy('loadDefaultOrgUnitUid').and.returnValue(
+  loadDefaultOrgUnitName = createSpy('loadDefaultOrgUnitName').and.returnValue(
     of(mockDefaultUid)
   );
 }
@@ -129,10 +129,10 @@ describe('AbstractB2bUnitSelectorComponent', () => {
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
     });
 
-    it('should set active unit to null when loadDefaultOrgUnitUid fails', () => {
+    it('should set active unit to null when loadDefaultOrgUnitName fails', () => {
       createComponent(true, []);
       connector = TestBed.inject(B2bUnitSelectionConnector) as any;
-      connector.loadDefaultOrgUnitUid.and.returnValue(
+      connector.loadDefaultOrgUnitName.and.returnValue(
         throwError(() => new Error('not found'))
       );
       fixture.detectChanges();
@@ -153,7 +153,7 @@ describe('AbstractB2bUnitSelectorComponent', () => {
       expect(store.dispatch).toHaveBeenCalledWith(
         new SetDefaultOrgUnit({
           userId: mockUserId,
-          unitUid: 'Rustic Services',
+          unitName: 'Rustic Services',
           redirectToHome: true,
         })
       );
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index b68d0a94e7b..a1edae461d7 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -70,7 +70,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
         this.store.dispatch(
           new SetDefaultOrgUnit({
             userId,
-            unitUid: unitName,
+            unitName,
             redirectToHome: true,
           })
         );
@@ -85,15 +85,15 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
         switchMap((userId) =>
           forkJoin({
             orgUnits: this.connector.loadOrgUnits(userId),
-            defaultUnitUid: this.connector
-              .loadDefaultOrgUnitUid(userId)
+            defaultUnitName: this.connector
+              .loadDefaultOrgUnitName(userId)
               .pipe(catchError(() => of(undefined))),
           })
         )
       )
-      .subscribe(({ orgUnits, defaultUnitUid }) => {
+      .subscribe(({ orgUnits, defaultUnitName }) => {
         this.stateService.setOrgUnits(orgUnits);
-        this.stateService.setActiveUnit(defaultUnitUid ?? null);
+        this.stateService.setActiveUnit(defaultUnitName ?? null);
       });
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
index f01fa494b83..3d40e4ffcd0 100644
--- a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.adapter.ts
@@ -9,10 +9,10 @@ import { Observable } from 'rxjs';
 
 export abstract class B2bUnitSelectionAdapter {
   /**
-   * Fetches the current B2B user profile and returns the default org unit uid.
+   * Fetches the current B2B user profile and returns the default org unit name.
    * Corresponds to GET /{baseSiteId}/orgUsers/{userId}
    */
-  abstract loadDefaultOrgUnitUid(
+  abstract loadDefaultOrgUnitName(
     userId: string
   ): Observable<string | undefined>;
 
@@ -24,5 +24,8 @@ export abstract class B2bUnitSelectionAdapter {
   /**
    * Sets the default org unit for the current B2B user.
    */
-  abstract setDefaultOrgUnit(userId: string, unitUid: string): Observable<void>;
+  abstract setDefaultOrgUnit(
+    userId: string,
+    unitName: string
+  ): Observable<void>;
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
index eb6d95352e3..7e1ca79b08c 100644
--- a/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/connectors/b2b-unit-selection.connector.ts
@@ -13,15 +13,15 @@ import { B2bUnitSelectionAdapter } from './b2b-unit-selection.adapter';
 export class B2bUnitSelectionConnector {
   constructor(protected adapter: B2bUnitSelectionAdapter) {}
 
-  loadDefaultOrgUnitUid(userId: string): Observable<string | undefined> {
-    return this.adapter.loadDefaultOrgUnitUid(userId);
+  loadDefaultOrgUnitName(userId: string): Observable<string | undefined> {
+    return this.adapter.loadDefaultOrgUnitName(userId);
   }
 
   loadOrgUnits(userId: string): Observable<B2BUnit[]> {
     return this.adapter.loadOrgUnits(userId);
   }
 
-  setDefaultOrgUnit(userId: string, unitUid: string): Observable<void> {
-    return this.adapter.setDefaultOrgUnit(userId, unitUid);
+  setDefaultOrgUnit(userId: string, unitName: string): Observable<void> {
+    return this.adapter.setDefaultOrgUnit(userId, unitName);
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
index 006f04618d5..57bf3d8e311 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -43,7 +43,7 @@ export class SetDefaultOrgUnit implements Action {
   constructor(
     public payload: {
       userId: string;
-      unitUid: string;
+      unitName: string;
       /** true = triggered from the header selector (navigates home on success); false/undefined = triggered from the dialog */
       redirectToHome?: boolean;
     }
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 24c067fb093..eadf38fac36 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ApplicationRef } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
+import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Action } from '@ngrx/store';
 import {
@@ -26,7 +26,7 @@ import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 // Side-effect import: ensures the LAUNCH_CALLER runtime assignment runs before tests.
 import '../../../root/model/augmented-core.model';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Observable, of, throwError } from 'rxjs';
+import { Observable, of, Subject, throwError } from 'rxjs';
 import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
@@ -52,7 +52,7 @@ class MockLoggerService {
 
 class MockB2bUnitSelectionConnector {
   loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
-  loadDefaultOrgUnitUid = createSpy('loadDefaultOrgUnitUid').and.returnValue(
+  loadDefaultOrgUnitName = createSpy('loadDefaultOrgUnitName').and.returnValue(
     of(mockDefaultUid)
   );
   setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(
@@ -89,12 +89,13 @@ describe('B2bUnitSelectionEffects', () => {
 
   beforeEach(() => {
     applicationRef = {
-      components: [{}] as any[],
-      afterTick: {
-        subscribe: jasmine
-          .createSpy()
-          .and.returnValue({ unsubscribe: () => {} }),
-      },
+      // Simulate AppComponent already mounted (manual ROPC login).
+      components: [{}],
+      // Required by Angular's ChangeDetectionSchedulerImpl (Angular 18+):
+      // - isStable: used by older internal code paths
+      // - afterTick: Subject subscribed to in the constructor
+      isStable: of(true),
+      afterTick: new Subject<void>(),
     };
 
     TestBed.configureTestingModule({
@@ -164,15 +165,15 @@ describe('B2bUnitSelectionEffects', () => {
       getTestScheduler().flush();
 
       expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
-        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
+        LAUNCH_CALLER.B2B_UNIT_SELECTION,
         undefined,
-        { orgUnits: mockUnits, defaultUnitUid: mockDefaultUid }
+        { orgUnits: mockUnits, defaultUnitName: mockDefaultUid }
       );
     });
 
     it('should NOT open the dialog when orgUnits is empty', () => {
       connector.loadOrgUnits.and.returnValue(of([]));
-      connector.loadDefaultOrgUnitUid.and.returnValue(of(undefined));
+      connector.loadDefaultOrgUnitName.and.returnValue(of(undefined));
 
       const action = new AuthActions.Login();
       actions$ = hot('-a', { a: action });
@@ -197,8 +198,8 @@ describe('B2bUnitSelectionEffects', () => {
       expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
     });
 
-    it('should degrade gracefully when loadDefaultOrgUnitUid fails', () => {
-      connector.loadDefaultOrgUnitUid.and.returnValue(
+    it('should degrade gracefully when loadDefaultOrgUnitName fails', () => {
+      connector.loadDefaultOrgUnitName.and.returnValue(
         throwError(() => mockError)
       );
 
@@ -213,12 +214,49 @@ describe('B2bUnitSelectionEffects', () => {
       expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
     });
+
+    it('should open the dialog via polling when AppComponent is not yet mounted (OAuth flow)', fakeAsync(() => {
+      // Simulate OAuth / page-refresh: components array is empty on LOGIN.
+      applicationRef.components = [];
+
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+
+      effects.checkOrgUnitsOnLogin$.subscribe();
+      getTestScheduler().flush();
+
+      // Dialog not yet opened — AppComponent not mounted.
+      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
+
+      // AppComponent mounts → next polling tick opens the dialog.
+      applicationRef.components = [{}];
+      tick(51); // advance past the 50 ms polling interval
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
+    }));
+
+    it('should still open dialog via timer fallback when AppComponent never mounts', fakeAsync(() => {
+      // Simulate OAuth / page-refresh: components array is empty on LOGIN.
+      applicationRef.components = [];
+      // AppComponent never mounts — components stays empty.
+
+      const action = new AuthActions.Login();
+      actions$ = hot('-a', { a: action });
+
+      effects.checkOrgUnitsOnLogin$.subscribe();
+      getTestScheduler().flush();
+
+      // Fast-forward past STABLE_TIMEOUT_MS so the timer fallback fires.
+      tick((effects as any).STABLE_TIMEOUT_MS + 1);
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
+    }));
   });
 
   // ── setDefaultOrgUnit$ ────────────────────────────────────────────────────
 
   describe('setDefaultOrgUnit$', () => {
-    const payload = { userId: mockUserId, unitUid: 'Rustic Services' };
+    const payload = { userId: mockUserId, unitName: 'Rustic Services' };
 
     it('should dispatch SetDefaultOrgUnitSuccess', () => {
       const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
@@ -238,7 +276,7 @@ describe('B2bUnitSelectionEffects', () => {
       getTestScheduler().flush();
 
       expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
-      expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitUid);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitName);
     });
 
     it('should navigate to home when redirectToHome is true', () => {
@@ -305,12 +343,12 @@ describe('B2bUnitSelectionEffects (feature disabled)', () => {
 
   beforeEach(() => {
     const appRef: any = {
-      components: [{}] as any[],
-      afterTick: {
-        subscribe: jasmine
-          .createSpy()
-          .and.returnValue({ unsubscribe: () => {} }),
-      },
+      components: [{}],
+      // Required by Angular's ChangeDetectionSchedulerImpl (Angular 18+):
+      // - isStable: used by older internal code paths
+      // - afterTick: Subject subscribed to in the constructor
+      isStable: of(true),
+      afterTick: new Subject<void>(),
     };
 
     TestBed.configureTestingModule({
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 1d8d6f0b52e..a5c5b181584 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -16,8 +16,17 @@ import {
   UserIdService,
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-import { EMPTY, forkJoin, Observable, of } from 'rxjs';
-import { catchError, exhaustMap, map, switchMap, tap } from 'rxjs/operators';
+import { EMPTY, forkJoin, interval, Observable, of, race, timer } from 'rxjs';
+import {
+  catchError,
+  exhaustMap,
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
@@ -58,16 +67,16 @@ export class B2bUnitSelectionEffects {
             forkJoin({
               orgUnits: this.connector.loadOrgUnits(userId),
               // Gracefully degrade if loading the default unit fails — do not block the main flow.
-              defaultUnitUid: this.connector
-                .loadDefaultOrgUnitUid(userId)
+              defaultUnitName: this.connector
+                .loadDefaultOrgUnitName(userId)
                 .pipe(catchError(() => of(undefined))),
             }).pipe(
-              tap(({ orgUnits, defaultUnitUid }) => {
+              tap(({ orgUnits, defaultUnitName }) => {
                 // Always write to the state service so the Company header selector is populated.
                 this.stateService.setOrgUnits(orgUnits);
-                this.stateService.setActiveUnit(defaultUnitUid ?? null);
+                this.stateService.setActiveUnit(defaultUnitName ?? null);
                 if (orgUnits.length > 0) {
-                  this.openDialogWhenReady(orgUnits, defaultUnitUid);
+                  this.openDialogWhenReady(orgUnits, defaultUnitName);
                 }
               }),
               map(
@@ -105,11 +114,11 @@ export class B2bUnitSelectionEffects {
       map(
         (action: B2bUnitSelectionActions.SetDefaultOrgUnit) => action.payload
       ),
-      switchMap(({ userId, unitUid, redirectToHome }) =>
-        this.connector.setDefaultOrgUnit(userId, unitUid).pipe(
+      switchMap(({ userId, unitName, redirectToHome }) =>
+        this.connector.setDefaultOrgUnit(userId, unitName).pipe(
           tap(() => {
             this.launchDialogService.closeDialog('CONFIRMED');
-            this.stateService.setActiveUnit(unitUid);
+            this.stateService.setActiveUnit(unitName);
             // Only navigate home for header selector switches (redirectToHome=true);
             // dialog confirmations stay on the current page.
             if (redirectToHome) {
@@ -152,37 +161,47 @@ export class B2bUnitSelectionEffects {
     protected launchDialogService: LaunchDialogService
   ) {}
 
+  /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
+  protected readonly STABLE_TIMEOUT_MS = 10_000;
+
   /**
-   * Opens the unit-selection dialog once AppComponent is mounted.
+   * Opens the unit-selection dialog once the AppComponent is mounted.
+   *
+   * Polls `ApplicationRef.components` every 50 ms (with an immediate synchronous
+   * check via `startWith(0)`) so the dialog opens as soon as the root component
+   * is bootstrapped — typically within one or two ticks after login.
+   *
+   * Using `ApplicationRef.isStable` instead would delay the dialog by several
+   * seconds because it waits for ALL Zone tasks (routing, HTTP, etc.) to drain.
    *
-   * InlineRootRenderStrategy requires ApplicationRef.components[0] to be present.
-   * - Already mounted (manual login): open immediately.
-   * - Not yet mounted (OAuth Code Flow / token restore during APP_INITIALIZER):
-   *   poll via requestAnimationFrame until Angular bootstraps AppComponent.
+   * A `timer(STABLE_TIMEOUT_MS)` fallback ensures the subscription always
+   * completes even if AppComponent never mounts (e.g. an error during bootstrap),
+   * preventing a memory leak.
    */
   protected openDialogWhenReady(
     orgUnits: B2BUnit[],
-    defaultUnitUid: string | undefined
+    defaultUnitName: string | undefined
   ): void {
     const open = () => {
       this.launchDialogService.openDialogAndSubscribe(
-        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
+        LAUNCH_CALLER.B2B_UNIT_SELECTION,
         undefined,
-        { orgUnits, defaultUnitUid }
+        { orgUnits, defaultUnitName }
       );
     };
 
-    if (this.applicationRef.components.length > 0) {
-      open();
-    } else {
-      const poll = () => {
-        if (this.applicationRef.components.length > 0) {
-          open();
-        } else {
-          requestAnimationFrame(poll);
-        }
-      };
-      requestAnimationFrame(poll);
-    }
+    // Poll until AppComponent is mounted, then open immediately.
+    // startWith(0) performs a synchronous check — if components are already
+    // present (manual ROPC login), the dialog opens without any async delay.
+    race(
+      interval(50).pipe(
+        startWith(0),
+        filter(() => this.applicationRef.components.length > 0),
+        take(1)
+      ),
+      timer(this.STABLE_TIMEOUT_MS)
+    )
+      .pipe(take(1))
+      .subscribe(() => open());
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
index 01ec3490df2..a18de2ad826 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.spec.ts
@@ -55,11 +55,11 @@ describe('OccB2bUnitSelectionAdapter', () => {
     httpMock.verify();
   });
 
-  // ── loadDefaultOrgUnitUid ────────────────────────────────────────────────
+  // ── loadDefaultOrgUnitName ───────────────────────────────────────────────
 
-  describe('loadDefaultOrgUnitUid()', () => {
+  describe('loadDefaultOrgUnitName()', () => {
     it('should call the orgUser endpoint', fakeAsync(() => {
-      adapter.loadDefaultOrgUnitUid(userId).subscribe();
+      adapter.loadDefaultOrgUnitName(userId).subscribe();
 
       httpMock.expectOne((req: HttpRequest<void>) => req.method === 'GET');
 
@@ -69,7 +69,7 @@ describe('OccB2bUnitSelectionAdapter', () => {
     }));
 
     it('should return the orgUnit name from the response', (done) => {
-      adapter.loadDefaultOrgUnitUid(userId).subscribe((name) => {
+      adapter.loadDefaultOrgUnitName(userId).subscribe((name) => {
         expect(name).toBe('Rustic');
         done();
       });
@@ -80,7 +80,7 @@ describe('OccB2bUnitSelectionAdapter', () => {
     });
 
     it('should return undefined when orgUnit is missing from response', (done) => {
-      adapter.loadDefaultOrgUnitUid(userId).subscribe((name) => {
+      adapter.loadDefaultOrgUnitName(userId).subscribe((name) => {
         expect(name).toBeUndefined();
         done();
       });
@@ -91,7 +91,7 @@ describe('OccB2bUnitSelectionAdapter', () => {
     });
 
     it('should rethrow a normalised error on HTTP failure', (done) => {
-      adapter.loadDefaultOrgUnitUid(userId).subscribe({
+      adapter.loadDefaultOrgUnitName(userId).subscribe({
         error: (err) => {
           expect(err).toBeDefined();
           done();
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
index eea20f79a8b..1e5a6e62e58 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -27,7 +27,7 @@ export class OccB2bUnitSelectionAdapter implements B2bUnitSelectionAdapter {
     protected occEndpoints: OccEndpointsService
   ) {}
 
-  loadDefaultOrgUnitUid(userId: string): Observable<string | undefined> {
+  loadDefaultOrgUnitName(userId: string): Observable<string | undefined> {
     return this.http
       .get<{
         orgUnit?: { name?: string };
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
index a921bc63321..2cae5777b1c 100644
--- a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
@@ -6,5 +6,11 @@
 
 import { LAUNCH_CALLER } from '@spartacus/storefront';
 
+declare module '@spartacus/storefront' {
+  enum LAUNCH_CALLER {
+    B2B_UNIT_SELECTION = 'B2B_UNIT_SELECTION',
+  }
+}
+
 // Runtime registration: extends the LAUNCH_CALLER enum at runtime.
 (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';

From 0ce99c1c6820b2c26799b0a63413c854f6fd93e6 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 28 Jul 2026 15:56:09 +0800
Subject: [PATCH 25/60] fix

fix
---
 .../core/store/effects/b2b-unit-selection.effects.spec.ts   | 2 +-
 .../core/store/effects/b2b-unit-selection.effects.ts        | 2 +-
 .../b2b-unit-selection/root/model/augmented-core.model.ts   | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index eadf38fac36..ad94b27792c 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -165,7 +165,7 @@ describe('B2bUnitSelectionEffects', () => {
       getTestScheduler().flush();
 
       expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
-        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
         undefined,
         { orgUnits: mockUnits, defaultUnitName: mockDefaultUid }
       );
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index a5c5b181584..597d744e0fc 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -184,7 +184,7 @@ export class B2bUnitSelectionEffects {
   ): void {
     const open = () => {
       this.launchDialogService.openDialogAndSubscribe(
-        LAUNCH_CALLER.B2B_UNIT_SELECTION,
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
         undefined,
         { orgUnits, defaultUnitName }
       );
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
index 2cae5777b1c..a921bc63321 100644
--- a/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/model/augmented-core.model.ts
@@ -6,11 +6,5 @@
 
 import { LAUNCH_CALLER } from '@spartacus/storefront';
 
-declare module '@spartacus/storefront' {
-  enum LAUNCH_CALLER {
-    B2B_UNIT_SELECTION = 'B2B_UNIT_SELECTION',
-  }
-}
-
 // Runtime registration: extends the LAUNCH_CALLER enum at runtime.
 (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'] = 'B2B_UNIT_SELECTION';

From 79923f71a0e635562f7a821791e4649181ccfdf1 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 28 Jul 2026 16:56:11 +0800
Subject: [PATCH 26/60] CXSPA-13801: Trigger Build


From 06e02d260a35d59009479bf6868f55aa48a17950 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 14:58:45 +0800
Subject: [PATCH 27/60] fix

fix
---
 .../b2b-unit-selection.effects.spec.ts        |  2 +
 .../effects/b2b-unit-selection.effects.ts     | 44 ++++++++++---------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index ad94b27792c..85bbeb5d5ac 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -94,8 +94,10 @@ describe('B2bUnitSelectionEffects', () => {
       // Required by Angular's ChangeDetectionSchedulerImpl (Angular 18+):
       // - isStable: used by older internal code paths
       // - afterTick: Subject subscribed to in the constructor
+      // - _tick: called by fakeAsync zone integration to trigger change detection
       isStable: of(true),
       afterTick: new Subject<void>(),
+      _tick: () => {},
     };
 
     TestBed.configureTestingModule({
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 597d744e0fc..e18289e1683 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -5,7 +5,7 @@
  */
 
 import { HttpErrorResponse } from '@angular/common/http';
-import { ApplicationRef, inject, Injectable } from '@angular/core';
+import { ApplicationRef, inject, Injectable, NgZone } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   AuthActions,
@@ -37,6 +37,7 @@ export class B2bUnitSelectionEffects {
   protected logger = inject(LoggerService);
   protected config = inject(B2bUnitSelectionConfig);
   protected applicationRef = inject(ApplicationRef);
+  protected ngZone = inject(NgZone);
   protected stateService = inject(B2bUnitSelectorStateService);
   protected routingService = inject(RoutingService);
 
@@ -167,16 +168,16 @@ export class B2bUnitSelectionEffects {
   /**
    * Opens the unit-selection dialog once the AppComponent is mounted.
    *
-   * Polls `ApplicationRef.components` every 50 ms (with an immediate synchronous
-   * check via `startWith(0)`) so the dialog opens as soon as the root component
-   * is bootstrapped — typically within one or two ticks after login.
+   * Polls `ApplicationRef.components` every 50 ms so the dialog opens as soon
+   * as the root component is bootstrapped — typically within one or two ticks.
    *
-   * Using `ApplicationRef.isStable` instead would delay the dialog by several
-   * seconds because it waits for ALL Zone tasks (routing, HTTP, etc.) to drain.
+   * The polling runs OUTSIDE Angular's zone via `NgZone.runOutsideAngular` so
+   * the `setInterval` does not keep the zone perpetually unstable, which would
+   * otherwise prevent `ApplicationRef.isStable` from emitting and block CMS
+   * page rendering.
    *
    * A `timer(STABLE_TIMEOUT_MS)` fallback ensures the subscription always
-   * completes even if AppComponent never mounts (e.g. an error during bootstrap),
-   * preventing a memory leak.
+   * completes even if AppComponent never mounts, preventing a memory leak.
    */
   protected openDialogWhenReady(
     orgUnits: B2BUnit[],
@@ -190,18 +191,19 @@ export class B2bUnitSelectionEffects {
       );
     };
 
-    // Poll until AppComponent is mounted, then open immediately.
-    // startWith(0) performs a synchronous check — if components are already
-    // present (manual ROPC login), the dialog opens without any async delay.
-    race(
-      interval(50).pipe(
-        startWith(0),
-        filter(() => this.applicationRef.components.length > 0),
-        take(1)
-      ),
-      timer(this.STABLE_TIMEOUT_MS)
-    )
-      .pipe(take(1))
-      .subscribe(() => open());
+    // Run the polling interval outside Angular's zone so the continuous
+    // setInterval does not keep ApplicationRef.isStable from emitting true.
+    this.ngZone.runOutsideAngular(() => {
+      race(
+        interval(50).pipe(
+          startWith(0),
+          filter(() => this.applicationRef.components.length > 0),
+          take(1)
+        ),
+        timer(this.STABLE_TIMEOUT_MS)
+      )
+        .pipe(take(1))
+        .subscribe(() => this.ngZone.run(() => open()));
+    });
   }
 }

From 7444325f838563f83d6b1e4e42fce33245fc403c Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 15:45:20 +0800
Subject: [PATCH 28/60] fix

fix
---
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 13 ++++--
 .../b2b-unit-selection-global-interceptor.ts  | 42 +++++++++++++++++++
 .../cypress/support/e2e.js                    |  1 +
 3 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index c2b1fe43420..8cfabe299d5 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -7,17 +7,22 @@
 const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 
 /**
- * Confirms the B2B Unit selection dialog if it is present.
+ * Confirms the B2B Unit selection dialog if it appears within a short timeout.
  *
  * The dialog is shown after login when the feature `b2bUnitSelection.enabled` is true
- * and the user belongs to at least one org unit.  E2E tests that do not specifically
+ * and the user belongs to at least one org unit. E2E tests that do not specifically
  * test this dialog should call this helper right after the B2B login step so that the
  * dialog does not block subsequent test interactions.
  *
- * If the dialog is not present (feature disabled / user has no units) this helper is a
- * no-op — no assertion is made on the dialog's absence.
+ * If the dialog does not appear (feature disabled / user has no units), this helper
+ * is a no-op.
+ *
+ * A 500ms wait is included to account for the async 50ms polling interval in the
+ * effect that opens the dialog after login, preventing a race condition where the
+ * dialog has not yet appeared at the time of the DOM check.
  */
 export function confirmB2bUnitSelectionDialogIfPresent(): void {
+  cy.wait(500);
   cy.get('body').then(($body) => {
     if ($body.find(B2B_UNIT_SELECTION_DIALOG).length > 0) {
       cy.get(B2B_UNIT_SELECTION_DIALOG).find('button.btn-primary').click();
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts b/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts
new file mode 100644
index 00000000000..8010adfdf93
--- /dev/null
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts
@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Global beforeEach interceptor for the two OCC endpoints introduced by the
+ * B2B Unit Selection feature.
+ *
+ * `B2bUnitSelectorComponent` is registered as a CMS Flex component placed in
+ * `SiteContextSlot`, so it renders on every B2B page and fires these requests
+ * on every test run — regardless of whether the test exercises the dialog.
+ * Stubbing them globally avoids touching every individual login helper.
+ *
+ * Only active when `BASE_SITE` is set to the B2B powertools site; B2C tests
+ * are unaffected.
+ *
+ * Intercepted endpoints:
+ *  - GET …/orgUsers/{userId}/orgUnits  (loadOrgUnits)
+ *  - GET …/orgUsers/{userId}           (loadDefaultOrgUnitName)
+ */
+beforeEach(() => {
+  const baseSite = Cypress.env('BASE_SITE');
+  if (!baseSite || !String(baseSite).startsWith('powertools')) {
+    return;
+  }
+
+  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${baseSite}`;
+
+  // Must register the more-specific `/orgUnits` stub FIRST so Cypress matches
+  // it before the broader `orgUsers/**` pattern.
+  cy.intercept('GET', `${occPrefix}/orgUsers/**/orgUnits`, {
+    statusCode: 200,
+    body: { orgUnits: [] },
+  }).as('stubOrgUserUnits');
+
+  cy.intercept('GET', `${occPrefix}/orgUsers/**`, {
+    statusCode: 200,
+    body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } },
+  }).as('stubOrgUser');
+});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js b/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
index 0147383583b..296ddfbaa90 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
@@ -20,3 +20,4 @@ import './commands.ts';
 // require('./commands')
 
 import './csrf-global-interceptor.ts';
+import './b2b-unit-selection-global-interceptor.ts';

From fff455b3fa9225ebd9e448b254ef97b5f861a811 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:18:42 +0800
Subject: [PATCH 29/60] fix

fix
---
 .../a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts   |  2 +
 ...2b.replenishment.a11y-e2e-spec-flaky.cy.ts |  2 +
 .../e2e/a11y/helpers/a11y-b2b.checkout.ts     |  2 +
 .../helpers/b2b/b2b-account-summary.ts        |  2 +
 .../cypress/helpers/b2b/b2b-checkout.ts       |  6 ++-
 .../cypress/helpers/b2b/b2b-order-approval.ts |  3 ++
 .../helpers/b2b/b2b-order-attachments.ts      |  2 +
 .../cypress/helpers/b2b/b2b-order-details.ts  |  3 ++
 .../cypress/helpers/b2b/b2b-order-history.ts  |  5 +++
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 28 +++++++++++++
 .../b2b/my-company/my-company.utils.ts        |  6 ++-
 .../b2b-unit-selection-global-interceptor.ts  | 42 -------------------
 .../cypress/support/e2e.js                    |  1 -
 13 files changed, 59 insertions(+), 45 deletions(-)
 delete mode 100644 projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
index 4daea3ea91b..a2145bbcd20 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
@@ -7,6 +7,7 @@
 import * as sampleData from '../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 import { isolateTestsBefore } from '../../../support/utils/test-isolation';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
   isolateTestsBefore();
@@ -16,6 +17,7 @@ describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
 
   before(() => {
     cy.a11yContinuumSetup();
+    stubB2bUnitSelectionApis();
     cy.requireLoggedIn();
     cy.visit('/my-account/quick-order');
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
index 64f20e77fed..bab7120484b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
@@ -16,6 +16,7 @@ import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { addB2bUser, setB2bPassword } from '../../../helpers/b2b/b2b-checkout';
 import { login } from '../../../support/utils/login';
 import { getSampleUser } from '../../../sample-data/checkout-flow';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 function loginB2bUser() {
   let adminToken;
@@ -35,6 +36,7 @@ function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
index 4c0057f60a5..7a3fb620021 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
@@ -13,6 +13,7 @@ import {
   POWERTOOLS_BASESITE,
   products,
 } from '../../../sample-data/b2b-checkout';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -32,6 +33,7 @@ export function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
index bb75dec27fa..d749c883313 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
@@ -13,6 +13,7 @@ import {
   AccountData,
   RegistrationData,
 } from '../../support/require-logged-in.commands';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginAsAdmin() {
   const linda = 'linda.wolf@pronto-hw.com';
@@ -144,6 +145,7 @@ function login(user: AccountData) {
   const minWait = 750;
   const maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(user);
 }
 
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 8b19f1a726b..0757f6242ff 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -41,7 +41,10 @@ import {
   waitForProductPage,
 } from '../checkout-flow';
 import { waitForPage } from '../navigation';
-import { confirmB2bUnitSelectionDialogIfPresent } from './b2b-unit-selection';
+import {
+  confirmB2bUnitSelectionDialogIfPresent,
+  stubB2bUnitSelectionApis,
+} from './b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -65,6 +68,7 @@ export function loginB2bUser() {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
 
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
index 1666825a257..39829fb5510 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
@@ -5,6 +5,7 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-approval';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 import {
   approvalOrderDetail,
   approvalOrderList,
@@ -35,10 +36,12 @@ export function visitOrderApprovalDetailPage() {
 }
 
 export function loginB2bUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
 export function loginB2bApprover() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bApproverAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
index 5d3e47f3723..b1854476a97 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
@@ -6,8 +6,10 @@
 
 import * as sampleData from '../../sample-data/b2b-order-attachments';
 import { POWERTOOLS_BASESITE } from '../../sample-data/b2b-checkout';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginB2bUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
index b98e98e7213..8b375506dc4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
@@ -7,6 +7,7 @@
 import * as sampleData from '../../sample-data/b2b-order-details';
 import { unitLevelOrder } from '../../sample-data/b2b-order-details';
 import { waitForPage } from '../navigation';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
@@ -19,10 +20,12 @@ export function visitOrderApprovalListPage() {
 }
 
 export function loginB2bUnitOrderViewer() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bCommonUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
index 1bbf929e989..13ba3586acc 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
@@ -5,20 +5,25 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-history';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginB2bUnitOrderViewer() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bUnitOrderViewer2() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount2);
 }
 
 export function loginB2bUnitOrderViewerManager() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerManagerAccount);
 }
 
 export function loginB2bCommonUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bCommonUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index 8cfabe299d5..179ba8984f5 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -6,6 +6,34 @@
 
 const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 
+/**
+ * Stubs the two OCC endpoints introduced by the B2B Unit Selection feature.
+ *
+ * `B2bUnitSelectorComponent` is placed in `SiteContextSlot` and fires these
+ * requests on every B2B page load. Tests that do not exercise the unit
+ * selection dialog should call this helper before `cy.requireLoggedIn()` so
+ * that the requests are intercepted before the app bootstraps.
+ *
+ * Intercepted endpoints:
+ *  - GET …/orgUsers/{userId}/orgUnits (loadOrgUnits)    → empty list, no dialog
+ *  - GET …/orgUsers/{userId}           (loadDefaultOrgUnitName) → minimal stub
+ */
+export function stubB2bUnitSelectionApis(): void {
+  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${Cypress.env('BASE_SITE')}`;
+
+  // Register the more-specific /orgUnits path first so it wins over the
+  // broader orgUsers/** pattern below.
+  cy.intercept('GET', `${occPrefix}/orgUsers/*/orgUnits`, {
+    statusCode: 200,
+    body: { orgUnits: [] },
+  }).as('stubOrgUserUnits');
+
+  cy.intercept('GET', `${occPrefix}/orgUsers/*`, {
+    statusCode: 200,
+    body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } },
+  }).as('stubOrgUser');
+}
+
 /**
  * Confirms the B2B Unit selection dialog if it appears within a short timeout.
  *
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
index 5664e3cf3f0..4390e3a7c08 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
@@ -7,7 +7,10 @@
 import { POWERTOOLS_BASESITE } from '../../../sample-data/b2b-checkout';
 import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
-import { confirmB2bUnitSelectionDialogIfPresent } from '../b2b-unit-selection';
+import {
+  confirmB2bUnitSelectionDialogIfPresent,
+  stubB2bUnitSelectionApis,
+} from '../b2b-unit-selection';
 import { ENTITY_UID_COOKIE_KEY, MyCompanyConfig } from './models/index';
 import {
   testCoreFeaturesFromConfig,
@@ -70,6 +73,7 @@ export function loginAsMyCompanyAdmin(): void {
   var minWait = 750;
   var maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(myCompanyAdminUser);
   confirmB2bUnitSelectionDialogIfPresent();
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts b/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts
deleted file mode 100644
index 8010adfdf93..00000000000
--- a/projects/storefrontapp-e2e-cypress/cypress/support/b2b-unit-selection-global-interceptor.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Global beforeEach interceptor for the two OCC endpoints introduced by the
- * B2B Unit Selection feature.
- *
- * `B2bUnitSelectorComponent` is registered as a CMS Flex component placed in
- * `SiteContextSlot`, so it renders on every B2B page and fires these requests
- * on every test run — regardless of whether the test exercises the dialog.
- * Stubbing them globally avoids touching every individual login helper.
- *
- * Only active when `BASE_SITE` is set to the B2B powertools site; B2C tests
- * are unaffected.
- *
- * Intercepted endpoints:
- *  - GET …/orgUsers/{userId}/orgUnits  (loadOrgUnits)
- *  - GET …/orgUsers/{userId}           (loadDefaultOrgUnitName)
- */
-beforeEach(() => {
-  const baseSite = Cypress.env('BASE_SITE');
-  if (!baseSite || !String(baseSite).startsWith('powertools')) {
-    return;
-  }
-
-  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${baseSite}`;
-
-  // Must register the more-specific `/orgUnits` stub FIRST so Cypress matches
-  // it before the broader `orgUsers/**` pattern.
-  cy.intercept('GET', `${occPrefix}/orgUsers/**/orgUnits`, {
-    statusCode: 200,
-    body: { orgUnits: [] },
-  }).as('stubOrgUserUnits');
-
-  cy.intercept('GET', `${occPrefix}/orgUsers/**`, {
-    statusCode: 200,
-    body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } },
-  }).as('stubOrgUser');
-});
diff --git a/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js b/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
index 296ddfbaa90..0147383583b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
+++ b/projects/storefrontapp-e2e-cypress/cypress/support/e2e.js
@@ -20,4 +20,3 @@ import './commands.ts';
 // require('./commands')
 
 import './csrf-global-interceptor.ts';
-import './b2b-unit-selection-global-interceptor.ts';

From 57dd2cd2a5b23f127acc7d35c5cdc0ed8cf25746 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 16:31:37 +0800
Subject: [PATCH 30/60] fix

fix
---
 .../b2b-unit-selection.effects.spec.ts        | 39 +++++++++++--------
 .../effects/b2b-unit-selection.effects.ts     | 19 +++++----
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 85bbeb5d5ac..8786bb556a4 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -18,8 +18,8 @@ import {
   AuthActions,
   B2BUnit,
   LoggerService,
-  RoutingService,
   UserIdService,
+  WindowRef,
   tryNormalizeHttpError,
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
@@ -74,8 +74,13 @@ class MockUserIdService {
   takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
 }
 
-class MockRoutingService {
-  go = createSpy('go');
+class MockWindowRef {
+  nativeWindow = {
+    location: {
+      assign: createSpy('assign'),
+      reload: createSpy('reload'),
+    },
+  };
 }
 
 describe('B2bUnitSelectionEffects', () => {
@@ -83,7 +88,7 @@ describe('B2bUnitSelectionEffects', () => {
   let connector: MockB2bUnitSelectionConnector;
   let stateService: MockB2bUnitSelectorStateService;
   let launchDialogService: MockLaunchDialogService;
-  let routingService: MockRoutingService;
+  let windowRef: MockWindowRef;
   let actions$: Observable<Action>;
   let applicationRef: any;
 
@@ -113,7 +118,7 @@ describe('B2bUnitSelectionEffects', () => {
         },
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: UserIdService, useClass: MockUserIdService },
-        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: WindowRef, useClass: MockWindowRef },
         { provide: ApplicationRef, useValue: applicationRef },
         { provide: LoggerService, useClass: MockLoggerService },
         {
@@ -130,7 +135,7 @@ describe('B2bUnitSelectionEffects', () => {
     connector = TestBed.inject(B2bUnitSelectionConnector) as any;
     stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
     launchDialogService = TestBed.inject(LaunchDialogService) as any;
-    routingService = TestBed.inject(RoutingService) as any;
+    windowRef = TestBed.inject(WindowRef) as any;
   });
 
   // ── checkOrgUnitsOnLogin$ ─────────────────────────────────────────────────
@@ -281,27 +286,29 @@ describe('B2bUnitSelectionEffects', () => {
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitName);
     });
 
-    it('should navigate to home when redirectToHome is true', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
-        ...payload,
-        redirectToHome: true,
-      });
+    it('should call location.reload() when redirectToHome is false (dialog confirmation)', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
       getTestScheduler().flush();
 
-      expect(routingService.go).toHaveBeenCalledWith({ cxRoute: 'home' });
+      expect(windowRef.nativeWindow.location.reload).toHaveBeenCalled();
+      expect(windowRef.nativeWindow.location.assign).not.toHaveBeenCalled();
     });
 
-    it('should NOT navigate to home when redirectToHome is false/undefined', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
+    it('should call location.assign("/") when redirectToHome is true (header selector)', () => {
+      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
+        ...payload,
+        redirectToHome: true,
+      });
       actions$ = hot('-a', { a: action });
 
       effects.setDefaultOrgUnit$.subscribe();
       getTestScheduler().flush();
 
-      expect(routingService.go).not.toHaveBeenCalled();
+      expect(windowRef.nativeWindow.location.assign).toHaveBeenCalledWith('/');
+      expect(windowRef.nativeWindow.location.reload).not.toHaveBeenCalled();
     });
 
     it('should dispatch SetDefaultOrgUnitFail on connector error', () => {
@@ -366,7 +373,7 @@ describe('B2bUnitSelectionEffects (feature disabled)', () => {
         },
         { provide: LaunchDialogService, useClass: MockLaunchDialogService },
         { provide: UserIdService, useClass: MockUserIdService },
-        { provide: RoutingService, useClass: MockRoutingService },
+        { provide: WindowRef, useClass: MockWindowRef },
         { provide: ApplicationRef, useValue: appRef },
         { provide: LoggerService, useClass: MockLoggerService },
         {
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index e18289e1683..6714bf64499 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -11,9 +11,9 @@ import {
   AuthActions,
   B2BUnit,
   LoggerService,
-  RoutingService,
   tryNormalizeHttpError,
   UserIdService,
+  WindowRef,
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { EMPTY, forkJoin, interval, Observable, of, race, timer } from 'rxjs';
@@ -39,7 +39,7 @@ export class B2bUnitSelectionEffects {
   protected applicationRef = inject(ApplicationRef);
   protected ngZone = inject(NgZone);
   protected stateService = inject(B2bUnitSelectorStateService);
-  protected routingService = inject(RoutingService);
+  protected windowRef = inject(WindowRef);
 
   /**
    * Listens for the LOGIN action and loads the user's org units and default unit.
@@ -101,8 +101,8 @@ export class B2bUnitSelectionEffects {
 
   /**
    * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
-   * On success, closes the dialog, updates the header selector state, and navigates
-   * home when triggered from the header selector (redirectToHome = true).
+   * On success, closes the dialog, updates the header selector state, and reloads
+   * the page so all org-context-dependent data (prices, catalog, CMS) is refreshed.
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
@@ -120,10 +120,15 @@ export class B2bUnitSelectionEffects {
           tap(() => {
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitName);
-            // Only navigate home for header selector switches (redirectToHome=true);
-            // dialog confirmations stay on the current page.
+            // Reload the page so all org-context data is refreshed for the
+            // newly selected unit.
+            // Header selector: navigate to home root and trigger a full page
+            // reload in one step via location.assign('/').
+            // Dialog: reload the current page in-place via location.reload().
             if (redirectToHome) {
-              this.routingService.go({ cxRoute: 'home' });
+              this.windowRef.nativeWindow?.location?.assign('/');
+            } else {
+              this.windowRef.nativeWindow?.location?.reload();
             }
           }),
           map(() => new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess()),

From 7be79350408ebec834a7117d976d6504f7bf873c Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 17:02:29 +0800
Subject: [PATCH 31/60] fix

fix
---
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index 179ba8984f5..5d6b61892bf 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -21,17 +21,20 @@ const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 export function stubB2bUnitSelectionApis(): void {
   const occPrefix = `${Cypress.env('OCC_PREFIX')}/${Cypress.env('BASE_SITE')}`;
 
-  // Register the more-specific /orgUnits path first so it wins over the
-  // broader orgUsers/** pattern below.
-  cy.intercept('GET', `${occPrefix}/orgUsers/*/orgUnits`, {
-    statusCode: 200,
-    body: { orgUnits: [] },
-  }).as('stubOrgUserUnits');
+  // Use pathname-based matching to avoid glob ambiguity with query strings
+  // (e.g. ?lang=en&curr=USD appended by OccEndpointsService).
+  //
+  // Register the more-specific /orgUnits path first so Cypress routes it
+  // before the broader orgUsers/{userId} rule below.
+  cy.intercept(
+    { method: 'GET', pathname: `${occPrefix}/orgUsers/*/orgUnits` },
+    { statusCode: 200, body: { orgUnits: [] } }
+  ).as('stubOrgUserUnits');
 
-  cy.intercept('GET', `${occPrefix}/orgUsers/*`, {
-    statusCode: 200,
-    body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } },
-  }).as('stubOrgUser');
+  cy.intercept(
+    { method: 'GET', pathname: `${occPrefix}/orgUsers/*` },
+    { statusCode: 200, body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } } }
+  ).as('stubOrgUser');
 }
 
 /**

From 80826f2a2a3b42af9c3513226937fa0b73498830 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 17:46:22 +0800
Subject: [PATCH 32/60] fix

fix
---
 .../abstract-b2b-unit-selector.component.ts                  | 5 ++++-
 .../cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index a1edae461d7..70eed617aa3 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -84,7 +84,10 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
         take(1),
         switchMap((userId) =>
           forkJoin({
-            orgUnits: this.connector.loadOrgUnits(userId),
+            // Gracefully degrade on error so the component never blocks page rendering.
+            orgUnits: this.connector
+              .loadOrgUnits(userId)
+              .pipe(catchError(() => of([] as B2BUnit[]))),
             defaultUnitName: this.connector
               .loadDefaultOrgUnitName(userId)
               .pipe(catchError(() => of(undefined))),
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 d53fdc5203a..39a48b910da 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
@@ -17,6 +17,7 @@ import {
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
+import { stubB2bUnitSelectionApis } from '../../../../helpers/b2b/b2b-unit-selection';
 
 context('B2B - Assisted Service Module', () => {
   const customer = getASMB2BCustomer();
@@ -43,6 +44,7 @@ context('B2B - Assisted Service Module', () => {
       });
 
       cy.log('--> Agent logging in');
+      stubB2bUnitSelectionApis();
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');

From 9e1ceb13d87df4ca6038033e5f65280174e10dde Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 19:57:23 +0800
Subject: [PATCH 33/60] fix

fix
---
 .../a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts   |  2 --
 ...2b.replenishment.a11y-e2e-spec-flaky.cy.ts |  2 --
 .../e2e/a11y/helpers/a11y-b2b.checkout.ts     |  3 --
 .../e2e/b2b/regression/asm/asm.core-e2e.cy.ts |  3 --
 .../helpers/b2b/b2b-account-summary.ts        |  3 --
 .../cypress/helpers/b2b/b2b-checkout.ts       |  6 +---
 .../cypress/helpers/b2b/b2b-order-approval.ts |  3 --
 .../helpers/b2b/b2b-order-attachments.ts      |  3 --
 .../cypress/helpers/b2b/b2b-order-details.ts  |  4 ---
 .../cypress/helpers/b2b/b2b-order-history.ts  |  6 ----
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 31 -------------------
 .../b2b/my-company/my-company.utils.ts        |  6 +---
 12 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
index a2145bbcd20..4daea3ea91b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
@@ -7,7 +7,6 @@
 import * as sampleData from '../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 import { isolateTestsBefore } from '../../../support/utils/test-isolation';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
   isolateTestsBefore();
@@ -17,7 +16,6 @@ describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
 
   before(() => {
     cy.a11yContinuumSetup();
-    stubB2bUnitSelectionApis();
     cy.requireLoggedIn();
     cy.visit('/my-account/quick-order');
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
index bab7120484b..64f20e77fed 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
@@ -16,7 +16,6 @@ import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { addB2bUser, setB2bPassword } from '../../../helpers/b2b/b2b-checkout';
 import { login } from '../../../support/utils/login';
 import { getSampleUser } from '../../../sample-data/checkout-flow';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 function loginB2bUser() {
   let adminToken;
@@ -36,7 +35,6 @@ function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
index 7a3fb620021..5373def48f7 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
@@ -13,8 +13,6 @@ import {
   POWERTOOLS_BASESITE,
   products,
 } from '../../../sample-data/b2b-checkout';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
-
 export function loginB2bUser() {
   let adminToken;
   let user = getSampleUser();
@@ -33,7 +31,6 @@ export function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
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 39a48b910da..a3325c101b9 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
@@ -17,8 +17,6 @@ import {
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
-import { stubB2bUnitSelectionApis } from '../../../../helpers/b2b/b2b-unit-selection';
-
 context('B2B - Assisted Service Module', () => {
   const customer = getASMB2BCustomer();
   const b2bAgent = getB2BAgent();
@@ -44,7 +42,6 @@ context('B2B - Assisted Service Module', () => {
       });
 
       cy.log('--> Agent logging in');
-      stubB2bUnitSelectionApis();
       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/b2b/b2b-account-summary.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
index d749c883313..2174dc0cd59 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
@@ -13,8 +13,6 @@ import {
   AccountData,
   RegistrationData,
 } from '../../support/require-logged-in.commands';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
-
 export function loginAsAdmin() {
   const linda = 'linda.wolf@pronto-hw.com';
   const registrationData: RegistrationData = {
@@ -145,7 +143,6 @@ function login(user: AccountData) {
   const minWait = 750;
   const maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(user);
 }
 
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 0757f6242ff..8b19f1a726b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -41,10 +41,7 @@ import {
   waitForProductPage,
 } from '../checkout-flow';
 import { waitForPage } from '../navigation';
-import {
-  confirmB2bUnitSelectionDialogIfPresent,
-  stubB2bUnitSelectionApis,
-} from './b2b-unit-selection';
+import { confirmB2bUnitSelectionDialogIfPresent } from './b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -68,7 +65,6 @@ export function loginB2bUser() {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
 
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
index 39829fb5510..1666825a257 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
@@ -5,7 +5,6 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-approval';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 import {
   approvalOrderDetail,
   approvalOrderList,
@@ -36,12 +35,10 @@ export function visitOrderApprovalDetailPage() {
 }
 
 export function loginB2bUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
 export function loginB2bApprover() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bApproverAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
index b1854476a97..0ae0260d03d 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
@@ -6,10 +6,7 @@
 
 import * as sampleData from '../../sample-data/b2b-order-attachments';
 import { POWERTOOLS_BASESITE } from '../../sample-data/b2b-checkout';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
-
 export function loginB2bUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
index 8b375506dc4..d6219db1e2c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
@@ -7,8 +7,6 @@
 import * as sampleData from '../../sample-data/b2b-order-details';
 import { unitLevelOrder } from '../../sample-data/b2b-order-details';
 import { waitForPage } from '../navigation';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
-
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
     '/my-account/approval-dashboard',
@@ -20,12 +18,10 @@ export function visitOrderApprovalListPage() {
 }
 
 export function loginB2bUnitOrderViewer() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bCommonUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
index 13ba3586acc..a411579077b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
@@ -5,25 +5,19 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-history';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
-
 export function loginB2bUnitOrderViewer() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bUnitOrderViewer2() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount2);
 }
 
 export function loginB2bUnitOrderViewerManager() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerManagerAccount);
 }
 
 export function loginB2bCommonUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bCommonUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index 5d6b61892bf..8cfabe299d5 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -6,37 +6,6 @@
 
 const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 
-/**
- * Stubs the two OCC endpoints introduced by the B2B Unit Selection feature.
- *
- * `B2bUnitSelectorComponent` is placed in `SiteContextSlot` and fires these
- * requests on every B2B page load. Tests that do not exercise the unit
- * selection dialog should call this helper before `cy.requireLoggedIn()` so
- * that the requests are intercepted before the app bootstraps.
- *
- * Intercepted endpoints:
- *  - GET …/orgUsers/{userId}/orgUnits (loadOrgUnits)    → empty list, no dialog
- *  - GET …/orgUsers/{userId}           (loadDefaultOrgUnitName) → minimal stub
- */
-export function stubB2bUnitSelectionApis(): void {
-  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${Cypress.env('BASE_SITE')}`;
-
-  // Use pathname-based matching to avoid glob ambiguity with query strings
-  // (e.g. ?lang=en&curr=USD appended by OccEndpointsService).
-  //
-  // Register the more-specific /orgUnits path first so Cypress routes it
-  // before the broader orgUsers/{userId} rule below.
-  cy.intercept(
-    { method: 'GET', pathname: `${occPrefix}/orgUsers/*/orgUnits` },
-    { statusCode: 200, body: { orgUnits: [] } }
-  ).as('stubOrgUserUnits');
-
-  cy.intercept(
-    { method: 'GET', pathname: `${occPrefix}/orgUsers/*` },
-    { statusCode: 200, body: { orgUnit: { uid: 'Rustic', name: 'Rustic' } } }
-  ).as('stubOrgUser');
-}
-
 /**
  * Confirms the B2B Unit selection dialog if it appears within a short timeout.
  *
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
index 4390e3a7c08..5664e3cf3f0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
@@ -7,10 +7,7 @@
 import { POWERTOOLS_BASESITE } from '../../../sample-data/b2b-checkout';
 import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
-import {
-  confirmB2bUnitSelectionDialogIfPresent,
-  stubB2bUnitSelectionApis,
-} from '../b2b-unit-selection';
+import { confirmB2bUnitSelectionDialogIfPresent } from '../b2b-unit-selection';
 import { ENTITY_UID_COOKIE_KEY, MyCompanyConfig } from './models/index';
 import {
   testCoreFeaturesFromConfig,
@@ -73,7 +70,6 @@ export function loginAsMyCompanyAdmin(): void {
   var minWait = 750;
   var maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(myCompanyAdminUser);
   confirmB2bUnitSelectionDialogIfPresent();
 }

From 040bb57a983c38d48c33609996e010972af01ef8 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 21:06:21 +0800
Subject: [PATCH 34/60] fix

fix
---
 .../a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts   |  2 ++
 ...2b.replenishment.a11y-e2e-spec-flaky.cy.ts |  2 ++
 .../e2e/a11y/helpers/a11y-b2b.checkout.ts     |  3 +++
 .../e2e/b2b/regression/asm/asm.core-e2e.cy.ts |  2 ++
 .../helpers/b2b/b2b-account-summary.ts        |  3 +++
 .../cypress/helpers/b2b/b2b-checkout.ts       |  6 ++++-
 .../cypress/helpers/b2b/b2b-order-approval.ts |  3 +++
 .../helpers/b2b/b2b-order-attachments.ts      |  3 +++
 .../cypress/helpers/b2b/b2b-order-details.ts  |  4 +++
 .../cypress/helpers/b2b/b2b-order-history.ts  |  6 +++++
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 26 +++++++++++++++++++
 .../b2b/my-company/my-company.utils.ts        |  6 ++++-
 12 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
index 4daea3ea91b..a2145bbcd20 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
@@ -7,6 +7,7 @@
 import * as sampleData from '../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 import { isolateTestsBefore } from '../../../support/utils/test-isolation';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
   isolateTestsBefore();
@@ -16,6 +17,7 @@ describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
 
   before(() => {
     cy.a11yContinuumSetup();
+    stubB2bUnitSelectionApis();
     cy.requireLoggedIn();
     cy.visit('/my-account/quick-order');
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
index 64f20e77fed..bab7120484b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
@@ -16,6 +16,7 @@ import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { addB2bUser, setB2bPassword } from '../../../helpers/b2b/b2b-checkout';
 import { login } from '../../../support/utils/login';
 import { getSampleUser } from '../../../sample-data/checkout-flow';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 function loginB2bUser() {
   let adminToken;
@@ -35,6 +36,7 @@ function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
index 5373def48f7..7a3fb620021 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
@@ -13,6 +13,8 @@ import {
   POWERTOOLS_BASESITE,
   products,
 } from '../../../sample-data/b2b-checkout';
+import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
+
 export function loginB2bUser() {
   let adminToken;
   let user = getSampleUser();
@@ -31,6 +33,7 @@ export function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
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 a3325c101b9..a8e44f9370a 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
@@ -17,6 +17,7 @@ import {
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
+import { stubB2bUnitSelectionApis } from '../../../../helpers/b2b/b2b-unit-selection';
 context('B2B - Assisted Service Module', () => {
   const customer = getASMB2BCustomer();
   const b2bAgent = getB2BAgent();
@@ -42,6 +43,7 @@ context('B2B - Assisted Service Module', () => {
       });
 
       cy.log('--> Agent logging in');
+      stubB2bUnitSelectionApis();
       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/b2b/b2b-account-summary.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
index 2174dc0cd59..d749c883313 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
@@ -13,6 +13,8 @@ import {
   AccountData,
   RegistrationData,
 } from '../../support/require-logged-in.commands';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
+
 export function loginAsAdmin() {
   const linda = 'linda.wolf@pronto-hw.com';
   const registrationData: RegistrationData = {
@@ -143,6 +145,7 @@ function login(user: AccountData) {
   const minWait = 750;
   const maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(user);
 }
 
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 8b19f1a726b..0757f6242ff 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -41,7 +41,10 @@ import {
   waitForProductPage,
 } from '../checkout-flow';
 import { waitForPage } from '../navigation';
-import { confirmB2bUnitSelectionDialogIfPresent } from './b2b-unit-selection';
+import {
+  confirmB2bUnitSelectionDialogIfPresent,
+  stubB2bUnitSelectionApis,
+} from './b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -65,6 +68,7 @@ export function loginB2bUser() {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
 
+      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
index 1666825a257..fdea1c941d9 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
@@ -13,6 +13,7 @@ import {
   rejectedOrderDetails,
 } from '../../sample-data/b2b-order-approval';
 import { waitForPage } from '../navigation';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
@@ -35,10 +36,12 @@ export function visitOrderApprovalDetailPage() {
 }
 
 export function loginB2bUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
 export function loginB2bApprover() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bApproverAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
index 0ae0260d03d..b1854476a97 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
@@ -6,7 +6,10 @@
 
 import * as sampleData from '../../sample-data/b2b-order-attachments';
 import { POWERTOOLS_BASESITE } from '../../sample-data/b2b-checkout';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
+
 export function loginB2bUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
index d6219db1e2c..8b375506dc4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
@@ -7,6 +7,8 @@
 import * as sampleData from '../../sample-data/b2b-order-details';
 import { unitLevelOrder } from '../../sample-data/b2b-order-details';
 import { waitForPage } from '../navigation';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
+
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
     '/my-account/approval-dashboard',
@@ -18,10 +20,12 @@ export function visitOrderApprovalListPage() {
 }
 
 export function loginB2bUnitOrderViewer() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bCommonUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
index a411579077b..13ba3586acc 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
@@ -5,19 +5,25 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-history';
+import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
+
 export function loginB2bUnitOrderViewer() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bUnitOrderViewer2() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount2);
 }
 
 export function loginB2bUnitOrderViewerManager() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerManagerAccount);
 }
 
 export function loginB2bCommonUser() {
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bCommonUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
index 8cfabe299d5..6663da58cc0 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
@@ -6,6 +6,32 @@
 
 const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
 
+/**
+ * Stubs the OCC endpoint used by the B2B Unit Selection feature to load the
+ * user's assignable org units.
+ *
+ * `B2bUnitSelectorComponent` is placed in `SiteContextSlot` and fires this
+ * request on every B2B page load when the feature is enabled. Tests that do
+ * not exercise the unit selection dialog should call this helper before
+ * `cy.requireLoggedIn()` so that the request is intercepted before the app
+ * bootstraps and the response returns an empty list (preventing the dialog
+ * from appearing).
+ *
+ * Uses `pathname`-based matching (instead of `path`) so the wildcard does not
+ * accidentally match the broader `orgUsers/{userId}` profile endpoint.
+ *
+ * Intercepted endpoint:
+ *  - GET …/orgUsers/{userId}/orgUnits  (loadOrgUnits) → empty list, no dialog
+ */
+export function stubB2bUnitSelectionApis(): void {
+  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${Cypress.env('BASE_SITE')}`;
+
+  cy.intercept(
+    { method: 'GET', pathname: `${occPrefix}/orgUsers/*/orgUnits` },
+    { statusCode: 200, body: { orgUnits: [] } }
+  ).as('stubOrgUserUnits');
+}
+
 /**
  * Confirms the B2B Unit selection dialog if it appears within a short timeout.
  *
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
index 5664e3cf3f0..4390e3a7c08 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
@@ -7,7 +7,10 @@
 import { POWERTOOLS_BASESITE } from '../../../sample-data/b2b-checkout';
 import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
-import { confirmB2bUnitSelectionDialogIfPresent } from '../b2b-unit-selection';
+import {
+  confirmB2bUnitSelectionDialogIfPresent,
+  stubB2bUnitSelectionApis,
+} from '../b2b-unit-selection';
 import { ENTITY_UID_COOKIE_KEY, MyCompanyConfig } from './models/index';
 import {
   testCoreFeaturesFromConfig,
@@ -70,6 +73,7 @@ export function loginAsMyCompanyAdmin(): void {
   var minWait = 750;
   var maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
+  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(myCompanyAdminUser);
   confirmB2bUnitSelectionDialogIfPresent();
 }

From c3b5e563e08a957410ba321bf19796cb905217c4 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 29 Jul 2026 23:39:23 +0800
Subject: [PATCH 35/60] fix

fix
---
 .../cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts     | 8 ++++++--
 .../cypress/helpers/b2b/b2b-checkout.ts                   | 2 +-
 2 files changed, 7 insertions(+), 3 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 a8e44f9370a..5861316e3be 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
@@ -17,7 +17,10 @@ import {
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
-import { stubB2bUnitSelectionApis } from '../../../../helpers/b2b/b2b-unit-selection';
+import {
+  confirmB2bUnitSelectionDialogIfPresent,
+  stubB2bUnitSelectionApis,
+} from '../../../../helpers/b2b/b2b-unit-selection';
 context('B2B - Assisted Service Module', () => {
   const customer = getASMB2BCustomer();
   const b2bAgent = getB2BAgent();
@@ -43,7 +46,6 @@ context('B2B - Assisted Service Module', () => {
       });
 
       cy.log('--> Agent logging in');
-      stubB2bUnitSelectionApis();
       checkout.visitHomePage('asm=true');
       cy.get('cx-asm-main-ui').should('exist');
       cy.get('cx-asm-main-ui').should('be.visible');
@@ -56,7 +58,9 @@ context('B2B - Assisted Service Module', () => {
         agentLoginForJDK21(b2bAgent.userName, b2bAgent.password);
       });
       cy.log('--> Agent emulate customer');
+      stubB2bUnitSelectionApis();
       asm.startCustomerEmulation(customer, true);
+      confirmB2bUnitSelectionDialogIfPresent();
 
       addB2bProductToCartAndCheckout();
 
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 0757f6242ff..1db96c6281c 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -72,8 +72,8 @@ export function loginB2bUser() {
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
-      confirmB2bUnitSelectionDialogIfPresent();
       visitHomePage();
+      confirmB2bUnitSelectionDialogIfPresent();
       cy.get('.cx-login-greet').should('contain', user.fullName);
     });
 }

From ffadd1e38e0e2a08914bbf7ef3e4ebbc46c4f883 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 00:05:00 +0800
Subject: [PATCH 36/60] fix

fix
---
 .../cypress/helpers/b2b/b2b-checkout.ts                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1db96c6281c..8e006567590 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -68,11 +68,11 @@ export function loginB2bUser() {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
 
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     })
     .then(() => {
       visitHomePage();
+      stubB2bUnitSelectionApis();
       confirmB2bUnitSelectionDialogIfPresent();
       cy.get('.cx-login-greet').should('contain', user.fullName);
     });

From 7045ad2d004a490683724b8ea2e9b84eb34f40d4 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 08:56:52 +0800
Subject: [PATCH 37/60] fix(e2e): make homepage intercept robust to
 query-parameter ordering

Replace the fragile `path` glob pattern for the homepage CMS intercept
with a `pathname`-only match in `waitForPage('homepage')`.

The previous pattern:
  path: `.../users/*/cms/pages?lang=en&curr=*`
relied on the query string being serialised as `?lang=en&curr=...`.
Adding the B2bUnitSelection feature module changes how Angular merges
OccConfig providers, which can alter the HttpParams serialisation order
(e.g. `?curr=USD&lang=en`), causing the glob to never match and the
`cy.wait('@getHomePage')` to time out with "No request ever occurred".

The homepage CMS request is uniquely identified by the pathname alone
(it carries no `pageLabelOrId` or `pageType` parameter), so switching
to a `pathname`-only intercept is both correct and resilient to any
future changes in query-string ordering.
---
 .../storefrontapp-e2e-cypress/cypress/helpers/navigation.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
index 33b1ed0ab30..8681cfe0b29 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
@@ -38,9 +38,9 @@ export function waitForPage(page: string, alias: string): string {
     page === 'homepage'
       ? {
           method: 'GET',
-          path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
             'BASE_SITE'
-          )}/${cmsEndpoints.pages}?lang=en&curr=*`,
+          )}/${cmsEndpoints.pages}`,
         }
       : {
           method: 'GET',

From 018e324b49ec6bdb5df8bf2fbdc1555d886d1c51 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 09:19:11 +0800
Subject: [PATCH 38/60] Revert "fix(e2e): make homepage intercept robust to
 query-parameter ordering"

This reverts commit 7045ad2d004a490683724b8ea2e9b84eb34f40d4.
---
 .../storefrontapp-e2e-cypress/cypress/helpers/navigation.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
index 8681cfe0b29..33b1ed0ab30 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
@@ -38,9 +38,9 @@ export function waitForPage(page: string, alias: string): string {
     page === 'homepage'
       ? {
           method: 'GET',
-          pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
             'BASE_SITE'
-          )}/${cmsEndpoints.pages}`,
+          )}/${cmsEndpoints.pages}?lang=en&curr=*`,
         }
       : {
           method: 'GET',

From 24bd89c10ca855e99167fb72d6d9f139a938c2d3 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 09:24:14 +0800
Subject: [PATCH 39/60] fix

fix
---
 ...stract-b2b-unit-selector.component.spec.ts | 26 ++++++++++++++
 .../abstract-b2b-unit-selector.component.ts   | 36 ++++++++++++++-----
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
index 61d1b11c946..985345b1cea 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -107,6 +107,32 @@ describe('AbstractB2bUnitSelectorComponent', () => {
     });
   });
 
+  describe('signal initialisation when disabled', () => {
+    it('should expose static empty signal for items when feature is disabled', () => {
+      createComponent(false, []);
+      fixture.detectChanges();
+
+      // items() must return an empty array without subscribing to stateService.orgUnits$
+      expect(component.items()).toEqual([]);
+    });
+
+    it('should expose static null signal for activeUnitName when feature is disabled', () => {
+      createComponent(false, []);
+      fixture.detectChanges();
+
+      expect(component.activeUnitName()).toBeNull();
+    });
+
+    it('hasAnyUnit and hasMultipleUnits should both be false when disabled', () => {
+      createComponent(false, mockUnits);
+      fixture.detectChanges();
+
+      // Even though stateService holds units, the static signal stays empty
+      expect(component.hasAnyUnit()).toBeFalse();
+      expect(component.hasMultipleUnits()).toBeFalse();
+    });
+  });
+
   describe('ngOnInit()', () => {
     it('should NOT load units when feature is disabled', () => {
       createComponent(false, []);
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 70eed617aa3..0b29b68b449 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { computed, Directive, inject, OnInit } from '@angular/core';
+import { computed, Directive, inject, OnInit, signal } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { Store } from '@ngrx/store';
 import { B2BUnit, UserIdService } from '@spartacus/core';
@@ -32,15 +32,33 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected connector = inject(B2bUnitSelectionConnector);
   protected config = inject(B2bUnitSelectionConfig);
 
-  /** All assignable B2B units for the current user. */
-  readonly items = toSignal(this.stateService.orgUnits$, {
-    initialValue: [] as B2BUnit[],
-  });
+  /**
+   * Whether the B2B unit selection feature is enabled.
+   * Evaluated once at construction time so signal creation can be gated on it.
+   */
+  protected readonly enabled = this.config.b2bUnitSelection?.enabled ?? false;
+
+  /**
+   * All assignable B2B units for the current user.
+   *
+   * When the feature is disabled we use a static `signal([])` rather than
+   * `toSignal(observable)` to avoid creating any RxJS subscription.  In
+   * Angular 21 the signal-reactive scheduler (backed by `queueMicrotask`)
+   * is patched by Zone.js; a live `toSignal` subscription can therefore
+   * prevent `ApplicationRef.isStable` from emitting `true`, which in turn
+   * blocks Cypress' `cy.wait()` from resolving — causing test timeouts even
+   * when `enabled = false` and no HTTP requests are issued.
+   */
+  readonly items = this.enabled
+    ? toSignal(this.stateService.orgUnits$, { initialValue: [] as B2BUnit[] })
+    : signal([] as B2BUnit[]);
 
   /** Currently active (default) unit name. */
-  readonly activeUnitName = toSignal(this.stateService.activeUnitName$, {
-    initialValue: null as string | null,
-  });
+  readonly activeUnitName = this.enabled
+    ? toSignal(this.stateService.activeUnitName$, {
+        initialValue: null as string | null,
+      })
+    : signal(null as string | null);
 
   /** True when the user has more than one unit — selector is interactive. */
   readonly hasMultipleUnits = computed(() => this.items().length > 1);
@@ -49,7 +67,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   readonly hasAnyUnit = computed(() => this.items().length > 0);
 
   ngOnInit(): void {
-    if (!this.config.b2bUnitSelection?.enabled) {
+    if (!this.enabled) {
       return;
     }
     // After a page refresh the BehaviorSubject is empty (effects may not have written yet).

From a5c0e63723611ef82fd7de3d63ce7d9709cef3bf Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:22:10 +0800
Subject: [PATCH 40/60] fix

fix
---
 .../b2b-unit-selection.effects.spec.ts        | 21 +++++++-
 .../effects/b2b-unit-selection.effects.ts     | 53 ++++++++++++-------
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 8786bb556a4..77331868757 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -392,8 +392,27 @@ describe('B2bUnitSelectionEffects (feature disabled)', () => {
   it('checkOrgUnitsOnLogin$ should return EMPTY when the feature is disabled', () => {
     const action = new AuthActions.Login();
     actions$ = hot('-a', { a: action });
-    const expected = cold('-');
+    const expected = cold('|');
 
     expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
   });
+
+  it('setDefaultOrgUnit$ should return EMPTY when the feature is disabled', () => {
+    const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
+      userId: 'current',
+      unitName: 'Rustic',
+    });
+    actions$ = hot('-a', { a: action });
+    const expected = cold('|');
+
+    expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
+  });
+
+  it('clearOnLogout$ should return EMPTY when the feature is disabled', () => {
+    const action = new AuthActions.Logout();
+    actions$ = hot('-a', { a: action });
+    const expected = cold('|');
+
+    expect(effects.clearOnLogout$).toBeObservable(expected);
+  });
 });
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 6714bf64499..1572729e5f2 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -52,18 +52,24 @@ export class B2bUnitSelectionEffects {
    * 2. OAuth Authorization Code Flow or page-refresh token restore:
    *    ApplicationRef.components may be empty; polling waits for AppComponent to mount
    *    before opening the dialog.
+   *
+   * When the feature is disabled the effect factory returns EMPTY so NgRx never
+   * subscribes to `actions$`.  A persistent `actions$` subscription keeps
+   * Angular's zone perpetually unstable (via Zone.js-patched scheduler internals),
+   * which prevents `ApplicationRef.isStable` from emitting `true` and causes
+   * Cypress `cy.wait()` to time out even when no HTTP requests are issued.
    */
   checkOrgUnitsOnLogin$: Observable<
     | B2bUnitSelectionActions.LoadUserOrgUnitsSuccess
     | B2bUnitSelectionActions.LoadUserOrgUnitsFail
-  > = createEffect(() =>
-    this.actions$.pipe(
+  > = createEffect(() => {
+    if (!this.config.b2bUnitSelection?.enabled) {
+      return EMPTY;
+    }
+    return this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
-      exhaustMap(() => {
-        if (!this.config.b2bUnitSelection?.enabled) {
-          return EMPTY;
-        }
-        return this.userIdService.takeUserId(true).pipe(
+      exhaustMap(() =>
+        this.userIdService.takeUserId(true).pipe(
           switchMap((userId) =>
             forkJoin({
               orgUnits: this.connector.loadOrgUnits(userId),
@@ -94,21 +100,26 @@ export class B2bUnitSelectionEffects {
             )
           ),
           catchError(() => EMPTY)
-        );
-      })
-    )
-  );
+        )
+      )
+    );
+  });
 
   /**
    * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
    * On success, closes the dialog, updates the header selector state, and reloads
    * the page so all org-context-dependent data (prices, catalog, CMS) is refreshed.
+   *
+   * Returns EMPTY when disabled so no `actions$` subscription is created.
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
     | B2bUnitSelectionActions.SetDefaultOrgUnitFail
-  > = createEffect(() =>
-    this.actions$.pipe(
+  > = createEffect(() => {
+    if (!this.config.b2bUnitSelection?.enabled) {
+      return EMPTY;
+    }
+    return this.actions$.pipe(
       ofType<B2bUnitSelectionActions.SetDefaultOrgUnit>(
         B2bUnitSelectionActions.SET_DEFAULT_ORG_UNIT
       ),
@@ -141,22 +152,28 @@ export class B2bUnitSelectionEffects {
           )
         )
       )
-    )
-  );
+    );
+  });
 
   /**
    * Listens for LOGOUT and clears the state service so the Company selector
    * is hidden after the user logs out.
+   *
+   * Returns EMPTY when disabled so no `actions$` subscription is created.
    */
   clearOnLogout$ = createEffect(
-    () =>
-      this.actions$.pipe(
+    () => {
+      if (!this.config.b2bUnitSelection?.enabled) {
+        return EMPTY;
+      }
+      return this.actions$.pipe(
         ofType<AuthActions.Logout>(AuthActions.LOGOUT),
         tap(() => {
           this.stateService.setOrgUnits([]);
           this.stateService.setActiveUnit(null);
         })
-      ),
+      );
+    },
     { dispatch: false }
   );
 

From 540be6b6c59ad3be604b38b68f5f9d436bf68bc3 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 13:44:32 +0800
Subject: [PATCH 41/60] fix

fix
---
 .../abstract-b2b-unit-selector.component.ts   | 57 ++++++++++++-------
 .../effects/b2b-unit-selection.effects.ts     | 17 ++++--
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 0b29b68b449..622df03563e 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -4,7 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { computed, Directive, inject, OnInit, signal } from '@angular/core';
+import {
+  computed,
+  Directive,
+  inject,
+  NgZone,
+  OnInit,
+  signal,
+} from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { Store } from '@ngrx/store';
 import { B2BUnit, UserIdService } from '@spartacus/core';
@@ -31,6 +38,7 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected userIdService = inject(UserIdService);
   protected connector = inject(B2bUnitSelectionConnector);
   protected config = inject(B2bUnitSelectionConfig);
+  protected ngZone = inject(NgZone);
 
   /**
    * Whether the B2B unit selection feature is enabled.
@@ -96,25 +104,34 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   }
 
   private loadAndPopulateState(): void {
-    this.userIdService
-      .takeUserId(true)
-      .pipe(
-        take(1),
-        switchMap((userId) =>
-          forkJoin({
-            // Gracefully degrade on error so the component never blocks page rendering.
-            orgUnits: this.connector
-              .loadOrgUnits(userId)
-              .pipe(catchError(() => of([] as B2BUnit[]))),
-            defaultUnitName: this.connector
-              .loadDefaultOrgUnitName(userId)
-              .pipe(catchError(() => of(undefined))),
-          })
+    // Run the HTTP requests outside Angular's zone so the pending subscription
+    // does not prevent ApplicationRef.isStable from emitting true.
+    // This mirrors the pattern used in B2bUnitSelectionEffects.openDialogWhenReady().
+    // Without this, Cypress cy.wait() calls time out because the zone never
+    // stabilises while these requests are in-flight.
+    this.ngZone.runOutsideAngular(() => {
+      this.userIdService
+        .takeUserId(true)
+        .pipe(
+          take(1),
+          switchMap((userId) =>
+            forkJoin({
+              // Gracefully degrade on error so the component never blocks page rendering.
+              orgUnits: this.connector
+                .loadOrgUnits(userId)
+                .pipe(catchError(() => of([] as B2BUnit[]))),
+              defaultUnitName: this.connector
+                .loadDefaultOrgUnitName(userId)
+                .pipe(catchError(() => of(undefined))),
+            })
+          )
         )
-      )
-      .subscribe(({ orgUnits, defaultUnitName }) => {
-        this.stateService.setOrgUnits(orgUnits);
-        this.stateService.setActiveUnit(defaultUnitName ?? null);
-      });
+        .subscribe(({ orgUnits, defaultUnitName }) => {
+          this.ngZone.run(() => {
+            this.stateService.setOrgUnits(orgUnits);
+            this.stateService.setActiveUnit(defaultUnitName ?? null);
+          });
+        });
+    });
   }
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 1572729e5f2..89d4e335cd6 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -16,7 +16,16 @@ import {
   WindowRef,
 } from '@spartacus/core';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-import { EMPTY, forkJoin, interval, Observable, of, race, timer } from 'rxjs';
+import {
+  defer,
+  EMPTY,
+  forkJoin,
+  interval,
+  Observable,
+  of,
+  race,
+  timer,
+} from 'rxjs';
 import {
   catchError,
   exhaustMap,
@@ -64,7 +73,7 @@ export class B2bUnitSelectionEffects {
     | B2bUnitSelectionActions.LoadUserOrgUnitsFail
   > = createEffect(() => {
     if (!this.config.b2bUnitSelection?.enabled) {
-      return EMPTY;
+      return defer(() => EMPTY);
     }
     return this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
@@ -117,7 +126,7 @@ export class B2bUnitSelectionEffects {
     | B2bUnitSelectionActions.SetDefaultOrgUnitFail
   > = createEffect(() => {
     if (!this.config.b2bUnitSelection?.enabled) {
-      return EMPTY;
+      return defer(() => EMPTY);
     }
     return this.actions$.pipe(
       ofType<B2bUnitSelectionActions.SetDefaultOrgUnit>(
@@ -164,7 +173,7 @@ export class B2bUnitSelectionEffects {
   clearOnLogout$ = createEffect(
     () => {
       if (!this.config.b2bUnitSelection?.enabled) {
-        return EMPTY;
+        return defer(() => EMPTY);
       }
       return this.actions$.pipe(
         ofType<AuthActions.Logout>(AuthActions.LOGOUT),

From 57fbafb051c11197b237dbe7aac732a674ad13f1 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 17:54:51 +0800
Subject: [PATCH 42/60] revert(e2e): remove b2b-unit-selection stubs from
 existing tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The feature flag `b2bUnitSelection.enabled` defaults to false, which means
zero API calls and zero zone impact — no stubs or dialog interactions are
needed in existing B2B tests.
---
 .../cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts    | 2 --
 .../a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts   | 2 --
 .../cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts          | 2 --
 .../cypress/e2e/b2b/regression/asm/asm.core-e2e.cy.ts      | 7 +------
 .../cypress/helpers/b2b/b2b-account-summary.ts             | 2 --
 .../cypress/helpers/b2b/b2b-checkout.ts                    | 6 ------
 .../cypress/helpers/b2b/b2b-order-approval.ts              | 3 ---
 .../cypress/helpers/b2b/b2b-order-attachments.ts           | 2 --
 .../cypress/helpers/b2b/b2b-order-details.ts               | 3 ---
 .../cypress/helpers/b2b/b2b-order-history.ts               | 5 -----
 .../cypress/helpers/b2b/my-company/my-company.utils.ts     | 6 ------
 11 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
index a2145bbcd20..4daea3ea91b 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b-quick-order.a11y-e2e.cy.ts
@@ -7,7 +7,6 @@
 import * as sampleData from '../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 import { isolateTestsBefore } from '../../../support/utils/test-isolation';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
   isolateTestsBefore();
@@ -17,7 +16,6 @@ describe('B2B Quick Order Accessibility', { testIsolation: false }, () => {
 
   before(() => {
     cy.a11yContinuumSetup();
-    stubB2bUnitSelectionApis();
     cy.requireLoggedIn();
     cy.visit('/my-account/quick-order');
   });
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
index bab7120484b..64f20e77fed 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2b/b2b.replenishment.a11y-e2e-spec-flaky.cy.ts
@@ -16,7 +16,6 @@ import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { addB2bUser, setB2bPassword } from '../../../helpers/b2b/b2b-checkout';
 import { login } from '../../../support/utils/login';
 import { getSampleUser } from '../../../sample-data/checkout-flow';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 function loginB2bUser() {
   let adminToken;
@@ -36,7 +35,6 @@ function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
index 7a3fb620021..4c0057f60a5 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/helpers/a11y-b2b.checkout.ts
@@ -13,7 +13,6 @@ import {
   POWERTOOLS_BASESITE,
   products,
 } from '../../../sample-data/b2b-checkout';
-import { stubB2bUnitSelectionApis } from '../../../helpers/b2b/b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -33,7 +32,6 @@ export function loginB2bUser() {
     .then((result: any) => {
       b2bUser.registrationData.email = user.email;
       b2bUser.registrationData.password = user.password;
-      stubB2bUnitSelectionApis();
       return cy.requireLoggedIn(b2bUser);
     });
 }
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 5861316e3be..d53fdc5203a 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
@@ -17,10 +17,7 @@ import {
 import { POWERTOOLS_BASESITE } from '../../../../sample-data/b2b-checkout';
 import { clearAllStorage } from '../../../../support/utils/clear-all-storage';
 import { interceptGet } from '../../../../support/utils/intercept';
-import {
-  confirmB2bUnitSelectionDialogIfPresent,
-  stubB2bUnitSelectionApis,
-} from '../../../../helpers/b2b/b2b-unit-selection';
+
 context('B2B - Assisted Service Module', () => {
   const customer = getASMB2BCustomer();
   const b2bAgent = getB2BAgent();
@@ -58,9 +55,7 @@ context('B2B - Assisted Service Module', () => {
         agentLoginForJDK21(b2bAgent.userName, b2bAgent.password);
       });
       cy.log('--> Agent emulate customer');
-      stubB2bUnitSelectionApis();
       asm.startCustomerEmulation(customer, true);
-      confirmB2bUnitSelectionDialogIfPresent();
 
       addB2bProductToCartAndCheckout();
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
index d749c883313..bb75dec27fa 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-account-summary.ts
@@ -13,7 +13,6 @@ import {
   AccountData,
   RegistrationData,
 } from '../../support/require-logged-in.commands';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginAsAdmin() {
   const linda = 'linda.wolf@pronto-hw.com';
@@ -145,7 +144,6 @@ function login(user: AccountData) {
   const minWait = 750;
   const maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(user);
 }
 
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 8e006567590..ff29b3b18e3 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-checkout.ts
@@ -41,10 +41,6 @@ import {
   waitForProductPage,
 } from '../checkout-flow';
 import { waitForPage } from '../navigation';
-import {
-  confirmB2bUnitSelectionDialogIfPresent,
-  stubB2bUnitSelectionApis,
-} from './b2b-unit-selection';
 
 export function loginB2bUser() {
   let adminToken;
@@ -72,8 +68,6 @@ export function loginB2bUser() {
     })
     .then(() => {
       visitHomePage();
-      stubB2bUnitSelectionApis();
-      confirmB2bUnitSelectionDialogIfPresent();
       cy.get('.cx-login-greet').should('contain', user.fullName);
     });
 }
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
index fdea1c941d9..1666825a257 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-approval.ts
@@ -13,7 +13,6 @@ import {
   rejectedOrderDetails,
 } from '../../sample-data/b2b-order-approval';
 import { waitForPage } from '../navigation';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
@@ -36,12 +35,10 @@ export function visitOrderApprovalDetailPage() {
 }
 
 export function loginB2bUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
 export function loginB2bApprover() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bApproverAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
index b1854476a97..5d3e47f3723 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-attachments.ts
@@ -6,10 +6,8 @@
 
 import * as sampleData from '../../sample-data/b2b-order-attachments';
 import { POWERTOOLS_BASESITE } from '../../sample-data/b2b-checkout';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginB2bUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
index 8b375506dc4..b98e98e7213 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-details.ts
@@ -7,7 +7,6 @@
 import * as sampleData from '../../sample-data/b2b-order-details';
 import { unitLevelOrder } from '../../sample-data/b2b-order-details';
 import { waitForPage } from '../navigation';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function visitOrderApprovalListPage() {
   const alias = waitForPage(
@@ -20,12 +19,10 @@ export function visitOrderApprovalListPage() {
 }
 
 export function loginB2bUnitOrderViewer() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bCommonUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
index 13ba3586acc..1bbf929e989 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-order-history.ts
@@ -5,25 +5,20 @@
  */
 
 import * as sampleData from '../../sample-data/b2b-order-history';
-import { stubB2bUnitSelectionApis } from './b2b-unit-selection';
 
 export function loginB2bUnitOrderViewer() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount);
 }
 
 export function loginB2bUnitOrderViewer2() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerAccount2);
 }
 
 export function loginB2bUnitOrderViewerManager() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bUnitOrderViewerManagerAccount);
 }
 
 export function loginB2bCommonUser() {
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(sampleData.b2bCommonUserAccount);
 }
 
diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
index 4390e3a7c08..edf709c87d4 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/my-company.utils.ts
@@ -7,10 +7,6 @@
 import { POWERTOOLS_BASESITE } from '../../../sample-data/b2b-checkout';
 import { myCompanyAdminUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
-import {
-  confirmB2bUnitSelectionDialogIfPresent,
-  stubB2bUnitSelectionApis,
-} from '../b2b-unit-selection';
 import { ENTITY_UID_COOKIE_KEY, MyCompanyConfig } from './models/index';
 import {
   testCoreFeaturesFromConfig,
@@ -73,9 +69,7 @@ export function loginAsMyCompanyAdmin(): void {
   var minWait = 750;
   var maxWait = 1500;
   cy.wait(Math.floor(Math.random() * (maxWait - minWait) + minWait));
-  stubB2bUnitSelectionApis();
   cy.requireLoggedIn(myCompanyAdminUser);
-  confirmB2bUnitSelectionDialogIfPresent();
 }
 
 /**

From 72cc9a161b4050d9f026fe90c713819767828a94 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 18:03:35 +0800
Subject: [PATCH 43/60] revert(e2e): remove unused b2b-unit-selection test
 helper

No test imports this file and the feature is disabled by default.
Will be added when dedicated tests are written for the feature.
---
 .../cypress/helpers/b2b/b2b-unit-selection.ts | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
deleted file mode 100644
index 6663da58cc0..00000000000
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/b2b-unit-selection.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const B2B_UNIT_SELECTION_DIALOG = 'cx-b2b-unit-selection-dialog';
-
-/**
- * Stubs the OCC endpoint used by the B2B Unit Selection feature to load the
- * user's assignable org units.
- *
- * `B2bUnitSelectorComponent` is placed in `SiteContextSlot` and fires this
- * request on every B2B page load when the feature is enabled. Tests that do
- * not exercise the unit selection dialog should call this helper before
- * `cy.requireLoggedIn()` so that the request is intercepted before the app
- * bootstraps and the response returns an empty list (preventing the dialog
- * from appearing).
- *
- * Uses `pathname`-based matching (instead of `path`) so the wildcard does not
- * accidentally match the broader `orgUsers/{userId}` profile endpoint.
- *
- * Intercepted endpoint:
- *  - GET …/orgUsers/{userId}/orgUnits  (loadOrgUnits) → empty list, no dialog
- */
-export function stubB2bUnitSelectionApis(): void {
-  const occPrefix = `${Cypress.env('OCC_PREFIX')}/${Cypress.env('BASE_SITE')}`;
-
-  cy.intercept(
-    { method: 'GET', pathname: `${occPrefix}/orgUsers/*/orgUnits` },
-    { statusCode: 200, body: { orgUnits: [] } }
-  ).as('stubOrgUserUnits');
-}
-
-/**
- * Confirms the B2B Unit selection dialog if it appears within a short timeout.
- *
- * The dialog is shown after login when the feature `b2bUnitSelection.enabled` is true
- * and the user belongs to at least one org unit. E2E tests that do not specifically
- * test this dialog should call this helper right after the B2B login step so that the
- * dialog does not block subsequent test interactions.
- *
- * If the dialog does not appear (feature disabled / user has no units), this helper
- * is a no-op.
- *
- * A 500ms wait is included to account for the async 50ms polling interval in the
- * effect that opens the dialog after login, preventing a race condition where the
- * dialog has not yet appeared at the time of the DOM check.
- */
-export function confirmB2bUnitSelectionDialogIfPresent(): void {
-  cy.wait(500);
-  cy.get('body').then(($body) => {
-    if ($body.find(B2B_UNIT_SELECTION_DIALOG).length > 0) {
-      cy.get(B2B_UNIT_SELECTION_DIALOG).find('button.btn-primary').click();
-    }
-  });
-}

From 59286a170c5a8e2757123bcb6670da72d7ce1e70 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 18:31:42 +0800
Subject: [PATCH 44/60] fix(e2e): make homepage intercept robust to
 query-parameter ordering

Angular serialises HttpParams by iterating over the merged OCC config
object.  Adding new endpoint keys (e.g. from B2bUnitSelectionOccModule)
changes the object's key-iteration order, flipping the homepage CMS
request from ?lang=en&curr=USD to ?curr=USD&lang=en.  A glob-based
`path` pattern fails to match the reordered URL and causes
cy.wait('@getHomePage') to time out.

Switch the homepage intercept to `pathname` + `query: { lang: 'en' }`
so it matches regardless of parameter order.  The lang=en guard avoids
false-positives on non-homepage CMS requests that also lack a
pageLabelOrId parameter.
---
 .../cypress/helpers/navigation.ts                   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
index 33b1ed0ab30..67eee2aa249 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
@@ -34,13 +34,22 @@ export const navigation = {
  */
 export function waitForPage(page: string, alias: string): string {
   // homepage is not explicitly being asked as it's driven by the backend.
+  // Use `pathname` + `query` (instead of `path` with a query-string glob) so
+  // the intercept is robust to query-parameter ordering.  Angular serialises
+  // HttpParams by iterating over the merged config object; adding new OCC
+  // endpoint configs (e.g. B2bUnitSelectionOccModule) changes the object's
+  // key-iteration order and can flip `?lang=en&curr=USD` to `?curr=USD&lang=en`,
+  // which a glob-based `path` pattern would not match.
   const route =
     page === 'homepage'
       ? {
           method: 'GET',
-          path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
             'BASE_SITE'
-          )}/${cmsEndpoints.pages}?lang=en&curr=*`,
+          )}/${cmsEndpoints.pages}`,
+          // Require lang=en to avoid matching non-homepage CMS requests that
+          // also lack a pageLabelOrId parameter (e.g. search-box suggestions).
+          query: { lang: 'en' },
         }
       : {
           method: 'GET',

From 6b1302a82fbab0d596563e3e7dd130fa8df9ffdf Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 18:34:24 +0800
Subject: [PATCH 45/60] fix

fix
---
 .../effects/b2b-unit-selection.effects.ts     | 30 ++++++++---
 .../root/events/b2b-unit-selection.events.ts  | 52 +++++++++++++++++++
 .../b2b-unit-selection/root/public_api.ts     |  1 +
 3 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/events/b2b-unit-selection.events.ts

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index 89d4e335cd6..e269fd0c29c 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -10,11 +10,17 @@ import { Actions, createEffect, ofType } from '@ngrx/effects';
 import {
   AuthActions,
   B2BUnit,
+  EventService,
   LoggerService,
   tryNormalizeHttpError,
   UserIdService,
   WindowRef,
 } from '@spartacus/core';
+import {
+  B2bUnitSelectionConfig,
+  B2bUnitSwitchedEvent,
+  B2bUnitSwitchFailedEvent,
+} from '@spartacus/organization/b2b-unit-selection/root';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import {
   defer,
@@ -36,7 +42,6 @@ import {
   take,
   tap,
 } from 'rxjs/operators';
-import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
 import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
@@ -140,6 +145,10 @@ export class B2bUnitSelectionEffects {
           tap(() => {
             this.launchDialogService.closeDialog('CONFIRMED');
             this.stateService.setActiveUnit(unitName);
+            this.eventService.dispatch(
+              { userId, unitName, redirectedToHome: redirectToHome ?? false },
+              B2bUnitSwitchedEvent
+            );
             // Reload the page so all org-context data is refreshed for the
             // newly selected unit.
             // Header selector: navigate to home root and trigger a full page
@@ -152,13 +161,21 @@ export class B2bUnitSelectionEffects {
             }
           }),
           map(() => new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess()),
-          catchError((error: HttpErrorResponse) =>
-            of(
+          catchError((error: HttpErrorResponse) => {
+            this.eventService.dispatch(
+              {
+                userId,
+                unitName,
+                error: tryNormalizeHttpError(error, this.logger),
+              },
+              B2bUnitSwitchFailedEvent
+            );
+            return of(
               new B2bUnitSelectionActions.SetDefaultOrgUnitFail(
                 tryNormalizeHttpError(error, this.logger)
               )
-            )
-          )
+            );
+          })
         )
       )
     );
@@ -190,7 +207,8 @@ export class B2bUnitSelectionEffects {
     protected actions$: Actions,
     protected connector: B2bUnitSelectionConnector,
     protected userIdService: UserIdService,
-    protected launchDialogService: LaunchDialogService
+    protected launchDialogService: LaunchDialogService,
+    protected eventService: EventService
   ) {}
 
   /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
diff --git a/feature-libs/organization/b2b-unit-selection/root/events/b2b-unit-selection.events.ts b/feature-libs/organization/b2b-unit-selection/root/events/b2b-unit-selection.events.ts
new file mode 100644
index 00000000000..5fdbe9de2b7
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/events/b2b-unit-selection.events.ts
@@ -0,0 +1,52 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CxEvent } from '@spartacus/core';
+
+/**
+ * Base event for B2B unit selection actions.
+ */
+export abstract class B2bUnitSelectionEvent extends CxEvent {
+  /**
+   * User ID of the logged-in B2B customer.
+   */
+  userId: string;
+  /**
+   * The unit name (uid) that was selected.
+   */
+  unitName: string;
+}
+
+/**
+ * Fired when the user has successfully switched to a new organisation unit.
+ * Other domains can listen to this event via `EventService.get(B2bUnitSwitchedEvent)`
+ * to react to an org-unit change (e.g. clear caches, reload quotes, etc.).
+ */
+export class B2bUnitSwitchedEvent extends B2bUnitSelectionEvent {
+  /**
+   * Event's type
+   */
+  static readonly type = 'B2bUnitSwitchedEvent';
+  /**
+   * `true` when the app navigated to the home page after the switch;
+   * `false` when the current page was reloaded in-place.
+   */
+  redirectedToHome: boolean;
+}
+
+/**
+ * Fired when an attempt to switch organisation unit has failed.
+ */
+export class B2bUnitSwitchFailedEvent extends B2bUnitSelectionEvent {
+  /**
+   * Event's type
+   */
+  static readonly type = 'B2bUnitSwitchFailedEvent';
+  /**
+   * Normalised error payload.
+   */
+  error: unknown;
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/public_api.ts b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
index 3b4ea46511c..c78cdd7f556 100644
--- a/feature-libs/organization/b2b-unit-selection/root/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
@@ -7,4 +7,5 @@
 export * from './b2b-unit-selection-root.module';
 export * from './config/b2b-unit-selection.config';
 export * from './config/default-b2b-unit-selection-config';
+export * from './events/b2b-unit-selection.events';
 export * from './feature-name';

From 065ea3afad403fef1ac0f54ccc98041465f9c97f Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 19:05:13 +0800
Subject: [PATCH 46/60] fix(e2e): make homepage intercept robust to
 query-parameter ordering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous glob `path: '.../users/*/cms/pages?lang=en&curr=*'` assumes
query parameters are serialised as lang-first.  Adding B2bUnitSelectionOccModule
changes Angular's OccConfig merge order, flipping the serialisation to
curr-first (?curr=USD&lang=en), so the glob never matches.

The attempted fix using `pathname` also failed because Cypress treats the
`pathname` field as a literal string — the `*` in `users/*/cms/pages` was
matched as a literal asterisk, not as a glob wildcard.

Fix: use `path: '.../users/*/cms/pages*'` — the `path` field supports minimatch
globs, so `*` correctly matches the user-id segment and the trailing `*`
accepts any query-string regardless of parameter order.  The homepage CMS
request is uniquely identified by omitting a `pageLabelOrId` parameter, so
no query-string filter is needed to distinguish it.
---
 .../cypress/helpers/navigation.ts             | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
index 67eee2aa249..31d34028592 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
@@ -34,22 +34,25 @@ export const navigation = {
  */
 export function waitForPage(page: string, alias: string): string {
   // homepage is not explicitly being asked as it's driven by the backend.
-  // Use `pathname` + `query` (instead of `path` with a query-string glob) so
-  // the intercept is robust to query-parameter ordering.  Angular serialises
-  // HttpParams by iterating over the merged config object; adding new OCC
-  // endpoint configs (e.g. B2bUnitSelectionOccModule) changes the object's
-  // key-iteration order and can flip `?lang=en&curr=USD` to `?curr=USD&lang=en`,
-  // which a glob-based `path` pattern would not match.
+  // Use a glob on the path-only portion (no query string) so the intercept
+  // is robust to query-parameter ordering.  Angular serialises HttpParams by
+  // iterating over the merged OCC config object; adding new endpoint configs
+  // (e.g. B2bUnitSelectionOccModule) changes the key-iteration order and can
+  // flip ?lang=en&curr=USD to ?curr=USD&lang=en.  Matching path + query string
+  // via a single `path` glob would require listing both orderings.
+  //
+  // The `*` in `users/*/cms/pages` is a minimatch single-segment wildcard that
+  // matches the user identifier (`current`, `anonymous`, or a numeric id).
   const route =
     page === 'homepage'
       ? {
           method: 'GET',
-          pathname: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
+          // Match on path only, no query-string suffix, so any parameter order
+          // is accepted.  We rely on the fact that only the homepage CMS request
+          // omits a pageLabelOrId query parameter.
+          path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
             'BASE_SITE'
-          )}/${cmsEndpoints.pages}`,
-          // Require lang=en to avoid matching non-homepage CMS requests that
-          // also lack a pageLabelOrId parameter (e.g. search-box suggestions).
-          query: { lang: 'en' },
+          )}/${cmsEndpoints.pages}*`,
         }
       : {
           method: 'GET',

From 3fab60a30eb594cbbb3d2d47d3a4e5f74298fd09 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 19:39:55 +0800
Subject: [PATCH 47/60] fix(b2b-unit-selection): use OnRunEffects to prevent
 zone instability when disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NgRx's EffectSources.toActions() wraps every registered effect with materialize()
and merges them inside an exhaustMap that lives for the entire app lifetime inside
Angular's zone.  Even when individual effects returned defer(() => EMPTY), the
outer merge() + exhaustMap() subscription kept a live Zone.js task indefinitely,
preventing ApplicationRef.isStable from emitting true and causing Cypress cy.wait()
to time out with "No request ever occurred".

Implement the NgRx OnRunEffects interface on B2bUnitSelectionEffects.  When the
feature is disabled, ngrxOnRunEffects() returns EMPTY, which NgRx passes directly
to exhaustMap — completing synchronously and creating no Zone.js pending task.
---
 .../store/b2b-unit-selection-store.module.ts  | 18 +++++
 .../effects/b2b-unit-selection.effects.ts     | 80 +++++++++++--------
 2 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts b/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
index b36d4c65df6..1347166da4f 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
@@ -8,6 +8,24 @@ import { NgModule } from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
 import { B2bUnitSelectionEffects } from './effects/b2b-unit-selection.effects';
 
+/**
+ * Registers NgRx effects for the B2B unit selection feature.
+ *
+ * **Why zone stability matters:**
+ * NgRx wraps every registered effect observable with `materialize()` and
+ * merges them inside `EffectsRunner`, which lives for the entire application
+ * lifetime inside Angular's zone.  Even when effects return `EMPTY` immediately,
+ * the `merge()` + `exhaustMap()` subscription chain in `EffectSources.toActions()`
+ * keeps a live observable subscription in the Angular zone indefinitely.
+ * This prevents `ApplicationRef.isStable` from emitting `true`, causing
+ * Cypress `cy.wait()` to time out with "No request ever occurred".
+ *
+ * **Solution: `OnRunEffects` hook.**
+ * `B2bUnitSelectionEffects` implements the NgRx `OnRunEffects` interface.
+ * When the feature is disabled, `ngrxOnRunEffects()` returns `EMPTY`, which
+ * NgRx passes directly to `exhaustMap` — completing synchronously and creating
+ * **no** Zone.js pending task so the zone can stabilise normally.
+ */
 @NgModule({
   imports: [EffectsModule.forFeature([B2bUnitSelectionEffects])],
 })
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index e269fd0c29c..e18d62cca01 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -6,7 +6,13 @@
 
 import { HttpErrorResponse } from '@angular/common/http';
 import { ApplicationRef, inject, Injectable, NgZone } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  EffectNotification,
+  ofType,
+  OnRunEffects,
+} from '@ngrx/effects';
 import {
   AuthActions,
   B2BUnit,
@@ -23,7 +29,6 @@ import {
 } from '@spartacus/organization/b2b-unit-selection/root';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import {
-  defer,
   EMPTY,
   forkJoin,
   interval,
@@ -47,7 +52,7 @@ import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-st
 import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
 
 @Injectable()
-export class B2bUnitSelectionEffects {
+export class B2bUnitSelectionEffects implements OnRunEffects {
   protected logger = inject(LoggerService);
   protected config = inject(B2bUnitSelectionConfig);
   protected applicationRef = inject(ApplicationRef);
@@ -66,21 +71,12 @@ export class B2bUnitSelectionEffects {
    * 2. OAuth Authorization Code Flow or page-refresh token restore:
    *    ApplicationRef.components may be empty; polling waits for AppComponent to mount
    *    before opening the dialog.
-   *
-   * When the feature is disabled the effect factory returns EMPTY so NgRx never
-   * subscribes to `actions$`.  A persistent `actions$` subscription keeps
-   * Angular's zone perpetually unstable (via Zone.js-patched scheduler internals),
-   * which prevents `ApplicationRef.isStable` from emitting `true` and causes
-   * Cypress `cy.wait()` to time out even when no HTTP requests are issued.
    */
   checkOrgUnitsOnLogin$: Observable<
     | B2bUnitSelectionActions.LoadUserOrgUnitsSuccess
     | B2bUnitSelectionActions.LoadUserOrgUnitsFail
-  > = createEffect(() => {
-    if (!this.config.b2bUnitSelection?.enabled) {
-      return defer(() => EMPTY);
-    }
-    return this.actions$.pipe(
+  > = createEffect(() =>
+    this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
       exhaustMap(() =>
         this.userIdService.takeUserId(true).pipe(
@@ -116,24 +112,19 @@ export class B2bUnitSelectionEffects {
           catchError(() => EMPTY)
         )
       )
-    );
-  });
+    )
+  );
 
   /**
    * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
    * On success, closes the dialog, updates the header selector state, and reloads
    * the page so all org-context-dependent data (prices, catalog, CMS) is refreshed.
-   *
-   * Returns EMPTY when disabled so no `actions$` subscription is created.
    */
   setDefaultOrgUnit$: Observable<
     | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
     | B2bUnitSelectionActions.SetDefaultOrgUnitFail
-  > = createEffect(() => {
-    if (!this.config.b2bUnitSelection?.enabled) {
-      return defer(() => EMPTY);
-    }
-    return this.actions$.pipe(
+  > = createEffect(() =>
+    this.actions$.pipe(
       ofType<B2bUnitSelectionActions.SetDefaultOrgUnit>(
         B2bUnitSelectionActions.SET_DEFAULT_ORG_UNIT
       ),
@@ -178,28 +169,22 @@ export class B2bUnitSelectionEffects {
           })
         )
       )
-    );
-  });
+    )
+  );
 
   /**
    * Listens for LOGOUT and clears the state service so the Company selector
    * is hidden after the user logs out.
-   *
-   * Returns EMPTY when disabled so no `actions$` subscription is created.
    */
   clearOnLogout$ = createEffect(
-    () => {
-      if (!this.config.b2bUnitSelection?.enabled) {
-        return defer(() => EMPTY);
-      }
-      return this.actions$.pipe(
+    () =>
+      this.actions$.pipe(
         ofType<AuthActions.Logout>(AuthActions.LOGOUT),
         tap(() => {
           this.stateService.setOrgUnits([]);
           this.stateService.setActiveUnit(null);
         })
-      );
-    },
+      ),
     { dispatch: false }
   );
 
@@ -214,6 +199,33 @@ export class B2bUnitSelectionEffects {
   /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
   protected readonly STABLE_TIMEOUT_MS = 10_000;
 
+  /**
+   * NgRx `OnRunEffects` hook — called by NgRx in `resolveEffectSource` instead
+   * of subscribing to `mergedEffects$` directly.
+   *
+   * **Why this fixes zone stability:**
+   * `EffectsModule.forFeature` always registers the effects class, and NgRx's
+   * `EffectSources.toActions()` wraps every registered effect with `materialize()`
+   * then merges them inside an `exhaustMap` that lives for the entire application
+   * lifetime inside Angular's zone.  Even when individual effects return
+   * `defer(() => EMPTY)` immediately, the outer `merge()` + `exhaustMap()`
+   * subscription chain keeps a live observable in the zone indefinitely.
+   * This prevents `ApplicationRef.isStable` from emitting `true`, causing
+   * Cypress `cy.wait()` to time out with "No request ever occurred".
+   *
+   * Returning `EMPTY` from this hook causes `resolveEffectSource` to return
+   * `EMPTY` to `exhaustMap`, which completes synchronously and creates **no**
+   * Zone.js pending task — allowing the zone to stabilise normally.
+   */
+  ngrxOnRunEffects(
+    resolvedEffects$: Observable<EffectNotification>
+  ): Observable<EffectNotification> {
+    if (!this.config.b2bUnitSelection?.enabled) {
+      return EMPTY;
+    }
+    return resolvedEffects$;
+  }
+
   /**
    * Opens the unit-selection dialog once the AppComponent is mounted.
    *

From 5f6d8cc76eb8203ebc49842ec762604ac75e0403 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 19:52:14 +0800
Subject: [PATCH 48/60] fix(b2b-unit-selection): avoid takeUserId(true) race
 condition on LOGIN
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

takeUserId(true) takes a snapshot of the current userId and throws if it
is 'anonymous'.  When AuthActions.LOGIN is dispatched, UserIdService may
not have called setUserId('current') yet, so the snapshot is still
'anonymous' — causing a logged error even though the catchError suppresses
the observable failure.

Replace takeUserId(true) with getUserId().pipe(filter, take(1)) so the
effect waits until the userId is actually non-anonymous rather than
throwing on the current snapshot.
---
 .../core/store/effects/b2b-unit-selection.effects.ts      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index e18d62cca01..f829bba8684 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -18,6 +18,7 @@ import {
   B2BUnit,
   EventService,
   LoggerService,
+  OCC_USER_ID_ANONYMOUS,
   tryNormalizeHttpError,
   UserIdService,
   WindowRef,
@@ -79,7 +80,9 @@ export class B2bUnitSelectionEffects implements OnRunEffects {
     this.actions$.pipe(
       ofType<AuthActions.Login>(AuthActions.LOGIN),
       exhaustMap(() =>
-        this.userIdService.takeUserId(true).pipe(
+        this.userIdService.getUserId().pipe(
+          filter((userId) => userId !== OCC_USER_ID_ANONYMOUS),
+          take(1),
           switchMap((userId) =>
             forkJoin({
               orgUnits: this.connector.loadOrgUnits(userId),
@@ -108,8 +111,7 @@ export class B2bUnitSelectionEffects implements OnRunEffects {
                 )
               )
             )
-          ),
-          catchError(() => EMPTY)
+          )
         )
       )
     )

From bfd1bd5dffc14e07093e617d26fd85b20dcbf434 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Thu, 30 Jul 2026 20:56:02 +0800
Subject: [PATCH 49/60] fix(b2b-unit-selection): update spec for
 ngrxOnRunEffects and getUserId
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add getUserId spy to MockUserIdService (required after takeUserId → getUserId)
- Replace 3 individual disabled-effect tests with one ngrxOnRunEffects test
  (the disabled gate now lives in ngrxOnRunEffects, not in each effect)
- Minor: collapse multi-line rxjs import onto one line
---
 .../b2b-unit-selection.effects.spec.ts        | 32 ++++++-------------
 .../effects/b2b-unit-selection.effects.ts     | 10 +-----
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
index 77331868757..dc1c84a0288 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
@@ -72,6 +72,7 @@ class MockLaunchDialogService {
 
 class MockUserIdService {
   takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
+  getUserId = createSpy('getUserId').and.returnValue(of(mockUserId));
 }
 
 class MockWindowRef {
@@ -389,30 +390,15 @@ describe('B2bUnitSelectionEffects (feature disabled)', () => {
     effects = TestBed.inject(B2bUnitSelectionEffects);
   });
 
-  it('checkOrgUnitsOnLogin$ should return EMPTY when the feature is disabled', () => {
-    const action = new AuthActions.Login();
-    actions$ = hot('-a', { a: action });
+  it('ngrxOnRunEffects should return EMPTY when the feature is disabled', () => {
+    // The disabled gate lives in ngrxOnRunEffects, not in each individual effect.
+    // jasmine-marbles tests effect observables directly (bypassing NgRx's
+    // EffectSources runner), so this is the correct place to assert the behavior.
+    const resolvedEffects$ = cold('-a', { a: {} });
     const expected = cold('|');
 
-    expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
-  });
-
-  it('setDefaultOrgUnit$ should return EMPTY when the feature is disabled', () => {
-    const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
-      userId: 'current',
-      unitName: 'Rustic',
-    });
-    actions$ = hot('-a', { a: action });
-    const expected = cold('|');
-
-    expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
-  });
-
-  it('clearOnLogout$ should return EMPTY when the feature is disabled', () => {
-    const action = new AuthActions.Logout();
-    actions$ = hot('-a', { a: action });
-    const expected = cold('|');
-
-    expect(effects.clearOnLogout$).toBeObservable(expected);
+    expect(effects.ngrxOnRunEffects(resolvedEffects$ as any)).toBeObservable(
+      expected
+    );
   });
 });
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index f829bba8684..d5c553b9919 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -29,15 +29,7 @@ import {
   B2bUnitSwitchFailedEvent,
 } from '@spartacus/organization/b2b-unit-selection/root';
 import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-import {
-  EMPTY,
-  forkJoin,
-  interval,
-  Observable,
-  of,
-  race,
-  timer,
-} from 'rxjs';
+import { EMPTY, forkJoin, interval, Observable, of, race, timer } from 'rxjs';
 import {
   catchError,
   exhaustMap,

From 5de360c9935115c031efd750419155a269520dee Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Fri, 31 Jul 2026 14:02:21 +0800
Subject: [PATCH 50/60] fix

fix
---
 .../cypress/helpers/navigation.ts                  | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
index 31d34028592..33b1ed0ab30 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/helpers/navigation.ts
@@ -34,25 +34,13 @@ export const navigation = {
  */
 export function waitForPage(page: string, alias: string): string {
   // homepage is not explicitly being asked as it's driven by the backend.
-  // Use a glob on the path-only portion (no query string) so the intercept
-  // is robust to query-parameter ordering.  Angular serialises HttpParams by
-  // iterating over the merged OCC config object; adding new endpoint configs
-  // (e.g. B2bUnitSelectionOccModule) changes the key-iteration order and can
-  // flip ?lang=en&curr=USD to ?curr=USD&lang=en.  Matching path + query string
-  // via a single `path` glob would require listing both orderings.
-  //
-  // The `*` in `users/*/cms/pages` is a minimatch single-segment wildcard that
-  // matches the user identifier (`current`, `anonymous`, or a numeric id).
   const route =
     page === 'homepage'
       ? {
           method: 'GET',
-          // Match on path only, no query-string suffix, so any parameter order
-          // is accepted.  We rely on the fact that only the homepage CMS request
-          // omits a pageLabelOrId query parameter.
           path: `${Cypress.env('OCC_PREFIX')}/${Cypress.env(
             'BASE_SITE'
-          )}/${cmsEndpoints.pages}*`,
+          )}/${cmsEndpoints.pages}?lang=en&curr=*`,
         }
       : {
           method: 'GET',

From dfed97be786844878ac54b5b01d150294bdb7471 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Fri, 31 Jul 2026 16:53:01 +0800
Subject: [PATCH 51/60] fix

fix
---
 ...bstract-b2b-unit-selector.component.spec.ts | 18 +++++++++++++++++-
 .../abstract-b2b-unit-selector.component.ts    | 12 +++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
index 985345b1cea..1e0f6a87694 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -7,7 +7,7 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { B2BUnit, UserIdService } from '@spartacus/core';
+import { B2BUnit, OCC_USER_ID_ANONYMOUS, UserIdService } from '@spartacus/core';
 import { of, throwError } from 'rxjs';
 import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
 import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
@@ -54,6 +54,7 @@ class MockB2bUnitSelectionConnector {
 }
 
 class MockUserIdService {
+  getUserId = createSpy('getUserId').and.returnValue(of(mockUserId));
   takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
 }
 
@@ -155,6 +156,21 @@ describe('AbstractB2bUnitSelectorComponent', () => {
       expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
     });
 
+    it('should NOT throw when user is anonymous on init (page-refresh race condition)', () => {
+      // Simulate page refresh: component initialises before OAuth token is restored.
+      // getUserId() first emits OCC_USER_ID_ANONYMOUS, then the real userId.
+      createComponent(true, []);
+      const userIdService = TestBed.inject(UserIdService) as any;
+      // Emit anonymous first, then the real userId — mirrors token-restore sequence.
+      userIdService.getUserId.and.returnValue(
+        of(OCC_USER_ID_ANONYMOUS, mockUserId)
+      );
+
+      expect(() => fixture.detectChanges()).not.toThrow();
+      // The filter skips anonymous; the real userId triggers the load.
+      expect(connector.loadOrgUnits).toHaveBeenCalledWith(mockUserId);
+    });
+
     it('should set active unit to null when loadDefaultOrgUnitName fails', () => {
       createComponent(true, []);
       connector = TestBed.inject(B2bUnitSelectionConnector) as any;
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index 622df03563e..f8bdb956286 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -14,9 +14,9 @@ import {
 } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { Store } from '@ngrx/store';
-import { B2BUnit, UserIdService } from '@spartacus/core';
+import { B2BUnit, OCC_USER_ID_ANONYMOUS, UserIdService } from '@spartacus/core';
 import { forkJoin, of } from 'rxjs';
-import { catchError, switchMap, take } from 'rxjs/operators';
+import { catchError, filter, switchMap, take } from 'rxjs/operators';
 import {
   B2bUnitSelectionConnector,
   B2bUnitSelectorStateService,
@@ -110,9 +110,15 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
     // Without this, Cypress cy.wait() calls time out because the zone never
     // stabilises while these requests are in-flight.
     this.ngZone.runOutsideAngular(() => {
+      // Use getUserId() + filter instead of takeUserId(true) to avoid throwing
+      // "Requested user id for logged user while user is not logged in" during
+      // page refresh: on refresh the component initialises before the OAuth token
+      // is restored from localStorage, so the user appears anonymous at first.
+      // getUserId() + filter waits silently until the session is fully restored.
       this.userIdService
-        .takeUserId(true)
+        .getUserId()
         .pipe(
+          filter((userId) => userId !== OCC_USER_ID_ANONYMOUS),
           take(1),
           switchMap((userId) =>
             forkJoin({

From f7c5516a7007f4673617509921041d43d6a7c284 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 3 Aug 2026 09:12:22 +0800
Subject: [PATCH 52/60] fix

fix
---
 .../b2b-unit-selection-dialog.component.ts       | 16 ++++++----------
 .../store/actions/b2b-unit-selection.actions.ts  |  7 -------
 .../store/effects/b2b-unit-selection.effects.ts  |  1 -
 .../adapters/occ-b2b-unit-selection.adapter.ts   |  4 ++--
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 1d38be5762f..767f669348d 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -7,6 +7,7 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  inject,
   OnDestroy,
   OnInit,
 } from '@angular/core';
@@ -44,6 +45,10 @@ import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/co
   ],
 })
 export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
+  protected launchDialogService = inject(LaunchDialogService);
+  protected userIdService = inject(UserIdService);
+  protected store = inject(Store);
+
   orgUnits: B2BUnit[] = [];
   protected subscriptions = new Subscription();
 
@@ -58,12 +63,6 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
     selectedUnit: new FormControl<B2BUnit | null>(null, [Validators.required]),
   });
 
-  constructor(
-    protected launchDialogService: LaunchDialogService,
-    protected userIdService: UserIdService,
-    protected store: Store
-  ) {}
-
   ngOnInit(): void {
     this.subscriptions.add(
       this.launchDialogService.data$
@@ -86,10 +85,7 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       this.form.markAllAsTouched();
       return;
     }
-    const unit = this.form.value.selectedUnit;
-    if (!unit) {
-      return;
-    }
+    const unit = this.form.value.selectedUnit!;
     this.userIdService
       .takeUserId(true)
       .pipe(take(1))
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
index 57bf3d8e311..183d7d1ada2 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
@@ -9,17 +9,11 @@ import { B2BUnit, ErrorAction } from '@spartacus/core';
 
 // ── Load Org Units ────────────────────────────────────────────────────────────
 
-export const LOAD_USER_ORG_UNITS = '[B2BUnitSelection] Load User Org Units';
 export const LOAD_USER_ORG_UNITS_SUCCESS =
   '[B2BUnitSelection] Load User Org Units Success';
 export const LOAD_USER_ORG_UNITS_FAIL =
   '[B2BUnitSelection] Load User Org Units Fail';
 
-export class LoadUserOrgUnits implements Action {
-  readonly type = LOAD_USER_ORG_UNITS;
-  constructor(public payload: { userId: string }) {}
-}
-
 export class LoadUserOrgUnitsSuccess implements Action {
   readonly type = LOAD_USER_ORG_UNITS_SUCCESS;
   constructor(public payload: B2BUnit[]) {}
@@ -60,7 +54,6 @@ export class SetDefaultOrgUnitFail implements Action, ErrorAction {
 }
 
 export type B2bUnitSelectionAction =
-  | LoadUserOrgUnits
   | LoadUserOrgUnitsSuccess
   | LoadUserOrgUnitsFail
   | SetDefaultOrgUnit
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
index d5c553b9919..c9a2ea48861 100644
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
@@ -257,7 +257,6 @@ export class B2bUnitSelectionEffects implements OnRunEffects {
         ),
         timer(this.STABLE_TIMEOUT_MS)
       )
-        .pipe(take(1))
         .subscribe(() => this.ngZone.run(() => open()));
     });
   }
diff --git a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
index 1e5a6e62e58..cdc9f8408e0 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/adapters/occ-b2b-unit-selection.adapter.ts
@@ -55,13 +55,13 @@ export class OccB2bUnitSelectionAdapter implements B2bUnitSelectionAdapter {
       );
   }
 
-  setDefaultOrgUnit(userId: string, unitUid: string): Observable<void> {
+  setDefaultOrgUnit(userId: string, unitName: string): Observable<void> {
     return this.http
       .put<void>(
         this.occEndpoints.buildUrl('orgUserDefaultUnit', {
           urlParams: { userId },
         }),
-        { uid: unitUid }
+        { uid: unitName }
       )
       .pipe(
         catchError((error: HttpErrorResponse) => {

From 2da7c8ea1da3bda4353e17144214ea6f9c79b8f0 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 3 Aug 2026 09:20:39 +0800
Subject: [PATCH 53/60] fix

fix
---
 .../b2b-unit-selection-dialog.component.ts                   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 767f669348d..a7b7b0ca3f7 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -85,7 +85,10 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       this.form.markAllAsTouched();
       return;
     }
-    const unit = this.form.value.selectedUnit!;
+    const unit = this.form.value.selectedUnit;
+    if (!unit) {
+      return;
+    }
     this.userIdService
       .takeUserId(true)
       .pipe(take(1))

From 07bc468e61b888b1e3b5bd2b224117fa9ca4c3c1 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 3 Aug 2026 09:55:58 +0800
Subject: [PATCH 54/60] fix

fix
---
 ...2b-unit-selection-dialog.component.spec.ts |  27 +-
 .../b2b-unit-selection-dialog.component.ts    |   9 +-
 ...stract-b2b-unit-selector.component.spec.ts |  28 +-
 .../abstract-b2b-unit-selector.component.ts   |  20 +-
 .../core/b2b-unit-selection-core.module.ts    |  16 +-
 .../b2b-unit-selection/core/public_api.ts     |   2 +-
 .../services/b2b-unit-selection.service.ts    | 235 ++++++++++
 .../b2b-unit-selector-state.service.ts        |   2 +-
 .../actions/b2b-unit-selection.actions.ts     |  61 ---
 .../core/store/actions/index.ts               |   7 -
 .../store/b2b-unit-selection-store.module.ts  |  32 --
 .../b2b-unit-selection.effects.spec.ts        | 404 ------------------
 .../effects/b2b-unit-selection.effects.ts     | 263 ------------
 13 files changed, 288 insertions(+), 818 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
 delete mode 100644 feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
index c6f8ed85bd2..d07cf45c4c6 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
@@ -8,7 +8,6 @@ import { ChangeDetectionStrategy, Directive, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
-import { Store } from '@ngrx/store';
 import { B2BUnit, I18nTestingModule, UserIdService } from '@spartacus/core';
 import {
   FocusConfig,
@@ -18,7 +17,7 @@ import {
   NgSelectA11yDirective,
 } from '@spartacus/storefront';
 import { BehaviorSubject, of } from 'rxjs';
-import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
+import { B2bUnitSelectionService } from '../../core/services/b2b-unit-selection.service';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog.component';
 import createSpy = jasmine.createSpy;
 
@@ -42,14 +41,14 @@ class MockUserIdService {
   takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
 }
 
-class MockStore {
-  dispatch = createSpy('dispatch');
+class MockB2bUnitSelectionService {
+  setDefaultUnit = createSpy('setDefaultUnit');
 }
 
 describe('B2bUnitSelectionDialogComponent', () => {
   let component: B2bUnitSelectionDialogComponent;
   let fixture: ComponentFixture<B2bUnitSelectionDialogComponent>;
-  let store: MockStore;
+  let unitSelectionService: MockB2bUnitSelectionService;
   let data$: BehaviorSubject<any>;
 
   function createComponent(dialogData: any = {}): void {
@@ -66,7 +65,10 @@ describe('B2bUnitSelectionDialogComponent', () => {
       providers: [
         { provide: LaunchDialogService, useValue: { data$ } },
         { provide: UserIdService, useClass: MockUserIdService },
-        { provide: Store, useClass: MockStore },
+        {
+          provide: B2bUnitSelectionService,
+          useClass: MockB2bUnitSelectionService,
+        },
       ],
     })
       .overrideComponent(B2bUnitSelectionDialogComponent, {
@@ -80,7 +82,7 @@ describe('B2bUnitSelectionDialogComponent', () => {
 
     fixture = TestBed.createComponent(B2bUnitSelectionDialogComponent);
     component = fixture.componentInstance;
-    store = TestBed.inject(Store) as any;
+    unitSelectionService = TestBed.inject(B2bUnitSelectionService) as any;
   }
 
   // ── ngOnInit ──────────────────────────────────────────────────────────────
@@ -134,20 +136,21 @@ describe('B2bUnitSelectionDialogComponent', () => {
       fixture.detectChanges();
     }));
 
-    it('should dispatch SetDefaultOrgUnit with correct payload', () => {
+    it('should call setDefaultUnit with correct payload', () => {
       component.confirm();
 
-      expect(store.dispatch).toHaveBeenCalledWith(
-        new SetDefaultOrgUnit({ userId: mockUserId, unitName: 'Rustic' })
+      expect(unitSelectionService.setDefaultUnit).toHaveBeenCalledWith(
+        mockUserId,
+        'Rustic'
       );
     });
 
-    it('should mark form as touched and NOT dispatch when selectedUnit is null', () => {
+    it('should mark form as touched and NOT call setDefaultUnit when selectedUnit is null', () => {
       component.form.get('selectedUnit')?.setValue(null);
 
       component.confirm();
 
-      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(unitSelectionService.setDefaultUnit).not.toHaveBeenCalled();
       expect(component.form.get('selectedUnit')?.touched).toBeTrue();
     });
   });
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index a7b7b0ca3f7..54728860a0b 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -17,7 +17,6 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import { Store } from '@ngrx/store';
 import { B2BUnit, TranslatePipe, UserIdService } from '@spartacus/core';
 import {
   FocusConfig,
@@ -29,7 +28,7 @@ import {
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/core';
+import { B2bUnitSelectionService } from '@spartacus/organization/b2b-unit-selection/core';
 
 @Component({
   selector: 'cx-b2b-unit-selection-dialog',
@@ -47,7 +46,7 @@ import { SetDefaultOrgUnit } from '@spartacus/organization/b2b-unit-selection/co
 export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
   protected launchDialogService = inject(LaunchDialogService);
   protected userIdService = inject(UserIdService);
-  protected store = inject(Store);
+  protected unitSelectionService = inject(B2bUnitSelectionService);
 
   orgUnits: B2BUnit[] = [];
   protected subscriptions = new Subscription();
@@ -93,9 +92,7 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       .takeUserId(true)
       .pipe(take(1))
       .subscribe((userId) => {
-        this.store.dispatch(
-          new SetDefaultOrgUnit({ userId, unitName: unit.name ?? '' })
-        );
+        this.unitSelectionService.setDefaultUnit(userId, unit.name ?? '');
       });
   }
 
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
index 1e0f6a87694..a48137b4138 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.spec.ts
@@ -6,12 +6,11 @@
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Store } from '@ngrx/store';
 import { B2BUnit, OCC_USER_ID_ANONYMOUS, UserIdService } from '@spartacus/core';
 import { of, throwError } from 'rxjs';
 import { B2bUnitSelectionConnector } from '../../core/connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectionService } from '../../core/services/b2b-unit-selection.service';
 import { B2bUnitSelectorStateService } from '../../core/services/b2b-unit-selector-state.service';
-import { SetDefaultOrgUnit } from '../../core/store/actions/b2b-unit-selection.actions';
 import { B2bUnitSelectionConfig } from '../../root/config/b2b-unit-selection.config';
 import { AbstractB2bUnitSelectorComponent } from './abstract-b2b-unit-selector.component';
 import createSpy = jasmine.createSpy;
@@ -58,8 +57,8 @@ class MockUserIdService {
   takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
 }
 
-class MockStore {
-  dispatch = createSpy('dispatch');
+class MockB2bUnitSelectionService {
+  setDefaultUnit = createSpy('setDefaultUnit');
 }
 
 describe('AbstractB2bUnitSelectorComponent', () => {
@@ -67,7 +66,7 @@ describe('AbstractB2bUnitSelectorComponent', () => {
   let fixture: ComponentFixture<TestB2bUnitSelectorComponent>;
   let stateService: MockB2bUnitSelectorStateService;
   let connector: MockB2bUnitSelectionConnector;
-  let store: MockStore;
+  let unitSelectionService: MockB2bUnitSelectionService;
 
   function createComponent(enabled = true, initialUnits: B2BUnit[] = []): void {
     stateService = new MockB2bUnitSelectorStateService();
@@ -82,7 +81,10 @@ describe('AbstractB2bUnitSelectorComponent', () => {
           useClass: MockB2bUnitSelectionConnector,
         },
         { provide: UserIdService, useClass: MockUserIdService },
-        { provide: Store, useClass: MockStore },
+        {
+          provide: B2bUnitSelectionService,
+          useClass: MockB2bUnitSelectionService,
+        },
         {
           provide: B2bUnitSelectionConfig,
           useValue: { b2bUnitSelection: { enabled } },
@@ -93,7 +95,7 @@ describe('AbstractB2bUnitSelectorComponent', () => {
     fixture = TestBed.createComponent(TestB2bUnitSelectorComponent);
     component = fixture.componentInstance;
     connector = TestBed.inject(B2bUnitSelectionConnector) as any;
-    store = TestBed.inject(Store) as any;
+    unitSelectionService = TestBed.inject(B2bUnitSelectionService) as any;
   }
 
   describe('computed signals', () => {
@@ -189,15 +191,13 @@ describe('AbstractB2bUnitSelectorComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should dispatch SetDefaultOrgUnit with correct payload', () => {
+    it('should call setDefaultUnit with correct payload', () => {
       component.onSelect('Rustic Services');
 
-      expect(store.dispatch).toHaveBeenCalledWith(
-        new SetDefaultOrgUnit({
-          userId: mockUserId,
-          unitName: 'Rustic Services',
-          redirectToHome: true,
-        })
+      expect(unitSelectionService.setDefaultUnit).toHaveBeenCalledWith(
+        mockUserId,
+        'Rustic Services',
+        true
       );
     });
   });
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
index f8bdb956286..b0b86e7f744 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selector/abstract-b2b-unit-selector.component.ts
@@ -13,14 +13,13 @@ import {
   signal,
 } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { Store } from '@ngrx/store';
 import { B2BUnit, OCC_USER_ID_ANONYMOUS, UserIdService } from '@spartacus/core';
 import { forkJoin, of } from 'rxjs';
 import { catchError, filter, switchMap, take } from 'rxjs/operators';
 import {
   B2bUnitSelectionConnector,
+  B2bUnitSelectionService,
   B2bUnitSelectorStateService,
-  SetDefaultOrgUnit,
 } from '@spartacus/organization/b2b-unit-selection/core';
 import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selection/root';
 
@@ -34,7 +33,7 @@ import { B2bUnitSelectionConfig } from '@spartacus/organization/b2b-unit-selecti
 @Directive()
 export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
   protected stateService = inject(B2bUnitSelectorStateService);
-  protected store = inject(Store);
+  protected unitSelectionService = inject(B2bUnitSelectionService);
   protected userIdService = inject(UserIdService);
   protected connector = inject(B2bUnitSelectionConnector);
   protected config = inject(B2bUnitSelectionConfig);
@@ -78,7 +77,8 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
     if (!this.enabled) {
       return;
     }
-    // After a page refresh the BehaviorSubject is empty (effects may not have written yet).
+    // After a page refresh the BehaviorSubject is empty (the service subscribes
+    // to LoginEvent, but on refresh there is no login event — only token restore).
     // Proactively load once to ensure the selector is populated.
     this.stateService.orgUnits$.pipe(take(1)).subscribe((units) => {
       if (units.length === 0) {
@@ -87,26 +87,20 @@ export abstract class AbstractB2bUnitSelectorComponent implements OnInit {
     });
   }
 
-  /** Dispatches SetDefaultOrgUnit when the user switches units via the header selector. */
+  /** Calls the service to persist the unit change when the user switches via the header selector. */
   onSelect(unitName: string): void {
     this.userIdService
       .takeUserId(true)
       .pipe(take(1))
       .subscribe((userId) => {
-        this.store.dispatch(
-          new SetDefaultOrgUnit({
-            userId,
-            unitName,
-            redirectToHome: true,
-          })
-        );
+        this.unitSelectionService.setDefaultUnit(userId, unitName, true);
       });
   }
 
   private loadAndPopulateState(): void {
     // Run the HTTP requests outside Angular's zone so the pending subscription
     // does not prevent ApplicationRef.isStable from emitting true.
-    // This mirrors the pattern used in B2bUnitSelectionEffects.openDialogWhenReady().
+    // This mirrors the pattern used in B2bUnitSelectionService.openDialogWhenReady().
     // Without this, Cypress cy.wait() calls time out because the zone never
     // stabilises while these requests are in-flight.
     this.ngZone.runOutsideAngular(() => {
diff --git a/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
index 818d6c18d66..f90fafc7086 100644
--- a/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
@@ -6,10 +6,18 @@
 
 import { NgModule } from '@angular/core';
 import { B2bUnitSelectionConnector } from './connectors/b2b-unit-selection.connector';
-import { B2bUnitSelectionStoreModule } from './store/b2b-unit-selection-store.module';
+import { B2bUnitSelectionService } from './services/b2b-unit-selection.service';
 
 @NgModule({
-  imports: [B2bUnitSelectionStoreModule],
-  providers: [B2bUnitSelectionConnector],
+  providers: [
+    B2bUnitSelectionConnector,
+    // Eagerly initialise the service so it subscribes to LoginEvent/LogoutEvent
+    // as soon as the feature module is loaded.
+    B2bUnitSelectionService,
+  ],
 })
-export class B2bUnitSelectionCoreModule {}
+export class B2bUnitSelectionCoreModule {
+  // Inject here to trigger instantiation (providedIn: 'root' is lazy by default
+  // inside feature modules unless explicitly constructed).
+  constructor(_service: B2bUnitSelectionService) {}
+}
diff --git a/feature-libs/organization/b2b-unit-selection/core/public_api.ts b/feature-libs/organization/b2b-unit-selection/core/public_api.ts
index 3867e4c07e9..dcca2ff11f1 100644
--- a/feature-libs/organization/b2b-unit-selection/core/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/public_api.ts
@@ -8,4 +8,4 @@ export * from './b2b-unit-selection-core.module';
 export * from './connectors/b2b-unit-selection.adapter';
 export * from './connectors/b2b-unit-selection.connector';
 export * from './services/b2b-unit-selector-state.service';
-export * from './store/actions/index';
+export * from './services/b2b-unit-selection.service';
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
new file mode 100644
index 00000000000..e19e1f45582
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
@@ -0,0 +1,235 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ApplicationRef, inject, Injectable, NgZone } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import {
+  B2BUnit,
+  EventService,
+  LoggerService,
+  LoginEvent,
+  LogoutEvent,
+  OCC_USER_ID_ANONYMOUS,
+  tryNormalizeHttpError,
+  UserIdService,
+  WindowRef,
+} from '@spartacus/core';
+import {
+  B2bUnitSelectionConfig,
+  B2bUnitSwitchedEvent,
+  B2bUnitSwitchFailedEvent,
+} from '@spartacus/organization/b2b-unit-selection/root';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+import { forkJoin, interval, of, race, Subscription, timer } from 'rxjs';
+import {
+  catchError,
+  filter,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+import { B2bUnitSelectionConnector } from '../connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from './b2b-unit-selector-state.service';
+
+/**
+ * Core service orchestrating B2B unit selection.
+ *
+ * Replaces the previous NgRx-effects-based implementation. By using
+ * `EventService` subscriptions instead of `EffectsModule.forFeature`, we
+ * eliminate the Zone.js pending-task that NgRx's `EffectSources.toActions()`
+ * creates for the lifetime of the application — a task that prevented
+ * `ApplicationRef.isStable` from emitting `true` and caused Cypress
+ * `cy.wait()` calls to time out in CI.
+ *
+ * **Lifecycle:** Eagerly initialised by `B2bUnitSelectionCoreModule` via
+ * constructor injection. Subscriptions are set up in the constructor and
+ * live for the application lifetime (no `ngOnDestroy` needed for a root
+ * singleton).
+ */
+@Injectable({ providedIn: 'root' })
+export class B2bUnitSelectionService {
+  protected logger = inject(LoggerService);
+  protected config = inject(B2bUnitSelectionConfig);
+  protected applicationRef = inject(ApplicationRef);
+  protected ngZone = inject(NgZone);
+  protected stateService = inject(B2bUnitSelectorStateService);
+  protected windowRef = inject(WindowRef);
+  protected eventService = inject(EventService);
+  protected userIdService = inject(UserIdService);
+  protected connector = inject(B2bUnitSelectionConnector);
+  protected launchDialogService = inject(LaunchDialogService);
+
+  /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
+  protected readonly STABLE_TIMEOUT_MS = 10_000;
+
+  private readonly subscriptions = new Subscription();
+
+  constructor() {
+    if (!this.config.b2bUnitSelection?.enabled) {
+      return;
+    }
+    this.subscribeToLogin();
+    this.subscribeToLogout();
+  }
+
+  /**
+   * Listens for `LoginEvent` and loads the user's org units and default unit.
+   * Opens the unit-selection dialog when the user belongs to more than one unit.
+   *
+   * Two login scenarios are handled:
+   * 1. Manual login (ROPC): `ApplicationRef.components` already has mounted
+   *    components; the dialog opens immediately.
+   * 2. OAuth Authorization Code Flow or page-refresh token restore:
+   *    `ApplicationRef.components` may be empty; polling waits for AppComponent
+   *    to mount before opening the dialog.
+   */
+  protected subscribeToLogin(): void {
+    this.subscriptions.add(
+      this.eventService
+        .get(LoginEvent)
+        .pipe(
+          switchMap(() =>
+            this.userIdService.getUserId().pipe(
+              filter((userId) => userId !== OCC_USER_ID_ANONYMOUS),
+              take(1),
+              switchMap((userId) =>
+                forkJoin({
+                  orgUnits: this.connector.loadOrgUnits(userId),
+                  // Gracefully degrade if loading the default unit fails.
+                  defaultUnitName: this.connector
+                    .loadDefaultOrgUnitName(userId)
+                    .pipe(catchError(() => of(undefined))),
+                }).pipe(
+                  tap(({ orgUnits, defaultUnitName }) => {
+                    // Always write to the state service so the Company header
+                    // selector is populated.
+                    this.stateService.setOrgUnits(orgUnits);
+                    this.stateService.setActiveUnit(defaultUnitName ?? null);
+                    if (orgUnits.length > 0) {
+                      this.openDialogWhenReady(orgUnits, defaultUnitName);
+                    }
+                  }),
+                  catchError((error: HttpErrorResponse) => {
+                    this.logger.error(
+                      tryNormalizeHttpError(error, this.logger)
+                    );
+                    return of(null);
+                  })
+                )
+              )
+            )
+          )
+        )
+        .subscribe()
+    );
+  }
+
+  /**
+   * Listens for `LogoutEvent` and clears the state service so the Company
+   * selector is hidden after the user logs out.
+   */
+  protected subscribeToLogout(): void {
+    this.subscriptions.add(
+      this.eventService
+        .get(LogoutEvent)
+        .pipe(
+          tap(() => {
+            this.stateService.setOrgUnits([]);
+            this.stateService.setActiveUnit(null);
+          })
+        )
+        .subscribe()
+    );
+  }
+
+  /**
+   * Calls the connector to persist the newly selected org unit, then
+   * closes the dialog / reloads the page so all org-context-dependent data
+   * (prices, catalog, CMS) is refreshed.
+   *
+   * @param userId       The OCC user identifier.
+   * @param unitName     The `name` of the selected B2B unit.
+   * @param redirectToHome  When `true` (header selector), navigates to the
+   *                     home root; when `false` / omitted (dialog), reloads
+   *                     the current page in place.
+   */
+  setDefaultUnit(
+    userId: string,
+    unitName: string,
+    redirectToHome?: boolean
+  ): void {
+    this.connector
+      .setDefaultOrgUnit(userId, unitName)
+      .pipe(take(1))
+      .subscribe({
+        next: () => {
+          this.launchDialogService.closeDialog('CONFIRMED');
+          this.stateService.setActiveUnit(unitName);
+          this.eventService.dispatch(
+            { userId, unitName, redirectedToHome: redirectToHome ?? false },
+            B2bUnitSwitchedEvent
+          );
+          // Reload page so all org-context data is refreshed for the new unit.
+          // Header selector: navigate to home root via location.assign('/').
+          // Dialog: reload the current page in-place via location.reload().
+          if (redirectToHome) {
+            this.windowRef.nativeWindow?.location?.assign('/');
+          } else {
+            this.windowRef.nativeWindow?.location?.reload();
+          }
+        },
+        error: (error: HttpErrorResponse) => {
+          this.eventService.dispatch(
+            {
+              userId,
+              unitName,
+              error: tryNormalizeHttpError(error, this.logger),
+            },
+            B2bUnitSwitchFailedEvent
+          );
+        },
+      });
+  }
+
+  /**
+   * Opens the unit-selection dialog once the AppComponent is mounted.
+   *
+   * Polls `ApplicationRef.components` every 50 ms so the dialog opens as soon
+   * as the root component is bootstrapped — typically within one or two ticks.
+   *
+   * The polling runs OUTSIDE Angular's zone via `NgZone.runOutsideAngular` so
+   * the `setInterval` does not keep the zone perpetually unstable, which would
+   * otherwise prevent `ApplicationRef.isStable` from emitting and block CMS
+   * page rendering.
+   *
+   * A `timer(STABLE_TIMEOUT_MS)` fallback ensures the subscription always
+   * completes even if AppComponent never mounts, preventing a memory leak.
+   */
+  protected openDialogWhenReady(
+    orgUnits: B2BUnit[],
+    defaultUnitName: string | undefined
+  ): void {
+    const open = () => {
+      this.launchDialogService.openDialogAndSubscribe(
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
+        undefined,
+        { orgUnits, defaultUnitName }
+      );
+    };
+
+    this.ngZone.runOutsideAngular(() => {
+      race(
+        interval(50).pipe(
+          startWith(0),
+          filter(() => this.applicationRef.components.length > 0),
+          take(1)
+        ),
+        timer(this.STABLE_TIMEOUT_MS)
+      ).subscribe(() => this.ngZone.run(() => open()));
+    });
+  }
+}
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
index 1c049a2599c..3f7ce6e43e9 100644
--- a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selector-state.service.ts
@@ -12,7 +12,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
  * Lightweight state service that shares B2B unit data between the unit-selection
  * dialog and the persistent B2B Unit selector in the header.
  *
- * Data is written by B2bUnitSelectionEffects after login; components subscribe
+ * Data is written by B2bUnitSelectionService after login; components subscribe
  * directly without issuing additional API calls.
  */
 @Injectable({ providedIn: 'root' })
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
deleted file mode 100644
index 183d7d1ada2..00000000000
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/b2b-unit-selection.actions.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Action } from '@ngrx/store';
-import { B2BUnit, ErrorAction } from '@spartacus/core';
-
-// ── Load Org Units ────────────────────────────────────────────────────────────
-
-export const LOAD_USER_ORG_UNITS_SUCCESS =
-  '[B2BUnitSelection] Load User Org Units Success';
-export const LOAD_USER_ORG_UNITS_FAIL =
-  '[B2BUnitSelection] Load User Org Units Fail';
-
-export class LoadUserOrgUnitsSuccess implements Action {
-  readonly type = LOAD_USER_ORG_UNITS_SUCCESS;
-  constructor(public payload: B2BUnit[]) {}
-}
-
-export class LoadUserOrgUnitsFail implements Action, ErrorAction {
-  readonly type = LOAD_USER_ORG_UNITS_FAIL;
-  constructor(public error: any) {}
-}
-
-// ── Set Default Org Unit ──────────────────────────────────────────────────────
-
-export const SET_DEFAULT_ORG_UNIT = '[B2BUnitSelection] Set Default Org Unit';
-export const SET_DEFAULT_ORG_UNIT_SUCCESS =
-  '[B2BUnitSelection] Set Default Org Unit Success';
-export const SET_DEFAULT_ORG_UNIT_FAIL =
-  '[B2BUnitSelection] Set Default Org Unit Fail';
-
-export class SetDefaultOrgUnit implements Action {
-  readonly type = SET_DEFAULT_ORG_UNIT;
-  constructor(
-    public payload: {
-      userId: string;
-      unitName: string;
-      /** true = triggered from the header selector (navigates home on success); false/undefined = triggered from the dialog */
-      redirectToHome?: boolean;
-    }
-  ) {}
-}
-
-export class SetDefaultOrgUnitSuccess implements Action {
-  readonly type = SET_DEFAULT_ORG_UNIT_SUCCESS;
-}
-
-export class SetDefaultOrgUnitFail implements Action, ErrorAction {
-  readonly type = SET_DEFAULT_ORG_UNIT_FAIL;
-  constructor(public error: any) {}
-}
-
-export type B2bUnitSelectionAction =
-  | LoadUserOrgUnitsSuccess
-  | LoadUserOrgUnitsFail
-  | SetDefaultOrgUnit
-  | SetDefaultOrgUnitSuccess
-  | SetDefaultOrgUnitFail;
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts b/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
deleted file mode 100644
index 310be832ef1..00000000000
--- a/feature-libs/organization/b2b-unit-selection/core/store/actions/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export * from './b2b-unit-selection.actions';
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts b/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
deleted file mode 100644
index 1347166da4f..00000000000
--- a/feature-libs/organization/b2b-unit-selection/core/store/b2b-unit-selection-store.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { NgModule } from '@angular/core';
-import { EffectsModule } from '@ngrx/effects';
-import { B2bUnitSelectionEffects } from './effects/b2b-unit-selection.effects';
-
-/**
- * Registers NgRx effects for the B2B unit selection feature.
- *
- * **Why zone stability matters:**
- * NgRx wraps every registered effect observable with `materialize()` and
- * merges them inside `EffectsRunner`, which lives for the entire application
- * lifetime inside Angular's zone.  Even when effects return `EMPTY` immediately,
- * the `merge()` + `exhaustMap()` subscription chain in `EffectSources.toActions()`
- * keeps a live observable subscription in the Angular zone indefinitely.
- * This prevents `ApplicationRef.isStable` from emitting `true`, causing
- * Cypress `cy.wait()` to time out with "No request ever occurred".
- *
- * **Solution: `OnRunEffects` hook.**
- * `B2bUnitSelectionEffects` implements the NgRx `OnRunEffects` interface.
- * When the feature is disabled, `ngrxOnRunEffects()` returns `EMPTY`, which
- * NgRx passes directly to `exhaustMap` — completing synchronously and creating
- * **no** Zone.js pending task so the zone can stabilise normally.
- */
-@NgModule({
-  imports: [EffectsModule.forFeature([B2bUnitSelectionEffects])],
-})
-export class B2bUnitSelectionStoreModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
deleted file mode 100644
index dc1c84a0288..00000000000
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.spec.ts
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  HttpErrorResponse,
-  provideHttpClient,
-  withInterceptorsFromDi,
-} from '@angular/common/http';
-import { provideHttpClientTesting } from '@angular/common/http/testing';
-import { ApplicationRef } from '@angular/core';
-import { fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { provideMockActions } from '@ngrx/effects/testing';
-import { Action } from '@ngrx/store';
-import {
-  AuthActions,
-  B2BUnit,
-  LoggerService,
-  UserIdService,
-  WindowRef,
-  tryNormalizeHttpError,
-} from '@spartacus/core';
-import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-// Side-effect import: ensures the LAUNCH_CALLER runtime assignment runs before tests.
-import '../../../root/model/augmented-core.model';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Observable, of, Subject, throwError } from 'rxjs';
-import { B2bUnitSelectionConfig } from '../../../root/config/b2b-unit-selection.config';
-import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
-import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
-import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
-import { B2bUnitSelectionEffects } from './b2b-unit-selection.effects';
-import createSpy = jasmine.createSpy;
-
-const mockUnits: B2BUnit[] = [
-  { uid: 'unit-1', name: 'Rustic' },
-  { uid: 'unit-2', name: 'Rustic Services' },
-];
-const mockUserId = 'current';
-const mockDefaultUid = 'Rustic';
-const mockError = new HttpErrorResponse({ error: 'test-error' });
-
-class MockLoggerService {
-  log(): void {}
-  warn(): void {}
-  error(): void {}
-  info(): void {}
-  debug(): void {}
-}
-
-class MockB2bUnitSelectionConnector {
-  loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
-  loadDefaultOrgUnitName = createSpy('loadDefaultOrgUnitName').and.returnValue(
-    of(mockDefaultUid)
-  );
-  setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(
-    of(void 0)
-  );
-}
-
-class MockB2bUnitSelectorStateService {
-  setOrgUnits = createSpy('setOrgUnits');
-  setActiveUnit = createSpy('setActiveUnit');
-}
-
-class MockLaunchDialogService {
-  openDialogAndSubscribe = createSpy('openDialogAndSubscribe');
-  closeDialog = createSpy('closeDialog');
-}
-
-class MockUserIdService {
-  takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
-  getUserId = createSpy('getUserId').and.returnValue(of(mockUserId));
-}
-
-class MockWindowRef {
-  nativeWindow = {
-    location: {
-      assign: createSpy('assign'),
-      reload: createSpy('reload'),
-    },
-  };
-}
-
-describe('B2bUnitSelectionEffects', () => {
-  let effects: B2bUnitSelectionEffects;
-  let connector: MockB2bUnitSelectionConnector;
-  let stateService: MockB2bUnitSelectorStateService;
-  let launchDialogService: MockLaunchDialogService;
-  let windowRef: MockWindowRef;
-  let actions$: Observable<Action>;
-  let applicationRef: any;
-
-  beforeEach(() => {
-    applicationRef = {
-      // Simulate AppComponent already mounted (manual ROPC login).
-      components: [{}],
-      // Required by Angular's ChangeDetectionSchedulerImpl (Angular 18+):
-      // - isStable: used by older internal code paths
-      // - afterTick: Subject subscribed to in the constructor
-      // - _tick: called by fakeAsync zone integration to trigger change detection
-      isStable: of(true),
-      afterTick: new Subject<void>(),
-      _tick: () => {},
-    };
-
-    TestBed.configureTestingModule({
-      providers: [
-        B2bUnitSelectionEffects,
-        {
-          provide: B2bUnitSelectionConnector,
-          useClass: MockB2bUnitSelectionConnector,
-        },
-        {
-          provide: B2bUnitSelectorStateService,
-          useClass: MockB2bUnitSelectorStateService,
-        },
-        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
-        { provide: UserIdService, useClass: MockUserIdService },
-        { provide: WindowRef, useClass: MockWindowRef },
-        { provide: ApplicationRef, useValue: applicationRef },
-        { provide: LoggerService, useClass: MockLoggerService },
-        {
-          provide: B2bUnitSelectionConfig,
-          useValue: { b2bUnitSelection: { enabled: true } },
-        },
-        provideMockActions(() => actions$),
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    });
-
-    effects = TestBed.inject(B2bUnitSelectionEffects);
-    connector = TestBed.inject(B2bUnitSelectionConnector) as any;
-    stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
-    launchDialogService = TestBed.inject(LaunchDialogService) as any;
-    windowRef = TestBed.inject(WindowRef) as any;
-  });
-
-  // ── checkOrgUnitsOnLogin$ ─────────────────────────────────────────────────
-
-  describe('checkOrgUnitsOnLogin$', () => {
-    it('should dispatch LoadUserOrgUnitsSuccess on successful login with multiple units', () => {
-      const action = new AuthActions.Login();
-      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(
-        mockUnits
-      );
-
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-b', { b: completion });
-
-      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
-    });
-
-    it('should write units and active unit to the state service', () => {
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-
-      effects.checkOrgUnitsOnLogin$.subscribe();
-      getTestScheduler().flush();
-
-      expect(stateService.setOrgUnits).toHaveBeenCalledWith(mockUnits);
-      expect(stateService.setActiveUnit).toHaveBeenCalledWith(mockDefaultUid);
-    });
-
-    it('should open the dialog when orgUnits.length > 0', () => {
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-
-      effects.checkOrgUnitsOnLogin$.subscribe();
-      getTestScheduler().flush();
-
-      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
-        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
-        undefined,
-        { orgUnits: mockUnits, defaultUnitName: mockDefaultUid }
-      );
-    });
-
-    it('should NOT open the dialog when orgUnits is empty', () => {
-      connector.loadOrgUnits.and.returnValue(of([]));
-      connector.loadDefaultOrgUnitName.and.returnValue(of(undefined));
-
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-
-      effects.checkOrgUnitsOnLogin$.subscribe();
-      getTestScheduler().flush();
-
-      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
-    });
-
-    it('should dispatch LoadUserOrgUnitsFail on connector error', () => {
-      connector.loadOrgUnits.and.returnValue(throwError(() => mockError));
-
-      const action = new AuthActions.Login();
-      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsFail(
-        tryNormalizeHttpError(mockError, new MockLoggerService())
-      );
-
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-b', { b: completion });
-
-      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
-    });
-
-    it('should degrade gracefully when loadDefaultOrgUnitName fails', () => {
-      connector.loadDefaultOrgUnitName.and.returnValue(
-        throwError(() => mockError)
-      );
-
-      const action = new AuthActions.Login();
-      const completion = new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(
-        mockUnits
-      );
-
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-b', { b: completion });
-
-      expect(effects.checkOrgUnitsOnLogin$).toBeObservable(expected);
-      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
-    });
-
-    it('should open the dialog via polling when AppComponent is not yet mounted (OAuth flow)', fakeAsync(() => {
-      // Simulate OAuth / page-refresh: components array is empty on LOGIN.
-      applicationRef.components = [];
-
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-
-      effects.checkOrgUnitsOnLogin$.subscribe();
-      getTestScheduler().flush();
-
-      // Dialog not yet opened — AppComponent not mounted.
-      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
-
-      // AppComponent mounts → next polling tick opens the dialog.
-      applicationRef.components = [{}];
-      tick(51); // advance past the 50 ms polling interval
-
-      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
-    }));
-
-    it('should still open dialog via timer fallback when AppComponent never mounts', fakeAsync(() => {
-      // Simulate OAuth / page-refresh: components array is empty on LOGIN.
-      applicationRef.components = [];
-      // AppComponent never mounts — components stays empty.
-
-      const action = new AuthActions.Login();
-      actions$ = hot('-a', { a: action });
-
-      effects.checkOrgUnitsOnLogin$.subscribe();
-      getTestScheduler().flush();
-
-      // Fast-forward past STABLE_TIMEOUT_MS so the timer fallback fires.
-      tick((effects as any).STABLE_TIMEOUT_MS + 1);
-
-      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
-    }));
-  });
-
-  // ── setDefaultOrgUnit$ ────────────────────────────────────────────────────
-
-  describe('setDefaultOrgUnit$', () => {
-    const payload = { userId: mockUserId, unitName: 'Rustic Services' };
-
-    it('should dispatch SetDefaultOrgUnitSuccess', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
-      const completion = new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess();
-
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-b', { b: completion });
-
-      expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
-    });
-
-    it('should close dialog and update state', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
-      actions$ = hot('-a', { a: action });
-
-      effects.setDefaultOrgUnit$.subscribe();
-      getTestScheduler().flush();
-
-      expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
-      expect(stateService.setActiveUnit).toHaveBeenCalledWith(payload.unitName);
-    });
-
-    it('should call location.reload() when redirectToHome is false (dialog confirmation)', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
-      actions$ = hot('-a', { a: action });
-
-      effects.setDefaultOrgUnit$.subscribe();
-      getTestScheduler().flush();
-
-      expect(windowRef.nativeWindow.location.reload).toHaveBeenCalled();
-      expect(windowRef.nativeWindow.location.assign).not.toHaveBeenCalled();
-    });
-
-    it('should call location.assign("/") when redirectToHome is true (header selector)', () => {
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit({
-        ...payload,
-        redirectToHome: true,
-      });
-      actions$ = hot('-a', { a: action });
-
-      effects.setDefaultOrgUnit$.subscribe();
-      getTestScheduler().flush();
-
-      expect(windowRef.nativeWindow.location.assign).toHaveBeenCalledWith('/');
-      expect(windowRef.nativeWindow.location.reload).not.toHaveBeenCalled();
-    });
-
-    it('should dispatch SetDefaultOrgUnitFail on connector error', () => {
-      connector.setDefaultOrgUnit.and.returnValue(throwError(() => mockError));
-
-      const action = new B2bUnitSelectionActions.SetDefaultOrgUnit(payload);
-      const completion = new B2bUnitSelectionActions.SetDefaultOrgUnitFail(
-        tryNormalizeHttpError(mockError, new MockLoggerService())
-      );
-
-      actions$ = hot('-a', { a: action });
-      const expected = cold('-b', { b: completion });
-
-      expect(effects.setDefaultOrgUnit$).toBeObservable(expected);
-    });
-  });
-
-  // ── clearOnLogout$ ────────────────────────────────────────────────────────
-
-  describe('clearOnLogout$', () => {
-    it('should clear state service on LOGOUT', () => {
-      const action = new AuthActions.Logout();
-      actions$ = hot('-a', { a: action });
-
-      effects.clearOnLogout$.subscribe();
-      getTestScheduler().flush();
-
-      expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
-      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
-    });
-  });
-});
-
-// ── B2bUnitSelectionEffects (feature disabled) ────────────────────────────
-// Isolated top-level describe so TestBed can be freshly configured without
-// interference from the parent describe's beforeEach which calls inject().
-
-describe('B2bUnitSelectionEffects (feature disabled)', () => {
-  let effects: B2bUnitSelectionEffects;
-  let actions$: Observable<Action>;
-
-  beforeEach(() => {
-    const appRef: any = {
-      components: [{}],
-      // Required by Angular's ChangeDetectionSchedulerImpl (Angular 18+):
-      // - isStable: used by older internal code paths
-      // - afterTick: Subject subscribed to in the constructor
-      isStable: of(true),
-      afterTick: new Subject<void>(),
-    };
-
-    TestBed.configureTestingModule({
-      providers: [
-        B2bUnitSelectionEffects,
-        {
-          provide: B2bUnitSelectionConnector,
-          useClass: MockB2bUnitSelectionConnector,
-        },
-        {
-          provide: B2bUnitSelectorStateService,
-          useClass: MockB2bUnitSelectorStateService,
-        },
-        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
-        { provide: UserIdService, useClass: MockUserIdService },
-        { provide: WindowRef, useClass: MockWindowRef },
-        { provide: ApplicationRef, useValue: appRef },
-        { provide: LoggerService, useClass: MockLoggerService },
-        {
-          provide: B2bUnitSelectionConfig,
-          useValue: { b2bUnitSelection: { enabled: false } },
-        },
-        provideMockActions(() => actions$),
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    });
-
-    effects = TestBed.inject(B2bUnitSelectionEffects);
-  });
-
-  it('ngrxOnRunEffects should return EMPTY when the feature is disabled', () => {
-    // The disabled gate lives in ngrxOnRunEffects, not in each individual effect.
-    // jasmine-marbles tests effect observables directly (bypassing NgRx's
-    // EffectSources runner), so this is the correct place to assert the behavior.
-    const resolvedEffects$ = cold('-a', { a: {} });
-    const expected = cold('|');
-
-    expect(effects.ngrxOnRunEffects(resolvedEffects$ as any)).toBeObservable(
-      expected
-    );
-  });
-});
diff --git a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts b/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
deleted file mode 100644
index c9a2ea48861..00000000000
--- a/feature-libs/organization/b2b-unit-selection/core/store/effects/b2b-unit-selection.effects.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { HttpErrorResponse } from '@angular/common/http';
-import { ApplicationRef, inject, Injectable, NgZone } from '@angular/core';
-import {
-  Actions,
-  createEffect,
-  EffectNotification,
-  ofType,
-  OnRunEffects,
-} from '@ngrx/effects';
-import {
-  AuthActions,
-  B2BUnit,
-  EventService,
-  LoggerService,
-  OCC_USER_ID_ANONYMOUS,
-  tryNormalizeHttpError,
-  UserIdService,
-  WindowRef,
-} from '@spartacus/core';
-import {
-  B2bUnitSelectionConfig,
-  B2bUnitSwitchedEvent,
-  B2bUnitSwitchFailedEvent,
-} from '@spartacus/organization/b2b-unit-selection/root';
-import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
-import { EMPTY, forkJoin, interval, Observable, of, race, timer } from 'rxjs';
-import {
-  catchError,
-  exhaustMap,
-  filter,
-  map,
-  startWith,
-  switchMap,
-  take,
-  tap,
-} from 'rxjs/operators';
-import { B2bUnitSelectionConnector } from '../../connectors/b2b-unit-selection.connector';
-import { B2bUnitSelectorStateService } from '../../services/b2b-unit-selector-state.service';
-import * as B2bUnitSelectionActions from '../actions/b2b-unit-selection.actions';
-
-@Injectable()
-export class B2bUnitSelectionEffects implements OnRunEffects {
-  protected logger = inject(LoggerService);
-  protected config = inject(B2bUnitSelectionConfig);
-  protected applicationRef = inject(ApplicationRef);
-  protected ngZone = inject(NgZone);
-  protected stateService = inject(B2bUnitSelectorStateService);
-  protected windowRef = inject(WindowRef);
-
-  /**
-   * Listens for the LOGIN action and loads the user's org units and default unit.
-   * Opens the unit-selection dialog when the user belongs to more than one unit.
-   *
-   * Two login scenarios are handled:
-   * 1. Manual login (ROPC — user submits the Spartacus login form):
-   *    ApplicationRef.components already has mounted components; the dialog opens immediately.
-   *
-   * 2. OAuth Authorization Code Flow or page-refresh token restore:
-   *    ApplicationRef.components may be empty; polling waits for AppComponent to mount
-   *    before opening the dialog.
-   */
-  checkOrgUnitsOnLogin$: Observable<
-    | B2bUnitSelectionActions.LoadUserOrgUnitsSuccess
-    | B2bUnitSelectionActions.LoadUserOrgUnitsFail
-  > = createEffect(() =>
-    this.actions$.pipe(
-      ofType<AuthActions.Login>(AuthActions.LOGIN),
-      exhaustMap(() =>
-        this.userIdService.getUserId().pipe(
-          filter((userId) => userId !== OCC_USER_ID_ANONYMOUS),
-          take(1),
-          switchMap((userId) =>
-            forkJoin({
-              orgUnits: this.connector.loadOrgUnits(userId),
-              // Gracefully degrade if loading the default unit fails — do not block the main flow.
-              defaultUnitName: this.connector
-                .loadDefaultOrgUnitName(userId)
-                .pipe(catchError(() => of(undefined))),
-            }).pipe(
-              tap(({ orgUnits, defaultUnitName }) => {
-                // Always write to the state service so the Company header selector is populated.
-                this.stateService.setOrgUnits(orgUnits);
-                this.stateService.setActiveUnit(defaultUnitName ?? null);
-                if (orgUnits.length > 0) {
-                  this.openDialogWhenReady(orgUnits, defaultUnitName);
-                }
-              }),
-              map(
-                ({ orgUnits }) =>
-                  new B2bUnitSelectionActions.LoadUserOrgUnitsSuccess(orgUnits)
-              ),
-              catchError((error: HttpErrorResponse) =>
-                of(
-                  new B2bUnitSelectionActions.LoadUserOrgUnitsFail(
-                    tryNormalizeHttpError(error, this.logger)
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  );
-
-  /**
-   * Listens for SET_DEFAULT_ORG_UNIT and calls the PUT API to persist the selection.
-   * On success, closes the dialog, updates the header selector state, and reloads
-   * the page so all org-context-dependent data (prices, catalog, CMS) is refreshed.
-   */
-  setDefaultOrgUnit$: Observable<
-    | B2bUnitSelectionActions.SetDefaultOrgUnitSuccess
-    | B2bUnitSelectionActions.SetDefaultOrgUnitFail
-  > = createEffect(() =>
-    this.actions$.pipe(
-      ofType<B2bUnitSelectionActions.SetDefaultOrgUnit>(
-        B2bUnitSelectionActions.SET_DEFAULT_ORG_UNIT
-      ),
-      map(
-        (action: B2bUnitSelectionActions.SetDefaultOrgUnit) => action.payload
-      ),
-      switchMap(({ userId, unitName, redirectToHome }) =>
-        this.connector.setDefaultOrgUnit(userId, unitName).pipe(
-          tap(() => {
-            this.launchDialogService.closeDialog('CONFIRMED');
-            this.stateService.setActiveUnit(unitName);
-            this.eventService.dispatch(
-              { userId, unitName, redirectedToHome: redirectToHome ?? false },
-              B2bUnitSwitchedEvent
-            );
-            // Reload the page so all org-context data is refreshed for the
-            // newly selected unit.
-            // Header selector: navigate to home root and trigger a full page
-            // reload in one step via location.assign('/').
-            // Dialog: reload the current page in-place via location.reload().
-            if (redirectToHome) {
-              this.windowRef.nativeWindow?.location?.assign('/');
-            } else {
-              this.windowRef.nativeWindow?.location?.reload();
-            }
-          }),
-          map(() => new B2bUnitSelectionActions.SetDefaultOrgUnitSuccess()),
-          catchError((error: HttpErrorResponse) => {
-            this.eventService.dispatch(
-              {
-                userId,
-                unitName,
-                error: tryNormalizeHttpError(error, this.logger),
-              },
-              B2bUnitSwitchFailedEvent
-            );
-            return of(
-              new B2bUnitSelectionActions.SetDefaultOrgUnitFail(
-                tryNormalizeHttpError(error, this.logger)
-              )
-            );
-          })
-        )
-      )
-    )
-  );
-
-  /**
-   * Listens for LOGOUT and clears the state service so the Company selector
-   * is hidden after the user logs out.
-   */
-  clearOnLogout$ = createEffect(
-    () =>
-      this.actions$.pipe(
-        ofType<AuthActions.Logout>(AuthActions.LOGOUT),
-        tap(() => {
-          this.stateService.setOrgUnits([]);
-          this.stateService.setActiveUnit(null);
-        })
-      ),
-    { dispatch: false }
-  );
-
-  constructor(
-    protected actions$: Actions,
-    protected connector: B2bUnitSelectionConnector,
-    protected userIdService: UserIdService,
-    protected launchDialogService: LaunchDialogService,
-    protected eventService: EventService
-  ) {}
-
-  /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
-  protected readonly STABLE_TIMEOUT_MS = 10_000;
-
-  /**
-   * NgRx `OnRunEffects` hook — called by NgRx in `resolveEffectSource` instead
-   * of subscribing to `mergedEffects$` directly.
-   *
-   * **Why this fixes zone stability:**
-   * `EffectsModule.forFeature` always registers the effects class, and NgRx's
-   * `EffectSources.toActions()` wraps every registered effect with `materialize()`
-   * then merges them inside an `exhaustMap` that lives for the entire application
-   * lifetime inside Angular's zone.  Even when individual effects return
-   * `defer(() => EMPTY)` immediately, the outer `merge()` + `exhaustMap()`
-   * subscription chain keeps a live observable in the zone indefinitely.
-   * This prevents `ApplicationRef.isStable` from emitting `true`, causing
-   * Cypress `cy.wait()` to time out with "No request ever occurred".
-   *
-   * Returning `EMPTY` from this hook causes `resolveEffectSource` to return
-   * `EMPTY` to `exhaustMap`, which completes synchronously and creates **no**
-   * Zone.js pending task — allowing the zone to stabilise normally.
-   */
-  ngrxOnRunEffects(
-    resolvedEffects$: Observable<EffectNotification>
-  ): Observable<EffectNotification> {
-    if (!this.config.b2bUnitSelection?.enabled) {
-      return EMPTY;
-    }
-    return resolvedEffects$;
-  }
-
-  /**
-   * Opens the unit-selection dialog once the AppComponent is mounted.
-   *
-   * Polls `ApplicationRef.components` every 50 ms so the dialog opens as soon
-   * as the root component is bootstrapped — typically within one or two ticks.
-   *
-   * The polling runs OUTSIDE Angular's zone via `NgZone.runOutsideAngular` so
-   * the `setInterval` does not keep the zone perpetually unstable, which would
-   * otherwise prevent `ApplicationRef.isStable` from emitting and block CMS
-   * page rendering.
-   *
-   * A `timer(STABLE_TIMEOUT_MS)` fallback ensures the subscription always
-   * completes even if AppComponent never mounts, preventing a memory leak.
-   */
-  protected openDialogWhenReady(
-    orgUnits: B2BUnit[],
-    defaultUnitName: string | undefined
-  ): void {
-    const open = () => {
-      this.launchDialogService.openDialogAndSubscribe(
-        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
-        undefined,
-        { orgUnits, defaultUnitName }
-      );
-    };
-
-    // Run the polling interval outside Angular's zone so the continuous
-    // setInterval does not keep ApplicationRef.isStable from emitting true.
-    this.ngZone.runOutsideAngular(() => {
-      race(
-        interval(50).pipe(
-          startWith(0),
-          filter(() => this.applicationRef.components.length > 0),
-          take(1)
-        ),
-        timer(this.STABLE_TIMEOUT_MS)
-      )
-        .subscribe(() => this.ngZone.run(() => open()));
-    });
-  }
-}

From 609a722146b3029894f88e0ed51240d0a6336881 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 3 Aug 2026 11:33:02 +0800
Subject: [PATCH 55/60] fix

fix
---
 .../b2b-unit-selection-components.module.ts   | 15 +++++-----
 ...provide-b2b-unit-selector-cms-component.ts | 29 +++++++++++++++++++
 .../components/public_api.ts                  |  1 +
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
index 0921d386fb8..eb536c8124e 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
+import { provideDefaultConfig } from '@spartacus/core';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
 import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selection-layout.config';
@@ -14,13 +14,12 @@ import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selectio
   imports: [B2bUnitSelectionDialogComponent, B2bUnitSelectorComponent],
   providers: [
     provideDefaultConfig(defaultB2bUnitSelectionLayoutConfig),
-    provideDefaultConfig(<CmsConfig>{
-      cmsComponents: {
-        B2bUnitSelectorComponent: {
-          component: B2bUnitSelectorComponent,
-        },
-      },
-    }),
+    // CMS component mapping is intentionally NOT registered here.
+    // It is only registered when the feature is explicitly enabled, via
+    // provideB2bUnitSelectorCmsComponent() in the consuming feature module.
+    // This prevents Angular from instantiating B2bUnitSelectorComponent in the
+    // CMS slot when the feature is disabled, which would otherwise create
+    // Zone.js micro-tasks and prevent ApplicationRef.isStable from emitting.
   ],
 })
 export class B2bUnitSelectionComponentsModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts b/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts
new file mode 100644
index 00000000000..c64cdf7d537
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Provider } from '@angular/core';
+import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
+import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
+
+/**
+ * Registers `B2bUnitSelectorComponent` in the CMS component map.
+ *
+ * Call this helper alongside `provideConfig({ b2bUnitSelection: { enabled: true } })`
+ * in your feature module.  Keeping the CMS registration separate from the base
+ * `B2bUnitSelectionComponentsModule` ensures the component is never instantiated
+ * by Angular's CMS engine when the feature is disabled — which would otherwise
+ * create Zone.js micro-tasks and prevent `ApplicationRef.isStable` from emitting
+ * `true`, causing Cypress `cy.wait()` calls to time out.
+ */
+export function provideB2bUnitSelectorCmsComponent(): Provider {
+  return provideDefaultConfig(<CmsConfig>{
+    cmsComponents: {
+      B2bUnitSelectorComponent: {
+        component: B2bUnitSelectorComponent,
+      },
+    },
+  });
+}
diff --git a/feature-libs/organization/b2b-unit-selection/components/public_api.ts b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
index 34411684e3a..e8063fa5191 100644
--- a/feature-libs/organization/b2b-unit-selection/components/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
@@ -9,3 +9,4 @@ export * from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 export * from './b2b-unit-selector/abstract-b2b-unit-selector.component';
 export * from './b2b-unit-selector/b2b-unit-selector.component';
 export * from './default-b2b-unit-selection-layout.config';
+export * from './provide-b2b-unit-selector-cms-component';

From 4a38946e2437b8a647c7f718f9eebc775714c286 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Mon, 3 Aug 2026 14:42:49 +0800
Subject: [PATCH 56/60] fix

fix
---
 .../b2b-unit-selection-components.module.ts   | 15 +++++-----
 ...provide-b2b-unit-selector-cms-component.ts | 29 -------------------
 .../components/public_api.ts                  |  1 -
 .../root/b2b-unit-selection-root.module.ts    | 24 +++++++++++++--
 ...ation-b2b-unit-selection-feature.module.ts | 24 ++++++++++-----
 5 files changed, 46 insertions(+), 47 deletions(-)
 delete mode 100644 feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
index eb536c8124e..0921d386fb8 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-components.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { provideDefaultConfig } from '@spartacus/core';
+import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
 import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selection-layout.config';
@@ -14,12 +14,13 @@ import { defaultB2bUnitSelectionLayoutConfig } from './default-b2b-unit-selectio
   imports: [B2bUnitSelectionDialogComponent, B2bUnitSelectorComponent],
   providers: [
     provideDefaultConfig(defaultB2bUnitSelectionLayoutConfig),
-    // CMS component mapping is intentionally NOT registered here.
-    // It is only registered when the feature is explicitly enabled, via
-    // provideB2bUnitSelectorCmsComponent() in the consuming feature module.
-    // This prevents Angular from instantiating B2bUnitSelectorComponent in the
-    // CMS slot when the feature is disabled, which would otherwise create
-    // Zone.js micro-tasks and prevent ApplicationRef.isStable from emitting.
+    provideDefaultConfig(<CmsConfig>{
+      cmsComponents: {
+        B2bUnitSelectorComponent: {
+          component: B2bUnitSelectorComponent,
+        },
+      },
+    }),
   ],
 })
 export class B2bUnitSelectionComponentsModule {}
diff --git a/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts b/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts
deleted file mode 100644
index c64cdf7d537..00000000000
--- a/feature-libs/organization/b2b-unit-selection/components/provide-b2b-unit-selector-cms-component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Provider } from '@angular/core';
-import { CmsConfig, provideDefaultConfig } from '@spartacus/core';
-import { B2bUnitSelectorComponent } from './b2b-unit-selector/b2b-unit-selector.component';
-
-/**
- * Registers `B2bUnitSelectorComponent` in the CMS component map.
- *
- * Call this helper alongside `provideConfig({ b2bUnitSelection: { enabled: true } })`
- * in your feature module.  Keeping the CMS registration separate from the base
- * `B2bUnitSelectionComponentsModule` ensures the component is never instantiated
- * by Angular's CMS engine when the feature is disabled — which would otherwise
- * create Zone.js micro-tasks and prevent `ApplicationRef.isStable` from emitting
- * `true`, causing Cypress `cy.wait()` calls to time out.
- */
-export function provideB2bUnitSelectorCmsComponent(): Provider {
-  return provideDefaultConfig(<CmsConfig>{
-    cmsComponents: {
-      B2bUnitSelectorComponent: {
-        component: B2bUnitSelectorComponent,
-      },
-    },
-  });
-}
diff --git a/feature-libs/organization/b2b-unit-selection/components/public_api.ts b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
index e8063fa5191..34411684e3a 100644
--- a/feature-libs/organization/b2b-unit-selection/components/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/public_api.ts
@@ -9,4 +9,3 @@ export * from './b2b-unit-selection-dialog/b2b-unit-selection-dialog.component';
 export * from './b2b-unit-selector/abstract-b2b-unit-selector.component';
 export * from './b2b-unit-selector/b2b-unit-selector.component';
 export * from './default-b2b-unit-selection-layout.config';
-export * from './provide-b2b-unit-selector-cms-component';
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
index 8d982040d0d..970857dddc3 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
@@ -5,12 +5,32 @@
  */
 
 import { NgModule } from '@angular/core';
-import { provideDefaultConfig } from '@spartacus/core';
+import {
+  CmsConfig,
+  provideDefaultConfig,
+  provideDefaultConfigFactory,
+} from '@spartacus/core';
 import { defaultB2bUnitSelectionConfig } from './config/default-b2b-unit-selection-config';
+import { ORGANIZATION_B2B_UNIT_SELECTION_FEATURE } from './feature-name';
 // Side-effect import: ensures the LAUNCH_CALLER extension is registered at application startup.
 import './model/augmented-core.model';
 
+// TODO: Inline this factory when we start releasing Ivy compiled libraries
+export function defaultB2bUnitSelectionComponentsConfig(): CmsConfig {
+  const config: CmsConfig = {
+    featureModules: {
+      [ORGANIZATION_B2B_UNIT_SELECTION_FEATURE]: {
+        cmsComponents: ['B2bUnitSelectorComponent'],
+      },
+    },
+  };
+  return config;
+}
+
 @NgModule({
-  providers: [provideDefaultConfig(defaultB2bUnitSelectionConfig)],
+  providers: [
+    provideDefaultConfig(defaultB2bUnitSelectionConfig),
+    provideDefaultConfigFactory(defaultB2bUnitSelectionComponentsConfig),
+  ],
 })
 export class B2bUnitSelectionRootModule {}
diff --git a/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
index 58293d129f7..d0d1511b311 100644
--- a/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts
@@ -5,21 +5,29 @@
  */
 
 import { NgModule } from '@angular/core';
-import { I18nConfig, provideConfig } from '@spartacus/core';
+import { CmsConfig, I18nConfig, provideConfig } from '@spartacus/core';
 import {
   b2bUnitSelectionTranslationChunksConfig,
   b2bUnitSelectionTranslationsEn,
 } from '@spartacus/organization/b2b-unit-selection/assets';
-import { B2bUnitSelectionModule } from '@spartacus/organization/b2b-unit-selection';
-import { B2bUnitSelectionRootModule } from '@spartacus/organization/b2b-unit-selection/root';
+import {
+  B2bUnitSelectionRootModule,
+  ORGANIZATION_B2B_UNIT_SELECTION_FEATURE,
+} from '@spartacus/organization/b2b-unit-selection/root';
 
-/**
- * Feature module for B2B Unit Selection.
- *
- */
 @NgModule({
-  imports: [B2bUnitSelectionRootModule, B2bUnitSelectionModule],
+  imports: [B2bUnitSelectionRootModule],
   providers: [
+    provideConfig(<CmsConfig>{
+      featureModules: {
+        [ORGANIZATION_B2B_UNIT_SELECTION_FEATURE]: {
+          module: () =>
+            import('@spartacus/organization/b2b-unit-selection').then(
+              (m) => m.B2bUnitSelectionModule
+            ),
+        },
+      },
+    }),
     provideConfig(<I18nConfig>{
       i18n: {
         resources: {

From 2acc1e30016dc27a11fa56408a0e4b4ad03853cb Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 4 Aug 2026 12:47:01 +0800
Subject: [PATCH 57/60] fix

fix
---
 ...2b-unit-selection-dialog.component.spec.ts |  66 +--
 .../b2b-unit-selection-dialog.component.ts    |  40 +-
 .../core/b2b-unit-selection-core.module.ts    |   5 +-
 .../b2b-unit-selection.service.spec.ts        | 439 ++++++++++++++++++
 .../services/b2b-unit-selection.service.ts    | 199 ++++----
 .../occ/b2b-unit-selection-occ.module.ts      |   3 -
 .../b2b-unit-selection/occ/public_api.ts      |   2 -
 .../root/b2b-unit-selection-root.module.ts    |   8 +-
 .../default-occ-b2b-unit-selection-config.ts  |  27 ++
 .../occ-b2b-unit-selection-endpoints.model.ts |  31 ++
 .../b2b-unit-selection/root/public_api.ts     |   2 +
 11 files changed, 688 insertions(+), 134 deletions(-)
 create mode 100644 feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.spec.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/config/default-occ-b2b-unit-selection-config.ts
 create mode 100644 feature-libs/organization/b2b-unit-selection/root/model/occ-b2b-unit-selection-endpoints.model.ts

diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
index d07cf45c4c6..9390c795182 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.spec.ts
@@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Directive, Input } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { NgSelectModule } from '@ng-select/ng-select';
-import { B2BUnit, I18nTestingModule, UserIdService } from '@spartacus/core';
+import { B2BUnit, I18nTestingModule } from '@spartacus/core';
 import {
   FocusConfig,
   FocusDirective,
@@ -16,8 +16,7 @@ import {
   LaunchDialogService,
   NgSelectA11yDirective,
 } from '@spartacus/storefront';
-import { BehaviorSubject, of } from 'rxjs';
-import { B2bUnitSelectionService } from '../../core/services/b2b-unit-selection.service';
+import { BehaviorSubject } from 'rxjs';
 import { B2bUnitSelectionDialogComponent } from './b2b-unit-selection-dialog.component';
 import createSpy = jasmine.createSpy;
 
@@ -25,7 +24,6 @@ const mockUnits: B2BUnit[] = [
   { uid: 'unit-1', name: 'Rustic' },
   { uid: 'unit-2', name: 'Rustic Services' },
 ];
-const mockUserId = 'current';
 
 @Directive({ selector: '[cxFocus]' })
 class MockFocusDirective {
@@ -37,18 +35,9 @@ class MockNgSelectA11yDirective {
   @Input() cxNgSelectA11y: { ariaLabel?: string } = {};
 }
 
-class MockUserIdService {
-  takeUserId = createSpy('takeUserId').and.returnValue(of(mockUserId));
-}
-
-class MockB2bUnitSelectionService {
-  setDefaultUnit = createSpy('setDefaultUnit');
-}
-
 describe('B2bUnitSelectionDialogComponent', () => {
   let component: B2bUnitSelectionDialogComponent;
   let fixture: ComponentFixture<B2bUnitSelectionDialogComponent>;
-  let unitSelectionService: MockB2bUnitSelectionService;
   let data$: BehaviorSubject<any>;
 
   function createComponent(dialogData: any = {}): void {
@@ -62,14 +51,7 @@ describe('B2bUnitSelectionDialogComponent', () => {
         I18nTestingModule,
         FormErrorsModule,
       ],
-      providers: [
-        { provide: LaunchDialogService, useValue: { data$ } },
-        { provide: UserIdService, useClass: MockUserIdService },
-        {
-          provide: B2bUnitSelectionService,
-          useClass: MockB2bUnitSelectionService,
-        },
-      ],
+      providers: [{ provide: LaunchDialogService, useValue: { data$ } }],
     })
       .overrideComponent(B2bUnitSelectionDialogComponent, {
         remove: { imports: [FocusDirective, NgSelectA11yDirective] },
@@ -82,7 +64,6 @@ describe('B2bUnitSelectionDialogComponent', () => {
 
     fixture = TestBed.createComponent(B2bUnitSelectionDialogComponent);
     component = fixture.componentInstance;
-    unitSelectionService = TestBed.inject(B2bUnitSelectionService) as any;
   }
 
   // ── ngOnInit ──────────────────────────────────────────────────────────────
@@ -126,33 +107,58 @@ describe('B2bUnitSelectionDialogComponent', () => {
       expect(component.orgUnits).toEqual([]);
       expect(component.form.value.selectedUnit).toBeNull();
     }));
+
+    it('should store the onConfirm callback from dialog data', waitForAsync(() => {
+      const onConfirm = createSpy('onConfirm');
+      createComponent({
+        orgUnits: mockUnits,
+        defaultUnitName: 'Rustic',
+        onConfirm,
+      });
+      fixture.detectChanges();
+
+      expect((component as any).onConfirm).toBe(onConfirm);
+    }));
   });
 
   // ── confirm() ─────────────────────────────────────────────────────────────
 
   describe('confirm()', () => {
+    let onConfirm: jasmine.Spy;
+
     beforeEach(waitForAsync(() => {
-      createComponent({ orgUnits: mockUnits, defaultUnitName: 'Rustic' });
+      onConfirm = createSpy('onConfirm');
+      createComponent({
+        orgUnits: mockUnits,
+        defaultUnitName: 'Rustic',
+        onConfirm,
+      });
       fixture.detectChanges();
     }));
 
-    it('should call setDefaultUnit with correct payload', () => {
+    it('should invoke the onConfirm callback with the selected unit name', () => {
       component.confirm();
 
-      expect(unitSelectionService.setDefaultUnit).toHaveBeenCalledWith(
-        mockUserId,
-        'Rustic'
-      );
+      expect(onConfirm).toHaveBeenCalledWith('Rustic');
     });
 
-    it('should mark form as touched and NOT call setDefaultUnit when selectedUnit is null', () => {
+    it('should mark form as touched and NOT invoke onConfirm when selectedUnit is null', () => {
       component.form.get('selectedUnit')?.setValue(null);
 
       component.confirm();
 
-      expect(unitSelectionService.setDefaultUnit).not.toHaveBeenCalled();
+      expect(onConfirm).not.toHaveBeenCalled();
       expect(component.form.get('selectedUnit')?.touched).toBeTrue();
     });
+
+    it('should NOT throw when onConfirm is not provided', () => {
+      // Re-create without onConfirm in data payload.
+      TestBed.resetTestingModule();
+      createComponent({ orgUnits: mockUnits, defaultUnitName: 'Rustic' });
+      fixture.detectChanges();
+
+      expect(() => component.confirm()).not.toThrow();
+    });
   });
 
   // ── ngOnDestroy ───────────────────────────────────────────────────────────
diff --git a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
index 54728860a0b..fada24c081d 100644
--- a/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
+++ b/feature-libs/organization/b2b-unit-selection/components/b2b-unit-selection-dialog/b2b-unit-selection-dialog.component.ts
@@ -17,7 +17,7 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import { B2BUnit, TranslatePipe, UserIdService } from '@spartacus/core';
+import { B2BUnit, TranslatePipe } from '@spartacus/core';
 import {
   FocusConfig,
   FocusDirective,
@@ -28,8 +28,21 @@ import {
 import { NgSelectComponent } from '@ng-select/ng-select';
 import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { B2bUnitSelectionService } from '@spartacus/organization/b2b-unit-selection/core';
 
+/**
+ * Dialog component for B2B unit selection.
+ *
+ * This component is standalone and rendered in the root outlet via
+ * `inlineRoot: true`. It does NOT inject `B2bUnitSelectionService` because
+ * that service is module-scoped (lives in the lazy feature module's child
+ * injector) and is therefore not reachable from the root outlet context.
+ *
+ * Instead, `B2bUnitSelectionService.openDialogWhenReady` passes an `onConfirm`
+ * callback via the dialog data payload. On confirmation this component calls
+ * that callback with the selected unit name, which triggers `setDefaultUnit`
+ * in the service. The service then calls `LaunchDialogService.closeDialog` on
+ * HTTP success — preserving the original close-after-persist behaviour.
+ */
 @Component({
   selector: 'cx-b2b-unit-selection-dialog',
   templateUrl: './b2b-unit-selection-dialog.component.html',
@@ -45,12 +58,12 @@ import { B2bUnitSelectionService } from '@spartacus/organization/b2b-unit-select
 })
 export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
   protected launchDialogService = inject(LaunchDialogService);
-  protected userIdService = inject(UserIdService);
-  protected unitSelectionService = inject(B2bUnitSelectionService);
 
   orgUnits: B2BUnit[] = [];
   protected subscriptions = new Subscription();
 
+  private onConfirm?: (unitName: string) => void;
+
   focusConfig: FocusConfig = {
     trap: true,
     block: true,
@@ -67,8 +80,13 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
       this.launchDialogService.data$
         .pipe(take(1))
         .subscribe(
-          (data: { orgUnits: B2BUnit[]; defaultUnitName?: string }) => {
+          (data: {
+            orgUnits: B2BUnit[];
+            defaultUnitName?: string;
+            onConfirm?: (unitName: string) => void;
+          }) => {
             this.orgUnits = data?.orgUnits ?? [];
+            this.onConfirm = data?.onConfirm;
             const matched =
               this.orgUnits.find((u) => u.name === data?.defaultUnitName) ??
               this.orgUnits[0] ??
@@ -79,6 +97,11 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
     );
   }
 
+  /**
+   * Invokes the `onConfirm` callback provided by `B2bUnitSelectionService`
+   * via the dialog data payload. The service handles the API call and closes
+   * the dialog on success via `LaunchDialogService.closeDialog`.
+   */
   confirm(): void {
     if (this.form.invalid) {
       this.form.markAllAsTouched();
@@ -88,12 +111,7 @@ export class B2bUnitSelectionDialogComponent implements OnInit, OnDestroy {
     if (!unit) {
       return;
     }
-    this.userIdService
-      .takeUserId(true)
-      .pipe(take(1))
-      .subscribe((userId) => {
-        this.unitSelectionService.setDefaultUnit(userId, unit.name ?? '');
-      });
+    this.onConfirm?.(unit.name ?? '');
   }
 
   ngOnDestroy(): void {
diff --git a/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
index f90fafc7086..1c0cd3a16ca 100644
--- a/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/b2b-unit-selection-core.module.ts
@@ -11,13 +11,12 @@ import { B2bUnitSelectionService } from './services/b2b-unit-selection.service';
 @NgModule({
   providers: [
     B2bUnitSelectionConnector,
-    // Eagerly initialise the service so it subscribes to LoginEvent/LogoutEvent
+    // Eagerly initialise the service so it subscribes to user ID changes
     // as soon as the feature module is loaded.
     B2bUnitSelectionService,
   ],
 })
 export class B2bUnitSelectionCoreModule {
-  // Inject here to trigger instantiation (providedIn: 'root' is lazy by default
-  // inside feature modules unless explicitly constructed).
+  // Inject here to trigger instantiation eagerly when the feature module loads.
   constructor(_service: B2bUnitSelectionService) {}
 }
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.spec.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.spec.ts
new file mode 100644
index 00000000000..cfddf604aa3
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.spec.ts
@@ -0,0 +1,439 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ApplicationRef, ComponentRef } from '@angular/core';
+import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { HttpErrorResponse } from '@angular/common/http';
+import {
+  B2BUnit,
+  EventService,
+  LoggerService,
+  OCC_USER_ID_ANONYMOUS,
+  UserIdService,
+  WindowRef,
+} from '@spartacus/core';
+import {
+  B2bUnitSelectionConfig,
+  B2bUnitSwitchedEvent,
+  B2bUnitSwitchFailedEvent,
+} from '@spartacus/organization/b2b-unit-selection/root';
+import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
+import { BehaviorSubject, of, throwError } from 'rxjs';
+import { B2bUnitSelectionConnector } from '../connectors/b2b-unit-selection.connector';
+import { B2bUnitSelectorStateService } from './b2b-unit-selector-state.service';
+import { B2bUnitSelectionService } from './b2b-unit-selection.service';
+import createSpy = jasmine.createSpy;
+
+const mockUnits: B2BUnit[] = [
+  { uid: 'unit-1', name: 'Rustic' },
+  { uid: 'unit-2', name: 'Rustic Services' },
+];
+const mockUserId = 'current';
+const mockDefaultUnitName = 'Rustic';
+
+class MockUserIdService {
+  private userId$ = new BehaviorSubject<string>(OCC_USER_ID_ANONYMOUS);
+  getUserId = createSpy('getUserId').and.callFake(() => this.userId$);
+  setUserId(id: string): void {
+    this.userId$.next(id);
+  }
+}
+
+class MockB2bUnitSelectionConnector {
+  loadOrgUnits = createSpy('loadOrgUnits').and.returnValue(of(mockUnits));
+  loadDefaultOrgUnitName = createSpy('loadDefaultOrgUnitName').and.returnValue(
+    of(mockDefaultUnitName)
+  );
+  setDefaultOrgUnit = createSpy('setDefaultOrgUnit').and.returnValue(
+    of(void 0)
+  );
+}
+
+class MockB2bUnitSelectorStateService {
+  setOrgUnits = createSpy('setOrgUnits');
+  setActiveUnit = createSpy('setActiveUnit');
+}
+
+class MockLaunchDialogService {
+  openDialogAndSubscribe = createSpy('openDialogAndSubscribe');
+  closeDialog = createSpy('closeDialog');
+}
+
+class MockEventService {
+  dispatch = createSpy('dispatch');
+}
+
+class MockLoggerService {
+  error = createSpy('error');
+  warn = createSpy('warn');
+}
+
+/**
+ * Mock WindowRef: proxies sessionStorage to the real window.sessionStorage
+ * so session-flag tests work, but stubs location.reload/assign to prevent
+ * real browser page reloads during Karma tests.
+ */
+class MockWindowRef {
+  nativeWindow = {
+    location: {
+      reload: createSpy('reload'),
+      assign: createSpy('assign'),
+    },
+  };
+
+  get sessionStorage(): Storage {
+    return window.sessionStorage;
+  }
+}
+
+describe('B2bUnitSelectionService', () => {
+  let service: B2bUnitSelectionService;
+  let userIdService: MockUserIdService;
+  let connector: MockB2bUnitSelectionConnector;
+  let stateService: MockB2bUnitSelectorStateService;
+  let launchDialogService: MockLaunchDialogService;
+  let eventService: MockEventService;
+
+  function createService(
+    enabled = true,
+    mockComponents: ComponentRef<any>[] = [{}] as any
+  ): void {
+    TestBed.configureTestingModule({
+      providers: [
+        B2bUnitSelectionService,
+        { provide: UserIdService, useClass: MockUserIdService },
+        {
+          provide: B2bUnitSelectionConnector,
+          useClass: MockB2bUnitSelectionConnector,
+        },
+        {
+          provide: B2bUnitSelectorStateService,
+          useClass: MockB2bUnitSelectorStateService,
+        },
+        { provide: LaunchDialogService, useClass: MockLaunchDialogService },
+        { provide: EventService, useClass: MockEventService },
+        { provide: LoggerService, useClass: MockLoggerService },
+        {
+          provide: B2bUnitSelectionConfig,
+          useValue: { b2bUnitSelection: { enabled } },
+        },
+        { provide: WindowRef, useClass: MockWindowRef },
+      ],
+    });
+
+    service = TestBed.inject(B2bUnitSelectionService);
+    userIdService = TestBed.inject(UserIdService) as any;
+    connector = TestBed.inject(B2bUnitSelectionConnector) as any;
+    stateService = TestBed.inject(B2bUnitSelectorStateService) as any;
+    launchDialogService = TestBed.inject(LaunchDialogService) as any;
+    eventService = TestBed.inject(EventService) as any;
+
+    // Override `components` on the real ApplicationRef instead of replacing
+    // the whole service. Replacing ApplicationRef with a bare object breaks
+    // Angular internals (ChangeDetectionSchedulerImpl) that access properties
+    // our mock does not provide.
+    (TestBed.inject(ApplicationRef) as any).components = mockComponents;
+  }
+
+  afterEach(() => {
+    TestBed.resetTestingModule();
+  });
+
+  // ── constructor / feature flag ──────────────────────────────────────────
+
+  describe('constructor', () => {
+    it('should be created', () => {
+      createService();
+      expect(service).toBeTruthy();
+    });
+
+    it('should NOT subscribe to userId changes when feature is disabled', () => {
+      createService(false);
+      // Force a login-like emission
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(connector.loadOrgUnits).not.toHaveBeenCalled();
+    });
+
+    it('should subscribe to userId changes when feature is enabled', () => {
+      createService(true);
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(connector.loadOrgUnits).toHaveBeenCalledWith(mockUserId);
+    });
+  });
+
+  // ── subscribeToUserIdChanges – logout ───────────────────────────────────
+
+  describe('subscribeToUserIdChanges() – logout path', () => {
+    beforeEach(() => createService());
+
+    it('should clear state when userId is anonymous', () => {
+      // Already anonymous from initial BehaviorSubject value.
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+
+    it('should clear state when userId becomes anonymous after login', () => {
+      (userIdService as any).setUserId(mockUserId);
+      stateService.setOrgUnits.calls.reset();
+      stateService.setActiveUnit.calls.reset();
+
+      (userIdService as any).setUserId(OCC_USER_ID_ANONYMOUS);
+
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+
+    it('should clear state when userId becomes empty string', () => {
+      (userIdService as any).setUserId(mockUserId);
+      stateService.setOrgUnits.calls.reset();
+      stateService.setActiveUnit.calls.reset();
+
+      (userIdService as any).setUserId('');
+
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith([]);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+
+    it('should NOT load org units for anonymous userId', () => {
+      expect(connector.loadOrgUnits).not.toHaveBeenCalled();
+    });
+  });
+
+  // ── subscribeToUserIdChanges – login ────────────────────────────────────
+
+  describe('subscribeToUserIdChanges() – login path', () => {
+    beforeEach(() => createService());
+
+    it('should call loadOrgUnits and loadDefaultOrgUnitName with userId', () => {
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(connector.loadOrgUnits).toHaveBeenCalledWith(mockUserId);
+      expect(connector.loadDefaultOrgUnitName).toHaveBeenCalledWith(mockUserId);
+    });
+
+    it('should populate state with loaded org units and default unit name', () => {
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(stateService.setOrgUnits).toHaveBeenCalledWith(mockUnits);
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(
+        mockDefaultUnitName
+      );
+    });
+
+    it('should fall back to null activeUnit when loadDefaultOrgUnitName errors', () => {
+      connector.loadDefaultOrgUnitName.and.returnValue(
+        throwError(() => new HttpErrorResponse({ status: 500 }))
+      );
+
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(null);
+    });
+
+    it('should NOT duplicate reactions when userId emits same value twice (distinctUntilChanged)', () => {
+      (userIdService as any).setUserId(mockUserId);
+      connector.loadOrgUnits.calls.reset();
+
+      // Same value again — should be swallowed by distinctUntilChanged.
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(connector.loadOrgUnits).not.toHaveBeenCalled();
+    });
+
+    it('should log error and continue when loadOrgUnits errors', () => {
+      const loggerService = TestBed.inject(LoggerService) as any;
+      // Provide a proper error body so tryNormalizeHttpError does not throw
+      // before logger.error is reached.
+      connector.loadOrgUnits.and.returnValue(
+        throwError(
+          () =>
+            new HttpErrorResponse({
+              status: 500,
+              error: { message: 'Server Error' },
+            })
+        )
+      );
+
+      (userIdService as any).setUserId(mockUserId);
+
+      expect(loggerService.error).toHaveBeenCalled();
+      // Stream should still be alive after error (handled via catchError → of(null)).
+    });
+
+    it('should NOT open dialog when orgUnits is empty', fakeAsync(() => {
+      connector.loadOrgUnits.and.returnValue(of([]));
+
+      (userIdService as any).setUserId(mockUserId);
+      tick(100);
+
+      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
+    }));
+
+    it('should NOT open dialog when orgUnits has only one unit', fakeAsync(() => {
+      connector.loadOrgUnits.and.returnValue(of([mockUnits[0]]));
+
+      (userIdService as any).setUserId(mockUserId);
+      tick(100);
+
+      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
+    }));
+  });
+
+  // ── openDialogWhenReady ─────────────────────────────────────────────────
+
+  describe('openDialogWhenReady()', () => {
+    it('should open dialog when ApplicationRef has components', fakeAsync(() => {
+      // AppComponent already present (mockComponents = [{}]).
+      createService(true, [{}] as any);
+      (userIdService as any).setUserId(mockUserId);
+
+      // Advance past the 50 ms polling interval.
+      tick(100);
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith(
+        (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
+        undefined,
+        jasmine.objectContaining({
+          orgUnits: mockUnits,
+          defaultUnitName: mockDefaultUnitName,
+          onConfirm: jasmine.any(Function),
+        })
+      );
+    }));
+
+    it('should open dialog after timeout when AppComponent never mounts', fakeAsync(() => {
+      // No components mounted.
+      createService(true, [] as any);
+      (userIdService as any).setUserId(mockUserId);
+
+      // Advance past STABLE_TIMEOUT_MS (10 000 ms).
+      tick(10_001);
+
+      expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalled();
+    }));
+
+    it('should NOT open dialog when sessionStorage flag is set', fakeAsync(() => {
+      createService(true, [{}] as any);
+      const windowRef = TestBed.inject(WindowRef);
+      windowRef.sessionStorage?.setItem('cx-b2b-unit-selected', 'true');
+
+      (userIdService as any).setUserId(mockUserId);
+      tick(100);
+
+      expect(launchDialogService.openDialogAndSubscribe).not.toHaveBeenCalled();
+      windowRef.sessionStorage?.removeItem('cx-b2b-unit-selected');
+    }));
+  });
+
+  // ── setDefaultUnit ──────────────────────────────────────────────────────
+
+  describe('setDefaultUnit()', () => {
+    beforeEach(() => createService());
+
+    it('should call connector.setDefaultOrgUnit with userId and unitName', () => {
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(connector.setDefaultOrgUnit).toHaveBeenCalledWith(
+        mockUserId,
+        mockDefaultUnitName
+      );
+    });
+
+    it('should close dialog on success', () => {
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(launchDialogService.closeDialog).toHaveBeenCalledWith('CONFIRMED');
+    });
+
+    it('should set sessionStorage confirmed flag on success', () => {
+      const windowRef = TestBed.inject(WindowRef);
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(windowRef.sessionStorage?.getItem('cx-b2b-unit-selected')).toBe(
+        'true'
+      );
+      windowRef.sessionStorage?.removeItem('cx-b2b-unit-selected');
+    });
+
+    it('should update active unit in state on success', () => {
+      stateService.setActiveUnit.calls.reset();
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(stateService.setActiveUnit).toHaveBeenCalledWith(
+        mockDefaultUnitName
+      );
+    });
+
+    it('should dispatch B2bUnitSwitchedEvent on success (redirectToHome=false by default)', () => {
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(eventService.dispatch).toHaveBeenCalledWith(
+        {
+          userId: mockUserId,
+          unitName: mockDefaultUnitName,
+          redirectedToHome: false,
+        },
+        B2bUnitSwitchedEvent
+      );
+    });
+
+    it('should dispatch B2bUnitSwitchedEvent with redirectedToHome=true when redirectToHome=true', () => {
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName, true);
+
+      expect(eventService.dispatch).toHaveBeenCalledWith(
+        {
+          userId: mockUserId,
+          unitName: mockDefaultUnitName,
+          redirectedToHome: true,
+        },
+        B2bUnitSwitchedEvent
+      );
+    });
+
+    it('should dispatch B2bUnitSwitchFailedEvent on error', () => {
+      connector.setDefaultOrgUnit.and.returnValue(
+        throwError(
+          () =>
+            new HttpErrorResponse({
+              status: 400,
+              error: { message: 'Bad Request' },
+            })
+        )
+      );
+
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(eventService.dispatch).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          userId: mockUserId,
+          unitName: mockDefaultUnitName,
+        }),
+        B2bUnitSwitchFailedEvent
+      );
+    });
+
+    it('should NOT dispatch B2bUnitSwitchedEvent on error', () => {
+      connector.setDefaultOrgUnit.and.returnValue(
+        throwError(
+          () =>
+            new HttpErrorResponse({
+              status: 400,
+              error: { message: 'Bad Request' },
+            })
+        )
+      );
+
+      service.setDefaultUnit(mockUserId, mockDefaultUnitName);
+
+      expect(eventService.dispatch).not.toHaveBeenCalledWith(
+        jasmine.anything(),
+        B2bUnitSwitchedEvent
+      );
+    });
+  });
+});
diff --git a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
index e19e1f45582..46b719f8db8 100644
--- a/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
+++ b/feature-libs/organization/b2b-unit-selection/core/services/b2b-unit-selection.service.ts
@@ -10,8 +10,6 @@ import {
   B2BUnit,
   EventService,
   LoggerService,
-  LoginEvent,
-  LogoutEvent,
   OCC_USER_ID_ANONYMOUS,
   tryNormalizeHttpError,
   UserIdService,
@@ -26,6 +24,7 @@ import { LAUNCH_CALLER, LaunchDialogService } from '@spartacus/storefront';
 import { forkJoin, interval, of, race, Subscription, timer } from 'rxjs';
 import {
   catchError,
+  distinctUntilChanged,
   filter,
   startWith,
   switchMap,
@@ -38,19 +37,23 @@ import { B2bUnitSelectorStateService } from './b2b-unit-selector-state.service';
 /**
  * Core service orchestrating B2B unit selection.
  *
- * Replaces the previous NgRx-effects-based implementation. By using
- * `EventService` subscriptions instead of `EffectsModule.forFeature`, we
- * eliminate the Zone.js pending-task that NgRx's `EffectSources.toActions()`
- * creates for the lifetime of the application — a task that prevented
- * `ApplicationRef.isStable` from emitting `true` and caused Cypress
- * `cy.wait()` calls to time out in CI.
+ * Provided in the lazy `B2bUnitSelectionCoreModule` (not `providedIn: 'root'`)
+ * so that it lives in the same injector as `B2bUnitSelectionConnector` and
+ * `B2bUnitSelectionAdapter`, avoiding cross-injector dependency errors.
  *
- * **Lifecycle:** Eagerly initialised by `B2bUnitSelectionCoreModule` via
- * constructor injection. Subscriptions are set up in the constructor and
- * live for the application lifetime (no `ngOnDestroy` needed for a root
- * singleton).
+ * Eagerly initialised by `B2bUnitSelectionCoreModule` via constructor injection.
+ * By using `UserIdService.getUserId()` instead of `LoginEvent` / `LogoutEvent`,
+ * the service reacts correctly whether it is instantiated before or after the
+ * auth token is restored from storage.
+ *
+ * **Dialog communication:** The dialog component (`B2bUnitSelectionDialogComponent`)
+ * does not inject this service directly (it is module-scoped and lives in a lazy
+ * child injector, while the dialog is rendered in the root outlet). Instead, the
+ * dialog calls `LaunchDialogService.closeDialog(unitName)` with the selected unit
+ * name, and this service subscribes to `LaunchDialogService.dialogClose` after
+ * opening the dialog to receive the result.
  */
-@Injectable({ providedIn: 'root' })
+@Injectable()
 export class B2bUnitSelectionService {
   protected logger = inject(LoggerService);
   protected config = inject(B2bUnitSelectionConfig);
@@ -66,61 +69,84 @@ export class B2bUnitSelectionService {
   /** Maximum time (ms) to wait for AppComponent to mount before opening the dialog anyway. */
   protected readonly STABLE_TIMEOUT_MS = 10_000;
 
+  /**
+   * sessionStorage key used to suppress the unit-selection dialog after the
+   * user has already confirmed a unit in the current browser session.
+   * Cleared on logout so the dialog reappears on the next login.
+   */
+  protected readonly UNIT_CONFIRMED_SESSION_KEY = 'cx-b2b-unit-selected';
+
   private readonly subscriptions = new Subscription();
 
   constructor() {
     if (!this.config.b2bUnitSelection?.enabled) {
       return;
     }
-    this.subscribeToLogin();
-    this.subscribeToLogout();
+    this.subscribeToUserIdChanges();
   }
 
   /**
-   * Listens for `LoginEvent` and loads the user's org units and default unit.
-   * Opens the unit-selection dialog when the user belongs to more than one unit.
+   * Reacts to every distinct change of the active user ID.
    *
-   * Two login scenarios are handled:
-   * 1. Manual login (ROPC): `ApplicationRef.components` already has mounted
-   *    components; the dialog opens immediately.
-   * 2. OAuth Authorization Code Flow or page-refresh token restore:
-   *    `ApplicationRef.components` may be empty; polling waits for AppComponent
-   *    to mount before opening the dialog.
+   * - **Login** (userId transitions from anonymous → real ID): loads the
+   *   user's org units and opens the unit-selection dialog when the user
+   *   belongs to more than one unit.
+   * - **Logout** (userId transitions to anonymous / empty): clears the state
+   *   so the Company header selector is hidden.
+   *
+   * Using `getUserId()` (a `BehaviorSubject`) instead of `LoginEvent` /
+   * `LogoutEvent` (plain `Subject`s) makes the service robust to lazy-loading
+   * timing: if the feature module loads after the auth token has already been
+   * restored from storage, `getUserId()` immediately emits the current user ID
+   * and the dialog still opens correctly.
    */
-  protected subscribeToLogin(): void {
+  protected subscribeToUserIdChanges(): void {
     this.subscriptions.add(
-      this.eventService
-        .get(LoginEvent)
+      this.userIdService
+        .getUserId()
         .pipe(
-          switchMap(() =>
-            this.userIdService.getUserId().pipe(
-              filter((userId) => userId !== OCC_USER_ID_ANONYMOUS),
-              take(1),
-              switchMap((userId) =>
-                forkJoin({
-                  orgUnits: this.connector.loadOrgUnits(userId),
-                  // Gracefully degrade if loading the default unit fails.
-                  defaultUnitName: this.connector
-                    .loadDefaultOrgUnitName(userId)
-                    .pipe(catchError(() => of(undefined))),
-                }).pipe(
-                  tap(({ orgUnits, defaultUnitName }) => {
-                    // Always write to the state service so the Company header
-                    // selector is populated.
-                    this.stateService.setOrgUnits(orgUnits);
-                    this.stateService.setActiveUnit(defaultUnitName ?? null);
-                    if (orgUnits.length > 0) {
-                      this.openDialogWhenReady(orgUnits, defaultUnitName);
-                    }
-                  }),
-                  catchError((error: HttpErrorResponse) => {
-                    this.logger.error(
-                      tryNormalizeHttpError(error, this.logger)
-                    );
-                    return of(null);
-                  })
-                )
-              )
+          distinctUntilChanged(),
+          tap((userId) => {
+            if (!userId || userId === OCC_USER_ID_ANONYMOUS) {
+              this.stateService.setOrgUnits([]);
+              this.stateService.setActiveUnit(null);
+              // Clear the session flag so the dialog appears again on next login.
+              this.windowRef.sessionStorage?.removeItem(
+                this.UNIT_CONFIRMED_SESSION_KEY
+              );
+            }
+          }),
+          filter((userId) => !!userId && userId !== OCC_USER_ID_ANONYMOUS),
+          switchMap((userId) =>
+            forkJoin({
+              orgUnits: this.connector.loadOrgUnits(userId),
+              // Gracefully degrade if loading the default unit fails.
+              defaultUnitName: this.connector
+                .loadDefaultOrgUnitName(userId)
+                .pipe(catchError(() => of(undefined))),
+            }).pipe(
+              tap(({ orgUnits, defaultUnitName }) => {
+                // Always write to the state service so the Company header
+                // selector is populated.
+                this.stateService.setOrgUnits(orgUnits);
+                this.stateService.setActiveUnit(defaultUnitName ?? null);
+                // Open the dialog when the user has multiple org units to
+                // choose from and has NOT already confirmed a unit in this
+                // browser session (flag is set in setDefaultUnit and cleared
+                // on logout, preventing the dialog from reopening after the
+                // post-confirm page reload).
+                const alreadyConfirmed =
+                  this.windowRef.sessionStorage?.getItem(
+                    this.UNIT_CONFIRMED_SESSION_KEY
+                  ) === 'true';
+                if (orgUnits.length > 1 && !alreadyConfirmed) {
+                  this.openDialogWhenReady(orgUnits, defaultUnitName, userId);
+                }
+              }),
+              catchError((error: HttpErrorResponse) => {
+                this.logger.error(tryNormalizeHttpError(error, this.logger));
+                return of(null);
+              })
             )
           )
         )
@@ -128,39 +154,24 @@ export class B2bUnitSelectionService {
     );
   }
 
-  /**
-   * Listens for `LogoutEvent` and clears the state service so the Company
-   * selector is hidden after the user logs out.
-   */
-  protected subscribeToLogout(): void {
-    this.subscriptions.add(
-      this.eventService
-        .get(LogoutEvent)
-        .pipe(
-          tap(() => {
-            this.stateService.setOrgUnits([]);
-            this.stateService.setActiveUnit(null);
-          })
-        )
-        .subscribe()
-    );
-  }
-
   /**
    * Calls the connector to persist the newly selected org unit, then
-   * closes the dialog / reloads the page so all org-context-dependent data
+   * closes the dialog and reloads the page so all org-context-dependent data
    * (prices, catalog, CMS) is refreshed.
    *
-   * @param userId       The OCC user identifier.
-   * @param unitName     The `name` of the selected B2B unit.
+   * Called either from the dialog flow (via the `onConfirm` callback passed in
+   * dialog data) or directly from the header selector component.
+   *
+   * @param userId          The OCC user identifier.
+   * @param unitName        The `name` of the selected B2B unit.
    * @param redirectToHome  When `true` (header selector), navigates to the
-   *                     home root; when `false` / omitted (dialog), reloads
-   *                     the current page in place.
+   *                        home root; when `false` (dialog, default), reloads
+   *                        the current page in place.
    */
   setDefaultUnit(
     userId: string,
     unitName: string,
-    redirectToHome?: boolean
+    redirectToHome = false
   ): void {
     this.connector
       .setDefaultOrgUnit(userId, unitName)
@@ -170,9 +181,15 @@ export class B2bUnitSelectionService {
           this.launchDialogService.closeDialog('CONFIRMED');
           this.stateService.setActiveUnit(unitName);
           this.eventService.dispatch(
-            { userId, unitName, redirectedToHome: redirectToHome ?? false },
+            { userId, unitName, redirectedToHome: redirectToHome },
             B2bUnitSwitchedEvent
           );
+          // Persist the session flag before reloading so the dialog does not
+          // reopen when the page reinitialises with the same user ID.
+          this.windowRef.sessionStorage?.setItem(
+            this.UNIT_CONFIRMED_SESSION_KEY,
+            'true'
+          );
           // Reload page so all org-context data is refreshed for the new unit.
           // Header selector: navigate to home root via location.assign('/').
           // Dialog: reload the current page in-place via location.reload().
@@ -198,8 +215,14 @@ export class B2bUnitSelectionService {
   /**
    * Opens the unit-selection dialog once the AppComponent is mounted.
    *
-   * Polls `ApplicationRef.components` every 50 ms so the dialog opens as soon
-   * as the root component is bootstrapped — typically within one or two ticks.
+   * The dialog component (`B2bUnitSelectionDialogComponent`) is standalone and
+   * rendered in the root outlet via `inlineRoot: true`. Because this service
+   * lives in the lazy feature module's child injector, the dialog cannot inject
+   * it directly. Instead, an `onConfirm` callback is passed via the dialog data
+   * payload. The dialog calls this callback with the selected unit name, which
+   * in turn calls `setDefaultUnit` — which closes the dialog via
+   * `LaunchDialogService.closeDialog` on HTTP success, preserving the original
+   * close-after-persist behaviour.
    *
    * The polling runs OUTSIDE Angular's zone via `NgZone.runOutsideAngular` so
    * the `setInterval` does not keep the zone perpetually unstable, which would
@@ -211,13 +234,21 @@ export class B2bUnitSelectionService {
    */
   protected openDialogWhenReady(
     orgUnits: B2BUnit[],
-    defaultUnitName: string | undefined
+    defaultUnitName: string | undefined,
+    userId: string
   ): void {
     const open = () => {
       this.launchDialogService.openDialogAndSubscribe(
         (LAUNCH_CALLER as any)['B2B_UNIT_SELECTION'],
         undefined,
-        { orgUnits, defaultUnitName }
+        {
+          orgUnits,
+          defaultUnitName,
+          // Pass a bound callback so the dialog can trigger setDefaultUnit
+          // without injecting this module-scoped service directly.
+          onConfirm: (unitName: string) =>
+            this.setDefaultUnit(userId, unitName),
+        }
       );
     };
 
diff --git a/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
index 06f1172736b..532baad1e1e 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/b2b-unit-selection-occ.module.ts
@@ -5,14 +5,11 @@
  */
 
 import { NgModule } from '@angular/core';
-import { provideDefaultConfig } from '@spartacus/core';
 import { B2bUnitSelectionAdapter } from '@spartacus/organization/b2b-unit-selection/core';
 import { OccB2bUnitSelectionAdapter } from './adapters/occ-b2b-unit-selection.adapter';
-import { defaultOccB2bUnitSelectionConfig } from './config/default-occ-b2b-unit-selection-config';
 
 @NgModule({
   providers: [
-    provideDefaultConfig(defaultOccB2bUnitSelectionConfig),
     {
       provide: B2bUnitSelectionAdapter,
       useClass: OccB2bUnitSelectionAdapter,
diff --git a/feature-libs/organization/b2b-unit-selection/occ/public_api.ts b/feature-libs/organization/b2b-unit-selection/occ/public_api.ts
index d82019fc6f0..74d10b615d2 100644
--- a/feature-libs/organization/b2b-unit-selection/occ/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/occ/public_api.ts
@@ -6,5 +6,3 @@
 
 export * from './adapters/occ-b2b-unit-selection.adapter';
 export * from './b2b-unit-selection-occ.module';
-export * from './config/default-occ-b2b-unit-selection-config';
-export * from './model/index';
diff --git a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
index 970857dddc3..3dc75e4769a 100644
--- a/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/b2b-unit-selection-root.module.ts
@@ -11,9 +11,11 @@ import {
   provideDefaultConfigFactory,
 } from '@spartacus/core';
 import { defaultB2bUnitSelectionConfig } from './config/default-b2b-unit-selection-config';
+import { defaultOccB2bUnitSelectionConfig } from './config/default-occ-b2b-unit-selection-config';
 import { ORGANIZATION_B2B_UNIT_SELECTION_FEATURE } from './feature-name';
-// Side-effect import: ensures the LAUNCH_CALLER extension is registered at application startup.
+// Side-effect imports: register module augmentations at application startup.
 import './model/augmented-core.model';
+import './model/occ-b2b-unit-selection-endpoints.model';
 
 // TODO: Inline this factory when we start releasing Ivy compiled libraries
 export function defaultB2bUnitSelectionComponentsConfig(): CmsConfig {
@@ -30,6 +32,10 @@ export function defaultB2bUnitSelectionComponentsConfig(): CmsConfig {
 @NgModule({
   providers: [
     provideDefaultConfig(defaultB2bUnitSelectionConfig),
+    // OCC endpoint config must be registered eagerly (in the root module) so that
+    // OccEndpointsService — a root singleton built once at app startup — can
+    // resolve our custom endpoint keys before the lazy feature module loads.
+    provideDefaultConfig(defaultOccB2bUnitSelectionConfig),
     provideDefaultConfigFactory(defaultB2bUnitSelectionComponentsConfig),
   ],
 })
diff --git a/feature-libs/organization/b2b-unit-selection/root/config/default-occ-b2b-unit-selection-config.ts b/feature-libs/organization/b2b-unit-selection/root/config/default-occ-b2b-unit-selection-config.ts
new file mode 100644
index 00000000000..6d3d270cd65
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/config/default-occ-b2b-unit-selection-config.ts
@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccConfig } from '@spartacus/core';
+
+/**
+ * Default OCC endpoint configuration for the B2B unit-selection feature.
+ *
+ * Placed in the **root** entry-point (eagerly loaded) so that
+ * `OccEndpointsService` — a root singleton whose config is built once at
+ * app startup — can resolve these endpoint keys before the lazy feature
+ * module is bootstrapped.
+ */
+export const defaultOccB2bUnitSelectionConfig: OccConfig = {
+  backend: {
+    occ: {
+      endpoints: {
+        orgUser: 'orgUsers/${userId}',
+        orgUserUnits: 'orgUsers/${userId}/orgUnits',
+        orgUserDefaultUnit: 'orgUsers/${userId}/defaultOrgUnit',
+      },
+    },
+  },
+};
diff --git a/feature-libs/organization/b2b-unit-selection/root/model/occ-b2b-unit-selection-endpoints.model.ts b/feature-libs/organization/b2b-unit-selection/root/model/occ-b2b-unit-selection-endpoints.model.ts
new file mode 100644
index 00000000000..f99a29e438c
--- /dev/null
+++ b/feature-libs/organization/b2b-unit-selection/root/model/occ-b2b-unit-selection-endpoints.model.ts
@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2026 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { OccEndpoint } from '@spartacus/core';
+
+export interface B2bUnitSelectionOccEndpoints {
+  /**
+   * Fetches current B2B user profile (includes the default orgUnit).
+   * GET /{baseSiteId}/orgUsers/{userId}
+   */
+  orgUser?: string | OccEndpoint;
+
+  /**
+   * Fetches all org units assigned to the current B2B user.
+   * GET /{baseSiteId}/orgUsers/{userId}/orgUnits
+   */
+  orgUserUnits?: string | OccEndpoint;
+
+  /**
+   * Sets the default org unit for the current B2B user.
+   * PUT /{baseSiteId}/orgUsers/{userId}/defaultOrgUnit
+   */
+  orgUserDefaultUnit?: string | OccEndpoint;
+}
+
+declare module '@spartacus/core' {
+  interface OccEndpoints extends B2bUnitSelectionOccEndpoints {}
+}
diff --git a/feature-libs/organization/b2b-unit-selection/root/public_api.ts b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
index c78cdd7f556..c4cc6e36cc4 100644
--- a/feature-libs/organization/b2b-unit-selection/root/public_api.ts
+++ b/feature-libs/organization/b2b-unit-selection/root/public_api.ts
@@ -7,5 +7,7 @@
 export * from './b2b-unit-selection-root.module';
 export * from './config/b2b-unit-selection.config';
 export * from './config/default-b2b-unit-selection-config';
+export * from './config/default-occ-b2b-unit-selection-config';
 export * from './events/b2b-unit-selection.events';
 export * from './feature-name';
+export * from './model/occ-b2b-unit-selection-endpoints.model';

From a60ab1da8c4c0caa41d4b33926fa45090f31dafa Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Tue, 4 Aug 2026 17:45:22 +0800
Subject: [PATCH 58/60] fix

fix
---
 .../organization-schematics-config.ts         |  56 +++++
 .../schematics/src/shared/libs-constants.ts   |   7 +
 .../src/shared/schematics-config-mappings.ts  |   2 +
 .../schematics/src/shared/utils/test-utils.ts |   2 +
 .../__snapshots__/index_spec.ts.snap          | 226 ++++++++++++++++++
 .../schematics/add-organization/index_spec.ts |  76 ++++++
 .../schematics/add-organization/schema.json   |   8 +-
 7 files changed, 376 insertions(+), 1 deletion(-)

diff --git a/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts b/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
index f8a42a49719..1f174fd2415 100644
--- a/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
+++ b/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
@@ -8,6 +8,7 @@ import {
   ORDER_FEATURE_NAME,
   ORGANIZATION_ACCOUNT_SUMMARY_FEATURE_NAME,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+  ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME,
   ORGANIZATION_ORDER_APPROVAL_FEATURE_NAME,
   ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   ORGANIZATION_UNIT_ORDER_FEATURE_NAME,
@@ -21,6 +22,9 @@ import {
   SPARTACUS_ORGANIZATION_ACCOUNT_SUMMARY_ROOT,
   SPARTACUS_ORGANIZATION_ADMINISTRATION_ASSETS,
   SPARTACUS_ORGANIZATION_ADMINISTRATION_ROOT,
+  SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION,
+  SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ASSETS,
+  SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ROOT,
   SPARTACUS_ORGANIZATION_ORDER_APPROVAL,
   SPARTACUS_ORGANIZATION_ORDER_APPROVAL_ASSETS,
   SPARTACUS_ORGANIZATION_ORDER_APPROVAL_ROOT,
@@ -279,3 +283,55 @@ export const ORGANIZATION_ACCOUNT_SUMMARY_SCHEMATICS_CONFIG: SchematicConfig = {
   },
   dependencyFeatures: [ORGANIZATION_ADMINISTRATION_FEATURE_NAME],
 };
+
+export const ORGANIZATION_B2B_UNIT_SELECTION_MODULE_NAME =
+  'OrganizationB2bUnitSelection';
+export const B2B_UNIT_SELECTION_MODULE = 'B2bUnitSelectionModule';
+export const B2B_UNIT_SELECTION_ROOT_MODULE = 'B2bUnitSelectionRootModule';
+export const ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME_CONSTANT =
+  'ORGANIZATION_B2B_UNIT_SELECTION_FEATURE';
+export const B2B_UNIT_SELECTION_TRANSLATIONS = 'b2bUnitSelectionTranslationsEn';
+export const B2B_UNIT_SELECTION_TRANSLATION_CHUNKS_CONFIG =
+  'b2bUnitSelectionTranslationChunksConfig';
+
+export const ORGANIZATION_B2B_UNIT_SELECTION_SCHEMATICS_CONFIG: SchematicConfig =
+  {
+    library: {
+      featureName: ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME,
+      mainScope: SPARTACUS_ORGANIZATION,
+      featureScope: SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION,
+      b2b: true,
+    },
+    folderName: ORGANIZATION_FOLDER_NAME,
+    moduleName: ORGANIZATION_B2B_UNIT_SELECTION_MODULE_NAME,
+    featureModule: {
+      name: B2B_UNIT_SELECTION_MODULE,
+      importPath: SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION,
+    },
+    rootModule: {
+      name: B2B_UNIT_SELECTION_ROOT_MODULE,
+      importPath: SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ROOT,
+    },
+    lazyLoadingChunk: {
+      moduleSpecifier: SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ROOT,
+      namedImports: [ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME_CONSTANT],
+    },
+    i18n: {
+      resources: B2B_UNIT_SELECTION_TRANSLATIONS,
+      chunks: B2B_UNIT_SELECTION_TRANSLATION_CHUNKS_CONFIG,
+      importPath: SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ASSETS,
+    },
+    styles: {
+      scssFileName: ORGANIZATION_SCSS_FILE_NAME,
+      importStyle: SPARTACUS_ORGANIZATION,
+      importStyles: [
+        SPARTACUS_BOOTSTRAP_FUNCTIONS,
+        SPARTACUS_BOOTSTRAP_VARIABLES,
+        SPARTACUS_BOOTSTRAP_MIXINS,
+      ],
+    },
+    // Requires B2bOrganization (Administration) to be installed first,
+    // as per the reviewer's guidance. The feature itself is opt-in at runtime
+    // via the b2bUnitSelection.enabled config flag.
+    dependencyFeatures: [ORGANIZATION_ADMINISTRATION_FEATURE_NAME],
+  };
diff --git a/core-libs/schematics/src/shared/libs-constants.ts b/core-libs/schematics/src/shared/libs-constants.ts
index 092417277f9..3d6e7effb38 100644
--- a/core-libs/schematics/src/shared/libs-constants.ts
+++ b/core-libs/schematics/src/shared/libs-constants.ts
@@ -124,6 +124,10 @@ export const SPARTACUS_ORGANIZATION_ACCOUNT_SUMMARY_COMPONENTS = `@spartacus/org
 export const SPARTACUS_ORGANIZATION_ACCOUNT_SUMMARY_ASSETS = `@spartacus/organization/account-summary/assets`;
 export const SPARTACUS_ORGANIZATION_ACCOUNT_SUMMARY_OCC = `@spartacus/organization/account-summary/occ`;
 
+export const SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION = `@spartacus/organization/b2b-unit-selection`;
+export const SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ROOT = `@spartacus/organization/b2b-unit-selection/root`;
+export const SPARTACUS_ORGANIZATION_B2B_UNIT_SELECTION_ASSETS = `@spartacus/organization/b2b-unit-selection/assets`;
+
 export const SPARTACUS_PRODUCT = `@spartacus/product`;
 export const SPARTACUS_PRODUCT_VARIANTS_COMPONENTS = `@spartacus/product/variants/components`;
 export const SPARTACUS_PRODUCT_VARIANTS_ROOT = `@spartacus/product/variants/root`;
@@ -336,6 +340,9 @@ export const ORGANIZATION_UNIT_ORDER_FEATURE_NAME = 'Unit-Order';
 
 export const ORGANIZATION_ACCOUNT_SUMMARY_FEATURE_NAME = 'Account-Summary';
 
+export const ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME =
+  'B2b-Unit-Selection';
+
 export const PRODUCT_BULK_PRICING_FEATURE_NAME = 'Bulk-Pricing';
 export const PRODUCT_IMAGE_ZOOM_FEATURE_NAME = 'Image-Zoom';
 export const PRODUCT_VARIANTS_FEATURE_NAME = 'Product-Variants';
diff --git a/core-libs/schematics/src/shared/schematics-config-mappings.ts b/core-libs/schematics/src/shared/schematics-config-mappings.ts
index 30c695629f5..d9936546e23 100644
--- a/core-libs/schematics/src/shared/schematics-config-mappings.ts
+++ b/core-libs/schematics/src/shared/schematics-config-mappings.ts
@@ -50,6 +50,7 @@ import {
 import {
   ORGANIZATION_ACCOUNT_SUMMARY_SCHEMATICS_CONFIG,
   ORGANIZATION_ADMINISTRATION_SCHEMATICS_CONFIG,
+  ORGANIZATION_B2B_UNIT_SELECTION_SCHEMATICS_CONFIG,
   ORGANIZATION_ORDER_APPROVAL_SCHEMATICS_CONFIG,
   ORGANIZATION_UNIT_ORDER_SCHEMATICS_CONFIG,
   ORGANIZATION_USER_REGISTRATION_SCHEMATICS_CONFIG,
@@ -126,6 +127,7 @@ export const SCHEMATICS_CONFIGS: SchematicConfig[] = [
   ORGANIZATION_USER_REGISTRATION_SCHEMATICS_CONFIG,
   ORGANIZATION_UNIT_ORDER_SCHEMATICS_CONFIG,
   ORGANIZATION_ACCOUNT_SUMMARY_SCHEMATICS_CONFIG,
+  ORGANIZATION_B2B_UNIT_SELECTION_SCHEMATICS_CONFIG,
 
   PICKUP_IN_STORE_SCHEMATICS_CONFIG,
   PRODUCT_CONFIGURATOR_TEXTFIELD_SCHEMATICS_CONFIG,
diff --git a/core-libs/schematics/src/shared/utils/test-utils.ts b/core-libs/schematics/src/shared/utils/test-utils.ts
index c4282ff654d..c53424c5dc5 100644
--- a/core-libs/schematics/src/shared/utils/test-utils.ts
+++ b/core-libs/schematics/src/shared/utils/test-utils.ts
@@ -66,6 +66,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 organizationB2bUnitSelectionFeatureModulePath =
+  'src/app/spartacus/features/organization/organization-b2b-unit-selection-feature.module.ts';
 export const pdfInvoicesFeatureModulePath =
   'src/app/spartacus/features/pdf-invoices/pdf-invoices-feature.module.ts';
 export const productBulkPricingFeatureModulePath =
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 c5f2810b638..91eecbf357a 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
@@ -452,6 +452,232 @@ exports[`Spartacus Organization schematics: ng-add Administration feature genera
 }"
 `;
 
+exports[`Spartacus Organization schematics: ng-add B2B unit selection feature eager loading should import appropriate modules 1`] = `
+"import { NgModule } from '@angular/core';
+import { I18nConfig, provideConfig } from "@spartacus/core";
+import { B2bUnitSelectionModule } from "@spartacus/organization/b2b-unit-selection";
+import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEnEn } from "@spartacus/organization/b2b-unit-selection/assets";
+import { B2bUnitSelectionRootModule } from "@spartacus/organization/b2b-unit-selection/root";
+
+@NgModule({
+  declarations: [],
+  imports: [
+    B2bUnitSelectionRootModule,
+    B2bUnitSelectionModule
+  ],
+  providers: [provideConfig(<I18nConfig>{
+    i18n: {
+      resources: { en: b2bUnitSelectionTranslationsEnEn },
+      chunks: b2bUnitSelectionTranslationChunksConfig,
+    },
+  })]
+})
+export class OrganizationB2bUnitSelectionFeatureModule { }
+"
+`;
+
+exports[`Spartacus Organization schematics: ng-add B2B unit selection feature general setup b2b features configuration should be added 1`] = `
+"import { NgModule } from '@angular/core';
+import { translationChunksConfig, translationsEn } from "@spartacus/assets";
+import { FeaturesConfig, I18nConfig, OccConfig, provideConfig, provideConfigFactory, SiteContextConfig } from "@spartacus/core";
+import { defaultB2bOccConfig } from "@spartacus/setup";
+import { defaultCmsContentProviders, layoutConfigFactory, mediaConfig } from "@spartacus/storefront";
+
+@NgModule({
+  declarations: [],
+  imports: [
+  ],
+  providers: [provideConfigFactory(layoutConfigFactory), provideConfig(mediaConfig), ...defaultCmsContentProviders, provideConfig(<OccConfig>{
+    backend: {
+      occ: {
+        baseUrl: 'https://localhost:9002',
+      }
+    },
+  }), provideConfig(<SiteContextConfig>{
+    context: {},
+  }), provideConfig(<I18nConfig>{
+    i18n: {
+      resources: { en: translationsEn },
+      chunks: translationChunksConfig,
+      fallbackLang: 'en'
+    },
+  }), provideConfig(<FeaturesConfig>{
+    features: {
+      level: '221121.15'
+    }
+  }), provideConfig(defaultB2bOccConfig)]
+})
+export class SpartacusConfigurationModule { }
+"
+`;
+
+exports[`Spartacus Organization schematics: ng-add B2B unit selection feature general setup should add the feature using the lazy loading syntax 1`] = `
+"import { NgModule } from '@angular/core';
+import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
+import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEnEn } from "@spartacus/organization/b2b-unit-selection/assets";
+import { B2bUnitSelectionRootModule, ORGANIZATION_B2B_UNIT_SELECTION_FEATURE } from "@spartacus/organization/b2b-unit-selection/root";
+
+@NgModule({
+  declarations: [],
+  imports: [
+    B2bUnitSelectionRootModule
+  ],
+  providers: [provideConfig(<CmsConfig>{
+    featureModules: {
+      [ORGANIZATION_B2B_UNIT_SELECTION_FEATURE]: {
+        module: () =>
+          import('@spartacus/organization/b2b-unit-selection').then((m) => m.B2bUnitSelectionModule),
+      },
+    }
+  }),
+  provideConfig(<I18nConfig>{
+    i18n: {
+      resources: { en: b2bUnitSelectionTranslationsEnEn },
+      chunks: b2bUnitSelectionTranslationChunksConfig,
+    },
+  })
+  ]
+})
+export class OrganizationB2bUnitSelectionFeatureModule { }
+"
+`;
+
+exports[`Spartacus Organization schematics: ng-add B2B unit selection feature general setup styling should create a proper scss file 1`] = `
+"@import "../../styles-config";
+@import "@spartacus/organization";
+@import "@spartacus/styles/vendor/bootstrap/scss/functions";
+@import "@spartacus/styles/vendor/bootstrap/scss/variables";
+@import "@spartacus/styles/vendor/bootstrap/scss/_mixins";
+"
+`;
+
+exports[`Spartacus Organization schematics: ng-add B2B unit selection 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",
+          "type": "component",
+          "addTypeToClassName": false
+        },
+        "@schematics/angular:directive": {
+          "type": "directive",
+          "addTypeToClassName": false
+        },
+        "@schematics/angular:service": {
+          "type": "service",
+          "addTypeToClassName": false
+        },
+        "@schematics/angular:guard": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:interceptor": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:module": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:pipe": {
+          "typeSeparator": "."
+        },
+        "@schematics/angular:resolver": {
+          "typeSeparator": "."
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular/build:application",
+          "options": {
+            "browser": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": [
+              "src/styles.scss",
+              "src/styles/spartacus/organization.scss"
+            ],
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ],
+              "sass": {
+                "silenceDeprecations": [
+                  "import"
+                ]
+              }
+            }
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kB",
+                  "maximumError": "3.5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "4kB",
+                  "maximumError": "8kB"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular/build:dev-server",
+          "configurations": {
+            "production": {
+              "buildTarget": "schematics-test:build:production"
+            },
+            "development": {
+              "buildTarget": "schematics-test:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "test": {
+          "builder": "@angular/build:unit-test",
+          "options": {
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "node_modules/"
+              ]
+            },
+            "styles": [
+              "src/styles/spartacus/organization.scss"
+            ]
+          }
+        }
+      }
+    }
+  }
+}"
+`;
+
 exports[`Spartacus Organization schematics: ng-add Order approval feature eager loading should import appropriate modules 1`] = `
 "import { NgModule } from '@angular/core';
 import { I18nConfig, provideConfig } from "@spartacus/core";
diff --git a/feature-libs/organization/schematics/add-organization/index_spec.ts b/feature-libs/organization/schematics/add-organization/index_spec.ts
index dfc176ff54d..dfaad14b64e 100644
--- a/feature-libs/organization/schematics/add-organization/index_spec.ts
+++ b/feature-libs/organization/schematics/add-organization/index_spec.ts
@@ -10,11 +10,13 @@ import {
   orderFeatureModulePath,
   ORGANIZATION_ACCOUNT_SUMMARY_FEATURE_NAME,
   ORGANIZATION_ADMINISTRATION_FEATURE_NAME,
+  ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME,
   ORGANIZATION_ORDER_APPROVAL_FEATURE_NAME,
   ORGANIZATION_UNIT_ORDER_FEATURE_NAME,
   ORGANIZATION_USER_REGISTRATION_FEATURE_NAME,
   organizationAccountSummaryFeatureModulePath,
   organizationAdministrationFeatureModulePath,
+  organizationB2bUnitSelectionFeatureModulePath,
   organizationOrderApprovalFeatureModulePath,
   organizationUnitOrderFeatureModulePath,
   organizationUserRegistrationFeatureModulePath,
@@ -68,6 +70,11 @@ describe('Spartacus Organization schematics: ng-add', () => {
     features: [ORGANIZATION_UNIT_ORDER_FEATURE_NAME],
   };
 
+  const b2bUnitSelectionFeatureOptions: SpartacusOrganizationOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME],
+  };
+
   describe('Without features', () => {
     beforeAll(async () => {
       appTree = await generateDefaultWorkspace(schematicRunner, appTree);
@@ -95,6 +102,9 @@ describe('Spartacus Organization schematics: ng-add', () => {
       expect(
         appTree.exists(organizationUnitOrderFeatureModulePath)
       ).toBeFalsy();
+      expect(
+        appTree.exists(organizationB2bUnitSelectionFeatureModulePath)
+      ).toBeFalsy();
     });
 
     it('should install necessary Spartacus libraries', () => {
@@ -457,4 +467,70 @@ describe('Spartacus Organization schematics: ng-add', () => {
       });
     });
   });
+
+  describe('B2B unit selection feature', () => {
+    describe('general setup', () => {
+      beforeAll(async () => {
+        appTree = await generateDefaultWorkspace(schematicRunner, appTree);
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          b2bUnitSelectionFeatureOptions,
+          appTree
+        );
+      });
+
+      it('should add the feature using the lazy loading syntax', async () => {
+        const module = appTree.readContent(
+          organizationB2bUnitSelectionFeatureModulePath
+        );
+        expect(module).toMatchSnapshot();
+      });
+
+      it('should NOT install the required feature dependencies', async () => {
+        const administrationFeatureModule = appTree.readContent(
+          organizationAdministrationFeatureModulePath
+        );
+        expect(administrationFeatureModule).toBeFalsy();
+      });
+
+      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('b2b features', () => {
+        it('configuration should be added', () => {
+          const configurationModule = appTree.readContent(
+            `src/app/spartacus/${SPARTACUS_CONFIGURATION_MODULE}.module.ts`
+          );
+          expect(configurationModule).toMatchSnapshot();
+        });
+      });
+    });
+
+    describe('eager loading', () => {
+      beforeAll(async () => {
+        appTree = await generateDefaultWorkspace(schematicRunner, appTree);
+        appTree = await schematicRunner.runSchematic(
+          'ng-add',
+          { ...b2bUnitSelectionFeatureOptions, lazy: false },
+          appTree
+        );
+      });
+
+      it('should import appropriate modules', async () => {
+        const module = appTree.readContent(
+          organizationB2bUnitSelectionFeatureModulePath
+        );
+        expect(module).toMatchSnapshot();
+      });
+    });
+  });
 });
diff --git a/feature-libs/organization/schematics/add-organization/schema.json b/feature-libs/organization/schematics/add-organization/schema.json
index 3fed48166d5..644608bbfd3 100644
--- a/feature-libs/organization/schematics/add-organization/schema.json
+++ b/feature-libs/organization/schematics/add-organization/schema.json
@@ -37,7 +37,8 @@
           "Order-Approval",
           "Account-Summary",
           "Organization-User-Registration",
-          "Unit-Order"
+          "Unit-Order",
+          "B2b-Unit-Selection"
         ],
         "type": "string"
       },
@@ -70,6 +71,11 @@
             "value": "Unit-Order",
             "label": "Unit Order (b2b feature)",
             "checked": true
+          },
+          {
+            "value": "B2b-Unit-Selection",
+            "label": "B2B Unit Selection (b2b feature, requires Organization - Administration)",
+            "checked": false
           }
         ]
       }

From ab28a6ddec3e26da1d9081c0fda69ac15fd6e722 Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 5 Aug 2026 14:44:02 +0800
Subject: [PATCH 59/60] fix

fix
---
 .../lib-configs/organization-schematics-config.ts      |  2 +-
 .../add-organization/__snapshots__/index_spec.ts.snap  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts b/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
index 1f174fd2415..f76ab1e7ec8 100644
--- a/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
+++ b/core-libs/schematics/src/shared/lib-configs/organization-schematics-config.ts
@@ -290,7 +290,7 @@ export const B2B_UNIT_SELECTION_MODULE = 'B2bUnitSelectionModule';
 export const B2B_UNIT_SELECTION_ROOT_MODULE = 'B2bUnitSelectionRootModule';
 export const ORGANIZATION_B2B_UNIT_SELECTION_FEATURE_NAME_CONSTANT =
   'ORGANIZATION_B2B_UNIT_SELECTION_FEATURE';
-export const B2B_UNIT_SELECTION_TRANSLATIONS = 'b2bUnitSelectionTranslationsEn';
+export const B2B_UNIT_SELECTION_TRANSLATIONS = 'b2bUnitSelectionTranslations';
 export const B2B_UNIT_SELECTION_TRANSLATION_CHUNKS_CONFIG =
   'b2bUnitSelectionTranslationChunksConfig';
 
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 a78d80b8ffb..0f85118fa5d 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
@@ -456,7 +456,7 @@ exports[`Spartacus Organization schematics: ng-add B2B unit selection feature ea
 "import { NgModule } from '@angular/core';
 import { I18nConfig, provideConfig } from "@spartacus/core";
 import { B2bUnitSelectionModule } from "@spartacus/organization/b2b-unit-selection";
-import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEnEn } from "@spartacus/organization/b2b-unit-selection/assets";
+import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEn } from "@spartacus/organization/b2b-unit-selection/assets";
 import { B2bUnitSelectionRootModule } from "@spartacus/organization/b2b-unit-selection/root";
 
 @NgModule({
@@ -467,7 +467,7 @@ import { B2bUnitSelectionRootModule } from "@spartacus/organization/b2b-unit-sel
   ],
   providers: [provideConfig(<I18nConfig>{
     i18n: {
-      resources: { en: b2bUnitSelectionTranslationsEnEn },
+      resources: { en: b2bUnitSelectionTranslationsEn },
       chunks: b2bUnitSelectionTranslationChunksConfig,
     },
   })]
@@ -503,7 +503,7 @@ import { defaultCmsContentProviders, layoutConfigFactory, mediaConfig } from "@s
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '221121.15'
+      level: '221121.17'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -514,7 +514,7 @@ export class SpartacusConfigurationModule { }
 exports[`Spartacus Organization schematics: ng-add B2B unit selection feature general setup should add the feature using the lazy loading syntax 1`] = `
 "import { NgModule } from '@angular/core';
 import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
-import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEnEn } from "@spartacus/organization/b2b-unit-selection/assets";
+import { b2bUnitSelectionTranslationChunksConfig, b2bUnitSelectionTranslationsEn } from "@spartacus/organization/b2b-unit-selection/assets";
 import { B2bUnitSelectionRootModule, ORGANIZATION_B2B_UNIT_SELECTION_FEATURE } from "@spartacus/organization/b2b-unit-selection/root";
 
 @NgModule({
@@ -532,7 +532,7 @@ import { B2bUnitSelectionRootModule, ORGANIZATION_B2B_UNIT_SELECTION_FEATURE } f
   }),
   provideConfig(<I18nConfig>{
     i18n: {
-      resources: { en: b2bUnitSelectionTranslationsEnEn },
+      resources: { en: b2bUnitSelectionTranslationsEn },
       chunks: b2bUnitSelectionTranslationChunksConfig,
     },
   })

From d5fb6a77cac8033a2c860c03d0dbcc8aee7a74fb Mon Sep 17 00:00:00 2001
From: Melody-zhou-512 <140146828+Melody-zhou-512@users.noreply.github.com>
Date: Wed, 5 Aug 2026 15:57:17 +0800
Subject: [PATCH 60/60] fix

fix
---
 core-libs/schematics/src/shared/utils/graph-utils_spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core-libs/schematics/src/shared/utils/graph-utils_spec.ts b/core-libs/schematics/src/shared/utils/graph-utils_spec.ts
index b4587a1fc46..914cb652eb1 100644
--- a/core-libs/schematics/src/shared/utils/graph-utils_spec.ts
+++ b/core-libs/schematics/src/shared/utils/graph-utils_spec.ts
@@ -211,6 +211,7 @@ describe('Graph utils', () => {
           "Customer-Ticketing",
           "Organization-User-Registration",
           "Administration",
+          "B2b-Unit-Selection",
           "Account-Summary",
           "Unit-Order",
           "Order-Approval",