From 93ae0d85225657657187981e5be890cf22723c9f Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 21 Feb 2023 13:26:30 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- .../tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt index 0aa75abfba..f90b73edb9 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt @@ -37,7 +37,7 @@ data class HistoryTransactionData( } ?: "" val time: String = transactionData.date?.let { - SimpleDateFormat("hh:MM").format(it.time) + SimpleDateFormat("HH:mm").format(it.time) } ?: "00:00" val date: String = calculateDate() From d7603c648e38b052239957de6bf0a5866978c1cf Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 21 Feb 2023 13:42:17 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- .../wallet/ui/wallet/saltPay/rv/HistoryItemData.kt | 12 ++++++++---- .../wallet/ui/wallet/saltPay/rv/TxHistoryAdapter.kt | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt index f90b73edb9..763f6b532e 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/HistoryItemData.kt @@ -16,7 +16,7 @@ sealed class HistoryItemData( val itemId: Long, ) { data class Date(val date: String) : HistoryItemData(0, date.hashCode().toLong()) - data class TransactionData(val data: HistoryTransactionData) : HistoryItemData(1, data.hash.hashCode().toLong()) + data class TransactionData(val data: HistoryTransactionData) : HistoryItemData(1, data.address.hashCode().toLong()) } data class HistoryTransactionData( @@ -32,9 +32,11 @@ data class HistoryTransactionData( else -> PendingTransactionType.Unknown } - val hash: String = transactionData.hash?.let { - "${it.substring(0..5)}...${it.substring(it.length - 4)}" - } ?: "" + val address: String = when (transactionType) { + PendingTransactionType.Incoming -> transactionData.sourceAddress.reduceAddress() + PendingTransactionType.Outgoing -> transactionData.destinationAddress.reduceAddress() + PendingTransactionType.Unknown -> "Unknown address" + } val time: String = transactionData.date?.let { SimpleDateFormat("HH:mm").format(it.time) @@ -71,4 +73,6 @@ data class HistoryTransactionData( return date } + + private fun String.reduceAddress(): String = "${substring(0..5)}...${substring(length - 4)}" } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/TxHistoryAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/TxHistoryAdapter.kt index 60e9d1dfd7..5ac81ac30a 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/TxHistoryAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/saltPay/rv/TxHistoryAdapter.kt @@ -96,7 +96,7 @@ private class TransactionItemVH( } private fun setupTitle(data: HistoryTransactionData) = with(binding) { - tvTxHash.text = data.hash + tvTxHash.text = data.address } private fun setupSubtitle(data: HistoryTransactionData) = with(binding) {