diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/utils/RouterProxy.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/utils/RouterProxy.kt
index 1bddd8572e..0761de97a5 100644
--- a/common/routing/src/main/kotlin/com/tangem/common/routing/utils/RouterProxy.kt
+++ b/common/routing/src/main/kotlin/com/tangem/common/routing/utils/RouterProxy.kt
@@ -23,8 +23,8 @@ private class RouterProxy(
     private val appRouter: AppRouter,
 ) : Router {
     override fun push(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
-        (route as? AppRoute)?.let {
-            appRouter.push(it, onComplete)
+        if (route is AppRoute) {
+            appRouter.push(route, onComplete)
         }
     }
 
@@ -39,7 +39,7 @@ private class RouterProxy(
     }
 
     override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
-        (route as? AppRoute)?.let {
+        if (route is AppRoute) {
             appRouter.popTo(route, onComplete)
         }
     }
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/MarketTokenDetailsRouter.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/MarketTokenDetailsRouter.kt
index bd9f68f694..fb1d1b1eff 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/MarketTokenDetailsRouter.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/entry/impl/MarketTokenDetailsRouter.kt
@@ -15,7 +15,11 @@ internal class MarketTokenDetailsRouter(
         stackNavigation.popWhile({ it != MarketsEntryChildFactory.Child.TokenList }, onComplete)
     }
 
-    override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) = error("Not allowed")
+    override fun popTo(route: Route, onComplete: (isSuccess: Boolean) -> Unit) {
+        /** Not allowed */
+    }
 
-    override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) = error("Not allowed")
+    override fun popTo(routeClass: KClass<out Route>, onComplete: (isSuccess: Boolean) -> Unit) {
+        /** Not allowed */
+    }
 }
\ No newline at end of file
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/ui/TokenMarketBlock.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/ui/TokenMarketBlock.kt
index 95285a38b0..67e5d7305e 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/ui/TokenMarketBlock.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/token/block/impl/ui/TokenMarketBlock.kt
@@ -112,7 +112,11 @@ private fun LeftSide(
 }
 
 @Composable
-fun RightSide(priceChangeType: PriceChangeType?, chartRawData: MarketChartRawData?, modifier: Modifier = Modifier) {
+private fun RightSide(
+    priceChangeType: PriceChangeType?,
+    chartRawData: MarketChartRawData?,
+    modifier: Modifier = Modifier,
+) {
     Row(
         modifier = modifier.padding(vertical = TangemTheme.dimens.spacing10),
         horizontalArrangement = Arrangement.spacedBy(TangemTheme.dimens.spacing8),