From ffa50554bd6ce9cb7080c7c539cc0341b72d96d8 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 24 Apr 2026 12:01:13 +0400
Subject: [PATCH] Updated on 2026-08-14

---
 .../component/extended/FeeExtendedSelectorComponent.kt    | 3 ++-
 .../component/extended/model/FeeExtendedSelectorModel.kt  | 8 ++++----
 .../component/token/FeeTokenSelectorComponent.kt          | 3 ++-
 .../component/token/model/FeeTokenSelectorModel.kt        | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/FeeExtendedSelectorComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/FeeExtendedSelectorComponent.kt
index 76f9baab92..42f403fe05 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/FeeExtendedSelectorComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/FeeExtendedSelectorComponent.kt
@@ -24,10 +24,11 @@ internal class FeeExtendedSelectorComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+        val current = state ?: return
 
         FeeExtendedSelectorContent(
             modifier = modifier,
-            state = state,
+            state = current,
         )
     }
 
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/model/FeeExtendedSelectorModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/model/FeeExtendedSelectorModel.kt
index 0a68ace88e..6c56801a3b 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/model/FeeExtendedSelectorModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/extended/model/FeeExtendedSelectorModel.kt
@@ -34,8 +34,8 @@ class FeeExtendedSelectorModel @Inject constructor(
         initAppCurrency()
     }
 
-    val uiState: StateFlow<FeeExtendedSelectorUM>
-        field = MutableStateFlow<FeeExtendedSelectorUM>(getInitialState())
+    val uiState: StateFlow<FeeExtendedSelectorUM?>
+        field = MutableStateFlow<FeeExtendedSelectorUM?>(getInitialState())
 
     init {
         params.state
@@ -44,8 +44,8 @@ class FeeExtendedSelectorModel @Inject constructor(
             .launchIn(modelScope)
     }
 
-    private fun getInitialState(): FeeExtendedSelectorUM {
-        val parentContentState = params.state.value as FeeSelectorUM.Content
+    private fun getInitialState(): FeeExtendedSelectorUM? {
+        val parentContentState = params.state.value as? FeeSelectorUM.Content ?: return null
         return convertState(parentContentState)
     }
 
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/FeeTokenSelectorComponent.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/FeeTokenSelectorComponent.kt
index 0fc8cce54a..410e436d41 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/FeeTokenSelectorComponent.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/FeeTokenSelectorComponent.kt
@@ -24,9 +24,10 @@ internal class FeeTokenSelectorComponent @AssistedInject constructor(
     @Composable
     override fun Content(modifier: Modifier) {
         val state by model.uiState.collectAsStateWithLifecycle()
+        val current = state ?: return
 
         FeeTokenSelectorContent(
-            state = state,
+            state = current,
             intents = model,
             modifier = modifier,
         )
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/model/FeeTokenSelectorModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/model/FeeTokenSelectorModel.kt
index eb7e57e5b0..2385981d76 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/model/FeeTokenSelectorModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/component/token/model/FeeTokenSelectorModel.kt
@@ -41,7 +41,7 @@ internal class FeeTokenSelectorModel @Inject constructor(
     private val params = paramsContainer.require<FeeSelectorComponentParams>()
     private var appCurrency = AppCurrency.Default
 
-    val uiState: StateFlow<FeeTokenSelectorUM>
+    val uiState: StateFlow<FeeTokenSelectorUM?>
         field = MutableStateFlow(getInitialState())
 
     init {
@@ -59,8 +59,8 @@ internal class FeeTokenSelectorModel @Inject constructor(
         }
     }
 
-    private fun getInitialState(): FeeTokenSelectorUM {
-        val parentState = params.state.value as FeeSelectorUM.Content
+    private fun getInitialState(): FeeTokenSelectorUM? {
+        val parentState = params.state.value as? FeeSelectorUM.Content ?: return null
         return stateFromParent(parentState)
     }