Merge branch 'main' into fix/expense-unexpected-error-after-report-rename

Author: marufsharifi

.claude/skills/playwright-app-testing/SKILL.md

@@ -41,7 +41,19 @@ When signing in to dev environment:
 - **Email**: Generate random Gmail address (e.g., `user+throwaway<random>@gmail.com`)
     - **New Account**: Press join to create account
     - **Existing Account**: Magic code: Always `000000`
-- **Onboarding**: Skip all optional steps
+- **Onboarding**: The `SKIP_ONBOARDING` env flag is set to `false` by default in `.env`. When `false`, onboarding screens will appear after sign-in for new accounts. Unless you are specifically asked to test onboarding, update the flag to `true` before starting the dev server so that onboarding is bypassed entirely:
+    ```bash
+    sed -i '' 's/SKIP_ONBOARDING=false/SKIP_ONBOARDING=true/' .env
+    ```
+    If you need to test onboarding flows, set it back to `false`:
+    ```bash
+    sed -i '' 's/SKIP_ONBOARDING=true/SKIP_ONBOARDING=false/' .env
+    ```
+    You can check the current value with:
+    ```bash
+    grep SKIP_ONBOARDING .env
+    ```
+    **Important**: After changing `SKIP_ONBOARDING` in `.env`, the web dev server must be restarted for the change to take effect.
 
 ## Example Usage
 

.env.example

@@ -9,6 +9,7 @@ SECURE_NGROK_URL=https://secure-expensify-user.ngrok.io/
 NGROK_URL=https://expensify-user.ngrok.io/
 USE_NGROK=false
 USE_WEB_PROXY=false
+SKIP_ONBOARDING=false
 USE_WDYR=false
 USE_REDUX_DEVTOOLS=false
 CAPTURE_METRICS=false

.github/ISSUE_TEMPLATE/OnboardOffboardExpertContributor.md

