taler-ios

commit 467894526a0479cca5b8e31f43dd657ce4c8d0b9
parent 648d8734025887a0a884ad34c2cad8e6b78dbd86
Author: Marc Stibane <marc@taler.net>
Date:   Mon,  3 Jul 2023 06:30:44 +0200

don't show Up+Down for pending and uncompleted

Diffstat:
M
TalerWallet1/Views/Balances/BalancesSectionView.swift
 | 
3
+++
M
TalerWallet1/Views/Transactions/TransactionsListView.swift
 | 
18
+++++++++++++-----

2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Views/Balances/BalancesSectionView.swift b/TalerWallet1/Views/Balances/BalancesSectionView.swift
@@ -103,6 +103,7 @@ struct BalancesSectionView: View {
                 NavigationLink(destination: LazyView {
                     TransactionsListView(navTitle: String(localized: "Transactions"), currency: currency,
                                      transactions: completedTransactions,
+                                       showUpDown: true,
                                   reloadAllAction: reloadCompleted,
                                   reloadOneAction: reloadOneAction)
                   }, tag: 3, selection: $buttonSelected
@@ -125,6 +126,7 @@ struct BalancesSectionView: View {
                     LazyView {
                         TransactionsListView(navTitle: String(localized: "Pending"), currency: currency,
                                          transactions: pendingTransactions,
+                                           showUpDown: false,
                                       reloadAllAction: reloadPending,
                                       reloadOneAction: reloadOneAction)
                     }
@@ -152,6 +154,7 @@ struct BalancesSectionView: View {
                     LazyView {
                         TransactionsListView(navTitle: String(localized: "Uncompleted"), currency: currency,
                                              transactions: uncompletedTransactions,
+                                               showUpDown: false,
                                           reloadAllAction: reloadUncompleted,
                                           reloadOneAction: reloadOneAction)
                     }
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -12,6 +12,7 @@ struct TransactionsListView: View {
 
     let currency: String
     let transactions: [Transaction]
+    let showUpDown: Bool
     let reloadAllAction: () async -> ()
     let reloadOneAction: ((_ transactionId: String) async throws -> Transaction)
 
@@ -27,6 +28,7 @@ struct TransactionsListView: View {
         Content(symLog: symLog,
               currency: currency,
           transactions: transactions,
+            showUpDown: showUpDown,
            myListStyle: $myListStyle,
        reloadAllAction: reloadAllAction,
        reloadOneAction: reloadOneAction)
@@ -48,6 +50,7 @@ extension TransactionsListView {
         let symLog: SymLogV?
         let currency: String
         let transactions: [Transaction]
+        let showUpDown: Bool
         @Binding var myListStyle: MyListStyle
         let reloadAllAction: () async -> ()
         let reloadOneAction: ((_ transactionId: String) async throws -> Transaction)
@@ -114,9 +117,11 @@ extension TransactionsListView {
                 }.id(viewId)
                 .listStyle(myListStyle.style).anyView
                 .onAppear {
-                    upAction = { withAnimation { scrollView.scrollTo(0) }}
-                    downAction = { withAnimation { scrollView.scrollTo(transactions.count - 1) }}
-                    downAction()
+                    if showUpDown {
+                        upAction = { withAnimation { scrollView.scrollTo(0) }}
+                        downAction = { withAnimation { scrollView.scrollTo(transactions.count - 1) }}
+                        downAction()
+                    }
                 }
                 .overlay {
                     if transactions.isEmpty {
@@ -125,8 +130,11 @@ extension TransactionsListView {
                 }
             }
             .navigationBarItems(trailing: HStack {
-                ArrowUpButton(action: upAction)
-                ArrowDownButton(action: downAction)
+                EmptyView()
+                if showUpDown {
+                    ArrowUpButton(action: upAction)
+                    ArrowDownButton(action: downAction)
+                }
             })
         }
     }