diff --git a/apps/browser/src/popup/tabs-v2.component.ts b/apps/browser/src/popup/tabs-v2.component.ts index 3d93f5d4e0..860b71794f 100644 --- a/apps/browser/src/popup/tabs-v2.component.ts +++ b/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 = combineLatest([ - this.configService.getFeatureFlag$(FeatureFlag.PM8851_BrowserOnboardingNudge), - this.hasActiveBadges$, - ]).pipe( - startWith([false, false]), - map(([onboardingFeatureEnabled, hasBadges]) => { + protected navButtons$: Observable = 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, ) {} } diff --git a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.html b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.html index 839681889a..9bba399435 100644 --- a/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.html +++ b/apps/browser/src/tools/popup/settings/about-page/about-page-v2.component.html @@ -23,12 +23,6 @@ - - - {{ "moreFromBitwarden" | i18n }} - - -