diff options
| author | Iván Ávalos <avalos@disroot.org> | 2024-04-01 12:55:02 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2024-04-03 13:19:01 -0600 |
| commit | b2a8c16817bfdce925be8a581c7cd6a93d07e66d (patch) | |
| tree | 24834d539d0c461913e4cff537ebc8845b03dd82 /wallet/src/main/java/net/taler/wallet/withdraw | |
| parent | a1c2929055708e456fc43ff38227be25b35827c7 (diff) | |
| download | taler-android-b2a8c16817bfdce925be8a581c7cd6a93d07e66d.tar.gz taler-android-b2a8c16817bfdce925be8a581c7cd6a93d07e66d.tar.bz2 taler-android-b2a8c16817bfdce925be8a581c7cd6a93d07e66d.zip | |
[wallet] Make manual withdrawal use correct transfer amount
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/withdraw')
| -rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt | 22 | ||||
| -rw-r--r-- | wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt | 20 |
2 files changed, 24 insertions, 18 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt index 6c1b014..d0bc893 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt @@ -42,6 +42,12 @@ fun TransferIBAN( transactionAmountRaw: Amount, transactionAmountEffective: Amount, ) { + val transferAmount = transfer + .withdrawalAccount + .transferAmount + ?.withSpec(transfer.withdrawalAccount.currencySpecification) + ?: transfer.amountRaw + Column( modifier = Modifier.padding(all = 16.dp), horizontalAlignment = Alignment.CenterHorizontally, @@ -49,7 +55,7 @@ fun TransferIBAN( Text( text = stringResource( R.string.withdraw_manual_ready_intro, - transfer.amountRaw.toString()), + transferAmount), style = MaterialTheme.typography.bodyLarge, modifier = Modifier .padding(vertical = 8.dp) @@ -78,14 +84,10 @@ fun TransferIBAN( info = cleanExchange(exchangeBaseUrl), ) - transfer.withdrawalAccount.transferAmount?.let { amount -> - WithdrawalAmountTransfer( - amountRaw = transactionAmountRaw, - amountEffective = transactionAmountEffective, - conversionAmountRaw = amount.withSpec( - transfer.withdrawalAccount.currencySpecification, - ), - ) - } + WithdrawalAmountTransfer( + amountRaw = transactionAmountRaw, + amountEffective = transactionAmountEffective, + conversionAmountRaw = transferAmount, + ) } }
\ No newline at end of file diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt index cc6597e..2ec43b9 100644 --- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt +++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt @@ -42,6 +42,12 @@ fun TransferTaler( transactionAmountRaw: Amount, transactionAmountEffective: Amount, ) { + val transferAmount = transfer + .withdrawalAccount + .transferAmount + ?.withSpec(transfer.withdrawalAccount.currencySpecification) + ?: transfer.amountRaw + Column( modifier = Modifier.padding(all = 16.dp), horizontalAlignment = Alignment.CenterHorizontally, @@ -49,7 +55,7 @@ fun TransferTaler( Text( text = stringResource( R.string.withdraw_manual_ready_intro, - transfer.amountRaw.toString()), + transferAmount), style = MaterialTheme.typography.bodyLarge, modifier = Modifier .padding(vertical = 8.dp) @@ -78,12 +84,10 @@ fun TransferTaler( info = cleanExchange(exchangeBaseUrl), ) - transfer.withdrawalAccount.transferAmount?.let { amount -> - WithdrawalAmountTransfer( - amountRaw = transactionAmountRaw, - amountEffective = transactionAmountEffective, - conversionAmountRaw = amount, - ) - } + WithdrawalAmountTransfer( + amountRaw = transactionAmountRaw, + amountEffective = transactionAmountEffective, + conversionAmountRaw = transferAmount, + ) } }
\ No newline at end of file |