From c19963f30dd693180d3caf57e9759c742dcfd3fd Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 24 Jul 2026 11:00:29 +0200 Subject: [PATCH] Updated on 2026-08-14 --- .../UpdateSaveButtonTransformer.kt | 2 +- .../components/DefaultFeedEntryComponent.kt | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateSaveButtonTransformer.kt b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateSaveButtonTransformer.kt index 56c0380b37..3b1ee06e4a 100644 --- a/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateSaveButtonTransformer.kt +++ b/features/address-book/impl/src/main/kotlin/com/tangem/features/addressbook/editcontact/state/transformers/UpdateSaveButtonTransformer.kt @@ -22,7 +22,7 @@ internal class UpdateSaveButtonTransformer( isLoading = isLoading, tangemIconUM = TangemIconUM.Icon(imageVector = Icons.ic_logo_tangem_24).takeIf { isColdWallet }, text = if (isNewContact) { - resourceReference(R.string.address_book_add_address) + resourceReference(R.string.address_book_add_contact) } else { resourceReference(R.string.address_book_save_contact) }, diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt index 3efbbb2670..5501157dc6 100644 --- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt +++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt @@ -14,6 +14,8 @@ import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.decompose.navigation.inner.InnerRouter import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState import com.tangem.core.ui.decompose.ComposableModularBottomSheetContentComponent +import com.tangem.core.ui.res.LocalMainBottomSheetColor +import com.tangem.core.ui.res.TangemTheme import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.markets.PreselectedMarketsInterval import com.tangem.domain.markets.PreselectedMarketsOrder @@ -218,13 +220,19 @@ internal class DefaultFeedEntryComponent @AssistedInject constructor( router.pop() } - EntryContent( - bottomSheetState = bottomSheetState, - stackState = stack.subscribeAsState(), - onHeaderSizeChange = {}, - onExpandSheet = {}, - isOpenedInBottomSheet = false, - ) + val primaryBackground = TangemTheme.colors3.bg.primary + CompositionLocalProvider( + LocalMainBottomSheetColor provides remember { mutableStateOf(primaryBackground) } + .apply { value = primaryBackground }, + ) { + EntryContent( + bottomSheetState = bottomSheetState, + stackState = stack.subscribeAsState(), + onHeaderSizeChange = {}, + onExpandSheet = {}, + isOpenedInBottomSheet = false, + ) + } } private fun onChildBack() {