From d0c1e93b3c061fea87cc01002a1f7a08bcc7e4f0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 23 Sep 2025 15:37:10 -0300
Subject: [PATCH] Do not display a price if it's been zeroed.

---
 .../app/backups/BackupsSettingsFragment.kt    | 24 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
index 35a4f618ef..2cfc4defaa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsFragment.kt
@@ -496,6 +496,11 @@ private fun ActiveBackupsRow(
           is MessageBackupsType.Paid -> {
             val body = if (backupState is BackupState.Canceled) {
               stringResource(R.string.BackupsSettingsFragment__subscription_canceled)
+            } else if (type.pricePerMonth.amount == BigDecimal.ZERO) {
+              stringResource(
+                R.string.BackupsSettingsFragment_renews_s,
+                DateUtils.formatDateWithYear(Locale.getDefault(), backupState.renewalTime.inWholeMilliseconds)
+              )
             } else {
               stringResource(
                 R.string.BackupsSettingsFragment_s_month_renews_s,
@@ -694,6 +699,25 @@ private fun ActivePaidBackupsRowPreview() {
   }
 }
 
+@SignalPreview
+@Composable
+private fun ActivePaidBackupsRowNoPricePreview() {
+  Previews.Preview {
+    ActiveBackupsRow(
+      backupState = BackupState.ActivePaid(
+        messageBackupsType = MessageBackupsType.Paid(
+          pricePerMonth = FiatMoney(BigDecimal.ZERO, Currency.getInstance("CAD")),
+          storageAllowanceBytes = 1_000_000,
+          mediaTtl = 30.days
+        ),
+        renewalTime = 0.seconds,
+        price = FiatMoney(BigDecimal.valueOf(4), Currency.getInstance("CAD"))
+      ),
+      lastBackupAt = 0.seconds
+    )
+  }
+}
+
 @SignalPreview
 @Composable
 private fun ActiveFreeBackupsRowPreview() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6638b5126..1b6585fd76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8142,6 +8142,8 @@
     <!-- BackupsSettingsFragment -->
     <!-- Subtitle for row for active backup, first placeholder is formatted amount, second is renewal date -->
     <string name="BackupsSettingsFragment_s_month_renews_s">%1$s/month, renews %2$s</string>
+    <!-- Subtitle for row for active backup when price is not available, first placeholder is renewal date -->
+    <string name="BackupsSettingsFragment_renews_s">Renews %1$s</string>
     <!-- Subtitle for row for active backup, placeholder is last date of backup -->
     <string name="BackupsSettingsFragment_last_backup_s">Last backup %1$s</string>
     <!-- Subtitle for row for canceled backup -->