Bug 1567548 - Remove references to Lockwise FAQ page. r=jaws,fluent-reviewers,flod

Differential Revision: https://phabricator.services.mozilla.com/D43895

--HG--
extra : moz-landing-system : lando

browser/app/profile/firefox.js

@@ -1784,7 +1784,6 @@ pref("signon.management.overrideURI", "about:logins?filter=%DOMAIN%");
   pref("signon.showAutoCompleteOrigins", true);
   pref("signon.includeOtherSubdomainsInLookup", true);
 #endif
-pref("signon.management.page.faqURL", "https://lockwise.firefox.com/faq.html");
 // The utm_creative value is appended within the code (specific to the location on
 // where it is clicked). Be sure that if these two prefs are updated, that
 // the utm_creative param be last.
@@ -2380,4 +2379,3 @@ pref("devtools.webide.lastConnectedRuntime", "");
 pref("devtools.webide.lastSelectedProject", "");
 pref("devtools.webide.zoom", "1");
 pref("devtools.webide.busyTimeout", 10000);
-

browser/components/BrowserGlue.jsm

@@ -143,7 +143,6 @@ let LEGACY_ACTORS = {
         AboutLoginsHideFooter: { wantUntrusted: true },
         AboutLoginsImport: { wantUntrusted: true },
         AboutLoginsInit: { wantUntrusted: true },
-        AboutLoginsOpenFAQ: { wantUntrusted: true },
         AboutLoginsGetHelp: { wantUntrusted: true },
         AboutLoginsOpenMobileAndroid: { wantUntrusted: true },
         AboutLoginsOpenMobileIos: { wantUntrusted: true },

browser/components/aboutlogins/AboutLoginsChild.jsm

@@ -104,10 +104,6 @@ class AboutLoginsChild extends ActorChild {
         this.mm.sendAsyncMessage("AboutLogins:Import");
         break;
       }
-      case "AboutLoginsOpenFAQ": {
-        this.mm.sendAsyncMessage("AboutLogins:OpenFAQ");
-        break;
-      }
       case "AboutLoginsOpenMobileAndroid": {
         this.mm.sendAsyncMessage("AboutLogins:OpenMobileAndroid", {
           source: event.detail,

browser/components/aboutlogins/AboutLoginsParent.jsm

@@ -156,14 +156,6 @@ var AboutLoginsParent = {
         });
         break;
       }
-      case "AboutLogins:OpenFAQ": {
-        const FAQ_URL_PREF = "signon.management.page.faqURL";
-        const FAQ_URL = Services.prefs.getStringPref(FAQ_URL_PREF);
-        message.target.ownerGlobal.openWebLinkIn(FAQ_URL, "tab", {
-          relatedToCurrent: true,
-        });
-        break;
-      }
       case "AboutLogins:OpenMobileAndroid": {
         const MOBILE_ANDROID_URL_PREF =
           "signon.management.page.mobileAndroidURL";

browser/components/aboutlogins/content/aboutLogins.html

@@ -130,8 +130,8 @@
         <ul>
           <li data-l10n-id="login-intro-instruction-fxa"></li>
           <li data-l10n-id="login-intro-instruction-fxa-settings"></li>
-          <li data-l10n-id="login-intro-instruction-faq">
-            <a data-l10n-name="faq" class="intro-faq-link" href="#"></a>
+          <li data-l10n-id="about-logins-intro-instruction-help">
+            <a data-l10n-name="help-link" class="intro-help-link" href="#"></a>
           </li>
         </ul>
       </section>
@@ -235,7 +235,6 @@
         <button role="menuitem" class="menuitem-button menuitem-preferences ghost-button" data-event-name="AboutLoginsOpenPreferences" data-l10n-id="menu-menuitem-preferences"></button>
         <hr role="separator" class="menuitem-separator"></hr>
         <button role="menuitem" class="menuitem-button menuitem-help ghost-button" data-event-name="AboutLoginsGetHelp" data-l10n-id="about-logins-menu-menuitem-help"></button>
-        <button role="menuitem" class="menuitem-button menuitem-faq ghost-button" data-event-name="AboutLoginsOpenFAQ" data-l10n-id="menu-menuitem-faq"></button>
         <hr role="separator" class="menuitem-separator"></hr>
         <button role="menuitem" class="menuitem-button menuitem-mobile menuitem-mobile-android ghost-button" data-event-name="AboutLoginsOpenMobileAndroid" data-l10n-id="menu-menuitem-android-app"></button>
         <button role="menuitem" class="menuitem-button menuitem-mobile menuitem-mobile-ios ghost-button" data-event-name="AboutLoginsOpenMobileIos" data-l10n-id="menu-menuitem-iphone-app"></button>

browser/components/aboutlogins/content/components/login-intro.js

@@ -17,11 +17,11 @@ export default class LoginIntro extends HTMLElement {
   }
 
   handleEvent(event) {
-    let faqLink = this.shadowRoot.querySelector(".intro-faq-link");
+    let helpLink = this.shadowRoot.querySelector(".intro-help-link");
 
-    if (event.type == "click" && event.originalTarget == faqLink) {
+    if (event.type == "click" && event.originalTarget == helpLink) {
       document.dispatchEvent(
-        new CustomEvent("AboutLoginsOpenFAQ", {
+        new CustomEvent("AboutLoginsGetHelp", {
           bubbles: true,
         })
       );

browser/components/aboutlogins/content/components/menu-button.css

@@ -73,10 +73,6 @@
   background-image: url("chrome://browser/skin/settings.svg");
 }
 
-.menuitem-faq {
-  background-image: url("chrome://global/skin/icons/help.svg");
-}
-
 .menuitem-mobile {
   background-image: url("chrome://browser/skin/device-phone.svg");
 }

browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js

@@ -19,12 +19,6 @@ add_task(async function test_open_feedback() {
       pref: "app.support.baseURL",
       selector: ".menuitem-help",
     },
-    {
-      urlFinal: "https://example.com/faqs",
-      urlBase: "https://example.com/faqs",
-      pref: "signon.management.page.faqURL",
-      selector: ".menuitem-faq",
-    },
     {
       urlFinal: "https://example.com/android?utm_creative=Elipsis_Menu",
       urlBase: "https://example.com/android?utm_creative=",

browser/components/aboutlogins/tests/chrome/test_menu_button.html

@@ -124,7 +124,6 @@ add_task(async function test_menu_keyboard_cycling() {
   let allItems = [
     "menuitem-preferences",
     "menuitem-help",
-    "menuitem-faq",
     "menuitem-mobile-android",
     "menuitem-mobile-ios",
   ];

browser/locales/en-US/browser/aboutLogins.ftl

@@ -41,7 +41,6 @@ menu-menuitem-preferences =
      *[other] Preferences
   }
 about-logins-menu-menuitem-help = Help
-menu-menuitem-faq = Frequently Asked Questions
 menu-menuitem-android-app = { -lockwise-brand-short-name } for Android
 menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad
 
@@ -73,7 +72,7 @@ login-intro-heading = Looking for your saved logins? Set up { -sync-brand-short-
 login-intro-description = If you saved your logins to { -brand-product-name } on a different device, here’s how to get them here:
 login-intro-instruction-fxa = Create or sign in to your { -fxaccount-brand-name } on the device where your logins are saved
 login-intro-instruction-fxa-settings = Make sure you’ve selected the Logins checkbox in { -sync-brand-short-name } Settings
-login-intro-instruction-faq = Visit { -lockwise-brand-short-name } <a data-l10n-name="faq">frequently asked questions</a> for more help
+about-logins-intro-instruction-help = Visit <a data-l10n-name="help-link">{ -lockwise-brand-short-name } Support</a> for more help
 
 ## Login