From b4fc097cd5e3fde1289659f273628e29c1a11da5 Mon Sep 17 00:00:00 2001
From: Alexandru2909 <alexandru.putanu@softvision.com>
Date: Thu, 23 Jun 2022 14:25:20 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/25721 - Remove 'Daylight' from
 the 'About Firefox' screen

---
 .../java/org/mozilla/fenix/settings/about/AboutFragment.kt  | 6 +-----
 app/src/main/res/values/static_strings.xml                  | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
index 3d6f44dd1d..bdf1bc3432 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt
@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import mozilla.components.service.glean.private.NoExtras
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.BuildConfig
-import org.mozilla.fenix.Config
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
@@ -40,7 +39,6 @@ import org.mozilla.geckoview.BuildConfig as GeckoViewBuildConfig
  */
 class AboutFragment : Fragment(), AboutPageListener {
 
-    private lateinit var headerAppName: String
     private lateinit var appName: String
     private var aboutPageAdapter: AboutPageAdapter? = AboutPageAdapter(this)
     private var _binding: FragmentAboutBinding? = null
@@ -54,8 +52,6 @@ class AboutFragment : Fragment(), AboutPageListener {
     ): View {
         _binding = FragmentAboutBinding.inflate(inflater, container, false)
         appName = getString(R.string.app_name)
-        headerAppName =
-            if (Config.channel.isRelease) getString(R.string.daylight_app_name) else appName
 
         return binding.root
     }
@@ -128,7 +124,7 @@ class AboutFragment : Fragment(), AboutPageListener {
             ""
         }
 
-        val content = getString(R.string.about_content, headerAppName)
+        val content = getString(R.string.about_content, appName)
         val buildDate = BuildConfig.BUILD_DATE
 
         binding.aboutText.text = aboutText
diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml
index 79e50b07b5..c5c7b7074d 100644
--- a/app/src/main/res/values/static_strings.xml
+++ b/app/src/main/res/values/static_strings.xml
@@ -52,9 +52,6 @@
     <!-- Content description (not visible, for screen readers etc.) used to announce [LinkTextView]. -->
     <string name="link_text_view_type_announcement" translatable="false">link</string>
 
-    <!-- Name of the application for about page -->
-    <string name="daylight_app_name" translatable="false">Firefox Daylight</string>
-
     <!-- Secret debug info strings -->
     <string name="debug_info_region_home" translatable="false">Home region</string>
     <string name="debug_info_region_current" translatable="false">Current region</string>