[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] branch master updated (6db5bc4 -> adfc919)
From: |
gnunet |
Subject: |
[taler-taler-ios] branch master updated (6db5bc4 -> adfc919) |
Date: |
Mon, 16 Oct 2023 23:07:09 +0200 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a change to branch master
in repository taler-ios.
from 6db5bc4 Build Instructions
new 95af8af sort: descending
new adfc919 disable some debug output
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
TalerWallet1/Model/Model+Transactions.swift | 12 +++++++-----
TalerWallet1/Views/Balances/BalanceRowView.swift | 2 +-
TalerWallet1/Views/Balances/BalancesListView.swift | 2 +-
TalerWallet1/Views/Sheets/QRSheet.swift | 4 ++--
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/TalerWallet1/Model/Model+Transactions.swift
b/TalerWallet1/Model/Model+Transactions.swift
index f3fb35b..5865ea3 100644
--- a/TalerWallet1/Model/Model+Transactions.swift
+++ b/TalerWallet1/Model/Model+Transactions.swift
@@ -37,13 +37,15 @@ extension WalletModel {
fileprivate struct GetTransactions: WalletBackendFormattedRequest {
func operation() -> String { return "getTransactions" }
// func operation() -> String { return "testingGetSampleTransactions" }
- func args() -> Args { return Args(currency: currency, search: search) }
+ func args() -> Args { return Args(currency: currency, search: search,
sort: sort) }
var currency: String?
var search: String?
+ var sort: String?
struct Args: Encodable {
var currency: String?
var search: String?
+ var sort: String?
}
struct Response: Decodable { // list of transactions
@@ -108,10 +110,10 @@ struct ResumeTransaction: WalletBackendFormattedRequest {
// MARK: -
extension WalletModel {
/// ask wallet-core for its list of transactions filtered by searchString
- func transactionsT(_ stack: CallStack, currency: String? = nil,
searchString: String? = nil)
+ func transactionsT(_ stack: CallStack, currency: String? = nil,
searchString: String? = nil, sort: String = "descending")
async -> [Transaction] { // might
be called from a background thread itself
do {
- let request = GetTransactions(currency: currency, search:
searchString)
+ let request = GetTransactions(currency: currency, search:
searchString, sort: sort)
let response = try await sendRequest(request, ASYNCDELAY)
return response.transactions
} catch {
@@ -119,9 +121,9 @@ extension WalletModel {
}
}
/// fetch transactions from Wallet-Core. No networking involved
- @MainActor func transactionsMA(_ stack: CallStack, currency: String? =
nil, searchString: String? = nil)
+ @MainActor func transactionsMA(_ stack: CallStack, currency: String? =
nil, searchString: String? = nil, sort: String = "descending")
async -> [Transaction] { // M for MainActor
- return await transactionsT(stack.push(), currency: currency,
searchString: searchString)
+ return await transactionsT(stack.push(), currency: currency,
searchString: searchString, sort: sort)
}
/// abort the specified transaction from Wallet-Core. No networking
involved
diff --git a/TalerWallet1/Views/Balances/BalanceRowView.swift
b/TalerWallet1/Views/Balances/BalanceRowView.swift
index 129ea3d..6a35992 100644
--- a/TalerWallet1/Views/Balances/BalanceRowView.swift
+++ b/TalerWallet1/Views/Balances/BalanceRowView.swift
@@ -97,7 +97,7 @@ struct BalanceRowView: View {
let twoRowButtons = TwoRowButtons(sendTitle: sendTitle,
recvTitle: requestTitle,
lineLimit: 5, sendDisabled:
amount.isZero,
sendAction: sendAction,
recvAction: recvAction)
- let _ = print("Screenwidth: \(UIScreen.screenWidth) Geometry: \(width)
\(sizeCategory): \(sizeCategory)")
+// let _ = print("Screenwidth: \(UIScreen.screenWidth) Geometry: \(width)
\(sizeCategory): \(sizeCategory)")
if Self.needVStack(titles, width: width, spacing: SPACING) {
VStack { twoRowButtons }
} else {
diff --git a/TalerWallet1/Views/Balances/BalancesListView.swift
b/TalerWallet1/Views/Balances/BalancesListView.swift
index 8ccad0c..2ab8f93 100644
--- a/TalerWallet1/Views/Balances/BalancesListView.swift
+++ b/TalerWallet1/Views/Balances/BalancesListView.swift
@@ -9,7 +9,7 @@ import AVFoundation
/// This view shows the list of balances / currencies, each in its own section
struct BalancesListView: View {
- private let symLog = SymLogV()
+ private let symLog = SymLogV(0)
let stack: CallStack
let navTitle: String
@Binding var balances: [Balance]
diff --git a/TalerWallet1/Views/Sheets/QRSheet.swift
b/TalerWallet1/Views/Sheets/QRSheet.swift
index 315c60b..17cf9f2 100644
--- a/TalerWallet1/Views/Sheets/QRSheet.swift
+++ b/TalerWallet1/Views/Sheets/QRSheet.swift
@@ -15,14 +15,14 @@ struct QRSheet: View {
var body: some View {
Group {
if scannedCode != nil {
- let _ = print(scannedCode as Any) // TODO: logging
+// let _ = print(scannedCode as Any) // TODO: logging
if let scannedURL = URL(string: scannedCode!) {
let scheme = scannedURL.scheme
if scheme == "taler" {
URLSheet(stack: stack.push(), urlToOpen: scannedURL)
} else {
- let _ = print(scannedURL) // TODO: logging
+// let _ = print(scannedURL) // TODO: logging
ErrorView(errortext: scannedURL.absoluteString)
}
} else {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (6db5bc4 -> adfc919),
gnunet <=