diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-05-13 13:02:14 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-05-13 13:04:17 -0600 |
commit | 2824bbef631aae87fd8533168635c4489505b23a (patch) | |
tree | 87723c14d81d206baf15ffae7b51d90cc1afeee4 | |
parent | 695cf8ed2040c396498c612d7ffcde3a4c06581e (diff) | |
download | taler-android-dev/ivan-avalos/dd53.tar.gz taler-android-dev/ivan-avalos/dd53.tar.bz2 taler-android-dev/ivan-avalos/dd53.zip |
[wallet] DD53: transaction-list: remove “Payment to” and “Refund from” labelsdev/ivan-avalos/dd53
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt | 7 | ||||
-rw-r--r-- | 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> |