Updated on 2026-08-14

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheet.kt

@@ -16,7 +16,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -146,7 +145,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewModalBottomSheet(
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         bsContent = {

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt

@@ -18,7 +18,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -141,7 +140,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewModalBottomSheetW
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         containerColor = containerColor,

core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/sheet/TangemBottomSheet.kt

@@ -134,7 +134,8 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewBottomSheet(
         sheetState = SheetState(
             skipPartiallyExpanded = skipPartiallyExpanded,
             initialValue = Expanded,
-            density = LocalDensity.current,
+            positionalThreshold = { 0f },
+            velocityThreshold = { 0f },
         ),
         onBack = null,
         containerColor = containerColor,

core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnter.kt

@@ -94,7 +94,7 @@ fun InputRowEnter(
                             modifier = Modifier
                                 .size(16.dp)
                                 .clip(CircleShape),
-                            text = description.resolveReference(),
+                            text = description,
                             content = { contentModifier ->
                                 Icon(
                                     modifier = contentModifier.size(16.dp),

core/ui/src/main/java/com/tangem/core/ui/components/inputrow/InputRowEnterInfoAmount.kt

@@ -158,7 +158,7 @@ fun InputRowEnterInfoAmountV2(
                             .size(16.dp)
                             .clip(CircleShape)
                             .testTag(SendSelectNetworkFeeBottomSheetTestTags.CUSTOM_INPUT_ITEM_TOOLTIP_ICON),
-                        text = description.resolveReference(),
+                        text = description,
                         content = { contentModifier ->
                             Icon(
                                 modifier = contentModifier.size(16.dp),

core/ui/src/main/java/com/tangem/core/ui/components/sheetscaffold/TangemBottomSheetScaffold.kt

@@ -239,19 +239,19 @@ private fun StandardBottomSheet(
                     }
                     val newTarget =
                         when (val oldTarget = state.anchoredDraggableState.targetValue) {
-                            Hidden -> if (newAnchors.hasAnchorFor(Hidden)) Hidden else oldTarget
+                            Hidden -> if (newAnchors.hasPositionFor(Hidden)) Hidden else oldTarget
                             PartiallyExpanded ->
                                 when {
-                                    newAnchors.hasAnchorFor(PartiallyExpanded) -> PartiallyExpanded
-                                    newAnchors.hasAnchorFor(Expanded) -> Expanded
-                                    newAnchors.hasAnchorFor(Hidden) -> Hidden
+                                    newAnchors.hasPositionFor(PartiallyExpanded) -> PartiallyExpanded
+                                    newAnchors.hasPositionFor(Expanded) -> Expanded
+                                    newAnchors.hasPositionFor(Hidden) -> Hidden
                                     else -> oldTarget
                                 }
                             Expanded ->
                                 when {
-                                    newAnchors.hasAnchorFor(Expanded) -> Expanded
-                                    newAnchors.hasAnchorFor(PartiallyExpanded) -> PartiallyExpanded
-                                    newAnchors.hasAnchorFor(Hidden) -> Hidden
+                                    newAnchors.hasPositionFor(Expanded) -> Expanded
+                                    newAnchors.hasPositionFor(PartiallyExpanded) -> PartiallyExpanded
+                                    newAnchors.hasPositionFor(Hidden) -> Hidden
                                     else -> oldTarget
                                 }
                         }

core/ui/src/main/java/com/tangem/core/ui/components/sheetscaffold/TangemSheetState.kt

@@ -102,11 +102,11 @@ class TangemSheetState(
 
     /** Whether the sheet has an expanded state defined. */
     val hasExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(Expanded)
+        get() = anchoredDraggableState.anchors.hasPositionFor(Expanded)
 
     /** Whether the modal bottom sheet has a partially expanded state defined. */
     val hasPartiallyExpandedState: Boolean
-        get() = anchoredDraggableState.anchors.hasAnchorFor(PartiallyExpanded)
+        get() = anchoredDraggableState.anchors.hasPositionFor(PartiallyExpanded)
 
     /**
      * Fully expand the bottom sheet with animation and suspend until it is fully expanded or
@@ -274,8 +274,8 @@ internal fun consumeSwipeWithinBottomSheetBoundsNestedScrollConnection(
     override suspend fun onPreFling(available: Velocity): Velocity {
         val toFling = available.toFloat()
         val currentOffset = sheetState.requireOffset()
-        val minAnchor = sheetState.anchoredDraggableState.anchors.minAnchor()
-        return if (toFling < 0 && currentOffset > minAnchor) {
+        val minPosition = sheetState.anchoredDraggableState.anchors.minPosition()
+        return if (toFling < 0 && currentOffset > minPosition) {
             onFling(toFling)
             // since we go to the anchor with tween settling, consume all for the best UX
             available

core/ui/src/main/java/com/tangem/core/ui/components/tooltip/TangemTooltip.kt

@@ -1,29 +1,39 @@
 package com.tangem.core.ui.components.tooltip
 
+import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
+import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.clickableSingle
+import com.tangem.core.ui.extensions.resolveAnnotatedReference
+import com.tangem.core.ui.extensions.stringReference
+import com.tangem.core.ui.res.LocalWindowSize
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.core.ui.res.TangemThemePreview
 import kotlinx.coroutines.launch
 
+/**
+ * A Tangem-themed tooltip component that displays a tooltip with the provided text when the content is clicked.
+ *
+ * @param text The text to be displayed inside the tooltip.
+ * @param modifier The modifier to be applied to the tooltip component.
+ * @param enabled If false, the tooltip will not be shown when the content is clicked.
+ * @param content The content that triggers the tooltip when clicked.
+ */
 @Composable
 fun TangemTooltip(
-    text: String,
+    text: TextReference,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     content: @Composable (Modifier) -> Unit,
@@ -33,30 +43,10 @@ fun TangemTooltip(
         enabled = enabled,
         tooltipContent = {
             Text(
-                modifier = Modifier.background(TangemTheme.colors.icon.secondary),
-                text = text,
-                style = TangemTheme.typography.body2,
-                color = TangemTheme.colors.text.primary2,
-            )
-        },
-        content = content,
-    )
-}
-
-@Composable
-fun TangemTooltip(
-    text: AnnotatedString,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    content: @Composable (Modifier) -> Unit,
-) {
-    InternalTangemTooltip(
-        modifier = modifier,
-        enabled = enabled,
-        tooltipContent = {
-            Text(
-                modifier = Modifier.background(TangemTheme.colors.icon.secondary),
-                text = text,
+                modifier = Modifier
+                    .background(TangemTheme.colors.icon.secondary)
+                    .padding(horizontal = 6.dp, vertical = 8.dp),
+                text = text.resolveAnnotatedReference(),
                 style = TangemTheme.typography.body2,
                 color = TangemTheme.colors.text.primary2,
             )
@@ -75,16 +65,22 @@ private fun InternalTangemTooltip(
 ) {
     val tooltipState = rememberTooltipState(isPersistent = true)
     val coroutineScope = rememberCoroutineScope()
+
+    val windowSize = LocalWindowSize.current.width
+
     TooltipBox(
-        positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(spacingBetweenTooltipAndAnchor = 8.dp),
+        positionProvider = TooltipDefaults.rememberTooltipPositionProvider(
+            positioning = TooltipAnchorPosition.Above,
+            spacingBetweenTooltipAndAnchor = 8.dp,
+        ),
         state = tooltipState,
         modifier = modifier,
         tooltip = {
             PlainTooltip(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 12.dp),
-                caretSize = DpSize(width = 14.dp, height = 8.dp),
+                modifier = Modifier.padding(end = 12.dp),
+                shape = RoundedCornerShape(14.dp),
+                caretShape = TooltipDefaults.caretShape(),
+                maxWidth = windowSize - 24.dp,
                 contentColor = TangemTheme.colors.text.primary2,
                 containerColor = TangemTheme.colors.icon.secondary,
                 content = { tooltipContent() },
@@ -103,24 +99,23 @@ private fun InternalTangemTooltip(
     )
 }
 
-@Preview
+// region Preview
 @Composable
+@Preview(showBackground = true, widthDp = 360, heightDp = 720)
+@Preview(showBackground = true, widthDp = 360, heightDp = 720, uiMode = Configuration.UI_MODE_NIGHT_YES)
 private fun TangemTooltip_Preview() {
     TangemThemePreview {
         Box(
             modifier = Modifier
-                .size(500.dp)
-                .background(TangemTheme.colors.background.secondary),
-            contentAlignment = Alignment.Center,
+                .fillMaxSize()
+                .background(TangemTheme.colors.background.tertiary),
         ) {
             TangemTooltip(
-                modifier = Modifier
-                    .background(TangemTheme.colors.background.secondary)
-                    .size(64.dp),
-                text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed venenatis.",
+                modifier = Modifier,
+                text = stringReference("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed venenatis."),
                 content = { contentModifier ->
                     Icon(
-                        modifier = contentModifier.size(64.dp),
+                        modifier = contentModifier,
                         painter = painterResource(R.drawable.ic_token_info_24),
                         tint = TangemTheme.colors.icon.informative,
                         contentDescription = null,

core/ui/src/main/java/com/tangem/core/ui/res/TangemTheme.kt

@@ -1,6 +1,8 @@
 package com.tangem.core.ui.res
 
 import android.app.Activity
+import androidx.compose.foundation.ComposeFoundationFlags
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.text.selection.LocalTextSelectionColors
 import androidx.compose.foundation.text.selection.TextSelectionColors
@@ -27,6 +29,7 @@ import com.tangem.core.ui.windowsize.rememberWindowSize
 import com.tangem.domain.apptheme.model.AppThemeMode
 import com.valentinilk.shimmer.Shimmer
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun TangemTheme(
     activity: Activity,
@@ -36,6 +39,9 @@ fun TangemTheme(
     overrideSystemBarColors: Boolean = true,
     content: @Composable () -> Unit,
 ) {
+    // TODO Research and implement in redesign [REDACTED_TASK_KEY]
+    ComposeFoundationFlags.isPausableCompositionInPrefetchEnabled = false
+
     val appThemeMode by uiDependencies.appThemeModeHolder.appThemeMode
     val windowSize = rememberWindowSize(activity = activity)
 

features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorBlockContent.kt

@@ -29,6 +29,7 @@ import com.tangem.common.ui.amountScreen.utils.getFiatString
 import com.tangem.core.ui.components.TextShimmer
 import com.tangem.core.ui.components.atoms.text.EllipsisText
 import com.tangem.core.ui.components.tooltip.TangemTooltip
+import com.tangem.core.ui.extensions.annotatedReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.format.bigdecimal.BigDecimalFormatConstants.EMPTY_BALANCE_SIGN
 import com.tangem.core.ui.format.bigdecimal.crypto
@@ -122,7 +123,7 @@ private fun FeeSelectorStaticPart(onReadMoreClick: () -> Unit, modifier: Modifie
             }
         }
         TangemTooltip(
-            text = annotatedString,
+            text = annotatedReference(annotatedString),
             modifier = Modifier
                 .padding(start = TangemTheme.dimens.spacing6)
                 .size(TangemTheme.dimens.size16)

features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/providers/ui/BlockchainProvidersScreen.kt

@@ -8,7 +8,6 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.*
 import androidx.compose.foundation.draganddrop.dragAndDropSource
 import androidx.compose.foundation.draganddrop.dragAndDropTarget
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -241,16 +240,10 @@ private fun ProviderItem(index: Int, state: ProviderUM, onDrop: (Int, Int) -> Un
             modifier = Modifier
                 .background(color = color, shape = RoundedCornerShape(16.dp))
                 .padding(vertical = 4.dp, horizontal = 8.dp)
-                .dragAndDropSource {
-                    detectTapGestures(
-                        onLongPress = {
-                            startTransfer(
-                                DragAndDropTransferData(
-                                    clipData = ClipData.newPlainText("provider index", index.toString()),
-                                    flags = View.DRAG_FLAG_GLOBAL,
-                                ),
-                            )
-                        },
+                .dragAndDropSource { _ ->
+                    DragAndDropTransferData(
+                        clipData = ClipData.newPlainText("provider index", index.toString()),
+                        flags = View.DRAG_FLAG_GLOBAL,
                     )
                 }
                 .dragAndDropTarget(

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/TangemSnapLayoutInfoProvider.kt

@@ -5,7 +5,6 @@ import androidx.compose.animation.core.calculateTargetValue
 import androidx.compose.animation.splineBasedDecay
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.snapping.SnapFlingBehavior
 import androidx.compose.foundation.lazy.LazyListLayoutInfo
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.ui.unit.Density
@@ -23,7 +22,7 @@ import kotlin.math.sign
  * This position should be considered with regard to the start edge of the item and the placement
  * within the viewport.
  *
- * @return A [SnapLayoutInfoProvider] that can be used with [SnapFlingBehavior]
+ * @return A [SnapLayoutInfoProvider] that can be used with snap fling behavior
  */
 @Suppress("FunctionNaming")
 @ExperimentalFoundationApi

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletCard.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.ConstraintLayoutScope
 import androidx.constraintlayout.compose.Dimension
+import androidx.constraintlayout.compose.Visibility
 import com.tangem.core.ui.components.FontSizeRange
 import com.tangem.core.ui.components.RectangleShimmer
 import com.tangem.core.ui.components.ResizableText
@@ -69,89 +70,6 @@ private const val HALF_OF_ITEM_WIDTH = 0.5
 @Suppress("LongMethod")
 @Composable
 internal fun WalletCard(state: WalletCardState, isBalanceHidden: Boolean, modifier: Modifier = Modifier) {
-    @Suppress("DestructuringDeclarationWithTooManyEntries")
-    CardContainer(
-        dropDownItems = state.dropDownItems,
-        isLockedState = state is WalletCardState.LockedContent,
-        modifier = modifier,
-    ) { itemSize ->
-        val (titleRef, balanceRef, additionalTextRef, imageRef) = createRefs()
-
-        val contentVerticalMargin = TangemTheme.dimens.spacing12
-        TitleText(
-            text = state.title,
-            modifier = Modifier.constrainAs(titleRef) {
-                start.linkTo(parent.start)
-                top.linkTo(anchor = parent.top, margin = contentVerticalMargin)
-                end.linkTo(imageRef.start)
-                width = Dimension.fillToConstraints
-            },
-        )
-
-        var balanceWidth by remember { mutableIntStateOf(value = Int.MIN_VALUE) }
-        Balance(
-            state = state,
-            isBalanceHidden = isBalanceHidden,
-            modifier = Modifier
-                .onSizeChanged { balanceWidth = it.width }
-                .padding(vertical = TangemTheme.dimens.spacing8)
-                .constrainAs(balanceRef) {
-                    start.linkTo(parent.start)
-                    top.linkTo(anchor = titleRef.bottom)
-                    bottom.linkTo(anchor = additionalTextRef.top)
-                },
-        )
-
-        val additionalText by remember(state.additionalInfo, isBalanceHidden) {
-            mutableStateOf(
-                state.additionalInfo?.content?.orMaskWithStars(
-                    maskWithStars = state.additionalInfo?.hideable == true && isBalanceHidden,
-                ),
-            )
-        }
-        AdditionalInfo(
-            text = additionalText,
-            modifier = Modifier.constrainAs(additionalTextRef) {
-                start.linkTo(parent.start)
-                top.linkTo(balanceRef.bottom)
-                bottom.linkTo(anchor = parent.bottom, margin = contentVerticalMargin)
-
-                if (additionalText != null) {
-                    width = if (state.imageResId != null) {
-                        end.linkTo(imageRef.start)
-                        Dimension.fillToConstraints
-                    } else {
-                        Dimension.wrapContent
-                    }
-                }
-            },
-        )
-
-        // If balance has a large width then image must be hidden
-        val hasSpaceForImage by remember(key1 = balanceWidth, key2 = itemSize.width) {
-            mutableStateOf(value = balanceWidth < itemSize.width * HALF_OF_ITEM_WIDTH)
-        }
-
-        if (hasSpaceForImage) {
-            Image(
-                id = state.imageResId,
-                modifier = Modifier.constrainAs(imageRef) {
-                    end.linkTo(parent.end)
-                    bottom.linkTo(parent.bottom)
-                    height = Dimension.fillToConstraints
-                },
-            )
-        }
-    }
-}
-
-@Composable
-private fun CardContainer(
-    dropDownItems: ImmutableList<WalletDropDownItems>,
-    isLockedState: Boolean,
-    modifier: Modifier = Modifier,
-    content: @Composable (ConstraintLayoutScope.(IntSize) -> Unit),
-) {
     var isMenuVisible by rememberSaveable { mutableStateOf(value = false) }
     var pressOffset by remember { mutableStateOf(value = DpOffset.Zero) }
     var itemSize by remember { mutableStateOf(value = IntSize.Zero) }
@@ -166,7 +84,7 @@ private fun CardContainer(
             .onSizeChanged { itemSize = it }
             .testTag(MainScreenTestTags.TOTAL_BALANCE_CONTAINER)
             .then(
-                if (isLockedState || dropDownItems.isEmpty()) {
+                if (state is WalletCardState.LockedContent || state.dropDownItems.isEmpty()) {
                     Modifier
                 } else {
                     Modifier
@@ -189,15 +107,19 @@ private fun CardContainer(
                         }
                 },
             ),
-        shape = TangemTheme.shapes.roundedCornersXMedium,
-        color = TangemTheme.colors.background.primary,
     ) {
         ConstraintLayout(
             modifier = Modifier
                 .fillMaxWidth()
+                .clip(TangemTheme.shapes.roundedCornersXMedium)
+                .background(TangemTheme.colors.background.primary)
                 .padding(horizontal = TangemTheme.dimens.spacing12),
         ) {
-            content(itemSize)
+            CardContainer(
+                state = state,
+                isBalanceHidden = isBalanceHidden,
+                itemSize = itemSize,
+            )
         }
     }
 
@@ -209,7 +131,82 @@ private fun CardContainer(
         pressOffset = pressOffset,
         itemHeight = itemHeight,
         onDismissRequest = { isMenuVisible = false },
-        dropDownItems = dropDownItems,
+        dropDownItems = state.dropDownItems,
+    )
+}
+
+@Suppress("DestructuringDeclarationWithTooManyEntries")
+@Composable
+private fun ConstraintLayoutScope.CardContainer(state: WalletCardState, isBalanceHidden: Boolean, itemSize: IntSize) {
+    val (titleRef, balanceRef, additionalTextRef, imageRef) = createRefs()
+
+    val contentVerticalMargin = TangemTheme.dimens.spacing12
+    TitleText(
+        text = state.title,
+        modifier = Modifier.constrainAs(titleRef) {
+            start.linkTo(anchor = parent.start)
+            top.linkTo(anchor = parent.top, margin = contentVerticalMargin)
+            end.linkTo(anchor = imageRef.start)
+            width = Dimension.fillToConstraints
+        },
+    )
+
+    var balanceWidth by remember { mutableIntStateOf(value = Int.MIN_VALUE) }
+    Balance(
+        state = state,
+        isBalanceHidden = isBalanceHidden,
+        modifier = Modifier
+            .onSizeChanged { balanceWidth = it.width }
+            .padding(vertical = TangemTheme.dimens.spacing8)
+            .constrainAs(balanceRef) {
+                start.linkTo(anchor = parent.start)
+                top.linkTo(anchor = titleRef.bottom)
+                bottom.linkTo(anchor = additionalTextRef.top)
+            },
+    )
+
+    val additionalText by remember(state.additionalInfo, isBalanceHidden) {
+        mutableStateOf(
+            state.additionalInfo?.content?.orMaskWithStars(
+                maskWithStars = state.additionalInfo?.hideable == true && isBalanceHidden,
+            ),
+        )
+    }
+    AdditionalInfo(
+        text = additionalText,
+        modifier = Modifier.constrainAs(additionalTextRef) {
+            start.linkTo(parent.start)
+            top.linkTo(balanceRef.bottom)
+            bottom.linkTo(anchor = parent.bottom, margin = contentVerticalMargin)
+
+            if (additionalText != null) {
+                width = if (state.imageResId != null) {
+                    end.linkTo(imageRef.start)
+                    Dimension.fillToConstraints
+                } else {
+                    Dimension.wrapContent
+                }
+            }
+        },
+    )
+
+    // If balance has a large width then image must be hidden
+    val hasSpaceForImage by remember(key1 = balanceWidth, key2 = itemSize.width) {
+        mutableStateOf(value = balanceWidth < itemSize.width * HALF_OF_ITEM_WIDTH)
+    }
+
+    Image(
+        id = state.imageResId,
+        modifier = Modifier.constrainAs(imageRef) {
+            end.linkTo(parent.end)
+            bottom.linkTo(parent.bottom)
+            height = Dimension.fillToConstraints
+            visibility = if (hasSpaceForImage) {
+                Visibility.Visible
+            } else {
+                Visibility.Gone
+            }
+        },
     )
 }
 

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcAddressItem.kt

@@ -14,6 +14,7 @@ import com.tangem.core.ui.components.SpacerWMax
 import com.tangem.core.ui.components.atoms.text.EllipsisText
 import com.tangem.core.ui.components.atoms.text.TextEllipsis
 import com.tangem.core.ui.components.tooltip.TangemTooltip
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.walletconnect.impl.R
@@ -38,7 +39,7 @@ internal fun WcAddressItem(address: String, modifier: Modifier = Modifier) {
         SpacerWMax()
         TangemTooltip(
             modifier = Modifier.padding(start = TangemTheme.dimens.spacing16),
-            text = address,
+            text = stringReference(address),
             enabled = isTooltipEnabled,
             content = { contentModifier ->
                 EllipsisText(

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcNetworkItem.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import com.tangem.core.ui.components.tooltip.TangemTooltip
+import com.tangem.core.ui.extensions.stringReference
 import com.tangem.core.ui.extensions.stringResourceSafe
 import com.tangem.core.ui.res.TangemTheme
 import com.tangem.features.walletconnect.impl.R
@@ -44,7 +45,7 @@ internal fun WcNetworkItem(networkInfo: WcNetworkInfoUM, modifier: Modifier = Mo
             )
             TangemTooltip(
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing16),
-                text = networkInfo.name,
+                text = stringReference(networkInfo.name),
                 enabled = isTooltipEnabled,
                 content = { contentModifier ->
                     Text(

features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcWalletItem.kt

@@ -52,7 +52,7 @@ internal fun WcPortfolioItem(portfolioName: AccountTitleUM, modifier: Modifier =
             )
             is AccountTitleUM.Text -> TangemTooltip(
                 modifier = Modifier.padding(start = TangemTheme.dimens.spacing16),
-                text = portfolioName.title.resolveReference(),
+                text = portfolioName.title,
                 enabled = isTooltipEnabled,
                 content = { contentModifier ->
                     Text(

gradle/dependencies.toml

@@ -33,10 +33,10 @@ androidxWorkManager = "2.9.0"
 # endregion AndroidX
 
 # region Compose
-compose-runtime = "1.7.8"
-compose-foundation = "1.7.8"
-compose-material3 = "1.3.1"
-compose-constraint = "1.0.1"
+compose-runtime = "1.10.0"
+compose-foundation = "1.10.0"
+compose-material3 = "1.4.0"
+compose-constraint = "1.1.1"
 compose-navigation = "2.7.7"
 compose-accompanist = "0.30.1"
 compose-paging = "3.2.1"