taler-ios

commit d10b35fc01b729552d5ff8cc13b5f8a39cfc8ded
parent 02da6018af2b1ed3bd694a024197e2a21ee1e84f
Author: Marc Stibane <marc@taler.net>
Date:   Sat,  8 Aug 2026 20:27:21 +0200

cleanup

Diffstat:
M
TalerWallet1/Controllers/Controller.swift
 | 
1
-
M
TalerWallet1/Model/Model+Payment.swift
 | 
2
+-
M
TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift
 | 
27
---------------------------
M
TalerWallet1/Views/Sheets/Payment/PaymentScan.swift
 | 
4
++--
M
TalerWallet1/Views/Transactions/PaymentTransactionView.swift
 | 
3
++-
M
TalerWallet1/Views/Transactions/TransactionSummaryList.swift
 | 
2
+-

6 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift
@@ -592,7 +592,6 @@ extension Controller {
         let host = url.host ?? "  <- no command"
         self.logger.trace("urlCommand(\(scheme)\(host)")
 #endif
-        var uncrypted = false
         var urlCommand = UrlCommand.unknown
         switch scheme.lowercased() {
             case "taler", "ext+taler", "web+taler":
diff --git a/TalerWallet1/Model/Model+Payment.swift b/TalerWallet1/Model/Model+Payment.swift
@@ -573,7 +573,7 @@ fileprivate struct CheckPayForTemplate: WalletBackendFormattedRequest {
 // MARK: -
 /// The result from confirmPayForUri
 struct ConfirmPayResult: Decodable {
-    var type: String                                // done || pending
+    var type: String?                               // done || pending
     var contractTerms: MerchantContractTerms?       // only if type==done
     var transactionId: String
     var lastError: TalerErrorDetail?                // might, but only if type==pending
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift
@@ -286,30 +286,3 @@ struct ManualWithdrawContent: View {
         }
     }
 }
-// MARK: -
-#if DEBUG
-//struct ManualWithdraw_Previews: PreviewProvider {
-//    struct StateContainer : View {
-//        @State private var amountToPreview = Amount(currency: LONGCURRENCY, cent: 510)
-//        @State private var exchange: Exchange? = Exchange(exchangeBaseUrl: DEMOEXCHANGE,
-//                                                                scopeInfo: ScopeInfo(type: .exchange, currency: LONGCURRENCY),
-//                                                                paytoUris: [],
-//                                                                tosStatus: .accepted,
-//                                                      exchangeEntryStatus: .ephemeral,
-//                                                     exchangeUpdateStatus: .ready,
-//                                                    ageRestrictionOptions: [])
-//
-//        var body: some View {
-//            ManualWithdraw(stack: CallStack("Preview"), isSheet: false,
-//                       scopeInfo: <#ScopeInfo?#>,
-//                 exchangeBaseUrl: DEMOEXCHANGE,
-//                        exchange: $exchange,
-//                amountToTransfer: $amountToPreview)
-//        }
-//    }
-//
-//    static var previews: some View {
-//        StateContainer()
-//    }
-//}
-#endif
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentScan.swift b/TalerWallet1/Views/Sheets/Payment/PaymentScan.swift
@@ -243,8 +243,8 @@ struct PaySafeArea: View, Sendable {
                 wasTapped = true
                 controller.hapticNotification(.success)
                 symLog?.log("paying \(amountString) now")
-#if DEBUG
-                DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
+#if DEBUG       // 1 second delay
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
                     payNow = true
                 }
 #else
diff --git a/TalerWallet1/Views/Transactions/PaymentTransactionView.swift b/TalerWallet1/Views/Transactions/PaymentTransactionView.swift
@@ -32,6 +32,7 @@ struct MerchantHeader: View {
         }
         return nil
     }
+
     var body: some View {
         if let terms {
             Section {
@@ -46,7 +47,7 @@ struct MerchantHeader: View {
                                 image
                                     .resizable()
                                     .aspectRatio(contentMode: .fit)
-                                    .frame(maxHeight: 60)
+                                    .frame(maxHeight: 50)
                             }
                         } else {
 #if TALER_NIGHTLY
diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift
@@ -86,7 +86,7 @@ struct TransactionSummaryList: View {
 
     private func payTransaction() async {
         if let confirmPayResult = try? await model.confirmPay(transactionId,
-                                                              choiceIndex: selectedChoice) {
+                                                  choiceIndex: selectedChoice) {
 //          symLog.log(confirmPayResult as Any)
             if confirmPayResult.type == "done" {
                 if let url {