From 0f536155181f7befd8e94c6e1fce4eb29a198694 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 28 Nov 2023 23:05:42 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/feature/swap/SwapRepositoryImpl.kt  |  2 +-
 .../feature/swap/converters/ErrorsDataConverter.kt | 14 +++++---------
 .../tangem/feature/swap/domain/models/DataError.kt |  4 +++-
 .../domain/models/data/AggregatedSwapDataModel.kt  |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
index f4e943542b..9ea783fc6b 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/SwapRepositoryImpl.kt
@@ -307,7 +307,7 @@ internal class SwapRepositoryImpl @Inject constructor(
         return if (ex is ApiResponseError.HttpException) {
             errorsDataConverter.convert(ex.errorBody ?: "")
         } else {
-            DataError.UnknownError()
+            DataError.UnknownError
         }
     }
 
diff --git a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ErrorsDataConverter.kt b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ErrorsDataConverter.kt
index db420a4033..5330219b1e 100644
--- a/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ErrorsDataConverter.kt
+++ b/features/swap/data/src/main/java/com/tangem/feature/swap/converters/ErrorsDataConverter.kt
@@ -11,13 +11,11 @@ internal class ErrorsDataConverter(
 ) : Converter<String, DataError> {
 
     @Suppress("MagicNumber")
-    override fun convert(errorBody: String): DataError {
+    override fun convert(value: String): DataError {
         try {
-            val errorResponse = jsonAdapter.fromJson(errorBody)
+            val error = jsonAdapter.fromJson(value)?.error ?: return DataError.UnknownError
 
-            val error = errorResponse?.error ?: return DataError.UnknownError()
-
-            val dataError = when (error.code) {
+            return when (error.code) {
                 2010 -> DataError.BadRequest(code = error.code)
                 2210 -> DataError.ExchangeProviderNotFoundError(code = error.code)
                 2220 -> DataError.ExchangeProviderNotActiveError(code = error.code)
@@ -41,12 +39,10 @@ internal class ErrorsDataConverter(
                     receivedFromDecimals = requireNotNull(error.value?.receivedFromDecimals),
                     expressFromDecimals = requireNotNull(error.value?.expressFromDecimals),
                 )
-                else -> DataError.UnknownError()
+                else -> DataError.UnknownError
             }
-
-            return dataError
         } catch (e: Exception) {
-            return DataError.UnknownError()
+            return DataError.UnknownError
         }
     }
 }
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt
index 8ea211009c..2c3a3e6af6 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/DataError.kt
@@ -30,5 +30,7 @@ sealed class DataError {
         val expressFromDecimals: Int,
     ) : DataError()
 
-    data class UnknownError(override val code: Int = -1) : DataError()
+    object UnknownError : DataError() {
+        override val code: Int = -1
+    }
 }
\ No newline at end of file
diff --git a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt
index 9f83feedf4..45a895181e 100644
--- a/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt
+++ b/features/swap/domain/src/main/java/com/tangem/feature/swap/domain/models/data/AggregatedSwapDataModel.kt
@@ -11,5 +11,5 @@ import com.tangem.feature.swap.domain.models.DataError
  */
 data class AggregatedSwapDataModel<T>(
     val dataModel: T?,
-    val error: DataError = DataError.UnknownError(),
+    val error: DataError = DataError.UnknownError,
 )
\ No newline at end of file