diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/text/BladeAnimation.kt b/core/ui/src/main/java/com/tangem/core/ui/components/text/BladeAnimation.kt
index b71c7e3dbf..097c5f5e60 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/text/BladeAnimation.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/text/BladeAnimation.kt
@@ -3,7 +3,9 @@ package com.tangem.core.ui.components.text
 import android.content.res.Configuration
 import androidx.compose.animation.core.*
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.remember
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.*
@@ -38,22 +40,14 @@ fun rememberBladeAnimation(): BladeAnimation {
 @Suppress("MagicNumber")
 @Composable
 fun TextStyle.applyBladeBrush(isEnabled: Boolean, textColor: Color): TextStyle {
-    val offsetState = LocalBladeAnimation.current.offsetState
-    val offset = if (isEnabled) offsetState.value else 0f
+    if (!isEnabled) return this.copy(color = textColor)
 
-    val brush = remember(offset, textColor, isEnabled) {
+    val offsetState = LocalBladeAnimation.current.offsetState
+    val offset = offsetState.value
+
+    val brush = remember(offset, textColor) {
         object : ShaderBrush() {
             override fun createShader(size: Size): Shader {
-                if (!isEnabled) {
-                    // Solid color via the same shader path (LinearGradientShader needs >= 2 colors).
-                    return LinearGradientShader(
-                        colors = listOf(textColor, textColor),
-                        from = Offset.Zero,
-                        to = Offset(size.width, size.height),
-                        tileMode = TileMode.Clamp,
-                    )
-                }
-
                 val center = Offset(size.width / 2f, size.height / 2f)
                 val diagonal = sqrt(size.width * size.width + size.height * size.height)
                 // Subtle diagonal angle, similar to iOS shimmer
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/WalletTokenCurrencyItemConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/WalletTokenCurrencyItemConverter.kt
index 7f37f1b1e8..3b6ba252a9 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/WalletTokenCurrencyItemConverter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/WalletTokenCurrencyItemConverter.kt
@@ -190,23 +190,12 @@ internal class WalletTokenCurrencyItemConverter(
                 )
             }
             is CryptoCurrencyStatus.Loading -> TangemTokenRowUM.EndContentUM.Loading
-            is CryptoCurrencyStatus.MissedDerivation -> TangemTokenRowUM.EndContentUM.Content(
-                text = stringReference(StringsSigns.DASH_SIGN),
-            )
+            is CryptoCurrencyStatus.MissedDerivation,
             is CryptoCurrencyStatus.Unreachable,
             is CryptoCurrencyStatus.NoAmount,
             -> {
                 TangemTokenRowUM.EndContentUM.Content(
-                    text = styledResourceReference(
-                        id = R.string.common_unreachable,
-                        spanStyleReference = { SpanStyle(color = TangemTheme.colors2.text.status.attention) },
-                    ),
-                    endIcons = persistentListOf(
-                        TangemIconUM.Icon(
-                            iconRes = R.drawable.ic_attention_default_24,
-                            tintReference = { TangemTheme.colors2.graphic.status.attention },
-                        ),
-                    ),
+                    text = stringReference(StringsSigns.DASH_SIGN),
                 )
             }
         }