From beb901120e766365035764705975cb0cbe25bdfe Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 20 May 2024 13:25:53 -0400 Subject: [PATCH] Fixes call from main thread --- .../amethyst/ui/screen/loggedIn/AccountViewModel.kt | 12 ++++++++++++ .../screen/loggedIn/NIP90ContentDiscoveryScreen.kt | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index fd0bc1862..41cf6886f 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -83,6 +83,7 @@ import com.vitorpamplona.quartz.events.LnZapEvent import com.vitorpamplona.quartz.events.LnZapRequestEvent import com.vitorpamplona.quartz.events.Participant import com.vitorpamplona.quartz.events.ReportEvent +import com.vitorpamplona.quartz.events.Response import com.vitorpamplona.quartz.events.SealedGossipEvent import com.vitorpamplona.quartz.events.UserMetadata import com.vitorpamplona.quartz.utils.TimeUtils @@ -1353,6 +1354,17 @@ class AccountViewModel(val account: Account, val settings: SettingsState) : View } } + fun sendZapPaymentRequestFor( + bolt11: String, + zappedNote: Note?, + onSent: () -> Unit, + onResponse: (Response?) -> Unit, + ) { + viewModelScope.launch(Dispatchers.IO) { + account.sendZapPaymentRequestFor(bolt11, zappedNote, onSent, onResponse) + } + } + val draftNoteCache = CachedDraftNotes(this) class CachedDraftNotes(val accountViewModel: AccountViewModel) : GenericBaseCacheAsync(20) { diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt index dfd3e96fa..3fa811ab4 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt @@ -332,7 +332,7 @@ fun FeedDVM( val context = LocalContext.current Button(onClick = { if (accountViewModel.account.hasWalletConnectSetup()) { - accountViewModel.account.sendZapPaymentRequestFor( + accountViewModel.sendZapPaymentRequestFor( bolt11 = invoice, zappedNote = null, onSent = {