taler-ios

commit 46c74da8f252405ba1af8df3787ab259018e3cba
parent 2bcef8bdae512cb66ab205ce66b9f0f2fc5cc985
Author: Marc Stibane <marc@taler.net>
Date:   Tue, 25 Aug 2026 17:42:21 +0200

padding

Diffstat:
M
TalerWallet1/Views/Sheets/Payment/PaymentScan.swift
 | 
2
--
M
TalerWallet1/Views/Transactions/TransactionSummaryList.swift
 | 
43
++++++++++++++++++++++++++-----------------

2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentScan.swift b/TalerWallet1/Views/Sheets/Payment/PaymentScan.swift
@@ -290,12 +290,10 @@ struct PaySafeArea: View, Sendable {
                                   seconds: timeToPay)
                     .padding(.top)
                 button
-                    .padding(.bottom, 4)
             }
             if #available(iOS 26.0, *) {
                 view
                     .glassEffect(in: .rect(cornerRadius: 16.0))
-                    .padding(.horizontal)
             } else {
                 view
             }
diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift
@@ -308,24 +308,33 @@ struct TransactionSummaryList: View {
             .navigationBarBackButtonHidden(hasDone)
             .interactiveDismissDisabled(hasDone && !isPaying)     // can only use "Done" button to dismiss
             .safeAreaInset(edge: .bottom) {
-                if isPaying, case .payment(let paymentTransaction) = talerTX {
-                    let details = paymentTransaction.details
-                    if let effective, let terms = details.contractTerms {
-                        let formatted = effective.formatted(currencyInfo)
-                        PaySafeArea(symLog: symLog,
-                                     stack: stack.push(),
-                                     terms: terms,
-                              amountString: formatted.0,
-                                amountA11y: formatted.1,
-                                    payNow: $payNow)
-                    } else {
-                        Button("Cancel") { dismissTop(stack.push()) }
-                            .buttonStyle(TalerButtonStyle(type: .bordered))
+                let bottomButton = ZStack {
+                    if isPaying, case .payment(let paymentTransaction) = talerTX {
+                        let details = paymentTransaction.details
+                        if let effective, let terms = details.contractTerms {
+                            let formatted = effective.formatted(currencyInfo)
+                            PaySafeArea(symLog: symLog,
+                                         stack: stack.push(),
+                                         terms: terms,
+                                  amountString: formatted.0,
+                                    amountA11y: formatted.1,
+                                        payNow: $payNow)
+                        } else {
+                            Button("Cancel") { dismissTop(stack.push()) }
+                                .buttonStyle(TalerButtonStyle(type: .bordered))
+                                .padding()
+                        } // Cancel
+                    } else if let showDone {
+                        Button("Done") { dismissTop(stack.push()) }
+                            .buttonStyle(TalerButtonStyle(type: showDone))
                             .padding()
-                    } // Cancel
-                } else if let showDone {
-                    Button("Done") { dismissTop(stack.push()) }
-                        .buttonStyle(TalerButtonStyle(type: showDone))
+                    }
+                }
+                if #available(iOS 26.0, *) {
+                    bottomButton
+                        .padding(.horizontal)
+                } else {
+                    bottomButton
                         .padding()
                 }
             }