From 3a1c32904963e56a0f16e1c3abaa79f3a34ef503 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Tue, 25 Jun 2024 23:25:39 -0700
Subject: [PATCH 1/2] Bump react-native-screens

---
 package-lock.json                                    |  8 ++++----
 package.json                                         |  2 +-
 ...t-native-screens+3.30.1+001+fix-screen-type.patch | 12 ------------
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 patches/react-native-screens+3.30.1+001+fix-screen-type.patch

diff --git a/package-lock.json b/package-lock.json
index fb15d51d1389..ae060c611450 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -115,7 +115,7 @@
         "react-native-release-profiler": "^0.1.6",
         "react-native-render-html": "6.3.1",
         "react-native-safe-area-context": "4.8.2",
-        "react-native-screens": "3.30.1",
+        "react-native-screens": "3.32.0",
         "react-native-share": "^10.0.2",
         "react-native-sound": "^0.11.2",
         "react-native-svg": "14.1.0",
@@ -37355,9 +37355,9 @@
       }
     },
     "node_modules/react-native-screens": {
-      "version": "3.30.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.30.1.tgz",
-      "integrity": "sha512-/muEvjocCtFb+j5J3YmLvB25+f4rIU8hnnxgGTkXcAf2omPBY8uhPjJaaFUlvj64VEoEzJcRpugbXWsjfPPIFg==",
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.32.0.tgz",
+      "integrity": "sha512-wybqZAHX7v8ipOXhh90CqGLkBHw5JYqKNRBX7R/b0c2WQisTOgu0M0yGwBMM6LyXRBT+4k3NTGHdDbpJVpq0yQ==",
       "dependencies": {
         "react-freeze": "^1.0.0",
         "warn-once": "^0.1.0"
diff --git a/package.json b/package.json
index d4be691e2fc2..de7e891a6d19 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,7 @@
     "react-native-release-profiler": "^0.1.6",
     "react-native-render-html": "6.3.1",
     "react-native-safe-area-context": "4.8.2",
-    "react-native-screens": "3.30.1",
+    "react-native-screens": "3.32.0",
     "react-native-share": "^10.0.2",
     "react-native-sound": "^0.11.2",
     "react-native-svg": "14.1.0",
diff --git a/patches/react-native-screens+3.30.1+001+fix-screen-type.patch b/patches/react-native-screens+3.30.1+001+fix-screen-type.patch
deleted file mode 100644
index f282ec58b07b..000000000000
--- a/patches/react-native-screens+3.30.1+001+fix-screen-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-native-screens/src/components/Screen.tsx b/node_modules/react-native-screens/src/components/Screen.tsx
-index 3f9a1cb..45767f7 100644
---- a/node_modules/react-native-screens/src/components/Screen.tsx
-+++ b/node_modules/react-native-screens/src/components/Screen.tsx
-@@ -79,6 +79,7 @@ export class InnerScreen extends React.Component<ScreenProps> {
-       // Due to how Yoga resolves layout, we need to have different components for modal nad non-modal screens
-       const AnimatedScreen =
-         Platform.OS === 'android' ||
-+        stackPresentation === undefined ||
-         stackPresentation === 'push' ||
-         stackPresentation === 'containedModal' ||
-         stackPresentation === 'containedTransparentModal'

From a626bb36b8eab3ac7980ddedd8fe5f50ac068028 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 26 Jun 2024 09:26:03 -0700
Subject: [PATCH 2/2] Update Podfile.lock

---
 ios/Podfile.lock | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 35dccc2de393..a5ffdcb4b63c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1243,7 +1243,13 @@ PODS:
   - react-native-config (1.5.0):
     - react-native-config/App (= 1.5.0)
   - react-native-config/App (1.5.0):
-    - React-Core
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React
+    - React-Codegen
+    - React-RCTFabric
+    - ReactCommon/turbomodule/core
   - react-native-document-picker (9.1.1):
     - RCT-Folly
     - RCTRequired
@@ -1974,7 +1980,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.30.1):
+  - RNScreens (3.32.0):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1988,13 +1994,14 @@ PODS:
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
+    - React-RCTImage
     - React-rendererdebug
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 3.30.1)
+    - RNScreens/common (= 3.32.0)
     - Yoga
-  - RNScreens/common (3.30.1):
+  - RNScreens/common (3.32.0):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2008,6 +2015,7 @@ PODS:
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
+    - React-RCTImage
     - React-rendererdebug
     - React-utils
     - ReactCommon/turbomodule/bridging
@@ -2552,7 +2560,7 @@ SPEC CHECKSUMS:
   react-native-airship: 38e2596999242b68c933959d6145512e77937ac0
   react-native-blob-util: 1ddace5234c62e3e6e4e154d305ad07ef686599b
   react-native-cameraroll: f373bebbe9f6b7c3fd2a6f97c5171cda574cf957
-  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
+  react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
   react-native-document-picker: 8532b8af7c2c930f9e202aac484ac785b0f4f809
   react-native-geolocation: f9e92eb774cb30ac1e099f34b3a94f03b4db7eb3
   react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
@@ -2612,7 +2620,7 @@ SPEC CHECKSUMS:
   RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216
   RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37
   RNReanimated: 323436b1a5364dca3b5f8b1a13458455e0de9efe
-  RNScreens: 9ec969a95987a6caae170ef09313138abf3331e1
+  RNScreens: abd354e98519ed267600b7ee64fdcb8e060b1218
   RNShare: 2a4cdfc0626ad56b0ef583d424f2038f772afe58
   RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
   RNSVG: 18f1381e046be2f1c30b4724db8d0c966238089f