commit 596b8fa07cb542695f4e87076faa4670cf55ce10 parent bd638fe5ec3a54f600f7d4744ac217e8094a5140 Author: Iván Ávalos <avalos@disroot.org> Date: Mon, 21 Jul 2025 17:51:05 +0200 [wallet] handle kyc-init Diffstat:
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/accounts/AddAccountIBAN.kt b/wallet/src/main/java/net/taler/wallet/accounts/AddAccountIBAN.kt @@ -73,7 +73,12 @@ fun AddAccountIBAN( value = iban, singleLine = true, onValueChange = { input -> - onFormEdited(name, input.uppercase()) + onFormEdited(name, input + .uppercase() + .replace(" ", "") + .replace("\n", "") + .replace("\t", "") + .trim()) }, isError = ibanError, supportingText = { diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionState.kt @@ -94,6 +94,9 @@ enum class TransactionMinorState { @SerialName("kyc") KycRequired, + @SerialName("kyc-init") + KycInit, + @SerialName("merge-kyc") MergeKycRequired, diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionStateComposable.kt @@ -51,6 +51,7 @@ 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 @@ -66,6 +67,7 @@ fun TransactionStateComposable( val message = when (state) { 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) @@ -131,6 +133,7 @@ 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)) diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionsComposable.kt @@ -18,7 +18,6 @@ package net.taler.wallet.transactions import androidx.activity.compose.BackHandler import androidx.compose.animation.animateContentSize -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Box @@ -99,6 +98,7 @@ 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 @@ -337,7 +337,6 @@ fun TransactionsHeader( } } -@OptIn(ExperimentalFoundationApi::class) @Composable fun TransactionRow( tx: Transaction, @@ -470,6 +469,7 @@ 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)) KycRequired, KycAuthRequired,