taler-ios

commit 26269a9693849292ddb8c9151190ab97baba1a86
parent ff9b1e1d3a0c920a45880c77ebc25c289f7213ce
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 20 Jul 2026 12:36:54 +0200

getExchangeTos progressToken baseUrl

Diffstat:
M
TalerWallet1/Model/Model+Withdraw.swift
 | 
13
++++++++-----
M
TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawTOSView.swift
 | 
6
+++---

2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -166,7 +166,7 @@ fileprivate struct GetExchangeTermsOfService: WalletBackendFormattedRequest {
     func args() -> Args { Args(exchangeBaseUrl: baseUrl,
                                 acceptedFormat: acceptedFormat,
                                 acceptLanguage: acceptLanguage,
-                                 progressToken: "ExchangeTos") }
+                                 progressToken: baseUrl) }
     var baseUrl: String
     var acceptedFormat: [String]?
     var acceptLanguage: String?
@@ -271,14 +271,17 @@ extension WalletModel {
         return response
     }
 
-    nonisolated func loadExchangeTermsOfService(_ baseUrl: String,
-                                           acceptedFormat: [String],
-                                           acceptLanguage: String,
-                                              viewHandles: Bool = false)
+    nonisolated func getExchangeTos(_ baseUrl: String,
+                               acceptedFormat: [String],
+                               acceptLanguage: String,
+                                  viewHandles: Bool = false)
       async throws -> ExchangeTermsOfService {
         let request = GetExchangeTermsOfService(baseUrl: baseUrl,
                                          acceptedFormat: acceptedFormat,
                                          acceptLanguage: acceptLanguage)
+        let controller = Controller.shared
+        controller.progressOperation = request.operation
+        controller.progressToken = baseUrl
         let response = try await sendRequest(request, viewHandles: viewHandles)
         return response
     }
diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawTOSView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawTOSView.swift
@@ -28,9 +28,9 @@ struct WithdrawTOSView: View {
     func loadToS(_ language: String) async {
         if let exchangeBaseUrl {
             let acceptedFormat: [String] = [MARKDOWN, PLAINTEXT]      // MARKDOWN, HTML, PLAINTEXT
-            if let someTOS = try? await model.loadExchangeTermsOfService(exchangeBaseUrl,
-                                                         acceptedFormat: acceptedFormat,
-                                                         acceptLanguage: language) {
+            if let someTOS = try? await model.getExchangeTos(exchangeBaseUrl,
+                                              acceptedFormat: acceptedFormat,
+                                              acceptLanguage: language) {
                 exchangeTOS = someTOS
             }
         } else {