From 2ab2c6f039f48bbaccf2e940b2c26f14a5252823 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Thu, 13 Jun 2024 15:36:41 -0400
Subject: [PATCH] Ensure that substrings match in the registration contact
 support bottom sheet.

---
 .../fragments/ContactSupportBottomSheetFragment.kt            | 2 +-
 app/src/main/res/values/strings.xml                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
index dab4a49857..6a395ca37a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ContactSupportBottomSheetFragment.kt
@@ -80,7 +80,7 @@ class ContactSupportBottomSheetFragment : ComposeBottomSheetDialogFragment() {
   private fun buildClickableString(): AnnotatedString {
     val troubleshootingStepsString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring)
     val contactSupportString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_cta_contact_support_substring)
-    val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action)
+    val completeString = stringResource(R.string.RegistrationActivity_support_bottom_sheet_body_call_to_action, troubleshootingStepsString, contactSupportString)
 
     val troubleshootingStartIndex = completeString.indexOf(troubleshootingStepsString)
     val troubleshootingEndIndex = troubleshootingStartIndex + troubleshootingStepsString.length
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36daf9214f..75cae3272f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2230,8 +2230,8 @@
     <string name="RegistrationActivity_support_bottom_sheet_title">Having trouble registering?</string>
     <!--    A list of suggestions to try for a user having trouble entering their verification code.-->
     <string name="RegistrationActivity_support_bottom_sheet_body_suggestions">• Make sure your phone has a cellular signal to receive your SMS or call\n • Confirm you can receive a phone call to the number\n • Check that you have entered your phone number correctly.</string>
-    <!--    A call to action for a user having trouble entering the verification to seek further help. -->
-    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow these troubleshooting steps or Contact Support</string>
+    <!--    A call to action for a user having trouble entering the verification to seek further help. The first placeholder is RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring, the second is RegistrationActivity_support_bottom_sheet_cta_contact_support_substring -->
+    <string name="RegistrationActivity_support_bottom_sheet_body_call_to_action">For more information, please follow %1$s or %2$s</string>
     <!--    A clickable piece of text that will take the user to our website with additional suggestions.-->
     <string name="RegistrationActivity_support_bottom_sheet_cta_troubleshooting_steps_substring">these troubleshooting steps</string>
     <!--    A clickable piece of text that will pre-fill a request for support email in the user\'s email app.-->