commit ce834ef412a23f9d0be22a8056da68aac41d5eb6 parent d7598a7c4482d6e9ff034b5f8b4ff352ad271838 Author: Marc Stibane <marc@taler.net> Date: Fri, 31 Jul 2026 08:42:37 +0200 comments Diffstat:
7 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift b/TalerWallet1/Views/Actions/Banking/ManualWithdrawDone.swift @@ -55,7 +55,7 @@ struct ManualWithdrawDone: View { transactionId: transactionId, talerTX: $talerTX, navTitle: navTitle, - hasDone: true, + hasDone: true, // conclude withdrawal showDone: .prominent, url: nil, withActions: false) diff --git a/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift b/TalerWallet1/Views/Actions/Peer2peer/P2PReadyV.swift @@ -86,7 +86,7 @@ struct P2PReadyV: View { transactionId: transactionId, talerTX: $talerTX, navTitle: navTitle, - hasDone: true, + hasDone: true, // conclude p2p showDone: .prominent, url: nil, withActions: false) diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift @@ -70,7 +70,7 @@ struct PaymentView: View, Sendable { transactionId: txId, talerTX: $talerTX, navTitle: nil, - hasDone: true, + hasDone: true, // conclude payment showDone: .prominent, url: url, withActions: false) diff --git a/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift b/TalerWallet1/Views/Sheets/Refund/RefundURIView.swift @@ -17,8 +17,6 @@ struct RefundURIView: View { @EnvironmentObject private var model: WalletModel @EnvironmentObject private var controller: Controller -// let navTitle = String(localized: "Refund", comment:"receive refund") - @State var refundTransactionId: String? = nil // @State var transaction: Transaction? // @State private var currencyInfo: CurrencyInfo = CurrencyInfo.zero(UNKNOWN) @@ -43,13 +41,13 @@ struct RefundURIView: View { TransactionSummaryList(stack: stack.push(), // scope: scope, - transactionId: refundTransactionId, - talerTX: $talerTX, - navTitle: nil, // navTitle, - hasDone: true, - showDone: .prominent, - url: nil, - withActions: true) + transactionId: refundTransactionId, + talerTX: $talerTX, + navTitle: nil, + hasDone: true, // conclude refund + showDone: .prominent, + url: nil, + withActions: true) // .task(id: controller.currencyTicker) { // currencyInfo = controller.info2(for: currency, controller.currencyTicker) // } diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptDone.swift @@ -58,7 +58,7 @@ struct WithdrawAcceptDone: View { transactionId: transactionId, talerTX: $talerTX, navTitle: navTitle, - hasDone: true, + hasDone: true, // conclude withdrawal showDone: nil, url: nil, withActions: false) diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift @@ -31,9 +31,9 @@ struct TransactionSummaryList: View { let transactionId: String @Binding var talerTX: TalerTransaction let navTitle: String? - let hasDone: Bool + let hasDone: Bool // false: just old tx, true: the conclusion of an transaction let showDone: TalerButtonStyleType? - let url: URL? // the scanned talerURL from PaymentView + let url: URL? // the scanned talerURL from PaymentView let withActions: Bool @EnvironmentObject private var controller: Controller diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift @@ -186,7 +186,7 @@ struct TransactionsArraySection: View { transactionId: transaction.id, talerTX: $talerTX, navTitle: nil, - hasDone: false, + hasDone: false, // just show an old tx showDone: nil, url: nil, withActions: true)