From 6de7e0cb50c5cb2c3862693fdfd0c705c3d374e2 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 14 Nov 2024 10:41:53 -0400
Subject: [PATCH] Normalize receipt labeling.

---
 .../settings/app/subscription/receipts/ReceiptImageRenderer.kt | 3 ++-
 .../receipts/detail/DonationReceiptDetailFragment.kt           | 2 +-
 app/src/main/res/values/strings.xml                            | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/ReceiptImageRenderer.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/ReceiptImageRenderer.kt
index 1b10052db4..012624e873 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/ReceiptImageRenderer.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/ReceiptImageRenderer.kt
@@ -48,9 +48,10 @@ object ReceiptImageRenderer {
     val today: String = DateUtils.formatDateWithDayOfWeek(Locale.getDefault(), System.currentTimeMillis())
     val amount: String = FiatMoneyUtil.format(context.resources, record.amount)
     val type: String = when (record.type) {
-      InAppPaymentReceiptRecord.Type.RECURRING_DONATION, InAppPaymentReceiptRecord.Type.RECURRING_BACKUP -> context.getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, context.getString(R.string.DonationReceiptListFragment__recurring))
+      InAppPaymentReceiptRecord.Type.RECURRING_DONATION -> context.getString(R.string.DonationReceiptListFragment__recurring)
       InAppPaymentReceiptRecord.Type.ONE_TIME_DONATION -> context.getString(R.string.DonationReceiptListFragment__one_time)
       InAppPaymentReceiptRecord.Type.ONE_TIME_GIFT -> context.getString(R.string.DonationReceiptListFragment__donation_for_a_friend)
+      InAppPaymentReceiptRecord.Type.RECURRING_BACKUP -> error("Not supported.")
     }
     val datePaid: String = DateUtils.formatDate(Locale.getDefault(), record.timestamp)
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
index ed634f72d7..b8cca5972b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
@@ -87,7 +87,7 @@ class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.do
         title = DSLSettingsText.from(R.string.DonationReceiptDetailsFragment__donation_type),
         summary = DSLSettingsText.from(
           when (record.type) {
-            InAppPaymentReceiptRecord.Type.RECURRING_DONATION -> getString(R.string.DonationReceiptDetailsFragment__s_dash_s, subscriptionName, getString(R.string.DonationReceiptListFragment__recurring))
+            InAppPaymentReceiptRecord.Type.RECURRING_DONATION -> getString(R.string.DonationReceiptListFragment__recurring)
             InAppPaymentReceiptRecord.Type.ONE_TIME_DONATION -> getString(R.string.DonationReceiptListFragment__one_time)
             InAppPaymentReceiptRecord.Type.ONE_TIME_GIFT -> getString(R.string.DonationReceiptListFragment__donation_for_a_friend)
             InAppPaymentReceiptRecord.Type.RECURRING_BACKUP -> error("Not supported in this fragment.")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca9a51d1fa..c89a201415 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6095,8 +6095,6 @@
     <string name="DonationReceiptDetailsFragment__amount">Amount</string>
     <!-- Donation receipts thanks -->
     <string name="DonationReceiptDetailsFragment__thank_you_for_supporting">Thank you for supporting Signal. Your contribution helps fuel the mission of developing open source privacy technology that protects free expression and enables secure global communication for millions around the world. If you’re a resident of the United States, please retain this receipt for your tax records. Signal Technology Foundation is a tax–exempt nonprofit organization in the United States under section 501c3 of the Internal Revenue Code. Our Federal Tax ID is 82–4506840.</string>
-    <!-- Donation receipt type -->
-    <string name="DonationReceiptDetailsFragment__s_dash_s">%1$s - %2$s</string>
     <!-- Donation reciepts screen empty state title -->
     <string name="DonationReceiptListFragment__no_receipts">No receipts</string>