Merge branch 'master' into feat/pubky-profile

# Conflicts:
#	gradle/libs.versions.toml

Author: ovitrif

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Fixed
+- Polish Primary, Secondary, and Tertiary buttons to match Figma design specs #887
+- Avoid msat truncation when paying invoices and LNURL callbacks #879
 - Fix ANR on RGS server settings screen caused by catastrophic regex backtracking #880
 - Fix crash when returning app to foreground on Receive screen #875
 - Show loading state on Spending tab when node is not running #875
@@ -23,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mnemonic warning text transitions on reveal #857
 
 ### Changed
+- Updated design of the success screen in the manual channel setup flow #883
 - Unified send flow with payment method switcher, details toggle, Lightning support for BIP21 payments, and improved fee rate defaults #863
 - Settings redesigned with tabbed navigation (General/Security/Advanced) with swipe support #857
 - Icons added to all settings rows for faster scanning #857

app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt

@@ -97,7 +97,7 @@ class NotifyPaymentReceivedHandler @Inject constructor(
             is NotifyPaymentReceived.Command.Onchain -> command.event.txid
         },
         sats = when (command) {
-            is NotifyPaymentReceived.Command.Lightning -> (command.event.amountMsat / 1000u).toLong()
+            is NotifyPaymentReceived.Command.Lightning -> ((command.event.amountMsat + 999u) / 1000u).toLong()
             is NotifyPaymentReceived.Command.Onchain -> command.event.details.amountSats
         },
     )

app/src/main/java/to/bitkit/ext/Lnurl.kt

@@ -24,5 +24,36 @@ fun LnurlPayData.commentAllowed(): Boolean = commentAllowed?.let { it > 0u } ==
 fun LnurlPayData.maxSendableSat(): ULong = maxSendable / MSATS_PER_SAT
 fun LnurlPayData.minSendableSat(): ULong = msatsToSatsCeil(minSendable)
 
+/**
+ * True when the LNURL-pay endpoint specifies a single exact amount.
+ *
+ * This also covers the sub-sat edge case where `minSendable` and `maxSendable` differ
+ * in their sub-sat fraction but map to the same (or inverted) sat range after rounding,
+ * e.g. `minSendable = 500500, maxSendable = 500500` → `minSendableSat() = 501, maxSendableSat() = 500`.
+ */
+fun LnurlPayData.isFixedAmount(): Boolean =
+    minSendable == maxSendable || (minSendable > 0u && minSendableSat() > maxSendableSat())
+
+/**
+ * Returns the amount in millisatoshis to send in the LNURL-pay callback.
+ *
+ * For fixed-amount requests (including sub-sat ranges) the original msat value
+ * from the server is returned verbatim, avoiding precision loss from the
+ * msat→sat→msat round-trip.
+ *
+ * For variable-amount requests the user-selected sat amount is converted to msats.
+ */
+fun LnurlPayData.callbackAmountMsats(userSats: ULong? = null): ULong =
+    if (isFixedAmount()) minSendable else (userSats ?: minSendableSat()) * MSATS_PER_SAT
+
 fun LnurlWithdrawData.minWithdrawableSat(): ULong = msatsToSatsCeil(minWithdrawable ?: 0u)
 fun LnurlWithdrawData.maxWithdrawableSat(): ULong = maxWithdrawable / MSATS_PER_SAT
+
+/**
+ * True when the LNURL-withdraw endpoint specifies a single exact amount,
+ * including the sub-sat edge case where rounding causes `min > max` in whole sats.
+ */
+fun LnurlWithdrawData.isFixedAmount(): Boolean {
+    val min = minWithdrawable ?: 0u
+    return min == maxWithdrawable || (min > 0u && minWithdrawableSat() > maxWithdrawableSat())
+}

app/src/main/java/to/bitkit/ext/PaymentDetails.kt

@@ -2,4 +2,5 @@ package to.bitkit.ext
 
 import org.lightningdevkit.ldknode.PaymentDetails
 
-val PaymentDetails.amountSats: ULong? get() = amountMsat?.let { it / 1000u }
+val PaymentDetails.amountSats: ULong?
+    get() = amountMsat?.let { (it + 999u) / 1000u }

