taler-android

commit d8245f2e3bda3f5abb99f285bcfd76d23174f640
parent b962cb4772844a52399e38267fdd4f63a85f9207
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 10 Jul 2024 09:19:41 -0600

[wallet] Add “waiting for confirmation” banner for B-I-withdrawals

Diffstat:
M
wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt
 | 
20
++++++++++++--------
M
wallet/src/main/res/values/strings.xml
 | 
1
+

2 files changed, 13 insertions(+), 8 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
@@ -38,21 +38,23 @@ 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.Suspended
 import net.taler.wallet.transactions.TransactionMajorState.Pending
+import net.taler.wallet.transactions.TransactionMajorState.Suspended
+import net.taler.wallet.transactions.TransactionMinorState.BankConfirmTransfer
 
 @Composable
 fun TransactionStateComposable(
     modifier: Modifier = Modifier,
     state: TransactionState,
 ) {
-    val message = when (state.major) {
-        Pending -> stringResource(R.string.transaction_state_pending)
-        Aborted -> stringResource(R.string.transaction_state_aborted)
-        Aborting -> stringResource(R.string.transaction_state_aborting)
-        Suspended -> stringResource(R.string.transaction_state_suspended)
-        Failed -> stringResource(R.string.transaction_state_failed)
-        Expired -> stringResource(R.string.transaction_state_expired)
+    val message = when (state) {
+        TransactionState(Pending, BankConfirmTransfer) -> stringResource(R.string.transaction_state_pending_bank)
+        TransactionState(Pending) -> stringResource(R.string.transaction_state_pending)
+        TransactionState(Aborted) -> stringResource(R.string.transaction_state_aborted)
+        TransactionState(Aborting) -> stringResource(R.string.transaction_state_aborting)
+        TransactionState(Suspended) -> stringResource(R.string.transaction_state_suspended)
+        TransactionState(Failed) -> stringResource(R.string.transaction_state_failed)
+        TransactionState(Expired) -> stringResource(R.string.transaction_state_expired)
         else -> return
     }
 
@@ -94,7 +96,9 @@ fun TransactionStateComposable(
 fun TransactionStateComposablePreview() {
     TalerSurface {
         Column {
+
             val modifier = Modifier.padding(vertical = 6.dp)
+            TransactionStateComposable(modifier, state = TransactionState(Pending, BankConfirmTransfer))
             TransactionStateComposable(modifier, state = TransactionState(Pending))
             TransactionStateComposable(modifier, state = TransactionState(Aborted))
             TransactionStateComposable(modifier, state = TransactionState(Aborting))
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
@@ -134,6 +134,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
     <string name="transaction_state_expired">This transaction has expired</string>
     <string name="transaction_state_failed">This transaction has failed</string>
     <string name="transaction_state_pending">This transaction is pending</string>
+    <string name="transaction_state_pending_bank">Waiting for confirmation in the bank</string>
     <string name="transaction_state_suspended">This transaction is suspended</string>
     <string name="transactions_abort">Abort</string>
     <string name="transactions_abort_dialog_message">Are you sure you want to abort this transaction? Funds still in transit might get lost.</string>