From 518eac14cdde6d533a1ebc349e441d54f95f5cfb Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Thu, 3 Feb 2022 14:11:05 -0500
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/23558 - Update menu copy for
 What's new and Customize homepage

---
 .../org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt  | 8 ++++----
 app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt      | 2 +-
 app/src/main/res/values/strings.xml                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
index 83fac710f3..de29fc5c65 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
@@ -188,7 +188,7 @@ class ThreeDotMenuMainRobot {
             mDevice.wait(
                 Until
                     .findObject(
-                        By.textContains("$packageName:id/browser_menu_customize_home")
+                        By.textContains("$packageName:id/browser_menu_customize_home_1")
                     ),
                 waitingTime
             )
@@ -276,7 +276,7 @@ class ThreeDotMenuMainRobot {
         }
 
         fun openWhatsNew(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            mDevice.waitNotNull(Until.findObject(By.text("What’s New")), waitingTime)
+            mDevice.waitNotNull(Until.findObject(By.text("What’s new")), waitingTime)
             whatsNewButton().click()
 
             BrowserRobot().interact()
@@ -379,7 +379,7 @@ private fun customizeHomeButton() =
     onView(
         allOf(
             withId(R.id.text),
-            withText(R.string.browser_menu_customize_home)
+            withText(R.string.browser_menu_customize_home_1)
         )
     )
 
@@ -455,7 +455,7 @@ private fun assertFindInPageButton() = findInPageButton()
 
 private fun whatsNewButton() = onView(
     allOf(
-        withText("What’s New"),
+        withText("What’s new"),
         withEffectiveVisibility(Visibility.VISIBLE)
     )
 )
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index 24c9f8d1d2..834a5d045c 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -166,7 +166,7 @@ class HomeMenu(
         }
 
         val customizeHomeItem = BrowserMenuImageText(
-            context.getString(R.string.browser_menu_customize_home),
+            context.getString(R.string.browser_menu_customize_home_1),
             R.drawable.ic_customize,
             primaryTextColor
         ) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 780eca7a1e..3d5fa9a621 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -179,7 +179,7 @@
     <!-- Browser menu button that sends a user to help articles -->
     <string name="browser_menu_help">Help</string>
     <!-- Browser menu button that sends a to a the what's new article -->
-    <string name="browser_menu_whats_new">What’s New</string>
+    <string name="browser_menu_whats_new">What’s new</string>
     <!-- Browser menu button that opens the settings menu -->
     <string name="browser_menu_settings">Settings</string>
     <!-- Browser menu button that opens a user's library -->
@@ -228,7 +228,7 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Edit</string>
     <!-- Browser menu button that opens the Customize menu -->
-    <string name="browser_menu_customize_home">Customize home</string>
+    <string name="browser_menu_customize_home" moz:removedIn="98" tools:ignore="UnusedResources">Customize home</string>
     <!-- Button shown on the home page that opens the Customize home settings -->
     <string name="browser_menu_customize_home_1">Customize homepage</string>
     <!-- Browser Toolbar -->