diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt index 04496bd572..30fedbe52a 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/pay/models/response/TangemPayTxHistoryResponse.kt @@ -48,7 +48,7 @@ data class TangemPayTxHistoryResponse( @Json(name = "status") val status: String, @Json(name = "declined_reason") val declinedReason: String? = null, @Json(name = "authorized_at") val authorizedAt: DateTime, - @Json(name = "posted_at") val postedAt: DateTime, + @Json(name = "posted_at") val postedAt: DateTime?, ) @JsonClass(generateAdapter = true) 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 4a01623666..defb6559b9 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 @@ -22,7 +22,8 @@ internal object TangemPayTxHistoryItemConverter : private fun convertSpend(id: String, spend: TangemPayTxHistoryResponse.Spend): TangemPayTxHistoryItem.Spend { return TangemPayTxHistoryItem.Spend( id = id, - date = spend.postedAt, + // If postedAt is null, it means transaction wasn't posted and was likely declined. Use authorizedAt + date = spend.postedAt ?: spend.authorizedAt, amount = spend.amount, currency = Currency.getInstance(spend.currency), enrichedMerchantName = spend.enrichedMerchantName,