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

fix: rename _transactions to allTransactions to fix ktlint backing-property-naming

Browse Source 
The backing property _transactions no longer has a matching public
property since it was replaced by filteredTransactions.

https://claude.ai/code/session_01CdNY7qYDRHJr1jhAFvVgzj
This commit is contained in:
Claude
2026-03-17 03:07:46 +00:00
parent 73d1e39587
commit 866dfca710
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/wallet/WalletViewModel.kt
+6 -6
View File
@@ -90,13 +90,13 @@ class WalletViewModel : ViewModel() {
private val _walletAlias = MutableStateFlow<String?>(null) private val _walletAlias = MutableStateFlow<String?>(null)
val walletAlias = _walletAlias.asStateFlow() val walletAlias = _walletAlias.asStateFlow()
private val _transactions = MutableStateFlow<List<NwcTransaction>>(emptyList()) private val allTransactions = MutableStateFlow<List<NwcTransaction>>(emptyList())
private val _transactionFilter = MutableStateFlow(TransactionFilter.ALL) private val _transactionFilter = MutableStateFlow(TransactionFilter.ALL)
val transactionFilter = _transactionFilter.asStateFlow() val transactionFilter = _transactionFilter.asStateFlow()
val filteredTransactions = val filteredTransactions =
combine(_transactions, _transactionFilter) { txs, filter -> combine(allTransactions, _transactionFilter) { txs, filter ->
when (filter) { when (filter) {
TransactionFilter.ALL -> txs TransactionFilter.ALL -> txs
TransactionFilter.ZAPS -> txs.filter { it.parsedMetadata()?.nostr != null } TransactionFilter.ZAPS -> txs.filter { it.parsedMetadata()?.nostr != null }
@@ -196,7 +196,7 @@ class WalletViewModel : ViewModel() {
when (response) { when (response) {
is ListTransactionsSuccessResponse -> { is ListTransactionsSuccessResponse -> {
val txs = response.result?.transactions ?: emptyList() val txs = response.result?.transactions ?: emptyList()
_transactions.value = txs allTransactions.value = txs
val totalCount = response.result?.total_count val totalCount = response.result?.total_count
_hasMoreTransactions.value = _hasMoreTransactions.value =
if (totalCount != null) { if (totalCount != null) {
@@ -224,7 +224,7 @@ class WalletViewModel : ViewModel() {
fun loadMoreTransactions() { fun loadMoreTransactions() {
if (_isLoadingMore.value || !_hasMoreTransactions.value) return if (_isLoadingMore.value || !_hasMoreTransactions.value) return
val acc = account ?: return val acc = account ?: return
val currentOffset = _transactions.value.size val currentOffset = allTransactions.value.size
viewModelScope.launch(Dispatchers.IO) { viewModelScope.launch(Dispatchers.IO) {
_isLoadingMore.value = true _isLoadingMore.value = true
try { try {
@@ -238,11 +238,11 @@ class WalletViewModel : ViewModel() {
when (response) { when (response) {
is ListTransactionsSuccessResponse -> { is ListTransactionsSuccessResponse -> {
val newTxs = response.result?.transactions ?: emptyList() val newTxs = response.result?.transactions ?: emptyList()
_transactions.value = _transactions.value + newTxs allTransactions.value = allTransactions.value + newTxs
val totalCount = response.result?.total_count val totalCount = response.result?.total_count
_hasMoreTransactions.value = _hasMoreTransactions.value =
if (totalCount != null) { if (totalCount != null) {
_transactions.value.size < totalCount allTransactions.value.size < totalCount
} else { } else {
newTxs.size >= pageSize newTxs.size >= pageSize
} }