taler-ios

commit 96cf5390721f42f824c7ea70ac5da0cac64f3a97
parent 06c6f38689aae32a1fc24b467f0a36becd130b1b
Author: Marc Stibane <marc@taler.net>
Date:   Thu,  6 Jul 2023 07:14:34 +0200

Ask for markdown ToS, typo in Send

Diffstat:
M
TalerWallet1/Model/Model+Withdraw.swift
 | 
8
+++++---
M
TalerWallet1/Views/Peer2peer/SendNow.swift
 | 
2
+-
M
TalerWallet1/Views/WithdrawBankIntegrated/WithdrawTOSView.swift
 | 
4
+++-

3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -75,11 +75,13 @@ struct ExchangeTermsOfService: Decodable {
 fileprivate struct GetExchangeTermsOfService: WalletBackendFormattedRequest {
     typealias Response = ExchangeTermsOfService
     func operation() -> String { return "getExchangeTos" }
-    func args() -> Args { return Args(exchangeBaseUrl: exchangeBaseUrl) }
+    func args() -> Args { return Args(exchangeBaseUrl: exchangeBaseUrl, acceptedFormat: acceptedFormat) }
 
     var exchangeBaseUrl: String
+    var acceptedFormat: [String]?
     struct Args: Encodable {
         var exchangeBaseUrl: String
+        var acceptedFormat: [String]?
     }
 }
 /// A request to mark an exchange's terms of service as accepted.
@@ -157,9 +159,9 @@ extension WalletModel {
         return response
     }
     @MainActor
-    func loadExchangeTermsOfServiceM(_ exchangeBaseUrl: String)             // M for MainActor
+    func loadExchangeTermsOfServiceM(_ exchangeBaseUrl: String, acceptedFormat: [String])             // M for MainActor
       async throws -> ExchangeTermsOfService {
-        let request = GetExchangeTermsOfService(exchangeBaseUrl: exchangeBaseUrl)
+        let request = GetExchangeTermsOfService(exchangeBaseUrl: exchangeBaseUrl, acceptedFormat: acceptedFormat)
         let response = try await sendRequest(request, ASYNCDELAY)
         return response
     }
diff --git a/TalerWallet1/Views/Peer2peer/SendNow.swift b/TalerWallet1/Views/Peer2peer/SendNow.swift
@@ -31,7 +31,7 @@ struct SendNow: View {
                     QRCodeDetailView(talerURI: talerURI,
                                      incoming: amountToSend == nil)
                     .padding()
-                    Text("The QR code can also be copied and shared from Transactions later")
+                    Text("The QR code can also be copied and shared from Transactions later.")
                         .fixedSize(horizontal: false, vertical: true)
                         .font(.subheadline)
                         .padding(.vertical, 20)
diff --git a/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawTOSView.swift b/TalerWallet1/Views/WithdrawBankIntegrated/WithdrawTOSView.swift
@@ -62,7 +62,9 @@ struct WithdrawTOSView: View {
         }.task {
             do {
                 if let exchangeBaseUrl {
-                    let someTOS = try await model.loadExchangeTermsOfServiceM(exchangeBaseUrl)
+                    let acceptedFormat: [String] = ["text/markdown", "text/plain"]
+                    let someTOS = try await model.loadExchangeTermsOfServiceM(exchangeBaseUrl,
+                                                                acceptedFormat: acceptedFormat)
                     exchangeTOS = someTOS
                 }
             } catch {    // TODO: error