fix: conflicts

Author: truph01

.claude/skills/coding-standards/SKILL.md

@@ -44,6 +44,7 @@ Coding standards for the Expensify App. Each standard is a standalone file in `r
 - [CONSISTENCY-6](rules/consistency-6-proper-error-handling.md) — Proper error handling
 
 ### Clean React Patterns
+- [CLEAN-REACT-PATTERNS-0](rules/clean-react-0-compiler.md) — React Compiler compliance
 - [CLEAN-REACT-PATTERNS-1](rules/clean-react-1-composition-over-config.md) — Composition over configuration
 - [CLEAN-REACT-PATTERNS-2](rules/clean-react-2-own-behavior.md) — Components own their behavior
 - [CLEAN-REACT-PATTERNS-3](rules/clean-react-3-context-free-contracts.md) — Context-free component contracts

.claude/skills/coding-standards/rules/clean-react-0-compiler.md

@@ -0,0 +1,127 @@
+---
+ruleId: CLEAN-REACT-PATTERNS-0
+title: React Compiler compliance
+---
+
+## [CLEAN-REACT-PATTERNS-0] React Compiler compliance
+
+### Reasoning
+
+React Compiler is enabled in this codebase (`babel-plugin-react-compiler` runs first in both webpack and metro configs). It automatically memoizes components and hooks at the AST level — analyzing data flow, tracking dependencies, and inserting fine-grained caching that is more precise than any hand-written `useMemo`, `useCallback`, or `React.memo`.
+
+Manual memoization is therefore:
+
+1. **Redundant** — the compiler already handles it, so the manual wrapper adds zero value
+2. **Harmful** — it interferes with the compiler's optimization model, potentially preventing it from applying its own caching strategy or causing double-wrapping
+3. **Noisy** — it clutters the codebase with dependency arrays that must be maintained, reviewed, and debugged
+
+The codebase enforces this via:
+- **Babel plugin**: `babel-plugin-react-compiler` in `babel.config.js`
+- **ESLint processor**: `eslint-plugin-react-compiler-compat` suppresses redundant lint rules when files compile successfully
+- **CI compliance check**: `scripts/react-compiler-compliance-check.ts` blocks PRs with manual memoization in new files
+
+Reference: [React Compiler documentation](https://react.dev/learn/react-compiler)
+
+### Incorrect
+
+#### Incorrect (useCallback)
+
+```tsx
+function ReportScreen({reportID}: {reportID: string}) {
+    const handlePress = useCallback(() => {
+        Navigation.navigate(ROUTES.REPORT_DETAILS.getRoute(reportID));
+    }, [reportID]);
+
+    return <Button onPress={handlePress} />;
+}
+```
+
+#### Incorrect (useMemo)
+
+```tsx
+function PolicyList({policies}: {policies: Policy[]}) {
+    const sortedPolicies = useMemo(
+        () => policies.sort((a, b) => a.name.localeCompare(b.name)),
+        [policies],
+    );
+
+    return <FlatList data={sortedPolicies} renderItem={renderItem} />;
+}
+```
+
+#### Incorrect (React.memo)
+
+```tsx
+const Avatar = React.memo(function Avatar({source, size}: AvatarProps) {
+    return <Image source={source} style={getAvatarStyle(size)} />;
+});
+```
+
+### Correct
+
+#### Correct (plain function — compiler memoizes automatically)
+
+```tsx
+function ReportScreen({reportID}: {reportID: string}) {
+    const handlePress = () => {
+        Navigation.navigate(ROUTES.REPORT_DETAILS.getRoute(reportID));
+    };
+
+    return <Button onPress={handlePress} />;
+}
+```
+
+#### Correct (plain expression — compiler memoizes automatically)
+
+```tsx
+function PolicyList({policies}: {policies: Policy[]}) {
+    const sortedPolicies = policies.sort((a, b) => a.name.localeCompare(b.name));
+
+    return <FlatList data={sortedPolicies} renderItem={renderItem} />;
+}
+```
+
+#### Correct (plain component — compiler memoizes automatically)
+
+```tsx
+function Avatar({source, size}: AvatarProps) {
+    return <Image source={source} style={getAvatarStyle(size)} />;
+}
+```
+
+---
+
+### Review Metadata
+
+#### Verification
+
+Before flagging, verify that the file actually compiles with React Compiler:
+
+```bash
+npx react-compiler-healthcheck --src "<filepath>" --verbose
+```
+
+If the output contains **"Failed to compile"** for the file under review, the rule **does not apply** — the author may have no alternative to manual memoization until the compilation issue is resolved.
+
+#### Condition
+
+The verification step above is a prerequisite. Only flag when the file compiles successfully AND any of these are true in new or modified code:
+
+1. **`useCallback`** — A function is wrapped in `useCallback`. The compiler automatically memoizes closures based on their captured variables.
+2. **`useMemo`** — A value is wrapped in `useMemo`. The compiler automatically caches derived values.
+3. **`React.memo`** — A component is wrapped in `React.memo` (or `memo` imported from React). The compiler automatically skips re-rendering components whose props haven't changed.
+
+**Response:** Challenge the author: "React Compiler is enabled — remove the manual memoization and restructure the code so the compiler can handle it."
+
+The goal is to fix the root cause (make code compiler-friendly) rather than slap on manual memoization as a workaround.
+
+**Search Patterns:**
+- `useCallback\s*\(` — manual callback memoization
+- `useMemo\s*\(` — manual value memoization
+- `React\.memo\s*\(` or `memo\s*\(` — manual component memoization
+- Import statements: `useCallback`, `useMemo` from `react`
+
+**DO NOT flag if:**
+- The file does not compile with React Compiler (verified by the compliance check in the Verification section above)
+- The code is inside `node_modules/`, `patches/`, or test fixtures
+- The manual memoization exists in unchanged lines (pre-existing code not touched by the diff)

.github/scripts/createDocsRoutes.ts

@@ -12,6 +12,7 @@ type Section = {
     href: string;
     title: string;
     articles?: Article[];
+    sections?: Section[];
 };
 
 type Hub = {
@@ -60,16 +61,14 @@ function toTitleCase(str: string): string {
 }
 
 /**
- * @param filename - The name of the file (path used for href)
+ * @param filename - The name of the file
  * @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, titleOverride?: string): Article {
+function getArticleObj(filename: string, order?: number): Article {
     const href = filename.replace('.md', '');
-    const title = titleOverride ? toTitleCase(titleOverride.replaceAll('-', ' ')) : toTitleCase(href.replaceAll('-', ' '));
     return {
         href,
-        title,
+        title: toTitleCase(href.replaceAll('-', ' ')),
         order,
     };
 }
@@ -97,76 +96,87 @@ function pushOrCreateEntry<TKey extends HubEntriesKey>(hubs: Hub[], hub: string,
 }
 
 function getOrderFromArticleFrontMatter(path: string): number | undefined {
-    const frontmatter = fs.readFileSync(path, 'utf8').split('---').at(1);
-    if (!frontmatter) {
-        return;
+    try {
+        const frontmatter = fs.readFileSync(path, 'utf8').split('---').at(1);
+        if (!frontmatter) {
+            return undefined;
+        }
+        const frontmatterObject = yaml.load(frontmatter) as Record<string, unknown>;
+        return frontmatterObject.order as number | undefined;
+    } catch {
+        return undefined;
     }
-    const frontmatterObject = yaml.load(frontmatter) as Record<string, unknown>;
-    return frontmatterObject.order as number | undefined;
+}
+
+/**
+ * Build a section from a directory path, with optional parent path for nested href
+ */
+function buildSection(platformName: string, hub: string, sectionPath: string, parentHref: string): Section {
+    const sectionName = sectionPath.split('/').pop() ?? sectionPath;
+    const fullPath = `${docsDir}/articles/${platformName}/${hub}/${sectionPath}`;
+    const articles: Article[] = [];
+    const childSections: Section[] = [];
+    const href = parentHref ? `${parentHref}/${sectionName}` : sectionName;
+
+    for (const entry of fs.readdirSync(fullPath)) {
+        const entryPath = `${fullPath}/${entry}`;
+        if (entry.endsWith('.md')) {
+            const order = getOrderFromArticleFrontMatter(entryPath);
+            articles.push(getArticleObj(entry, order));
+        } else if (fs.statSync(entryPath).isDirectory()) {
+            childSections.push(buildSection(platformName, hub, `${sectionPath}/${entry}`, href));
+        }
+    }
+
+    const section: Section = {
+        href,
+        title: toTitleCase(sectionName.replaceAll('-', ' ')),
+        ...(articles.length > 0 && {articles}),
+        ...(childSections.length > 0 && {sections: childSections}),
+    };
+    return section;
+}
+
+/**
+ * Flatten sections for lookup by full path (e.g. netsuite/troubleshooting/connection-errors)
+ */
+function flattenSections(sections: Section[]): Section[] {
+    const result: Section[] = [];
+    for (const s of sections) {
+        result.push(s);
+        if (s.sections?.length) {
+            result.push(...flattenSections(s.sections));
+        }
+    }
+    return result;
 }
 
 /**
  * Add articles and sections to hubs
  * @param hubs - The hubs inside docs/articles/ for a platform
  * @param platformName - Expensify Classic or New Expensify
- * @param routeHubs - The hubs insude docs/data/_routes.yml for a platform
+ * @param routeHubs - The hubs inside docs/data/_routes.yml for a platform
  */
 function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof platformNames>, routeHubs: Hub[]) {
     for (const hub of hubs) {
-        // Iterate through each directory in articles
-        for (const fileOrFolder of fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}`)) {
-            // If the directory content is a markdown file, then it is an article
+        const basePath = `${docsDir}/articles/${platformName}/${hub}`;
+
+        for (const fileOrFolder of fs.readdirSync(basePath)) {
             if (fileOrFolder.endsWith('.md')) {
                 const articleObj = getArticleObj(fileOrFolder);
                 pushOrCreateEntry(routeHubs, hub, 'articles', articleObj);
                 continue;
             }
 
-            // For readability, we will use the term section to refer to subfolders
-            const section = fileOrFolder;
-            const articles: Article[] = [];
-
-            // 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}`));
-                            }
-                        }
-                    }
-                }
-            }
+            const sectionPath = fileOrFolder;
+            const section = buildSection(platformName, hub, sectionPath, '');
+            pushOrCreateEntry(routeHubs, hub, 'sections', section);
+        }
 
