From 65bedf8d26a2143ff5e88fb8a23bfead30a3bef7 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Thu, 2 Mar 2023 14:42:11 -0500
Subject: [PATCH] Use page header for 2FA setup comp on org settings page to
 match other org settings pages but use tabbed header class on user account
 settings > security > Two-step login tab. (#4890)

---
 .../app/organizations/settings/two-factor-setup.component.ts    | 1 +
 apps/web/src/auth/settings/two-factor-setup.component.html      | 2 +-
 apps/web/src/auth/settings/two-factor-setup.component.ts        | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
index fa9d25b8be..97179ab7aa 100644
--- a/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/organizations/settings/two-factor-setup.component.ts
@@ -17,6 +17,7 @@ import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../..
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
+  tabbedHeader = false;
   constructor(
     apiService: ApiService,
     modalService: ModalService,
diff --git a/apps/web/src/auth/settings/two-factor-setup.component.html b/apps/web/src/auth/settings/two-factor-setup.component.html
index 4073bab4c2..d61f62425e 100644
--- a/apps/web/src/auth/settings/two-factor-setup.component.html
+++ b/apps/web/src/auth/settings/two-factor-setup.component.html
@@ -1,6 +1,6 @@
 <!-- Please remove this disable statement when editing this file! -->
 <!-- eslint-disable @angular-eslint/template/button-has-type -->
-<div class="page-header">
+<div [ngClass]="tabbedHeader ? 'tabbed-header' : 'page-header'">
   <h1 *ngIf="!organizationId">{{ "twoStepLogin" | i18n }}</h1>
   <h1 *ngIf="organizationId">{{ "twoStepLoginEnforcement" | i18n }}</h1>
 </div>
diff --git a/apps/web/src/auth/settings/two-factor-setup.component.ts b/apps/web/src/auth/settings/two-factor-setup.component.ts
index 818ade5bb2..dc5c08e81b 100644
--- a/apps/web/src/auth/settings/two-factor-setup.component.ts
+++ b/apps/web/src/auth/settings/two-factor-setup.component.ts
@@ -43,6 +43,8 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
   modal: ModalRef;
   formPromise: Promise<any>;
 
+  tabbedHeader = true;
+
   private destroy$ = new Subject<void>();
   private twoFactorAuthPolicyAppliesToActiveUser: boolean;