From af3b084d54efa59692d2db7f4b3319eab56e183c Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Thu, 21 Aug 2025 09:23:18 +0200
Subject: [PATCH 1/6] Bump react-native-web

---
 package-lock.json                             | 15 ++++---------
 package.json                                  |  2 +-
 patches/react-native-web/details.md           | 22 +++++++++----------
 ...ative-web+0.20.0+011+fix-memory-leak.patch | 12 ----------
 ...react-native-web+0.21.1+001+initial.patch} |  0
 ...native-web+0.21.1+002+fixLastSpacer.patch} |  0
 ...web+0.21.1+003+image-header-support.patch} |  0
 ...-web+0.21.1+004+fixPointerEventDown.patch} |  0
 ...tive-web+0.21.1+005+osr-improvement.patch} |  0
 ....1+006+remove-focus-trap-from-modal.patch} |  0
 ...1+007+fix-scrollable-overflown-text.patch} |  0
 ...8+fix-nested-flatlist-scroll-on-web.patch} |  0
 ...009+fix-two-direction-scroll-on-web.patch} |  0
 ...ve-web+0.21.1+010+fullstory-support.patch} |  0
 14 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch
 rename patches/react-native-web/{react-native-web+0.20.0+001+initial.patch => react-native-web+0.21.1+001+initial.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+002+fixLastSpacer.patch => react-native-web+0.21.1+002+fixLastSpacer.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+003+image-header-support.patch => react-native-web+0.21.1+003+image-header-support.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+004+fixPointerEventDown.patch => react-native-web+0.21.1+004+fixPointerEventDown.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+005+osr-improvement.patch => react-native-web+0.21.1+005+osr-improvement.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch => react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch => react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch => react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch => react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+010+fullstory-support.patch => react-native-web+0.21.1+010+fullstory-support.patch} (100%)

diff --git a/package-lock.json b/package-lock.json
index 0e6902e83d7b..d27e9c3e87a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -130,7 +130,7 @@
         "react-native-url-polyfill": "^2.0.0",
         "react-native-view-shot": "4.0.0",
         "react-native-vision-camera": "^4.7.0",
-        "react-native-web": "0.20.0",
+        "react-native-web": "0.21.1",
         "react-native-webview": "13.13.1",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -21803,13 +21803,6 @@
         "undici-types": "~6.21.0"
       }
     },
-    "node_modules/electron/node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/emittery": {
       "version": "0.13.1",
       "dev": true,
@@ -35183,9 +35176,9 @@
       }
     },
     "node_modules/react-native-web": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.20.0.tgz",
-      "integrity": "sha512-OOSgrw+aON6R3hRosCau/xVxdLzbjEcsLysYedka0ZON4ZZe6n9xgeN9ZkoejhARM36oTlUgHIQqxGutEJ9Wxg==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.21.1.tgz",
+      "integrity": "sha512-BeNsgwwe4AXUFPAoFU+DKjJ+CVQa3h54zYX77p7GVZrXiiNo3vl03WYDYVEy5R2J2HOPInXtQZB5gmj3vuzrKg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
diff --git a/package.json b/package.json
index 5b95ff18a6d5..10b64ca43770 100644
--- a/package.json
+++ b/package.json
@@ -200,7 +200,7 @@
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "4.0.0",
     "react-native-vision-camera": "^4.7.0",
-    "react-native-web": "0.20.0",
+    "react-native-web": "0.21.1",
     "react-native-webview": "13.13.1",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
diff --git a/patches/react-native-web/details.md b/patches/react-native-web/details.md
index 6629cf89a047..f1ad5a53b6a0 100644
--- a/patches/react-native-web/details.md
+++ b/patches/react-native-web/details.md
@@ -1,6 +1,6 @@
 # `react-native-web` patches
 
-### [react-native-web+0.20.0+001+initial.patch](react-native-web+0.20.0+001+initial.patch)
+### [react-native-web+0.21.1+001+initial.patch](react-native-web+0.21.1+001+initial.patch)
 
 - Reason:
   
@@ -12,7 +12,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/24482
 
-### [react-native-web+0.20.0+002+fixLastSpacer.patch](react-native-web+0.20.0+002+fixLastSpacer.patch)
+### [react-native-web+0.21.1+002+fixLastSpacer.patch](react-native-web+0.21.1+002+fixLastSpacer.patch)
 
 - Reason:
   
@@ -24,7 +24,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/32843
 
