Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt

@@ -0,0 +1,23 @@
+package com.tangem.tap.common.compose.extensions
+
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.*
+
+@Composable
+fun LazyListState.OnBottomReached(loadMoreThreshold: Int, loadMore: () -> Unit) {
+    require(loadMoreThreshold >= 0)
+    val shouldLoadMore = remember {
+        derivedStateOf {
+            val lastVisibleItem = layoutInfo.visibleItemsInfo.lastOrNull()
+                ?: return@derivedStateOf false
+            lastVisibleItem.index >=  layoutInfo.totalItemsCount - 1 - loadMoreThreshold
+        }
+    }
+
+    LaunchedEffect(shouldLoadMore) {
+        snapshotFlow { shouldLoadMore.value }
+            .collect { shouldLoadMore ->
+                if (shouldLoadMore) loadMore()
+            }
+    }
+}

app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt

@@ -191,8 +191,8 @@ class CurrenciesRepository(
             }
         }.map { it.await() }
             .map { (it as? Result.Success)?.data?.coins?.firstOrNull()?.id }
-            .mapIndexedNotNull { index, s ->
-                if (s == null) null else tokens[index].contractAddress to s
+            .mapIndexedNotNull { index, id ->
+                if (id == null) null else tokens[index].contractAddress to id
             }.toMap()
     }
 

app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt

@@ -2,6 +2,7 @@ package com.tangem.tap.domain.tokens
 
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
+import com.tangem.domain.common.extensions.getListOfCoins
 import com.tangem.domain.common.extensions.toNetworkId
 import com.tangem.network.api.tangemTech.CoinsResponse
 import com.tangem.network.api.tangemTech.TangemTechService

app/src/main/java/com/tangem/tap/features/tokens/ui/compose/ListOfCurrencies.kt

@@ -4,13 +4,14 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.tangem.blockchain.common.Blockchain
+import com.tangem.tap.common.compose.extensions.OnBottomReached
 import com.tangem.tap.domain.tokens.Currency
 import com.tangem.tap.features.tokens.redux.ContractAddress
 import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
@@ -18,7 +19,7 @@ import com.tangem.tap.features.tokens.redux.TokenWithBlockchain
 
 @Composable
 fun ListOfCurrencies(
-    header: @Composable ()->Unit,
+    header: @Composable () -> Unit,
     currencies: List<Currency>,
     nonRemovableTokens: List<ContractAddress>,
     nonRemovableBlockchains: List<Blockchain>,
@@ -42,34 +43,31 @@ fun ListOfCurrencies(
         expandedCurrencies.value = mutableList
     }
 
+    val listState = rememberLazyListState()
+
     LazyColumn(
+        state = listState,
         modifier = Modifier
             .fillMaxSize(),
         contentPadding = PaddingValues(bottom = 90.dp)
     ) {
         item { header() }
         itemsIndexed(currencies) { index, currency ->
-            val lastIndex = currencies.lastIndex
-            if (currencies.isNotEmpty()) {
-                if (index + 40 == lastIndex) {
-                    SideEffect { onLoadMore() }
-                }
-                CurrencyItem(
-                    currency = currency,
-                    nonRemovableTokens = nonRemovableTokens,
-                    nonRemovableBlockchains = nonRemovableBlockchains,
-                    addedTokens = addedTokens,
-                    addedBlockchains = addedBlockchains,
-                    allowToAdd = allowToAdd,
-                    expanded = expandedCurrencies.value.contains(currency.id),
-                    onCurrencyClick = onCurrencyClick,
-                    onAddCurrencyToggled = onAddCurrencyToggled,
-                    onNetworkItemClicked = onNetworkItemClicked
-                )
-            }
-
+            CurrencyItem(
+                currency = currency,
+                nonRemovableTokens = nonRemovableTokens,
+                nonRemovableBlockchains = nonRemovableBlockchains,
+                addedTokens = addedTokens,
+                addedBlockchains = addedBlockchains,
+                allowToAdd = allowToAdd,
+                expanded = expandedCurrencies.value.contains(currency.id),
+                onCurrencyClick = onCurrencyClick,
+                onAddCurrencyToggled = onAddCurrencyToggled,
+                onNetworkItemClicked = onNetworkItemClicked
+            )
         }
     }
+    listState.OnBottomReached(loadMoreThreshold = 40) { onLoadMore() }
 }
 
 val Currency.fullName: String