diff --git a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt index ee0a5ce91f..fab9e10cfb 100644 --- a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt +++ b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt @@ -199,7 +199,6 @@ abstract class BaseTestCase : TestCase( // build even when the app version resolves to 1.0.0-SNAPSHOT on CI (then 1.0.0 < x.xx would // disable them). On the releases/6.0 branch every toggle with version <= 6.0 ships enabled. // 6.0 - "APP_REDESIGN_ENABLED" to true, "TWI_1326_YIELD_MODE_SWAP_ENABLED" to true, // 6.1 "TWI_1638_VA_MVP0_ENABLED" to true, diff --git a/app/src/main/java/com/tangem/tap/core/ui/DefaultDesignFeatureToggles.kt b/app/src/main/java/com/tangem/tap/core/ui/DefaultDesignFeatureToggles.kt deleted file mode 100644 index ebb2174886..0000000000 --- a/app/src/main/java/com/tangem/tap/core/ui/DefaultDesignFeatureToggles.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.tangem.tap.core.ui - -import com.tangem.core.configtoggle.FeatureToggles -import com.tangem.core.configtoggle.feature.FeatureTogglesManager -import com.tangem.core.ui.DesignFeatureToggles -import javax.inject.Inject - -class DefaultDesignFeatureToggles @Inject constructor( - private val featureTogglesManager: FeatureTogglesManager, -) : DesignFeatureToggles { - - override val isRedesignEnabled: Boolean - get() = true - - override val isWarningsRefactoringEnabled: Boolean - get() = featureTogglesManager.isFeatureEnabled(FeatureToggles.AND_14829_WARNINGS_REFACTORING_ENABLED) -} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/di/UiDependenciesModule.kt b/app/src/main/java/com/tangem/tap/di/UiDependenciesModule.kt index bf500d19e8..5a8327d167 100644 --- a/app/src/main/java/com/tangem/tap/di/UiDependenciesModule.kt +++ b/app/src/main/java/com/tangem/tap/di/UiDependenciesModule.kt @@ -4,7 +4,6 @@ import androidx.compose.material3.SnackbarHostState import com.tangem.core.decompose.di.GlobalUiMessageSender import com.tangem.core.decompose.ui.DefaultUiMessageSender import com.tangem.core.decompose.ui.UiMessageSender -import com.tangem.core.ui.DesignFeatureToggles import com.tangem.core.ui.UiDependencies import com.tangem.core.ui.components.snackbar.TangemTopSnackbarHostState import com.tangem.core.ui.haptic.VibratorHapticManager @@ -25,7 +24,6 @@ internal object UiDependenciesModule { fun provideUiDependencies( vibratorHapticManager: VibratorHapticManager, appThemeModeHolder: AppThemeModeHolder, - designFeatureToggles: DesignFeatureToggles, ): UiDependencies { return object : UiDependencies { override val vibratorHapticManager = vibratorHapticManager @@ -33,7 +31,6 @@ internal object UiDependenciesModule { override val globalSnackbarHostState: SnackbarHostState = SnackbarHostState() override val globalTopSnackbarHostState: TangemTopSnackbarHostState = TangemTopSnackbarHostState() override val eventMessageHandler: EventMessageHandler = EventMessageHandler() - override val designFeatureToggles: DesignFeatureToggles = designFeatureToggles } } diff --git a/app/src/main/java/com/tangem/tap/di/core/ui/CoreUiBindsModule.kt b/app/src/main/java/com/tangem/tap/di/core/ui/CoreUiBindsModule.kt deleted file mode 100644 index b02028c5bf..0000000000 --- a/app/src/main/java/com/tangem/tap/di/core/ui/CoreUiBindsModule.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.tangem.tap.di.core.ui - -import com.tangem.core.ui.DesignFeatureToggles -import com.tangem.tap.core.ui.DefaultDesignFeatureToggles -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent - -@Module -@InstallIn(SingletonComponent::class) -interface CoreUiBindsModule { - - @Binds - fun bindDesignFeatureToggles(impl: DefaultDesignFeatureToggles): DesignFeatureToggles -} \ No newline at end of file diff --git a/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/MarketsListItemPlaceholder.kt b/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/MarketsListItemPlaceholder.kt index 410ecbdc54..cee1c12257 100644 --- a/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/MarketsListItemPlaceholder.kt +++ b/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/MarketsListItemPlaceholder.kt @@ -4,7 +4,6 @@ import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview @@ -93,11 +92,9 @@ private fun PreviewV1() { @Composable private fun PreviewV2() { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - Column(Modifier.background(TangemTheme.colors2.surface.level3)) { - repeat(20) { - MarketsListItemPlaceholder() - } + Column(Modifier.background(TangemTheme.colors2.surface.level3)) { + repeat(20) { + MarketsListItemPlaceholder() } } } diff --git a/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverter.kt b/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverter.kt index a4c5eb7019..78e6e28675 100644 --- a/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverter.kt +++ b/common/ui-markets/src/main/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverter.kt @@ -12,10 +12,9 @@ object QuickActionsConverter { fun quickActions( cryptoData: CryptoCurrencyData, tokenActionsHandler: TokenActionsHandler, - isRedesignEnabled: Boolean, context: TokenActionsContext = TokenActionsContext.Markets, ): QuickActions { - val states = toQuickActionStates(cryptoData.actions, isRedesignEnabled, context) + val states = toQuickActionStates(cryptoData.actions, context) return QuickActions( actions = states.map { it.action }.toImmutableList(), onQuickActionClick = { quickActionUM -> @@ -70,21 +69,18 @@ object QuickActionsConverter { */ fun toQuickActions( actions: List, - isRedesignEnabled: Boolean, context: TokenActionsContext = TokenActionsContext.Markets, - ): ImmutableList = - toQuickActionStates(actions, isRedesignEnabled, context).map { it.action }.toImmutableList() + ): ImmutableList = toQuickActionStates(actions, context).map { it.action }.toImmutableList() private fun toQuickActionStates( actions: List, - isRedesignEnabled: Boolean, context: TokenActionsContext, ): List { val allowed = context.allowedActionsInOrder ?: return actions .filter { it.unavailabilityReason == ScenarioUnavailabilityReason.None } .mapNotNull { action -> - action.toQuickActionUM(isRedesignEnabled)?.let { QuickActionState(it, isEnabled = true) } + action.toQuickActionUM()?.let { QuickActionState(it, isEnabled = true) } } val byBsAction = actions.associateBy { it.toBsAction() } @@ -94,13 +90,13 @@ object QuickActionsConverter { when (action) { TokenActionsBSContentUM.Action.SendWithSwap -> if (isExchangeAvailable) { - QuickActionState(swapAndSendUM(isRedesignEnabled), isEnabled = true) + QuickActionState(QuickActionUM.V2.SwapAndSend, isEnabled = true) } else { null } else -> { val state = byBsAction[action] ?: return@mapNotNull null - val um = state.toQuickActionUM(isRedesignEnabled) ?: return@mapNotNull null + val um = state.toQuickActionUM() ?: return@mapNotNull null QuickActionState(um, isEnabled = state.unavailabilityReason == ScenarioUnavailabilityReason.None) } } @@ -109,13 +105,7 @@ object QuickActionsConverter { private data class QuickActionState(val action: QuickActionUM, val isEnabled: Boolean) - private fun swapAndSendUM(isRedesignEnabled: Boolean): QuickActionUM = - if (isRedesignEnabled) QuickActionUM.V2.SwapAndSend else QuickActionUM.V1.SwapAndSend - - private fun TokenActionsState.ActionState.toQuickActionUM(isRedesignEnabled: Boolean): QuickActionUM? = - if (isRedesignEnabled) toV2() else toV1() - - private fun TokenActionsState.ActionState.toV2(): QuickActionUM? = when (this) { + private fun TokenActionsState.ActionState.toQuickActionUM(): QuickActionUM? = when (this) { is TokenActionsState.ActionState.Buy -> QuickActionUM.V2.Buy is TokenActionsState.ActionState.Swap -> QuickActionUM.V2.Exchange(shouldShowBadge) is TokenActionsState.ActionState.Receive -> QuickActionUM.V2.Receive @@ -126,17 +116,6 @@ object QuickActionsConverter { else -> null } - private fun TokenActionsState.ActionState.toV1(): QuickActionUM? = when (this) { - is TokenActionsState.ActionState.Buy -> QuickActionUM.V1.Buy - is TokenActionsState.ActionState.Swap -> QuickActionUM.V1.Exchange(shouldShowBadge) - is TokenActionsState.ActionState.Receive -> QuickActionUM.V1.Receive - is TokenActionsState.ActionState.Send -> QuickActionUM.V1.Send - is TokenActionsState.ActionState.Sell -> QuickActionUM.V1.Sell - is TokenActionsState.ActionState.Stake -> QuickActionUM.V1.Stake - is TokenActionsState.ActionState.YieldMode -> QuickActionUM.V1.YieldMode(apy) - else -> null - } - private fun TokenActionsState.ActionState.toBsAction(): TokenActionsBSContentUM.Action? = when (this) { is TokenActionsState.ActionState.Buy -> TokenActionsBSContentUM.Action.Buy is TokenActionsState.ActionState.Swap -> TokenActionsBSContentUM.Action.Exchange diff --git a/common/ui-markets/src/test/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverterTest.kt b/common/ui-markets/src/test/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverterTest.kt index c470ad2253..229ee12c47 100644 --- a/common/ui-markets/src/test/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverterTest.kt +++ b/common/ui-markets/src/test/kotlin/com/tangem/common/ui/markets/action/QuickActionsConverterTest.kt @@ -21,7 +21,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.AddFunds, ) @@ -45,7 +44,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.Markets, ) @@ -68,7 +66,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.Markets, ) @@ -92,7 +89,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.Transfer, ) @@ -116,7 +112,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.Transfer, ) @@ -141,7 +136,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.AddFunds, ) @@ -167,7 +161,6 @@ internal class QuickActionsConverterTest { // Act val result = QuickActionsConverter.toQuickActions( actions = actions, - isRedesignEnabled = true, context = TokenActionsContext.Transfer, ) @@ -194,7 +187,6 @@ internal class QuickActionsConverterTest { val result = QuickActionsConverter.quickActions( cryptoData = cryptoData(actions), tokenActionsHandler = mockk(relaxed = true), - isRedesignEnabled = true, context = TokenActionsContext.Transfer, ) @@ -215,7 +207,6 @@ internal class QuickActionsConverterTest { val result = QuickActionsConverter.quickActions( cryptoData = cryptoData(actions), tokenActionsHandler = mockk(relaxed = true), - isRedesignEnabled = true, context = TokenActionsContext.AddFunds, ) diff --git a/common/ui/src/main/java/com/tangem/common/ui/account/PortfolioSelectRow.kt b/common/ui/src/main/java/com/tangem/common/ui/account/PortfolioSelectRow.kt index 2e6d8cc553..5b0eb6b72f 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/account/PortfolioSelectRow.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/account/PortfolioSelectRow.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.Immutable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -30,7 +29,6 @@ import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -190,12 +188,10 @@ private fun PortfolioSelectRowPreview(@PreviewParameter(PreviewProvider::class) @Composable private fun PortfolioSelectRowPreviewV2(@PreviewParameter(PreviewProvider::class) state: PortfolioSelectUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - PortfolioSelectRowV2( - state = state, - modifier = Modifier.background(TangemTheme.colors2.surface.level3), - ) - } + PortfolioSelectRowV2( + state = state, + modifier = Modifier.background(TangemTheme.colors2.surface.level3), + ) } } diff --git a/common/ui/src/main/java/com/tangem/common/ui/addtoken/AddTokenContentV2.kt b/common/ui/src/main/java/com/tangem/common/ui/addtoken/AddTokenContentV2.kt index 215283148e..bec183e118 100644 --- a/common/ui/src/main/java/com/tangem/common/ui/addtoken/AddTokenContentV2.kt +++ b/common/ui/src/main/java/com/tangem/common/ui/addtoken/AddTokenContentV2.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -37,7 +36,6 @@ import com.tangem.core.ui.ds.row.TangemRowContainer import com.tangem.core.ui.ds.row.TangemRowLayoutId import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -202,15 +200,13 @@ private fun AddButton(state: AddTokenUM.Button, modifier: Modifier = Modifier) { @Composable private fun Preview(@PreviewParameter(PreviewProvider::class) state: AddTokenUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - Box( - modifier = Modifier - .fillMaxWidth() - .background(TangemTheme.colors2.surface.level2) - .padding(horizontal = 16.dp), - ) { - AddTokenContentV2(state = state) - } + Box( + modifier = Modifier + .fillMaxWidth() + .background(TangemTheme.colors2.surface.level2) + .padding(horizontal = 16.dp), + ) { + AddTokenContentV2(state = state) } } } \ No newline at end of file diff --git a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusItemsLegacy.kt b/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusItemsLegacy.kt deleted file mode 100644 index 92ba061053..0000000000 --- a/common/ui/src/main/java/com/tangem/common/ui/expressStatus/ExpressStatusItemsLegacy.kt +++ /dev/null @@ -1,46 +0,0 @@ -package com.tangem.common.ui.expressStatus - -import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.ui.Modifier -import com.tangem.common.ui.R -import com.tangem.common.ui.expressStatus.state.ExpressTransactionStateIconUM -import com.tangem.common.ui.expressStatus.state.ExpressTransactionStateUM -import com.tangem.core.ui.res.TangemTheme -import kotlinx.collections.immutable.PersistentList - -fun LazyListScope.expressTransactionsItemsLegacy( - expressTxs: PersistentList, - modifier: Modifier = Modifier, -) { - items( - count = expressTxs.size, - key = { index -> expressTxs[index].info.txId }, - contentType = { index -> expressTxs[index]::class.java }, - ) { index -> - val itemInfo = expressTxs[index].info - val (iconRes, tint) = when (itemInfo.iconState) { - ExpressTransactionStateIconUM.Warning -> { - R.drawable.ic_alert_triangle_20 to TangemTheme.colors.icon.attention - } - ExpressTransactionStateIconUM.Error -> { - R.drawable.ic_alert_circle_24 to TangemTheme.colors.icon.warning - } - ExpressTransactionStateIconUM.None -> null to null - } - - ExpressStatusItem( - title = itemInfo.title, - fromTokenIconState = itemInfo.fromCurrencyIcon, - toTokenIconState = itemInfo.toCurrencyIcon, - fromAmount = itemInfo.fromAmount, - fromSymbol = itemInfo.fromAmountSymbol, - toAmount = itemInfo.toAmount, - toSymbol = itemInfo.toAmountSymbol, - subtitle = itemInfo.subtitle, - onClick = itemInfo.onClick, - infoIconRes = iconRes, - infoIconTint = tint, - modifier = modifier.animateItem(), - ) - } -} \ No newline at end of file diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json index 7feb32e9ad..ff55104cfe 100644 --- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json @@ -19,10 +19,6 @@ "name": "TWI_485_USEDESK_ENABLED", "version": "undefined" }, - { - "name": "APP_REDESIGN_ENABLED", - "version": "6.0" - }, { "name": "VIRTUAL_ACCOUNTS_ENABLED", "version": "undefined" diff --git a/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt index 73c3b4de0b..72b516fd2a 100644 --- a/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt +++ b/core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesNamingConventionTest.kt @@ -39,7 +39,6 @@ internal class FeatureTogglesNamingConventionTest { /** Toggles created before the AND_/TWI_ naming convention. Do NOT add new entries. */ val EXCLUDED_TOGGLES_LIST = setOf( "ADDRESS_SYNC_ENABLED", - "APP_REDESIGN_ENABLED", "NEW_CARD_SCANNING_ENABLED", "VIRTUAL_ACCOUNTS_ENABLED", "VISA_ONBOARDING_ENABLED", diff --git a/core/ui/src/main/java/com/tangem/core/ui/DesignFeatureToggles.kt b/core/ui/src/main/java/com/tangem/core/ui/DesignFeatureToggles.kt deleted file mode 100644 index f66c937b3b..0000000000 --- a/core/ui/src/main/java/com/tangem/core/ui/DesignFeatureToggles.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.tangem.core.ui - -interface DesignFeatureToggles { - val isRedesignEnabled: Boolean - - val isWarningsRefactoringEnabled: Boolean -} \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/UiDependencies.kt b/core/ui/src/main/java/com/tangem/core/ui/UiDependencies.kt index 84b5333435..d44c8cf1a3 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/UiDependencies.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/UiDependencies.kt @@ -19,6 +19,4 @@ interface UiDependencies { val globalTopSnackbarHostState: TangemTopSnackbarHostState val eventMessageHandler: EventMessageHandler - - val designFeatureToggles: DesignFeatureToggles } \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/UnableToLoadData.kt b/core/ui/src/main/java/com/tangem/core/ui/components/UnableToLoadData.kt index f3275d7024..be48fda46d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/UnableToLoadData.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/UnableToLoadData.kt @@ -10,44 +10,15 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.tangem.core.ui.R -import com.tangem.core.ui.components.buttons.SecondarySmallButton -import com.tangem.core.ui.components.buttons.SmallButtonConfig import com.tangem.core.ui.ds.button.* import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @Composable fun UnableToLoadData(onRetryClick: () -> Unit, modifier: Modifier = Modifier) { - if (LocalRedesignEnabled.current) { - UnableToLoadDataV2(onRetryClick, modifier) - } else { - UnableToLoadDataV1(onRetryClick, modifier) - } -} - -@Composable -private fun UnableToLoadDataV1(onRetryClick: () -> Unit, modifier: Modifier = Modifier) { - Column( - modifier = modifier, - verticalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing12), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - Text( - text = stringResourceSafe(R.string.markets_loading_error_title), - style = TangemTheme.typography.caption1, - color = TangemTheme.colors.text.tertiary, - ) - SecondarySmallButton( - config = SmallButtonConfig( - text = resourceReference(R.string.try_to_load_data_again_button_title), - onClick = onRetryClick, - ), - ) - } + UnableToLoadDataV2(onRetryClick, modifier) } @Composable @@ -80,13 +51,4 @@ private fun PreviewV2() { TangemThemePreviewRedesign { UnableToLoadDataV2(onRetryClick = {}) } -} - -@Preview -@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES) -@Composable -private fun PreviewV1() { - TangemThemePreview { - UnableToLoadDataV1(onRetryClick = {}) - } } \ No newline at end of file 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 fc037b18d9..6de753765e 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 @@ -2,22 +2,13 @@ package com.tangem.core.ui.components.bottomsheets.message import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.tangem.core.ui.res.LocalRedesignEnabled @Composable fun MessageBottomSheet(state: MessageBottomSheetUM, onDismissRequest: () -> Unit) { - if (LocalRedesignEnabled.current) { - MessageBottomSheetV2(state, onDismissRequest) - } else { - MessageBottomSheetV1(state, onDismissRequest) - } + MessageBottomSheetV2(state, onDismissRequest) } @Composable fun MessageBottomSheetContent(state: MessageBottomSheetUM, modifier: Modifier = Modifier) { - if (LocalRedesignEnabled.current) { - MessageBottomSheetContentV2(state, modifier) - } else { - MessageBottomSheetContentV1(state, modifier) - } + MessageBottomSheetContentV2(state, modifier) } \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt index a303ff1acc..5ba1764345 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/currency/icon/CurrencyIcon.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.tangem.core.ui.components.CircleShimmer import com.tangem.core.ui.extensions.conditional -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.test.TokenElementsTestTags import com.tangem.core.ui.utils.getGreyScaleColorFilter @@ -51,11 +50,7 @@ fun TangemCurrencyIcon(state: CurrencyIconState, modifier: Modifier = Modifier, modifier = iconModifier, shouldShowTopBadge = shouldDisplayNetwork, networkBadgeSize = 14.dp, - networkBadgeBackground = if (LocalRedesignEnabled.current) { - TangemTheme.colors2.surface.level1 - } else { - TangemTheme.colors.background.primary - }, + networkBadgeBackground = TangemTheme.colors2.surface.level1, ) } } diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/items/DecriptionItem.kt b/core/ui/src/main/java/com/tangem/core/ui/components/items/DecriptionItem.kt index a3dd844b63..fbed962074 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/items/DecriptionItem.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/items/DecriptionItem.kt @@ -7,10 +7,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.text.SpanStyle -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview @@ -21,7 +19,6 @@ import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -34,67 +31,13 @@ fun DescriptionItem( hasFullDescription: Boolean, onReadMoreClick: () -> Unit, modifier: Modifier = Modifier, - textStyle: TextStyle = TangemTheme.typography.body2, ) { - if (LocalRedesignEnabled.current) { - DescriptionItemV2( - description = description, - hasFullDescription = hasFullDescription, - onReadMoreClick = onReadMoreClick, - modifier = modifier, - ) - } else { - DescriptionItemV1( - description = description, - hasFullDescription = hasFullDescription, - onReadMoreClick = onReadMoreClick, - modifier = modifier, - textStyle = textStyle, - ) - } -} - -@Composable -private fun DescriptionItemV1( - description: TextReference, - hasFullDescription: Boolean, - onReadMoreClick: () -> Unit, - modifier: Modifier = Modifier, - textStyle: TextStyle = TangemTheme.typography.body2, -) { - if (hasFullDescription) { - val text = buildAnnotatedString { - withStyle(SpanStyle(color = TangemTheme.colors.text.secondary)) { - append(description.resolveReference()) - } - withStyle(SpanStyle(color = TangemTheme.colors.text.accent)) { - append( - " " + stringResourceSafe(R.string.common_read_more).replace( - ' ', - StringsSigns.NON_BREAKING_SPACE, - ), - ) - } - } - - Text( - modifier = modifier - .clickable( - interactionSource = null, - indication = null, - onClick = onReadMoreClick, - ), - text = text, - style = textStyle, - ) - } else { - Text( - modifier = modifier, - text = description.resolveReference(), - style = textStyle, - color = TangemTheme.colors.text.secondary, - ) - } + DescriptionItemV2( + description = description, + hasFullDescription = hasFullDescription, + onReadMoreClick = onReadMoreClick, + modifier = modifier, + ) } @Composable @@ -141,34 +84,7 @@ private fun DescriptionItemV2( @Composable fun DescriptionPlaceholder(modifier: Modifier = Modifier) { - if (LocalRedesignEnabled.current) { - DescriptionPlaceholderV2(modifier) - } else { - DescriptionPlaceholderV1(modifier) - } -} - -@Composable -private fun DescriptionPlaceholderV1(modifier: Modifier = Modifier) { - Column( - modifier = modifier, - ) { - TextShimmer( - modifier = Modifier.fillMaxWidth(), - style = TangemTheme.typography.body2, - textSizeHeight = true, - ) - TextShimmer( - modifier = Modifier.fillMaxWidth(), - style = TangemTheme.typography.body2, - textSizeHeight = true, - ) - TextShimmer( - modifier = Modifier.fillMaxWidth(fraction = 0.8f), - style = TangemTheme.typography.body2, - textSizeHeight = true, - ) - } + DescriptionPlaceholderV2(modifier) } @Composable @@ -213,17 +129,15 @@ private fun ContentPreviewV1() { @Preview @Composable private fun ContentPreviewV2() { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - TangemThemePreviewRedesign { - DescriptionItem( - description = stringReference( - "XRP (XRP) is a cryptocurrency launched in January 2009, where the first " + - "genesis block was mined on 9th January 2009", - ), - hasFullDescription = true, - onReadMoreClick = {}, - ) - } + TangemThemePreviewRedesign { + DescriptionItem( + description = stringReference( + "XRP (XRP) is a cryptocurrency launched in January 2009, where the first " + + "genesis block was mined on 9th January 2009", + ), + hasFullDescription = true, + onReadMoreClick = {}, + ) } } @@ -245,16 +159,14 @@ private fun PreviewPlaceholderV1() { @Preview @Composable private fun PreviewPlaceholderV2() { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - TangemThemePreviewRedesign { - PreviewShimmerContainer( - actualContent = { - ContentPreviewV2() - }, - shimmerContent = { - DescriptionPlaceholder() - }, - ) - } + TangemThemePreviewRedesign { + PreviewShimmerContainer( + actualContent = { + ContentPreviewV2() + }, + shimmerContent = { + DescriptionPlaceholder() + }, + ) } } \ No newline at end of file diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeInPercent.kt b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeInPercent.kt index c4882dcdc8..03a163d8db 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeInPercent.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/components/marketprice/PriceChangeInPercent.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector @@ -14,7 +13,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import com.tangem.core.ui.R -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -27,72 +25,13 @@ fun PriceChangeInPercent( modifier: Modifier = Modifier, isDisabled: Boolean = false, ) { - if (LocalRedesignEnabled.current) { - PriceChangeInPercentV2( - modifier = modifier, - valueInPercent = valueInPercent, - type = type, - textStyle = textStyle, - isDisabled = isDisabled, - ) - } else { - PriceChangeInPercentV1( - modifier = modifier, - valueInPercent = valueInPercent, - type = type, - textStyle = textStyle, - ) - } -} - -@Composable -private fun PriceChangeInPercentV1( - valueInPercent: String, - type: PriceChangeType, - textStyle: TextStyle, - modifier: Modifier = Modifier, -) { - if (valueInPercent.isBlank()) { - Box(modifier) - return - } - - Row( + PriceChangeInPercentV2( modifier = modifier, - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(space = TangemTheme.dimens.spacing2), - ) { - Icon( - modifier = Modifier - .size(TangemTheme.dimens.size8) - .align(Alignment.CenterVertically), - imageVector = ImageVector.vectorResource( - id = when (type) { - PriceChangeType.UP -> R.drawable.ic_arrow_up_8 - PriceChangeType.DOWN -> R.drawable.ic_arrow_down_8 - PriceChangeType.NEUTRAL -> R.drawable.ic_elipse_8 - }, - ), - tint = when (type) { - PriceChangeType.UP -> TangemTheme.colors.icon.accent - PriceChangeType.DOWN -> TangemTheme.colors.icon.warning - PriceChangeType.NEUTRAL -> TangemTheme.colors.icon.inactive - }, - contentDescription = null, - ) - - Text( - text = valueInPercent, - color = when (type) { - PriceChangeType.UP -> TangemTheme.colors.text.accent - PriceChangeType.DOWN -> TangemTheme.colors.text.warning - PriceChangeType.NEUTRAL -> TangemTheme.colors.text.disabled - }, - style = textStyle, - overflow = TextOverflow.Visible, - maxLines = 1, - ) - } + valueInPercent = valueInPercent, + type = type, + textStyle = textStyle, + isDisabled = isDisabled, + ) } @Composable @@ -191,31 +130,29 @@ private fun PreviewV1() { @Composable private fun PreviewV2() { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - Column { - PriceChangeInPercent( - valueInPercent = "52.00%", - type = PriceChangeType.NEUTRAL, - textStyle = TangemTheme.typography2.captionRegular12, - ) - PriceChangeInPercent( - valueInPercent = "52.00%", - type = PriceChangeType.UP, - textStyle = TangemTheme.typography2.captionRegular12, - isDisabled = true, - ) - PriceChangeInPercent( - valueInPercent = "52.00%", - type = PriceChangeType.DOWN, - textStyle = TangemTheme.typography2.captionRegular12, - isDisabled = false, - ) - PriceChangeInPercent( - valueInPercent = "52.00%", - type = PriceChangeType.DOWN, - textStyle = TangemTheme.typography2.captionRegular12, - ) - } + Column { + PriceChangeInPercent( + valueInPercent = "52.00%", + type = PriceChangeType.NEUTRAL, + textStyle = TangemTheme.typography2.captionRegular12, + ) + PriceChangeInPercent( + valueInPercent = "52.00%", + type = PriceChangeType.UP, + textStyle = TangemTheme.typography2.captionRegular12, + isDisabled = true, + ) + PriceChangeInPercent( + valueInPercent = "52.00%", + type = PriceChangeType.DOWN, + textStyle = TangemTheme.typography2.captionRegular12, + isDisabled = false, + ) + PriceChangeInPercent( + valueInPercent = "52.00%", + type = PriceChangeType.DOWN, + textStyle = TangemTheme.typography2.captionRegular12, + ) } } } 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 116a4e795a..244c22de45 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 @@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.SnackbarDuration -import androidx.compose.material3.SnackbarHostState -import androidx.compose.material3.SnackbarResult import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -28,10 +25,6 @@ import com.tangem.core.ui.res.* @Composable fun EventMessageEffect( messageHandler: EventMessageHandler = LocalEventMessageHandler.current, - snackbarHostState: SnackbarHostState = LocalSnackbarHostState.current, - onShowSnackbar: suspend (SnackbarMessage, Context) -> Unit = { message, context -> - showSnackbar(snackbarHostState, message, context) - }, topSnackbarHostState: TangemTopSnackbarHostState = LocalTopSnackbarHostState.current, onShowTopSnackbar: suspend (SnackbarMessage) -> Unit = { message -> topSnackbarHostState.showSnackbar(message) @@ -44,16 +37,11 @@ fun EventMessageEffect( var dialogMessage: DialogMessage? by remember { mutableStateOf(value = null) } var bottomSheetMessage: BottomSheetMessage? by remember { mutableStateOf(value = null) } var loadingMessage: GlobalLoadingMessage? by remember { mutableStateOf(value = null) } - val isRedesignEnabled = LocalRedesignEnabled.current EventEffect(event = messageEvent) { message -> when (message) { is SnackbarMessage -> { - if (isRedesignEnabled) { - onShowTopSnackbar(message) - } else { - onShowSnackbar(message, context) - } + onShowTopSnackbar(message) } is DialogMessage -> { dialogMessage = message @@ -155,23 +143,6 @@ private fun MessageDialog(message: DialogMessage, onDismissRequest: () -> Unit) ) } -private suspend fun showSnackbar(snackbarHostState: SnackbarHostState, message: SnackbarMessage, context: Context) { - val result = snackbarHostState.showSnackbar( - message = message.message.resolveReference(context.resources), - actionLabel = message.actionLabel?.resolveReference(context.resources), - duration = when (message.duration) { - SnackbarMessage.Duration.Short -> SnackbarDuration.Short - SnackbarMessage.Duration.Long -> SnackbarDuration.Long - SnackbarMessage.Duration.Indefinite -> SnackbarDuration.Indefinite - }, - ) - - when (result) { - SnackbarResult.Dismissed -> message.onDismissRequest() - SnackbarResult.ActionPerformed -> message.action?.invoke() - } -} - private fun showToast(message: ToastMessage, context: Context) { Toast.makeText( /* context = */ context, diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt index 7ea6cfb4c7..cd972eaf5c 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt @@ -65,11 +65,7 @@ fun TangemTheme( typography = typography, dimens = dimens, content = { - if (uiDependencies.designFeatureToggles.isRedesignEnabled) { - TangemThemeRedesign { content() } - } else { - content() - } + TangemThemeRedesign { content() } }, ) } @@ -452,14 +448,6 @@ val LocalHazeState = staticCompositionLocalOf { error("No HazeState provided") } -val LocalRedesignEnabled = staticCompositionLocalOf { - false -} - -val LocalVisaRedesignEnabled = staticCompositionLocalOf { - false -} - val LocalPowerSavingState = compositionLocalOf { error("No PowerSavingState provided") } diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt index cc4967aeb3..be94de6a9d 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt @@ -37,7 +37,6 @@ fun TangemThemeRedesign(content: @Composable () -> Unit) { colorScheme = tangemColorScheme(colors = rememberedColors), ) { CompositionLocalProvider( - LocalRedesignEnabled provides true, LocalTangemColors provides rememberedColors, LocalTangemColors2 provides if (LocalIsInDarkTheme.current) darkThemeColors2() else lightThemeColors2(), LocalTangemColors3 provides rememberedColors3, diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt index 89a691bfa4..b828f87571 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/model/AddToPortfolioModel.kt @@ -395,7 +395,7 @@ internal class AddToPortfolioModel @Inject constructor( currency = addedToken.currency, accountId = selectedPortfolio.account.account.account.accountId, ).onEach { state -> - val requestedQuickActions = toQuickActions(state.states, isRedesignEnabled = true) + val requestedQuickActions = toQuickActions(state.states) when { requestedQuickActions.isNotEmpty() -> { timerJob.cancel() diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/ChooseNetworkContent.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/ChooseNetworkContent.kt index 13f8c911ba..0d2c04dc6b 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/ChooseNetworkContent.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/addtoportfolio/ui/ChooseNetworkContent.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -36,7 +35,6 @@ import com.tangem.core.ui.ds.row.TangemRowContainer import com.tangem.core.ui.ds.row.TangemRowLayoutId import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringResourceSafe -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -220,11 +218,9 @@ private fun Preview(@PreviewParameter(ChooseNetworkContentProvider::class) conte @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) private fun PreviewV2(@PreviewParameter(ChooseNetworkContentProvider::class) content: ChooseNetworkUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - ChooseNetworkContent( - state = content, - ) - } + ChooseNetworkContent( + state = content, + ) } } diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/choosetoken/ui/ChooseTokenScreen.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/choosetoken/ui/ChooseTokenScreen.kt index b3b3e5af67..cc70dc93b0 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/choosetoken/ui/ChooseTokenScreen.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/choosetoken/ui/ChooseTokenScreen.kt @@ -77,7 +77,7 @@ import com.tangem.core.ui.ds.row.token.internal.TokenRowTitle import com.tangem.core.ui.extensions.* import com.tangem.core.ui.res.TangemColorPalette import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview +import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.core.ui.test.BuyTokenScreenTestTags import com.tangem.core.ui.utils.ProvideSharedTransitionScope import com.tangem.core.ui.utils.TangemSharedTransitionLayout @@ -851,7 +851,7 @@ private fun LazyListScope.tokensNotFound(modifier: Modifier = Modifier) { @Preview @Composable private fun TokenScreenPreview(@PreviewParameter(ChooseTokenScreenPreviewProvider::class) state: ChooseTokenFullUM) { - TangemThemePreview { + TangemThemePreviewRedesign { ChooseTokenScreen( state = state, modifier = Modifier, diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt index cd4bf2fd29..983aab32d5 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorBS.kt @@ -4,7 +4,6 @@ import android.content.res.Configuration import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter @@ -14,7 +13,6 @@ import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfig import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetType import com.tangem.core.ui.ds2.topnavigation.TangemTopNavigation -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign @@ -73,13 +71,11 @@ private fun Preview(@PreviewParameter(PortfolioSelectorPreviewStateProvider::cla @Composable private fun PreviewV2(@PreviewParameter(PortfolioSelectorPreviewStateProvider::class) params: PortfolioSelectorUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - PortfolioSelectorBS( - state = params, - onDismiss = {}, - modifier = Modifier, - onBack = {}, - ) - } + PortfolioSelectorBS( + state = params, + onDismiss = {}, + modifier = Modifier, + onBack = {}, + ) } } \ No newline at end of file diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt index 8a3c4a4e65..d819c761b4 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/portfolioselector/ui/PortfolioSelectorContentV2.kt @@ -32,7 +32,6 @@ import com.tangem.core.ui.ds.row.TangemRowLayoutId import com.tangem.core.ui.extensions.conditional import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.res.LocalCanScrollBackward -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.features.commonfeatures.impl.portfolioselector.entity.PortfolioSelectorItemUM @@ -218,16 +217,14 @@ private fun WalletNameRow(model: PortfolioSelectorItemUM.GroupTitle, modifier: M @Composable private fun Preview(@PreviewParameter(PortfolioSelectorPreviewStateProvider::class) params: PortfolioSelectorUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - Box( - modifier = Modifier.fillMaxWidth(), - contentAlignment = Alignment.Center, - ) { - PortfolioSelectorContentV2( - state = params, - modifier = Modifier.background(color = TangemTheme.colors.background.tertiary), - ) - } + Box( + modifier = Modifier.fillMaxWidth(), + contentAlignment = Alignment.Center, + ) { + PortfolioSelectorContentV2( + state = params, + modifier = Modifier.background(color = TangemTheme.colors.background.tertiary), + ) } } } \ No newline at end of file diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/model/TokenActionsUiBuilder.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/model/TokenActionsUiBuilder.kt index dad1077d6b..613115b938 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/model/TokenActionsUiBuilder.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/model/TokenActionsUiBuilder.kt @@ -85,7 +85,6 @@ internal class TokenActionsUiBuilder @Inject constructor( quickActions = quickActions( cryptoData = cryptoCurrencyData, tokenActionsHandler = tokenActionsHandler, - isRedesignEnabled = true, context = params.context, ), bottomActionText = bottomActionText(bottomAction), diff --git a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt index f9c83e26ab..656ec489af 100644 --- a/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt +++ b/features/common-features/impl/src/main/java/com/tangem/features/commonfeatures/impl/tokenactions/ui/TokenActionsContentV2.kt @@ -229,17 +229,15 @@ private fun WalletPortfolioRow(name: TextReference, deviceIcon: DeviceIconUM, mo @Composable private fun Preview(@PreviewParameter(TokenActionsContentPreviewProviderV2::class) state: TokenActionsUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - Box( - modifier = Modifier - .fillMaxWidth() - .background(TangemTheme.colors2.surface.level2) - .padding(horizontal = 16.dp), - ) { - TokenActionsContentV2( - state = state, - ) - } + Box( + modifier = Modifier + .fillMaxWidth() + .background(TangemTheme.colors2.surface.level2) + .padding(horizontal = 16.dp), + ) { + TokenActionsContentV2( + state = state, + ) } } } diff --git a/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt b/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt index 26a3d76d2c..63a2d3f09b 100644 --- a/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt +++ b/features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt @@ -25,7 +25,6 @@ import com.tangem.core.ui.components.pager.PagerIndicator import com.tangem.core.ui.ds.message.TangemMessage import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme -import com.tangem.core.ui.res.TangemThemePreview import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.features.promobanners.api.PromoBannersBlockComponent.Placeholder import com.tangem.features.promobanners.impl.model.PromoBannerNotificationUM @@ -243,19 +242,6 @@ private fun previewState(bannerCount: Int) = PromoBannersBlockUM( onPageChanged = {}, ) -@Preview(showBackground = true, widthDp = 360) -@Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) -@Composable -private fun Preview_PromoBannersBlock_Legacy() { - TangemThemePreview { - PromoBannersBlock( - state = previewState(bannerCount = 2), - horizontalItemPadding = 12.dp, - modifier = Modifier.padding(vertical = 16.dp), - ) - } -} - @Preview(showBackground = true, widthDp = 360) @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES) @Composable diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/express/PreviewEmptyExpressTransactionsComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/express/PreviewEmptyExpressTransactionsComponent.kt index 0567ebae39..e4c2e25cc3 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/express/PreviewEmptyExpressTransactionsComponent.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/express/PreviewEmptyExpressTransactionsComponent.kt @@ -2,7 +2,7 @@ package com.tangem.features.tangempay.components.express import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.ui.Modifier -import com.tangem.common.ui.expressStatus.expressTransactionsItemsLegacy +import com.tangem.common.ui.expressStatus.expressTransactionsItems import com.tangem.common.ui.expressStatus.state.* import com.tangem.core.ui.components.currency.icon.CurrencyIconState import com.tangem.core.ui.extensions.TextReference @@ -17,18 +17,11 @@ internal class PreviewEmptyExpressTransactionsComponent : ExpressTransactionsCom override val state: StateFlow = MutableStateFlow(getInitialState()) - override fun LazyListScope.expressTransactionsContentLegacy( - state: PersistentList, - modifier: Modifier, - ) { - expressTransactionsItemsLegacy(expressTxs = state, modifier = modifier) - } - override fun LazyListScope.expressTransactionsContent( state: PersistentList, modifier: Modifier, ) { - expressTransactionsItemsLegacy(expressTxs = state, modifier = modifier) + expressTransactionsItems(expressTxs = state, modifier = modifier) } private fun getInitialState(): ExpressTransactionsBlockState { diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayAddFundsContentV2.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayAddFundsContentV2.kt index 4cb06f07df..9b511a2ce9 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayAddFundsContentV2.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayAddFundsContentV2.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -26,8 +25,6 @@ import com.tangem.core.ui.ds2.button.TangemButton import com.tangem.core.ui.extensions.TextReference.Res import com.tangem.core.ui.extensions.resolveReference import com.tangem.core.ui.extensions.resourceReference -import com.tangem.core.ui.res.LocalRedesignEnabled -import com.tangem.core.ui.res.LocalVisaRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.core.ui.res.generated.icons.Icons @@ -126,40 +123,35 @@ private fun TangemPayTopUpItem(state: TangemPayAddFundsItemUM, modifier: Modifie @Composable private fun TangemPayAddFundsContentPreview() { TangemThemePreviewRedesign { - CompositionLocalProvider( - LocalVisaRedesignEnabled provides true, - LocalRedesignEnabled provides true, - ) { - TangemPayAddFundsContentV2( - state = TangemPayAddFundsUM( - items = persistentListOf( - TangemPayAddFundsItemUM( - icon = TangemIconUM.Icon( - imageVector = Icons.ic_logo_tangem_20, - tintReference = { - TangemTheme.colors3.icon.brand - }, - ), - title = Res(R.string.common_exchange), - description = Res(R.string.exсhange_token_description), - onClick = {}, - ), - TangemPayAddFundsItemUM( - icon = TangemIconUM.Icon( - imageVector = Icons.ic_card_20, - tintReference = { - TangemTheme.colors3.icon.brand - }, - ), - title = Res(R.string.common_receive), - description = Res(R.string.receive_token_description), - onClick = {}, + TangemPayAddFundsContentV2( + state = TangemPayAddFundsUM( + items = persistentListOf( + TangemPayAddFundsItemUM( + icon = TangemIconUM.Icon( + imageVector = Icons.ic_logo_tangem_20, + tintReference = { + TangemTheme.colors3.icon.brand + }, ), + title = Res(R.string.common_exchange), + description = Res(R.string.exсhange_token_description), + onClick = {}, + ), + TangemPayAddFundsItemUM( + icon = TangemIconUM.Icon( + imageVector = Icons.ic_card_20, + tintReference = { + TangemTheme.colors3.icon.brand + }, + ), + title = Res(R.string.common_receive), + description = Res(R.string.receive_token_description), + onClick = {}, ), - dismiss = {}, - errorMessage = null, ), - ) - } + dismiss = {}, + errorMessage = null, + ), + ) } } \ No newline at end of file diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt index 75784a1e20..fd5cacb24e 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayCardPageScreen.kt @@ -319,18 +319,14 @@ private fun previewCardDetailsState(): TangemPayCardDetailsUM = TangemPayCardDet @Composable private fun TangemPayCardPageScreenPreviewV2() { TangemThemePreviewRedesign { - CompositionLocalProvider( - LocalRedesignEnabled provides true, - ) { - TangemPayCardPageScreen( - state = TangemPayCardPageUM.stub(), - cardSection = { - TangemPayCard( - state = previewCardDetailsState(), - modifier = Modifier.padding(horizontal = 16.dp), - ) - }, - ) - } + TangemPayCardPageScreen( + state = TangemPayCardPageUM.stub(), + cardSection = { + TangemPayCard( + state = previewCardDetailsState(), + modifier = Modifier.padding(horizontal = 16.dp), + ) + }, + ) } } \ No newline at end of file diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDailyLimitBlock.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDailyLimitBlock.kt index 2454853469..d51ea8beb0 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDailyLimitBlock.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayDailyLimitBlock.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -193,16 +192,12 @@ private fun SubtitleLimit(state: TangemPayDailyLimitBlockState, modifier: Modifi @Composable private fun PreviewV2() { TangemThemePreviewRedesign { - CompositionLocalProvider( - LocalRedesignEnabled provides true, + Column( + verticalArrangement = Arrangement.spacedBy(16.dp), ) { - Column( - verticalArrangement = Arrangement.spacedBy(16.dp), - ) { - TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Content.stub()) - TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Error(onReloadClick = {})) - TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Loading) - } + TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Content.stub()) + TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Error(onReloadClick = {})) + TangemPayDailyLimitBlock(state = TangemPayDailyLimitBlockState.Loading) } } } \ No newline at end of file diff --git a/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/component/DefaultTangemPayMainBlockComponent.kt b/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/component/DefaultTangemPayMainBlockComponent.kt index e2b4e2f930..97e47c1bf5 100644 --- a/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/component/DefaultTangemPayMainBlockComponent.kt +++ b/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/component/DefaultTangemPayMainBlockComponent.kt @@ -3,10 +3,8 @@ package com.tangem.features.tangempay.component import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.ui.Modifier import com.tangem.core.decompose.context.AppComponentContext -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.features.tangempay.entity.TangemPayMainUM import com.tangem.features.tangempay.ui.TangemPayMainBlockContent -import com.tangem.features.tangempay.ui.TangemPayMainBlockItem import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -28,11 +26,7 @@ internal class DefaultTangemPayMainBlockComponent @AssistedInject constructor( key = TANGEM_PAY_ACCOUNT_CONTENT_TYPE, contentType = TANGEM_PAY_ACCOUNT_CONTENT_TYPE, ) { - if (LocalRedesignEnabled.current) { - TangemPayMainBlockContent(state, isBalanceHidden, modifier) - } else { - TangemPayMainBlockItem(state, isBalanceHidden, modifier) - } + TangemPayMainBlockContent(state, isBalanceHidden, modifier) } } diff --git a/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayMainBlockContent.kt b/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayMainBlockContent.kt index 6fc54eed14..3afe7d5419 100644 --- a/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayMainBlockContent.kt +++ b/features/tangempay/main/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayMainBlockContent.kt @@ -31,7 +31,6 @@ import com.tangem.core.ui.components.text.applyBladeBrush import com.tangem.core.ui.ds.row.TangemRowContainer import com.tangem.core.ui.ds.row.TangemRowLayoutId import com.tangem.core.ui.extensions.* -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.core.ui.test.TangemPayTestTags @@ -284,8 +283,7 @@ private fun TangemPayMainLoading(modifier: Modifier = Modifier) { @Composable private fun getVisaIconPainter(): Painter { - val resource = if (LocalRedesignEnabled.current) R.drawable.ic_visa_in_banner else R.drawable.img_visa_36 - return painterResource(resource) + return painterResource(R.drawable.ic_visa_in_banner) } // region Preview diff --git a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/ExpressTransactionsComponent.kt b/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/ExpressTransactionsComponent.kt index b2e7362937..c2eec143ea 100644 --- a/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/ExpressTransactionsComponent.kt +++ b/features/tokendetails/api/src/main/kotlin/com/tangem/features/tokendetails/ExpressTransactionsComponent.kt @@ -16,11 +16,6 @@ interface ExpressTransactionsComponent { val state: StateFlow - fun LazyListScope.expressTransactionsContentLegacy( - state: PersistentList, - modifier: Modifier, - ) - fun LazyListScope.expressTransactionsContent(state: PersistentList, modifier: Modifier) data class Params( diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/DefaultExpressTransactionsComponent.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/DefaultExpressTransactionsComponent.kt index 299af6e826..6ef03e4613 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/DefaultExpressTransactionsComponent.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/DefaultExpressTransactionsComponent.kt @@ -5,7 +5,6 @@ import androidx.compose.runtime.Stable import androidx.compose.ui.Modifier import com.arkivanov.essenty.lifecycle.subscribe import com.tangem.common.ui.expressStatus.expressTransactionsItems -import com.tangem.common.ui.expressStatus.expressTransactionsItemsLegacy import com.tangem.common.ui.expressStatus.state.ExpressTransactionStateUM import com.tangem.common.ui.expressStatus.state.ExpressTransactionsBlockState import com.tangem.core.decompose.context.AppComponentContext @@ -34,13 +33,6 @@ internal class DefaultExpressTransactionsComponent @AssistedInject constructor( ) } - override fun LazyListScope.expressTransactionsContentLegacy( - state: PersistentList, - modifier: Modifier, - ) { - expressTransactionsItemsLegacy(expressTxs = state, modifier = modifier) - } - override fun LazyListScope.expressTransactionsContent( state: PersistentList, modifier: Modifier, diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt index 38d0061d02..a8dbb984ad 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsScreen.kt @@ -348,11 +348,6 @@ private val PreviewExpressTransactionsComponent = object : ExpressTransactionsCo ), ) - override fun LazyListScope.expressTransactionsContentLegacy( - state: PersistentList, - modifier: Modifier, - ) = Unit - override fun LazyListScope.expressTransactionsContent( state: PersistentList, modifier: Modifier, diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/bottomsheet/TransferBottomSheetContent.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/bottomsheet/TransferBottomSheetContent.kt index 907b472f7c..b395483b2b 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/bottomsheet/TransferBottomSheetContent.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/bottomsheet/TransferBottomSheetContent.kt @@ -17,7 +17,6 @@ import com.tangem.core.ui.ds.button.TangemButtonSize import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.LocalHazeState -import com.tangem.core.ui.res.LocalRedesignEnabled import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreviewRedesign import com.tangem.feature.tokendetails.presentation.tokendetails.state.TransferUM @@ -143,13 +142,11 @@ private fun TailLoader() { @Composable private fun Preview(@PreviewParameter(TransferPreviewProvider::class) state: TransferUM) { TangemThemePreviewRedesign { - CompositionLocalProvider(LocalRedesignEnabled provides true) { - TransferBottomSheetContent( - state = state, - onCloseClick = {}, - modifier = Modifier.padding(horizontal = 16.dp), - ) - } + TransferBottomSheetContent( + state = state, + onCloseClick = {}, + modifier = Modifier.padding(horizontal = 16.dp), + ) } } diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt index 9282b02b5b..8be654d28f 100644 --- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt +++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/WalletSettingsScreen.kt @@ -467,7 +467,6 @@ private fun DescriptionWithMoreBlock( .padding(horizontal = 12.dp), description = model.text, hasFullDescription = true, - textStyle = TangemTheme.typography.caption2, onReadMoreClick = onDescriptionClick, ) } diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcConnectionsComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcConnectionsComponent.kt index 8dbef0e3bb..f93aed9685 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcConnectionsComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/components/WcConnectionsComponent.kt @@ -46,7 +46,7 @@ internal class WcConnectionsComponent( WcConnectionsContent(modifier = modifier, state = state, snackbarHostState = snackbarHostState) - EventMessageEffect(messageHandler = messageHandler, snackbarHostState = snackbarHostState) + EventMessageEffect(messageHandler = messageHandler) bottomSheet.child?.instance?.BottomSheet() }