-            pushOrCreateEntry(routeHubs, hub, 'sections', {
-                href: section,
-                title: toTitleCase(section.replaceAll('-', ' ')),
-                articles,
-            });
+        // Add flat section list for nested section page lookup
+        const hubObj = routeHubs.find((obj) => obj.href === hub);
+        if (hubObj?.sections?.length) {
+            (hubObj as Hub & {flatSections?: Section[]}).flatSections = flattenSections(hubObj.sections);
         }
     }
 }

.github/workflows/README.md

@@ -8,7 +8,7 @@ name: CI
 on: pull_request
 jobs:
   validate:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2404
     steps:
       - id: myTrueAction
         uses: Expensify/my-action-outputs-true@main

.github/workflows/authorChecklist.yml

@@ -9,11 +9,22 @@ on:
     paths-ignore: ['docs/articles/**/*.md', 'docs/redirects.csv', 'docs/assets/images/**']
 
 jobs:
+  validate:
+    uses: ./.github/workflows/contributorValidationGate.yml
+    with:
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      AUTHOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
+
   # Note: PHP specifically looks for the name of this job, "checklist", so if the name of the job is changed,
   # then you also need to go into PHP and update the name of this job in the GH_JOB_NAME_CHECKLIST constant
   checklist:
+    needs: [validate]
     runs-on: blacksmith-2vcpu-ubuntu-2404