app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt

@@ -192,7 +192,7 @@ class WakeNodeWorker @AssistedInject constructor(
         showDetails: Boolean,
         hiddenBody: String,
     ) {
-        val sats = event.amountMsat / 1000u
+        val sats = (event.amountMsat + 999u) / 1000u
         // Save for UI to pick up
         cacheStore.setBackgroundReceive(
             NewTransactionSheetDetails(

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

@@ -897,20 +897,29 @@ class LightningRepo @Inject constructor(
         runCatching { lightningService.receive(amountSats, description, expirySeconds) }
     }
 
+    suspend fun createInvoiceMsats(
+        amountMsats: ULong,
+        description: String,
+        expirySeconds: UInt = 86_400u,
+    ): Result<String> = executeWhenNodeRunning("createInvoiceMsats") {
+        updateGeoBlockState()
+        runCatching { lightningService.receiveMsats(amountMsats, description, expirySeconds) }
+    }
+
     @Suppress("ForbiddenComment")
     suspend fun fetchLnurlInvoice(
         callbackUrl: String,
-        amountSats: ULong,
+        amountMsats: ULong,
         comment: String? = null,
     ): Result<LightningInvoice> {
         return runCatching {
             // TODO use bitkit-core getLnurlInvoice if it works with callbackUrl
-            val bolt11 = lnurlService.fetchLnurlInvoice(callbackUrl, amountSats, comment).getOrThrow().pr
+            val bolt11 = lnurlService.fetchLnurlInvoice(callbackUrl, amountMsats, comment).getOrThrow().pr
             val decoded = (coreService.decode(bolt11) as Scanner.Lightning).invoice
             return@runCatching decoded
         }.onFailure {
             Logger.error(
-                "fetchLnurlInvoice error, url: $callbackUrl, amount: $amountSats, comment: $comment",
+                "Failed to fetch LNURL invoice, url: '$callbackUrl', amountMsats: '$amountMsats', comment: '$comment'",
                 it,
                 context = TAG,
             )

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

@@ -590,15 +590,19 @@ class LightningService @Inject constructor(
     }
 
     suspend fun receive(sat: ULong? = null, description: String, expirySecs: UInt = 3600u): String {
+        return receiveMsats(amountMsat = sat?.let { it * 1000u }, description = description, expirySecs = expirySecs)
+    }
+
+    suspend fun receiveMsats(amountMsat: ULong? = null, description: String, expirySecs: UInt = 3600u): String {
         val node = this.node ?: throw ServiceError.NodeNotSetup()
 
         val message = description
 
         return ServiceQueue.LDK.background {
-            val bolt11Invoice: Bolt11Invoice = if (sat != null) {
+            val bolt11Invoice: Bolt11Invoice = if (amountMsat != null) {
                 node.bolt11Payment()
                     .receive(
-                        amountMsat = sat * 1000u,
+                        amountMsat = amountMsat,
                         description = Bolt11InvoiceDescription.Direct(description = message),
                         expirySecs = expirySecs,
                     )

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

@@ -41,14 +41,14 @@ class LnurlService @Inject constructor(
 
     suspend fun fetchLnurlInvoice(
         callbackUrl: String,
-        amountSats: ULong,
+        amountMsats: ULong,
         comment: String? = null,
     ): Result<LnurlPayResponse> = runCatching {
         Logger.debug("Fetching LNURL pay invoice from: $callbackUrl", context = TAG)
 
         val response = client.get(callbackUrl) {
             url {
-                parameters["amount"] = "${amountSats * 1000u}" // convert to msat
+                parameters["amount"] = "$amountMsats"
                 comment?.takeIf { it.isNotBlank() }?.let {
                     parameters["comment"] = it
                 }

app/src/main/java/to/bitkit/ui/Locals.kt

@@ -53,6 +53,3 @@ val settingsViewModel: SettingsViewModel?
 
 val backupsViewModel: BackupsViewModel?
     @Composable get() = LocalBackupsViewModel.current
-
-val drawerState: DrawerState?
-    @Composable get() = LocalDrawerState.current