From 2a5a05fe83a1c134223b73baf9efc7924fdaba0a Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 17 Jun 2026 11:58:06 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../express/models/response/ExchangeItemResponse.kt | 3 +++ .../api/onramp/models/response/OnrampItemResponse.kt | 3 +++ .../local/converter/ExpressHistoryConverter.kt | 4 ++-- .../local/converter/ExpressHistoryConverterTest.kt | 12 ++++++++---- .../repository/ExpressHistoryRepositoryTest.kt | 6 ++++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeItemResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeItemResponse.kt index 7c5d86f608..06fb8713a8 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeItemResponse.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/express/models/response/ExchangeItemResponse.kt @@ -79,8 +79,11 @@ data class ExchangeItemResponse( val createdAt: String, /** Transaction last-update timestamp in ISO-8601 format */ + // todo txHistory uncomment +/* @Json(name = "updatedAt") val updatedAt: String, +*/ /** Pay-in expiration timestamp in ISO-8601 format */ @Json(name = "payTill") diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampItemResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampItemResponse.kt index fa5767bf7b..b9337deaf8 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampItemResponse.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampItemResponse.kt @@ -44,8 +44,11 @@ data class OnrampItemResponse( val createdAt: String, /** Transaction last-update timestamp in ISO-8601 format */ + // todo txHistory uncomment +/* @Json(name = "updatedAt") val updatedAt: String, +*/ // endregion // region fromAsset (fiat) info diff --git a/core/datasource/src/main/java/com/tangem/datasource/local/converter/ExpressHistoryConverter.kt b/core/datasource/src/main/java/com/tangem/datasource/local/converter/ExpressHistoryConverter.kt index 2718464884..e9189cd377 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/local/converter/ExpressHistoryConverter.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/local/converter/ExpressHistoryConverter.kt @@ -30,7 +30,7 @@ fun ExchangeItemResponse.toEntity(ownerAddress: String): ExpressExchangeEntity { refundNetwork = refundNetwork, refundContractAddress = refundContractAddress, createdAt = createdAt, - updatedAt = updatedAt, + updatedAt = ""/*updatedAt*/, // todo txHistory uncomment payTill = payTill, averageDuration = averageDuration, from = ExpressExchangeEntity.AssetEmbedded( @@ -62,7 +62,7 @@ fun OnrampItemResponse.toEntity(ownerAddress: String): ExpressOnrampEntity { externalTxUrl = externalTxUrl, payoutHash = payoutHash, createdAt = createdAt, - updatedAt = updatedAt, + updatedAt = ""/*updatedAt*/, // todo txHistory uncomment, fromCurrencyCode = fromCurrencyCode, fromAmount = fromAmount, fromPrecision = fromPrecision, diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/local/converter/ExpressHistoryConverterTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/local/converter/ExpressHistoryConverterTest.kt index 6fd3ee0094..ca1c5656cd 100644 --- a/core/datasource/src/test/kotlin/com/tangem/datasource/local/converter/ExpressHistoryConverterTest.kt +++ b/core/datasource/src/test/kotlin/com/tangem/datasource/local/converter/ExpressHistoryConverterTest.kt @@ -35,7 +35,8 @@ internal class ExpressHistoryConverterTest { Truth.assertThat(entity.refundNetwork).isEqualTo(item.refundNetwork) Truth.assertThat(entity.refundContractAddress).isEqualTo(item.refundContractAddress) Truth.assertThat(entity.createdAt).isEqualTo(item.createdAt) - Truth.assertThat(entity.updatedAt).isEqualTo(item.updatedAt) + // todo txHistory uncomment + // Truth.assertThat(entity.updatedAt).isEqualTo(item.updatedAt) Truth.assertThat(entity.payTill).isEqualTo(item.payTill) Truth.assertThat(entity.averageDuration).isEqualTo(item.averageDuration) } @@ -129,7 +130,8 @@ internal class ExpressHistoryConverterTest { Truth.assertThat(entity.externalTxUrl).isEqualTo(item.externalTxUrl) Truth.assertThat(entity.payoutHash).isEqualTo(item.payoutHash) Truth.assertThat(entity.createdAt).isEqualTo(item.createdAt) - Truth.assertThat(entity.updatedAt).isEqualTo(item.updatedAt) + // todo txHistory uncomment + // Truth.assertThat(entity.updatedAt).isEqualTo(item.updatedAt) Truth.assertThat(entity.fromCurrencyCode).isEqualTo(item.fromCurrencyCode) Truth.assertThat(entity.fromAmount).isEqualTo(item.fromAmount) Truth.assertThat(entity.fromPrecision).isEqualTo(item.fromPrecision) @@ -221,7 +223,8 @@ internal class ExpressHistoryConverterTest { refundNetwork = refundNetwork, refundContractAddress = refundContractAddress, createdAt = "2026-06-01T00:00:00Z", - updatedAt = "2026-06-01T00:05:00Z", + // todo txHistory uncomment + // updatedAt = "2026-06-01T00:05:00Z", payTill = payTill, averageDuration = averageDuration, fromContractAddress = "0xfromContract", @@ -253,7 +256,8 @@ internal class ExpressHistoryConverterTest { externalTxUrl = externalTxUrl, payoutHash = payoutHash, createdAt = "2026-06-01T00:00:00Z", - updatedAt = "2026-06-01T00:05:00Z", + // todo txHistory uncomment + // updatedAt = "2026-06-01T00:05:00Z", fromCurrencyCode = "USD", fromAmount = "100.0", fromPrecision = 2, diff --git a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/ExpressHistoryRepositoryTest.kt b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/ExpressHistoryRepositoryTest.kt index 061d953409..0484e956ea 100644 --- a/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/ExpressHistoryRepositoryTest.kt +++ b/data/txhistory/src/test/kotlin/com/tangem/data/txhistory/repository/ExpressHistoryRepositoryTest.kt @@ -313,7 +313,8 @@ internal class ExpressHistoryRepositoryTest { refundNetwork = null, refundContractAddress = null, createdAt = "2026-06-01T00:00:00Z", - updatedAt = "2026-06-01T00:05:00Z", + // todo txHistory uncomment + // updatedAt = "2026-06-01T00:05:00Z", payTill = null, averageDuration = null, fromContractAddress = "0xfromContract", @@ -337,7 +338,8 @@ internal class ExpressHistoryRepositoryTest { externalTxUrl = null, payoutHash = "payout-hash", createdAt = "2026-06-01T00:00:00Z", - updatedAt = "2026-06-01T00:05:00Z", + // todo txHistory uncomment + // updatedAt = "2026-06-01T00:05:00Z", fromCurrencyCode = "USD", fromAmount = "100.0", fromPrecision = 2,