From 86a853c15ffe006f8f2b574c0ce0ebd01d808dd1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 13 Jan 2025 20:26:45 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../confirmresidency/DefaultConfirmResidencyComponent.kt  | 8 +++++---
 .../onramp/selectcountry/DefaultSelectCountryComponent.kt | 2 +-
 .../onramp/selectcountry/SelectCountryComponent.kt        | 2 +-
 .../selectcountry/model/OnrampSelectCountryModel.kt       | 6 +++---
 .../onramp/settings/DefaultOnrampSettingsComponent.kt     | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt
index e7f8a4d6dc..0e1ea2888c 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/confirmresidency/DefaultConfirmResidencyComponent.kt
+++ b/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()
+                    }
                 },
             ),
         )
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt
index fa24e2dc0f..0cc50766e3 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/DefaultSelectCountryComponent.kt
+++ b/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
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/SelectCountryComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/SelectCountryComponent.kt
index ba72314dd6..8abf849546 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/SelectCountryComponent.kt
+++ b/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>
 }
\ No newline at end of file
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/model/OnrampSelectCountryModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/model/OnrampSelectCountryModel.kt
index d7e2a1c6ad..94296a59e1 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/selectcountry/model/OnrampSelectCountryModel.kt
+++ b/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)
         }
     }
 
diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/settings/DefaultOnrampSettingsComponent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/settings/DefaultOnrampSettingsComponent.kt
index 36999376a3..a3c7234332 100644
--- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/settings/DefaultOnrampSettingsComponent.kt
+++ b/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() },
             ),
         )
     }