Updated on 2026-08-14

data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketExchangeConverter.kt

@@ -1,6 +1,7 @@
 package com.tangem.data.markets.converters
 
 import com.tangem.datasource.api.markets.models.response.TokenMarketExchangesResponse
+import com.tangem.domain.markets.BuildConfig
 import com.tangem.domain.markets.TokenMarketExchange
 import com.tangem.utils.converter.Converter
 
@@ -11,6 +12,8 @@ import com.tangem.utils.converter.Converter
  */
 internal object TokenMarketExchangeConverter : Converter<TokenMarketExchangesResponse.Exchange, TokenMarketExchange> {
 
+    private const val PROD_IMAGE_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api/exchanges/"
+    private const val DEV_IMAGE_HOST = "https://s3.eu-central-1.amazonaws.com/tangem.api.dev/exchanges/"
     private val RISKY_INTERVAL = 0..3
     private val CAUTION_INTERVAL = 4..7
 
@@ -19,7 +22,7 @@ internal object TokenMarketExchangeConverter : Converter<TokenMarketExchangesRes
             TokenMarketExchange(
                 id = id,
                 name = name,
-                imageUrl = imageUrl,
+                imageUrl = "${getImageHost()}large/$id.png",
                 isCentralized = isCentralized,
                 volumeInUsd = volumeInUsd,
                 trustScore = when (trustScore) {
@@ -32,4 +35,12 @@ internal object TokenMarketExchangeConverter : Converter<TokenMarketExchangesRes
             )
         }
     }
+
+    private fun getImageHost(): String {
+        return if (BuildConfig.TESTER_MENU_ENABLED) {
+            DEV_IMAGE_HOST
+        } else {
+            PROD_IMAGE_HOST
+        }
+    }
 }

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt

@@ -534,9 +534,12 @@ internal class MarketsTokenDetailsModel @Inject constructor(
     }
 
     private fun onListedOnClick(exchangesCount: Int) {
-        showBottomSheet(content = ExchangesBottomSheetContent.Loading(exchangesCount))
-
         modelScope.launch {
+            showBottomSheet(content = ExchangesBottomSheetContent.Loading(exchangesCount))
+
+            // Delay to show the bottom sheet
+            delay(timeMillis = 800L)
+
             val maybeExchanges = getTokenExchangesUseCase(tokenId = params.token.id)
 
             updateExchangeBSContent(maybeExchanges = maybeExchanges, exchangesCount = exchangesCount)

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt

@@ -3,11 +3,10 @@ package com.tangem.features.markets.details.impl.ui.components
 import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.key
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalDensity
@@ -17,9 +16,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.util.fastForEach
-import com.tangem.core.ui.components.SpacerH
 import com.tangem.core.ui.components.SpacerH12
 import com.tangem.core.ui.components.appbar.TangemTopAppBar
 import com.tangem.core.ui.components.appbar.models.TopAppBarButtonUM
@@ -57,44 +53,37 @@ internal fun ExchangesBottomSheet(config: TangemBottomSheetConfig) {
         addBottomInsets = false,
         title = { Title(textResId = it.titleResId, onBackClick = config.onDismissRequest) },
         content = { content ->
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .verticalScroll(state = rememberScrollState()),
-            ) {
-                Subtitle(
-                    subtitleRes = content.subtitleResId,
-                    volumeReference = content.volumeReference,
-                    modifier = Modifier.padding(
-                        start = TangemTheme.dimens.spacing16,
-                        top = TangemTheme.dimens.spacing12,
-                        end = TangemTheme.dimens.spacing16,
-                        bottom = TangemTheme.dimens.spacing8,
-                    ),
-                )
-
-                when (content) {
-                    is ExchangesBottomSheetContent.Content,
-                    is ExchangesBottomSheetContent.Loading,
-                    -> {
-                        content.exchangeItems.fastForEach { item ->
-                            key(item.id) {
-                                TokenItem(state = item, isBalanceHidden = false)
-                            }
-                        }
-                    }
-                    is ExchangesBottomSheetContent.Error -> {
-                        Error(
-                            content = content,
-                            modifier = Modifier
-                                .align(alignment = Alignment.CenterHorizontally)
-                                .padding(horizontal = 16.dp)
-                                .weight(1f),
+            Box {
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize(),
+                    contentPadding = PaddingValues(bottom = bottomBarHeight),
+                ) {
+                    item(key = "subtitle") {
+                        Subtitle(
+                            subtitleRes = content.subtitleResId,
+                            volumeReference = content.volumeReference,
+                            modifier = Modifier.padding(
+                                start = TangemTheme.dimens.spacing16,
+                                top = TangemTheme.dimens.spacing12,
+                                end = TangemTheme.dimens.spacing16,
+                                bottom = TangemTheme.dimens.spacing8,
+                            ),
                         )
                     }
+
+                    items(
+                        items = content.exchangeItems,
+                        key = TokenItemState::id,
+                        itemContent = { TokenItem(state = it, isBalanceHidden = false) },
+                    )
                 }
 
-                SpacerH(bottomBarHeight)
+                if (content is ExchangesBottomSheetContent.Error) {
+                    Error(
+                        content = content,
+                        modifier = Modifier.align(Alignment.Center),
+                    )
+                }
             }
         },
     )

features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ListedOnBlock.kt

@@ -10,6 +10,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -33,7 +34,7 @@ import kotlinx.coroutines.delay
  */
 @Composable
 internal fun ListedOnBlock(state: ListedOnUM, modifier: Modifier = Modifier) {
-    Box {
+    Box(modifier = modifier) {
         InformationBlock(
             title = {
                 Text(
@@ -44,9 +45,11 @@ internal fun ListedOnBlock(state: ListedOnUM, modifier: Modifier = Modifier) {
                     overflow = TextOverflow.Ellipsis,
                 )
             },
-            modifier = modifier.clickable(enabled = state is ListedOnUM.Content) {
-                (state as? ListedOnUM.Content)?.onClick?.invoke()
-            },
+            modifier = Modifier
+                .clip(shape = TangemTheme.shapes.roundedCornersXMedium)
+                .clickable(enabled = state is ListedOnUM.Content) {
+                    (state as? ListedOnUM.Content)?.onClick?.invoke()
+                },
         ) {
             Description(
                 state = state,