Merge pull request #322 from tangem/IOS-4541-screen-presented-multipl…

…e-times IOS-4541 Ensure that ViewController only presented once
tangem · Sep 20, 2023 · d765cc6 · d765cc6
2 parents af1f997 + 930443f
commit d765cc6
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/TangemSdk/TangemSdk/UI/BaseViewDelegate.swift b/TangemSdk/TangemSdk/UI/BaseViewDelegate.swift
@@ -22,13 +22,11 @@ class BaseViewDelegate {
     }
 
     func presentScreenIfNeeded() {
-        if screen == nil {
-            screen = makeScreen()
+        guard self.screen == nil else {
+            return
         }
 
-        guard !self.screen!.isBeingPresented, self.screen!.presentingViewController == nil,
-              let topmostViewController = UIApplication.shared.topMostViewController
-        else { return }
+        guard let topmostViewController = UIApplication.shared.topMostViewController else { return }
 
         if let presentedController = topmostViewController.presentedViewController { //dismiss alert
             presentedController.dismiss(animated: false) {
@@ -40,7 +38,10 @@ class BaseViewDelegate {
             return
         }
 
-        topmostViewController.present(self.screen!, animated: true, completion: nil)
+        let screen = makeScreen()
+        self.screen = screen
+
+        topmostViewController.present(screen, animated: true, completion: nil)
     }