-    if: github.actor != 'OSBotify' && github.actor != 'imgbot[bot]'
+    if: |
+      needs.validate.outputs.IS_AUTHORIZED == 'true'
+      && github.actor != 'OSBotify'
+      && github.actor != 'imgbot[bot]'
     steps:
       - name: Checkout
         # v4

.github/workflows/buildIOS.yml

@@ -144,10 +144,12 @@ jobs:
             op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore/${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}
             op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Share_Extension/${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}
             op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Notification_Service/${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}
+            op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Live_Activity_Extension/${{ vars.APPLE_LIVE_ACTIVITY_PROVISIONING_PROFILE_FILE }}" --force --out-file ./${{ vars.APPLE_LIVE_ACTIVITY_PROVISIONING_PROFILE_FILE }}
           else
             op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc/OldApp_AdHoc.mobileprovision" --force --out-file ./OldApp_AdHoc.mobileprovision
             op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Share_Extension/OldApp_AdHoc_Share_Extension.mobileprovision" --force --out-file ./OldApp_AdHoc_Share_Extension.mobileprovision
             op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
+            op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Live_Activity_Extension/OldApp_AdHoc_LiveActivityExtension.mobileprovision" --force --out-file ./OldApp_AdHoc_LiveActivityExtension.mobileprovision
           fi
           op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
