Updated on 2026-08-14

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt

@@ -70,12 +70,14 @@ internal class DefaultConfirmResidencyComponent @AssistedInject constructor(
             context = childByContext(componentContext),
             params = SelectCountryComponent.Params(
                 cryptoCurrency = params.cryptoCurrency,
-                onDismiss = {
+                onDismiss = { isCountrySelected ->
                     // Dismiss country select sheet
                     model.bottomSheetNavigation.dismiss()
 
-                    // Dismiss confirm residency sheet
-                    config.onDismiss()
+                    if (isCountrySelected) {
+                        // Dismiss confirm residency sheet
+                        config.onDismiss()
+                    }
                 },
             ),
         )

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt

@@ -25,7 +25,7 @@ internal class DefaultSelectCountryComponent @AssistedInject constructor(
     private val model: OnrampSelectCountryModel = getOrCreateModel(params)
 
     override fun dismiss() {
-        model.dismiss()
+        model.dismiss(isCountrySelected = false)
     }
 
     @Composable

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/SelectCountryComponent.kt

@@ -6,7 +6,7 @@ import com.tangem.domain.tokens.model.CryptoCurrency
 
 internal interface SelectCountryComponent : ComposableBottomSheetComponent {
 
-    data class Params(val cryptoCurrency: CryptoCurrency, val onDismiss: () -> Unit)
+    data class Params(val cryptoCurrency: CryptoCurrency, val onDismiss: (Boolean) -> Unit)
 
     interface Factory : ComponentFactory<Params, SelectCountryComponent>
 }

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/model/OnrampSelectCountryModel.kt

@@ -60,8 +60,8 @@ internal class OnrampSelectCountryModel @Inject constructor(
         modelScope.launch { subscribeOnUpdateState() }
     }
 
-    fun dismiss() {
-        params.onDismiss()
+    fun dismiss(isCountrySelected: Boolean) {
+        params.onDismiss(isCountrySelected)
     }
 
     private suspend fun subscribeOnUpdateState() {
@@ -92,7 +92,7 @@ internal class OnrampSelectCountryModel @Inject constructor(
         analyticsEventHandler.send(OnrampAnalyticsEvent.OnResidenceChosen(country.name))
         modelScope.launch {
             saveDefaultCountryUseCase.invoke(country)
-            dismiss()
+            dismiss(isCountrySelected = true)
         }
     }
 

features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/settings/DefaultOnrampSettingsComponent.kt

@@ -53,7 +53,7 @@ internal class DefaultOnrampSettingsComponent @AssistedInject constructor(
             context = childByContext(componentContext),
             params = SelectCountryComponent.Params(
                 params.cryptoCurrency,
-                model.bottomSheetNavigation::dismiss,
+                onDismiss = { model.bottomSheetNavigation.dismiss() },
             ),
         )
     }