taler-ios

commit 93abd00ba3a26d1c7c8cd3f5fc1bcd105a399ba8
parent 272b34978b02f6ad94ee5d6e4f765d7a359da4b5
Author: Marc Stibane <marc@taler.net>
Date:   Mon, 20 Jul 2026 12:26:26 +0200

prepareWithdrawExchange progressToken talerUri

Diffstat:
M
TalerWallet1/Controllers/Controller.swift
 | 
7
+++++--
M
TalerWallet1/Model/Model+Withdraw.swift
 | 
6
++++--

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift b/TalerWallet1/Controllers/Controller.swift
@@ -139,8 +139,6 @@ class Controller: ObservableObject {
     @Published var slowConnection: Bool = false
     @Published var stalledConnection: Bool = false
     @Published var errorConnection: Bool = false
-    @Published var lastProgressError: RequestProgressError? = nil
-    @Published var lastProgressPhase: RequestProgressPhase? = nil
     @Published var oimModeActive: Bool = false
     @Published var oimSheetActive: Bool = false
     @Published var diagnosticModeEnabled: Bool = false
@@ -166,6 +164,11 @@ class Controller: ObservableObject {
     var messageForSheet: String? = nil
     var isLoadingChoices: String? = nil
 
+    var lastProgressError: RequestProgressError? = nil
+    var lastProgressPhase: RequestProgressPhase? = nil
+    var progressOperation: String? = nil
+    var progressToken: String? = nil
+
     private let monitor = NWPathMonitor()
 
     private var diagnosticModeObservation: NSKeyValueObservation?
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -106,8 +106,7 @@ fileprivate struct PrepareWithdrawExchange: WalletBackendFormattedRequest {
     typealias Response = WithdrawExchangeResponse
     var operation: String { "prepareWithdrawExchange" }
     func args() -> Args { Args(talerUri: talerUri,
-                          progressToken: "WithdrawExchange") }
-
+                          progressToken: talerUri) }
     var talerUri: String
     struct Args: Encodable {
         var talerUri: String
@@ -242,6 +241,9 @@ extension WalletModel {
                                             viewHandles: Bool = false)
       async throws -> WithdrawExchangeResponse {
         let request = PrepareWithdrawExchange(talerUri: talerUri)
+        let controller = Controller.shared
+        controller.progressOperation = request.operation
+        controller.progressToken = talerUri
         let response = try await sendRequest(request, viewHandles: viewHandles)
         return response
     }