commit 2974634cabcd5a391303847346b36eff8f367acb
parent c4761b478239405a9ad20e7fd74944a14b4de44b
Author: Marc Stibane <marc@taler.net>
Date: Fri, 31 May 2024 09:05:09 +0200
restrictAge
Diffstat:
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -158,14 +158,16 @@ struct AcceptWithdrawalResponse: Decodable {
fileprivate struct AcceptBankIntegratedWithdrawal: WalletBackendFormattedRequest {
typealias Response = AcceptWithdrawalResponse
func operation() -> String { "acceptBankIntegratedWithdrawal" }
- func args() -> Args { Args(talerWithdrawUri: talerWithdrawUri, exchangeBaseUrl: exchangeBaseUrl) }
+ func args() -> Args { Args(talerWithdrawUri: talerWithdrawUri, exchangeBaseUrl: exchangeBaseUrl, restrictAge: restrictAge) }
var talerWithdrawUri: String
var exchangeBaseUrl: String
+ var restrictAge: Int?
struct Args: Encodable {
var talerWithdrawUri: String
var exchangeBaseUrl: String
+ var restrictAge: Int?
}
}
// MARK: -
@@ -236,9 +238,9 @@ extension WalletModel {
return response
}
@MainActor // M for MainActor
- func sendAcceptIntWithdrawalM(_ exchangeBaseUrl: String, withdrawURL: String, viewHandles: Bool = false)
+ func sendAcceptIntWithdrawalM(_ exchangeBaseUrl: String, withdrawURL: String, restrictAge: Int?, viewHandles: Bool = false)
async throws -> AcceptWithdrawalResponse? {
- let request = AcceptBankIntegratedWithdrawal(talerWithdrawUri: withdrawURL, exchangeBaseUrl: exchangeBaseUrl)
+ let request = AcceptBankIntegratedWithdrawal(talerWithdrawUri: withdrawURL, exchangeBaseUrl: exchangeBaseUrl, restrictAge: restrictAge)
let response = try await sendRequest(request, ASYNCDELAY, viewHandles: viewHandles)
return response
}
diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift
@@ -56,7 +56,8 @@ struct WithdrawAcceptDone: View {
DebugViewC.shared.setSheetID(SHEET_WITHDRAW_CONFIRM)
}.task {
if let exchangeBaseUrl {
- if let result = try? await model.sendAcceptIntWithdrawalM(exchangeBaseUrl, withdrawURL: url.absoluteString) {
+ // TODO: restrictAge
+ if let result = try? await model.sendAcceptIntWithdrawalM(exchangeBaseUrl, withdrawURL: url.absoluteString, restrictAge: nil) {
let confirmTransferUrl = result.confirmTransferUrl
symLog.log(confirmTransferUrl)
transactionId = result.transactionId