refactor: codify paykit issuer contract

app/src/androidTest/java/to/bitkit/ui/screens/paymentrequests/PaymentRequestsScreenTest.kt

@@ -55,10 +55,12 @@ class PaymentRequestsScreenTest {
             }
         }
 
-        composeTestRule.onNodeWithTag("PaymentRequestRowincoming").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestRow-incoming").assertIsDisplayed()
         composeTestRule.onNodeWithTag("MoneyPrimary").assertIsDisplayed()
         composeTestRule.onNodeWithTag("MoneySecondary").assertIsDisplayed()
         composeTestRule.onNodeWithTag("PaymentRequestsSeeAll").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestDismiss-incoming").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestPay-incoming").assertIsDisplayed()
         composeTestRule.onNodeWithText("Dismiss").assertIsDisplayed()
     }
 
@@ -149,8 +151,8 @@ class PaymentRequestsScreenTest {
             }
         }
 
-        composeTestRule.onNodeWithTag("PaymentRequestRowaccepted").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("PaymentRequestRowoutgoing").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestRow-accepted").assertIsDisplayed()
+        composeTestRule.onNodeWithTag("PaymentRequestRow-outgoing").assertIsDisplayed()
         composeTestRule.onNodeWithText("Waiting for", substring = true).assertIsDisplayed()
         composeTestRule.onNodeWithText("PAYMENT REQUESTS").assertIsDisplayed()
         composeTestRule.onNodeWithText("TODAY").assertIsDisplayed()

app/src/main/java/to/bitkit/repositories/PaykitIssuerInterop.kt

@@ -0,0 +1,50 @@
+package to.bitkit.repositories
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.lightningdevkit.ldknode.Network
+import to.bitkit.di.json as appJson
+
+internal object PaykitIssuerInterop {
+    /** Canonical lowercase Bitcoin asset used by Paykit Payment Requests. */
+    const val BITCOIN_ASSET = "btc"
+
+    private val payloadJson = Json(appJson) {
+        prettyPrint = false
+        isLenient = false
+        encodeDefaults = false
+    }
+
+    fun supportedEndpointIdentifiers(
+        identifiers: List<String>,
+        network: Network,
+    ): List<String> = identifiers
+        .filter { MethodId.fromRawValue(it, network) != null }
+        .distinct()
+
+    fun parseEndpointPayload(endpointData: String): PaykitEndpointPayload? {
+        val payload = runCatching {
+            payloadJson.decodeFromString<PaykitEndpointPayload>(endpointData)
+        }.getOrNull() ?: return null
+        val value = payload.value.trim()
+        if (value.isEmpty()) return null
+
+        return payload.copy(value = value)
+    }
+
+    fun serializeEndpointPayload(value: String): String? {
+        val trimmedValue = value.trim()
+        if (trimmedValue.isEmpty()) return null
+
+        return payloadJson.encodeToString(PaykitEndpointPayload(value = trimmedValue))
+    }
+}
+
+@Serializable
+internal data class PaykitEndpointPayload(
+    val value: String,
+    val min: String? = null,
+    val max: String? = null,
+)

app/src/main/java/to/bitkit/repositories/PaykitPaymentRequestRepo.kt

@@ -30,10 +30,12 @@ import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
+import org.lightningdevkit.ldknode.Network
 import to.bitkit.async.appScope
 import to.bitkit.data.SettingsData
 import to.bitkit.data.SettingsStore
 import to.bitkit.di.IoDispatcher
+import to.bitkit.env.Env
 import to.bitkit.ext.runSuspendCatching
 import to.bitkit.flags.PaykitFeatureFlags
 import to.bitkit.models.PubkyPublicKeyFormat
@@ -970,10 +972,11 @@ private fun List<PaykitPaymentRequest>.withExpiredLifecycle(now: Instant): List<
 private val bitcoinAmountPattern = Regex("(?:[0-9]+(?:\\.[0-9]*)?|\\.[0-9]+)")
 
 @Suppress("CyclomaticComplexMethod", "ReturnCount", "LongMethod")
