commit 9a568e6fbcfcc838d48130b828d766b60b7d86b8 parent cf45883a3505b7e32d019de04305443aab75ab6c Author: Marc Stibane <marc@taler.net> Date: Thu, 11 Dec 2025 19:27:16 +0100 pass scanned URL Diffstat:
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdraw.swift @@ -14,6 +14,7 @@ import SymLog struct ManualWithdraw: View { private let symLog = SymLogV(0) let stack: CallStack + let url: URL? // when Action is tapped while in currency TransactionList… let selectedBalance: Balance? // …then use THIS balance, otherwise show picker @Binding var amountLastUsed: Amount @@ -83,6 +84,7 @@ struct ManualWithdraw: View { if let scope = balance?.scopeInfo ?? exchange?.scopeInfo { let _ = symLog.log("exchange = \(exchange?.exchangeBaseUrl), scope = \(scope.url), amountToTransfer = \(amountToTransfer.currencyStr)") ManualWithdrawContent(stack: stack.push(), + url: url, scope: scope, amountLastUsed: $amountLastUsed, amountToTransfer: $amountToTransfer, @@ -132,6 +134,7 @@ struct ManualWithdraw: View { struct ManualWithdrawContent: View { private let symLog = SymLogV(0) let stack: CallStack + let url: URL? let scope: ScopeInfo @Binding var amountLastUsed: Amount @Binding var amountToTransfer: Amount @@ -230,6 +233,7 @@ struct ManualWithdrawContent: View { // let _ = print(selectedAge, restrictAge) let destination = ManualWithdrawDone(stack: stack.push(), // scope: detailsForAmount.scopeInfo, + url: url, baseURL: baseURL, amountToTransfer: amountToTransfer) // restrictAge: restrictAge) diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift @@ -14,6 +14,7 @@ struct ManualWithdrawDone: View { let stack: CallStack // let scope: ScopeInfo // TODO: use data from tx itself + let url: URL? let baseURL: String let amountToTransfer: Amount // let restrictAge: Int? @@ -93,6 +94,7 @@ fileprivate struct ManualWithdrawDone_Previews: PreviewProvider { exchangeUpdateStatus: .initial, ageRestrictionOptions: []) ManualWithdrawDone(stack: CallStack("Preview"), + url: URL("taler://withdraw"), // scope: scopeInfo, baseURL: DEMOEXCHANGE, amountToTransfer: amountToTransfer) diff --git a/TalerWallet1/Views/Main/MainView.swift b/TalerWallet1/Views/Main/MainView.swift @@ -456,6 +456,7 @@ extension MainView { selectedBalance: selectedBalance, amountLastUsed: $amountLastUsed) let manualWithdrawDest = ManualWithdraw(stack: stack.push(Self.name), + url: nil, selectedBalance: selectedBalance, amountLastUsed: $amountLastUsed, // currency needs to be updated! amountToTransfer: $amountToTransfer, diff --git a/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift b/TalerWallet1/Views/Sheets/WithdrawExchangeV.swift @@ -59,6 +59,7 @@ struct WithdrawExchangeV: View { let scopeInfo = exchange.scopeInfo Group { ManualWithdraw(stack: stack.push(), + url: url, selectedBalance: selectedBalance, amountLastUsed: $amountLastUsed, amountToTransfer: $amountToTransfer,