feat(clink): support variable-amount offers in the offer card

The offer card no longer assumes a fixed price:
- FIXED offers show their preset price (unchanged).
- SPONTANEOUS offers (and the spec default when the pointer omits a price
  type) now render an amount field; Pay is disabled until a positive amount
  is entered, and that amount is sent as amount_sats.
- An INVALID_AMOUNT (code 5) response reveals/refines the amount field and
  shows the service's allowed range, so variable offers recover gracefully
  even when the price type was ambiguous.

:amethyst compiles; the offer round-trip remains untested end-to-end.
This commit is contained in:
Claude
2026-06-09 23:00:12 +00:00
parent 503f33eb2e
commit 94ee192641
2 changed files with 59 additions and 7 deletions
@@ -25,11 +25,13 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -43,6 +45,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.vitorpamplona.amethyst.R
@@ -56,7 +59,10 @@ import com.vitorpamplona.amethyst.ui.theme.DividerThickness
import com.vitorpamplona.amethyst.ui.theme.QuoteBorder
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
import com.vitorpamplona.amethyst.ui.theme.subtleBorder
import com.vitorpamplona.quartz.experimental.clink.common.SatRange
import com.vitorpamplona.quartz.experimental.clink.offers.OfferErrorCode
import com.vitorpamplona.quartz.experimental.clink.pointers.NOffer
import com.vitorpamplona.quartz.experimental.clink.pointers.OfferPriceType
import kotlinx.coroutines.launch
/**
@@ -76,6 +82,9 @@ fun ClinkOfferPreview(
var requesting by remember { mutableStateOf(false) }
var errorMessage by remember { mutableStateOf<String?>(null) }
var payingInvoice by remember { mutableStateOf<String?>(null) }
var amountInput by remember { mutableStateOf("") }
var needsAmount by remember { mutableStateOf((offer.priceType ?: OfferPriceType.SPONTANEOUS) == OfferPriceType.SPONTANEOUS) }
var amountRange by remember { mutableStateOf<SatRange?>(null) }
errorMessage?.let {
ErrorMessageDialog(
@@ -130,11 +139,41 @@ fun ClinkOfferPreview(
HorizontalDivider(thickness = DividerThickness)
offer.price?.let {
Text(
text = "$it ${stringRes(id = R.string.sats)}",
fontSize = 25.sp,
fontWeight = FontWeight.W500,
// FIXED offers display their preset price; SPONTANEOUS offers (and the default
// when the pointer omits a price type) require the payer to enter an amount.
val effectiveType = offer.priceType ?: OfferPriceType.SPONTANEOUS
if (effectiveType == OfferPriceType.FIXED) {
offer.price?.let {
Text(
text = "$it ${stringRes(id = R.string.sats)}",
fontSize = 25.sp,
fontWeight = FontWeight.W500,
modifier =
Modifier
.fillMaxWidth()
.padding(vertical = 10.dp),
)
}
}
if (needsAmount) {
OutlinedTextField(
value = amountInput,
onValueChange = { new -> amountInput = new.filter(Char::isDigit) },
label = { Text(stringRes(R.string.clink_offer_amount_sats)) },
singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
supportingText =
amountRange?.let { range ->
val min = range.min
val max = range.max
if (min != null && max != null) {
{ Text(stringRes(R.string.clink_offer_amount_range, min.toString(), max.toString())) }
} else {
null
}
},
modifier =
Modifier
.fillMaxWidth()
@@ -142,21 +181,31 @@ fun ClinkOfferPreview(
)
}
val amountRequired = needsAmount
Button(
modifier =
Modifier
.fillMaxWidth()
.padding(vertical = 10.dp),
enabled = !requesting,
enabled = !requesting && (!amountRequired || (amountInput.toLongOrNull() ?: 0L) > 0L),
onClick = {
requesting = true
scope.launch {
val response = ClinkOfferPayer.requestInvoice(accountViewModel.account, offer)
val amount = if (amountRequired) amountInput.toLongOrNull() else null
val response = ClinkOfferPayer.requestInvoice(accountViewModel.account, offer, amountSats = amount)
requesting = false
val bolt11 = response?.bolt11
when {
bolt11 != null -> payingInvoice = bolt11
response?.code == OfferErrorCode.INVALID_AMOUNT -> {
// Reveal the amount field (or refine it) with the service's range.
needsAmount = true
amountRange = response.range
errorMessage =
response.error?.takeIf { it.isNotBlank() }
?: stringRes(context, R.string.clink_offer_invalid_amount)
}
response?.error != null -> errorMessage = response.error
else -> errorMessage = stringRes(context, R.string.error_dialog_pay_invoice_error)
}
+3
View File
@@ -118,6 +118,9 @@
<string name="clink_confirm_payment_title">Confirm payment</string>
<string name="clink_confirm_pay_amount_via_source">Pay %1$s via %2$s?</string>
<string name="clink_confirm_pay_via_source">Pay this invoice via %1$s?</string>
<string name="clink_offer_amount_sats">Amount (sats)</string>
<string name="clink_offer_invalid_amount">Enter a valid amount for this offer.</string>
<string name="clink_offer_amount_range">Allowed range: %1$s%2$s sats</string>
<string name="clink_debit_pay_only">Pay only</string>
<string name="wallet_add_clink_title">CLINK Debit</string>
<string name="wallet_add_clink_description">Pay and zap from a wallet that pre-authorized your account. Spend only — no balance or history.</string>