-### [react-native-web+0.20.0+003+image-header-support.patch](react-native-web+0.20.0+003+image-header-support.patch)
+### [react-native-web+0.21.1+003+image-header-support.patch](react-native-web+0.21.1+003+image-header-support.patch)
 
 - Reason:
   
@@ -36,7 +36,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/13036
 
-### [react-native-web+0.20.0+004+fixPointerEventDown.patch](react-native-web+0.20.0+004+fixPointerEventDown.patch)
+### [react-native-web+0.21.1+004+fixPointerEventDown.patch](react-native-web+0.21.1+004+fixPointerEventDown.patch)
 
 - Reason:
   
@@ -48,7 +48,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/38494
 
-### [react-native-web+0.20.0+005+osr-improvement.patch](react-native-web+0.20.0+005+osr-improvement.patch)
+### [react-native-web+0.21.1+005+osr-improvement.patch](react-native-web+0.21.1+005+osr-improvement.patch)
 
 - Reason:
   
@@ -60,7 +60,7 @@
 - E/App issue: 🛑
 - PR introducing patch: 
 
-### [react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch](react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch)
+### [react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch](react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch)
 
 - Reason:
   
@@ -72,7 +72,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/39520
 
-### [react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch](react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch)
+### [react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch](react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch)
 
 - Reason:
   
@@ -84,7 +84,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/47532
 
-### [react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch)
+### [react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch)
 
 - Reason:
   
@@ -96,7 +96,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/60174
 
-### [react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch)
+### [react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch)
 
 - Reason:
   
@@ -108,7 +108,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/60340
 
-### [react-native-web+0.20.0+010+fullstory-support.patch](react-native-web+0.20.0+010+fullstory-support.patch)
+### [react-native-web+0.21.1+010+fullstory-support.patch](react-native-web+0.21.1+010+fullstory-support.patch)
 
 - Reason:
   
@@ -120,7 +120,7 @@
 - E/App issue: As explained above the current solution can't be applied to upstream because it's tailored to Fullstory needs.
 - PR introducing patch: https://github.com/Expensify/App/pull/67552
 
