[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 50/69: txStates
From: |
gnunet |
Subject: |
[taler-taler-ios] 50/69: txStates |
Date: |
Fri, 19 Jan 2024 09:02: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 d243328ba79f0b8b46017150631ac8ab5e1f2859
Author: Marc Stibane <marc@taler.net>
AuthorDate: Thu Jan 18 00:06:26 2024 +0100
txStates
---
TalerWallet1/Model/Transaction.swift | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/TalerWallet1/Model/Transaction.swift
b/TalerWallet1/Model/Transaction.swift
index 8dbf4b7..4fb492b 100644
--- a/TalerWallet1/Model/Transaction.swift
+++ b/TalerWallet1/Model/Transaction.swift
@@ -68,7 +68,7 @@ enum TransactionMinorState: String, Codable {
case .autoRefund: return self.rawValue
case .user: return self.rawValue
case .bank: return self.rawValue
- case .exchange: return self.rawValue
+ case .exchange: return self.rawValue // in
aborted
case .claimProposal: return self.rawValue
case .checkRefund: return self.rawValue
case .createPurse: return self.rawValue
@@ -77,7 +77,7 @@ enum TransactionMinorState: String, Codable {
case .merge: return self.rawValue
case .repurchase: return self.rawValue
case .bankRegisterReserve: return self.rawValue
- case .bankConfirmTransfer: return String(localized:
"MinorState.bankConfirmTransfer", defaultValue: "Waiting for bank", comment:
"TxMinorState heading")
+ case .bankConfirmTransfer: return String(localized:
"MinorState.bankConfirmTransfer", defaultValue: "Waiting for bank transfer",
comment: "TxMinorState heading")
case .withdrawCoins: return self.rawValue
case .exchangeWaitReserve: return self.rawValue
case .abortingBank: return self.rawValue
@@ -263,7 +263,7 @@ struct TransactionCommon: Decodable, Sendable {
do {
return try Amount.diff(amountEffective, amountRaw)
} catch {}
- return Amount(currency: amountRaw.currencyStr, integer: 0, fraction: 0)
+ return Amount.zero(currency: amountRaw.currencyStr)
}
func incoming() -> Bool {
@@ -494,8 +494,8 @@ enum Transaction: Decodable, Hashable, Identifiable,
Sendable {
var isP2pIncoming: Bool { isSendInvoice || isRcvCoins}
var isPending : Bool { common.txState.major == .pending }
- var isPendingReady : Bool { common.txState.minor == .ready }
- var isPendingKYC : Bool { common.txState.minor == .kyc }
+ var isPendingReady : Bool { isPending && common.txState.minor == .ready }
+ var isPendingKYC : Bool { isPending && common.txState.minor == .kyc }
var isDone : Bool { common.txState.major == .done }
var isAborting : Bool { common.txState.major == .aborting }
var isAborted : Bool { common.txState.major == .aborted }
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 18/69: ToS for P2P, (continued)
- [taler-taler-ios] 18/69: ToS for P2P, gnunet, 2024/01/19
- [taler-taler-ios] 29/69: clearDb (instead of reset), gnunet, 2024/01/19
- [taler-taler-ios] 27/69: use minor for Status, gnunet, 2024/01/19
- [taler-taler-ios] 14/69: remove Apple Sounds, gnunet, 2024/01/19
- [taler-taler-ios] 21/69: TransactionDone popToRootView, gnunet, 2024/01/19
- [taler-taler-ios] 09/69: API 2:0:1, gnunet, 2024/01/19
- [taler-taler-ios] 15/69: hapticFeedback, gnunet, 2024/01/19
- [taler-taler-ios] 08/69: fixes, gnunet, 2024/01/19
- [taler-taler-ios] 11/69: Landscape, gnunet, 2024/01/19
- [taler-taler-ios] 17/69: Summary in ThreeAmountsV, gnunet, 2024/01/19
- [taler-taler-ios] 50/69: txStates,
gnunet <=
- [taler-taler-ios] 24/69: dbg+cleanup, gnunet, 2024/01/19
- [taler-taler-ios] 13/69: definitions, gnunet, 2024/01/19
- [taler-taler-ios] 23/69: aborting Notification, gnunet, 2024/01/19
- [taler-taler-ios] 28/69: AccountRestriction, gnunet, 2024/01/19
- [taler-taler-ios] 60/69: P2P Expiration Timestamp, gnunet, 2024/01/19
- [taler-taler-ios] 26/69: Layout transactions, gnunet, 2024/01/19
- [taler-taler-ios] 51/69: cleanup, gnunet, 2024/01/19
- [taler-taler-ios] 67/69: Bump version to 0.9.4 (0), gnunet, 2024/01/19
- [taler-taler-ios] 68/69: lowercased(), gnunet, 2024/01/19
- [taler-taler-ios] 54/69: Keyboard needs more time, gnunet, 2024/01/19