feat(clink): render noffer offers as a payable card in notes

Wires the ClinkOfferSegment into RichTextViewer with a ClinkOfferPreview card (modeled on InvoicePreview): shows the offer + price and a Pay button. Pay runs ClinkOfferPayer, which publishes the kind-21001 request to the offer's relays and awaits the encrypted reply via a one-shot subscription, then hands the returned bolt11 to the existing payViaIntent wallet flow. Consume-only; Amethyst never answers offers. Compiles (:amethyst:compilePlayDebugKotlin); visual rendering and a live offer round-trip still need on-device verification.
2026-08-09 16:14:40 +00:00 · 2026-06-09 21:19:45 +00:00
parent 62e522ccc4
commit a7066784d4
4 changed files with 270 additions and 0 deletions
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.service
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.quartz.experimental.clink.client.OfferClient
+import com.vitorpamplona.quartz.experimental.clink.offers.OfferEvent
+import com.vitorpamplona.quartz.experimental.clink.offers.OfferResponse
+import com.vitorpamplona.quartz.experimental.clink.pointers.NOffer
+import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.relay.client.reqs.SubscriptionListener
+import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
+import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.withTimeoutOrNull
+
+/**
+ * Drives the CLINK Offers payer round-trip: publishes a kind-21001 request to the
+ * offer's relays and waits for the service's encrypted reply, returning the decrypted
+ * [OfferResponse] (an invoice or an error). UI then hands a successful `bolt11` to the
+ * existing pay path (e.g. `payViaIntent`).
+ *
+ * Consume-only: Amethyst never answers offer requests, it only asks.
+ */
+object ClinkOfferPayer {
+    const val DEFAULT_TIMEOUT_MS = 30_000L
+
+    /**
+     * @param amountSats overrides the pointer's embedded price (required for spontaneous offers).
+     * @return the decrypted response, or null if no reply arrived before [timeoutMs] (or the
+     *   pointer carried no relay to reach).
+     */
+    suspend fun requestInvoice(
+        account: Account,
+        offer: NOffer,
+        amountSats: Long? = null,
+        timeoutMs: Long = DEFAULT_TIMEOUT_MS,
+    ): OfferResponse? {
+        val relays = offer.relays.toSet()
+        if (relays.isEmpty()) return null
+
+        val client = OfferClient(offer, account.signer)
+        val request = client.requestInvoice(amountSats)
+
+        val reply = CompletableDeferred<OfferEvent>()
+        val subId = "clink-offer-${request.id}"
+        val filters: Map<NormalizedRelayUrl, List<Filter>> = relays.associateWith { listOf(client.responseFilter(request.id)) }
+
+        val listener =
+            object : SubscriptionListener {
+                override fun onEvent(
+                    event: Event,
+                    isLive: Boolean,
+                    relay: NormalizedRelayUrl,
+                    forFilters: List<Filter>?,
+                ) {
+                    if (event is OfferEvent && event.requestId() == request.id && !reply.isCompleted) {
+                        reply.complete(event)
+                    }
+                }
+            }
+
+        account.client.subscribe(subId, filters, listener)
+        return try {
+            account.client.publish(request, relays)
+            val response = withTimeoutOrNull(timeoutMs) { reply.await() } ?: return null
+            client.parseResponse(response)
+        } finally {
+            account.client.unsubscribe(subId)
+        }
+    }
+}
@@ -70,6 +70,7 @@ import com.vitorpamplona.amethyst.commons.richtext.Base64Segment
 import com.vitorpamplona.amethyst.commons.richtext.BechSegment
 import com.vitorpamplona.amethyst.commons.richtext.BlossomUriSegment
 import com.vitorpamplona.amethyst.commons.richtext.CashuSegment
+import com.vitorpamplona.amethyst.commons.richtext.ClinkOfferSegment
 import com.vitorpamplona.amethyst.commons.richtext.EmailSegment
 import com.vitorpamplona.amethyst.commons.richtext.EmojiSegment
 import com.vitorpamplona.amethyst.commons.richtext.HashIndexEventSegment
@@ -109,6 +110,7 @@ import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.navigation.routes.routeFor
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
+import com.vitorpamplona.amethyst.ui.note.creators.invoice.ClinkOfferPreview
 import com.vitorpamplona.amethyst.ui.note.creators.invoice.MayBeInvoicePreview
 import com.vitorpamplona.amethyst.ui.note.toShortDisplay
 import com.vitorpamplona.amethyst.ui.note.types.ReplyRenderType
