From b9e3753ae8c8e1d28f292e3db52baca55635929f Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 23 Jun 2023 16:32:13 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../impl/presentation/ui/components/AddCustomTokenForm.kt  | 2 --
 .../presentation/viewmodels/AddCustomTokenViewModel.kt     | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
index 0051e2e6c4..0090ef8223 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
@@ -8,7 +8,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -161,7 +160,6 @@ private fun SelectorField(model: AddCustomTokenSelectorField) {
             expanded = isExpanded && isEnabled,
             onDismissRequest = { isExpanded = false },
         ) {
-            FocusRequester
             model.items.forEachIndexed { index, item ->
                 DropdownMenuItem(
                     onClick = {
diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
index 6429affe5e..297bf37f54 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt
@@ -41,6 +41,7 @@ import com.tangem.wallet.BuildConfig
 import com.tangem.wallet.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -613,7 +614,11 @@ internal class AddCustomTokenViewModel @Inject constructor(
     private inner class ActionsHandler(private val featureRouter: CustomTokenRouter) {
 
         fun onBackButtonClick() {
-            featureRouter.popBackStack()
+            viewModelScope.launch(dispatchers.main) {
+                // need delay before close, cause crashed in compose PopUpMenu as
+                delay(timeMillis = 100)
+                featureRouter.popBackStack()
+            }
         }
 
         fun onContactAddressValueChange(enteredValue: String) {