Merge pull request #38 from plaidev/flutter

[ios] dismiss in-app-message when the same experiments are triggered between the short period
plaidev · Jun 4, 2024 · e2873a2 · e2873a2
2 parents 618c861 + 688601d
commit e2873a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ios/Nativebrik/Nativebrik/component/root.swift b/ios/Nativebrik/Nativebrik/component/root.swift
@@ -22,6 +22,7 @@ class ModalRootViewController: UIViewController {
             return page.data?.kind == PageKind.TRIGGER
         }
         self.modalViewController = modalViewController
+        self.modalViewController?.dismissModal()
         self.container = container
         super.init(nibName: nil, bundle: nil)
 
@@ -235,6 +236,9 @@ class RootView: UIView {
 
 func findTopPresenting(_ viewContorller: UIViewController) ->  UIViewController {
     if let presented = viewContorller.presentedViewController {
+        if presented.isBeingDismissed {
+            return viewContorller
+        }
         return findTopPresenting(presented)
     } else {
         return viewContorller

diff --git a/ios/Nativebrik/Nativebrik/component/trigger.swift b/ios/Nativebrik/Nativebrik/component/trigger.swift
@@ -17,7 +17,7 @@ class TriggerViewController: UIViewController {
     private let user: NativebrikUser
     private let container: Container
     private var modalViewController: ModalComponentViewController? = nil
-    private var currentVC: UIViewController? = nil
+    private var currentVC: ModalRootViewController? = nil
     private var didLoaded = false
     private var ignoreFirstUserEventToForegroundEvent = true