From e16c1af0ca46120004fc8263468e229893c0ad8e Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Fri, 7 Nov 2025 14:28:38 +0100
Subject: [PATCH 1/2] fix: declare support for 0.83

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index cc809336c..8220027cf 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "@callstack/react-native-visionos": "0.76 - 0.79",
     "@expo/config-plugins": ">=5.0",
     "react": "18.2 - 19.1",
-    "react-native": "0.76 - 0.82 || >=0.83.0-0 <0.83.0",
+    "react-native": "0.76 - 0.83 || >=0.83.0-0 <0.84.0",
     "react-native-macos": "^0.0.0-0 || 0.76 - 0.79",
     "react-native-windows": "^0.0.0-0 || 0.76 - 0.80"
   },
diff --git a/yarn.lock b/yarn.lock
index 2a3b92466..6b22da2c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12349,7 +12349,7 @@ __metadata:
     "@callstack/react-native-visionos": 0.76 - 0.79
     "@expo/config-plugins": ">=5.0"
     react: 18.2 - 19.1
-    react-native: 0.76 - 0.82 || >=0.83.0-0 <0.83.0
+    react-native: 0.76 - 0.83 || >=0.83.0-0 <0.84.0
     react-native-macos: ^0.0.0-0 || 0.76 - 0.79
     react-native-windows: ^0.0.0-0 || 0.76 - 0.80
   peerDependenciesMeta:

From 04ae291d48fd003f4ddb0aad26f2c0c122df13b3 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:24:25 +0100
Subject: [PATCH 2/2] test: skip unsupported test variants

---
 scripts/testing/test-matrix.mts | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/testing/test-matrix.mts b/scripts/testing/test-matrix.mts
index b1511b7fe..d887892fd 100644
--- a/scripts/testing/test-matrix.mts
+++ b/scripts/testing/test-matrix.mts
@@ -338,20 +338,29 @@ if (platforms.length === 0) {
   process.exitCode = 1;
   showBanner(red("No valid platforms were specified"));
 } else {
-  TEST_VARIANTS.reduce(
-    (job, variant) => {
-      return job.then(() =>
-        withReactNativeVersion(version, async () => {
-          for (const platform of platforms) {
-            await buildRunTest({ version, platform, variant });
-          }
-        })
-      );
-    },
-    waitForUserInput(
-      `${TAG} Before continuing, make sure all emulators/simulators and Appium/Metro instances are closed.\n${TAG}\n${TAG} Press any key to continue...`
+  TEST_VARIANTS.filter((variant) =>
+    platforms.some((platform) =>
+      PLATFORM_CONFIG[platform].isAvailable({
+        version,
+        platform,
+        variant,
+        engine: "hermes",
+      })
     )
   )
+    .reduce(
+      (job, variant) =>
+        job.then(() =>
+          withReactNativeVersion(version, async () => {
+            for (const platform of platforms) {
+              await buildRunTest({ version, platform, variant });
+            }
+          })
+        ),
+      waitForUserInput(
+        `${TAG} Before continuing, make sure all emulators/simulators and Appium/Metro instances are closed.\n${TAG}\n${TAG} Press any key to continue...`
+      )
+    )
     .then(() => {
       showBanner("Initialize new app");
       $(