From 2ab85057cec55aab95001ee384f5bbe7fb4fa671 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 22 Jun 2022 15:39:24 -0400
Subject: [PATCH] Issue #12372 - Update the "Select addresses" text to "Select
 address"

---
 .../layout/mozac_feature_prompts_address_select_prompt.xml  | 2 +-
 components/feature/prompts/src/main/res/values/strings.xml  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/feature/prompts/src/main/res/layout/mozac_feature_prompts_address_select_prompt.xml b/components/feature/prompts/src/main/res/layout/mozac_feature_prompts_address_select_prompt.xml
index 64064fd0d60..eefce4acd66 100644
--- a/components/feature/prompts/src/main/res/layout/mozac_feature_prompts_address_select_prompt.xml
+++ b/components/feature/prompts/src/main/res/layout/mozac_feature_prompts_address_select_prompt.xml
@@ -29,7 +29,7 @@
                 android:gravity="center_vertical"
                 android:paddingStart="16dp"
                 android:paddingEnd="56dp"
-                android:text="@string/mozac_feature_prompts_select_address"
+                android:text="@string/mozac_feature_prompts_select_address_2"
                 android:textColor="?android:colorEdgeEffect"
                 android:textSize="16sp"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/components/feature/prompts/src/main/res/values/strings.xml b/components/feature/prompts/src/main/res/values/strings.xml
index 42cf481ab1f..456ea4734da 100644
--- a/components/feature/prompts/src/main/res/values/strings.xml
+++ b/components/feature/prompts/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:moz="http://mozac.org/tools">
     <!-- Text for confirmation for a positive action in dialog  -->
     <string name="mozac_feature_prompts_ok">OK</string>
     <!-- Text for confirmation for a negative action in dialog.  -->
@@ -119,7 +119,9 @@
 
     <!-- Address Autofill -->
     <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
-    <string name="mozac_feature_prompts_select_address">Select addresses</string>
+    <string name="mozac_feature_prompts_select_address" moz:removedIn="104" tools:ignore="UnusedResources">Select addresses</string>
+    <!-- Header for the select address prompt to allow users to fill a form with a saved address. -->
+    <string name="mozac_feature_prompts_select_address_2">Select address</string>
     <!-- Content description for expanding the select addresses options in the select address prompt. -->
     <string name="mozac_feature_prompts_expand_address_content_description">Expand suggested addresses</string>
     <!-- Content description for collapsing the select address options in the select address prompt. -->