From e5d93deb3b50dfd1219fdf06e244b811e8297034 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 4 Dec 2025 16:18:17 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../TangemPayTxHistoryDetailsConverter.kt             | 11 ++++++-----
 .../transformers/TangemPayTxHistoryItemsConverter.kt  | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverter.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverter.kt
index 53447b8304..1779a301cf 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverter.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryDetailsConverter.kt
@@ -51,7 +51,7 @@ internal object TangemPayTxHistoryDetailsConverter :
 
     private fun TangemPayTxHistoryItem.extractIcon(): ImageReference {
         return when (this) {
-            is TangemPayTxHistoryItem.Collateral -> ImageReference.Res(R.drawable.ic_arrow_down_24)
+            is TangemPayTxHistoryItem.Collateral -> ImageReference.Res(R.drawable.ic_arrow_up_24)
             is TangemPayTxHistoryItem.Fee -> ImageReference.Res(R.drawable.ic_percent_24)
             is TangemPayTxHistoryItem.Payment -> ImageReference.Res(R.drawable.ic_arrow_up_24)
             is TangemPayTxHistoryItem.Spend -> {
@@ -69,7 +69,7 @@ internal object TangemPayTxHistoryDetailsConverter :
         return when (this) {
             is TangemPayTxHistoryItem.Spend -> stringReference(this.enrichedMerchantName ?: this.merchantName)
             is TangemPayTxHistoryItem.Payment -> resourceReference(R.string.tangem_pay_withdrawal)
-            is TangemPayTxHistoryItem.Collateral -> resourceReference(R.string.tangem_pay_deposit)
+            is TangemPayTxHistoryItem.Collateral -> resourceReference(R.string.tangem_pay_withdrawal)
             is TangemPayTxHistoryItem.Fee -> {
                 this.description?.let(::stringReference) ?: resourceReference(R.string.tangem_pay_fee_title)
             }
@@ -113,13 +113,14 @@ internal object TangemPayTxHistoryDetailsConverter :
                 amountPrefix + amount
             }
             is TangemPayTxHistoryItem.Collateral -> {
-                val amount = this.amount.format {
+                val amountPrefix = if (this.amount.isZero()) "" else StringsSigns.MINUS
+                val amount = this.amount.abs().format {
                     fiat(
                         fiatCurrencyCode = this@extractAmount.currency.currencyCode,
                         fiatCurrencySymbol = this@extractAmount.currency.symbol,
                     )
                 }
-                StringsSigns.PLUS + amount
+                amountPrefix + amount
             }
         }
     }
@@ -130,7 +131,7 @@ internal object TangemPayTxHistoryDetailsConverter :
             is TangemPayTxHistoryItem.Spend,
             is TangemPayTxHistoryItem.Payment,
             -> themedColor { TangemTheme.colors.text.primary1 }
-            is TangemPayTxHistoryItem.Collateral -> themedColor { TangemTheme.colors.text.accent }
+            is TangemPayTxHistoryItem.Collateral -> themedColor { TangemTheme.colors.text.primary1 }
         }
     }
 
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt
index a8aed0ae0b..bfd3c3cb0d 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayTxHistoryItemsConverter.kt
@@ -96,18 +96,18 @@ internal class TangemPayTxHistoryItemsConverter(
     private fun convertCollateral(
         collateral: TangemPayTxHistoryItem.Collateral,
     ): TangemPayTransactionState.Content.Collateral {
-        val amountPrefix = if (collateral.amount.isZero()) "" else StringsSigns.PLUS
-        val amount = amountPrefix + collateral.amount.format {
+        val amountPrefix = if (collateral.amount.isZero()) "" else StringsSigns.MINUS
+        val amount = amountPrefix + collateral.amount.abs().format {
             fiat(fiatCurrencyCode = collateral.currency.currencyCode, fiatCurrencySymbol = collateral.currency.symbol)
         }
         return TangemPayTransactionState.Content.Collateral(
             id = collateral.id,
             onClick = { txHistoryUiActions.onTransactionClick(collateral) },
             amount = amount,
-            amountColor = themedColor { TangemTheme.colors.text.accent },
-            title = resourceReference(R.string.tangem_pay_deposit),
+            amountColor = themedColor { TangemTheme.colors.text.primary1 },
+            title = resourceReference(R.string.tangem_pay_withdrawal),
             subtitle = resourceReference(R.string.common_transfer),
-            icon = ImageReference.Res(R.drawable.ic_arrow_down_24),
+            icon = ImageReference.Res(R.drawable.ic_arrow_up_24),
             time = DateTimeFormatters.formatDate(collateral.date, DateTimeFormatters.timeFormatter),
         )
     }