From 52df64e24fd65f988cf4ada0b1486720489c5e3c Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Fri, 22 May 2026 13:17:40 +0200
Subject: [PATCH 1/2] Link E/App PR in Onyx PR

---
 .github/PULL_REQUEST_TEMPLATE.md                    | 13 +++++++++++++
 .../actions/javascript/validatePRChecklist/index.js |  8 ++++++++
 .../validatePRChecklist/validatePRChecklist.ts      |  8 ++++++++
 3 files changed, 29 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4957991b7..5a59af55b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,6 +7,18 @@
 <!-- Please replace GH_LINK with the link to the GitHub issue this Pull Request is related to -->
 GH_LINK
 
+### Linked E/App PR
+<!--
+Every Onyx PR must ship with a corresponding Expensify/App PR that pins Onyx to this PR's HEAD via git+https
+(e.g. "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#<commit_sha>").
+That linked PR runs the full E/App test suite signals that the Onyx
+change is safe. After this PR is merged and published to npm, swap the linked E/App PR to the pinned version
+(e.g. "react-native-onyx": "3.0.72") and request a final review — it becomes the bump PR.
+
+Paste the full Expensify/App PR URL below (e.g. https://github.com/Expensify/App/pull/12345):
+-->
+
+
 ### Automated Tests
 <!---
 Most changes to Onyx should have accompanying tests. Describe the tests you added or if no tests were added an explanation about why one was not needed.
@@ -20,6 +32,7 @@ Each set of changes should be tested against the Expensify/App repo on all platf
 ### Author Checklist
 
 - [ ] I linked the correct issue in the `### Related Issues` section above
+- [ ] I linked the corresponding Expensify/App PR in the `### Linked E/App PR` section above, and verified this change against it (E/App CI passed and manual testing completed)
 - [ ] I wrote clear testing steps that cover the changes made in this PR
     - [ ] I added steps for local testing in the `Tests` section
     - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
diff --git a/.github/actions/javascript/validatePRChecklist/index.js b/.github/actions/javascript/validatePRChecklist/index.js
index b9161e7c6..4794aeefc 100644
--- a/.github/actions/javascript/validatePRChecklist/index.js
+++ b/.github/actions/javascript/validatePRChecklist/index.js
@@ -29983,6 +29983,7 @@ const fs = __importStar(__nccwpck_require__(7147));
 const path = __importStar(__nccwpck_require__(1017));
 const UNCHECKED_PATTERN = /- \[ \]/g;
 const CHECKED_PATTERN = /- \[x\]/gi;
+const E_APP_PR_URL_PATTERN = /^https?:\/\/github\.com\/Expensify\/App\/pull\/\d+\/?$/;
 function getAuthorChecklistSection(body) {
     const startMarker = '### Author Checklist';
     const endMarker = '### Screenshots/Videos';
@@ -30025,6 +30026,13 @@ function validateChecklist(body) {
     if (unchecked > 0) {
         errors.push(`${unchecked} checklist item(s) are unchecked. All items must be checked before merging — including items that don't apply (check them and note why if needed).`);
     }
+    const linkedEAppPR = getSectionContent(body, 'Linked E/App PR');
+    if (!linkedEAppPR) {
+        errors.push('The "Linked E/App PR" section is empty. Every Onyx PR must link to a corresponding Expensify/App PR that pins this PR via git+https and runs the full E/App test suite.');
+    }
+    else if (!E_APP_PR_URL_PATTERN.test(linkedEAppPR)) {
+        errors.push(`The "Linked E/App PR" section must contain a single Expensify/App PR URL (e.g. https://github.com/Expensify/App/pull/12345), found: "${linkedEAppPR}".`);
+    }
     // Section warnings
     if (!getSectionContent(body, 'Automated Tests')) {
         warnings.push('The "Automated Tests" section is empty. Please describe the automated tests you added, or explain why automated tests are not needed for this change.');
diff --git a/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts b/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
index f6c63fd47..848103db9 100644
--- a/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
+++ b/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
@@ -16,6 +16,7 @@ interface ValidationResult {
 
 const UNCHECKED_PATTERN = /- \[ \]/g;
 const CHECKED_PATTERN = /- \[x\]/gi;
+const E_APP_PR_URL_PATTERN = /^https?:\/\/github\.com\/Expensify\/App\/pull\/\d+\/?$/;
 
 function getAuthorChecklistSection(body: string): string {
     const startMarker = '### Author Checklist';
@@ -67,6 +68,13 @@ function validateChecklist(body: string): ValidationResult {
         errors.push(`${unchecked} checklist item(s) are unchecked. All items must be checked before merging — including items that don't apply (check them and note why if needed).`);
     }
 
+    const linkedEAppPR = getSectionContent(body, 'Linked E/App PR');
+    if (!linkedEAppPR) {
+        errors.push('The "Linked E/App PR" section is empty. Every Onyx PR must link to a corresponding Expensify/App PR that pins this PR via git+https and runs the full E/App test suite.');
+    } else if (!E_APP_PR_URL_PATTERN.test(linkedEAppPR)) {
+        errors.push(`The "Linked E/App PR" section must contain a single Expensify/App PR URL (e.g. https://github.com/Expensify/App/pull/12345), found: "${linkedEAppPR}".`);
+    }
+
     // Section warnings
     if (!getSectionContent(body, 'Automated Tests')) {
         warnings.push('The "Automated Tests" section is empty. Please describe the automated tests you added, or explain why automated tests are not needed for this change.');

From 1e06a268dc9dff3eb39925fd596f408b795ac44c Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Fri, 22 May 2026 13:21:15 +0200
Subject: [PATCH 2/2] Prettier fix

---
 .../javascript/validatePRChecklist/validatePRChecklist.ts     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts b/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
index 848103db9..8ff45e202 100644
--- a/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
+++ b/.github/actions/javascript/validatePRChecklist/validatePRChecklist.ts
@@ -70,7 +70,9 @@ function validateChecklist(body: string): ValidationResult {
 
     const linkedEAppPR = getSectionContent(body, 'Linked E/App PR');
     if (!linkedEAppPR) {
-        errors.push('The "Linked E/App PR" section is empty. Every Onyx PR must link to a corresponding Expensify/App PR that pins this PR via git+https and runs the full E/App test suite.');
+        errors.push(
+            'The "Linked E/App PR" section is empty. Every Onyx PR must link to a corresponding Expensify/App PR that pins this PR via git+https and runs the full E/App test suite.',
+        );
     } else if (!E_APP_PR_URL_PATTERN.test(linkedEAppPR)) {
         errors.push(`The "Linked E/App PR" section must contain a single Expensify/App PR URL (e.g. https://github.com/Expensify/App/pull/12345), found: "${linkedEAppPR}".`);
     }