taler-android

commit c18ac0cfd54382a1e5b1d3c0849628712159a0a3
parent 3b42698bcf39a84aca9518dd3ecc66a3d99691fb
Author: Iván Ávalos <avalos@disroot.org>
Date:   Mon, 22 Apr 2024 09:39:57 -0600

[wallet] DD53: address cta-wire-transfer issues

bug 0008726

Diffstat:
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/ScreenTransfer.kt
 | 
12
++++++------
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt
 | 
2
+-

3 files changed, 8 insertions(+), 8 deletions(-)
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
@@ -213,13 +213,13 @@ fun WithdrawalAmountTransfer(
                 amount = fee,
                 amountType = AmountType.Negative,
             )
-        }
 
-        TransactionAmountComposable(
-            label = stringResource(id = R.string.withdraw_total),
-            amount = amountEffective,
-            amountType = AmountType.Positive,
-        )
+            TransactionAmountComposable(
+                label = stringResource(id = R.string.withdraw_total),
+                amount = amountEffective,
+                amountType = AmountType.Positive,
+            )
+        }
     }
 }
 
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
@@ -73,11 +73,11 @@ fun TransferIBAN(
                 .padding(all = 16.dp)
         )
 
+        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
         transfer.receiverName?.let {
             DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
         }
         DetailRow(stringResource(R.string.withdraw_manual_ready_iban), transfer.iban)
-        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
 
         TransactionInfoComposable(
             label = stringResource(R.string.withdraw_exchange),
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
@@ -73,11 +73,11 @@ fun TransferTaler(
                 .padding(all = 16.dp)
         )
 
+        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
         transfer.receiverName?.let {
             DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
         }
         DetailRow(stringResource(R.string.withdraw_manual_ready_account), transfer.account)
-        DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
 
         TransactionInfoComposable(
             label = stringResource(R.string.withdraw_exchange),