commit e2bf3278880abb07d14a85c778e00661453e56c9
parent a918f544f65e9a748c1d59d891e11426d444f528
Author: Marc Stibane <marc@taler.net>
Date: Fri, 5 Jun 2026 23:34:10 +0200
remove merchant (since it's now on top)
Diffstat:
6 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pPayURIView.swift
@@ -136,7 +136,6 @@ struct PeerPullDebitView: View {
baseURL: nil,
txStateLcl: nil,
summary: summary,
- merchant: nil,
products: nil)
}
}
diff --git a/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift b/TalerWallet1/Views/Sheets/P2P_Sheets/P2pReceiveURIView.swift
@@ -181,7 +181,6 @@ struct PeerPushCreditView: View {
baseURL: nil,
txStateLcl: nil,
summary: summary,
- merchant: nil,
products: nil)
}
}
diff --git a/TalerWallet1/Views/Sheets/Payment/PaymentView.swift b/TalerWallet1/Views/Sheets/Payment/PaymentView.swift
@@ -179,7 +179,6 @@ struct PaymentView: View, Sendable {
baseURL: baseURL,
// terms: terms,
summary: terms.summary,
- merchant: terms.merchant.name,
products: terms.products,
balanceDetails: preparePayResult.balanceDetails)
@@ -243,7 +242,6 @@ struct PaymentView2: View, Sendable {
let baseURL: String?
// let terms: MerchantContractTerms
let summary: String?
- let merchant: String?
let products: [Product]?
let balanceDetails: PayMerchantInsufficientBalanceDetails?
@@ -280,8 +278,7 @@ struct PaymentView2: View, Sendable {
incoming: false,
baseURL: baseURL,
txStateLcl: nil,
- summary: summary,
- merchant: merchant,
+ summary: nil, // summary already shown in PaymentView above choices
products: products)
// TODO: payment: popup with all possible exchanges, check fees
} else if let balanceDetails { // Insufficient
@@ -304,15 +301,13 @@ struct PaymentView2: View, Sendable {
incoming: false,
baseURL: baseURL,
txStateLcl: nil,
- summary: summary,
- merchant: merchant,
+ summary: nil, // summary already shown in PaymentView above choices
products: products)
} else {
// TODO: Error - neither effective nor balanceDetails
Text("Error")
.talerFont(.body)
}
-
}
}
// MARK: -
diff --git a/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift b/TalerWallet1/Views/Sheets/WithdrawBankIntegrated/WithdrawAcceptView.swift
@@ -94,7 +94,6 @@ struct WithdrawAcceptView: View {
baseURL: exchange2.exchangeBaseUrl,
txStateLcl: nil, // common.txState.major.localizedState
summary: nil,
- merchant: nil,
products: nil)
if let wireFee {
if !wireFee.isZero {
diff --git a/TalerWallet1/Views/Transactions/ThreeAmountsSection.swift b/TalerWallet1/Views/Transactions/ThreeAmountsSection.swift
@@ -21,7 +21,6 @@ struct ThreeAmountsSheet: View { // should be in a separate file
var feeIsNegative: Bool? // show fee with minus (or plus) sign, or no sign if nil
let large: Bool // set to false for QR or IBAN
let summary: String?
- let merchant: String?
#if DEBUG
@AppStorage("developerMode") var developerMode: Bool = true
@@ -66,7 +65,6 @@ struct ThreeAmountsSheet: View { // should be in a separate file
baseURL: baseURL,
txStateLcl: txStateLcl,
summary: summary,
- merchant: merchant,
products: nil)
}
}
@@ -113,7 +111,6 @@ struct ThreeAmountsSection: View {
let baseURL: String?
let txStateLcl: String? // localizedState
let summary: String?
- let merchant: String?
let products: [Product]?
@Environment(\.colorScheme) private var colorScheme
@@ -171,12 +168,6 @@ struct ThreeAmountsSection: View {
.padding(.bottom)
}
}
- if let merchant {
- Text(merchant)
- .talerFont(.title3)
- .lineLimit(4)
- .padding(.bottom)
- }
AmountRowV(stack: stack.push(),
title: minimalistic ? topAbbrev : topTitle,
amount: topAmount,
@@ -264,7 +255,7 @@ struct ThreeAmounts_Previews: PreviewProvider {
topTitle: "Withdrawal",
baseURL: DEMOEXCHANGE,
noFees: false,
- large: 1==0, summary: nil, merchant: nil)
+ large: 1==0, summary: nil)
.safeAreaInset(edge: .bottom) {
Button(String("Preview")) {}
.buttonStyle(TalerButtonStyle(type: .prominent))
diff --git a/TalerWallet1/Views/Transactions/TransactionSummaryList.swift b/TalerWallet1/Views/Transactions/TransactionSummaryList.swift
@@ -539,12 +539,11 @@ struct TransactionSummaryList: View {
noFees: nil, // TODO: noFees
feeIsNegative: true,
large: false,
- summary: nil,
- merchant: nil)
+ summary: nil)
}
case .deposit(let depositTransaction): Group {
if transaction.common.isPendingKYCauth {
- KYCauth(stack: stack.push(), common: transaction.common)
+ KYCauth(stack: stack.push(), common: common)
} else if transaction.isPendingKYC {
KYCbutton(kycUrl: common.kycUrl)
}
@@ -557,8 +556,7 @@ struct TransactionSummaryList: View {
noFees: nil, // TODO: noFees
feeIsNegative: false,
large: true,
- summary: nil,
- merchant: nil)
+ summary: nil)
}
case .payment(let paymentTransaction): Group {
let details = paymentTransaction.details
@@ -571,7 +569,6 @@ struct TransactionSummaryList: View {
firstScope: firstScope,
baseURL: nil,
summary: details.info?.summary,
- merchant: details.info?.merchant.name,
products: details.info?.products,
balanceDetails: nil)
@@ -586,12 +583,11 @@ struct TransactionSummaryList: View {
noFees: nil, // TODO: noFees
feeIsNegative: false,
large: true,
- summary: details.info?.summary,
- merchant: details.info?.merchant.name)
+ summary: details.info?.summary)
}
}
case .refund(let refundTransaction): Group {
- let details = refundTransaction.details // TODO: more details
+ let details = refundTransaction.details // TODO: more details, details.info?.merchant.name
ThreeAmountsSheet(stack: stack.push(),
scope: scope,
common: common,
@@ -601,8 +597,7 @@ struct TransactionSummaryList: View {
noFees: nil, // TODO: noFees
feeIsNegative: true,
large: true,
- summary: details.info?.summary,
- merchant: details.info?.merchant.name)
+ summary: details.info?.summary)
}
case .refresh(let refreshTransaction): Group {
let labelColor = WalletColors().labelColor
@@ -679,6 +674,7 @@ struct TransactionSummaryList: View {
transactionId: common.transactionId)
} else {
// TODO: isSendCoins should show QR only while not yet expired - either set timer or wallet-core should do so and send a state-changed notification
+ // TODO: details.info.summary
if pending {
if transaction.isPendingReady {
QRCodeDetails(transaction: transaction)
@@ -686,7 +682,7 @@ struct TransactionSummaryList: View {
Text("QR code and link can also be scanned or copied / shared from Transactions later.")
.multilineTextAlignment(.leading)
.talerFont(.subheadline)
- .padding(.top)
+// .padding(.top)
}
} else {
Text("This transaction is not yet ready...")
@@ -706,38 +702,35 @@ struct TransactionSummaryList: View {
noFees: nil, // TODO: noFees
feeIsNegative: true,
large: false,
- summary: details.info.summary,
- merchant: nil)
+ summary: details.info.summary)
} // else
} // p2p
case .recoup(let recoupTransaction): Group {
- let details = recoupTransaction.details
+ let details = recoupTransaction.details // TODO: details.recoupReason
ThreeAmountsSheet(stack: stack.push(),
scope: scope,
common: common,
topAbbrev: String(localized: "Recoup:", comment: "mini"),
topTitle: String(localized: "Recoup:"),
- baseURL: nil,
+ baseURL: nil, // TODO: baseURL, noFees
noFees: nil,
feeIsNegative: nil,
- large: true, // TODO: baseURL, noFees
- summary: details.recoupReason,
- merchant: nil)
+ large: true,
+ summary: details.recoupReason)
}
case .denomLoss(let denomLossTransaction): Group {
- let details = denomLossTransaction.details // TODO: more details
+ let details = denomLossTransaction.details // TODO: more details, details.lossEventType.rawValue
ThreeAmountsSheet(stack: stack.push(),
scope: scope,
common: common,
topAbbrev: String(localized: "Lost:", comment: "mini"),
topTitle: String(localized: "Money lost:"),
baseURL: details.exchangeBaseUrl,
- noFees: nil,
+ noFees: nil, // TODO: noFees
feeIsNegative: nil,
- large: true, // TODO: baseURL, noFees
- summary: details.lossEventType.rawValue,
- merchant: nil)
+ large: true,
+ summary: details.lossEventType.rawValue)
}
} // switch
} // Group