-private fun PaymentRequestRecord.toPaykitPaymentRequest(
+internal fun PaymentRequestRecord.toPaykitPaymentRequest(
     expectedRole: PaymentRequestLocalRole,
     now: Instant,
     requiresActionableRequest: Boolean = true,
+    network: Network = Env.network,
 ): PaykitPaymentRequest? {
     if (localRole != expectedRole || state == PaymentRequestLifecycleState.ACTIVE_RECURRING) return null
     if (
@@ -984,13 +987,14 @@ private fun PaymentRequestRecord.toPaykitPaymentRequest(
         return null
     }
     val requestTerms = terms ?: return null
-    if (requestTerms.recurrence != null || requestTerms.amount.asset != "btc") return null
+    if (requestTerms.recurrence != null || requestTerms.amount.asset != PaykitIssuerInterop.BITCOIN_ASSET) return null
     val amountSats = requestTerms.amount.value.toPaykitSats()
         ?.takeIf { it <= ULong.MAX_VALUE / 1000uL }
         ?: return null
-    val endpoints = requestTerms.acceptedPaymentEndpointIdentifiers
-        .filter { MethodId.fromRawValue(it) != null }
-        .distinct()
+    val endpoints = PaykitIssuerInterop.supportedEndpointIdentifiers(
+        requestTerms.acceptedPaymentEndpointIdentifiers,
+        network,
+    )
     if (requiresActionableRequest && endpoints.isEmpty()) return null
 
     val expiresAt = requestTerms.proposalExpiresAt?.let {

app/src/main/java/to/bitkit/repositories/PrivatePaykitRepo.kt

@@ -553,7 +553,9 @@ class PrivatePaykitRepo @Inject constructor(
                 val consumedVersion = ensureState().contacts[publicKey]
                     ?.consumedPrivatePaymentListVersionsByReceiverPath
                     ?.get(receiverPath)
-                val amount = paymentRequest?.let { PaymentAmountContext(it.amountValue, "btc") }
+                val amount = paymentRequest?.let {
+                    PaymentAmountContext(it.amountValue, PaykitIssuerInterop.BITCOIN_ASSET)
+                }
                 val prepared = preparePrivateContactPayment(
                     publicKey = publicKey,
                     receiverPath = receiverPath,

app/src/main/java/to/bitkit/repositories/PublicPaykitRepo.kt

@@ -8,10 +8,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import org.lightningdevkit.ldknode.Bolt11Invoice
 import org.lightningdevkit.ldknode.Network
 import to.bitkit.data.SettingsData
@@ -35,7 +31,6 @@ import kotlin.time.Clock
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.ExperimentalTime
-import to.bitkit.di.json as appJson
 
 sealed class PublicPaykitError(message: String) : AppError(message) {
     data object InvalidPayload : PublicPaykitError("Invalid Paykit payment endpoint payload")
@@ -78,12 +73,6 @@ class PublicPaykitRepo @Inject constructor(
     companion object {
         private val methodIdPattern = Regex("^[a-z0-9]+-[a-z0-9]+-[a-z0-9]+$")
 
-        private val payloadJson = Json(appJson) {
-            prettyPrint = false
-            isLenient = false
-            encodeDefaults = false
-        }
-
         internal val payablePreferenceOrder = listOf(
             MethodId.Bolt11,
             MethodId.Lnurl,
@@ -105,29 +94,28 @@ class PublicPaykitRepo @Inject constructor(
         fun isOnchainPaymentOptionEnabled(settings: SettingsData): Boolean =
             settings.publicPaykitOnchainEnabled
 
-        fun parseEndpoint(methodId: String, endpointData: String): Endpoint? {
+        fun parseEndpoint(
+            methodId: String,
+            endpointData: String,
+            network: Network = Env.network,
+        ): Endpoint? {
             if (!methodIdPattern.matches(methodId)) return null
 
-            val knownMethodId = MethodId.fromRawValue(methodId) ?: return null
-            val payload = runCatching {
-                payloadJson.decodeFromString<PaymentEndpointPayload>(endpointData)
-            }.getOrNull() ?: return null
-            val value = payload.value.trim()
-            if (value.isEmpty()) return null
+            val knownMethodId = MethodId.fromRawValue(methodId, network) ?: return null
+            val payload = PaykitIssuerInterop.parseEndpointPayload(endpointData) ?: return null
 
             return Endpoint(
                 methodId = knownMethodId,
-                value = value,
+                value = payload.value,
                 min = payload.min,
                 max = payload.max,
                 rawPayload = endpointData,
             )
         }
 
         fun serializePayload(value: String): String {
-            val trimmedValue = value.trim()
-            if (trimmedValue.isEmpty()) throw PublicPaykitError.InvalidPayload
-            return payloadJson.encodeToString(PaymentEndpointPayload(value = trimmedValue))
+            return PaykitIssuerInterop.serializeEndpointPayload(value)
+                ?: throw PublicPaykitError.InvalidPayload
         }
 
         fun hasLightningRouteHints(bolt11: String): Boolean =
@@ -463,13 +451,9 @@ enum class MethodId(
     }
 
     companion object {
-        fun fromRawValue(value: String): MethodId? = entries.firstOrNull { it.rawValue == value }
+        fun fromRawValue(
+            value: String,
+            network: Network = Env.network,
+        ): MethodId? = entries.firstOrNull { it.rawValueForNetwork(network) == value }
     }
 }
-
-@Serializable
-private data class PaymentEndpointPayload(
-    val value: String,
-    val min: String? = null,
-    val max: String? = null,
-)

app/src/main/java/to/bitkit/services/PaykitSdkService.kt

@@ -85,6 +85,7 @@ import to.bitkit.models.PubkyAuthRequestError
 import to.bitkit.models.PubkyPublicKeyFormat
 import to.bitkit.repositories.Endpoint
 import to.bitkit.repositories.PaykitBillingPeriod
+import to.bitkit.repositories.PaykitIssuerInterop
 import to.bitkit.repositories.PublicPaykitRepo
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
@@ -638,7 +639,7 @@ class PaykitSdkService @Inject constructor(
                         PubkyPublicKeyFormat.matches(identityStatus.publicKey, expectedIdentity)
                 ) { "Paykit identity changed before proposing the payment request" }
                 val terms = PaymentRequestTerms(
-                    amount = PaymentRequestAmount(proposal.amountValue, "btc"),
+                    amount = PaymentRequestAmount(proposal.amountValue, PaykitIssuerInterop.BITCOIN_ASSET),
                     paymentReference = PaymentReference(proposal.paymentReference),
                     proposalExpiresAt = proposal.proposalExpiresAt,
                     recurrence = null,

app/src/main/java/to/bitkit/ui/screens/paymentrequests/PaymentRequestsScreen.kt

@@ -522,7 +522,7 @@ internal fun PaymentRequestCard(
                 }
             )
             .clickableAlpha(enabled = onClick != null) { onClick?.invoke() }
-            .testTag("PaymentRequestRow${request.paymentRequestId}"),
+            .testTag("PaymentRequestRow-${request.paymentRequestId}"),
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -583,7 +583,9 @@ internal fun PaymentRequestCard(
                         )
                     },
                     size = ButtonSize.Small,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("PaymentRequestDismiss-${request.paymentRequestId}")
                 )
                 PrimaryButton(
                     text = stringResource(R.string.wallet__payment_request_pay),
@@ -597,7 +599,9 @@ internal fun PaymentRequestCard(
                         )
                     },
                     size = ButtonSize.Small,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("PaymentRequestPay-${request.paymentRequestId}")
                 )
             }
         }

app/src/main/java/to/bitkit/ui/screens/wallets/send/SendConfirmScreen.kt

@@ -219,7 +219,11 @@ internal fun SendConfirmContent(
     onBiometricsSuccess: () -> Unit = {},
     onBiometricsFailure: () -> Unit = {},
 ) {
-    Box(modifier = modifier) {
+    Box(
+        modifier = modifier.testTag(
+            if (uiState.isPaymentRequest) "PaymentRequestConfirm" else "SendConfirm",
+        )
+    ) {
         Column(
             modifier = Modifier
                 .fillMaxSize()