taler-ios

commit 8a27e5e803239b91a73ae5fc067be33bbd4b2c4b
parent 53ee8de70a0c3e0f449c9f8fe10f64cb50fa5f10
Author: Marc Stibane <marc@taler.net>
Date:   Sun, 12 Nov 2023 18:11:35 +0100

amountToTransfer Transactions

Diffstat:
M
TalerWallet1/Views/Transactions/TransactionRowView.swift
 | 
10
++++------
M
TalerWallet1/Views/Transactions/TransactionsListView.swift
 | 
20
+++++++++-----------

2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/TalerWallet1/Views/Transactions/TransactionRowView.swift b/TalerWallet1/Views/Transactions/TransactionRowView.swift
@@ -59,7 +59,7 @@ struct TransactionRowContentV: View {
 
 struct TransactionRowView: View {
     let transaction : Transaction
-    let currencyInfo: CurrencyInfo?
+    let currency: String
 
     @Environment(\.sizeCategory) var sizeCategory
     @EnvironmentObject private var controller: Controller
@@ -81,7 +81,7 @@ struct TransactionRowView: View {
         let foreColor = pending ? WalletColors().pendingColor(incoming)
                       : done ? WalletColors().transactionColor(incoming)
                              : WalletColors().incompleteColor
-//        let currencyInfo = controller.info(for: currency, controller.currencyTicker)
+        let currencyInfo = controller.info(for: currency, controller.currencyTicker)
         SingleAxisGeometryReader { width in
             Group {
                 let amountStr = amount.string(currencyInfo)
@@ -115,11 +115,9 @@ struct TransactionRow_Previews: PreviewProvider {
                                            id: "some payment ID",
                                          time: Timestamp(from: 1_666_666_000_000))
     static var previews: some View {
-        let testInfo = PreviewCurrencyInfo(TESTCURRENCY, digits: 0)
-        let demoInfo = PreviewCurrencyInfo(TESTCURRENCY, digits: 2)
         List {
-            TransactionRowView(transaction: withdrawal, currencyInfo: testInfo)
-            TransactionRowView(transaction: payment, currencyInfo: demoInfo)
+            TransactionRowView(transaction: withdrawal, currency: TESTCURRENCY)
+            TransactionRowView(transaction: payment, currency: DEMOCURRENCY)
         }
     }
 }
diff --git a/TalerWallet1/Views/Transactions/TransactionsListView.swift b/TalerWallet1/Views/Transactions/TransactionsListView.swift
@@ -11,7 +11,7 @@ struct TransactionsListView: View {
     @AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
     let navTitle: String
 
-    let currencyInfo: CurrencyInfo?
+    let currency: String
     let transactions: [Transaction]
     let showUpDown: Bool
     let reloadAllAction: (_ stack: CallStack) async -> ()
@@ -29,11 +29,10 @@ struct TransactionsListView: View {
         ScrollViewReader { scrollView in
             List {
                 TransactionsArraySliceV(symLog: symLog,
-                                      stack: stack.push(),
-                               currencyInfo: currencyInfo,
-                               transactions: transactions,
-//                          reloadAllAction: reloadAllAction,
-                            reloadOneAction: reloadOneAction)
+                                         stack: stack.push(),
+                                      currency: currency,
+                                  transactions: transactions,
+                               reloadOneAction: reloadOneAction)
             }
             .id(viewId)
             .listStyle(myListStyle.style).anyView
@@ -69,8 +68,7 @@ struct TransactionsListView: View {
         }
         .overlay {
             if transactions.isEmpty {
-                let unknown = String(localized: "Unknown currency")
-                TransactionsEmptyView(stack: stack.push(), currency: currencyInfo?.scope.currency ?? unknown)
+                TransactionsEmptyView(stack: stack.push(), currency: currency)
             }
         }
         .onAppear {
@@ -83,9 +81,8 @@ struct TransactionsListView: View {
 struct TransactionsArraySliceV: View {
     let symLog: SymLogV?
     let stack: CallStack
-    let currencyInfo: CurrencyInfo?
+    let currency: String
     let transactions: [Transaction]
-//  let reloadAllAction: (_ stack: CallStack) async -> ()
     let reloadOneAction: ((_ transactionId: String) async throws -> Transaction)
 
     @EnvironmentObject private var model: WalletModel
@@ -114,7 +111,8 @@ struct TransactionsArraySliceV: View {
                                    resumeAction: resumeAction)
                 }
             } label: {
-                TransactionRowView(transaction: transaction, currencyInfo: currencyInfo)
+                TransactionRowView(transaction: transaction,
+                                      currency: currency)
             }
             .id(Int(index))
         }