taler-ios

commit 57649155921c4b24b071a7948177d91451f5bebb
parent a93686d71c845cd724966f61c43b2c9097b59f41
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 12 Nov 2023 08:33:39 +0100

Exchange with scopeInfo

Diffstat:
M
TalerWallet1/Model/Model+Exchange.swift
 | 
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Model/Model+Exchange.swift b/TalerWallet1/Model/Model+Exchange.swift
@@ -32,18 +32,21 @@ struct Exchange: Codable, Hashable, Identifiable {
     static func == (lhs: Exchange, rhs: Exchange) -> Bool {
         return lhs.exchangeBaseUrl == rhs.exchangeBaseUrl
         &&     lhs.tosStatus == rhs.tosStatus
-        &&     lhs.exchangeStatus == rhs.exchangeStatus                         // deprecated
+//        &&     lhs.exchangeStatus == rhs.exchangeStatus                         // deprecated
         &&     lhs.exchangeEntryStatus == rhs.exchangeEntryStatus
         &&     lhs.exchangeUpdateStatus == rhs.exchangeUpdateStatus
     }
 
     var exchangeBaseUrl: String
-    var currency: String?
+    // deprecated, use scopeInfo
+    var currency: String?           // TODO: remove this
+    var scopeInfo: ScopeInfo?
     var paytoUris: [String]
     var tosStatus: ExchangeTosStatus
-    var exchangeStatus: String?                                                 // deprecated
-    var exchangeEntryStatus: ExchangeEntryStatus?                   // new, but not yet deployed in demo.taler.net
-    var exchangeUpdateStatus: ExchangeUpdateStatus?                 // new, but not yet deployed in demo.taler.net
+    // deprecated, use EntryStatus + UpdateStatus
+//    var exchangeStatus: String?
+    var exchangeEntryStatus: ExchangeEntryStatus
+    var exchangeUpdateStatus: ExchangeUpdateStatus
     var ageRestrictionOptions: [Int]
     var lastUpdateErrorInfo: ExchangeError?