From c9de05de95220db60f967432d4fbc798b4d6a0e6 Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Mon, 21 Oct 2024 09:50:59 -0400
Subject: [PATCH] [PM-13675] Adjust browser autofill override instructions
 conditions and placement in the settings view (#11559)

* adjust browser autofill override instructions conditions and placement in the settings view

* adjust placement of override instructions in the refresh component for Firefox
---
 .../popup/settings/autofill-v1.component.html | 17 ++++++++--
 .../popup/settings/autofill.component.html    | 31 ++++++++++---------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/apps/browser/src/autofill/popup/settings/autofill-v1.component.html b/apps/browser/src/autofill/popup/settings/autofill-v1.component.html
index ec8aeac37e..530519e88f 100644
--- a/apps/browser/src/autofill/popup/settings/autofill-v1.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill-v1.component.html
@@ -41,8 +41,19 @@
           </option>
         </select>
       </div>
-      <div class="box-footer" *ngIf="accountSwitcherEnabled && canOverrideBrowserAutofillSetting">
-        {{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}
+      <div class="box-footer" *ngIf="accountSwitcherEnabled || !canOverrideBrowserAutofillSetting">
+        <span *ngIf="accountSwitcherEnabled">{{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}</span>
+        <span *ngIf="!canOverrideBrowserAutofillSetting">
+          {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
+          <a
+            [attr.href]="disablePasswordManagerLink"
+            (click)="openDisablePasswordManagerLink($event)"
+            target="_blank"
+            rel="noreferrer"
+          >
+            {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }}
+          </a>
+        </span>
       </div>
     </div>
   </div>
@@ -86,7 +97,7 @@
         />
       </div>
     </div>
-    <div class="box-footer">
+    <div class="box-footer" *ngIf="canOverrideBrowserAutofillSetting">
       <span *ngIf="accountSwitcherEnabled">{{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}</span>
       {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
       <a
diff --git a/apps/browser/src/autofill/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html
index b9e4ad222d..e9c9fd9c75 100644
--- a/apps/browser/src/autofill/popup/settings/autofill.component.html
+++ b/apps/browser/src/autofill/popup/settings/autofill.component.html
@@ -11,7 +11,7 @@
         <h2 bitTypography="h6">{{ "autofillSuggestionsSectionTitle" | i18n }}</h2>
       </bit-section-header>
       <bit-card>
-        <bit-form-control>
+        <bit-form-control [disableMargin]="!enableInlineMenu && !canOverrideBrowserAutofillSetting">
           <input
             bitCheckbox
             id="show-inline-menu"
@@ -26,6 +26,22 @@
           >
             {{ "showInlineMenuOnFormFieldsDescAlt" | i18n }}
           </bit-hint>
+          <bit-hint
+            *ngIf="!canOverrideBrowserAutofillSetting"
+            [class]="!enableInlineMenu ? 'tw-text-sm tw-mb-6' : 'tw-text-sm'"
+          >
+            {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
+            <a
+              bitLink
+              class="tw-no-underline"
+              rel="noreferrer"
+              target="_blank"
+              (click)="openURI($event, disablePasswordManagerURI)"
+              [attr.href]="disablePasswordManagerURI"
+            >
+              {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }}
+            </a>
+          </bit-hint>
         </bit-form-control>
         <bit-form-control
           *ngIf="inlineMenuPositioningImprovementsEnabled && enableInlineMenu"
@@ -68,19 +84,6 @@
           <bit-label for="show-autofill-suggestions-on-icon">
             {{ "showInlineMenuOnIconSelectionLabel" | i18n }}
           </bit-label>
-          <bit-hint class="tw-text-sm" *ngIf="!canOverrideBrowserAutofillSetting">
-            {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }}
-            <a
-              bitLink
-              class="tw-no-underline"
-              rel="noreferrer"
-              target="_blank"
-              (click)="openURI($event, disablePasswordManagerURI)"
-              [attr.href]="disablePasswordManagerURI"
-            >
-              {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }}
-            </a>
-          </bit-hint>
         </bit-form-control>
         <bit-form-control *ngIf="canOverrideBrowserAutofillSetting">
           <input