diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
index ba9bbc588f..eae34d3741 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/components/txHistory/PreviewTangemPayTxHistoryComponent.kt
@@ -35,7 +35,7 @@ internal class PreviewTangemPayTxHistoryComponent(txHistoryUM: TangemPayTxHistor
                         amount = "-4.99 USD",
                         amountColor = { TangemTheme.colors.text.primary1 },
                         time = "16:41",
-                        title = stringReference("Starbucks"),
+                        title = stringReference("StarbucksStarbucksStarbucksStarbucks"),
                         subtitle = stringReference("Food&Drinks"),
                         iconUrl = null,
                     ),
diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt
index 466c8de420..bcaec6f86e 100644
--- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt
+++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/ui/TangemPayTxHistoryUi.kt
@@ -241,7 +241,7 @@ private fun TangemPayTransaction(
                     bottom.linkTo(timestampItem.top)
                     start.linkTo(titleItem.end)
                     end.linkTo(parent.end)
-                    width = Dimension.fillToConstraints
+                    width = Dimension.preferredWrapContent
                 },
             )
 
@@ -363,7 +363,7 @@ private fun Amount(state: TangemPayTransactionState, isBalanceHidden: Boolean, m
         }
         is TangemPayTransactionState.Loading -> {
             RectangleShimmer(
-                modifier = modifier.size(width = TangemTheme.dimens.size40, height = TangemTheme.dimens.size12),
+                modifier = modifier.size(width = TangemTheme.dimens.size72, height = TangemTheme.dimens.size12),
             )
         }
     }