diff --git a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt
index d2d0b4e176..a25181a85b 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/visa/utils/TangemPayTxHistoryItemConverter.kt
@@ -33,10 +33,15 @@ internal class TangemPayTxHistoryItemConverter(moshi: Moshi) :
     }
 
     private fun convertSpend(id: String, spend: TangemPayTxHistoryResponse.Spend): TangemPayTxHistoryItem.Spend {
+        val rawDate = if (spend.amount.signum() < 0) {
+            spend.postedAt ?: spend.authorizedAt
+        } else {
+            spend.authorizedAt
+        }
         return TangemPayTxHistoryItem.Spend(
             id = id,
             jsonRepresentation = spendAdapter.toJson(spend),
-            date = spend.authorizedAt.withLocalZone(),
+            date = rawDate.withLocalZone(),
             amount = spend.amount,
             currency = Currency.getInstance(spend.currency),
             authorizedAmount = spend.authorizedAmount.orZero(),
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt
index d4fc29fe56..e905428e64 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/utils/TangemPayTxHistoryUiManager.kt
@@ -10,7 +10,6 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
-import java.util.UUID
 
 internal class TangemPayTxHistoryUiManager(
     private val state: MutableStateFlow<TangemPayTxHistoryState>,
@@ -41,30 +40,30 @@ internal class TangemPayTxHistoryUiManager(
         val currentUiBatches = state.value.uiBatches
         val batches = if (clearUiBatches) mutableListOf() else currentUiBatches.toMutableList()
 
-        var previousLastDate: String? = null
+        val rebucketed = rebucketByDate(newCurrencyBatches)
 
-        for ((key, data) in newCurrencyBatches) {
+        for ((key, data) in rebucketed) {
             // Find if batch with same key exists
             val existingBatchIndex = batches.indexOfFirst { it.key == key }
             val shouldUpdateExisting = existingBatchIndex != -1 &&
-                currentUiBatches[existingBatchIndex].data.transactionItemsSizeNotEqual(data)
+                currentUiBatches[existingBatchIndex].data.transactionItemsDiffer(data)
 
-            // Get last date of previous batch's data
-            if (key > 0) {
-                val prevBatch = newCurrencyBatches.find { it.key == key - 1 }
-                previousLastDate = prevBatch?.data?.lastOrNull()?.date?.millis?.toDateFormatWithTodayYesterday()
+            // Last date of previous batch's data, used to dedupe group title at the seam
+            val previousLastDate = if (key > 0) {
+                rebucketed.find { it.key == key - 1 }
+                    ?.data?.lastOrNull()?.date?.millis?.toDateFormatWithTodayYesterday()
             } else {
-                previousLastDate = null
+                null
             }
 
-            // Case 1: Update existing batch if sizes differ
+            // Case 1: Update existing batch if contents differ
             if (shouldUpdateExisting) {
                 val items = generateUiItems(key, data, previousLastDate)
                 batches[existingBatchIndex] = Batch(key = key, data = items)
                 continue
             }
 
-            // Case 2: Skip if batch exists and has same size
+            // Case 2: Skip if batch exists and has same contents
             if (existingBatchIndex != -1) {
                 continue
             }
@@ -77,6 +76,22 @@ internal class TangemPayTxHistoryUiManager(
         return batches
     }
 
+    private fun rebucketByDate(
+        batches: List<Batch<Int, List<TangemPayTxHistoryItem>>>,
+    ): List<Batch<Int, List<TangemPayTxHistoryItem>>> {
+        val sortedItems = batches.asSequence()
+            .flatMap { it.data.asSequence() }
+            .sortedByDescending { it.date.millis }
+            .toList()
+
+        var offset = 0
+        return batches.map { (key, data) ->
+            val chunk = sortedItems.subList(offset, offset + data.size)
+            offset += data.size
+            Batch(key = key, data = chunk)
+        }
+    }
+
     private fun generateUiItems(
         key: Int,
         data: List<TangemPayTxHistoryItem>,
@@ -100,7 +115,7 @@ internal class TangemPayTxHistoryUiManager(
                 items.add(
                     TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(
                         title = firstDate,
-                        itemKey = UUID.randomUUID().toString(),
+                        itemKey = "title-$firstDate",
                     ),
                 )
             }
@@ -117,7 +132,7 @@ internal class TangemPayTxHistoryUiManager(
                     items.add(
                         TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.GroupTitle(
                             title = nextDate,
-                            itemKey = UUID.randomUUID().toString(),
+                            itemKey = "title-$nextDate",
                         ),
                     )
                 }
@@ -130,9 +145,14 @@ internal class TangemPayTxHistoryUiManager(
         return items
     }
 
-    private fun List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>.transactionItemsSizeNotEqual(
+    private fun List<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM>.transactionItemsDiffer(
         txInfos: List<TangemPayTxHistoryItem>,
     ): Boolean {
-        return this.filterIsInstance<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction>().size != txInfos.size
+        val existingIds = this
+            .asSequence()
+            .filterIsInstance<TangemPayTxHistoryUM.TangemPayTxHistoryItemUM.Transaction>()
+            .map { it.transaction.id }
+            .toList()
+        return existingIds != txInfos.map { it.id }
     }
 }
\ No newline at end of file