taler-android

commit a4ff2e59ce25af69f90bdaffec7a6ee0bea078a9
parent 988f331fe8b139dda2f34b6e472022d6c1021466
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed,  4 Mar 2026 22:30:39 +0100

[wallet] dd88: reorder transfer steps
Diffstat:
M
wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt
 | 
24
++++++++++++------------
M
wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt
 | 
42
+++++++++++++++++++++---------------------

2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt b/wallet/src/main/java/net/taler/wallet/transfer/TransferCyclos.kt
@@ -64,14 +64,19 @@ fun TransferCyclos(
             modifier = Modifier.padding(vertical = 6.dp)
         )
 
-        TransferStep(1, stringResource(R.string.withdraw_manual_step_subject))
+        TransferStep(1, stringResource(R.string.withdraw_manual_step_cyclos))
 
         DetailRow(
-            stringResource(R.string.withdraw_manual_ready_subject),
-            transfer.subject,
-            characterBreak = true,
+            stringResource(R.string.withdraw_manual_ready_receiver),
+            transfer.receiverName,
         )
 
+        WithdrawalAmountTransfer(
+            conversionAmountRaw = transfer.transferAmount,
+        )
+
+        TransferStep(2, stringResource(R.string.withdraw_manual_step_subject))
+
         WarningLabel(
             modifier = Modifier.padding(
                 horizontal = 8.dp,
@@ -80,15 +85,10 @@ fun TransferCyclos(
             label = stringResource(R.string.withdraw_manual_ready_warning),
         )
 
-        TransferStep(2, stringResource(R.string.withdraw_manual_step_cyclos))
-
         DetailRow(
-            stringResource(R.string.withdraw_manual_ready_receiver),
-            transfer.receiverName,
-        )
-
-        WithdrawalAmountTransfer(
-            conversionAmountRaw = transfer.transferAmount,
+            stringResource(R.string.withdraw_manual_ready_subject),
+            transfer.subject,
+            characterBreak = true,
         )
 
         TransferStep(3,
diff --git a/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt b/wallet/src/main/java/net/taler/wallet/transfer/TransferIBAN.kt
@@ -81,26 +81,9 @@ fun TransferIBAN(
             modifier = Modifier.padding(vertical = 6.dp)
         )
 
-        TransferStep(1, stringResource(R.string.withdraw_manual_step_subject))
+        TransferStep(1, stringResource(R.string.withdraw_manual_step_iban))
 
-        DetailRow(
-            stringResource(R.string.withdraw_manual_ready_subject),
-            transfer.subject,
-            characterBreak = true,
-        )
-
-        WarningLabel(
-            modifier = Modifier.padding(
-                horizontal = 8.dp,
-                vertical = 16.dp,
-            ),
-            label = when (transferContext) {
-                ManualWithdrawal -> stringResource(R.string.withdraw_manual_ready_warning)
-                is DepositKycAuth -> stringResource(R.string.send_deposit_kyc_auth_warning_subject)
-            },
-        )
-
-        TransferStep(2, stringResource(R.string.withdraw_manual_step_iban))
+        DetailRow(stringResource(R.string.withdraw_manual_ready_iban), transfer.iban)
 
         transfer.receiverName?.let {
             DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
@@ -114,12 +97,29 @@ fun TransferIBAN(
             DetailRow(stringResource(R.string.withdraw_manual_ready_town), it)
         }
 
-        DetailRow(stringResource(R.string.withdraw_manual_ready_iban), transfer.iban)
-
         WithdrawalAmountTransfer(
             conversionAmountRaw = transfer.transferAmount,
         )
 
+        TransferStep(2, stringResource(R.string.withdraw_manual_step_subject))
+
+        WarningLabel(
+            modifier = Modifier.padding(
+                horizontal = 8.dp,
+                vertical = 16.dp,
+            ),
+            label = when (transferContext) {
+                ManualWithdrawal -> stringResource(R.string.withdraw_manual_ready_warning)
+                is DepositKycAuth -> stringResource(R.string.send_deposit_kyc_auth_warning_subject)
+            },
+        )
+
+        DetailRow(
+            stringResource(R.string.withdraw_manual_ready_subject),
+            transfer.subject,
+            characterBreak = true,
+        )
+
         TransferStep(3,
             when (transferContext) {
                 ManualWithdrawal -> stringResource(