taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

commit 7c21f89f0987964c1d99a50700458df8707f6263
parent a3b83e0778437653a0d3e35f772127875435ce50
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed,  4 Jun 2025 15:54:32 +0200

[wallet] render finalizing state

Diffstat:
Mwallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt | 9+++++++--
Mwallet/src/main/res/values/strings.xml | 1+
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt @@ -44,6 +44,7 @@ import net.taler.wallet.transactions.TransactionMajorState.Aborting import net.taler.wallet.transactions.TransactionMajorState.Done import net.taler.wallet.transactions.TransactionMajorState.Expired import net.taler.wallet.transactions.TransactionMajorState.Failed +import net.taler.wallet.transactions.TransactionMajorState.Finalizing import net.taler.wallet.transactions.TransactionMajorState.Pending import net.taler.wallet.transactions.TransactionMajorState.Suspended import net.taler.wallet.transactions.TransactionMinorState.BalanceKycInit @@ -81,6 +82,7 @@ fun TransactionStateComposable( TransactionState(Suspended) -> stringResource(R.string.transaction_state_suspended) TransactionState(Failed, Repurchase) -> stringResource(R.string.payment_already_paid) TransactionState(Failed) -> stringResource(R.string.transaction_state_failed) + TransactionState(Finalizing) -> stringResource(R.string.transaction_state_finalizing) TransactionState(Expired) -> stringResource(R.string.transaction_state_expired) else -> return } @@ -89,7 +91,8 @@ fun TransactionStateComposable( TransactionState(Done) -> colorResource(R.color.green) TransactionState(Pending), TransactionState(Suspended), - TransactionState(Failed, Repurchase) -> MaterialTheme.colorScheme.surfaceVariant + TransactionState(Failed, Repurchase), + TransactionState(Finalizing) -> MaterialTheme.colorScheme.surfaceVariant TransactionState(Aborted), TransactionState(Aborting), TransactionState(Failed), @@ -101,7 +104,8 @@ fun TransactionStateComposable( TransactionState(Done) -> Color.White TransactionState(Pending), TransactionState(Suspended), - TransactionState(Failed, Repurchase) -> MaterialTheme.colorScheme.onSurfaceVariant + TransactionState(Failed, Repurchase), + TransactionState(Finalizing) -> MaterialTheme.colorScheme.onSurfaceVariant TransactionState(Aborted), TransactionState(Aborting), TransactionState(Failed), @@ -138,6 +142,7 @@ fun TransactionStateComposablePreview() { TransactionStateComposable(modifier, state = TransactionState(Suspended)) TransactionStateComposable(modifier, state = TransactionState(Failed, Repurchase)) TransactionStateComposable(modifier, state = TransactionState(Failed)) + TransactionStateComposable(modifier, state = TransactionState(Finalizing)) TransactionStateComposable(modifier, state = TransactionState(Expired)) TransactionStateComposable(modifier, state = TransactionState(Done)) diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml @@ -152,6 +152,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="transaction_state_done">This transaction was completed successfully</string> <string name="transaction_state_expired">This transaction has expired</string> <string name="transaction_state_failed">This transaction has failed or been abandoned</string> + <string name="transaction_state_finalizing">This transaction is finalizing</string> <string name="transaction_state_pending">This transaction is pending</string> <string name="transaction_state_pending_bank">Waiting for authorization in the bank</string> <string name="transaction_state_pending_kyc_bank">This transaction would exceed a limit set by the payment service provider. To increase the limit, follow the instructions linked below.</string>