From a2fb7e2ce12d625128fcc494cdf023e249a431d7 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 31 May 2022 17:58:50 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../tap/domain/tokens/LoadAvailableCoinsService.kt    | 11 ++++++++++-
 .../tap/features/tokens/ui/AddTokensFragment.kt       |  8 +++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
index b195457e4f..a0be7dc18a 100644
--- a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
@@ -21,7 +21,7 @@ class LoadAvailableCoinsService(
         if (isTestNet) {
             return Result.Success(
                 LoadedCoins(
-                    currencies = currenciesRepository.getTestnetCoins(),
+                    currencies = currenciesRepository.getTestnetCoins().filter(searchInput),
                     moreAvailable = false,
                 )
             )
@@ -59,6 +59,15 @@ class LoadAvailableCoinsService(
         )
     }
 
+    private fun List<Currency>.filter(searchInput: String?): List<Currency> {
+        if (searchInput.isNullOrBlank()) return this
+
+        return filter{
+            it.symbol.contains(searchInput, ignoreCase = true) ||
+                    it.name.contains(searchInput, ignoreCase = true)
+        }
+    }
+
     companion object {
         const val LOAD_PER_PAGE = 100
     }
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
index fae99d7af4..deeabe4c9e 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/ui/AddTokensFragment.kt
@@ -84,7 +84,13 @@ class AddTokensFragment : Fragment(R.layout.fragment_add_tokens),
         }
 
         val onLoadMore = {
-            store.dispatch(TokensAction.LoadCurrencies(scanResponse = store.state.globalState.scanResponse))
+            if (store.state.tokensState.needToLoadMore) {
+                store.dispatch(
+                    TokensAction.LoadCurrencies(
+                        scanResponse = store.state.globalState.scanResponse
+                    )
+                )
+            }
         }
 
         cvCurrencies.setContent {