From 7984bb329f662b669cc525f5e9641f2eba03b93d Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Thu, 13 Feb 2025 10:23:38 +0100
Subject: [PATCH] [PM-15402] Remove `TaxInfoComponent` from
 trial-initiation.module.ts (#12996)

---
 .../trial-billing-step.component.html         |  4 ++-
 .../trial-billing-step.component.ts           | 25 ++++++++++---------
 .../app/billing/shared/tax-info.component.ts  |  3 +++
 .../trial-initiation.module.ts                |  2 --
 .../providers/providers.module.ts             |  3 +--
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
index 361b2d9a3a3..b3b8668e90b 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
@@ -50,7 +50,9 @@
     <div class="tw-mb-4">
       <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "paymentType" | i18n }}</h2>
       <app-payment [showAccountCredit]="false"></app-payment>
-      <app-tax-info [trialFlow]="true" (countryChanged)="changedCountry()"></app-tax-info>
+      <app-manage-tax-information
+        (taxInformationChanged)="changedCountry()"
+      ></app-manage-tax-information>
     </div>
     <div class="tw-flex tw-space-x-2">
       <button type="submit" buttonType="primary" bitButton [loading]="form.loading">
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
index 1c24bb9fd80..2a67f570db6 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
@@ -3,6 +3,7 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import {
   BillingInformation,
@@ -17,7 +18,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { ToastService } from "@bitwarden/components";
 
-import { BillingSharedModule, TaxInfoComponent } from "../../shared";
+import { BillingSharedModule } from "../../shared";
 import { PaymentComponent } from "../../shared/payment/payment.component";
 
 export type TrialOrganizationType = Exclude<ProductTierType, ProductTierType.Free>;
@@ -51,7 +52,7 @@ export enum SubscriptionProduct {
 })
 export class TrialBillingStepComponent implements OnInit {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
-  @ViewChild(TaxInfoComponent) taxInfoComponent: TaxInfoComponent;
+  @ViewChild(ManageTaxInformationComponent) taxInfoComponent: ManageTaxInformationComponent;
   @Input() organizationInfo: OrganizationInfo;
   @Input() subscriptionProduct: SubscriptionProduct = SubscriptionProduct.PasswordManager;
   @Output() steppedBack = new EventEmitter();
@@ -89,8 +90,7 @@ export class TrialBillingStepComponent implements OnInit {
   }
 
   async submit(): Promise<void> {
-    if (!this.taxInfoComponent.taxFormGroup.valid && this.taxInfoComponent?.taxFormGroup.touched) {
-      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
+    if (!this.taxInfoComponent.validate()) {
       return;
     }
 
@@ -115,7 +115,8 @@ export class TrialBillingStepComponent implements OnInit {
   }
 
   protected changedCountry() {
-    this.paymentComponent.showBankAccount = this.taxInfoComponent.country === "US";
+    this.paymentComponent.showBankAccount =
+      this.taxInfoComponent.getTaxInformation().country === "US";
     if (
       !this.paymentComponent.showBankAccount &&
       this.paymentComponent.selected === PaymentMethodType.BankAccount
@@ -210,13 +211,13 @@ export class TrialBillingStepComponent implements OnInit {
 
   private getBillingInformationFromTaxInfoComponent(): BillingInformation {
     return {
-      postalCode: this.taxInfoComponent.taxFormGroup?.value.postalCode,
-      country: this.taxInfoComponent.taxFormGroup?.value.country,
-      taxId: this.taxInfoComponent.taxFormGroup?.value.taxId,
-      addressLine1: this.taxInfoComponent.taxFormGroup?.value.line1,
-      addressLine2: this.taxInfoComponent.taxFormGroup?.value.line2,
-      city: this.taxInfoComponent.taxFormGroup?.value.city,
-      state: this.taxInfoComponent.taxFormGroup?.value.state,
+      postalCode: this.taxInfoComponent.getTaxInformation()?.postalCode,
+      country: this.taxInfoComponent.getTaxInformation()?.country,
+      taxId: this.taxInfoComponent.getTaxInformation()?.taxId,
+      addressLine1: this.taxInfoComponent.getTaxInformation()?.line1,
+      addressLine2: this.taxInfoComponent.getTaxInformation()?.line2,
+      city: this.taxInfoComponent.getTaxInformation()?.city,
+      state: this.taxInfoComponent.getTaxInformation()?.state,
     };
   }
 
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index 214364e4cf2..a987ed8d489 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -15,6 +15,9 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 
 import { SharedModule } from "../../shared";
 
+/**
+ * @deprecated Use `ManageTaxInformationComponent` instead.
+ */
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
diff --git a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
index 2c6481ec1bf..3e6bfdc4e6c 100644
--- a/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
+++ b/apps/web/src/app/billing/trial-initiation/trial-initiation.module.ts
@@ -6,7 +6,6 @@ import { InputPasswordComponent } from "@bitwarden/auth/angular";
 import { FormFieldModule } from "@bitwarden/components";
 
 import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
-import { TaxInfoComponent } from "../../billing";
 import { TrialBillingStepComponent } from "../../billing/accounts/trial-initiation/trial-billing-step.component";
 import { SecretsManagerTrialFreeStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-free-stepper.component";
 import { SecretsManagerTrialPaidStepperComponent } from "../../billing/trial-initiation/secrets-manager/secrets-manager-trial-paid-stepper.component";
@@ -48,7 +47,6 @@ import { VerticalStepperModule } from "./vertical-stepper/vertical-stepper.modul
     FormFieldModule,
     OrganizationCreateModule,
     EnvironmentSelectorModule,
-    TaxInfoComponent,
     TrialBillingStepComponent,
     InputPasswordComponent,
   ],
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
index 3310be7ba36..c720a94d5ec 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts
@@ -6,7 +6,7 @@ import { FormsModule } from "@angular/forms";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { SearchModule } from "@bitwarden/components";
 import { DangerZoneComponent } from "@bitwarden/web-vault/app/auth/settings/account/danger-zone.component";
-import { OrganizationPlansComponent, TaxInfoComponent } from "@bitwarden/web-vault/app/billing";
+import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 import { OssModule } from "@bitwarden/web-vault/app/oss.module";
 
 import {
@@ -47,7 +47,6 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr
     OrganizationPlansComponent,
     SearchModule,
     ProvidersLayoutComponent,
-    TaxInfoComponent,
     DangerZoneComponent,
     ScrollingModule,
   ],