bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

[PM-24554] remove code for feature flag (#16092)

Browse Source
This commit is contained in:
Kyle Denney
2025-08-21 09:36:57 -05:00
committed by GitHub
parent b0f46004ff
commit f07518084f
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
View File

@@ -4,7 +4,7 @@ import { StepperSelectionEvent } from "@angular/cdk/stepper";
import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core"; import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
import { FormBuilder, Validators } from "@angular/forms"; import { FormBuilder, Validators } from "@angular/forms";
import { ActivatedRoute, Router } from "@angular/router"; import { ActivatedRoute, Router } from "@angular/router";
import { combineLatest, firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs"; import { firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
import { import {
InputPasswordFlow, InputPasswordFlow,
@@ -101,9 +101,6 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
protected trialPaymentOptional$ = this.configService.getFeatureFlag$( protected trialPaymentOptional$ = this.configService.getFeatureFlag$(
FeatureFlag.TrialPaymentOptional, FeatureFlag.TrialPaymentOptional,
); );
protected allowTrialLengthZero$ = this.configService.getFeatureFlag$(
FeatureFlag.AllowTrialLengthZero,
);
constructor( constructor(
protected router: Router, protected router: Router,
@@ -337,14 +334,11 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
return this.productTier; return this.productTier;
} }
readonly showBillingStep$ = combineLatest([ readonly showBillingStep$ = this.trialPaymentOptional$.pipe(
this.trialPaymentOptional$, map((trialPaymentOptional) => {
this.allowTrialLengthZero$,
]).pipe(
map(([trialPaymentOptional, allowTrialLengthZero]) => {
return ( return (
(!trialPaymentOptional && !this.isSecretsManagerFree) || (!trialPaymentOptional && !this.isSecretsManagerFree) ||
(trialPaymentOptional && allowTrialLengthZero && this.trialLength === 0) (trialPaymentOptional && this.trialLength === 0)
); );
}), }),
); );

2
libs/common/src/enums/feature-flag.enum.ts
View File

@@ -28,7 +28,6 @@ export enum FeatureFlag {
PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features", PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships", PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
UseOrganizationWarningsService = "use-organization-warnings-service", UseOrganizationWarningsService = "use-organization-warnings-service",
AllowTrialLengthZero = "pm-20322-allow-trial-length-0",
PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout", PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover", PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover",
PM22415_TaxIDWarnings = "pm-22415-tax-id-warnings", PM22415_TaxIDWarnings = "pm-22415-tax-id-warnings",
@@ -104,7 +103,6 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE, [FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
[FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE, [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
[FeatureFlag.UseOrganizationWarningsService]: FALSE, [FeatureFlag.UseOrganizationWarningsService]: FALSE,
[FeatureFlag.AllowTrialLengthZero]: FALSE,
[FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE, [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,
[FeatureFlag.PM21821_ProviderPortalTakeover]: FALSE, [FeatureFlag.PM21821_ProviderPortalTakeover]: FALSE,
[FeatureFlag.PM22415_TaxIDWarnings]: FALSE, [FeatureFlag.PM22415_TaxIDWarnings]: FALSE,