taler-ios

commit 5084e8011b98f5c9dcee56e60562a21be0afe74d
parent edbfc89460e5490fe6d301e80c1b1573e29b616e
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 11 Dec 2025 19:02:07 +0100

use URI for addExchange

Diffstat:
M
TalerWallet1/Model/Model+Exchange.swift
 | 
14
+++++++-------
M
TalerWallet1/Views/Settings/Bank/BankListView.swift
 | 
2
+-
M
TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift
 | 
4
++--

3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Model/Model+Exchange.swift b/TalerWallet1/Model/Model+Exchange.swift
@@ -173,12 +173,12 @@ fileprivate struct UpdateExchange: WalletBackendFormattedRequest {
 
 /// A request to add an exchange.
 fileprivate struct AddExchange: WalletBackendFormattedRequest {
-    func operation() -> String { "addExchange" }     // addExchangeEntry
-    func args() -> Args { Args(exchangeBaseUrl: exchangeBaseUrl, allowCompletion: true) }
+    func operation() -> String { "addExchange" }
+    func args() -> Args { Args(uri: uri, allowCompletion: true) }
 
-    var exchangeBaseUrl: String
+    var uri: String
     struct Args: Encodable {
-        var exchangeBaseUrl: String
+        var uri: String
         var allowCompletion: Bool
     }
     struct Response: Decodable {}   // no result - getting no error back means success
@@ -266,10 +266,10 @@ extension WalletModel {
     }
 
     /// add a new exchange with URL to the wallet's list of known exchanges
-    nonisolated func addExchange(url: String, viewHandles: Bool = false)
+    nonisolated func addExchange(uri: String, viewHandles: Bool = false)
       async throws {
-        let request = AddExchange(exchangeBaseUrl: url)
-        logger.info("adding exchange: \(url, privacy: .public)")
+        let request = AddExchange(uri: uri)
+        logger.info("adding exchange: \(uri, privacy: .public)")
         _ = try await sendRequest(request, viewHandles: viewHandles)
     }
 
diff --git a/TalerWallet1/Views/Settings/Bank/BankListView.swift b/TalerWallet1/Views/Settings/Bank/BankListView.swift
@@ -28,7 +28,7 @@ struct BankListView: View {
     func addExchange(_ exchange: String) -> Void {
         Task { // runs on MainActor
             symLog.log("adding: \(exchange)")
-            if let _ = try? await model.addExchange(url: exchange) {
+            if let _ = try? await model.addExchange(uri: exchange) {
                 symLog.log("added: \(exchange)")
                 announce("added: \(exchange)")
                 NotificationCenter.default.post(name: .ExchangeAdded, object: nil, userInfo: nil)
diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift
@@ -24,7 +24,7 @@ struct ExchangeListView: View {
     func addExchange(_ exchange: String) -> Void {
         Task { // runs on MainActor
             symLog.log("adding: \(exchange)")
-            if let _ = try? await model.addExchange(url: exchange) {
+            if let _ = try? await model.addExchange(uri: exchange) {
                 symLog.log("added: \(exchange)")
                 announce("added: \(exchange)")
                 NotificationCenter.default.post(name: .ExchangeAdded, object: nil, userInfo: nil)
@@ -87,7 +87,7 @@ struct ExchangeListCommonV: View {
         let balanceList = List(Array(controller.balances.enumerated()), id: \.element) { index, balance in
             ExchangeSectionView(stack: stack.push(),
                               balance: balance,
-                             thousand: index * MAXEXCHANGES)
+                             thousand: index * MAXEXCHANGES)        // unique ID
         }
 
         let emptyList = List {