bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-07 20:24:01 +00:00
Code Issues Releases Wiki Activity

fix(billing): update unified dialog logic and re-add comments

Browse Source
This commit is contained in:
Stephon Brown
2026-01-27 13:45:17 -05:00
parent 550dde3b81
commit 28e63d564a
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/web/src/app/billing/individual/upgrade/unified-upgrade-dialog/unified-upgrade-dialog.component.ts
View File

@@ -17,6 +17,7 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
import {
BusinessSubscriptionPricingTierId,
PersonalSubscriptionPricingTierId,
PersonalSubscriptionPricingTierIds,
} from "@bitwarden/common/billing/types/subscription-pricing-tier";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -123,10 +124,24 @@ export class UnifiedUpgradeDialogComponent implements OnInit {
protected readonly showPremiumOrgFlow = computed(
() => this.hasPremiumPersonally() && this.premiumToOrganizationUpgradeEnabled(),
);
// Type-narrowed computed signal for app-upgrade-payment
// When hasPremiumPersonally is false, selectedPlan will only contain PersonalSubscriptionPricingTierId
/**
* Type-safe computed signal for app-upgrade-payment component.
* Returns the selected plan only when it's a personal plan (Premium or Families).
* When showPremiumOrgFlow is true, this will be null since business plans are handled separately.
*/
protected readonly selectedPersonalPlanId = computed<PersonalSubscriptionPricingTierId | null>(
() => this.selectedPlan() as PersonalSubscriptionPricingTierId | null,
() => {
const plan = this.selectedPlan();
// When showing premium org flow, user is selecting business plans (Teams/Enterprise)
// Standard flow uses personal plans (Premium/Families)
if (
plan === PersonalSubscriptionPricingTierIds.Premium ||
plan === PersonalSubscriptionPricingTierIds.Families
) {
return plan;
}
return null;
},
);
protected readonly PaymentStep = UnifiedUpgradeDialogStep.Payment;

3
apps/web/src/app/billing/individual/upgrade/upgrade-payment/upgrade-payment.component.ts
View File

@@ -59,6 +59,9 @@ import {
UpgradePaymentService,
} from "./services/upgrade-payment.service";
/**
* Status types for upgrade payment dialog
*/
export const UpgradePaymentStatus = {
Closed: "closed",
UpgradedToPremium: "upgradedToPremium",