[wallet] Manual withdrawal: hide fee when zero and relax paddings for smaller screens

2 files changed, 8 insertions, 12 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
index fd67e71..caad7b6 100644
--- a/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/withdraw/PromptWithdrawFragment.kt
@@ -164,10 +164,12 @@ class PromptWithdrawFragment : Fragment() {
         ui.chosenAmountView.text = amountRaw.toString()
         ui.chosenAmountView.fadeIn()
 
-        ui.feeLabel.fadeIn()
-        ui.feeView.text =
-            getString(R.string.amount_negative, (amountRaw - amountEffective).toString())
-        ui.feeView.fadeIn()
+        val fee = amountRaw - amountEffective
+        if (!fee.isZero()) {
+            ui.feeLabel.fadeIn()
+            ui.feeView.text = getString(R.string.amount_negative, fee.toString())
+            ui.feeView.fadeIn()
+        }
 
         ui.exchangeIntroView.fadeIn()
         ui.withdrawExchangeUrl.text = cleanExchange(exchange)
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 508fcc3..3179ebd 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
@@ -83,15 +83,9 @@ fun ScreenTransfer(
         val scrollState = rememberScrollState()
         Column(
             modifier = Modifier
-                .verticalScroll(scrollState)
-                .padding(all = 16.dp),
+                .verticalScroll(scrollState),
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            Text(
-                text = stringResource(R.string.withdraw_manual_ready_title),
-                style = MaterialTheme.typography.headlineSmall,
-            )
-
             when (val transfer = selectedTransfer) {
                 is TransferData.IBAN -> TransferIBAN(
                     transfer = transfer,
@@ -111,7 +105,7 @@ fun ScreenTransfer(
                 Button(
                     onClick = { bankAppClick(selectedTransfer) },
                     modifier = Modifier
-                        .padding(top = 16.dp)
+                        .padding(bottom = 16.dp)
                 ) {
                     Text(text = stringResource(R.string.withdraw_manual_ready_bank_button))
                 }