nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main-upstream' into claude/strip-file-metadata-sVIEd

Browse Source
This commit is contained in:
davotoula
2026-03-17 18:47:35 +01:00
parent 985cab73cd a6c153a154
commit 76f8130d40
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/drafts/DraftListScreen.kt
+2
View File
@@ -32,6 +32,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Delete
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@@ -74,6 +75,7 @@ fun DraftListScreen(
RenderDraftListScreen(accountViewModel.feedStates.drafts, accountViewModel, nav) RenderDraftListScreen(accountViewModel.feedStates.drafts, accountViewModel, nav)
} }
@OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
private fun RenderDraftListScreen( private fun RenderDraftListScreen(
feedState: FeedContentState, feedState: FeedContentState,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/WalletViewModel.kt
+4 -3
View File
@@ -82,6 +82,7 @@ enum class TransactionFilter {
} }
private const val NWC_TIMEOUT_MS = 30_000L private const val NWC_TIMEOUT_MS = 30_000L
private const val PAYMENT_FAILED = "Payment failed"
class WalletViewModel : ViewModel() { class WalletViewModel : ViewModel() {
private var account: Account? = null private var account: Account? = null
@@ -301,14 +302,14 @@ class WalletViewModel : ViewModel() {
is PayInvoiceErrorResponse -> { is PayInvoiceErrorResponse -> {
_sendState.value = _sendState.value =
SendState.Error( SendState.Error(
response.error?.message ?: "Payment failed", response.error?.message ?: PAYMENT_FAILED,
) )
} }
is NwcErrorResponse -> { is NwcErrorResponse -> {
_sendState.value = _sendState.value =
SendState.Error( SendState.Error(
response.error?.message ?: "Payment failed", response.error?.message ?: PAYMENT_FAILED,
) )
} }
@@ -318,7 +319,7 @@ class WalletViewModel : ViewModel() {
} }
} }
} catch (e: Exception) { } catch (e: Exception) {
_sendState.value = SendState.Error(e.message ?: "Payment failed") _sendState.value = SendState.Error(e.message ?: PAYMENT_FAILED)
} }
} }
} }