From e43accc14d53fe434fe3f4f186a9fe207a1aadb3 Mon Sep 17 00:00:00 2001
From: ElenaDiachenko <diachenkoelena2@gmail.com>
Date: Mon, 18 Mar 2024 13:11:23 +0200
Subject: [PATCH 1/2] fix/flipper_xcode_15.3

---
 .../engine-rn-tvos/templates/platforms/tvos/Podfile | 13 +++++++++++++
 packages/engine-rn/templates/platforms/ios/Podfile  | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile
index f221c517b1..92afdc3633 100644
--- a/packages/engine-rn-tvos/templates/platforms/tvos/Podfile
+++ b/packages/engine-rn-tvos/templates/platforms/tvos/Podfile
@@ -82,6 +82,19 @@ post_install do |installer|
     :mac_catalyst_enabled => false
   )
   {{INJECT_POST_INSTALL}}
+  
+  installer.pods_project.targets.each do |target|
+    if target.name == 'Flipper'
+      file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
+      contents = File.read(file_path)
+      unless contents.include?('#include <functional>')
+        File.open(file_path, 'w') do |file|
+          file.puts('#include <functional>')
+          file.puts(contents)
+        end
+      end
+    end
+  end
 end
 
 {{INJECT_PLUGIN_PODFILE_INJECT}}
\ No newline at end of file
diff --git a/packages/engine-rn/templates/platforms/ios/Podfile b/packages/engine-rn/templates/platforms/ios/Podfile
index 80770050c4..93c1d15fcf 100755
--- a/packages/engine-rn/templates/platforms/ios/Podfile
+++ b/packages/engine-rn/templates/platforms/ios/Podfile
@@ -65,6 +65,19 @@ target 'RNVApp' do
       :mac_catalyst_enabled => false
     )
     {{INJECT_POST_INSTALL}}
+
+    installer.pods_project.targets.each do |target|
+      if target.name == 'Flipper'
+        file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
+        contents = File.read(file_path)
+        unless contents.include?('#include <functional>')
+          File.open(file_path, 'w') do |file|
+            file.puts('#include <functional>')
+            file.puts(contents)
+          end
+        end
+      end
+    end
   end
 end
 

From 9dde48745202a64b112776143ba862900643eb27 Mon Sep 17 00:00:00 2001
From: pauliusguzas <paulius.guzas@flexn.io>
Date: Mon, 18 Mar 2024 15:29:22 +0200
Subject: [PATCH 2/2] fix: change e2e selector because renative text has been
 removed from mobiles

---
 packages/app-harness/src/app/index.tsx  | 2 +-
 packages/app-harness/test/specs/e2e.cjs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/app-harness/src/app/index.tsx b/packages/app-harness/src/app/index.tsx
index 85193e0a18..428f1387cc 100644
--- a/packages/app-harness/src/app/index.tsx
+++ b/packages/app-harness/src/app/index.tsx
@@ -52,7 +52,7 @@ const AppContent = () => {
                 <Image
                     style={styles.logo}
                     source={ICON_LOGO}
-                    {...testProps('template-starter-home-screen-renative-image')}
+                    {...testProps('app-harness-home-screen-renative-image')}
                 />
                 <Text style={styles.introText} {...testProps('app-harness-home-screen-intro-text')}>
                     ReNative Harness
diff --git a/packages/app-harness/test/specs/e2e.cjs b/packages/app-harness/test/specs/e2e.cjs
index d1fa07c02b..04d4e695ab 100644
--- a/packages/app-harness/test/specs/e2e.cjs
+++ b/packages/app-harness/test/specs/e2e.cjs
@@ -5,7 +5,7 @@ describe('Test App Harness', () => {
         FlexnRunner.launchApp();
     });
 
-    it('--> check if element has correct text in Home Page', async () => {
-        await FlexnRunner.expectToHaveTextById('app-harness-home-screen-intro-text', 'ReNative Harness');
+    it('--> check if ReNative logo is displayed in Home Page', async () => {
+        await FlexnRunner.expectToBeDisplayedById('app-harness-home-screen-renative-image');
     });
 });