[taler-taler-ios] 01/02: Ask for markdown ToS, typo in Send

[gnunet]

This is an automated email from the git hooks/post-receive script.

marc-stibane pushed a commit to branch master
in repository taler-ios.

commit 96cf5390721f42f824c7ea70ac5da0cac64f3a97
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Jul 6 07:14:34 2023 +0200

    Ask for markdown ToS, typo in Send
---
 TalerWallet1/Model/Model+Withdraw.swift                         | 8 +++++---
 TalerWallet1/Views/Peer2peer/SendNow.swift                      | 2 +-
 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
index 0a1b5e2..5a4e39d 100644
--- 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
index bc07dbc..aba01b7 100644
--- 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
index 6197077..4298ef2 100644
--- 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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.