From dafdb437310cfa0516df30684d6adf0cfc842d8b Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cgonzalez@bitwarden.com>
Date: Fri, 31 May 2024 15:10:19 -0500
Subject: [PATCH] [PM-8027] Cleaning up implementation details

---
 .../collect-autofill-content.service.ts       | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
index 6e30372c2a0..4cdf275c43a 100644
--- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts
@@ -125,21 +125,6 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte
     return pageDetails;
   }
 
-  private setupInlineMenuListeners(pageDetails: AutofillPageDetails) {
-    if (!this.autofillOverlayContentService) {
-      return;
-    }
-
-    const formFieldElements = Array.from(this.autofillFieldElements.keys());
-    for (const element of formFieldElements) {
-      void this.autofillOverlayContentService.setupAutofillOverlayListenerOnField(
-        element,
-        this.autofillFieldElements.get(element),
-        pageDetails,
-      );
-    }
-  }
-
   /**
    * Find an AutofillField element by its opid, will only return the first
    * element if there are multiple elements with the same opid. If no
@@ -470,10 +455,6 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte
 
     if (elementIsSpanElement(element)) {
       this.cacheAutofillFieldElement(index, element, autofillFieldBase);
-      // void this.autofillOverlayContentService?.setupAutofillOverlayListenerOnField(
-      //   element,
-      //   autofillFieldBase,
-      // );
       return autofillFieldBase;
     }
 
@@ -513,10 +494,6 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte
     };
 
     this.cacheAutofillFieldElement(index, element, autofillField);
-    // void this.autofillOverlayContentService?.setupAutofillOverlayListenerOnField(
-    //   element,
-    //   autofillField,
-    // );
     return autofillField;
   };
 
@@ -1455,6 +1432,20 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte
     }
   };
 
+  private setupInlineMenuListeners(pageDetails: AutofillPageDetails) {
+    if (!this.autofillOverlayContentService) {
+      return;
+    }
+
+    this.autofillFieldElements.forEach((autofillField, formFieldElement) => {
+      void this.autofillOverlayContentService.setupAutofillOverlayListenerOnField(
+        formFieldElement,
+        autofillField,
+        pageDetails,
+      );
+    });
+  }
+
   /**
    * Destroys the CollectAutofillContentService. Clears all
    * timeouts and disconnects the mutation observer.