-### [react-native-web+0.20.0+011+fix-memory-leak.patch](react-native-web+0.20.0+011+fix-memory-leak.patch)
+### [react-native-web+0.21.1+011+fix-memory-leak.patch](react-native-web+0.21.1+011+fix-memory-leak.patch)
 - Reason:
   
     ```
diff --git a/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch b/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch
deleted file mode 100644
index bd749e123c7d..000000000000
--- a/patches/react-native-web/react-native-web+0.20.0+011+fix-memory-leak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js b/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js
-index 9ba3336..2d67005 100644
---- a/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js
-+++ b/node_modules/react-native-web/dist/vendor/react-native/Animated/nodes/AnimatedProps.js
-@@ -68,6 +68,7 @@ class AnimatedProps extends AnimatedNode {
-     if (this.__isNative && this._animatedView) {
-       this.__disconnectAnimatedView();
-     }
-+    this._animatedView = null
-     for (var key in this._props) {
-       var value = this._props[key];
-       if (value instanceof AnimatedNode) {
diff --git a/patches/react-native-web/react-native-web+0.20.0+001+initial.patch b/patches/react-native-web/react-native-web+0.21.1+001+initial.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+001+initial.patch
rename to patches/react-native-web/react-native-web+0.21.1+001+initial.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+002+fixLastSpacer.patch b/patches/react-native-web/react-native-web+0.21.1+002+fixLastSpacer.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+002+fixLastSpacer.patch
rename to patches/react-native-web/react-native-web+0.21.1+002+fixLastSpacer.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+003+image-header-support.patch b/patches/react-native-web/react-native-web+0.21.1+003+image-header-support.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+003+image-header-support.patch
rename to patches/react-native-web/react-native-web+0.21.1+003+image-header-support.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+004+fixPointerEventDown.patch b/patches/react-native-web/react-native-web+0.21.1+004+fixPointerEventDown.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+004+fixPointerEventDown.patch
rename to patches/react-native-web/react-native-web+0.21.1+004+fixPointerEventDown.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+005+osr-improvement.patch b/patches/react-native-web/react-native-web+0.21.1+005+osr-improvement.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+005+osr-improvement.patch
rename to patches/react-native-web/react-native-web+0.21.1+005+osr-improvement.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch b/patches/react-native-web/react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+006+remove-focus-trap-from-modal.patch
rename to patches/react-native-web/react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch b/patches/react-native-web/react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+007+fix-scrollable-overflown-text.patch
rename to patches/react-native-web/react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+008+fix-nested-flatlist-scroll-on-web.patch
rename to patches/react-native-web/react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+009+fix-two-direction-scroll-on-web.patch
rename to patches/react-native-web/react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch b/patches/react-native-web/react-native-web+0.21.1+010+fullstory-support.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch
rename to patches/react-native-web/react-native-web+0.21.1+010+fullstory-support.patch

From d5cd93199560c70cc0edb16e1c0ba4e285a6a37f Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Mon, 20 Oct 2025 13:05:05 +0200
Subject: [PATCH 2/6] Bump react-native-web to 0.21.2

---
 package-lock.json                                           | 6 ++++--
 package.json                                                | 2 +-
 ...tial.patch => react-native-web+0.21.2+001+initial.patch} | 0
 ...atch => react-native-web+0.21.2+002+fixLastSpacer.patch} | 0
 ... react-native-web+0.21.2+003+image-header-support.patch} | 0
 ...> react-native-web+0.21.2+004+fixPointerEventDown.patch} | 0
 ...ch => react-native-web+0.21.2+005+osr-improvement.patch} | 0
 ...ative-web+0.21.2+006+remove-focus-trap-from-modal.patch} | 0
 ...tive-web+0.21.2+007+fix-scrollable-overflown-text.patch} | 0
 ...-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch} | 0
 ...ve-web+0.21.2+009+fix-two-direction-scroll-on-web.patch} | 0
 ... => react-native-web+0.21.2+010+fullstory-support.patch} | 0
 ...react-native-web+0.21.2+012+fix-overscroll-recoil.patch} | 0
 13 files changed, 5 insertions(+), 3 deletions(-)
 rename patches/react-native-web/{react-native-web+0.21.1+001+initial.patch => react-native-web+0.21.2+001+initial.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+002+fixLastSpacer.patch => react-native-web+0.21.2+002+fixLastSpacer.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+003+image-header-support.patch => react-native-web+0.21.2+003+image-header-support.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+004+fixPointerEventDown.patch => react-native-web+0.21.2+004+fixPointerEventDown.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+005+osr-improvement.patch => react-native-web+0.21.2+005+osr-improvement.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch => react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch => react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch => react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch => react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.21.1+010+fullstory-support.patch => react-native-web+0.21.2+010+fullstory-support.patch} (100%)
 rename patches/react-native-web/{react-native-web+0.20.0+012+fix-overscroll-recoil.patch => react-native-web+0.21.2+012+fix-overscroll-recoil.patch} (100%)

diff --git a/package-lock.json b/package-lock.json
index 97b480338a9b..f7ad6a95f95a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -137,7 +137,7 @@
         "react-native-url-polyfill": "^2.0.0",
         "react-native-view-shot": "4.0.0",
         "react-native-vision-camera": "^4.7.2",
-        "react-native-web": "0.20.0",
+        "react-native-web": "0.21.2",
         "react-native-webview": "13.13.1",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -32564,7 +32564,9 @@
       }
     },
     "node_modules/react-native-web": {
-      "version": "0.20.0",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.21.2.tgz",
+      "integrity": "sha512-SO2t9/17zM4iEnFvlu2DA9jqNbzNhoUP+AItkoCOyFmDMOhUnBBznBDCYN92fGdfAkfQlWzPoez6+zLxFNsZEg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.6",
diff --git a/package.json b/package.json
index 8544222e793c..5dc641721e6b 100644
--- a/package.json
+++ b/package.json
@@ -208,7 +208,7 @@
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "4.0.0",
     "react-native-vision-camera": "^4.7.2",
-    "react-native-web": "0.20.0",
+    "react-native-web": "0.21.2",
     "react-native-webview": "13.13.1",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
diff --git a/patches/react-native-web/react-native-web+0.21.1+001+initial.patch b/patches/react-native-web/react-native-web+0.21.2+001+initial.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+001+initial.patch
rename to patches/react-native-web/react-native-web+0.21.2+001+initial.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+002+fixLastSpacer.patch b/patches/react-native-web/react-native-web+0.21.2+002+fixLastSpacer.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+002+fixLastSpacer.patch
rename to patches/react-native-web/react-native-web+0.21.2+002+fixLastSpacer.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+003+image-header-support.patch b/patches/react-native-web/react-native-web+0.21.2+003+image-header-support.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+003+image-header-support.patch
rename to patches/react-native-web/react-native-web+0.21.2+003+image-header-support.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+004+fixPointerEventDown.patch b/patches/react-native-web/react-native-web+0.21.2+004+fixPointerEventDown.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+004+fixPointerEventDown.patch
rename to patches/react-native-web/react-native-web+0.21.2+004+fixPointerEventDown.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+005+osr-improvement.patch b/patches/react-native-web/react-native-web+0.21.2+005+osr-improvement.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+005+osr-improvement.patch
rename to patches/react-native-web/react-native-web+0.21.2+005+osr-improvement.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch b/patches/react-native-web/react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch
rename to patches/react-native-web/react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch b/patches/react-native-web/react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch
rename to patches/react-native-web/react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch
rename to patches/react-native-web/react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch b/patches/react-native-web/react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch
rename to patches/react-native-web/react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch
diff --git a/patches/react-native-web/react-native-web+0.21.1+010+fullstory-support.patch b/patches/react-native-web/react-native-web+0.21.2+010+fullstory-support.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.1+010+fullstory-support.patch
rename to patches/react-native-web/react-native-web+0.21.2+010+fullstory-support.patch
diff --git a/patches/react-native-web/react-native-web+0.20.0+012+fix-overscroll-recoil.patch b/patches/react-native-web/react-native-web+0.21.2+012+fix-overscroll-recoil.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.20.0+012+fix-overscroll-recoil.patch
rename to patches/react-native-web/react-native-web+0.21.2+012+fix-overscroll-recoil.patch

From a1cac77e5a1226de90eeb178c663f6b7488a2186 Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Tue, 21 Oct 2025 10:09:18 +0200
Subject: [PATCH 3/6] Update details.md for react-native-web patches

---
 patches/react-native-web/details.md           | 24 +++++++++----------
 ...eb+0.21.2+011+fix-overscroll-recoil.patch} |  0
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename patches/react-native-web/{react-native-web+0.21.2+012+fix-overscroll-recoil.patch => react-native-web+0.21.2+011+fix-overscroll-recoil.patch} (100%)

diff --git a/patches/react-native-web/details.md b/patches/react-native-web/details.md
index 0d62178746c6..3b86ebf16bc2 100644
--- a/patches/react-native-web/details.md
+++ b/patches/react-native-web/details.md
@@ -1,6 +1,6 @@
 # `react-native-web` patches
 
-### [react-native-web+0.21.1+001+initial.patch](react-native-web+0.21.1+001+initial.patch)
+### [react-native-web+0.21.2+001+initial.patch](react-native-web+0.21.2+001+initial.patch)
 
 - Reason:
   
@@ -12,7 +12,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/24482
 
-### [react-native-web+0.21.1+002+fixLastSpacer.patch](react-native-web+0.21.1+002+fixLastSpacer.patch)
+### [react-native-web+0.21.2+002+fixLastSpacer.patch](react-native-web+0.21.2+002+fixLastSpacer.patch)
 
 - Reason:
   
@@ -24,7 +24,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/32843
 
-### [react-native-web+0.21.1+003+image-header-support.patch](react-native-web+0.21.1+003+image-header-support.patch)
+### [react-native-web+0.21.2+003+image-header-support.patch](react-native-web+0.21.2+003+image-header-support.patch)
 
 - Reason:
   
@@ -36,7 +36,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/13036
 
-### [react-native-web+0.21.1+004+fixPointerEventDown.patch](react-native-web+0.21.1+004+fixPointerEventDown.patch)
+### [react-native-web+0.21.2+004+fixPointerEventDown.patch](react-native-web+0.21.2+004+fixPointerEventDown.patch)
 
 - Reason:
   
@@ -48,7 +48,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/38494
 
-### [react-native-web+0.21.1+005+osr-improvement.patch](react-native-web+0.21.1+005+osr-improvement.patch)
+### [react-native-web+0.21.2+005+osr-improvement.patch](react-native-web+0.21.2+005+osr-improvement.patch)
 
 - Reason:
   
@@ -60,7 +60,7 @@
 - E/App issue: 🛑
 - PR introducing patch: 
 
-### [react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch](react-native-web+0.21.1+006+remove-focus-trap-from-modal.patch)
+### [react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch](react-native-web+0.21.2+006+remove-focus-trap-from-modal.patch)
 
 - Reason:
   
@@ -72,7 +72,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/39520
 
-### [react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch](react-native-web+0.21.1+007+fix-scrollable-overflown-text.patch)
+### [react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch](react-native-web+0.21.2+007+fix-scrollable-overflown-text.patch)
 
 - Reason:
   
@@ -84,7 +84,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/47532
 
-### [react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.21.1+008+fix-nested-flatlist-scroll-on-web.patch)
+### [react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch](react-native-web+0.21.2+008+fix-nested-flatlist-scroll-on-web.patch)
 
 - Reason:
   
@@ -96,7 +96,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/60174
 
-### [react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.21.1+009+fix-two-direction-scroll-on-web.patch)
+### [react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch](react-native-web+0.21.2+009+fix-two-direction-scroll-on-web.patch)
 
 - Reason:
   
@@ -108,7 +108,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/60340
 
-### [react-native-web+0.21.1+010+fullstory-support.patch](react-native-web+0.21.1+010+fullstory-support.patch)
+### [react-native-web+0.21.2+010+fullstory-support.patch](react-native-web+0.21.2+010+fullstory-support.patch)
 
 - Reason:
   
@@ -120,7 +120,7 @@
 - E/App issue: As explained above the current solution can't be applied to upstream because it's tailored to Fullstory needs.
 - PR introducing patch: https://github.com/Expensify/App/pull/67552
 
-### [react-native-web+0.21.1+011+fix-memory-leak.patch](react-native-web+0.21.1+011+fix-memory-leak.patch)
+### [react-native-web+0.21.2+011+fix-memory-leak.patch](react-native-web+0.21.2+011+fix-memory-leak.patch)
 - Reason:
   
     ```
