From 8d1ca3a650275d6927034ebc418a2923cae4372f Mon Sep 17 00:00:00 2001
From: Colton Hurst <colton@coltonhurst.com>
Date: Thu, 31 Jul 2025 18:30:57 -0400
Subject: [PATCH] atdb 1

---
 apps/desktop/src/app/accounts/settings.component.ts         | 6 +-----
 .../src/autofill/services/desktop-autotype.service.ts       | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 488855ca463..03bc6924491 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -19,7 +19,6 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import {
   VaultTimeout,
   VaultTimeoutAction,
@@ -267,10 +266,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
 
     // Autotype is for Windows initially
     const isWindows = this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop;
-    const windowsDesktopAutotypeFeatureFlag = await this.configService.getFeatureFlag(
-      FeatureFlag.WindowsDesktopAutotype,
-    );
-    this.showEnableAutotype = isWindows && windowsDesktopAutotypeFeatureFlag;
+    this.showEnableAutotype = isWindows;
 
     this.userHasMasterPassword = await this.userVerificationService.hasMasterPassword();
 
diff --git a/apps/desktop/src/autofill/services/desktop-autotype.service.ts b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
index 65152450a86..22c6a9768cd 100644
--- a/apps/desktop/src/autofill/services/desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
@@ -58,9 +58,7 @@ export class DesktopAutotypeService {
       ]).pipe(
         map(
           ([autotypeEnabled, windowsDesktopAutotypeFeatureFlag, authStatus]) =>
-            autotypeEnabled &&
-            windowsDesktopAutotypeFeatureFlag &&
-            authStatus == AuthenticationStatus.Unlocked,
+            autotypeEnabled && authStatus == AuthenticationStatus.Unlocked,
         ),
       );