diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt index 5bd058642b..2d758616c3 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt @@ -123,7 +123,6 @@ internal object WalletScreenPreviewData { ), bottomSheetConfig = null, tokensListState = contentTokensState, - manageTokensButtonConfig = ManageTokensButtonConfig(onClick = {}), ) } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/ManageTokensButtonConfig.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/ManageTokensButtonConfig.kt deleted file mode 100644 index 52c4b9f6dc..0000000000 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/ManageTokensButtonConfig.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.tangem.feature.wallet.presentation.wallet.state.model - -internal data class ManageTokensButtonConfig(val onClick: () -> Unit) \ No newline at end of file diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt index 0f48485b21..748fb7136c 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletState.kt @@ -20,7 +20,6 @@ internal sealed interface WalletState : WalletStateHolder { sealed class MultiCurrency : WalletState { abstract val tokensListState: WalletTokensListState - abstract val manageTokensButtonConfig: ManageTokensButtonConfig? data class Content( override val pullToRefreshConfig: PullToRefreshConfig, @@ -28,7 +27,6 @@ internal sealed interface WalletState : WalletStateHolder { override val warnings: ImmutableList, override val bottomSheetConfig: TangemBottomSheetConfig?, override val tokensListState: WalletTokensListState, - override val manageTokensButtonConfig: ManageTokensButtonConfig?, ) : MultiCurrency() data class Locked( @@ -43,7 +41,6 @@ internal sealed interface WalletState : WalletStateHolder { ) { override val tokensListState = WalletTokensListState.ContentState.Locked - override val manageTokensButtonConfig = null } } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt index b852f07fa7..44698f71e3 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/SetTokenListTransformer.kt @@ -1,10 +1,8 @@ package com.tangem.feature.wallet.presentation.wallet.state.transformers import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.common.util.cardTypesResolver import com.tangem.domain.tokens.model.TokenList import com.tangem.domain.wallets.models.UserWallet -import com.tangem.feature.wallet.presentation.wallet.state.model.ManageTokensButtonConfig import com.tangem.feature.wallet.presentation.wallet.state.model.WalletCardState import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState import com.tangem.feature.wallet.presentation.wallet.state.model.WalletTokensListState @@ -26,7 +24,6 @@ internal class SetTokenListTransformer( prevState.copy( walletCardState = prevState.walletCardState.toLoadedState(), tokensListState = prevState.tokensListState.toLoadedState(), - manageTokensButtonConfig = createManageTokensButtonConfig(), ) } is WalletState.MultiCurrency.Locked -> { @@ -58,12 +55,4 @@ internal class SetTokenListTransformer( clickIntents = clickIntents, ).convert(value = this) } - - private fun createManageTokensButtonConfig(): ManageTokensButtonConfig? { - return if (userWallet.scanResponse.cardTypesResolver.isSingleWalletWithToken()) { - null - } else { - ManageTokensButtonConfig(clickIntents::onManageTokensClick) - } - } } \ No newline at end of file diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt index 924cd9e0c8..21d72d857e 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/utils/WalletLoadingStateFactory.kt @@ -35,7 +35,6 @@ internal class WalletLoadingStateFactory(private val clickIntents: WalletClickIn warnings = persistentListOf(), bottomSheetConfig = null, tokensListState = WalletTokensListState.ContentState.Loading, - manageTokensButtonConfig = ManageTokensButtonConfig(clickIntents::onManageTokensClick), ) } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt index d131e8e482..f9f733cd80 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen.kt @@ -46,7 +46,6 @@ import androidx.compose.ui.unit.dp import androidx.paging.compose.collectAsLazyPagingItems import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.tangem.core.ui.components.BottomFade -import com.tangem.core.ui.components.PrimaryButton import com.tangem.core.ui.components.atoms.Hand import com.tangem.core.ui.components.atoms.handComposableComponentHeight import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig @@ -294,25 +293,6 @@ private fun BaseScaffold( modifier = Modifier.padding(bottom = TangemTheme.dimens.spacing16), ) }, - floatingActionButton = { - val manageTokensButtonConfig by rememberUpdatedState( - newValue = (state.wallets[state.selectedWalletIndex] as? WalletState.MultiCurrency) - ?.manageTokensButtonConfig, - ) - - AnimatedVisibility( - visible = manageTokensButtonConfig != null, - enter = fadeIn(), - exit = fadeOut(), - ) { - val config = manageTokensButtonConfig ?: return@AnimatedVisibility - - ManageTokensButton( - modifier = Modifier.navigationBarsPadding(), - onClick = config.onClick, - ) - } - }, floatingActionButtonPosition = FabPosition.Center, containerColor = TangemTheme.colors.background.secondary, content = { @@ -759,17 +739,6 @@ private fun WalletSnackbarHost( } } -@Composable -private fun ManageTokensButton(onClick: () -> Unit, modifier: Modifier = Modifier) { - PrimaryButton( - text = stringResource(id = R.string.main_manage_tokens), - onClick = onClick, - modifier = modifier - .fillMaxWidth() - .padding(horizontal = TangemTheme.dimens.spacing16), - ) -} - internal fun LazyListScope.organizeTokens(state: WalletState, itemModifier: Modifier) { (state as? WalletState.MultiCurrency)?.let { (state.tokensListState as? WalletTokensListState.ContentState)?.let {