From 0c03651086f8ba9a8824d42c85d18233779afe4d Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Fri, 28 Aug 2020 19:39:19 -0400
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/14254 - Removes Login select
 feature flag

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt          | 5 -----
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index aae515af2a..7e6d7a8eae 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -45,9 +45,4 @@ object FeatureFlags {
      * Enables viewing downloads in browser.
      */
     val viewDownloads = Config.channel.isNightlyOrDebug
-
-    /**
-     * Enables selecting from multiple logins.
-     */
-    val loginSelect = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 41f90d6f2d..2f509b03ae 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -507,7 +507,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                     onNeedToRequestPermissions = { permissions ->
                         requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS)
                     },
-                    loginPickerView = if (FeatureFlags.loginSelect) loginSelectBar else null,
+                    loginPickerView = loginSelectBar,
                     onManageLogins = {
                         browserAnimator.captureEngineViewAndDrawStatically {
                             val directions =