diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
index 6128a71c4a..d6f98918b8 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableBottomSheetComponent.kt
@@ -10,13 +10,16 @@ interface ComposableBottomSheetComponent {
 
     @Composable
     fun BottomSheet()
-}
 
-fun getEmptyComposableBottomSheetComponent() = EmptyComposableBottomSheetComponent
+    companion object {
+        val EMPTY = EmptyComposableBottomSheetComponent
+    }
+}
 
 object EmptyComposableBottomSheetComponent : ComposableBottomSheetComponent {
     override fun dismiss() {}
 
     @Composable
-    override fun BottomSheet() {}
+    override fun BottomSheet() {
+    }
 }
\ No newline at end of file
diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
index b242250e28..9e861ebc84 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableContentComponent.kt
@@ -9,9 +9,11 @@ fun interface ComposableContentComponent {
 
     @Composable
     fun Content(modifier: Modifier)
-}
 
-fun getEmptyComposableContentComponent() = EmptyComposableContentComponent
+    companion object {
+        val EMPTY = EmptyComposableContentComponent
+    }
+}
 
 object EmptyComposableContentComponent : ComposableContentComponent {
     @Composable
diff --git a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
index 15a24d2001..f6531b2720 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/decompose/ComposableModularContentComponent.kt
@@ -15,9 +15,11 @@ interface ComposableModularContentComponent {
 
     @Composable
     fun Footer()
-}
 
-fun getEmptyComposableModularContentComponent() = EmptyComposableModularContentComponent
+    companion object {
+        val EMPTY = EmptyComposableModularContentComponent
+    }
+}
 
 object EmptyComposableModularContentComponent : ComposableModularContentComponent {
     @Composable
diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
index df40299e1b..99f038db3f 100644
--- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
+++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/DefaultSendWithSwapComponent.kt
@@ -18,7 +18,6 @@ import com.tangem.core.decompose.context.childByContext
 import com.tangem.core.decompose.model.getOrCreateModel
 import com.tangem.core.decompose.navigation.inner.InnerRouter
 import com.tangem.core.ui.decompose.ComposableContentComponent
-import com.tangem.core.ui.decompose.getEmptyComposableContentComponent
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.swap.models.R
 import com.tangem.domain.swap.models.SwapDirection
@@ -152,9 +151,9 @@ internal class DefaultSendWithSwapComponent @AssistedInject constructor(
 
     private fun getDestinationComponent(factoryContext: AppComponentContext): ComposableContentComponent {
         val amountContentUM = model.uiState.value.amountUM as? SwapAmountUM.Content
-            ?: return getEmptyComposableContentComponent()
+            ?: return ComposableContentComponent.EMPTY
         val secondaryCryptoCurrency = amountContentUM.secondaryCryptoCurrencyStatus?.currency
-            ?: return getEmptyComposableContentComponent()
+            ?: return ComposableContentComponent.EMPTY
 
         return sendDestinationComponentFactory.create(
             context = factoryContext,