[wallet] Fix conversion amount display and UI bug

3 files changed, 30 insertions, 14 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 4263b2a..404440a 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
@@ -50,10 +50,21 @@ class ManualWithdrawSuccessFragment : Fragment() {
     ): View = ComposeView(requireContext()).apply {
         status = withdrawManager.withdrawStatus.value as WithdrawStatus.ManualTransferRequired
 
+        // Set action bar subtitle and unset on exit
         if (status.withdrawalTransfers.size > 1) {
-            (requireActivity() as AppCompatActivity)
-                .supportActionBar
-                ?.subtitle = getString(R.string.withdraw_subtitle)
+            val activity = requireActivity() as AppCompatActivity
+
+            activity.apply {
+                supportActionBar?.subtitle = getString(R.string.withdraw_subtitle)
+            }
+
+            findNavController().addOnDestinationChangedListener { controller, destination, args ->
+                if (destination.id != R.id.nav_exchange_manual_withdrawal_success) {
+                    activity.apply {
+                        supportActionBar?.subtitle = null
+                    }
+                }
+            }
         }
 
         setContent {
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 ead798b..292f1d5 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
@@ -56,11 +56,13 @@ fun TransferBitcoin(
             segwitAddresses = transfer.segwitAddresses,
         )
 
-        WithdrawalAmountTransfer(
-            amountRaw = transactionAmountRaw,
-            amountEffective = transactionAmountEffective,
-            conversionAmountRaw = transfer.amountRaw,
-        )
+        transfer.withdrawalAccount.transferAmount?.let { amount ->
+            WithdrawalAmountTransfer(
+                amountRaw = transactionAmountRaw,
+                amountEffective = transactionAmountEffective,
+                conversionAmountRaw = amount,
+            )
+        }
     }
 }
 
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 fb374d6..a9e5f59 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
@@ -31,6 +31,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import net.taler.common.Amount
 import net.taler.wallet.R
+import net.taler.wallet.cleanExchange
 import net.taler.wallet.transactions.TransactionInfoComposable
 import net.taler.wallet.withdraw.TransferData
 
@@ -71,13 +72,15 @@ fun TransferIBAN(
 
         TransactionInfoComposable(
             label = stringResource(R.string.withdraw_exchange),
-            info = exchangeBaseUrl,
+            info = cleanExchange(exchangeBaseUrl),
         )
 
-        WithdrawalAmountTransfer(
-            amountRaw = transactionAmountRaw,
-            amountEffective = transactionAmountEffective,
-            conversionAmountRaw = transfer.amountRaw,
-        )
+        transfer.withdrawalAccount.transferAmount?.let { amount ->
+            WithdrawalAmountTransfer(
+                amountRaw = transactionAmountRaw,
+                amountEffective = transactionAmountEffective,
+                conversionAmountRaw = amount,
+            )
+        }
     }
 }
\ No newline at end of file