[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 03/15: [wallet] DD51: enrich manual withdrawal amo
From: |
gnunet |
Subject: |
[taler-taler-android] 03/15: [wallet] DD51: enrich manual withdrawal amounts with currencySpecification |
Date: |
Wed, 27 Mar 2024 18:27:06 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit cc59e3545af3e33578795c3435f1ca9a00f9d66b
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Mon Feb 12 19:41:12 2024 -0600
[wallet] DD51: enrich manual withdrawal amounts with currencySpecification
bug 0008329
(cherry picked from commit b6f98987b842759383eb12ef5f6e4c5ca1468437)
---
.../wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt | 2 ++
.../java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt | 10 ++++++----
.../java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt | 4 +++-
.../main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt | 4 +++-
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt
index f09d275..63413c2 100644
---
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt
+++
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt
@@ -36,6 +36,7 @@ import net.taler.wallet.withdraw.WithdrawStatus
class ManualWithdrawSuccessFragment : Fragment() {
private val model: MainViewModel by activityViewModels()
private val withdrawManager by lazy { model.withdrawManager }
+ private val balanceManager by lazy { model.balanceManager }
private lateinit var status: WithdrawStatus.ManualTransferRequired
@@ -66,6 +67,7 @@ class ManualWithdrawSuccessFragment : Fragment() {
TalerSurface {
ScreenTransfer(
status = status,
+ spec =
balanceManager.getSpecForCurrency(status.transactionAmountRaw.currency),
bankAppClick = { onBankAppClick(it) },
shareClick = { onShareClick(it) },
)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
index 86972cf..35ff89c 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
@@ -59,6 +59,7 @@ import net.taler.wallet.withdraw.WithdrawStatus
@Composable
fun ScreenTransfer(
status: WithdrawStatus.ManualTransferRequired,
+ spec: CurrencySpecification?,
bankAppClick: ((transfer: TransferData) -> Unit)?,
shareClick: ((transfer: TransferData) -> Unit)?,
) {
@@ -98,14 +99,14 @@ fun ScreenTransfer(
is TransferData.IBAN -> TransferIBAN(
transfer = transfer,
exchangeBaseUrl = status.exchangeBaseUrl,
- transactionAmountRaw = status.transactionAmountRaw,
- transactionAmountEffective =
status.transactionAmountEffective,
+ transactionAmountRaw =
status.transactionAmountRaw.withSpec(spec),
+ transactionAmountEffective =
status.transactionAmountEffective.withSpec(spec),
)
is TransferData.Bitcoin -> TransferBitcoin(
transfer = transfer,
- transactionAmountRaw = status.transactionAmountRaw,
- transactionAmountEffective =
status.transactionAmountEffective,
+ transactionAmountRaw =
status.transactionAmountRaw.withSpec(spec),
+ transactionAmountEffective =
status.transactionAmountEffective.withSpec(spec),
)
}
@@ -305,6 +306,7 @@ fun ScreenTransferPreview() {
)
),
),
+ spec = null,
bankAppClick = {},
shareClick = {},
)
diff --git
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt
index 292f1d5..c21ca7e 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt
@@ -60,7 +60,9 @@ fun TransferBitcoin(
WithdrawalAmountTransfer(
amountRaw = transactionAmountRaw,
amountEffective = transactionAmountEffective,
- conversionAmountRaw = amount,
+ conversionAmountRaw = amount.withSpec(
+ transfer.withdrawalAccount.currencySpecification,
+ ),
)
}
}
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 1ebee4f..6c1b014 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
@@ -82,7 +82,9 @@ fun TransferIBAN(
WithdrawalAmountTransfer(
amountRaw = transactionAmountRaw,
amountEffective = transactionAmountEffective,
- conversionAmountRaw = amount,
+ conversionAmountRaw = amount.withSpec(
+ transfer.withdrawalAccount.currencySpecification,
+ ),
)
}
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (39b6926 -> 4af27e7), gnunet, 2024/03/27
- [taler-taler-android] 04/15: [wallet] Balance layout improvements, gnunet, 2024/03/27
- [taler-taler-android] 05/15: [wallet] Display transactions by scopeInfo instead of currency, gnunet, 2024/03/27
- [taler-taler-android] 02/15: [wallet] DD51: enrich some tx amounts with currencySpecification, gnunet, 2024/03/27
- [taler-taler-android] 14/15: [wallet] Use Backend.json instead of Json, gnunet, 2024/03/27
- [taler-taler-android] 07/15: [wallet] Set input digits of some amount inputs, gnunet, 2024/03/27
- [taler-taler-android] 01/15: [wallet] DD51: initial rendering based on currency spec, gnunet, 2024/03/27
- [taler-taler-android] 03/15: [wallet] DD51: enrich manual withdrawal amounts with currencySpecification,
gnunet <=
- [taler-taler-android] 15/15: [wallet] Use TransactionManager.selectedScope instead of passing around scopeInfo, gnunet, 2024/03/27
- [taler-taler-android] 08/15: [wallet] Cache currencySpec in loadBalances(), gnunet, 2024/03/27
- [taler-taler-android] 10/15: [taler-android] Improve handling of currencies with no symbol, gnunet, 2024/03/27
- [taler-taler-android] 12/15: [wallet] Fix call to loadBalances() from non-UI thread, gnunet, 2024/03/27
- [taler-taler-android] 06/15: [wallet] Improve DD51 unit rendering and adapt tests accordingly, gnunet, 2024/03/27
- [taler-taler-android] 11/15: [wallet] Cache currency spec per scope info, gnunet, 2024/03/27
- [taler-taler-android] 13/15: [wallet] DD51'd more views, UX improvements and some fixes, gnunet, 2024/03/27
- [taler-taler-android] 09/15: [taler-android] Improved and refactored testToString test, gnunet, 2024/03/27