Fix dismissal in UIKit demos. (#2986)

* Fix dismissal in UIKit demos. * Revert test code
pointfreeco · Apr 14, 2024 · 640a72e · 640a72e
1 parent 7e90901
commit 640a72e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift b/Examples/CaseStudies/UIKitCaseStudies/LoadThenNavigate.swift
@@ -107,7 +107,7 @@ class LazyNavigationViewController: UIViewController {
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
 
-    if !isMovingToParent {
+    if !isMovingToParent && store.optionalCounter != nil {
       store.send(.setNavigation(isActive: false))
     }
   }

diff --git a/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift b/Examples/CaseStudies/UIKitCaseStudies/NavigateAndLoad.swift
@@ -100,7 +100,7 @@ class EagerNavigationViewController: UIViewController {
   override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
 
-    if !isMovingToParent {
+    if !isMovingToParent && store.isNavigationActive {
       store.send(.setNavigation(isActive: false))
     }
   }

diff --git a/Examples/TicTacToe/tic-tac-toe/Sources/LoginUIKit/LoginViewController.swift b/Examples/TicTacToe/tic-tac-toe/Sources/LoginUIKit/LoginViewController.swift
@@ -126,7 +126,7 @@ public class LoginViewController: UIViewController {
   public override func viewDidAppear(_ animated: Bool) {
     super.viewDidAppear(animated)
 
-    if !isMovingToParent {
+    if !isMovingToParent && store.twoFactor != nil {
       store.twoFactorDismissed()
     }
   }