@@ -131,7 +131,7 @@
 - E/App issue: https://github.com/Expensify/App/issues/65820
 - PR introducing patch: https://github.com/Expensify/App/pull/68834
 
-### [react-native-web+0.20.0+012+fix-overscroll-recoil.patch](react-native-web+0.20.0+012+fix-overscroll-recoil.patch)
+### [react-native-web+0.21.2+011+fix-overscroll-recoil.patch](react-native-web+0.21.2+011+fix-overscroll-recoil.patch)
 
 - Reason:
   
diff --git a/patches/react-native-web/react-native-web+0.21.2+012+fix-overscroll-recoil.patch b/patches/react-native-web/react-native-web+0.21.2+011+fix-overscroll-recoil.patch
similarity index 100%
rename from patches/react-native-web/react-native-web+0.21.2+012+fix-overscroll-recoil.patch
rename to patches/react-native-web/react-native-web+0.21.2+011+fix-overscroll-recoil.patch

From 827a00b6a86c09b9ebb3d95b113f6d65316de0f8 Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Tue, 21 Oct 2025 10:11:28 +0200
Subject: [PATCH 4/6] Revert .nvmrc change

---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index f234c57bc4b1..f5b3751f5dd2 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.19.3
+20.19.4

From 7797069fd6b5b10e43e39524049b9bb85f29a0cc Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Tue, 21 Oct 2025 10:27:32 +0200
Subject: [PATCH 5/6] Retrigger tests, since they pass locally


