diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt index 7ab791d0b4..e6166576ce 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt @@ -239,6 +239,7 @@ object OnboardingHelper { scope.launch { val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles) + val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles) val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) { val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase) @@ -248,7 +249,7 @@ object OnboardingHelper { globalState.userCountryCode == RUSSIA_COUNTRY_CODE } - if (isRussia) { + if (isRussia && !onrampFeatureToggles.isFeatureEnabled) { val dialogData = AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl) store.dispatchDialogShow(AppDialog.RussianCardholdersWarningDialog(dialogData)) } else { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt index 7c99d07e6e..9edfafa699 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt @@ -95,7 +95,7 @@ object TradeCryptoMiddleware { scope.launch { val homeFeatureToggles = store.inject(DaggerGraphState::homeFeatureToggles) - + val onrampFeatureToggles = store.inject(DaggerGraphState::onrampFeatureToggles) val isRussia = if (homeFeatureToggles.isMigrateUserCountryCodeEnabled) { val getUserCountryCodeUseCase = store.inject(DaggerGraphState::getUserCountryUseCase) @@ -104,7 +104,7 @@ object TradeCryptoMiddleware { state()?.globalState?.userCountryCode == RUSSIA_COUNTRY_CODE } - if (action.checkUserLocation && isRussia) { + if (action.checkUserLocation && isRussia && !onrampFeatureToggles.isFeatureEnabled) { val dialogData = topUrl?.let { AppDialog.RussianCardholdersWarningDialog.Data(topUpUrl = it) }