Revert "Use separate link text for JP/WP feedback form"

This reverts commit 3f363a9.
wordpress-mobile · Jan 27, 2025 · 11e08fc · 11e08fc
1 parent 3f363a9
commit 11e08fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormActivity.kt
@@ -57,9 +57,6 @@ class FeedbackFormActivity : BaseAppCompatActivity() {
         )
     }
 
-    /**
-     * Displays the when the user taps to contact support in the JP app, or community forums in the WP app
-     */
     private fun navigateToHelpScreen() {
         val intent = Intent(this, HelpActivity::class.java)
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormScreen.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/feedbackform/FeedbackFormScreen.kt
@@ -49,7 +49,6 @@ import androidx.compose.ui.text.withLink
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.flow.MutableStateFlow
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.ui.compose.components.MediaUriPager
 import org.wordpress.android.ui.compose.components.ProgressDialog
@@ -112,11 +111,7 @@ private fun MessageSection(
     onMessageChanged: (String) -> Unit,
     onSupportClick: () -> Unit
 ) {
-    val linkText = if (BuildConfig.IS_JETPACK_APP) {
-        stringResource(id = R.string.feedback_form_note_link_jetpack)
-    } else {
-        stringResource(id = R.string.feedback_form_note_link_wordpress)
-    }
+    val linkText = stringResource(id = R.string.feedback_form_note_link)
     val linkAnnotation = LinkAnnotation.Url(
         url = "support",
         styles = TextLinkStyles(

diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -1144,9 +1144,8 @@
     <string name="feedback_form_attachment_already_added">Attachment already added</string>
     <string name="feedback_form_unable_to_create_tempfile">Unable to create temporary file</string>
     <string name="feedback_form_add_attachments">Add attachments</string>
-    <string name="feedback_form_note_text">Please note this is not a support form, and we will not be able to reply. If you need assistance, please use our "</string>
-    <string name="feedback_form_note_link_jetpack">Contact Support screen.</string>
-    <string name="feedback_form_note_link_wordpress">Community Forums.</string>
+    <string name="feedback_form_note_text">Please note this is not a support form, and we will not be able to reply. If you need support, please use our "</string>
+    <string name="feedback_form_note_link">Contact Support screen.</string>
     <string name="media_pager_remove_item_content_description">Remove item %1$d</string>
 
     <!-- activity log -->