taler-ios

commit 5aa95c61544443a0491c73201c29a94d0d107a36
parent 113a99294dc231507d0ca1a869a11ae507cf49fe
Author: Marc Stibane <marc@taler.net>
Date:   Thu,  7 Nov 2024 19:43:39 +0100

cleanup

Diffstat:
M
TalerWallet1/Backend/WalletBackendRequest.swift
 | 
28
+---------------------------
M
TalerWallet1/Backend/WalletCore.swift
 | 
2
+-
M
TalerWallet1/Controllers/DebugViewC.swift
 | 
2
+-
M
TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift
 | 
2
+-

4 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/TalerWallet1/Backend/WalletBackendRequest.swift b/TalerWallet1/Backend/WalletBackendRequest.swift
@@ -123,7 +123,7 @@ struct Product: Codable, Identifiable {
     var quantity: Int?
     var unit: String?
     var price: Amount?
-    var image: String? // URL to a product image
+    var image: String? // product image 128x128 encoded
     var taxes: [Tax]?
     var delivery_date: Timestamp?
 
@@ -209,32 +209,6 @@ struct WalletBackendPreparePayRequest: WalletBackendFormattedRequest {
     struct Response: Decodable {}
 }
 
-/// A request to confirm a payment.
-struct WalletBackendConfirmPayRequest: WalletBackendFormattedRequest {
-    func operation() -> String { "confirmPay" }
-    func args() -> Args { Args(proposalId: proposalId) }
-    var proposalId: String
-
-    struct Args: Encodable {
-        var proposalId: String
-    }
-
-    struct Response: Decodable {}
-}
-// MARK: -
-/// A request to abort a failed payment.
-struct WalletBackendAbortFailedPaymentRequest: WalletBackendFormattedRequest {
-    func operation() -> String { "abortFailedPayWithRefund" }
-    func args() -> Args { Args(proposalId: proposalId) }
-
-    var proposalId: String
-    struct Args: Encodable {
-        var proposalId: String
-    }
-    
-    struct Response: Decodable {}
-    
-}
 // MARK: -
 struct IntegrationTestArgs: Codable {
     var exchangeBaseUrl: String
diff --git a/TalerWallet1/Backend/WalletCore.swift b/TalerWallet1/Backend/WalletCore.swift
@@ -271,7 +271,7 @@ extension WalletCore {
                             postNotification(.TransactionStateTransition, userInfo: [TRANSACTIONTRANSITION: decoded])
                         default:
                             if let newMinor {
-                                logger.warning("\(newMajor.rawValue, privacy: .public):\(newMinor.rawValue, privacy: .public) \(decoded.transactionId, privacy: .private(mask: .hash))")
+                                logger.log("\(newMajor.rawValue, privacy: .public):\(newMinor.rawValue, privacy: .public) \(decoded.transactionId, privacy: .private(mask: .hash))")
                             } else {
                                 logger.warning("\(newMajor.rawValue, privacy: .public): \(decoded.transactionId, privacy: .private(mask: .hash))")
                             }
diff --git a/TalerWallet1/Controllers/DebugViewC.swift b/TalerWallet1/Controllers/DebugViewC.swift
@@ -29,7 +29,7 @@ public let VIEW_EMPTY_WALLET = 10                                   // 10 Wallet
 public let VIEW_BALANCES = VIEW_EMPTY_WALLET + 1                    // 11 BalancesListView
 public let VIEW_SETTINGS = VIEW_BALANCES + 1                        // 12 SettingsView
 public let VIEW_ABOUT = VIEW_SETTINGS + 1                           // 13 AboutView
-public let VIEW_BANKING = VIEW_ABOUT + 1                            // 14 ExchangeListView
+public let VIEW_PAYMENT_SERVICES = VIEW_ABOUT + 1                   // 14 ExchangeListView
 
 // MARK: Transactions
 public let VIEW_EMPTY_HISTORY = VIEW_EMPTY_WALLET + 10              // 20 TransactionsEmptyView
diff --git a/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift b/TalerWallet1/Views/Settings/Exchange/ExchangeListView.swift
@@ -116,7 +116,7 @@ struct ExchangeListCommonV: View {
         }
 //#endif
         .onAppear() {
-            DebugViewC.shared.setViewID(VIEW_BANKING, stack: stack.push())
+            DebugViewC.shared.setViewID(VIEW_PAYMENT_SERVICES, stack: stack.push())
         }
 //        .onNotification(.ExchangeAdded) { notification in
 //            // doesn't need to be received on main thread because we just reload in the background anyway