From a94022d0f21ca4575b8b8ee5b58e71a679faa542 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 18 May 2020 09:46:29 -0300 Subject: [wallet] upgrade to latest core and fix sorting bug --- .../src/main/java/net/taler/wallet/transactions/Transactions.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt') 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 6dc9af1..55579cc 100644 --- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt +++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt @@ -100,7 +100,7 @@ class TransactionPayment( override val icon = R.drawable.ic_cash_usd_outline override val detailPageLayout = R.layout.fragment_transaction_payment override val amountType = AmountType.Negative - override fun getTitle(context: Context) = info.merchant.name ?: info.summary + override fun getTitle(context: Context) = info.merchant.name override val generalTitleRes = R.string.payment_title } @@ -143,11 +143,7 @@ class TransactionRefund( override val detailPageLayout = R.layout.fragment_transaction_payment override val amountType = AmountType.Positive override fun getTitle(context: Context): String { - return if (info.merchant.name == null) { - context.getString(R.string.transaction_refund_for, info.summary) - } else { - context.getString(R.string.transaction_refund_from, info.merchant.name) - } + return context.getString(R.string.transaction_refund_from, info.merchant.name) } override val generalTitleRes = R.string.refund_title } -- cgit v1.2.3