From 2c641c6d46ae4c1dc2aa55c4247689ab975ec102 Mon Sep 17 00:00:00 2001
From: Darsbir <darsbir.singh@myntra.com>
Date: Wed, 8 Mar 2023 15:29:57 +0530
Subject: [PATCH] if inside RNCTExecuteOnMainQueue

---
 React/Views/RCTModalHostViewManager.m         | 30 +++++++++----------
 .../react/react-native/maven-metadata.xml     |  2 +-
 .../react/react-native/maven-metadata.xml.md5 |  2 +-
 .../react-native/maven-metadata.xml.sha1      |  2 +-
 .../react-native/maven-metadata.xml.sha256    |  2 +-
 .../react-native/maven-metadata.xml.sha512    |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index ddf17727f92a78..5b344308cde41e 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -75,15 +75,15 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
       modalHostView.onShow(nil);
     }
   };
-  if (_presentationBlock) {
-    _presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
-  } else {
-    RCTExecuteOnMainQueue(^{
-            [[modalHostView reactViewController] presentViewController:viewController
-                                                                      animated:animated
-                                                                    completion:completionBlock];
-            });
-  }
+  RCTExecuteOnMainQueue(^{
+    if (self->_presentationBlock) {
+      self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+      [[modalHostView reactViewController] presentViewController:viewController
+                                                        animated:animated
+                                                      completion:completionBlock];
+    }
+  });
 }
 
 - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
@@ -95,13 +95,13 @@ - (void)dismissModalHostView:(RCTModalHostView *)modalHostView
       [[self.bridge moduleForClass:[RCTModalManager class]] modalDismissed:modalHostView.identifier];
     }
   };
-  if (_dismissalBlock) {
-    _dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
-  } else {
-        RCTExecuteOnMainQueue(^{
-            [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
-            });
+  RCTExecuteOnMainQueue(^{
+    if (self->_dismissalBlock) {
+      self->_dismissalBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+    } else {
+          [viewController.presentingViewController dismissViewControllerAnimated:animated completion:completionBlock];
   }
+  });
 }
 
 - (RCTShadowView *)shadowView
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml b/android/com/facebook/react/react-native/maven-metadata.xml
index 1a835241e9003d..b586f387d74990 100644
--- a/android/com/facebook/react/react-native/maven-metadata.xml
+++ b/android/com/facebook/react/react-native/maven-metadata.xml
@@ -8,6 +8,6 @@
     <versions>
       <version>0.68.5</version>
     </versions>
-    <lastUpdated>20230227161545</lastUpdated>
+    <lastUpdated>20230308095903</lastUpdated>
   </versioning>
 </metadata>
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.md5 b/android/com/facebook/react/react-native/maven-metadata.xml.md5
index 04805e2d694cf7..c2ab5c046bed0f 100644
--- a/android/com/facebook/react/react-native/maven-metadata.xml.md5
+++ b/android/com/facebook/react/react-native/maven-metadata.xml.md5
@@ -1 +1 @@
-72d5804561b702287b21bf7c3b9f7423
\ No newline at end of file
+5e50491d154a0869a0948e01c4a56cd0
\ No newline at end of file
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha1 b/android/com/facebook/react/react-native/maven-metadata.xml.sha1
index 94e995e2594489..3fe1b3e69ab01e 100644
--- a/android/com/facebook/react/react-native/maven-metadata.xml.sha1
+++ b/android/com/facebook/react/react-native/maven-metadata.xml.sha1
@@ -1 +1 @@
-484bb81ee79103f6832455814390c1cc5c3e742f
\ No newline at end of file
+4fc6b7525c66b3a6c214998f34f7611463ad1e73
\ No newline at end of file
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha256 b/android/com/facebook/react/react-native/maven-metadata.xml.sha256
index a37d519d9791cd..779469c711a28e 100644
--- a/android/com/facebook/react/react-native/maven-metadata.xml.sha256
+++ b/android/com/facebook/react/react-native/maven-metadata.xml.sha256
@@ -1 +1 @@
-930078b761a7bfe9760272f253db9a0941868030a8c995c60595b36110d37fd8
\ No newline at end of file
+960dbf9dc373a20b381ea6061b8ec39716c2c414e666ec27d885ceca2a5833cf
\ No newline at end of file
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha512 b/android/com/facebook/react/react-native/maven-metadata.xml.sha512
index d43b57d76d1110..98dc1f7f163ba4 100644
--- a/android/com/facebook/react/react-native/maven-metadata.xml.sha512
+++ b/android/com/facebook/react/react-native/maven-metadata.xml.sha512
@@ -1 +1 @@
-f44328bdf5b7d30d391f06a068a21b38309004b448d47968ca564123e260e52959bbf7f365c6a69c46b1f8c1084a1172228cff980ca56a91fa9db52f4b47c891
\ No newline at end of file
+34d4952934c59daf346a02aa1508e07d49fbc6201b52c74e2031270494b162665a827f18603fa02cb7c485934c163f999240737881a9fa763665e525cfc9753e
\ No newline at end of file