Updated on 2026-08-14

domain/visa/models/src/main/kotlin/com/tangem/domain/visa/model/TangemPayTxHistoryItem.kt

@@ -2,14 +2,38 @@ package com.tangem.domain.visa.model
 
 import org.joda.time.DateTime
 import java.math.BigDecimal
+import java.util.Currency
 
-data class TangemPayTxHistoryItem(
-    val id: String,
-    val date: DateTime?,
-    val amount: BigDecimal?,
-    val merchantName: String?,
-    val status: String?,
-    val currency: String?,
-) {
-    val timeStampInMillis: Long = date?.millis ?: 0
+sealed class TangemPayTxHistoryItem {
+    abstract val id: String
+    abstract val date: DateTime
+    abstract val amount: BigDecimal
+    abstract val currency: Currency
+
+    data class Spend(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+        val enrichedMerchantName: String?,
+        val merchantName: String,
+        val enrichedMerchantCategory: String?,
+        val merchantCategory: String,
+        val status: String,
+        val enrichedMerchantIconUrl: String?,
+    ) : TangemPayTxHistoryItem()
+
+    data class Payment(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+    ) : TangemPayTxHistoryItem()
+
+    data class Fee(
+        override val id: String,
+        override val date: DateTime,
+        override val amount: BigDecimal,
+        override val currency: Currency,
+    ) : TangemPayTxHistoryItem()
 }

domain/visa/src/main/kotlin/com/tangem/domain/pay/usecase/TangemPayIssueOrderUseCase.kt

@@ -1,10 +1,12 @@
 package com.tangem.domain.pay.usecase
 
+import arrow.core.Either
+import com.tangem.core.error.UniversalError
 import com.tangem.domain.pay.repository.OnboardingRepository
 
 class TangemPayIssueOrderUseCase(
     private val repository: OnboardingRepository,
 ) {
 
-    suspend operator fun invoke(): Unit? = repository.createOrder().getOrNull()
+    suspend operator fun invoke(): Either<UniversalError, Unit> = repository.createOrder()
 }