[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 18/36: amountToTransfer Transactions
From: |
gnunet |
Subject: |
[taler-taler-ios] 18/36: amountToTransfer Transactions |
Date: |
Mon, 13 Nov 2023 21:27:23 +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 8a27e5e803239b91a73ae5fc067be33bbd4b2c4b
Author: Marc Stibane <marc@taler.net>
AuthorDate: Sun Nov 12 18:11:35 2023 +0100
amountToTransfer Transactions
---
.../Views/Transactions/TransactionRowView.swift | 10 ++++------
.../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
index 165fa06..e3d71ab 100644
--- 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
index 84cad1e..cce00e6 100644
--- 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))
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 23/36: amountToTransfer Exchange, (continued)
- [taler-taler-ios] 23/36: amountToTransfer Exchange, gnunet, 2023/11/13
- [taler-taler-ios] 14/36: Debugging: Delay currency info, gnunet, 2023/11/13
- [taler-taler-ios] 27/36: Debugging, gnunet, 2023/11/13
- [taler-taler-ios] 30/36: Bugfix, gnunet, 2023/11/13
- [taler-taler-ios] 12/36: DD51 Currency rendering, gnunet, 2023/11/13
- [taler-taler-ios] 24/36: Exchange needs Balance for Deposit, gnunet, 2023/11/13
- [taler-taler-ios] 21/36: amountToTransfer Send, gnunet, 2023/11/13
- [taler-taler-ios] 07/36: Amount(currency:cent:), gnunet, 2023/11/13
- [taler-taler-ios] 06/36: RequestPurpose, gnunet, 2023/11/13
- [taler-taler-ios] 01/36: Startup Chime, gnunet, 2023/11/13
- [taler-taler-ios] 18/36: amountToTransfer Transactions,
gnunet <=
- [taler-taler-ios] 17/36: amountToTransfer Balances, gnunet, 2023/11/13
- [taler-taler-ios] 09/36: cleanup, zero, gnunet, 2023/11/13
- [taler-taler-ios] 29/36: less logging, gnunet, 2023/11/13
- [taler-taler-ios] 13/36: once at very first startup, gnunet, 2023/11/13
- [taler-taler-ios] 15/36: About with explicit link to taler.net, gnunet, 2023/11/13
- [taler-taler-ios] 28/36: Cleanup property wrappers, gnunet, 2023/11/13
- [taler-taler-ios] 22/36: amountToTransfer ManualWithdraw, gnunet, 2023/11/13
- [taler-taler-ios] 33/36: Announce shouldn't change screen, gnunet, 2023/11/13
- [taler-taler-ios] 34/36: Previews, gnunet, 2023/11/13
- [taler-taler-ios] 32/36: Shortcuts (50,25,10,5), gnunet, 2023/11/13