suspended-looks-like-completed-in-the-list.diff (2462B)
1 diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt 2 index c6a17561..90bcfc33 100644 3 --- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt 4 +++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt 5 @@ -85,8 +85,12 @@ import net.taler.wallet.transactions.TransactionMajorState.Aborted 6 import net.taler.wallet.transactions.TransactionMajorState.Aborting 7 import net.taler.wallet.transactions.TransactionMajorState.Dialog 8 import net.taler.wallet.transactions.TransactionMajorState.Done 9 +import net.taler.wallet.transactions.TransactionMajorState.Expired 10 import net.taler.wallet.transactions.TransactionMajorState.Failed 11 import net.taler.wallet.transactions.TransactionMajorState.Pending 12 +import net.taler.wallet.transactions.TransactionMajorState.Suspended 13 +import net.taler.wallet.transactions.TransactionMajorState.SuspendedAborting 14 +import net.taler.wallet.transactions.TransactionMajorState.SuspendedFinalizing 15 import net.taler.wallet.transactions.TransactionMinorState.BalanceKycRequired 16 import net.taler.wallet.transactions.TransactionMinorState.BankConfirmTransfer 17 import net.taler.wallet.transactions.TransactionMinorState.KycAuthRequired 18 @@ -423,6 +427,22 @@ fun TransactionExtraInfo(tx: Transaction) { 19 20 tx.txState.major == Dialog -> {} 21 22 + // Suspended and its two compound forms said nothing at all here, so a 23 + // suspended transaction looked exactly like a completed one in the 24 + // list -- the only difference was on the detail screen. The string 25 + // already exists. 26 + tx.txState.major == Suspended || 27 + tx.txState.major == SuspendedFinalizing || 28 + tx.txState.major == SuspendedAborting -> Text( 29 + stringResource(R.string.transaction_state_suspended), 30 + color = MaterialTheme.colorScheme.error, 31 + ) 32 + 33 + tx.txState.major == Expired -> Text( 34 + stringResource(R.string.transaction_state_expired), 35 + color = MaterialTheme.colorScheme.error, 36 + ) 37 + 38 tx is TransactionWithdrawal && !tx.confirmed -> Text(stringResource(R.string.withdraw_waiting_confirm)) 39 tx is TransactionPeerPushCredit && tx.info.summary != null -> Text(tx.info.summary) 40 tx is TransactionPeerPushDebit && tx.info.summary != null -> Text(tx.info.summary)