Updated on 2026-08-14

core/ui/src/main/java/com/tangem/core/ui/ds/message/TangemMessage.kt

@@ -83,13 +83,17 @@ fun TangemMessage(
         trailingContent = if (isIconLeading) null else icon,
         contentColor = contentColor,
         onCloseClick = messageUM.onCloseClick,
-        buttons = {
+        buttons = if (messageUM.buttonsUM.isEmpty()) {
+            null
+        } else {
+            {
                 messageUM.buttonsUM.fastForEach { buttonUM ->
                     TangemButton(
                         buttonUM = buttonUM.tangemButtonUM,
                         modifier = Modifier.weight(1f),
                     )
                 }
+            }
         },
     )
 }

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt

@@ -214,9 +214,13 @@ internal class DefaultFeedEntryComponent @AssistedInject constructor(
 
     private fun onChildBack() {
         if (stack.value.active.configuration !is FeedEntryChildFactory.Child.Feed) {
+            if (stack.value.backStack.isEmpty()) {
+                router.pop()
+            } else {
                 stackNavigation.pop()
             }
         }
+    }
 
     private fun mapEntryRouteToChild(entryRoute: FeedEntryRoute?): FeedEntryChildFactory.Child {
         return when (entryRoute) {

features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/market/list/DefaultMarketsTokenListComponent.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
@@ -24,6 +25,7 @@ import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState
 import com.tangem.core.ui.components.haze.hazeEffectTangem
 import com.tangem.core.ui.decompose.ComposableModularBottomSheetContentComponent
 import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.conditional
 import com.tangem.core.ui.res.LocalMainBottomSheetColor
 import com.tangem.core.ui.res.LocalRedesignEnabled
 import com.tangem.core.ui.res.TangemTheme
@@ -56,11 +58,13 @@ internal class DefaultMarketsTokenListComponent(
         val bsState by bottomSheetState
 
         if (LocalRedesignEnabled.current) {
-            val background = LocalMainBottomSheetColor.current.value
+            val bottomSheetColor = LocalMainBottomSheetColor.current.value
             FeedSearchBar(
                 isSearchBarClickable = bottomSheetState.value == BottomSheetState.EXPANDED,
                 feedListSearchBar = state.feedListSearchBar,
-                modifier = Modifier.background(background.copy(alpha = .95f)),
+                modifier = Modifier.conditional(bottomSheetColor.isSpecified) {
+                    background(bottomSheetColor.copy(alpha = .95f))
+                },
                 startContent = {
                     Icon(
                         imageVector = ImageVector.vectorResource(id = R.drawable.ic_arrow_back_28),

features/promo-banners/impl/src/main/kotlin/com/tangem/features/promobanners/impl/ui/PromoBannersBlock.kt

@@ -191,6 +191,7 @@ private fun SmoothHeightPager(
             BannerNotification(
                 config = banners[lowerPage].config,
                 containerColor = containerColor,
+                modifier = Modifier.padding(horizontal = horizontalPadding),
             )
         }.first().measure(pageConstraints).height
 
@@ -199,6 +200,7 @@ private fun SmoothHeightPager(
                 BannerNotification(
                     config = banners[upperPage].config,
                     containerColor = containerColor,
+                    modifier = Modifier.padding(horizontal = horizontalPadding),
                 )
             }.first().measure(pageConstraints).height
         } else {