taler-android

commit cc59e3545af3e33578795c3435f1ca9a00f9d66b
parent c86ae12e55c227e285252271c90b56f35f38858e
Author: Iván Ávalos <avalos@disroot.org>
Date:   Mon, 12 Feb 2024 19:41:12 -0600

[wallet] DD51: enrich manual withdrawal amounts with currencySpecification

bug 0008329

(cherry picked from commit b6f98987b842759383eb12ef5f6e4c5ca1468437)

Diffstat:
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawSuccessFragment.kt
 | 
2
++
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
 | 
10
++++++----
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferBitcoin.kt
 | 
4
+++-
M
wallet/src/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
@@ -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
@@ -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
@@ -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
@@ -82,7 +82,9 @@ fun TransferIBAN(
             WithdrawalAmountTransfer(
                 amountRaw = transactionAmountRaw,
                 amountEffective = transactionAmountEffective,
-                conversionAmountRaw = amount,
+                conversionAmountRaw = amount.withSpec(
+                    transfer.withdrawalAccount.currencySpecification,
+                ),
             )
         }
     }