diff --git a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt index 89d9327ed6..7096920bb8 100644 --- a/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt +++ b/app/src/main/java/com/tangem/tap/common/extensions/Navigation.kt @@ -61,7 +61,11 @@ fun FragmentActivity.popBackTo(screen: AppScreen?, inclusive: Boolean = false) { } fun FragmentActivity.getPreviousScreen(): AppScreen? { - val indexOfLastFragment = this.supportFragmentManager.backStackEntryCount - 1 + val indexOfLastFragment = if(this.supportFragmentManager.backStackEntryCount>0) { + this.supportFragmentManager.backStackEntryCount - 1 + }else{ + 0 + } val tag = if (indexOfLastFragment < this.supportFragmentManager.backStackEntryCount) this.supportFragmentManager.getBackStackEntryAt(indexOfLastFragment).name else null