From 1662c2e4101069026ebf925aad25f07ea2d0b00a Mon Sep 17 00:00:00 2001
From: "codrut.topliceanu" <codrut.topliceanu@softvision.ro>
Date: Wed, 28 Apr 2021 12:52:08 +0300
Subject: [PATCH] For #19132 - Fix navigation on disconnect started from
 tabsTray

 - Added checks to popBackStack from the Disconnect Logged-in User Dialog, either back to settings, browserFragment or homeFragment.
---
 .../java/org/mozilla/fenix/settings/account/SignOutFragment.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
index fe0b30c2a..e5f960008 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt
@@ -66,9 +66,10 @@ class SignOutFragment : AppCompatDialogFragment() {
                 accountManager.logout()
             }.invokeOnCompletion {
                 runIfFragmentIsAttached {
-                    if (!findNavController().popBackStack(R.id.settingsFragment, false)) {
+                    if (this.isVisible) {
                         dismiss()
                     }
+                    findNavController().popBackStack()
                 }
             }
         }