(android) Fix navigation threading issue in lnurl-pay

ACINQ · Nov 26, 2024 · f02abc7 · f02abc7
1 parent 7439267
commit f02abc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/PrepareSendView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/PrepareSendView.kt
@@ -143,13 +143,13 @@ fun SendView(
                 SendToOfferView(offer = data.offer, onBackClick = onBackClick, onPaymentSent = { navController.popToHome() })
             }
             is SendManager.ParseResult.Uri -> {
-                SendSpliceOutView(requestedAmount = data.uri.amount, address = data.uri.address, onBackClick = onBackClick, onSpliceOutSuccess = {navController.popToHome() })
+                SendSpliceOutView(requestedAmount = data.uri.amount, address = data.uri.address, onBackClick = onBackClick, onSpliceOutSuccess = { navController.popToHome() })
             }
             is SendManager.ParseResult.Lnurl.Pay -> {
                 LnurlPayView(payIntent = data.paymentIntent, onBackClick, onPaymentSent = { navController.popToHome() })
             }
             is SendManager.ParseResult.Lnurl.Withdraw -> {
-                LnurlWithdrawView(withdraw = data.lnurlWithdraw, onBackClick = onBackClick, onFeeManagementClick = { navController.navigate(Screen.LiquidityPolicy.route) }, onWithdrawDone = { navController.popToHome()})
+                LnurlWithdrawView(withdraw = data.lnurlWithdraw, onBackClick = onBackClick, onFeeManagementClick = { navController.navigate(Screen.LiquidityPolicy.route) }, onWithdrawDone = { navController.popToHome() })
             }
             is SendManager.ParseResult.Lnurl.Auth -> {
                 LnurlAuthView(auth = data.auth, onBackClick = { navController.popBackStack() }, onChangeAuthSchemeSettingClick = { navController.navigate("${Screen.PaymentSettings.route}?showAuthSchemeDialog=true") },

diff --git a/...android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/lnurl/LnurlPayViewModel.kt b/...android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/lnurl/LnurlPayViewModel.kt
@@ -60,7 +60,9 @@ class LnurlPayViewModel(private val sendManager: SendManager) : ViewModel() {
                     val invoice = result.value
                     state.value = LnurlPayViewState.PayingInvoice(invoice)
                     sendManager.lnurlPay_payInvoice(payIntent, amount, comment, invoice, fees)
-                    onPaymentSent()
+                    viewModelScope.launch(Dispatchers.Main) {
+                        onPaymentSent()
+                    }
                 }
             }
         }