From 2d1d6d3d9419557104119d888bb658fda3a3b842 Mon Sep 17 00:00:00 2001
From: staszekscp <mariusz.stanisz@swmansion.com>
Date: Tue, 21 Oct 2025 13:07:35 +0200
Subject: [PATCH 6/6] Update details.md for react-native-web patches

---
 patches/react-native-web/details.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/patches/react-native-web/details.md b/patches/react-native-web/details.md
index 3b86ebf16bc2..8c7df48f3ea2 100644
--- a/patches/react-native-web/details.md
+++ b/patches/react-native-web/details.md
@@ -120,17 +120,6 @@
 - E/App issue: As explained above the current solution can't be applied to upstream because it's tailored to Fullstory needs.
 - PR introducing patch: https://github.com/Expensify/App/pull/67552
 
-### [react-native-web+0.21.2+011+fix-memory-leak.patch](react-native-web+0.21.2+011+fix-memory-leak.patch)
-- Reason:
-  
-    ```
-    Fixes memory leak on web caused by Animated API used in @react-navigation package
-    ```
-  
-- Upstream PR/issue: https://github.com/necolas/react-native-web/pull/2800
-- E/App issue: https://github.com/Expensify/App/issues/65820
-- PR introducing patch: https://github.com/Expensify/App/pull/68834
-
 ### [react-native-web+0.21.2+011+fix-overscroll-recoil.patch](react-native-web+0.21.2+011+fix-overscroll-recoil.patch)
 
 - Reason: