resolve merge conflicts

Author: Shahidullah-Muffakir

.github/ISSUE_TEMPLATE/NewPatchTemplate.md

@@ -0,0 +1,39 @@
+---
+name: Patch Tracking
+about: Template for tracking patches applied to third-party libraries
+---
+
+If you haven't already, check out our [contributing guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md) and [patch guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PATCHES.md) for information on how to manage patches.
+___
+
+## Patch Information
+
+**Library Name:** <!-- e.g., react-native-pdf -->
+**Library Version:** <!-- e.g., 6.7.3 -->
+**Patch Number:** <!-- e.g., 001 -->
+**Patch Description:** <!-- e.g., update-podspec-to-support-new-arch -->
+**Full Patch Filename:** <!-- e.g., react-native-pdf+6.7.3+001+update-podspec-to-support-new-arch.patch -->
+
+## Patch Details
+
+### Reason for Patch
+<!-- Explain why this patch is necessary. What issue does it solve? -->
+
+### Changes Made
+<!-- Briefly describe the changes made in the patch -->
+
+### Upstream Status
+**Upstream PR/Issue:** <!-- Link to the PR or issue in the upstream repository, if one exists -->
+
+## Related Information
+
+**PR Introducing Patch:** <!-- Link to the PR that introduced this patch -->
+
+## Additional Notes
+<!-- Any other relevant information about this patch -->
+
+## Checklist
+- [ ] Patch file is correctly named and placed in the appropriate directory
+- [ ] Patch is documented in the corresponding `details.md` file
+- [ ] This issue is linked in the `details.md` file
+- [ ] Upstream PR/issue has been created (if applicable)

.github/actions/javascript/authorChecklist/index.js

@@ -15602,7 +15602,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -12376,7 +12376,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/checkAndroidStatus/index.js

@@ -737095,7 +737095,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/checkDeployBlockers/index.js

@@ -11659,7 +11659,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -11926,7 +11926,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/getArtifactInfo/index.js

@@ -11620,7 +11620,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -11963,7 +11963,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/getPullRequestDetails/index.js

@@ -11723,7 +11723,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**

.github/actions/javascript/isStagingDeployLocked/index.js

@@ -11620,7 +11620,11 @@ class GithubUtils {
      * @private
      */
     static initOctokit() {
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        const token = process.env.GITHUB_TOKEN ?? core.getInput('GITHUB_TOKEN', { required: true });
+        if (!token) {
+            console.error('GitHubUtils could not find GITHUB_TOKEN');
+            process.exit(1);
+        }
         this.initOctokitWithToken(token);
     }
     /**