commit c50939e68ff7733895c02d0b040c01e763c9f0c2
parent 5e822091756aa6980dd988afd70fd825217eb051
Author: Iván Ávalos <avalos@disroot.org>
Date: Tue, 3 Mar 2026 22:17:40 +0100
[wallet] update DD37 states
Diffstat:
5 files changed, 57 insertions(+), 91 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -54,7 +54,7 @@ import net.taler.wallet.transactions.TransactionInfoComposable
import net.taler.wallet.transactions.TransactionMajorState.Done
import net.taler.wallet.transactions.TransactionMajorState.Pending
import net.taler.wallet.transactions.TransactionMinorState.CreatePurse
-import net.taler.wallet.transactions.TransactionMinorState.MergeKycRequired
+import net.taler.wallet.transactions.TransactionMinorState.KycRequired
import net.taler.wallet.transactions.TransactionMinorState.Ready
import net.taler.wallet.transactions.TransactionPeerComposable
import net.taler.wallet.transactions.TransactionPeerPushDebit
@@ -109,7 +109,7 @@ fun ColumnScope.PeerQrCode(
) {
val context = LocalContext.current
- if (state == TransactionState(Pending) && state.minor != MergeKycRequired) {
+ if (state == TransactionState(Pending) && state.minor != KycRequired) {
Text(
modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp),
style = MaterialTheme.typography.bodyLarge,
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/ActionButtonComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/ActionButtonComposable.kt
@@ -38,7 +38,6 @@ import net.taler.wallet.transactions.TransactionMinorState.BankConfirmTransfer
import net.taler.wallet.transactions.TransactionMinorState.ExchangeWaitReserve
import net.taler.wallet.transactions.TransactionMinorState.KycAuthRequired
import net.taler.wallet.transactions.TransactionMinorState.KycRequired
-import net.taler.wallet.transactions.TransactionMinorState.MergeKycRequired
interface ActionListener {
enum class Type {
@@ -59,7 +58,7 @@ fun ActionButton(
) {
if (tx.txState.major == Pending) {
when (tx.txState.minor) {
- KycRequired, BalanceKycRequired, MergeKycRequired -> KycButton(modifier, tx, listener)
+ KycRequired, BalanceKycRequired -> KycButton(modifier, tx, listener)
BankConfirmTransfer -> ConfirmBankButton(modifier, tx, listener)
ExchangeWaitReserve, KycAuthRequired -> ConfirmManualButton(modifier, tx, listener)
else -> {}
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt
@@ -85,117 +85,94 @@ enum class TransactionMajorState {
@Serializable
enum class TransactionMinorState {
- @SerialName("unknown")
- Unknown,
-
- @SerialName("deposit")
- Deposit,
-
- @SerialName("kyc")
- KycRequired,
-
- @SerialName("kyc-init")
- KycInit,
+ @SerialName("aborting-bank")
+ AbortingBank,
- @SerialName("merge-kyc")
- MergeKycRequired,
-
- @SerialName("balance-kyc")
- BalanceKycRequired,
-
- @SerialName("balance-kyc-init")
- BalanceKycInit,
-
- @SerialName("kyc-auth")
- KycAuthRequired,
-
- @SerialName("track")
- Track,
-
- @SerialName("submit-payment")
- SubmitPayment,
-
- @SerialName("rebind-session")
- RebindSession,
-
- @SerialName("refresh")
- Refresh,
-
- @SerialName("pickup")
- Pickup,
+ @SerialName("accept-refund")
+ AcceptRefund,
@SerialName("auto-refund")
AutoRefund,
- @SerialName("user")
- User,
+ @SerialName("balance-kyc")
+ BalanceKycRequired,
@SerialName("bank")
Bank,
- @SerialName("exchange")
- Exchange,
+ @SerialName("bank-confirm-transfer")
+ BankConfirmTransfer,
- @SerialName("claim-proposal")
- ClaimProposal,
+ @SerialName("bank-register-reserve")
+ BankRegisterReserve,
@SerialName("check-refund")
CheckRefund,
+ @SerialName("claim-proposal")
+ ClaimProposal,
+
+ @SerialName("completed-by-another-wallet")
+ CompletedByAnotherWallet,
+
@SerialName("create-purse")
CreatePurse,
@SerialName("delete-purse")
DeletePurse,
- @SerialName("refresh-expired")
- RefreshExpired,
+ @SerialName("deposit")
+ Deposit,
- @SerialName("ready")
- Ready,
+ @SerialName("exchange")
+ Exchange,
+
+ @SerialName("exchange-wait-reserve")
+ ExchangeWaitReserve,
+
+ @SerialName("kyc-auth")
+ KycAuthRequired,
+
+ @SerialName("kyc-init")
+ KycInit,
+
+ @SerialName("kyc")
+ KycRequired,
@SerialName("merge")
Merge,
- @SerialName("repurchase")
- Repurchase,
-
- @SerialName("bank-register-reserve")
- BankRegisterReserve,
+ @SerialName("paid-by-other")
+ PaidByOther,
- @SerialName("bank-confirm-transfer")
- BankConfirmTransfer,
+ @SerialName("proposed")
+ Proposed,
- @SerialName("withdraw-coins")
- WithdrawCoins,
+ @SerialName("ready")
+ Ready,
- @SerialName("exchange-wait-reserve")
- ExchangeWaitReserve,
+ @SerialName("rebind-session")
+ RebindSession,
- @SerialName("aborting")
- Aborting,
+ @SerialName("refresh")
+ Refresh,
@SerialName("refused")
Refused,
- @SerialName("withdraw")
- Withdraw,
-
- @SerialName("merchant-order-proposed")
- MerchantOrderProposed,
+ @SerialName("repurchase")
+ Repurchase,
- @SerialName("proposed")
- Proposed,
+ @SerialName("submit-payment")
+ SubmitPayment,
- @SerialName("refund-available")
- RefundAvailable,
+ @SerialName("track")
+ Track,
- @SerialName("accept-refund")
- AcceptRefund,
+ @SerialName("unknown")
+ Unknown,
- @SerialName("paid-by-other")
- PaidByOther,
+ @SerialName("withdraw")
+ Withdraw,
- @SerialName("completed-by-other-wallet")
- CompletedByOtherWallet,
}
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt
@@ -47,13 +47,11 @@ 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
import net.taler.wallet.transactions.TransactionMinorState.BalanceKycRequired
import net.taler.wallet.transactions.TransactionMinorState.BankConfirmTransfer
import net.taler.wallet.transactions.TransactionMinorState.KycAuthRequired
import net.taler.wallet.transactions.TransactionMinorState.KycInit
import net.taler.wallet.transactions.TransactionMinorState.KycRequired
-import net.taler.wallet.transactions.TransactionMinorState.MergeKycRequired
import net.taler.wallet.transactions.TransactionMinorState.Repurchase
import net.taler.wallet.transactions.WithdrawalDetails.ManualTransfer
@@ -68,10 +66,8 @@ fun TransactionStateComposable(
TransactionState(Done) -> stringResource(R.string.transaction_state_done)
TransactionState(Pending, BankConfirmTransfer) -> stringResource(R.string.transaction_state_pending_bank)
TransactionState(Pending, KycInit) -> stringResource(R.string.transaction_preparing_kyc)
- TransactionState(Pending, BalanceKycInit) -> stringResource(R.string.transaction_preparing_kyc)
TransactionState(Pending, KycRequired) -> stringResource(R.string.transaction_state_pending_kyc_bank)
TransactionState(Pending, BalanceKycRequired) -> stringResource(R.string.transaction_state_pending_kyc_bank)
- TransactionState(Pending, MergeKycRequired) -> stringResource(R.string.transaction_state_pending_kyc_bank)
TransactionState(Pending, KycAuthRequired) -> stringResource(R.string.transaction_state_pending_kyc_auth)
TransactionState(Pending) -> stringResource(R.string.transaction_state_pending)
TransactionState(Aborted) -> if (tx is TransactionWithdrawal && tx.withdrawalDetails is ManualTransfer) {
@@ -137,10 +133,8 @@ fun TransactionStateComposablePreview() {
val modifier = Modifier.padding(vertical = 6.dp)
TransactionStateComposable(modifier, state = TransactionState(Pending, BankConfirmTransfer))
TransactionStateComposable(modifier, state = TransactionState(Pending, KycInit))
- TransactionStateComposable(modifier, state = TransactionState(Pending, BalanceKycInit))
TransactionStateComposable(modifier, state = TransactionState(Pending, KycRequired))
TransactionStateComposable(modifier, state = TransactionState(Pending, BalanceKycRequired))
- TransactionStateComposable(modifier, state = TransactionState(Pending, MergeKycRequired))
TransactionStateComposable(modifier, state = TransactionState(Pending, KycAuthRequired))
TransactionStateComposable(modifier, state = TransactionState(Pending))
TransactionStateComposable(modifier, state = TransactionState(Aborted))
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt
@@ -97,13 +97,11 @@ import net.taler.wallet.transactions.TransactionMajorState.Dialog
import net.taler.wallet.transactions.TransactionMajorState.Done
import net.taler.wallet.transactions.TransactionMajorState.Failed
import net.taler.wallet.transactions.TransactionMajorState.Pending
-import net.taler.wallet.transactions.TransactionMinorState.BalanceKycInit
import net.taler.wallet.transactions.TransactionMinorState.BalanceKycRequired
import net.taler.wallet.transactions.TransactionMinorState.BankConfirmTransfer
import net.taler.wallet.transactions.TransactionMinorState.KycRequired
import net.taler.wallet.transactions.TransactionMinorState.KycAuthRequired
import net.taler.wallet.transactions.TransactionMinorState.KycInit
-import net.taler.wallet.transactions.TransactionMinorState.MergeKycRequired
import net.taler.wallet.transactions.TransactionMinorState.Repurchase
import net.taler.wallet.transactions.TransactionsResult.Error
import net.taler.wallet.transactions.TransactionsResult.None
@@ -480,12 +478,10 @@ fun TransactionExtraInfo(tx: Transaction) {
tx.txState.major == Pending -> when(tx.txState.minor) {
BankConfirmTransfer -> Text(stringResource(R.string.withdraw_waiting_confirm))
- KycInit,
- BalanceKycInit -> Text(stringResource(R.string.transaction_preparing_kyc))
+ KycInit -> Text(stringResource(R.string.transaction_preparing_kyc))
KycRequired,
KycAuthRequired,
- BalanceKycRequired,
- MergeKycRequired -> Text(stringResource(R.string.transactions_required_kyc))
+ BalanceKycRequired -> Text(stringResource(R.string.transactions_required_kyc))
else -> {}
}
