From 88a80a7d3af455f2bc5dd5202b72db7391a4fe51 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 9 Jan 2025 11:45:37 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/tap/features/main/MainScreenStateHolder.kt | 4 ++-- .../java/com/tangem/tap/features/main/MainViewModel.kt | 2 +- .../main/ui/ModalNotificationBottomSheetFragment.kt | 2 +- .../permission/GiveTxPermisssionBottomSheet.kt | 2 +- .../core/ui/components/bottomsheets/TangemBottomSheet.kt | 7 +++---- .../components/bottomsheets/TangemBottomSheetConfig.kt | 4 ++-- .../bottomsheets/message/MessageBottomSheet.kt | 2 +- .../bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt | 2 +- .../com/tangem/core/ui/message/EventMessageEffect.kt | 2 +- .../component/impl/DefaultAddCustomTokenComponent.kt | 2 +- .../component/preview/PreviewAddCustomTokenComponent.kt | 2 +- .../details/impl/model/MarketsTokenDetailsModel.kt | 6 +++--- .../details/impl/ui/MarketsTokenDetailsContent.kt | 2 +- .../details/impl/ui/components/ExchangesBottomSheet.kt | 2 +- .../impl/ui/components/SecurityScoreBottomSheet.kt | 2 +- .../impl/model/AddToPortfolioBSContentUMFactory.kt | 4 ++-- .../markets/portfolio/impl/model/TokenActionsHandler.kt | 4 ++-- .../portfolio/impl/ui/AddToPortfolioBottomSheet.kt | 4 ++-- .../markets/portfolio/impl/ui/TokenActionsBottomSheet.kt | 2 +- .../portfolio/impl/ui/WalletSelectorBottomSheet.kt | 2 +- .../impl/model/statemanager/MarketsListUMStateManager.kt | 8 ++++---- .../features/markets/tokenlist/impl/ui/MarketsList.kt | 4 ++-- .../impl/ui/components/MarketsListSortByBottomSheet.kt | 2 +- .../child/accesscode/MultiWalletAccessCodeComponent.kt | 2 +- .../model/builder/ImportSeedPhraseUiStateBuilder.kt | 2 +- .../ui/stateBuiders/ImportSeedPhraseStateBuilder.kt | 4 ++-- .../confirmresidency/DefaultConfirmResidencyComponent.kt | 2 +- .../confirmresidency/PreviewConfirmResidencyComponent.kt | 2 +- .../paymentmethod/DefaultSelectPaymentMethodComponent.kt | 2 +- .../onramp/providers/DefaultSelectProviderComponent.kt | 2 +- .../selectcountry/DefaultSelectCountryComponent.kt | 2 +- .../selectcurrency/DefaultSelectCurrencyComponent.kt | 2 +- .../presentation/QrScanningCameraDeniedBottomSheet.kt | 2 +- .../ShowCameraDeniedBottomSheetTransformer.kt | 2 +- .../ShowActionSelectorBottomSheetTransformer.kt | 2 +- .../transformers/ShowInfoBottomSheetStateTransformer.kt | 2 +- .../SetApprovalBottomSheetInProgressTransformer.kt | 2 +- .../approval/ShowApprovalBottomSheetTransformer.kt | 2 +- .../ui/bottomsheet/StakingActionSelectorBottomSheet.kt | 2 +- .../ui/bottomsheet/StakingInfoBottomSheet.kt | 2 +- .../com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt | 2 +- .../tangem/feature/swap/ui/ChooseProviderBottomSheet.kt | 2 +- .../main/java/com/tangem/feature/swap/ui/StateBuilder.kt | 9 ++++----- .../com/tangem/feature/swap/viewmodels/SwapViewModel.kt | 2 +- .../state/factory/TokenDetailsStateFactory.kt | 6 +++--- .../state/factory/express/ExpressStatusFactory.kt | 2 +- .../wallet/presentation/common/WalletPreviewData.kt | 2 +- .../state/transformers/CloseBottomSheetTransformer.kt | 2 +- .../state/transformers/OpenBottomSheetTransformer.kt | 2 +- 49 files changed, 68 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/main/MainScreenStateHolder.kt b/app/src/main/java/com/tangem/tap/features/main/MainScreenStateHolder.kt index 9bbeded200..c2c010454e 100644 --- a/app/src/main/java/com/tangem/tap/features/main/MainScreenStateHolder.kt +++ b/app/src/main/java/com/tangem/tap/features/main/MainScreenStateHolder.kt @@ -35,7 +35,7 @@ internal class MainScreenStateHolder(private val intents: MainIntents) { stateFlowInternal.update { state -> state.copy( modalNotification = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = intents::onDismissBottomSheet, content = notificationsFactory.createBalancesAreHiddenModalNotification(), ), @@ -45,7 +45,7 @@ internal class MainScreenStateHolder(private val intents: MainIntents) { fun updateWithoutModalNotification() { stateFlowInternal.update { state -> - state.copy(modalNotification = state.modalNotification?.copy(isShow = false)) + state.copy(modalNotification = state.modalNotification?.copy(isShown = false)) } } diff --git a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt index 1bc9c4dd87..375b285fb1 100644 --- a/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/main/MainViewModel.kt @@ -125,7 +125,7 @@ internal class MainViewModel @Inject constructor( it.isBalanceHidingNotificationEnabled && it.isBalanceHidden } .onEach { - if (state.value.modalNotification?.isShow != true && !it.isUpdateFromToast) { + if (state.value.modalNotification?.isShown != true && !it.isUpdateFromToast) { listenToFlipsUseCase.changeUpdateEnabled(false) stateHolder.updateWithHiddenBalancesNotification() router.push(AppRoute.ModalNotification) diff --git a/app/src/main/java/com/tangem/tap/features/main/ui/ModalNotificationBottomSheetFragment.kt b/app/src/main/java/com/tangem/tap/features/main/ui/ModalNotificationBottomSheetFragment.kt index ef72720cad..6e4e1517e4 100644 --- a/app/src/main/java/com/tangem/tap/features/main/ui/ModalNotificationBottomSheetFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/main/ui/ModalNotificationBottomSheetFragment.kt @@ -50,7 +50,7 @@ internal class ModalNotificationBottomSheetFragment : ComposeBottomSheetFragment } LaunchedEffect(notification) { - if (!notification.isShow) { + if (!notification.isShown) { dismiss() } } diff --git a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt index 0502230706..4291b55a7f 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/bottomsheet/permission/GiveTxPermisssionBottomSheet.kt @@ -296,7 +296,7 @@ private fun Preview_GiveTxPermissionBottomSheet() { TangemThemePreview { GiveTxPermissionBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = previewData, ), diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt index 22399d6e4b..c433f996ea 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheet.kt @@ -2,7 +2,6 @@ package com.tangem.core.ui.components.bottomsheets import androidx.activity.compose.BackHandler import androidx.activity.compose.LocalOnBackPressedDispatcherOwner -import androidx.compose.foundation.background import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.* import androidx.compose.material3.* @@ -99,7 +98,7 @@ inline fun DefaultBottomSheet( crossinline title: @Composable (BoxScope.(T) -> Unit), crossinline content: @Composable (ColumnScope.(T) -> Unit), ) { - var isVisible by remember { mutableStateOf(value = config.isShow) } + var isVisible by remember { mutableStateOf(value = config.isShown) } val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = skipPartiallyExpanded) if (isVisible && config.content is T) { @@ -114,8 +113,8 @@ inline fun DefaultBottomSheet( ) } - LaunchedEffect(key1 = config.isShow) { - if (config.isShow) { + LaunchedEffect(key1 = config.isShown) { + if (config.isShown) { isVisible = true } else { sheetState.collapse { isVisible = false } diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt index d2eb1f9935..002cecf115 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/TangemBottomSheetConfig.kt @@ -3,12 +3,12 @@ package com.tangem.core.ui.components.bottomsheets /** * Tangem bottom sheet config * - * @property isShow flag that determine if bottom sheet is shown + * @property isShown flag that determine if bottom sheet is shown * @property onDismissRequest lambda be invoked when bottom sheet is dismissed * @property content content config */ data class TangemBottomSheetConfig( - val isShow: Boolean, + val isShown: Boolean, val onDismissRequest: () -> Unit, val content: TangemBottomSheetConfigContent, ) { diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt index bc1f77ae7f..f0f478d567 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/message/MessageBottomSheet.kt @@ -112,7 +112,7 @@ private fun Preview_NotificationBottomSheet( MessageBottomSheet( config = TangemBottomSheetConfig( content = params, - isShow = true, + isShown = true, onDismissRequest = {}, ), ) diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt index e3cf2008f6..d6f38a3567 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt @@ -279,7 +279,7 @@ private fun Preview_TokenReceiveBottomSheet( ) { TangemThemePreview { val config = TangemBottomSheetConfig( - isShow = true, + isShown = true, content = params, onDismissRequest = {}, ) diff --git a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt index 0943fb1d50..7a4451f689 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/message/EventMessageEffect.kt @@ -76,7 +76,7 @@ fun EventMessageEffect( @Composable private fun MessageBottomSheet(message: BottomSheetMessage, onDismissRequest: () -> Unit) { val config = TangemBottomSheetConfig( - isShow = true, + isShown = true, content = MessageBottomSheetUM( iconResId = message.iconResId, title = message.title, diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/impl/DefaultAddCustomTokenComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/impl/DefaultAddCustomTokenComponent.kt index 563c100c5e..10cf6ddcc7 100644 --- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/impl/DefaultAddCustomTokenComponent.kt +++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/impl/DefaultAddCustomTokenComponent.kt @@ -62,7 +62,7 @@ internal class DefaultAddCustomTokenComponent @AssistedInject constructor( override fun BottomSheet() { val config = remember { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = initialConfiguration.step.toContentModel(::popBack), ) diff --git a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewAddCustomTokenComponent.kt b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewAddCustomTokenComponent.kt index cfac082152..d11eaaaf24 100644 --- a/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewAddCustomTokenComponent.kt +++ b/features/manage-tokens/impl/src/main/kotlin/com/tangem/features/managetokens/component/preview/PreviewAddCustomTokenComponent.kt @@ -29,7 +29,7 @@ internal class PreviewAddCustomTokenComponent( override fun BottomSheet() { val config by previewConfig.collectAsStateWithLifecycle() val bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = config.step.toContentModel(::dismiss), ) diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt index 5121d721b4..c6c2a86b49 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/model/MarketsTokenDetailsModel.kt @@ -205,7 +205,7 @@ internal class MarketsTokenDetailsModel @Inject constructor( body = MarketsTokenDetailsUM.Body.Loading, triggerPriceChange = consumedEvent(), bottomSheetConfig = TangemBottomSheetConfig( - isShow = false, + isShown = false, onDismissRequest = {}, content = TangemBottomSheetConfigContent.Empty, ), @@ -510,7 +510,7 @@ internal class MarketsTokenDetailsModel @Inject constructor( state.update { stateToUpdate -> stateToUpdate.copy( bottomSheetConfig = stateToUpdate.bottomSheetConfig.copy( - isShow = true, + isShown = true, onDismissRequest = ::hideBottomSheet, content = content, ), @@ -521,7 +521,7 @@ internal class MarketsTokenDetailsModel @Inject constructor( private fun hideBottomSheet() { state.update { stateToUpdate -> stateToUpdate.copy( - bottomSheetConfig = stateToUpdate.bottomSheetConfig.copy(isShow = false), + bottomSheetConfig = stateToUpdate.bottomSheetConfig.copy(isShown = false), ) } } diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt index 2aa2188b32..6b22d2f6e3 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/MarketsTokenDetailsContent.kt @@ -336,7 +336,7 @@ private fun Preview() { onSelectedIntervalChange = { }, body = MarketsTokenDetailsUM.Body.Loading, bottomSheetConfig = TangemBottomSheetConfig( - isShow = false, + isShown = false, onDismissRequest = {}, content = TangemBottomSheetConfigContent.Empty, ), diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt index 7fc3e9974b..4c7bd46d6c 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/ExchangesBottomSheet.kt @@ -152,7 +152,7 @@ private fun Preview_ExchangesBottomSheet( config = TangemBottomSheetConfig( onDismissRequest = {}, content = content, - isShow = true, + isShown = true, ), ) } diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/SecurityScoreBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/SecurityScoreBottomSheet.kt index 07019d64e1..391e6b8969 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/SecurityScoreBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/details/impl/ui/components/SecurityScoreBottomSheet.kt @@ -181,7 +181,7 @@ private fun SecurityScoreBottomSheetPreview() { TangemThemePreview { SecurityScoreBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = SecurityScorePreviewData.bottomSheetContent, ), diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/AddToPortfolioBSContentUMFactory.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/AddToPortfolioBSContentUMFactory.kt index a337b02336..9461484567 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/AddToPortfolioBSContentUMFactory.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/AddToPortfolioBSContentUMFactory.kt @@ -50,7 +50,7 @@ internal class AddToPortfolioBSContentUMFactory( alreadyAddedNetworks: Set?, ): TangemBottomSheetConfig { return TangemBottomSheetConfig( - isShow = portfolioUIData.portfolioBSVisibilityModel.addToPortfolioBSVisibility, + isShown = portfolioUIData.portfolioBSVisibilityModel.addToPortfolioBSVisibility, onDismissRequest = { onAddToPortfolioVisibilityChange(false) }, content = if (selectedWallet != null && alreadyAddedNetworks != null) { AddToPortfolioBSContentUM( @@ -107,7 +107,7 @@ internal class AddToPortfolioBSContentUMFactory( selectedWalletId: UserWalletId, ): TangemBottomSheetConfig { return TangemBottomSheetConfig( - isShow = isShow, + isShown = isShow, onDismissRequest = { onWalletSelectorVisibilityChange(false) }, content = WalletSelectorBSContentUM( userWallets = portfolioData.walletsWithCurrencies diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt index 9868bc2b34..cce4273617 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/model/TokenActionsHandler.kt @@ -101,10 +101,10 @@ internal class TokenActionsHandler @AssistedInject constructor( updateTokenReceiveBSConfig { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = { updateTokenReceiveBSConfig { - it.copy(isShow = false) + it.copy(isShown = false) } }, content = TokenReceiveBottomSheetConfig( diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/AddToPortfolioBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/AddToPortfolioBottomSheet.kt index 7d8382790c..1f0e080b17 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/AddToPortfolioBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/AddToPortfolioBottomSheet.kt @@ -295,7 +295,7 @@ private fun Preview( TangemThemePreview { AddToPortfolioBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, content = content, onDismissRequest = {}, ), @@ -370,7 +370,7 @@ private fun PreviewContentTestOnDevice( AddToPortfolioBottomSheet( config = TangemBottomSheetConfig( - isShow = isShow, + isShown = isShow, content = contentState, onDismissRequest = { isShow = false }, ), diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/TokenActionsBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/TokenActionsBottomSheet.kt index 611315a24b..8a09c1758a 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/TokenActionsBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/TokenActionsBottomSheet.kt @@ -72,7 +72,7 @@ private fun Preview() { Box(Modifier.background(TangemTheme.colors.background.secondary)) { TokenActionsBottomSheet( TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = TokenActionsBSContentUM( title = "Wallet 1", diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/WalletSelectorBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/WalletSelectorBottomSheet.kt index 22ba89a8f7..a9fdbdaef9 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/WalletSelectorBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/portfolio/impl/ui/WalletSelectorBottomSheet.kt @@ -94,7 +94,7 @@ private fun Preview() { TangemThemePreview { WalletSelectorBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = WalletSelectorBSContentUM( userWallets = persistentListOf( diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/statemanager/MarketsListUMStateManager.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/statemanager/MarketsListUMStateManager.kt index 66801cb9bd..6c2b177d24 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/statemanager/MarketsListUMStateManager.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/statemanager/MarketsListUMStateManager.kt @@ -26,8 +26,8 @@ internal class MarketsListUMStateManager( ) { private var sortByBottomSheetIsShown - get() = state.value.sortByBottomSheet.isShow - set(value) = state.update { it.copy(sortByBottomSheet = it.sortByBottomSheet.copy(isShow = value)) } + get() = state.value.sortByBottomSheet.isShown + set(value) = state.update { it.copy(sortByBottomSheet = it.sortByBottomSheet.copy(isShown = value)) } var searchQuery get() = state.value.searchBar.query @@ -203,7 +203,7 @@ internal class MarketsListUMStateManager( onIntervalClick = { selectedInterval = it }, onSortByButtonClick = { sortByBottomSheetIsShown = true }, sortByBottomSheet = TangemBottomSheetConfig( - isShow = false, + isShown = false, onDismissRequest = { sortByBottomSheetIsShown = false }, content = SortByBottomSheetContentUM( selectedOption = SortByTypeUM.Rating, @@ -217,7 +217,7 @@ internal class MarketsListUMStateManager( it.copy( selectedSortBy = sortByTypeUM, sortByBottomSheet = it.sortByBottomSheet.copy( - isShow = false, + isShown = false, content = (it.sortByBottomSheet.content as SortByBottomSheetContentUM).copy( selectedOption = sortByTypeUM, ), diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt index 18815666be..752717b1bb 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/MarketsList.kt @@ -62,7 +62,7 @@ internal fun MarketsList( ) MarketsListSortByBottomSheet(config = state.sortByBottomSheet) KeyboardEvents( - isSortByBottomSheetShown = state.sortByBottomSheet.isShow, + isSortByBottomSheetShown = state.sortByBottomSheet.isShown, bottomSheetState = bottomSheetState, ) } @@ -321,7 +321,7 @@ private fun Preview() { onIntervalClick = {}, onSortByButtonClick = {}, sortByBottomSheet = TangemBottomSheetConfig( - isShow = false, + isShown = false, onDismissRequest = {}, content = SortByBottomSheetContentUM(selectedOption = SortByTypeUM.Rating) {}, ), diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListSortByBottomSheet.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListSortByBottomSheet.kt index 61b289ff7e..9f08d614c4 100644 --- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListSortByBottomSheet.kt +++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListSortByBottomSheet.kt @@ -72,7 +72,7 @@ private fun Preview() { Box(Modifier.background(TangemTheme.colors.background.secondary)) { MarketsListSortByBottomSheet( TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = SortByBottomSheetContentUM( selectedOption = SortByTypeUM.Trending, diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/MultiWalletAccessCodeComponent.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/MultiWalletAccessCodeComponent.kt index 9edd571b93..7beeb89bd9 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/MultiWalletAccessCodeComponent.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/accesscode/MultiWalletAccessCodeComponent.kt @@ -51,7 +51,7 @@ class MultiWalletAccessCodeComponent( val bsConfig = remember(this, showBs) { TangemBottomSheetConfig( - isShow = showBs, + isShown = showBs, onDismissRequest = { dismiss() }, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt index d4f152b149..bc73e0a862 100644 --- a/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt +++ b/features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/seedphrase/model/builder/ImportSeedPhraseUiStateBuilder.kt @@ -157,7 +157,7 @@ internal class ImportSeedPhraseUiStateBuilder( updateUiState { state -> state.copy( infoBottomSheetConfig = TangemBottomSheetConfig.Empty.copy( - isShow = true, + isShown = true, onDismissRequest = { updateUiState { it.copy(infoBottomSheetConfig = TangemBottomSheetConfig.Empty) } }, diff --git a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/stateBuiders/ImportSeedPhraseStateBuilder.kt b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/stateBuiders/ImportSeedPhraseStateBuilder.kt index 56169d7fa1..5562ff3af5 100644 --- a/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/stateBuiders/ImportSeedPhraseStateBuilder.kt +++ b/features/onboarding/src/main/java/com/tangem/feature/onboarding/presentation/wallet2/ui/stateBuiders/ImportSeedPhraseStateBuilder.kt @@ -69,7 +69,7 @@ class ImportSeedPhraseStateBuilder { return uiState.copy( importSeedPhraseState = uiState.importSeedPhraseState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismiss, content = ShowPassphraseInfoBottomSheetContent(onDismiss), ), @@ -81,7 +81,7 @@ class ImportSeedPhraseStateBuilder { return uiState.copy( importSeedPhraseState = uiState.importSeedPhraseState.copy( bottomSheetConfig = uiState.importSeedPhraseState.bottomSheetConfig?.copy( - isShow = false, + isShown = false, ), ), ) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt index 0a88231cc3..e7f8a4d6dc 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt @@ -47,7 +47,7 @@ internal class DefaultConfirmResidencyComponent @AssistedInject constructor( val bottomSheet by bottomSheetSlot.subscribeAsState() val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/PreviewConfirmResidencyComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/PreviewConfirmResidencyComponent.kt index adc039dca9..70eecdc9a2 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/PreviewConfirmResidencyComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/PreviewConfirmResidencyComponent.kt @@ -33,7 +33,7 @@ internal class PreviewConfirmResidencyComponent( val state by previewState.collectAsStateWithLifecycle() val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/DefaultSelectPaymentMethodComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/DefaultSelectPaymentMethodComponent.kt index 75a8748835..25d8b7cb79 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/DefaultSelectPaymentMethodComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/paymentmethod/DefaultSelectPaymentMethodComponent.kt @@ -24,7 +24,7 @@ internal class DefaultSelectPaymentMethodComponent @AssistedInject constructor( override fun BottomSheet() { val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = PaymentMethodsBottomSheetConfig( selectedMethodId = params.selectedMethodId, diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/DefaultSelectProviderComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/DefaultSelectProviderComponent.kt index e59e4722e9..d0bcd4a3d0 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/DefaultSelectProviderComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/providers/DefaultSelectProviderComponent.kt @@ -52,7 +52,7 @@ internal class DefaultSelectProviderComponent @AssistedInject constructor( val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt index 35fc452dc8..fa24e2dc0f 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt @@ -33,7 +33,7 @@ internal class DefaultSelectCountryComponent @AssistedInject constructor( val state by model.state.collectAsStateWithLifecycle() val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcurrency/DefaultSelectCurrencyComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcurrency/DefaultSelectCurrencyComponent.kt index 687df5d015..552c4023d0 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcurrency/DefaultSelectCurrencyComponent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcurrency/DefaultSelectCurrencyComponent.kt @@ -33,7 +33,7 @@ internal class DefaultSelectCurrencyComponent @AssistedInject constructor( val state by model.state.collectAsStateWithLifecycle() val bottomSheetConfig = remember(key1 = this) { TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = ::dismiss, content = TangemBottomSheetConfigContent.Empty, ) diff --git a/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/QrScanningCameraDeniedBottomSheet.kt b/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/QrScanningCameraDeniedBottomSheet.kt index ec162be095..dd1f555379 100644 --- a/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/QrScanningCameraDeniedBottomSheet.kt +++ b/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/QrScanningCameraDeniedBottomSheet.kt @@ -83,7 +83,7 @@ private fun Preview_CameraDeniedBottomSheet() { TangemThemePreview { CameraDeniedBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = CameraDeniedBottomSheetConfig( onSettingsClick = {}, diff --git a/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/transformers/ShowCameraDeniedBottomSheetTransformer.kt b/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/transformers/ShowCameraDeniedBottomSheetTransformer.kt index 340c70fdd8..5dedeffebc 100644 --- a/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/transformers/ShowCameraDeniedBottomSheetTransformer.kt +++ b/features/qr-scanning/impl/src/main/java/com/tangem/feature/qrscanning/presentation/transformers/ShowCameraDeniedBottomSheetTransformer.kt @@ -12,7 +12,7 @@ internal class ShowCameraDeniedBottomSheetTransformer( override fun transform(prevState: QrScanningState): QrScanningState { return prevState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = clickIntents::onBackClick, content = CameraDeniedBottomSheetConfig( onSettingsClick = clickIntents::onSettingsClick, diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowActionSelectorBottomSheetTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowActionSelectorBottomSheetTransformer.kt index 2c927652c7..c70861712b 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowActionSelectorBottomSheetTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowActionSelectorBottomSheetTransformer.kt @@ -17,7 +17,7 @@ internal class ShowActionSelectorBottomSheetTransformer( override fun transform(prevState: StakingUiState): StakingUiState { return prevState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, content = StakingActionSelectionBottomSheetConfig( title = resourceReference(R.string.common_choose_action), actions = pendingActions, diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt index f0e0ade2cc..9f1c669b3e 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/ShowInfoBottomSheetStateTransformer.kt @@ -17,7 +17,7 @@ internal class ShowInfoBottomSheetStateTransformer( return prevState.copy( bottomSheetConfig = TangemBottomSheetConfig( onDismissRequest = onDismiss, - isShow = true, + isShown = true, content = when (infoType) { InfoType.ANNUAL_PERCENTAGE_RATE -> StakingInfoBottomSheetConfig( title = resourceReference(R.string.staking_details_annual_percentage_rate), diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt index 085061c2b8..5ceb9ac4d3 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/SetApprovalBottomSheetInProgressTransformer.kt @@ -13,7 +13,7 @@ internal class SetApprovalBottomSheetInProgressTransformer( return prevState.copy( bottomSheetConfig = prevState.bottomSheetConfig?.copy( onDismissRequest = onDismiss, - isShow = true, + isShown = true, content = approvalBottomSheetConfig?.let { config -> config.copy( data = config.data.copy( diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt index 8350e74f74..be9aac4f36 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/approval/ShowApprovalBottomSheetTransformer.kt @@ -45,7 +45,7 @@ internal class ShowApprovalBottomSheetTransformer( ) return prevState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismiss, content = GiveTxPermissionBottomSheetConfig( data = GiveTxPermissionState.ReadyForRequest( diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingActionSelectorBottomSheet.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingActionSelectorBottomSheet.kt index 8f4434e496..64c371054c 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingActionSelectorBottomSheet.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingActionSelectorBottomSheet.kt @@ -67,7 +67,7 @@ private fun Preview_StakingActionSelectorBottomSheet() { TangemThemePreview { StakingActionSelectorBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = StakingActionSelectionBottomSheetConfig( title = resourceReference(R.string.common_select_action), diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingInfoBottomSheet.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingInfoBottomSheet.kt index 6e0b80bd18..af0ceabcc0 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingInfoBottomSheet.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/ui/bottomsheet/StakingInfoBottomSheet.kt @@ -52,7 +52,7 @@ private fun Preview_StakingInfoBottomSheet() { TangemThemePreview { StakingInfoBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = StakingInfoBottomSheetConfig( title = stringReference("Title"), diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt index 40d3a41298..13dc36fbac 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseFeeBottomSheet.kt @@ -170,7 +170,7 @@ private fun Preview_ChooseFeeBottomSheet() { TangemThemePreview { ChooseFeeBottomSheet( config = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = content, ), diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt index e2db69b9db..44fae2d1f8 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/ChooseProviderBottomSheet.kt @@ -134,7 +134,7 @@ private fun Preview_ChooseProviderBottomSheet() { TangemThemePreview { ChooseProviderBottomSheet( TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = {}, content = content, ), diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt index 73ff14265e..58a9aabddf 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt @@ -10,7 +10,6 @@ import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIco import com.tangem.core.ui.event.consumedEvent import com.tangem.core.ui.event.triggeredEvent import com.tangem.core.ui.extensions.* -import com.tangem.core.ui.format.bigdecimal.* import com.tangem.core.ui.format.bigdecimal.anyDecimals import com.tangem.core.ui.format.bigdecimal.crypto import com.tangem.core.ui.format.bigdecimal.format @@ -946,7 +945,7 @@ internal class StateBuilder( ) return uiState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismiss, content = config, ), @@ -957,7 +956,7 @@ internal class StateBuilder( fun dismissBottomSheet(uiState: SwapStateHolder): SwapStateHolder { return uiState.copy( - bottomSheetConfig = uiState.bottomSheetConfig?.copy(isShow = false), + bottomSheetConfig = uiState.bottomSheetConfig?.copy(isShown = false), ) } @@ -981,7 +980,7 @@ internal class StateBuilder( ) return uiState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismiss, content = config, ), @@ -1044,7 +1043,7 @@ internal class StateBuilder( ) return uiState.copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismiss, content = config, ), diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt index 353348dd44..a43e7c530c 100644 --- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt +++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt @@ -1024,7 +1024,7 @@ internal class SwapViewModel @Inject constructor( }, onBackClicked = { val bottomSheet = uiState.bottomSheetConfig - if (bottomSheet != null && bottomSheet.isShow) { + if (bottomSheet != null && bottomSheet.isShown) { uiState = stateBuilder.dismissBottomSheet(uiState) } else { if (swapRouter.currentScreen == SwapNavScreen.SelectToken) { diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt index 462f209d58..cc941824dc 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt @@ -254,7 +254,7 @@ internal class TokenDetailsStateFactory( ): TokenDetailsState { return currentStateProvider().copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = clickIntents::onDismissBottomSheet, content = TokenReceiveBottomSheetConfig( name = currency.name, @@ -275,7 +275,7 @@ internal class TokenDetailsStateFactory( ): TokenDetailsState { return currentStateProvider().copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = clickIntents::onDismissBottomSheet, content = ChooseAddressBottomSheetConfig( addressModels = networkAddress.availableAddresses.mapToAddressModels(currency).toImmutableList(), @@ -288,7 +288,7 @@ internal class TokenDetailsStateFactory( fun getStateWithClosedBottomSheet(): TokenDetailsState { val state = currentStateProvider() return state.copy( - bottomSheetConfig = state.bottomSheetConfig?.copy(isShow = false), + bottomSheetConfig = state.bottomSheetConfig?.copy(isShown = false), ) } diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt index 7cfbd6eb7b..3c1633c710 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/express/ExpressStatusFactory.kt @@ -133,7 +133,7 @@ internal class ExpressStatusFactory @AssistedInject constructor( return currentStateProvider().copy( bottomSheetConfig = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = clickIntents::onDismissBottomSheet, content = ExpressStatusBottomSheetConfig( value = expressState, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt index 129a6ff281..0f2e5c8932 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/WalletPreviewData.kt @@ -180,7 +180,7 @@ internal object WalletPreviewData { val bottomSheet by lazy { TangemBottomSheetConfig( - isShow = false, + isShown = false, onDismissRequest = {}, content = WalletBottomSheetConfig.UnlockWallets( onUnlockClick = {}, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/CloseBottomSheetTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/CloseBottomSheetTransformer.kt index 02dd3d93aa..feeea1a264 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/CloseBottomSheetTransformer.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/CloseBottomSheetTransformer.kt @@ -29,6 +29,6 @@ internal class CloseBottomSheetTransformer(userWalletId: UserWalletId) : WalletS } private fun updateConfig(prevState: WalletState) = prevState.bottomSheetConfig?.copy( - isShow = false, + isShown = false, ) } \ No newline at end of file diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/OpenBottomSheetTransformer.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/OpenBottomSheetTransformer.kt index 69417c564c..46ffbf9066 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/OpenBottomSheetTransformer.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/OpenBottomSheetTransformer.kt @@ -35,7 +35,7 @@ internal class OpenBottomSheetTransformer( } private fun updateConfig() = TangemBottomSheetConfig( - isShow = true, + isShown = true, onDismissRequest = onDismissBottomSheet, content = content, )