taler-ios

commit fa8436c1128f994bcf266d59e6ab7f1f5947b3c7
parent deec3fc223b81298360525bb7ddf3d5ef3598d1c
Author: Marc Stibane <marc@taler.net>
Date:   Sat,  9 Nov 2024 11:39:02 +0100

TransactionById

Diffstat:
M
TalerWallet1/Model/WalletModel.swift
 | 
11
+++--------
M
TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift
 | 
3
++-
M
TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
 | 
3
++-
M
TalerWallet1/Views/Balances/BalancesSectionView.swift
 | 
3
++-
M
TalerWallet1/Views/Sheets/Payment/PaymentDone.swift
 | 
3
++-
M
TalerWallet1/Views/Sheets/Refund/RefundURIView.swift
 | 
4
++--
M
TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
 | 
3
++-

7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/TalerWallet1/Model/WalletModel.swift b/TalerWallet1/Model/WalletModel.swift
@@ -109,17 +109,12 @@ fileprivate struct GetTransactionById: WalletBackendFormattedRequest {
 }
 
 extension WalletModel {
-    func getTransactionByIdT(_ transactionId: String, viewHandles: Bool = false)
-      async throws -> Transaction {              // T for any Thread
-        // might be called from a background thread itself
+    /// get the specified transaction from Wallet-Core. No networking involved
+    nonisolated func getTransactionById(_ transactionId: String, viewHandles: Bool = false)
+      async throws -> Transaction {
         let request = GetTransactionById(transactionId: transactionId)
         return try await sendRequest(request, ASYNCDELAY, viewHandles: viewHandles)
     }
-    /// get the specified transaction from Wallet-Core. No networking involved
-    @MainActor func getTransactionByIdM(_ transactionId: String, viewHandles: Bool = false)
-      async throws -> Transaction {                // M for MainActor
-        return try await getTransactionByIdT(transactionId, viewHandles: viewHandles)      // call GetTransactionById on main thread
-    }
 }
 // MARK: -
 /// The info returned from Wallet-core init
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift
@@ -25,8 +25,9 @@ struct ManualWithdrawDone: View {
 
     let navTitle = String(localized: "Wire Transfer")
 
+    @MainActor
     func reloadOneAction(_ transactionId: String, viewHandles: Bool) async throws -> Transaction {
-        return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        return try await model.getTransactionById(transactionId, viewHandles: viewHandles)
     }
 
     @MainActor
diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift
@@ -31,8 +31,9 @@ struct P2PReadyV: View {
     let navTitle = String(localized: "P2P Ready")
     @State private var transactionId: String? = nil
 
+    @MainActor
     func reloadOneAction(_ transactionId: String, viewHandles: Bool) async throws -> Transaction {
-        return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        return try await model.getTransactionById(transactionId, viewHandles: viewHandles)
     }
 
     @MainActor
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -44,8 +44,9 @@ struct BalancesSectionView {
 
     private static func className() -> String {"\(self)"}
 
+    @MainActor
     func reloadOneAction(_ transactionId: String, _ viewHandles: Bool) async throws -> Transaction {
-        return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        return try await model.getTransactionById(transactionId, viewHandles: viewHandles)
     }
 
     @State private var sectionID = UUID()
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentDone.swift b/TalerWallet1/Views/Sheets/Payment/PaymentDone.swift
@@ -19,8 +19,9 @@ struct PaymentDone: View {
 
     @State var paymentDone: Bool = false
 
+    @MainActor
     func reloadOneAction(_ transactionId: String, viewHandles: Bool) async throws -> Transaction {
-        return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        return try await model.getTransactionById(transactionId, viewHandles: viewHandles)
     }
 
     @MainActor
diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift
@@ -25,7 +25,7 @@ struct RefundURIView: View {
 
     @MainActor
     func reloadOneAction(_ transactionId: String, viewHandles: Bool) async throws -> Transaction {
-        return try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        return try await model.getTransactionById(transactionId, viewHandles: viewHandles)
     }
 
     @MainActor
@@ -33,7 +33,7 @@ struct RefundURIView: View {
         symLog.log(".task")
         if let result = try? await model.startRefundForUri(url: url.absoluteString) {
             refundTransactionId = result
-            transaction = try? await model.getTransactionByIdM(result)
+            transaction = try? await model.getTransactionById(result)
         }
     }
 
diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
@@ -25,8 +25,9 @@ struct WithdrawAcceptDone: View {
 
     let navTitle = String(localized: "Authorize at Bank", comment: "Nav title")
 
+    @MainActor
     func reloadOneAction(_ transactionId: String, viewHandles: Bool) async throws -> Transaction {
-        let response = try await model.getTransactionByIdT(transactionId, viewHandles: viewHandles)
+        let response = try await model.getTransactionById(transactionId, viewHandles: viewHandles)
         transaction = response
         return response
     }