commit e5627c53f4607ac5e56fda71809e0e8ff4dc9f82
parent 867d6db010c8296404c6a90dd95f04eada061b9c
Author: Marc Stibane <marc@taler.net>
Date: Mon, 29 Jun 2026 18:42:41 +0200
cleanup
Diffstat:
6 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/TalerWallet1/Model/Model+Deposit.swift b/TalerWallet1/Model/Model+Deposit.swift
@@ -106,7 +106,8 @@ extension WalletModel {
// MARK: - Deposit
struct WireTypeDetails: Codable {
let paymentTargetType: PaytoType
- let talerBankHostnames: [String]
+ let preferredEntryType: String? // iban / bban TODO: use this
+ let talerBankHostnames: [String]?
}
struct DepositWireTypesResponse: Codable {
@@ -237,6 +238,7 @@ struct BankAccountsInfo: Decodable, Hashable {
var bankAccountId: String
var paytoUri: String
var kycCompleted: Bool
+ var currencies: [String]? // Currencies supported by the bank, if known
var label: String?
var payToWorkAround: String {
let payto = PayTo(paytoUri)
diff --git a/TalerWallet1/Model/Model+Payment.swift b/TalerWallet1/Model/Model+Payment.swift
@@ -273,17 +273,6 @@ enum PreparePayResultType: String, Codable {
case choiceSelection = "choice-selection"
}
-struct PayMerchantInsufficientBalanceDetails: Codable {
- let amountRequested: Amount
- let balanceAvailable: Amount
- let balanceMaterial: Amount
- let balanceAgeAcceptable: Amount
- let balanceReceiverAcceptable: Amount
- let balanceReceiverDepositable: Amount
- let perExchange: [String:ExchangeFeeGapEstimate]
- let causeHint: InsufficientBalanceHint
-}
-
struct ExchangeFeeGapEstimate: Codable {
let balanceAvailable: Amount
let balanceMaterial: Amount
diff --git a/TalerWallet1/Model/Model+Withdraw.swift b/TalerWallet1/Model/Model+Withdraw.swift
@@ -29,6 +29,7 @@ extension AccountRestriction: Identifiable {
enum TransferType: String, Codable {
case payto
case chQrBill = "ch-qr-bill"
+ case uri
}
struct QrCodeSpec: Codable, Hashable {
@@ -38,6 +39,7 @@ struct QrCodeSpec: Codable, Hashable {
struct TransferOption: Codable, Hashable {
var type: TransferType
+ var uri: String? // only if type == uri
var paytoUri: String? // only if type == payto
var qrReferenceNumber: String?
var qrCodes: [QrCodeSpec]?
diff --git a/TalerWallet1/Model/Transaction.swift b/TalerWallet1/Model/Transaction.swift
@@ -436,7 +436,7 @@ struct WithdrawalDetails: Decodable {
var bankConfirmationUrl: String?
}
struct WithdrawalTransactionDetails: Decodable {
- var exchangeBaseUrl: String
+ var exchangeBaseUrl: String?
var withdrawalDetails: WithdrawalDetails
}
struct WithdrawalTransaction : Sendable {
@@ -490,10 +490,7 @@ struct PaymentTransaction : Sendable {
// MARK: - Refund
struct RefundTransactionDetails: Decodable {
var refundedTransactionId: String
- var refundPending: Amount?
- /// The amount that couldn't be applied because refund permissions expired.
- var amountInvalid: Amount?
- var info: OrderShortInfo? // TODO: is this still here?
+ var paymentInfo: OrderShortInfo?
}
struct RefundTransaction : Sendable {
var common: TransactionCommon
@@ -510,6 +507,7 @@ enum RefreshReason: String, Decodable {
case abortPay = "abort-pay"
case abortDeposit = "abort-deposit"
case abortPeerPushDebit = "abort-peer-push-debit"
+ case abortPeerPullDebit = "abort-peer-pull-debit"
case recoup
case backupRestored = "backup-restored"
case scheduled
@@ -534,6 +532,8 @@ enum RefreshReason: String, Decodable {
comment: "RefreshReason")
case .abortPeerPushDebit: return String(localized: "Abort Sending",
comment: "RefreshReason")
+ case .abortPeerPullDebit: return String(localized: "Abort Requesting",
+ comment: "RefreshReason")
case .recoup: return String(localized: "Recoup",
comment: "RefreshReason")
case .backupRestored: return String(localized: "Backup restored",
@@ -773,7 +773,7 @@ enum TalerTransaction: Decodable, Hashable, Identifiable, Sendable {
case .payment(let paymentTransaction):
result["summary"] = paymentTransaction.details.info?.summary ?? EMPTYSTRING
case .refund(let refundTransaction):
- if let info = refundTransaction.details.info {
+ if let info = refundTransaction.details.paymentInfo {
result["summary"] = info.summary
}
case .refresh(let refreshTransaction):
diff --git a/TalerWallet1/Model/WalletModel.swift b/TalerWallet1/Model/WalletModel.swift
@@ -61,11 +61,11 @@ struct InsufficientBalanceDetailsPerExchange: Codable, Hashable {
var balanceMaterial: Amount
var balanceExchangeDepositable: Amount
var balanceAgeAcceptable: Amount
- var balanceReceiverAcceptable: Amount
+ var balanceReceiverAcceptable: Amount? // deprecated
var balanceReceiverDepositable: Amount
var maxEffectiveSpendAmount: Amount
/// Exchange doesn't have global fees configured for the relevant year, p2p payments aren't possible.
- var missingGlobalFees: Bool
+ var missingGlobalFees: Bool? // deprecated
}
/// Detailed reason for why the wallet's balance is insufficient.
diff --git a/TalerWallet1/Views/Transactions/TransactionTypeDetail.swift b/TalerWallet1/Views/Transactions/TransactionTypeDetail.swift
@@ -132,7 +132,7 @@ struct TransactionTypeDetail: View {
noFees: nil, // TODO: noFees
feeIsNegative: true,
large: true,
- summary: details.info?.summary)
+ summary: details.paymentInfo?.summary)
}
case .refresh(let refreshTransaction): Group {
let labelColor = WalletColors().labelColor