@@ -34,4 +34,6 @@ Which action do you wish to take for this team member (select one):
 ### Ring0 Tasks
 
 - [ ] If adding, add to the appropriate GitHub child team of [external-expert-contributors](https://github.com/orgs/Expensify/teams/external-expert-contributors/teams) (each agency must have its own child team)
+- [ ] If adding, create an [IdentityDot account](https://stackoverflowteams.com/c/expensify/questions/22914) for the contributor
 - [ ] If removing, remove from our organization [here](https://github.com/orgs/Expensify/people)
+- [ ] If removing, delete the contributor's [IdentityDot account](https://stackoverflowteams.com/c/expensify/questions/22914)

.github/actions/javascript/getPullRequestIncrementalChanges/getPullRequestIncrementalChanges.ts

@@ -1,5 +1,6 @@
 import * as core from '@actions/core';
 import {context} from '@actions/github';
+import {RequestError} from '@octokit/request-error';
 import type {PullRequestEvent, PullRequestSynchronizeEvent} from '@octokit/webhooks-types';
 import {getJSONInput} from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
@@ -89,7 +90,29 @@ async function run(): Promise<void> {
 
         // Now we know there are local changes - get PR diff from the GitHub API to compare
         console.log(`🌐 Using GitHub API to validate ${localChangedFiles.size} files with local changes`);
-        const prDiff = Git.parseDiff(await GitHubUtils.getPullRequestDiff(prNumber));
+
+        let prDiffString: string;
+        try {
+            prDiffString = await GitHubUtils.getPullRequestDiff(prNumber);
+        } catch (error) {
+            const isTooLarge =
+                error instanceof RequestError &&
+                typeof error.response?.data === 'object' &&
+                error.response.data !== null &&
+                'errors' in error.response.data &&
+                ((error.response.data as {errors?: Array<{code?: string}>}).errors ?? []).some((e) => e.code === 'too_large');
+
+            if (!isTooLarge) {
+                throw error;
+            }
+
+            core.warning(`PR #${prNumber} diff is too large for the GitHub API. Skipping incremental change detection.`);
+            core.setOutput('CHANGED_FILES', JSON.stringify([]));
+            core.setOutput('HAS_CHANGES', false);
+            return;
+        }
+
+        const prDiff = Git.parseDiff(prDiffString);
 
         // Compare the local push diff with the PR diff and collect changed files, checking for overlapping content changes at the line level
         for (const prFileDiff of prDiff.files) {

.github/actions/javascript/getPullRequestIncrementalChanges/index.js

@@ -11582,6 +11582,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const core = __importStar(__nccwpck_require__(2186));
 const github_1 = __nccwpck_require__(5438);
+const request_error_1 = __nccwpck_require__(537);
 const ActionUtils_1 = __nccwpck_require__(6981);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
@@ -11655,7 +11656,25 @@ async function run() {
         }
         // Now we know there are local changes - get PR diff from the GitHub API to compare
         console.log(`🌐 Using GitHub API to validate ${localChangedFiles.size} files with local changes`);
-        const prDiff = Git_1.default.parseDiff(await GithubUtils_1.default.getPullRequestDiff(prNumber));
+        let prDiffString;
+        try {
+            prDiffString = await GithubUtils_1.default.getPullRequestDiff(prNumber);
+        }
+        catch (error) {
+            const isTooLarge = error instanceof request_error_1.RequestError &&
+                typeof error.response?.data === 'object' &&
+                error.response.data !== null &&
+                'errors' in error.response.data &&
+                (error.response.data.errors ?? []).some((e) => e.code === 'too_large');
+            if (!isTooLarge) {
+                throw error;
+            }
+            core.warning(`PR #${prNumber} diff is too large for the GitHub API. Skipping incremental change detection.`);
+            core.setOutput('CHANGED_FILES', JSON.stringify([]));
+            core.setOutput('HAS_CHANGES', false);
+            return;
+        }
+        const prDiff = Git_1.default.parseDiff(prDiffString);
         // Compare the local push diff with the PR diff and collect changed files, checking for overlapping content changes at the line level
         for (const prFileDiff of prDiff.files) {
             const filePath = prFileDiff.filePath;
@@ -12506,6 +12525,7 @@ class Git {
                         newStart,
                         newCount,
                         lines: [],
+                        contextLineCount: 0,
                     };
                 }
                 continue;
@@ -12533,7 +12553,8 @@ class Git {
                     });
                 }
                 else if (firstChar === ' ') {
-                    // Context line - skip it (we only care about added/removed lines)
+                    // Context line - count it so calculateLineNumber accounts for position advancement
+                    currentHunk.contextLineCount++;
                     continue;
                 }
                 else if (firstChar === '\\') {
@@ -12597,9 +12618,9 @@ class Git {
         const removedCount = hunk.lines.filter((l) => l.type === 'removed').length;
         switch (lineType) {
             case 'added':
-                return hunk.newStart + addedCount;
+                return hunk.newStart + hunk.contextLineCount + addedCount;
             case 'removed':
-                return hunk.oldStart + removedCount;
+                return hunk.oldStart + hunk.contextLineCount + removedCount;
             default:
                 throw new Error(`Unknown line type: ${String(lineType)}`);
         }
@@ -12795,6 +12816,7 @@ class Git {
                 newStart: 1,
                 newCount: lines.length,
                 lines: diffLines,
+                contextLineCount: 0,
             };
             const fileDiff = {
                 filePath,

.github/actions/javascript/reviewerChecklist/index.js

@@ -11622,15 +11622,13 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
     })
         .then(() => {
         console.log(`Looking through all ${combinedComments.length} comments for the reviewer checklist...`);
+        const maxCompletedItems = numberOfChecklistItems + 2;
+        const minCompletedItems = numberOfChecklistItems - 2;
         let foundReviewerChecklist = false;
         let numberOfFinishedChecklistItems = 0;
         let numberOfUnfinishedChecklistItems = 0;
         // Once we've gathered all the data, loop through each comment and look to see if it contains the reviewer checklist
         for (let i = 0; i < combinedComments.length; i++) {
-            // Skip all other comments if we already found the reviewer checklist
-            if (foundReviewerChecklist) {
-                break;
-            }
             const whitespace = /([\n\r])/gm;
             const comment = combinedComments.at(i)?.replaceAll(whitespace, '');
             console.log(`Comment ${i} starts with: ${comment?.slice(0, 20)}...`);
@@ -11640,14 +11638,16 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
                 foundReviewerChecklist = true;
                 numberOfFinishedChecklistItems = (comment?.match(/- \[x\]/gi) ?? []).length;
                 numberOfUnfinishedChecklistItems = (comment?.match(/- \[ \]/g) ?? []).length;
+                if (numberOfFinishedChecklistItems >= minCompletedItems && numberOfFinishedChecklistItems <= maxCompletedItems && numberOfUnfinishedChecklistItems === 0) {
+                    console.log('PR Reviewer checklist is complete 🎉');
+                    return;
+                }
             }
         }
         if (!foundReviewerChecklist) {
             core.setFailed('No PR Reviewer Checklist was found');
             return;
         }
-        const maxCompletedItems = numberOfChecklistItems + 2;
-        const minCompletedItems = numberOfChecklistItems - 2;
         console.log(`You completed ${numberOfFinishedChecklistItems} out of ${numberOfChecklistItems} checklist items with ${numberOfUnfinishedChecklistItems} unfinished items`);
         if (numberOfFinishedChecklistItems >= minCompletedItems && numberOfFinishedChecklistItems <= maxCompletedItems && numberOfUnfinishedChecklistItems === 0) {
             console.log('PR Reviewer checklist is complete 🎉');

.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts

@@ -43,17 +43,14 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems: number) {
         })
         .then(() => {
             console.log(`Looking through all ${combinedComments.length} comments for the reviewer checklist...`);
+            const maxCompletedItems = numberOfChecklistItems + 2;
+            const minCompletedItems = numberOfChecklistItems - 2;
             let foundReviewerChecklist = false;
             let numberOfFinishedChecklistItems = 0;
             let numberOfUnfinishedChecklistItems = 0;
 
             // Once we've gathered all the data, loop through each comment and look to see if it contains the reviewer checklist
             for (let i = 0; i < combinedComments.length; i++) {
-                // Skip all other comments if we already found the reviewer checklist
-                if (foundReviewerChecklist) {
-                    break;
-                }
-
                 const whitespace = /([\n\r])/gm;
                 const comment = combinedComments.at(i)?.replaceAll(whitespace, '');
 
@@ -65,6 +62,11 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems: number) {
                     foundReviewerChecklist = true;
                     numberOfFinishedChecklistItems = (comment?.match(/- \[x\]/gi) ?? []).length;
                     numberOfUnfinishedChecklistItems = (comment?.match(/- \[ \]/g) ?? []).length;
+
+                    if (numberOfFinishedChecklistItems >= minCompletedItems && numberOfFinishedChecklistItems <= maxCompletedItems && numberOfUnfinishedChecklistItems === 0) {
+                        console.log('PR Reviewer checklist is complete 🎉');
+                        return;
+                    }
                 }
             }
 
@@ -73,9 +75,6 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems: number) {
                 return;
             }
 
-            const maxCompletedItems = numberOfChecklistItems + 2;
-            const minCompletedItems = numberOfChecklistItems - 2;
-
             console.log(`You completed ${numberOfFinishedChecklistItems} out of ${numberOfChecklistItems} checklist items with ${numberOfUnfinishedChecklistItems} unfinished items`);
 
             if (numberOfFinishedChecklistItems >= minCompletedItems && numberOfFinishedChecklistItems <= maxCompletedItems && numberOfUnfinishedChecklistItems === 0) {

.github/scripts/createDocsRoutes.ts

@@ -60,13 +60,16 @@ function toTitleCase(str: string): string {
 }
 
 /**
- * @param filename - The name of the file
+ * @param filename - The name of the file (path used for href)
+ * @param order - Optional order from front matter
+ * @param titleOverride - Optional display title (e.g. subfolder name: "Export-Errors" -> "Export Errors")
  */
-function getArticleObj(filename: string, order?: number): Article {
+function getArticleObj(filename: string, order?: number, titleOverride?: string): Article {
     const href = filename.replace('.md', '');
+    const title = titleOverride ? toTitleCase(titleOverride.replaceAll('-', ' ')) : toTitleCase(href.replaceAll('-', ' '));
     return {
         href,
-        title: toTitleCase(href.replaceAll('-', ' ')),
+        title,
         order,
     };
 }
@@ -123,10 +126,40 @@ function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof pla
             const section = fileOrFolder;
             const articles: Article[] = [];
 
-            // Each subfolder will be a section containing articles
-            for (const subArticle of fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}/${section}`)) {
-                const order = getOrderFromArticleFrontMatter(`${docsDir}/articles/${platformName}/${hub}/${section}/${subArticle}`);
-                articles.push(getArticleObj(subArticle, order));
+            // Section can contain .md files directly and/or subfolders (and nested subfolders) that contain .md files
+            const sectionPath = `${docsDir}/articles/${platformName}/${hub}/${section}`;
+            for (const entry of fs.readdirSync(sectionPath)) {
+                const entryPath = `${sectionPath}/${entry}`;
+                if (entry.endsWith('.md') && fs.statSync(entryPath).isFile()) {
+                    const order = getOrderFromArticleFrontMatter(entryPath);
+                    articles.push(getArticleObj(entry, order));
+                    continue;
+                }
+                if (fs.statSync(entryPath).isDirectory()) {
+                    // One level: section/SubFolder/file.md -> href "SubFolder/file", display title = "Troubleshoot SubFolder"
+                    for (const file of fs.readdirSync(entryPath)) {
+                        const filePath = `${entryPath}/${file}`;
+                        if (file.endsWith('.md') && fs.statSync(filePath).isFile()) {
+                            const order = getOrderFromArticleFrontMatter(filePath);
+                            articles.push(getArticleObj(`${entry}/${file}`, order, `Troubleshoot ${entry}`));
+                            continue;
+                        }
+                        if (fs.statSync(filePath).isDirectory()) {
+                            // Two levels: section/SubFolder/NestedFolder/file.md -> href "SubFolder/NestedFolder/file", display title = "Troubleshoot NestedFolder" (e.g. "Troubleshoot Export Errors")
+                            for (const nestedFile of fs.readdirSync(filePath)) {
+                                if (!nestedFile.endsWith('.md')) {
+                                    continue;
+                                }
+                                const nestedPath = `${filePath}/${nestedFile}`;
+                                if (!fs.statSync(nestedPath).isFile()) {
+                                    continue;
+                                }
+                                const order = getOrderFromArticleFrontMatter(nestedPath);
+                                articles.push(getArticleObj(`${entry}/${file}/${nestedFile}`, order, `Troubleshoot ${file}`));
+                            }
+                        }
+                    }
+                }
             }
 
             pushOrCreateEntry(routeHubs, hub, 'sections', {

.github/workflows/buildAndroid.yml

@@ -183,7 +183,7 @@ jobs:
           comment-bot: false
           rock-build-extra-params: ${{ inputs.variant == 'Adhoc' && '--extra-params "-PreactNativeArchitectures=arm64-v8a,x86_64 --profile"' || '--extra-params "--profile"' }}
           custom-identifier: ${{ steps.computeIdentifier.outputs.IDENTIFIER }}
-          validate-elf-alignment: false
+          validate-elf-alignment: ${{ inputs.variant != 'Release' && 'true' || 'false' }}
 
       - name: Upload Gradle profile report
         if: always()
@@ -283,6 +283,10 @@ jobs:
             --key-pass=pass:${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
           unzip -p Expensify.apks universal.apk > Expensify.apk
 
+      - name: Validate ELF alignment for Release APK
+        if: ${{ inputs.variant == 'Release' && steps.collectArtifacts.outputs.HAS_AAB == 'true' }}
+        run: npx rock validate-elf-alignment "Expensify.apk"
+
       - name: Upload Android APK build artifact
         if: steps.collectArtifacts.outputs.HAS_AAB == 'true'
         # v6