From e78794533d2e7c6fec9f054de8a76319ddb3e1e4 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 11 Jul 2025 21:00:30 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../api/onramp/models/response/OnrampQuoteResponse.kt    | 4 ++--
 .../com/tangem/data/onramp/DefaultOnrampRepository.kt    | 9 ++++++---
 .../kotlin/com/tangem/domain/onramp/model/OnrampQuote.kt | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
index 46ca99bbb6..ec0d6eb2c7 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/api/onramp/models/response/OnrampQuoteResponse.kt
@@ -33,10 +33,10 @@ data class OnrampQuoteResponse(
     val providerId: String,
 
     @Json(name = "minFromAmount")
-    val minFromAmount: String,
+    val minFromAmount: String?,
 
     @Json(name = "maxFromAmount")
-    val maxFromAmount: String,
+    val maxFromAmount: String?,
 
     @Json(name = "minToAmount")
     val minToAmount: String?,
diff --git a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
index 8b279d736b..64fd63a63a 100644
--- a/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
+++ b/data/onramp/src/main/java/com/tangem/data/onramp/DefaultOnrampRepository.kt
@@ -52,7 +52,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.withContext
 import org.joda.time.DateTime
 import timber.log.Timber
@@ -303,8 +302,12 @@ internal class DefaultOnrampRepository(
                                     OnrampQuote.Data(
                                         fromAmount = fromOnrampAmount,
                                         toAmount = convertToAmount(response.toAmount, cryptoCurrency),
-                                        minFromAmount = convertToAmount(response.minFromAmount, cryptoCurrency),
-                                        maxFromAmount = convertToAmount(response.maxFromAmount, cryptoCurrency),
+                                        minFromAmount = response.minFromAmount?.let {
+                                            convertToAmount(it, cryptoCurrency)
+                                        },
+                                        maxFromAmount = response.maxFromAmount?.let {
+                                            convertToAmount(it, cryptoCurrency)
+                                        },
                                         paymentMethod = paymentMethod,
                                         provider = provider,
                                         countryCode = response.countryCode,
diff --git a/domain/onramp/models/src/main/kotlin/com/tangem/domain/onramp/model/OnrampQuote.kt b/domain/onramp/models/src/main/kotlin/com/tangem/domain/onramp/model/OnrampQuote.kt
index dde5f19064..59a0ddefa4 100644
--- a/domain/onramp/models/src/main/kotlin/com/tangem/domain/onramp/model/OnrampQuote.kt
+++ b/domain/onramp/models/src/main/kotlin/com/tangem/domain/onramp/model/OnrampQuote.kt
@@ -15,8 +15,8 @@ sealed class OnrampQuote {
         override val fromAmount: OnrampAmount,
         override val countryCode: String,
         val toAmount: OnrampAmount,
-        val minFromAmount: OnrampAmount,
-        val maxFromAmount: OnrampAmount,
+        val minFromAmount: OnrampAmount?,
+        val maxFromAmount: OnrampAmount?,
     ) : OnrampQuote()
 
     data class AmountError(