Updated on 2026-08-14

features/details/impl/src/main/kotlin/com/tangem/features/details/entity/UserWalletListUM.kt

@@ -2,6 +2,7 @@ package com.tangem.features.details.entity
 
 import androidx.compose.runtime.Immutable
 import com.tangem.common.ui.userwallet.state.UserWalletItemUM
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.TextReference
 import kotlinx.collections.immutable.ImmutableList
 
@@ -11,4 +12,5 @@ internal data class UserWalletListUM(
     val isWalletSavingInProgress: Boolean,
     val addNewWalletText: TextReference,
     val onAddNewWalletClick: () -> Unit,
+    val addWalletBottomSheet: TangemBottomSheetConfig = TangemBottomSheetConfig.Empty,
 )

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

@@ -6,12 +6,17 @@ import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.core.decompose.navigation.Router
 import com.tangem.core.decompose.ui.UiMessageSender
+import com.tangem.core.navigation.url.UrlOpener
+import com.tangem.core.ui.R.*
+import com.tangem.core.ui.components.bottomsheets.BottomSheetOption
+import com.tangem.core.ui.components.bottomsheets.OptionsBottomSheetContent
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.domain.wallets.usecase.GenerateBuyTangemCardLinkUseCase
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsUseCase
 import com.tangem.features.details.entity.UserWalletListUM
 import com.tangem.features.details.impl.R
-import com.tangem.features.details.utils.UserWalletSaver
 import com.tangem.features.wallet.utils.UserWalletsFetcher
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.collections.immutable.ImmutableList
@@ -20,16 +25,19 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+@Suppress("LongParameterList")
 @ModelScoped
 internal class UserWalletListModel @Inject constructor(
     userWalletsFetcherFactory: UserWalletsFetcher.Factory,
     shouldSaveUserWalletsUseCase: ShouldSaveUserWalletsUseCase,
     private val router: Router,
     private val messageSender: UiMessageSender,
-    private val userWalletSaver: UserWalletSaver,
     override val dispatchers: CoroutineDispatcherProvider,
+    private val generateBuyTangemCardLinkUseCase: GenerateBuyTangemCardLinkUseCase,
+    private val urlOpener: UrlOpener,
 ) : Model() {
 
     private val isWalletSavingInProgress: MutableStateFlow<Boolean> = MutableStateFlow(value = false)
@@ -45,7 +53,8 @@ internal class UserWalletListModel @Inject constructor(
             userWallets = persistentListOf(),
             isWalletSavingInProgress = false,
             addNewWalletText = TextReference.EMPTY,
-            onAddNewWalletClick = ::addUserWallet,
+            onAddNewWalletClick = ::showAddWalletBottomSheet,
+            addWalletBottomSheet = TangemBottomSheetConfig.Empty,
         ),
     )
 
@@ -54,8 +63,9 @@ internal class UserWalletListModel @Inject constructor(
             flow = userWalletsFetcher.userWallets,
             flow2 = shouldSaveUserWalletsUseCase(),
             flow3 = isWalletSavingInProgress,
-            transform = ::updateState,
-        ).launchIn(modelScope)
+        ) { userWallets, shouldSaveUserWallets, isWalletSavingInProgress ->
+            updateState(userWallets, shouldSaveUserWallets, isWalletSavingInProgress)
+        }.launchIn(modelScope)
     }
 
     private fun updateState(
@@ -74,7 +84,58 @@ internal class UserWalletListModel @Inject constructor(
         )
     }
 
-    private fun addUserWallet() = withProgress(isWalletSavingInProgress) {
-        userWalletSaver.scanAndSaveUserWallet(modelScope)
+    private fun showAddWalletBottomSheet() {
+        state.update { currentState ->
+            currentState.copy(
+                addWalletBottomSheet = TangemBottomSheetConfig(
+                    isShown = true,
+                    onDismissRequest = ::dismissAddWalletBottomSheet,
+                    content = createAddWalletBottomSheetContent(),
+                ),
+            )
+        }
+    }
+
+    private fun dismissAddWalletBottomSheet() {
+        state.update { currentState ->
+            currentState.copy(
+                addWalletBottomSheet = currentState.addWalletBottomSheet.copy(isShown = false),
+            )
+        }
+    }
+
+    private fun createAddWalletBottomSheetContent(): OptionsBottomSheetContent {
+        return OptionsBottomSheetContent(
+            options = persistentListOf(
+                BottomSheetOption(
+                    key = ADD_WALLET_KEY_CREATE,
+                    label = resourceReference(string.home_button_create_new_wallet),
+                ),
+                BottomSheetOption(
+                    key = ADD_WALLET_KEY_ADD,
+                    label = resourceReference(string.home_button_add_existing_wallet),
+                ),
+                BottomSheetOption(
+                    key = ADD_WALLET_KEY_BUY,
+                    label = resourceReference(string.details_buy_wallet),
+                ),
+            ),
+            onOptionClick = { optionKey ->
+                dismissAddWalletBottomSheet()
+                when (optionKey) {
+                    ADD_WALLET_KEY_CREATE -> router.push(AppRoute.CreateWalletSelection)
+                    ADD_WALLET_KEY_ADD -> router.push(AppRoute.AddExistingWallet)
+                    ADD_WALLET_KEY_BUY -> modelScope.launch {
+                        generateBuyTangemCardLinkUseCase.invoke().let { urlOpener.openUrl(it) }
+                    }
+                }
+            },
+        )
+    }
+
+    companion object {
+        private const val ADD_WALLET_KEY_CREATE = "create"
+        private const val ADD_WALLET_KEY_ADD = "add"
+        private const val ADD_WALLET_KEY_BUY = "buy"
     }
 }

features/details/impl/src/main/kotlin/com/tangem/features/details/ui/UserWalletListBlock.kt

@@ -15,9 +15,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.tangem.common.ui.userwallet.UserWalletItem
+import com.tangem.core.ui.R.*
 import com.tangem.core.ui.components.block.BlockCard
+import com.tangem.core.ui.components.bottomsheets.OptionsBottomSheet
+import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig
 import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resolveReference
+import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import com.tangem.features.details.component.UserWalletListComponent
@@ -44,6 +48,8 @@ internal fun UserWalletListBlock(state: UserWalletListUM, modifier: Modifier = M
             onClick = state.onAddNewWalletClick,
         )
     }
+
+    AddWalletBottomSheet(state.addWalletBottomSheet)
 }
 
 @Composable
@@ -94,6 +100,15 @@ private fun AddWalletButton(
     }
 }
 
+@Composable
+private fun AddWalletBottomSheet(config: TangemBottomSheetConfig) {
+    OptionsBottomSheet(
+        config = config,
+        title = resourceReference(string.auth_info_add_wallet_title),
+        containerColor = TangemTheme.colors.background.tertiary,
+    )
+}
+
 // region Preview
 @Composable
 @Preview(showBackground = true, widthDp = 360)