diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
index adb05dd819..7767ac6d66 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletLoadingTxHistoryConverter.kt
@@ -32,7 +32,7 @@ internal class WalletLoadingTxHistoryConverter(
 
     private val txHistoryItemConverter by lazy {
         val blockchain = currentCardTypeResolverProvider().getBlockchain()
-        WalletTxHistoryTransactionStateConverter(
+        WalletPendingTxToTransactionStateConverter(
             symbol = blockchain.currency,
             decimals = blockchain.decimals(),
             clickIntents = clickIntents,
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletPendingTxToTransactionStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletPendingTxToTransactionStateConverter.kt
new file mode 100644
index 0000000000..a3d2cfa92e
--- /dev/null
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletPendingTxToTransactionStateConverter.kt
@@ -0,0 +1,109 @@
+package com.tangem.feature.wallet.presentation.wallet.state.factory.txhistory
+
+import com.tangem.core.ui.components.transactions.state.TransactionState
+import com.tangem.core.ui.extensions.TextReference
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.core.ui.utils.DateTimeFormatters
+import com.tangem.domain.txhistory.models.TxHistoryItem
+import com.tangem.feature.wallet.impl.R
+import com.tangem.feature.wallet.presentation.wallet.viewmodels.WalletClickIntents
+import com.tangem.utils.converter.Converter
+import com.tangem.utils.toBriefAddressFormat
+import com.tangem.utils.toFormattedCurrencyString
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+
+// FIXME: Refactoring needed
+/** Same as [WalletTxHistoryTransactionStateConverter] but with other timestamp format */
+internal class WalletPendingTxToTransactionStateConverter(
+    private val symbol: String,
+    private val decimals: Int,
+    private val clickIntents: WalletClickIntents,
+) : Converter<TxHistoryItem, TransactionState> {
+
+    override fun convert(value: TxHistoryItem): TransactionState {
+        return createTransactionStateItem(item = value)
+    }
+
+    private fun createTransactionStateItem(item: TxHistoryItem): TransactionState {
+        return TransactionState.Content(
+            txHash = item.txHash,
+            amount = item.getAmount(),
+            timestamp = item.timestampInMillis.toTimeFormat(),
+            status = item.status.tiUiStatus(),
+            direction = item.extractDirection(),
+            iconRes = item.extractIcon(),
+            title = item.extractTitle(),
+            subtitle = item.extractSubtitle(),
+            onClick = { clickIntents.onTransactionClick(item.txHash) },
+        )
+    }
+
+    private fun TxHistoryItem.extractIcon(): Int = if (status == TxHistoryItem.TransactionStatus.Failed) {
+        R.drawable.ic_close_24
+    } else {
+        when (type) {
+            is TxHistoryItem.TransactionType.Approve -> R.drawable.ic_doc_24
+            is TxHistoryItem.TransactionType.Operation,
+            is TxHistoryItem.TransactionType.Swap,
+            is TxHistoryItem.TransactionType.Transfer,
+            is TxHistoryItem.TransactionType.UnknownOperation,
+            -> if (isOutgoing) R.drawable.ic_arrow_up_24 else R.drawable.ic_arrow_down_24
+        }
+    }
+
+    private fun TxHistoryItem.extractTitle(): TextReference = when (val type = type) {
+        is TxHistoryItem.TransactionType.Approve -> resourceReference(R.string.common_approval)
+        is TxHistoryItem.TransactionType.Operation -> stringReference(type.name)
+        is TxHistoryItem.TransactionType.Swap -> resourceReference(R.string.common_swap)
+        is TxHistoryItem.TransactionType.Transfer -> resourceReference(R.string.common_transfer)
+        is TxHistoryItem.TransactionType.UnknownOperation -> resourceReference(R.string.transaction_history_operation)
+    }
+
+    private fun TxHistoryItem.extractSubtitle(): TextReference =
+        when (val interactionAddress = interactionAddressType) {
+            is TxHistoryItem.InteractionAddressType.Contract -> resourceReference(
+                id = R.string.transaction_history_contract_address,
+                formatArgs = wrappedList(interactionAddress.address.toBriefAddressFormat()),
+            )
+            is TxHistoryItem.InteractionAddressType.Multiple -> resourceReference(
+                id = if (isOutgoing) {
+                    R.string.transaction_history_transaction_to_address
+                } else {
+                    R.string.transaction_history_transaction_from_address
+                },
+                formatArgs = wrappedList(resourceReference(R.string.transaction_history_multiple_addresses)),
+            )
+            is TxHistoryItem.InteractionAddressType.User -> resourceReference(
+                id = if (isOutgoing) {
+                    R.string.transaction_history_transaction_to_address
+                } else {
+                    R.string.transaction_history_transaction_from_address
+                },
+                formatArgs = wrappedList(interactionAddress.address.toBriefAddressFormat()),
+            )
+        }
+
+    private fun TxHistoryItem.TransactionStatus.tiUiStatus() = when (this) {
+        TxHistoryItem.TransactionStatus.Confirmed -> TransactionState.Content.Status.Confirmed
+        TxHistoryItem.TransactionStatus.Failed -> TransactionState.Content.Status.Failed
+        TxHistoryItem.TransactionStatus.Unconfirmed -> TransactionState.Content.Status.Unconfirmed
+    }
+
+    private fun Long.toTimeFormat(): String {
+        return DateTimeFormatters.formatTime(time = DateTime(this, DateTimeZone.getDefault()))
+    }
+
+    private fun TxHistoryItem.extractDirection() =
+        if (isOutgoing) TransactionState.Content.Direction.OUTGOING else TransactionState.Content.Direction.INCOMING
+
+    private fun TxHistoryItem.getAmount(): String {
+        val prefix = when (status) {
+            TxHistoryItem.TransactionStatus.Failed -> ""
+            else -> if (isOutgoing) "-" else "+"
+        }
+        return prefix + amount.toFormattedCurrencyString(currency = symbol, decimals = decimals)
+    }
+}
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt
index 31621a3785..a7b4c8efa5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/factory/txhistory/WalletTxHistoryTransactionStateConverter.kt
@@ -12,6 +12,8 @@ import com.tangem.utils.converter.Converter
 import com.tangem.utils.toBriefAddressFormat
 import com.tangem.utils.toFormattedCurrencyString
 
+// FIXME: Refactoring needed
+/** Same as [WalletPendingTxToTransactionStateConverter] but with other timestamp format */
 internal class WalletTxHistoryTransactionStateConverter(
     private val symbol: String,
     private val decimals: Int,