From b086411860daa8e5e03e934c3594852c6e255fc8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 26 May 2025 16:12:03 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/entity/factory/amount/OnrampAmountStateFactory.kt    | 2 +-
 .../features/onramp/paymentmethod/ui/PaymentMethodIcon.kt     | 3 +--
 .../onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
index cf04d7b7e8..f94e973358 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/amount/OnrampAmountStateFactory.kt
@@ -116,7 +116,7 @@ internal class OnrampAmountStateFactory(
             ),
         )
 
-        val bestProvider = selectedQuote as? OnrampQuote.Data
+        val bestProvider = quotes.firstOrNull()
         val isMultipleQuotes = !quotes.isSingleItem()
         val isOtherQuotesHasData = quotes
             .filter { it.paymentMethod == selectedQuote.paymentMethod }
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/PaymentMethodIcon.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/PaymentMethodIcon.kt
index 5f2290e4a5..af5efaae8a 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/PaymentMethodIcon.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/PaymentMethodIcon.kt
@@ -9,7 +9,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
-import com.tangem.core.ui.res.TangemColorPalette
 import com.tangem.core.ui.res.TangemTheme
 
 @Composable
@@ -18,7 +17,7 @@ internal fun PaymentMethodIcon(imageUrl: String, modifier: Modifier = Modifier)
         modifier = modifier
             .size(TangemTheme.dimens.size40)
             .clip(TangemTheme.shapes.roundedCorners8)
-            .background(TangemColorPalette.Light1) // Ignore themed color.
+            .background(TangemTheme.colors.background.secondary)
             .padding(TangemTheme.dimens.spacing6),
         model = ImageRequest.Builder(context = LocalContext.current)
             .data(imageUrl)
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
index e58782f5a5..48ce4dfda8 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
+++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/ui/SelectPaymentMethodBottomSheet.kt
@@ -11,8 +11,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
+import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheet
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.onramp.impl.R
@@ -26,7 +26,7 @@ internal fun SelectPaymentMethodBottomSheet(config: TangemBottomSheetConfig) {
     TangemBottomSheet<PaymentMethodsBottomSheetConfig>(
         config = config,
         addBottomInsets = true,
-        containerColor = TangemTheme.colors.background.tertiary,
+        containerColor = TangemTheme.colors.background.primary,
         titleText = resourceReference(R.string.onramp_pay_with),
         content = { contentConfig ->
             SelectPaymentMethodBottomSheetContent(