Reorder dismissal during log out so that Login appears beneath Settings

1 files changed, 16 insertions, 8 deletions

diff --git a/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift b/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift
index 8cbdfe8a13..a187448298 100644
--- a/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/App/ApplicationCoordinator.swift
@@ -285,10 +285,22 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         }
     }
 
-    private func didLogout() {
-        router.dismissAll(.primary, animated: false)
+    private func didDismissSettings(_ reason: SettingsDismissReason) {
+        if isPad {
+            router.dismissAll(.settings, animated: true)
 
-        continueFlow(animated: true)
+            if reason == .userLoggedOut {
+                router.dismissAll(.primary, animated: true)
+                continueFlow(animated: true)
+            }
+        } else {
+            if reason == .userLoggedOut {
+                router.dismissAll(.primary, animated: false)
+                continueFlow(animated: false)
+            }
+
+            router.dismissAll(.settings, animated: true)
+        }
     }
 
     /**
@@ -532,11 +544,7 @@ final class ApplicationCoordinator: Coordinator, Presenting, RootContainerViewCo
         )
 
         coordinator.didFinish = { [weak self] coordinator, reason in
-            self?.router.dismissAll(.settings, animated: true)
-
-            if reason == .userLoggedOut {
-                self?.didLogout()
-            }
+            self?.didDismissSettings(reason)
         }
 
         coordinator.willNavigate = { [weak self] coordinator, from, to in