From 77d6ac88e761b6fb696763fade9f129cf2c2711b Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cesar.a.gonzalezcs@gmail.com>
Date: Thu, 1 Aug 2024 08:18:20 -0500
Subject: [PATCH] [PM-10416] Address field is used to populate state field when
 adding identity cipher from inline menu (#10348)

---
 .../src/autofill/services/autofill-constants.ts       |  2 ++
 .../inline-menu-field-qualification.service.ts        | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/autofill/services/autofill-constants.ts b/apps/browser/src/autofill/services/autofill-constants.ts
index 2dce06fc53..3a297e8d25 100644
--- a/apps/browser/src/autofill/services/autofill-constants.ts
+++ b/apps/browser/src/autofill/services/autofill-constants.ts
@@ -393,6 +393,7 @@ export class IdentityAutoFillConstants {
     "address-line-2",
     "addr-2",
     "street-2",
+    "address-ext",
   ];
 
   static readonly Address3FieldNames: string[] = [
@@ -409,6 +410,7 @@ export class IdentityAutoFillConstants {
     "zip-code",
     "postal-code",
     "post-code",
+    "postcode",
     "address-zip",
     "address-postal",
     "address-code",
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 151b8010f7..3c48d8db83 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
@@ -666,7 +666,14 @@ export class InlineMenuFieldQualificationService
 
     return (
       !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues) &&
-      this.keywordsFoundInFieldData(field, IdentityAutoFillConstants.Address1FieldNames, false)
+      this.keywordsFoundInFieldData(
+        field,
+        [
+          ...IdentityAutoFillConstants.AddressFieldNames,
+          ...IdentityAutoFillConstants.Address1FieldNames,
+        ],
+        false,
+      )
     );
   };
 
@@ -730,7 +737,7 @@ export class InlineMenuFieldQualificationService
 
     return (
       !this.fieldContainsAutocompleteValues(field, this.autocompleteDisabledValues) &&
-      this.keywordsFoundInFieldData(field, IdentityAutoFillConstants.AddressFieldNames, false)
+      this.keywordsFoundInFieldData(field, IdentityAutoFillConstants.StateFieldNames, false)
     );
   };