remove PM8851_BrowserOnboardingNudge feature flag (#15956)

apps/browser/src/popup/tabs-v2.component.ts

@@ -1,11 +1,9 @@
 import { Component } from "@angular/core";
-import { combineLatest, map, Observable, startWith, switchMap } from "rxjs";
+import { map, Observable, startWith, switchMap } from "rxjs";
 
 import { NudgesService } from "@bitwarden/angular/vault";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Icons } from "@bitwarden/components";
 
 import { NavButton } from "../platform/popup/layout/popup-tab-navigation.component";
@@ -19,12 +17,9 @@ export class TabsV2Component {
   private hasActiveBadges$ = this.accountService.activeAccount$
     .pipe(getUserId)
     .pipe(switchMap((userId) => this.nudgesService.hasActiveBadges$(userId)));
-  protected navButtons$: Observable<NavButton[]> = combineLatest([
-    this.configService.getFeatureFlag$(FeatureFlag.PM8851_BrowserOnboardingNudge),
-    this.hasActiveBadges$,
-  ]).pipe(
-    startWith([false, false]),
-    map(([onboardingFeatureEnabled, hasBadges]) => {
+  protected navButtons$: Observable<NavButton[]> = this.hasActiveBadges$.pipe(
+    startWith(false),
+    map((hasBadges) => {
       return [
         {
           label: "vault",
@@ -49,7 +44,7 @@ export class TabsV2Component {
           page: "/tabs/settings",
           icon: Icons.SettingsInactive,
           iconActive: Icons.SettingsActive,
-          showBerry: onboardingFeatureEnabled && hasBadges,
+          showBerry: hasBadges,
         },
       ];
     }),
@@ -57,6 +52,5 @@ export class TabsV2Component {
   constructor(
     private nudgesService: NudgesService,
     private accountService: AccountService,
-    private readonly configService: ConfigService,
   ) {}
 }

apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.html

@@ -23,12 +23,6 @@
         <i slot="end" class="bwi bwi-external-link" aria-hidden="true"></i>
       </button>
     </bit-item>
-    <bit-item *ngIf="!(isNudgeFeatureEnabled$ | async)">
-      <a bit-item-content routerLink="/more-from-bitwarden">
-        {{ "moreFromBitwarden" | i18n }}
-        <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
-      </a>
-    </bit-item>
     <bit-item>
       <button type="button" bit-item-content (click)="rate()">
         {{ "rateExtension" | i18n }}

apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.ts

@@ -5,8 +5,6 @@ import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { DeviceType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ItemModule } from "@bitwarden/components";
@@ -48,17 +46,12 @@ export class AboutPageV2Component {
     private dialogService: DialogService,
     private environmentService: EnvironmentService,
     private platformUtilsService: PlatformUtilsService,
-    private configService: ConfigService,
   ) {}
 
   about() {
     this.dialogService.open(AboutDialogComponent);
   }
 
-  protected isNudgeFeatureEnabled$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM8851_BrowserOnboardingNudge,
-  );
-
   async launchHelp() {
     const confirmed = await this.dialogService.openSimpleDialog({
       title: { key: "continueToHelpCenter" },

apps/browser/src/tools/popup/settings/settings-v2.component.html

@@ -76,7 +76,7 @@
         <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
       </a>
     </bit-item>
-    <bit-item *ngIf="isNudgeFeatureEnabled$ | async">
+    <bit-item>
       <a bit-item-content routerLink="/download-bitwarden">
         <i slot="start" class="bwi bwi-mobile" aria-hidden="true"></i>
         <div class="tw-flex tw-items-center tw-justify-center">
@@ -92,7 +92,7 @@
         <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
       </a>
     </bit-item>
-    <bit-item *ngIf="isNudgeFeatureEnabled$ | async">
+    <bit-item>
       <a bit-item-content routerLink="/more-from-bitwarden">
         <i slot="start" class="bwi bwi-filter" aria-hidden="true"></i>
         {{ "moreFromBitwarden" | i18n }}

apps/browser/src/tools/popup/settings/settings-v2.component.ts

@@ -14,8 +14,6 @@ import {
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import { BadgeComponent, ItemModule } from "@bitwarden/components";
 
@@ -75,15 +73,10 @@ export class SettingsV2Component implements OnInit {
     ),
   );
 
-  protected isNudgeFeatureEnabled$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM8851_BrowserOnboardingNudge,
-  );
-
   constructor(
     private readonly nudgesService: NudgesService,
     private readonly accountService: AccountService,
     private readonly autofillBrowserSettingsService: AutofillBrowserSettingsService,
-    private readonly configService: ConfigService,
   ) {}
 
   async ngOnInit() {

apps/browser/src/vault/popup/guards/intro-carousel.guard.spec.ts

@@ -1,29 +1,23 @@
 import { TestBed } from "@angular/core/testing";
 import { Router } from "@angular/router";
-import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
 import { IntroCarouselService } from "../services/intro-carousel.service";
 
 import { IntroCarouselGuard } from "./intro-carousel.guard";
 
 describe("IntroCarouselGuard", () => {
-  let mockConfigService: MockProxy<ConfigService>;
   const mockIntroCarouselService = {
     introCarouselState$: of(true),
   };
   const createUrlTree = jest.fn();
 
   beforeEach(() => {
-    mockConfigService = mock<ConfigService>();
     createUrlTree.mockClear();
 
     TestBed.configureTestingModule({
       providers: [
         { provide: Router, useValue: { createUrlTree } },
-        { provide: ConfigService, useValue: mockConfigService },
         {
           provide: IntroCarouselService,
           useValue: mockIntroCarouselService,
@@ -32,22 +26,16 @@ describe("IntroCarouselGuard", () => {
     });
   });
 
-  it("should return true if the feature flag is off", async () => {
-    mockConfigService.getFeatureFlag.mockResolvedValue(false);
-    const result = await TestBed.runInInjectionContext(async () => await IntroCarouselGuard());
-    expect(result).toBe(true);
-  });
-  it("should navigate to intro-carousel route if feature flag is true and dismissed is true", async () => {
-    mockConfigService.getFeatureFlag.mockResolvedValue(true);
+  it("should return true when dismissed is true", async () => {
     const result = await TestBed.runInInjectionContext(async () => await IntroCarouselGuard());
     expect(result).toBe(true);
   });
 
-  it("should navigate to intro-carousel route if feature flag is true and dismissed is false", async () => {
+  it("should navigate to intro-carousel route when dismissed is false", async () => {
     TestBed.overrideProvider(IntroCarouselService, {
       useValue: { introCarouselState$: of(false) },
     });
-    mockConfigService.getFeatureFlag.mockResolvedValue(true);
+
     await TestBed.runInInjectionContext(async () => await IntroCarouselGuard());
     expect(createUrlTree).toHaveBeenCalledWith(["/intro-carousel"]);
   });

apps/browser/src/vault/popup/guards/intro-carousel.guard.ts

@@ -2,23 +2,15 @@ import { inject } from "@angular/core";
 import { Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-
 import { IntroCarouselService } from "../services/intro-carousel.service";
 
 export const IntroCarouselGuard = async () => {
   const router = inject(Router);
-  const configService = inject(ConfigService);
   const introCarouselService = inject(IntroCarouselService);
 
-  const hasOnboardingNudgesFlag = await configService.getFeatureFlag(
-    FeatureFlag.PM8851_BrowserOnboardingNudge,
-  );
-
   const hasIntroCarouselDismissed = await firstValueFrom(introCarouselService.introCarouselState$);
 
-  if (!hasOnboardingNudgesFlag || hasIntroCarouselDismissed) {
+  if (hasIntroCarouselDismissed) {
     return true;
   }
 

apps/browser/src/vault/popup/services/intro-carousel.service.ts

@@ -1,8 +1,6 @@
 import { Injectable } from "@angular/core";
-import { firstValueFrom, map, Observable } from "rxjs";
+import { map, Observable } from "rxjs";
 
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
   GlobalState,
   KeyDefinition,
@@ -28,17 +26,9 @@ export class IntroCarouselService {
     map((x) => x ?? false),
   );
 
-  constructor(
-    private stateProvider: StateProvider,
-    private configService: ConfigService,
-  ) {}
+  constructor(private stateProvider: StateProvider) {}
 
   async setIntroCarouselDismissed(): Promise<void> {
-    const hasVaultNudgeFlag = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.PM8851_BrowserOnboardingNudge),
-    );
-    if (hasVaultNudgeFlag) {
-      await this.introCarouselState.update(() => true);
-    }
+    await this.introCarouselState.update(() => true);
   }
 }