(android) Fix description of incoming offer with unknown source

ACINQ · Jul 2, 2024 · 78a2942 · 78a2942
1 parent 5869ed5
commit 78a2942
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Settings.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Settings.kt
@@ -211,18 +211,17 @@ fun SettingSwitch(
     Column(
         modifier
             .fillMaxWidth()
-            .clickable(onClick = { if (enabled) onCheckChangeAttempt(!isChecked) })
-            .enableOrFade(enabled)
+            .clickable(onClick = { if (enabled) onCheckChangeAttempt(!isChecked) }, enabled = enabled)
             .padding(horizontal = 16.dp, vertical = 12.dp),
     ) {
         Row(verticalAlignment = Alignment.CenterVertically) {
             icon?.let {
                 PhoenixIcon(it, Modifier.size(ButtonDefaults.IconSize))
                 Spacer(Modifier.width(12.dp))
             }
-            Text(text = title, style = MaterialTheme.typography.body2, modifier = Modifier.weight(1f))
+            Text(text = title, style = if (enabled) MaterialTheme.typography.body2 else MaterialTheme.typography.caption, modifier = Modifier.weight(1f))
             Spacer(Modifier.width(16.dp))
-            Switch(checked = isChecked, onCheckedChange = null)
+            Switch(checked = isChecked, onCheckedChange = null, enabled = enabled, modifier = Modifier.enableOrFade(enabled))
         }
         if (description != null) {
             Spacer(modifier = Modifier.height(2.dp))

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentLine.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentLine.kt
@@ -189,7 +189,7 @@ private fun PaymentDescription(paymentInfo: WalletPaymentInfo, modifier: Modifie
 
                 when (val contact = contactForKey.value) {
                     null -> when (val note = offerMetadata.payerNote) {
-                        null -> stringResource(id = R.string.paymentdetails_desc_from_unknown)
+                        null -> null
                         else -> stringResource(id = R.string.paymentdetails_desc_from_unknown_with_note, note)
                     }
                     else -> when (val note = offerMetadata.payerNote) {

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/PaymentSettingsView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/PaymentSettingsView.kt
@@ -118,6 +118,14 @@ fun PaymentSettingsView(
                     initialShowDialog = false
                 )
             }
+
+            SettingSwitch(
+                title = "Block BOLT12 payments from unknown sources",
+                description = "\uD83D\uDEA7 Coming soon",
+                enabled = false,
+                isChecked = false,
+                onCheckChangeAttempt = {}
+            )
         }
 
         val isOverpaymentEnabled by userPrefs.getIsOverpaymentEnabled.collectAsState(initial = false)

diff --git a/phoenix-android/src/main/res/values/strings.xml b/phoenix-android/src/main/res/values/strings.xml
@@ -689,7 +689,7 @@
     <string name="paymentsettings_overpayment_disabled">Disabled (default)</string>
 
     <string name="paymentsettings_random_payer_key_title">Random payer key</string>
-    <string name="paymentsettings_random_payer_key_desc">If random, the recipient of a BOLT12 offer will not know who made the payment. Disabled by default.</string>
+    <string name="paymentsettings_random_payer_key_desc">If enabled, the recipient of a BOLT12 offer will not know who made the payment.</string>
 
     <!-- settings: currencies -->