[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 03/10: tip -> reward
From: |
gnunet |
Subject: |
[taler-taler-ios] 03/10: tip -> reward |
Date: |
Tue, 08 Aug 2023 12:29:22 +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 9ba37a156cacc4bf14e68e1dbb31f16cd171127e
Author: Marc Stibane <marc@taler.net>
AuthorDate: Tue Aug 8 12:08:02 2023 +0200
tip -> reward
---
TalerWallet1/Backend/Transaction.swift | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/TalerWallet1/Backend/Transaction.swift
b/TalerWallet1/Backend/Transaction.swift
index 128a47a..ffbdd38 100644
--- a/TalerWallet1/Backend/Transaction.swift
+++ b/TalerWallet1/Backend/Transaction.swift
@@ -119,7 +119,7 @@ enum TransactionType: String, Codable {
case payment
case refund
case refresh
- case reward = "tip" // TODO: reward // get paid for
e.g. survey participation
+ case reward // get paid for e.g. survey
participation
// case tip // tip personnel at restaurants
case peerPushDebit = "peer-push-debit" // send coins to peer, show QR
case scanPushCredit = "peer-push-credit" // scan QR, receive coins from
peer
@@ -132,7 +132,6 @@ enum TransactionType: String, Codable {
var isRefund : Bool { self == .refund }
var isRefresh : Bool { self == .refresh }
var isReward : Bool { self == .reward }
- // var isTipPayment : Bool { self == .tip }
var isSendCoins : Bool { self == .peerPushDebit }
var isRcvCoins : Bool { self == .scanPushCredit }
var isSendInvoice: Bool { self == .peerPullCredit }
@@ -266,16 +265,6 @@ struct RewardTransaction {
var details: RewardTransactionDetails
}
-//struct TipTransactionDetails: Decodable {
-// /// The exchange that the tip will be withdrawn from
-// var exchangeBaseUrl: String
-//}
-
-//struct TipTransaction {
-// var common: TransactionCommon
-// var details: TipTransactionDetails
-//}
-
enum RefreshReason: String, Decodable {
case manual
case payMerchant = "pay-merchant"
@@ -327,7 +316,6 @@ enum Transaction: Decodable, Hashable, Identifiable {
case payment (PaymentTransaction)
case refund (RefundTransaction)
case reward (RewardTransaction)
-// case tip (TipTransaction)
case refresh (RefreshTransaction)
case peer2peer (P2PTransaction)
@@ -347,9 +335,6 @@ enum Transaction: Decodable, Hashable, Identifiable {
case .reward:
let details = try RewardTransactionDetails.init(from:
decoder)
self = .reward(RewardTransaction(common: common, details:
details))
-// case .tip:
-// let details = try TipTransactionDetails.init(from:
decoder)
-// self = .tip(TipTransaction(common: common, details:
details))
case .refresh:
let details = try RefreshTransactionDetails.init(from:
decoder)
self = .refresh(RefreshTransaction(common: common,
details: details))
@@ -405,7 +390,6 @@ enum Transaction: Decodable, Hashable, Identifiable {
var isRefund : Bool { common.type == .refund }
var isRefresh : Bool { common.type == .refresh }
var isReward : Bool { common.type == .reward }
-// var isTipPayment : Bool { common.type == .tip }
var isSendCoins : Bool { common.type == .peerPushDebit }
var isRcvCoins : Bool { common.type == .scanPushCredit }
var isSendInvoice: Bool { common.type == .peerPullCredit }
@@ -452,8 +436,6 @@ enum Transaction: Decodable, Hashable, Identifiable {
return refundTransaction.common
case .reward(let rewardTransaction):
return rewardTransaction.common
-// case .tip(let tipTransaction):
-// return tipTransaction.common
case .refresh(let refreshTransaction):
return refreshTransaction.common
case .peer2peer(let p2pTransaction):
@@ -476,8 +458,6 @@ enum Transaction: Decodable, Hashable, Identifiable {
}
case .reward(let rewardTransaction):
result[EXCHANGEBASEURL] =
rewardTransaction.details.exchangeBaseUrl
-// case .tip(let tipTransaction):
-// result[EXCHANGEBASEURL] =
tipTransaction.details.exchangeBaseUrl
case .refresh(let refreshTransaction):
result["reason"] =
refreshTransaction.details.refreshReason.rawValue
case .peer2peer(let p2pTransaction):
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] branch master updated (dbf44d6 -> 7792241), gnunet, 2023/08/08
- [taler-taler-ios] 03/10: tip -> reward,
gnunet <=
- [taler-taler-ios] 07/10: Wallet changes + bugfixes, gnunet, 2023/08/08
- [taler-taler-ios] 01/10: PaymentView, gnunet, 2023/08/08
- [taler-taler-ios] 10/10: iOS: bump version to 0.9.3 (17), gnunet, 2023/08/08
- [taler-taler-ios] 05/10: SuperScriptDigits, gnunet, 2023/08/08
- [taler-taler-ios] 04/10: Payment Sounds by carlo von lynX, gnunet, 2023/08/08
- [taler-taler-ios] 02/10: started with PayTemplates, gnunet, 2023/08/08
- [taler-taler-ios] 09/10: Usability improved for manual withdrawal + P2P, gnunet, 2023/08/08
- [taler-taler-ios] 08/10: NavigationLinksView, gnunet, 2023/08/08
- [taler-taler-ios] 06/10: GetScopedCurrencyInfo, gnunet, 2023/08/08