taler-android

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

commit 6c79e5b03c46038cfca41ef0ae275f5360ecff77
parent 4a72da387532c044c684e1678ba72d1252ca2f79
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 28 May 2025 17:27:13 +0200

[wallet] preparations for kyc-auth

Diffstat:
Mwallet/src/main/java/net/taler/wallet/transactions/ActionButtonComposable.kt | 13++-----------
Mwallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 8++++++++
2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/transactions/ActionButtonComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/ActionButtonComposable.kt @@ -36,7 +36,6 @@ import net.taler.wallet.transactions.TransactionMajorState.Pending import net.taler.wallet.transactions.TransactionMinorState.BalanceKycRequired 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 @@ -77,21 +76,13 @@ private fun KycButton( onClick = { listener.onActionButtonClicked(tx, ActionListener.Type.COMPLETE_KYC) }, modifier = modifier, ) { - val label = when (tx.txState.minor) { - KycRequired, - KycAuthRequired, - BalanceKycRequired, - MergeKycRequired -> stringResource(R.string.transaction_action_kyc) - else -> return@Button - } - Icon( Icons.Default.Link, - label, + contentDescription = null, modifier = Modifier.size(ButtonDefaults.IconSize) ) Spacer(Modifier.size(ButtonDefaults.IconSpacing)) - Text(label) + Text(stringResource(R.string.transaction_action_kyc)) } } diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt @@ -401,6 +401,7 @@ class TransactionDeposit( override val txState: TransactionState, override val txActions: List<TransactionAction>, val kycUrl: String? = null, + val kycAuthTransferInfo: KycAuthTransferInfo? = null, override val error: TalerErrorInfo? = null, override val amountRaw: Amount, override val amountEffective: Amount, @@ -424,6 +425,13 @@ class TransactionDeposit( } @Serializable +data class KycAuthTransferInfo( + val debitPaytoUri: String, + val accountPub: String, + val creditPaytoUris: List<String>, +) + +@Serializable data class PeerInfoShort( val expiration: Timestamp? = null, val summary: String? = null,