From d9e65aca14334398f9c8079da91ef9fbb62e0a59 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Wed, 8 Jan 2025 15:34:16 -0500
Subject: [PATCH] Remove lock and logout settings from Safari Account Settings
 (#12699)

---
 .../popup/settings/account-security.component.html   | 12 ------------
 .../popup/settings/account-security.component.ts     |  6 +-----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.html b/apps/browser/src/auth/popup/settings/account-security.component.html
index 3f874fc1a76..0f2754b2bf2 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.html
+++ b/apps/browser/src/auth/popup/settings/account-security.component.html
@@ -109,18 +109,6 @@
           <i slot="end" class="bwi bwi-external-link" aria-hidden="true"></i>
         </button>
       </bit-item>
-      <bit-item
-        *ngIf="
-          !accountSwitcherEnabled && availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)
-        "
-      >
-        <button bit-item-content type="button" appStopClick (click)="lock()"></button>
-        {{ "lockNow" | i18n }}
-      </bit-item>
-      <bit-item *ngIf="!accountSwitcherEnabled">
-        <button bit-item-content type="button" appStopClick (click)="logOut()"></button>
-        {{ "logOut" | i18n }}
-      </bit-item>
     </bit-section>
   </div>
 </popup-page>
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 099f445be85..158eb797ac8 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -63,7 +63,6 @@ import {
 
 import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
 import { BrowserApi } from "../../../platform/browser/browser-api";
-import { enableAccountSwitching } from "../../../platform/flags";
 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
@@ -107,7 +106,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   hasVaultTimeoutPolicy = false;
   biometricUnavailabilityReason: string;
   showChangeMasterPass = true;
-  accountSwitcherEnabled = false;
 
   form = this.formBuilder.group({
     vaultTimeout: [null as VaultTimeout | null],
@@ -140,9 +138,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private biometricStateService: BiometricStateService,
     private toastService: ToastService,
     private biometricsService: BiometricsService,
-  ) {
-    this.accountSwitcherEnabled = enableAccountSwitching();
-  }
+  ) {}
 
   async ngOnInit() {
     const hasMasterPassword = await this.userVerificationService.hasMasterPassword();