[taler-taler-ios] 03/36: Exchange with scopeInfo

[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 57649155921c4b24b071a7948177d91451f5bebb
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sun Nov 12 08:33:39 2023 +0100

    Exchange with scopeInfo
---
 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
index 524f462..293bc3c 100644
--- 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?
 

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