[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 38/54: actions
From: |
gnunet |
Subject: |
[taler-taler-ios] 38/54: actions |
Date: |
Fri, 30 Jun 2023 22:34:10 +0200 |
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 e68c03adb34dfb8f844a839d8c24373012947a28
Author: Marc Stibane <marc@taler.net>
AuthorDate: Wed Jun 28 17:59:01 2023 +0200
actions
---
.../Views/Balances/BalancesSectionView.swift | 27 +++-------------------
.../Views/Transactions/TransactionsListView.swift | 25 +++++++-------------
2 files changed, 11 insertions(+), 41 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift
b/TalerWallet1/Views/Balances/BalancesSectionView.swift
index 29f32e3..d6f01df 100644
--- a/TalerWallet1/Views/Balances/BalancesSectionView.swift
+++ b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -30,7 +30,6 @@ struct BalancesSectionView: View {
@State private var pendingTransactions: [Transaction] = []
@State private var uncompletedTransactions: [Transaction] = []
-// func dummyTransaction (_ transactionId: String) async throws {}
func reloadOneAction(_ transactionId: String) async throws -> Transaction {
return try await model.getTransactionByIdT(transactionId)
}
@@ -80,11 +79,6 @@ struct BalancesSectionView: View {
uncompletedTransactions =
WalletModel.uncompletedTransactions(transactions)
// sectionID = UUID()
}
- let abortAction = model.abortTransaction
- let deleteAction = model.deleteTransaction // dummyTransaction
- let failAction = model.failTransaction
- let suspendAction = model.suspendTransaction // dummyTransaction
- let resumeAction = model.resumeTransaction
Section {
// if "KUDOS" == currency && !balance.available.isZero {
@@ -110,12 +104,7 @@ struct BalancesSectionView: View {
TransactionsListView(navTitle: String(localized:
"Transactions"), currency: currency,
transactions: completedTransactions,
reloadAllAction: reloadCompleted,
- reloadOneAction: reloadOneAction,
- abortAction: abortAction,
- deleteAction: deleteAction,
- failAction: failAction,
- suspendAction: suspendAction,
- resumeAction: resumeAction)
+ reloadOneAction: reloadOneAction)
}, tag: 3, selection: $buttonSelected
) { EmptyView() }.frame(width: 0).opacity(0).hidden()
@@ -140,12 +129,7 @@ struct BalancesSectionView: View {
TransactionsListView(navTitle: String(localized:
"Pending"), currency: currency,
transactions: pendingTransactions,
reloadAllAction: reloadPending,
- reloadOneAction: reloadOneAction,
- abortAction: abortAction,
- deleteAction: deleteAction,
- failAction: failAction,
- suspendAction: suspendAction,
- resumeAction: resumeAction)
+ reloadOneAction: reloadOneAction)
}
} label: {
VStack(spacing: 6) {
@@ -172,12 +156,7 @@ struct BalancesSectionView: View {
TransactionsListView(navTitle: String(localized:
"Uncompleted"), currency: currency,
transactions:
uncompletedTransactions,
reloadAllAction: reloadUncompleted,
- reloadOneAction: reloadOneAction,
- abortAction: abortAction,
- deleteAction: deleteAction,
- failAction: failAction,
- suspendAction: suspendAction,
- resumeAction: resumeAction)
+ reloadOneAction: reloadOneAction)
}
} label: {
UncompletedRowView(uncompletedTransactions:
$uncompletedTransactions)
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift
b/TalerWallet1/Views/Transactions/TransactionsListView.swift
index 014a3a0..2ae882e 100644
--- a/TalerWallet1/Views/Transactions/TransactionsListView.swift
+++ b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -14,11 +14,6 @@ struct TransactionsListView: View {
let transactions: [Transaction]
let reloadAllAction: () async -> ()
let reloadOneAction: ((_ transactionId: String) async throws ->
Transaction)
- let abortAction: (_ transactionId: String) async throws -> ()
- let deleteAction: (_ transactionId: String) async throws -> ()
- let failAction: (_ transactionId: String) async throws -> ()
- let suspendAction: (_ transactionId: String) async throws -> ()
- let resumeAction: (_ transactionId: String) async throws -> ()
var body: some View {
#if DEBUG
@@ -34,12 +29,7 @@ struct TransactionsListView: View {
transactions: transactions,
myListStyle: $myListStyle,
reloadAllAction: reloadAllAction,
- reloadOneAction: reloadOneAction,
- abortAction: abortAction,
- deleteAction: deleteAction,
- failAction: failAction,
- suspendAction: suspendAction,
- resumeAction: resumeAction)
+ reloadOneAction: reloadOneAction)
.navigationTitle(title)
.navigationBarTitleDisplayMode(.large) // .inline
.onAppear {
@@ -60,11 +50,8 @@ extension TransactionsListView {
@Binding var myListStyle: MyListStyle
let reloadAllAction: () async -> ()
let reloadOneAction: ((_ transactionId: String) async throws ->
Transaction)
- let abortAction: (_ transactionId: String) async throws -> ()
- let deleteAction: (_ transactionId: String) async throws -> ()
- let failAction: (_ transactionId: String) async throws -> ()
- let suspendAction: (_ transactionId: String) async throws -> ()
- let resumeAction: (_ transactionId: String) async throws -> ()
+
+ @EnvironmentObject private var model: WalletModel
@State private var upAction: () -> Void = {}
@State private var downAction: () -> Void = {}
@@ -97,7 +84,11 @@ extension TransactionsListView {
let _ = Self._printChanges()
let _ = symLog?.vlog() // just to get the # to compare it
with .onAppear & onDisappear
#endif
-
+ let abortAction = model.abortTransaction
+ let deleteAction = model.deleteTransaction
+ let failAction = model.failTransaction
+ let suspendAction = model.suspendTransaction
+ let resumeAction = model.resumeTransaction
ScrollViewReader { scrollView in
List {
ForEach(Array(zip(transactions.indices, transactions)),
id: \.1) { index, transaction in
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 06/54: Notifications, (continued)
- [taler-taler-ios] 06/54: Notifications, gnunet, 2023/06/30
- [taler-taler-ios] 42/54: BalanceRow, gnunet, 2023/06/30
- [taler-taler-ios] 15/54: Suspend-Resume, gnunet, 2023/06/30
- [taler-taler-ios] 21/54: Sounds, P2P receive, gnunet, 2023/06/30
- [taler-taler-ios] 07/54: Big Model update, removed unneccessary thread-safety code, gnunet, 2023/06/30
- [taler-taler-ios] 41/54: playSound, gnunet, 2023/06/30
- [taler-taler-ios] 30/54: bugfix, gnunet, 2023/06/30
- [taler-taler-ios] 43/54: confirmTransferUrl, gnunet, 2023/06/30
- [taler-taler-ios] 33/54: log only release builds, gnunet, 2023/06/30
- [taler-taler-ios] 27/54: Logging, gnunet, 2023/06/30
- [taler-taler-ios] 38/54: actions,
gnunet <=
- [taler-taler-ios] 28/54: playSound, gnunet, 2023/06/30
- [taler-taler-ios] 32/54: Adjust DebugView for Notch, gnunet, 2023/06/30
- [taler-taler-ios] 20/54: viewID + comments, gnunet, 2023/06/30
- [taler-taler-ios] 31/54: bump Testflight version, gnunet, 2023/06/30
- [taler-taler-ios] 37/54: Decodable, gnunet, 2023/06/30
- [taler-taler-ios] 29/54: Model cleanup, gnunet, 2023/06/30
- [taler-taler-ios] 36/54: playSound, gnunet, 2023/06/30
- [taler-taler-ios] 44/54: BalanceReloaded, gnunet, 2023/06/30
- [taler-taler-ios] 35/54: developerMode, gnunet, 2023/06/30
- [taler-taler-ios] 45/54: TransactionDetails, gnunet, 2023/06/30