diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts index f1cd505de0..30c5106a4f 100644 --- a/apps/web/src/app/admin-console/organizations/members/members.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts @@ -98,10 +98,6 @@ export class MembersComponent extends BaseMembersComponent protected canUseSecretsManager$: Observable; - protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$( - FeatureFlag.EnableUpgradePasswordManagerSub, - ); - protected accountDeprovisioningEnabled$: Observable = this.configService.getFeatureFlag$( FeatureFlag.AccountDeprovisioning, ); @@ -487,29 +483,20 @@ export class MembersComponent extends BaseMembersComponent this.organization.productTierType === ProductTierType.TeamsStarter || this.organization.productTierType === ProductTierType.Families) ) { - const enableUpgradePasswordManagerSub = await firstValueFrom( - this.enableUpgradePasswordManagerSub$, - ); - if (enableUpgradePasswordManagerSub && this.organization.canEditSubscription) { - const reference = openChangePlanDialog(this.dialogService, { - data: { - organizationId: this.organization.id, - subscription: null, - productTierType: this.organization.productTierType, - }, - }); + const reference = openChangePlanDialog(this.dialogService, { + data: { + organizationId: this.organization.id, + subscription: null, + productTierType: this.organization.productTierType, + }, + }); - const result = await lastValueFrom(reference.closed); + const result = await lastValueFrom(reference.closed); - if (result === ChangePlanDialogResultType.Submitted) { - await this.load(); - } - return; - } else { - // Show org upgrade modal - await this.showSeatLimitReachedDialog(); - return; + if (result === ChangePlanDialogResultType.Submitted) { + await this.load(); } + return; } const dialog = openUserAddEditDialog(this.dialogService, { diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index f5cc89c86b..61c13a26e0 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -60,10 +60,6 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy protected readonly subscriptionHiddenIcon = SubscriptionHiddenIcon; protected readonly teamsStarter = ProductTierType.TeamsStarter; - protected enableUpgradePasswordManagerSub$ = this.configService.getFeatureFlag$( - FeatureFlag.EnableUpgradePasswordManagerSub, - ); - protected deprecateStripeSourcesAPI$ = this.configService.getFeatureFlag$( FeatureFlag.AC2476_DeprecateStripeSourcesAPI, ); @@ -360,27 +356,20 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy }; async changePlan() { - const EnableUpgradePasswordManagerSub = await firstValueFrom( - this.enableUpgradePasswordManagerSub$, - ); - if (EnableUpgradePasswordManagerSub) { - const reference = openChangePlanDialog(this.dialogService, { - data: { - organizationId: this.organizationId, - subscription: this.sub, - productTierType: this.userOrg.productTierType, - }, - }); + const reference = openChangePlanDialog(this.dialogService, { + data: { + organizationId: this.organizationId, + subscription: this.sub, + productTierType: this.userOrg.productTierType, + }, + }); - const result = await lastValueFrom(reference.closed); + const result = await lastValueFrom(reference.closed); - if (result === ChangePlanDialogResultType.Closed) { - return; - } - await this.load(); - } else { - this.showChangePlan = !this.showChangePlan; + if (result === ChangePlanDialogResultType.Closed) { + return; } + await this.load(); } isSecretsManagerTrial(): boolean { diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index a12d05e99b..723fac226f 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -21,7 +21,6 @@ export enum FeatureFlag { VaultBulkManagementAction = "vault-bulk-management-action", IdpAutoSubmitLogin = "idp-auto-submit-login", UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh", - EnableUpgradePasswordManagerSub = "AC-2708-upgrade-password-manager-sub", GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor", EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill", DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2", @@ -72,7 +71,6 @@ export const DefaultFeatureFlagValue = { [FeatureFlag.VaultBulkManagementAction]: FALSE, [FeatureFlag.IdpAutoSubmitLogin]: FALSE, [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE, - [FeatureFlag.EnableUpgradePasswordManagerSub]: FALSE, [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE, [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE, [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE,