[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 12/12: [wallet] DD53: transaction-list: remove “Pa
From: |
gnunet |
Subject: |
[taler-taler-android] 12/12: [wallet] DD53: transaction-list: remove “Payment to” and “Refund from” labels |
Date: |
Mon, 13 May 2024 21:22:51 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit 2824bbef631aae87fd8533168635c4489505b23a
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Mon May 13 13:02:14 2024 -0600
[wallet] DD53: transaction-list: remove “Payment to” and “Refund from”
labels
---
wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 7 ++-----
wallet/src/main/res/values/strings.xml | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 982b961..2bd204c 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -314,7 +314,7 @@ class TransactionPayment(
@Transient
override val amountType = AmountType.Negative
- override fun getTitle(context: Context) =
context.getString(R.string.transaction_payment_to, info.merchant.name)
+ override fun getTitle(context: Context) = info.merchant.name
override val generalTitleRes = R.string.payment_title
}
@@ -355,10 +355,7 @@ class TransactionRefund(
@Transient
override val amountType = AmountType.Positive
- override fun getTitle(context: Context): String {
- val merchantName = paymentInfo?.merchant?.name ?: "null"
- return context.getString(R.string.transaction_refund_from,
merchantName)
- }
+ override fun getTitle(context: Context) = paymentInfo?.merchant?.name ?:
context.getString(R.string.transaction_refund)
override val generalTitleRes = R.string.refund_title
}
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index 36c3a3b..b0fa772 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -116,13 +116,11 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="transactions_cancel_dialog_message">Are you sure you want to
cancel this withdrawal? Funds still in transit might get lost.</string>
<!-- Transactions -->
- <string name="transaction_payment_to">Payment to %1$s</string>
<string name="transaction_paid">Paid</string>
<string name="transaction_order_total">Total</string>
<string name="transaction_order">Purchase</string>
<string name="transaction_order_id">Order #%1$s</string>
<string name="transaction_refund">Refund</string>
- <string name="transaction_refund_from">Refund from %s</string>
<string name="transaction_pending">PENDING</string>
<string name="transaction_refresh">Coin expiry change fee</string>
<string name="transaction_deposit">Deposit</string>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-android] branch master updated (2b81b99 -> 2824bbe), gnunet, 2024/05/13
- [taler-taler-android] 10/12: [wallet] DD53: balance-list: remove non-breaking space from exchange scope string, gnunet, 2024/05/13
- [taler-taler-android] 02/12: [wallet] DD53: address balance-list issues, gnunet, 2024/05/13
- [taler-taler-android] 01/12: [wallet] DD53: address transaction-list issues (+UI improvements), gnunet, 2024/05/13
- [taler-taler-android] 12/12: [wallet] DD53: transaction-list: remove “Payment to” and “Refund from” labels,
gnunet <=
- [taler-taler-android] 05/12: [wallet] DD53: address cta-withdraw-done issues, gnunet, 2024/05/13
- [taler-taler-android] 06/12: [wallet] DD53: address cta-payment-paid issues, gnunet, 2024/05/13
- [taler-taler-android] 11/12: [wallet] DD53: replace occurrence of Provider with PSP, gnunet, 2024/05/13
- [taler-taler-android] 07/12: [wallet] DD53: address cta-peer-pull-initiate issues, gnunet, 2024/05/13
- [taler-taler-android] 08/12: [wallet] DD53: address cta-wire-transfer issues, gnunet, 2024/05/13
- [taler-taler-android] 04/12: [wallet] DD53: address cta-withdraw-done issues, gnunet, 2024/05/13
- [taler-taler-android] 03/12: [wallet] DD53: rename “Exchange” to “Provider” all around, gnunet, 2024/05/13
- [taler-taler-android] 09/12: [wallet] DD53: transaction-list: replace horizontal scroll with flow, gnunet, 2024/05/13