Merge branch 'master' into ai/lsp-skill

Author: ovitrif

AGENTS.md

@@ -240,7 +240,8 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 
 ### Changelog
 
-- ALWAYS add an entry under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- ALWAYS add exactly ONE entry per PR under `## [Unreleased]` in `CHANGELOG.md` for `feat:` and `fix:` PRs; skip for `chore:`, `ci:`, `refactor:`, `test:`, `docs:` unless the change is user-facing
+- NEVER add multiple changelog lines for the same PR — summarize all changes in a single concise entry
 - USE standard Keep a Changelog categories: `### Added`, `### Changed`, `### Deprecated`, `### Removed`, `### Fixed`, `### Security`
 - ALWAYS append `#PR_NUMBER` at the end of each changelog entry when the PR number is known
 - ALWAYS place new entries at the top of their category section (newest first)

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Fixed
+- Retouch Primary, Secondary, and Tertiary buttons styling #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
@@ -22,6 +24,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Mnemonic warning text transitions on reveal #857
 
 ### Changed
+- Show end of address on Receive Bitcoin screen using middle ellipsis truncation #886
+- Update funding screen: replace Advanced with Manual Setup, fix Use Other Wallet navigation to open amount entry, and add Fund Wallet button to no-funds dialog #885
+- 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
 - Selected values displayed on right side of settings rows #857

app/src/main/java/to/bitkit/di/HttpModule.kt

@@ -18,9 +18,9 @@ import io.ktor.http.contentType
 import io.ktor.http.isSuccess
 import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.json.Json
-import to.bitkit.utils.UrlValidator
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
+import to.bitkit.utils.UrlValidator
 import javax.inject.Singleton
 import io.ktor.client.plugins.logging.Logger as KtorLogger
 

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/DateTime.kt

@@ -109,6 +109,34 @@ fun Long.toRelativeTimeString(
     }
 }
 
+fun formatInvoiceExpiryRelative(
+    expirySeconds: ULong,
+    locale: Locale = Locale.getDefault(),
+): String {
+    val seconds = expirySeconds.toLong()
+    if (seconds <= 0) return ""
+
+    val uLocale = ULocale.forLocale(locale)
+    val numberFormat = NumberFormat.getNumberInstance(uLocale)?.apply { maximumFractionDigits = 0 }
+    val formatter = RelativeDateTimeFormatter.getInstance(
+        uLocale,
+        numberFormat,
+        RelativeDateTimeFormatter.Style.LONG,
+        DisplayContext.CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE,
+    ) ?: return ""
+
+    val minutes = seconds / Factor.SECONDS_TO_MINUTES.toLong()
+    val hours = minutes / Factor.MINUTES_TO_HOURS.toLong()
+    val days = hours / Factor.HOURS_TO_DAYS.toLong()
+
+    return when {
+        minutes < 1 -> formatter.format(seconds.toDouble(), Direction.NEXT, RelativeUnit.SECONDS)
+        hours < 1 -> formatter.format(minutes.toDouble(), Direction.NEXT, RelativeUnit.MINUTES)
+        days < 1 -> formatter.format(hours.toDouble(), Direction.NEXT, RelativeUnit.HOURS)
+        else -> formatter.format(days.toDouble(), Direction.NEXT, RelativeUnit.DAYS)
+    }
+}
+
 fun getDaysInMonth(month: LocalDate): List<LocalDate?> {
     val firstDayOfMonth = LocalDate(month.year, month.month, Constants.FIRST_DAY_OF_MONTH)
     val daysInMonth = month.month.toJavaMonth().length(isLeapYear(month.year))

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/models/FeeRate.kt

@@ -15,6 +15,13 @@ enum class FeeRate(
     @DrawableRes val icon: Int,
     val color: Color,
 ) {
+    INSTANT(
+        title = R.string.fee__instant__title,
+        description = R.string.fee__instant__description,
+        shortDescription = R.string.fee__instant__shortDescription,
+        color = Colors.Purple,
+        icon = R.drawable.ic_speed_fast,
+    ),
     FAST(
         title = R.string.fee__fast__title,
         description = R.string.fee__fast__description,
@@ -53,7 +60,7 @@ enum class FeeRate(
 
     fun toSpeed(): TransactionSpeed {
         return when (this) {
-            FAST -> TransactionSpeed.Fast
+            INSTANT, FAST -> TransactionSpeed.Fast
             NORMAL -> TransactionSpeed.Medium
             MINIMUM, SLOW -> TransactionSpeed.Slow
             CUSTOM -> TransactionSpeed.Custom(0u)

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,
             )