From b988993a8860b1f17734fd5d9c4956a7327824e7 Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Tue, 11 Mar 2025 16:06:03 -0400
Subject: [PATCH] PM-18963 removed flag and updated relevant tests (#13767)

---
 ...e-menu-field-qualification.service.spec.ts | 22 ++-----------------
 ...inline-menu-field-qualification.service.ts |  7 ++----
 .../src/background/runtime.background.ts      |  4 ----
 libs/common/src/enums/feature-flag.enum.ts    |  2 --
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
index dc59e05a18b..f3047947c82 100644
--- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
+++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts
@@ -21,8 +21,7 @@ describe("InlineMenuFieldQualificationService", () => {
   });
 
   describe("isFieldForLoginForm", () => {
-    it("does not disqualify totp fields for premium users with flag set to true", () => {
-      inlineMenuFieldQualificationService["inlineMenuTotpFeatureFlag"] = true;
+    it("does not disqualify totp fields for premium users", () => {
       inlineMenuFieldQualificationService["premiumEnabled"] = true;
       const field = mock<AutofillField>({
         type: "text",
@@ -37,24 +36,7 @@ describe("InlineMenuFieldQualificationService", () => {
       );
     });
 
-    it("disqualifies totp fields for premium users with flag set to false", () => {
-      inlineMenuFieldQualificationService["inlineMenuTotpFeatureFlag"] = false;
-      inlineMenuFieldQualificationService["inlineMenuTotpFeatureFlag"] = true;
-      const field = mock<AutofillField>({
-        type: "text",
-        autoCompleteType: "one-time-code",
-        htmlName: "totp",
-        htmlID: "totp",
-        placeholder: "totp",
-      });
-
-      expect(inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails)).toBe(
-        false,
-      );
-    });
-
-    it("disqualifies totp fields for non-premium users with flag set to true", () => {
-      inlineMenuFieldQualificationService["inlineMenuTotpFeatureFlag"] = true;
+    it("disqualifies totp fields for non-premium users", () => {
       inlineMenuFieldQualificationService["premiumEnabled"] = false;
       const field = mock<AutofillField>({
         type: "text",
diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
index dff40a3ab93..046381d956c 100644
--- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
+++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
@@ -151,17 +151,14 @@ export class InlineMenuFieldQualificationService
   ]);
   private totpFieldAutocompleteValue = "one-time-code";
   private inlineMenuFieldQualificationFlagSet = false;
-  private inlineMenuTotpFeatureFlag = false;
   private premiumEnabled = false;
 
   constructor() {
     void Promise.all([
       sendExtensionMessage("getInlineMenuFieldQualificationFeatureFlag"),
-      sendExtensionMessage("getInlineMenuTotpFeatureFlag"),
       sendExtensionMessage("getUserPremiumStatus"),
-    ]).then(([fieldQualificationFlag, totpFeatureFlag, premiumStatus]) => {
+    ]).then(([fieldQualificationFlag, premiumStatus]) => {
       this.inlineMenuFieldQualificationFlagSet = !!fieldQualificationFlag?.result;
-      this.inlineMenuTotpFeatureFlag = !!totpFeatureFlag?.result;
       this.premiumEnabled = !!premiumStatus?.result;
     });
   }
@@ -180,7 +177,7 @@ export class InlineMenuFieldQualificationService
     /**
      * Totp inline menu is available only for premium users.
      */
-    if (this.inlineMenuTotpFeatureFlag && this.premiumEnabled) {
+    if (this.premiumEnabled) {
       const isTotpField = this.isTotpField(field);
       // Autofill does not fill totp inputs with a "password" `type` attribute value
       const passwordType = field.type === "password";
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index a5fea0651fc..32e7432174a 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -78,7 +78,6 @@ export default class RuntimeBackground {
         BiometricsCommands.GetBiometricsStatusForUser,
         "getUseTreeWalkerApiForPageDetailsCollectionFeatureFlag",
         "getInlineMenuFieldQualificationFeatureFlag",
-        "getInlineMenuTotpFeatureFlag",
         "getUserPremiumStatus",
       ];
 
@@ -217,9 +216,6 @@ export default class RuntimeBackground {
         );
         return result;
       }
-      case "getInlineMenuTotpFeatureFlag": {
-        return await this.configService.getFeatureFlag(FeatureFlag.InlineMenuTotp);
-      }
     }
   }
 
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index e17ac77e416..2e5f571a5ca 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -17,7 +17,6 @@ export enum FeatureFlag {
   IdpAutoSubmitLogin = "idp-auto-submit-login",
   InlineMenuFieldQualification = "inline-menu-field-qualification",
   InlineMenuPositioningImprovements = "inline-menu-positioning-improvements",
-  InlineMenuTotp = "inline-menu-totp",
   NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements",
   NotificationRefresh = "notification-refresh",
   UseTreeWalkerApiForPageDetailsCollection = "use-tree-walker-api-for-page-details-collection",
@@ -73,7 +72,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.IdpAutoSubmitLogin]: FALSE,
   [FeatureFlag.InlineMenuFieldQualification]: FALSE,
   [FeatureFlag.InlineMenuPositioningImprovements]: FALSE,
-  [FeatureFlag.InlineMenuTotp]: FALSE,
   [FeatureFlag.NotificationBarAddLoginImprovements]: FALSE,
   [FeatureFlag.NotificationRefresh]: FALSE,
   [FeatureFlag.UseTreeWalkerApiForPageDetailsCollection]: FALSE,