@@ -506,6 +508,10 @@ private fun RenderWordWithoutPreview(
        // as a wall of base64.
        is CashuSegment -> CashuPreview(word.segmentText, accountViewModel)

+        // Decoding is local and the network round-trip only fires on the Pay tap,
+        // so the offer card is safe to render even in the no-preview path.
+        is ClinkOfferSegment -> ClinkOfferPreview(word.offer, accountViewModel)
+
        is EmailSegment -> ClickableEmail(word.segmentText)

        is SecretEmoji -> Text(word.segmentText)
@@ -552,6 +558,7 @@ private fun RenderWordWithPreview(
        is InvoiceSegment -> MayBeInvoicePreview(word.segmentText, accountViewModel)
        is WithdrawSegment -> MayBeWithdrawal(word.segmentText, accountViewModel)
        is CashuSegment -> CashuPreview(word.segmentText, accountViewModel)
+        is ClinkOfferSegment -> ClinkOfferPreview(word.offer, accountViewModel)
        is EmailSegment -> ClickableEmail(word.segmentText)
        is SecretEmoji -> DisplaySecretEmoji(word, state, callbackUri, true, quotesLeft, backgroundColor, accountViewModel, nav)
        is MathSegment -> LatexEquation(word.latex, word.displayMode, word.leading, word.trailing)
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.note.creators.invoice
+
+import androidx.compose.foundation.border
+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.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.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+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.unit.dp
+import androidx.compose.ui.unit.sp
+import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.commons.hashtags.CustomHashTagIcons
+import com.vitorpamplona.amethyst.commons.hashtags.Lightning
+import com.vitorpamplona.amethyst.service.ClinkOfferPayer
+import com.vitorpamplona.amethyst.ui.note.ErrorMessageDialog
+import com.vitorpamplona.amethyst.ui.note.payViaIntent
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.stringRes
+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.pointers.NOffer
+import kotlinx.coroutines.launch
+
+/**
+ * Inline card for a CLINK Offers pointer (`noffer1…`) found in a note. Tapping "Pay"
+ * runs the offer round-trip ([ClinkOfferPayer]) to fetch a fresh BOLT-11 over Nostr,
+ * then hands it to the existing wallet intent.
+ */
+@Composable
+fun ClinkOfferPreview(
+    offer: NOffer,
+    accountViewModel: AccountViewModel,
+) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    var requesting by remember { mutableStateOf(false) }
+    var errorMessage by remember { mutableStateOf<String?>(null) }
+
+    errorMessage?.let {
+        ErrorMessageDialog(
+            title = stringRes(context, R.string.error_dialog_pay_invoice_error),
+            textContent = it,
+            onDismiss = { errorMessage = null },
+        )
+    }
+
+    Column(
+        modifier =
+            Modifier
+                .fillMaxWidth()
+                .padding(start = 20.dp, end = 20.dp, top = 10.dp, bottom = 10.dp)
+                .clip(shape = QuoteBorder)
+                .border(1.dp, MaterialTheme.colorScheme.subtleBorder, QuoteBorder),
+    ) {
+        Column(
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(20.dp),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 10.dp),
+            ) {
+                Icon(
+                    imageVector = CustomHashTagIcons.Lightning,
+                    contentDescription = null,
+                    modifier = Size20Modifier,
+                    tint = Color.Unspecified,
+                )
+
+                Text(
+                    text = stringRes(R.string.clink_lightning_offer),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier = Modifier.padding(start = 10.dp),
+                )
+            }
+
+            HorizontalDivider(thickness = DividerThickness)
+
+            offer.price?.let {
+                Text(
+                    text = "$it ${stringRes(id = R.string.sats)}",
+                    fontSize = 25.sp,
+                    fontWeight = FontWeight.W500,
+                    modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 10.dp),
+                )
+            }
+
+            Button(
+                modifier =
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 10.dp),
+                enabled = !requesting,
+                onClick = {
+                    requesting = true
+                    scope.launch {
+                        val response = ClinkOfferPayer.requestInvoice(accountViewModel.account, offer)
+                        requesting = false
+
+                        val bolt11 = response?.bolt11
+                        when {
+                            bolt11 != null -> payViaIntent(bolt11, context, { }) { errorMessage = it }
+                            response?.error != null -> errorMessage = response.error
+                            else -> errorMessage = stringRes(context, R.string.error_dialog_pay_invoice_error)
+                        }
+                    }
+                },
+                shape = QuoteBorder,
+                colors =
+                    ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.primary,
+                    ),
+            ) {
+                Text(
+                    text = stringRes(if (requesting) R.string.clink_requesting_invoice else R.string.pay),
+                    color = Color.White,
+                    fontSize = 20.sp,
+                )
+            }
+        }
+    }
+}
@@ -112,6 +112,8 @@
    <string name="log_out">Logout</string>
    <string name="show_more">Show More</string>
    <string name="lightning_invoice">Lightning Invoice</string>
+    <string name="clink_lightning_offer">Lightning Offer</string>
+    <string name="clink_requesting_invoice">Requesting invoice…</string>
    <string name="pay">Pay</string>
    <string name="lightning_tips">Lightning Tips</string>
    <string name="note_to_receiver">Note to Receiver</string>