diff --git a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt index f459c74e77..fd93beee79 100644 --- a/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt +++ b/app/src/main/java/com/tangem/tap/ForegroundActivityObserver.kt @@ -18,8 +18,7 @@ class ForegroundActivityObserver : ActivityResultCaller { val foregroundActivity: AppCompatActivity? get() = activities.entries - .filterNot { it.value.isDestroyed } - .firstOrNull() + .firstOrNull { it.value?.isDestroyed ?: false } ?.value internal val callbacks: ActivityLifecycleCallbacks diff --git a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/excludedblockchains/ExcludedBlockchainsViewModel.kt b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/excludedblockchains/ExcludedBlockchainsViewModel.kt index 03fa351f78..213bfbc246 100644 --- a/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/excludedblockchains/ExcludedBlockchainsViewModel.kt +++ b/features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/excludedblockchains/ExcludedBlockchainsViewModel.kt @@ -45,7 +45,7 @@ internal class ExcludedBlockchainsViewModel @Inject constructor( state.update { state -> state.copy( popBack = router::back, - onRestartClick = appFinisher::finish, + onRestartClick = appFinisher::restart, ) } }