[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 18/32: Dismiss P2P without showing details again
From: |
gnunet |
Subject: |
[taler-taler-ios] 18/32: Dismiss P2P without showing details again |
Date: |
Sat, 10 Feb 2024 15:04:44 +0100 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit 52ae044f96d6d0d005dc2a4e7a9064eadb7d4082
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sun Feb 4 15:25:23 2024 +0100
Dismiss P2P without showing details again
---
.../Views/Sheets/P2P_Sheets/P2pAcceptDone.swift | 24 +++-------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
index 0d45f8d..ede5272 100644
--- a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
+++ b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pAcceptDone.swift
@@ -17,15 +17,6 @@ struct P2pAcceptDone: View {
@EnvironmentObject private var controller: Controller
@EnvironmentObject private var model: WalletModel
- @State private var finished: Bool = false
-
- func reloadOneAction(_ transactionId: String) async throws -> Transaction {
- return try await model.getTransactionByIdT(transactionId)
- }
- func dismissTopAnimated(_ stack: CallStack) {
- dismissTop()
- }
-
var body: some View {
#if PRINT_CHANGES
let _ = Self._printChanges()
@@ -33,18 +24,9 @@ struct P2pAcceptDone: View {
#endif
let navTitle = incoming ? String(localized: "Received P2P", comment:
"Title, short")
: String(localized: "Paid P2P", comment:
"Title, short")
- TransactionSummaryV(stack: stack.push(),
- transactionId: transactionId,
- reloadAction: reloadOneAction,
- navTitle: navTitle,
- doneAction: dismissTopAnimated,
- abortAction: nil,
- deleteAction: nil,
- failAction: nil,
- suspendAction: nil,
- resumeAction: nil)
+ LoadingView(url: nil, message: "Accepting...")
.navigationBarBackButtonHidden(true)
- .interactiveDismissDisabled() // can only use "Done"
button to dismiss
+// .interactiveDismissDisabled() // can only use "Done"
button to dismiss
.navigationTitle(navTitle)
.onAppear() {
symLog.log("onAppear")
@@ -58,7 +40,7 @@ struct P2pAcceptDone: View {
} else {
_ = try await
model.confirmPeerPullDebitM(transactionId)
}
- finished = true
+ dismissTop()
} catch { // TODO: error
symLog.log(error.localizedDescription)
controller.playSound(0)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 06/32: Cleanup, logging, (continued)
- [taler-taler-ios] 06/32: Cleanup, logging, gnunet, 2024/02/10
- [taler-taler-ios] 20/32: wording, gnunet, 2024/02/10
- [taler-taler-ios] 04/32: Fake Euro, gnunet, 2024/02/10
- [taler-taler-ios] 27/32: don't dismiss after done, gnunet, 2024/02/10
- [taler-taler-ios] 13/32: ScrollVStack, gnunet, 2024/02/10
- [taler-taler-ios] 21/32: minimalistic, gnunet, 2024/02/10
- [taler-taler-ios] 17/32: currency formatter, gnunet, 2024/02/10
- [taler-taler-ios] 14/32: shouldReloadBalances, gnunet, 2024/02/10
- [taler-taler-ios] 26/32: more scopeInfo, gnunet, 2024/02/10
- [taler-taler-ios] 30/32: Bump version to 0.9.4 (3), gnunet, 2024/02/10
- [taler-taler-ios] 18/32: Dismiss P2P without showing details again,
gnunet <=
- [taler-taler-ios] 32/32: remove reward, gnunet, 2024/02/10
- [taler-taler-ios] 31/32: Wording, gnunet, 2024/02/10
- [taler-taler-ios] 12/32: devExperiment Refresh, gnunet, 2024/02/10
- [taler-taler-ios] 11/32: Identifiable, gnunet, 2024/02/10
- [taler-taler-ios] 28/32: RotatingTaler while waiting for tx to finish, gnunet, 2024/02/10
- [taler-taler-ios] 23/32: TransactionDetailV, gnunet, 2024/02/10
- [taler-taler-ios] 19/32: Show merchant in payment details, gnunet, 2024/02/10
- [taler-taler-ios] 15/32: githash 7 chars, gnunet, 2024/02/10
- [taler-taler-ios] 22/32: CallStack, gnunet, 2024/02/10
- [taler-taler-ios] 10/32: ScrollVStack, gnunet, 2024/02/10