diff options
| author | Marc Stibane <marc@taler.net> | 2023-10-24 21:30:27 +0200 |
|---|---|---|
| committer | Marc Stibane <marc@taler.net> | 2023-10-24 21:30:27 +0200 |
| commit | e937aac39f15f6453563b3109613540e0d7a4977 (patch) | |
| tree | 70ba626e3cdfbe16494627f76dda25ced6099938 | |
| parent | 1bb30945a8af10d8331aae719a4f452d36b5d251 (diff) | |
| download | taler-ios-e937aac39f15f6453563b3109613540e0d7a4977.tar.gz taler-ios-e937aac39f15f6453563b3109613540e0d7a4977.tar.bz2 taler-ios-e937aac39f15f6453563b3109613540e0d7a4977.zip | |
Cleanup
| -rw-r--r-- | TalerWallet1/Model/WalletModel.swift | 3 | ||||
| -rw-r--r-- | 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 |