feat(send): improve Lightning send failure recovery by pwltr · Pull Request #1140 · synonymdev/bitkit-android

pwltr · 2026-08-06T14:19:09Z

Description

Ports the iOS Lightning send-failure retry/support behavior to Android.

Shows the send failure screen for failed Lightning sends instead of relying only on toasts.
Maps LDK payment failure reasons to localized, user-facing strings and avoids exposing internal error values like Optional(...), NodeError, or DuplicatePayment.
Uses the reusable generic route failure copy for routeNotFound and retriesExhausted.
Preserves LDK failure reasons for payments that first enter SendPendingScreen and fail later.
Shows the correct failure title for Lightning vs on-chain send errors.
Shows Contact Support above Try Again on the Lightning send failure screen.
Prefills the support report with failure type, payment method, routing cache reset status, and the available Lightning payment request.
Resets routing caches only for routing-related failures, and only once per current send flow/payment attempt.
Retries non-routing failures normally without resetting graph/scorer caches.
Retry clears local/VSS network graph data and scorer/pathfinding score data before restarting ldk-node when a routing reset is needed.
Retry waits for local routing data to be usable again without requiring a newer remote RGS snapshot timestamp or waiting only on delayed graph-cache persistence.
Guards retry state in WalletViewModel so overlapping retry flows cannot surface stale timeout errors.
Resets send navigation back to the retry route instead of stacking retry screens on top of the failure screen.

Closes #829

Preview

Normal payment:

Screen.Recording.2026-08-11.at.17.59.27.mov

QuickPay:

Screen.Recording.2026-08-12.at.14.55.13.mov

QA Notes

Tested on mainnet emulator:

Confirmed ROUTE_NOT_FOUND surfaces user-facing payment failure copy.
Confirmed pending RETRIES_EXHAUSTED failures surface the localized retries-exhausted copy instead of generic failure copy.
Confirmed Try Again deletes local graph, VSS graph, scorer, and external scores cache for the first routing-related retry.
Confirmed Try Again does not repeat routing cache reset after a reset has already been attempted in the current send flow.
Confirmed retry restarts from an empty graph and accepts the same RGS snapshot timestamp.
Confirmed retry waits through RGS/scorer refresh and returns to the send confirmation path without timing out when graph cache persistence lags behind the in-memory graph.
Confirmed no stale retry timeout after repeated retry attempts.

Automated checks:

compileDevDebugKotlin
PaymentFailureReasonExtTest.kt
AppViewModelSendFlowTest.kt
detekt

greptile-apps · 2026-08-12T12:46:12Z

Greptile Summary

The PR replaces toast-only Lightning send failures with a recoverable failure screen, localized failure reasons, support-report prefilling, and routing-cache resets for routing-related retries.

Propagates typed LDK payment failure reasons through normal, pending, and QuickPay send flows.
Adds retry-route and reset-attempt state to the nested send navigation graph.
Clears graph and scorer caches, restarts LDK, and waits for routing sources before retrying.
Adds localized failure and support copy plus focused send-flow tests.

Confidence Score: 4/5

The PR should not merge until pending QuickPay failures can retry without crashing from cleared payment state.

The new Pending branch clears the only QuickPay request state, while the corresponding failure route explicitly returns to a destination that requires that state to be non-null.

Files Needing Attention: app/src/main/java/to/bitkit/ui/screens/wallets/send/SendQuickPayScreen.kt, app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt

Important Files Changed

Filename	Overview
app/src/main/java/to/bitkit/ui/screens/wallets/send/SendQuickPayScreen.kt	Moves QuickPay cleanup to terminal results, but clearing state on Pending breaks the newly added pending-failure retry route.
app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt	Adds typed failure navigation, support reporting, and routing-aware retry behavior; its QuickPay retry destination still requires state that the Pending path clears.
app/src/main/java/to/bitkit/repositories/LightningRepo.kt	Adds graph/scorer cache reset and bounded routing-data refresh orchestration without an independently established defect.
app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt	Routes active Lightning failures into the send sheet and preserves typed failure details and payment requests.
app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt	Serializes routing-reset retries with a mutex and exposes retry progress to the UI.
app/src/main/java/to/bitkit/ext/PaymentFailureReasonExt.kt	Maps LDK failure reasons to localized user copy and sanitized compact support metadata.

Sequence Diagram

sequenceDiagram
    participant User
    participant QuickPay as QuickPay Screen
    participant AppVM as AppViewModel
    participant Pending as Pending Screen
    participant Error as Failure Screen

    QuickPay->>AppVM: resetQuickPay()
    QuickPay->>Pending: "navigate with retryRoute=QuickPay"
    Pending-->>Error: payment failure
    User->>Error: Try Again
    Error->>QuickPay: clear stack and navigate
    QuickPay->>AppVM: read quickPayData
    AppVM-->>QuickPay: null
    QuickPay--xQuickPay: requireNotNull crashes

_{Reviews (1): Last reviewed commit: "feat(send): improve Lightning send failu..." | Re-trigger Greptile}

jvsena42 · 2026-08-13T14:05:22Z

