commit 6265ecb93afed9a962dcc5b1559a45122fccb019
parent 7f6d54cd27edeee4dfd8b637e176302692376324
Author: Marc Stibane <marc@taler.net>
Date: Mon, 5 Oct 2026 08:19:19 +0200
progressToken
Diffstat:
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/TalerWallet1/Model/Model+P2P.swift b/TalerWallet1/Model/Model+P2P.swift
@@ -248,11 +248,12 @@ struct PreparePeerPullDebitResponse: Codable {
fileprivate struct PreparePeerPullDebit: WalletBackendFormattedRequest {
typealias Response = PreparePeerPullDebitResponse
var operation: String { "preparePeerPullDebit" }
- func args() -> Args { Args(talerUri: talerUri) }
+ func args() -> Args { Args(talerUri: talerUri, progressToken: talerUri) }
var talerUri: String
struct Args: Encodable {
var talerUri: String
+ var progressToken: String
}
}
extension WalletModel {
@@ -260,6 +261,9 @@ extension WalletModel {
viewHandles: Bool = false)
async throws -> PreparePeerPullDebitResponse {
let request = PreparePeerPullDebit(talerUri: talerUri)
+ let controller = Controller.shared
+ controller.progressOperation = request.operation
+ controller.progressToken = talerUri
let (response, id) = try await sendRequest(request, viewHandles: viewHandles)
return response
}
diff --git a/TalerWallet1/Model/Model+Payment.swift b/TalerWallet1/Model/Model+Payment.swift
@@ -347,7 +347,7 @@ struct PreparePayResult2: Codable {
fileprivate struct PreparePayForUri: WalletBackendFormattedRequest {
typealias Response = PreparePayResult2
var operation: String { "preparePayForUriV2" }
- func args() -> Args { Args(talerPayUri: talerPayUri) } // No progressToken!
+ func args() -> Args { Args(talerPayUri: talerPayUri) } // No progressToken! use waitTransactionState
var talerPayUri: String
struct Args: Encodable {