@@ -169,6 +171,8 @@ jobs:
               <string>${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}</string>
               <key>${{ vars.APPLE_ID }}.NotificationServiceExtension</key>
               <string>${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}</string>
+              <key>${{ vars.APPLE_ID }}.LiveActivityExtension</key>
+              <string>${{ vars.APPLE_LIVE_ACTIVITY_PROVISIONING_PROFILE_NAME }}</string>
             </dict>
           </dict>
           </plist>
@@ -189,6 +193,8 @@ jobs:
               <string>(OldApp) AdHoc: Share Extension</string>
               <key>com.expensify.expensifylite.adhoc.NotificationServiceExtension</key>
               <string>(OldApp) AdHoc: Notification Service</string>
+              <key>com.expensify.expensifylite.adhoc.LiveActivityExtension</key>
+              <string>(OldApp) AdHoc: LiveActivityExtension</string>
             </dict>
           </dict>
           </plist>
@@ -211,9 +217,9 @@ jobs:
         id: prepare-profiles
         run: |
           if [ "${{ inputs.variant }}" == "Release" ]; then
-            echo 'PROFILES=[{"name":"${{ vars.APPLE_STORE_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}"},{"name":"${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}"},{"name":"${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}"}]' >> "$GITHUB_OUTPUT"
+            echo 'PROFILES=[{"name":"${{ vars.APPLE_STORE_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_STORE_PROVISIONING_PROFILE_FILE }}"},{"name":"${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_SHARE_PROVISIONING_PROFILE_FILE }}"},{"name":"${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_NOTIFICATION_PROVISIONING_PROFILE_FILE }}"},{"name":"${{ vars.APPLE_LIVE_ACTIVITY_PROVISIONING_PROFILE_NAME }}","file":"./${{ vars.APPLE_LIVE_ACTIVITY_PROVISIONING_PROFILE_FILE }}"}]' >> "$GITHUB_OUTPUT"
           else
-            echo 'PROFILES=[{"name":"(OldApp) AdHoc","file":"./OldApp_AdHoc.mobileprovision"},{"name":"(OldApp) AdHoc: Share Extension","file":"./OldApp_AdHoc_Share_Extension.mobileprovision"},{"name":"(OldApp) AdHoc: Notification Service","file":"./OldApp_AdHoc_Notification_Service.mobileprovision"}]' >> "$GITHUB_OUTPUT"
+            echo 'PROFILES=[{"name":"(OldApp) AdHoc","file":"./OldApp_AdHoc.mobileprovision"},{"name":"(OldApp) AdHoc: Share Extension","file":"./OldApp_AdHoc_Share_Extension.mobileprovision"},{"name":"(OldApp) AdHoc: Notification Service","file":"./OldApp_AdHoc_Notification_Service.mobileprovision"},{"name":"(OldApp) AdHoc: LiveActivityExtension","file":"./OldApp_AdHoc_LiveActivityExtension.mobileprovision"}]' >> "$GITHUB_OUTPUT"
           fi
 
       - name: Rock Remote Build - iOS

.github/workflows/cla.yml

@@ -8,6 +8,18 @@ on:
     branches: [main]
 
 jobs:
+  validate:
+    if: ${{ github.event_name == 'pull_request_target' }}
+    uses: ./.github/workflows/contributorValidationGate.yml
+    with:
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+      AUTHOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
+
   CLA:
+    needs: [validate]
+    if: |
+      always()
+      && (github.event_name == 'issue_comment' || needs.validate.outputs.IS_AUTHORIZED == 'true')
     uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
     secrets: inherit