Merge branch 'main' into fix/63894

Author: nkdengineer

.eslintrc.js

@@ -100,6 +100,11 @@ const restrictedImportPaths = [
         name: 'react-native-animatable',
         message: "Please use 'react-native-reanimated' instead.",
     },
+    {
+        name: 'react-native-onyx',
+        importNames: ['useOnyx'],
+        message: "Please use '@hooks/useOnyx' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [
@@ -225,6 +230,7 @@ module.exports = {
         'rulesdir/no-multiple-onyx-in-file': 'off',
         'rulesdir/prefer-underscore-method': 'off',
         'rulesdir/prefer-import-module-contents': 'off',
+        'rulesdir/no-beta-handler': 'error',
 
         // React and React Native specific rules
         'react-native-a11y/has-accessibility-hint': ['off'],

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

@@ -55,7 +55,7 @@ async function run(): Promise<IssuesCreateResponse | void> {
         const currentChecklistData: StagingDeployCashData | undefined = shouldCreateNewDeployChecklist ? undefined : GithubUtils.getStagingDeployCashData(mostRecentChecklist);
 
         // Find the list of PRs merged between the current checklist and the previous checklist
-        const mergedPRs = await GitUtils.getPullRequestsMergedBetween(previousChecklistData.tag, newStagingTag);
+        const mergedPRs = await GitUtils.getPullRequestsDeployedBetween(previousChecklistData.tag, newStagingTag);
 
         // Next, we generate the checklist body
         let checklistBody = '';

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

@@ -60,7 +60,7 @@ async function run() {
         }
 
         console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
-        const prList = await GitUtils.getPullRequestsMergedBetween(priorTag, inputTag);
+        const prList = await GitUtils.getPullRequestsDeployedBetween(priorTag, inputTag);
         console.log('Found the pull request list: ', prList);
         core.setOutput('PR_LIST', prList);
     } catch (error) {