[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 08/11: Cleanup
From: |
gnunet |
Subject: |
[taler-taler-ios] 08/11: Cleanup |
Date: |
Tue, 24 Oct 2023 22:45:24 +0200 |
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 e937aac39f15f6453563b3109613540e0d7a4977
Author: Marc Stibane <marc@taler.net>
AuthorDate: Tue Oct 24 21:30:27 2023 +0200
Cleanup
---
TalerWallet1/Model/WalletModel.swift | 3 +--
TalerWallet1/Views/Peer2peer/SendDone.swift | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/TalerWallet1/Model/WalletModel.swift
b/TalerWallet1/Model/WalletModel.swift
index 993a67c..1133ef7 100644
--- a/TalerWallet1/Model/WalletModel.swift
+++ b/TalerWallet1/Model/WalletModel.swift
@@ -20,10 +20,9 @@ struct HTTPError: Codable, Hashable {
var stack: String?
}
// MARK: -
-/// The "virtual" base class for all models
+/// Communicate with wallet-core
class WalletModel: ObservableObject {
public static let shared = WalletModel()
- static func className() -> String {"\(self)"}
let logger = Logger(subsystem: "net.taler.gnu", category: "WalletModel")
let semaphore = AsyncSemaphore(value: 1)
var cachedBalances: [Balance]? = nil
diff --git a/TalerWallet1/Views/Peer2peer/SendDone.swift
b/TalerWallet1/Views/Peer2peer/SendDone.swift
index 5cfe04d..5d09df6 100644
--- a/TalerWallet1/Views/Peer2peer/SendDone.swift
+++ b/TalerWallet1/Views/Peer2peer/SendDone.swift
@@ -50,13 +50,12 @@ struct SendDone: View {
resumeAction: nil)
.navigationBarBackButtonHidden(true)
.interactiveDismissDisabled() // can only use "Done"
button to dismiss
- .navigationTitle(navTitle)
} else {
WithdrawProgressView(message: "Loading...")
- .navigationTitle(navTitle)
}
}
//
.background(WalletColors().backgroundColor.edgesIgnoringSafeArea(.all))
+ .navigationTitle(navTitle)
.task {
symLog.log(".task")
do {
@@ -69,6 +68,7 @@ struct SendDone: View {
purse_expiration: timestamp)
// TODO: user might choose baseURL
let response = try await model.initiatePeerPushDebitM(nil,
terms: terms)
+ // will switch from WithdrawProgressView to
TransactionDetailView
transactionId = response.transactionId
} else if let amountToReceive {
let terms = PeerContractTerms(amount: amountToReceive,
@@ -76,6 +76,7 @@ struct SendDone: View {
purse_expiration: timestamp)
// TODO: user might choose baseURL
let response = try await
model.initiatePeerPullCreditM(nil, terms: terms)
+ // will switch from WithdrawProgressView to
TransactionDetailView
transactionId = response.transactionId
} else { fatalError() }
} catch { // TODO: error
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (a0c6bdb -> bf7f8e3), gnunet, 2023/10/24
- [taler-taler-ios] 01/11: Assets cleanup, gnunet, 2023/10/24
- [taler-taler-ios] 02/11: Native Logging for wallet-core (QuickJS), gnunet, 2023/10/24
- [taler-taler-ios] 03/11: Logger, gnunet, 2023/10/24
- [taler-taler-ios] 05/11: Only call DetailsForAmount if non-zero, gnunet, 2023/10/24
- [taler-taler-ios] 10/11: CharacterSet+contains, gnunet, 2023/10/24
- [taler-taler-ios] 11/11: Layout for Pending - wip, gnunet, 2023/10/24
- [taler-taler-ios] 04/11: ExchangeRowView, gnunet, 2023/10/24
- [taler-taler-ios] 08/11: Cleanup,
gnunet <=
- [taler-taler-ios] 09/11: DD51 - CurrencySpecification, gnunet, 2023/10/24
- [taler-taler-ios] 07/11: intValue, fracValue, valueAsTuple, gnunet, 2023/10/24
- [taler-taler-ios] 06/11: Fix for NavigationView popping back, gnunet, 2023/10/24