taler-ios

commit 86d2740c9e48719cf03646bc48156b98a62079b6
parent 61d87f9cddd3c4ba47159cf2aced9504f89633da
Author: Marc Stibane <marc@taler.net>
Date:   Thu, 25 Jul 2024 14:08:10 +0200

Pass in currencyInfo

Diffstat:
M
TalerWallet1/Views/Overview/OverviewSectionV.swift
 | 
21
+++++++++++++--------
M
TalerWallet1/Views/Transactions/TransactionsListView.swift
 | 
8
++++++--

2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/TalerWallet1/Views/Overview/OverviewSectionV.swift b/TalerWallet1/Views/Overview/OverviewSectionV.swift
@@ -80,6 +80,7 @@ extension OverviewSectionV: View {
             }
             CurrenciesNavigationLinksV(symLog: symLog,
                                          stack: stack.push(),
+                                  currencyInfo: currencyInfo,
                                        balance: balance,
                               amountToTransfer: $amountToTransfer,      // does still have the wrong currency
                                        summary: $summary,
@@ -122,6 +123,7 @@ extension OverviewSectionV: View {
                 let threeTransactions = Array(slice)
                 TransactionsArraySliceV(symLog: symLog,
                                          stack: stack.push(),
+                                  currencyInfo: currencyInfo,
                                      scopeInfo: scopeInfo,
                                   transactions: threeTransactions,
                                reloadOneAction: reloadOneAction)
@@ -142,6 +144,7 @@ extension OverviewSectionV: View {
 fileprivate struct CurrenciesNavigationLinksV: View {
     let symLog: SymLogV?
     let stack: CallStack
+    let currencyInfo: CurrencyInfo
     let balance: Balance
     
 //    let sectionCount: Int
@@ -175,6 +178,7 @@ fileprivate struct CurrenciesNavigationLinksV: View {
         HStack(spacing: 0) {
             let balanceDest = LazyView {
                 TransactionsListView(stack: stack.push(),
+                              currencyInfo: currencyInfo,
                                   navTitle: String(localized: "Transactions", comment: "ViewTitle of TransactionList"),
                                  scopeInfo: scopeInfo,
                               transactions: completedTransactions,
@@ -185,14 +189,15 @@ fileprivate struct CurrenciesNavigationLinksV: View {
                 { EmptyView() }.frame(width: 0).opacity(0).hidden()           // TransactionsListView
 
             OverviewRowV(stack: stack.push(),
-                          amount: balance.available,
-                      sendAction: {
-                            selectAndUpdate(1)      // trigger SendAmount NavigationLink
-                   }, recvAction: {
-                            selectAndUpdate(2)      // trigger RequestPayment NavigationLink
-                    }, rowAction: {
-                            buttonSelected = 3      // trigger TransactionList NavigationLink
-                  }, balanceDest: balanceDest)
+                  currencyInfo: currencyInfo,
+                        amount: balance.available,
+                    sendAction: {
+                        selectAndUpdate(1)      // trigger SendAmount NavigationLink
+                 }, recvAction: {
+                        selectAndUpdate(2)      // trigger RequestPayment NavigationLink
+                  }, rowAction: {
+                        buttonSelected = 3      // trigger TransactionList NavigationLink
+                }, balanceDest: balanceDest)
         }
     }
 }
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -16,7 +16,7 @@ fileprivate let showUpDown = 25     // show up+down buttons in the menubar if li
 struct TransactionsListView: View {
     private let symLog = SymLogV(0)
     let stack: CallStack
-    @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
+    let currencyInfo: CurrencyInfo
     let navTitle: String
 
     let scopeInfo: ScopeInfo
@@ -24,6 +24,7 @@ struct TransactionsListView: View {
     let reloadAllAction: (_ stack: CallStack) async -> ()
     let reloadOneAction: ((_ transactionId: String, _ viewHandles: Bool) async throws -> Transaction)
 
+    @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
     @State private var viewId = UUID()
 
     var body: some View {
@@ -36,6 +37,7 @@ struct TransactionsListView: View {
             List {
                 TransactionsArraySliceV(symLog: symLog,
                                          stack: stack.push(),
+                                  currencyInfo: currencyInfo,
                                      scopeInfo: scopeInfo,
                                   transactions: transactions,
                                reloadOneAction: reloadOneAction)
@@ -83,6 +85,7 @@ struct TransactionsListView: View {
 struct TransactionsArraySliceV: View {
     let symLog: SymLogV?
     let stack: CallStack
+    let currencyInfo: CurrencyInfo
     let scopeInfo: ScopeInfo
     let transactions: [Transaction]
     let reloadOneAction: ((_ transactionId: String, _ viewHandles: Bool) async throws -> Transaction)
@@ -102,6 +105,7 @@ struct TransactionsArraySliceV: View {
             NavigationLink {
                 LazyView {
                     TransactionSummaryV(stack: stack.push(),
+                                 currencyInfo: currencyInfo,
                                   transactionId: transaction.id,
                                    reloadAction: reloadOneAction,
                                        navTitle: nil,
@@ -113,7 +117,7 @@ struct TransactionsArraySliceV: View {
                                    resumeAction: resumeAction)
                 }
             } label: {
-                TransactionRowView(transaction: transaction)
+                TransactionRowView(currencyInfo: currencyInfo, transaction: transaction)
             }
             .id(Int(index))
         }