+                    val scope = rememberCoroutineScope()
                    SendErrorScreen(
+                        title = stringResource(route.failureTitle(sendUiState.payMethod)),
                        message = route.message,
+                        isRetrying = isRetrying,
                        onRetry = {
-                            navController.navigateTo(SendRoute.Recipient) {
-                                popUpTo(navController.graph.id) { inclusive = true }
+                            if (isRetrying) return@SendErrorScreen
+                            scope.launch {
+                                val shouldResetRoutingCaches = route.shouldResetRoutingCaches(
+                                    routingCacheResetAttempted = routingCacheResetAttempted
+                                )
+                                if (shouldResetRoutingCaches) routingCacheResetAttempted = true
+                                val resetResult = if (shouldResetRoutingCaches) {
+                                    walletViewModel.resetPaymentRoutingCachesAndWait()
+                                } else {
+                                    Result.success(Unit)
+                                }


dismissing the error screen mid-reset may cancel the coroutine between node stop() and start(), leaving the node stopped

jvsena42 · 2026-08-13T14:12:01Z

+        val resetRoutingCachesOnRetry: Boolean = false,
+        val failureType: String = "Unknown",
+        val paymentRequest: String? = null,
+        val routingCacheResetAttempted: Boolean = false,


property never used

jvsena42 · 2026-08-13T14:13:09Z

-        data class Failure(override val paymentHash: String) : Command
+        data class Failure(
+            override val paymentHash: String,
+            val reason: PaymentFailureReason? = null,


never called

jvsena42 · 2026-08-13T16:12:56Z

+            context = TAG,
+        )
+
+        stop().onFailure {


the node stops here and I only see it starting again on the VSS-delete failure path worth double checking if the is some path that Kees the node on stopped state

jvsena42 · 2026-08-13T16:43:53Z

+            _sendUiState.update {
+                it.copy(
+                    amount = amountSats,
+                    decodedInvoice = invoice,


This will make it matches in closeActiveSendForFailedPayment and race with the similar logic of watchUntil in QuickPayVIewModel

jvsena42 · 2026-08-13T16:47:30Z

            SendMethod.ONCHAIN -> {
                val address = _sendUiState.value.address
                val tags = _sendUiState.value.selectedTags
                sendOnchain(address, amount, tags = tags)
                    .onSuccess { txId ->
                        Logger.info("Onchain send result txid: $txId", context = TAG)
                        onSendSuccess(
                            NewTransactionSheetDetails(
                                type = NewTransactionSheetType.ONCHAIN,
                                direction = NewTransactionSheetDirection.SENT,
                                paymentHashOrTxId = txId,
                                sats = amount.toLong(),
                                isLoadingDetails = true,
                            )
                        )
                        lightningRepo.sync()
                        activityRepo.syncActivities()
                        _successSendUiState.update { it.copy(isLoadingDetails = false) }
                    }.onFailure { e ->
                        Logger.error("Error sending onchain payment", e, context = TAG)
                        toast(
                            type = Toast.ToastType.ERROR,


The SendMethod.ONCHAIN still do Toast + hideSheet()

jvsena42 · 2026-08-13T16:49:10Z

    onBack: () -> Unit,
    navigateResultScreen: (Boolean) -> Unit,
 ) {
+    LaunchedEffect(prefillMessage) {


This re-runs on every composition recreation while the ViewModel survives

pwltr force-pushed the feat/reset-routing branch 3 times, most recently from 6a53759 to 873d26e Compare August 12, 2026 12:41

feat(send): improve Lightning send failure recovery

776366e

pwltr force-pushed the feat/reset-routing branch from 873d26e to 776366e Compare August 12, 2026 12:42

pwltr marked this pull request as ready for review August 12, 2026 12:42

greptile-apps Bot reviewed Aug 12, 2026

View reviewed changes

Comment thread app/src/main/java/to/bitkit/ui/screens/wallets/send/SendQuickPayScreen.kt

pwltr added 3 commits August 12, 2026 14:57

fix(send): preserve quickpay state on pending payment

48391ce

fix(send): set quickpay send method

f3f2ac0

fix: preserve quickpay state

e9340dd

pwltr requested review from jvsena42 and ovitrif August 12, 2026 14:43

jvsena42 assigned pwltr Aug 13, 2026

jvsena42 requested changes Aug 13, 2026

View reviewed changes

Navigation Menu

Uh oh!

feat(send): improve Lightning send failure recovery - #1140

feat(send): improve Lightning send failure recovery#1140
pwltr wants to merge 4 commits into
masterfrom
feat/reset-routing

pwltr commented Aug 6, 2026 •

edited

Loading

Uh oh!

greptile-apps Bot commented Aug 12, 2026

Important Files Changed

Uh oh!

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

jvsena42 Aug 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

pwltr commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Preview

QA Notes

Uh oh!

greptile-apps Bot commented Aug 12, 2026

Greptile Summary

Confidence Score: 4/5

Important Files Changed

Sequence Diagram

Uh oh!

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

jvsena42 Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

pwltr commented Aug 6, 2026 •

edited

Loading