Merge remote-tracking branch 'upstream/main' into JKobrynski/fix/56507-inconsistent-workspace-subtitle

Author: JKobrynski

.eslintrc.js

@@ -150,8 +150,14 @@ module.exports = {
             {
                 selector: ['variable', 'property'],
                 format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
+                // This filter excludes variables and properties that start with "private_" to make them valid.
+                //
+                // Examples:
+                // - "private_a" → valid
+                // - "private_test" → valid
+                // - "private_" → not valid
                 filter: {
-                    regex: '^private_[a-z][a-zA-Z0-9]+$',
+                    regex: '^private_[a-z][a-zA-Z0-9]*$',
                     match: false,
                 },
             },

.github/ISSUE_TEMPLATE/ExpertContributorChangeRequest.md

@@ -0,0 +1,32 @@
+---
+name: Add or remove expert contributor from the team
+about: In order to get access to the HybridApp setup, expert contributors need to be added to our Github Organization. They also need to be added to the necessary rooms in Slack
+title: "Expert Contributor Change Request - <insert-name>"
+labels: Daily, Task, ring0
+---
+
+### Expert Contributor Details
+
+- Name: 
+- Github handle (or Github profile link):
+- Email:
+- Slack post in your team channel with this request for visibility: 
+- Team (check your team):
+    - [ ] Callstack
+    - [ ] Margelo
+    - [ ] Software Mansion
+
+Do you want to remove this developer from the team? YES/NO
+
+### Tasks for ring0 assignee
+
+- [ ] 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)
+- [ ] Add to Slack channels using Slack Connect: 
+    - [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
+    - [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
+    - [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
+    - [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
+    - [ ] [#expense](https://expensify.enterprise.slack.com/archives/C06ML6X0W9L)
+    - [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
+    - [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)
+    - [ ] [#expert-contributors](https://expensify.enterprise.slack.com/archives/C08CZDJFJ77)

.github/actionlint.yaml

@@ -4,5 +4,13 @@ self-hosted-runner:
     - ubuntu-latest-xl
     - macos-15-large
     - macos-15-xlarge
-    - ubuntu-latest-reassure-tests
     - macos-12
+    - ubuntu-20.04-v4
+
+paths:
+  '**/*':
+    ignore:
+      # This is meant to be a temporary workaround for a bug in actionslint. Upstream:
+      #    - issue: https://github.com/rhysd/actionlint/issues/511
+      #    - PR: https://github.com/rhysd/actionlint/pull/513
+      - '"env" is not allowed in "runs" section because .* is a Composite action.*'

.github/actions/composite/setupGitForOSBotify/action.yml

@@ -6,6 +6,10 @@ inputs:
     description: "Indicates if node is set up for hybrid app"
     required: false
     default: 'false'
+  IS_DESKTOP_BUILD:
+    description: "Indicates if node is set up for desktop app"
+    required: false
+    default: 'false'
 
 outputs:
   cache-hit:
@@ -41,6 +45,7 @@ runs:
         key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
 
     - id: cache-desktop-node-modules
+      if: inputs.IS_DESKTOP_BUILD == 'true'
       uses: actions/cache@v4
       with:
         path: desktop/node_modules
@@ -60,7 +65,7 @@ runs:
         command: npm ci
 
     - name: Install node packages for desktop submodule
-      if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
+      if: inputs.IS_DESKTOP_BUILD == 'true' && steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
       uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
       with:
         timeout_minutes: 30

.github/actions/composite/setupGitForOSBotifyApp/action.yml

@@ -0,0 +1,45 @@
+name: Validate actor
+description: Validate the the current actor has the permissions they need. By default, it validates that the user has write permissions.
+
+inputs:
+  # If `REQUIRE_APP_DEPLOYER` is true, we check that they're an app deployer. If not, we just check that they have write access.
+  REQUIRE_APP_DEPLOYER:
+    description: Should this action require the actor to be an app deployer?
+    required: false
+    default: 'true'
+  OS_BOTIFY_TOKEN:
+    description: OSBotify token. Needed to access certain API endpoints the regular github.token can't
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Get user permissions
+      if: ${{ !fromJSON(inputs.REQUIRE_APP_DEPLOYER) }}
+      id: getUserPermissions
+      shell: bash
+      run: |
+        PERMISSION=$(gh api /repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission | jq -r '.permission')
+        if [[ "$PERMISSION" == 'write' || "$PERMISSION" == 'admin' ]]; then
+          echo "::notice::✅ Actor ${{ github.actor }} has write permission"
+        else
+          echo "::error::❌ Actor ${{ github.actor }} does not have write permission"
+          exit 1
+        fi
+      env:
+        GITHUB_TOKEN: ${{ inputs.OS_BOTIFY_TOKEN }}
+
+    - name: Check if user is deployer
+      id: isUserDeployer
+      if: fromJSON(inputs.REQUIRE_APP_DEPLOYER)
+      shell: bash
+      run: |
+        if [[ "${{ github.actor }}" == "OSBotify" || "${{ github.actor }}" == "os-botify[bot]" ]] || \
+            gh api /orgs/Expensify/teams/mobile-deployers/memberships/${{ github.actor }} --silent; then
+          echo "::notice::✅ Actor ${{ github.actor }} is an app deployer"
+        else
+          echo "::error::❌ Actor ${{ github.actor }} is not an app deployer"
+          exit 1
+        fi
+      env:
+        GITHUB_TOKEN: ${{ inputs.OS_BOTIFY_TOKEN }}

.github/actions/composite/setupNode/action.yml

@@ -17242,8 +17242,8 @@ exports["default"] = newComponentCategory;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const GIT_CONST = {
-    GITHUB_OWNER: 'Expensify',
-    APP_REPO: 'App',
+    GITHUB_OWNER: process.env.GITHUB_REPOSITORY_OWNER,
+    APP_REPO: process.env.GITHUB_REPOSITORY.split('/').at(1) ?? '',
 };
 const CONST = {
     ...GIT_CONST,
@@ -17532,7 +17532,7 @@ class GithubUtils {
                 const sortedDeployBlockers = [...new Set(deployBlockers)].sort((a, b) => GithubUtils.getIssueOrPullRequestNumberFromURL(a) - GithubUtils.getIssueOrPullRequestNumberFromURL(b));
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/${process.env.GITHUB_REPOSITORY}/compare/production...staging\r\n`;
                 // PR list
                 if (sortedPRList.length > 0) {
                     issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
@@ -17570,9 +17570,9 @@ class GithubUtils {
                 // eslint-disable-next-line max-len
                 issueBody += `\r\n- [${isTimingDashboardChecked ? 'x' : ' '}] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
                 // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-mobile-app/crashlytics/app/ios:com.expensify.expensifylite/issues?state=open&time=last-seven-days&types=crash&tag=all&sort=eventCount) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
                 // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) for **the previous release version** and verified that the release did not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-mobile-app/crashlytics/app/android:org.me.mobiexpensifyg/issues?state=open&time=last-seven-days&types=crash&tag=all&sort=eventCount) for **the previous release version** and verified that the release did not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
                 // eslint-disable-next-line max-len
                 issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
                 issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';

.github/actions/composite/validateActor/action.yml

@@ -12246,8 +12246,8 @@ exports.getStringInput = getStringInput;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const GIT_CONST = {
-    GITHUB_OWNER: 'Expensify',
-    APP_REPO: 'App',
+    GITHUB_OWNER: process.env.GITHUB_REPOSITORY_OWNER,
+    APP_REPO: process.env.GITHUB_REPOSITORY.split('/').at(1) ?? '',
 };
 const CONST = {
     ...GIT_CONST,
@@ -12536,7 +12536,7 @@ class GithubUtils {
                 const sortedDeployBlockers = [...new Set(deployBlockers)].sort((a, b) => GithubUtils.getIssueOrPullRequestNumberFromURL(a) - GithubUtils.getIssueOrPullRequestNumberFromURL(b));
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/${process.env.GITHUB_REPOSITORY}/compare/production...staging\r\n`;
                 // PR list
                 if (sortedPRList.length > 0) {
                     issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
@@ -12574,9 +12574,9 @@ class GithubUtils {
                 // eslint-disable-next-line max-len
                 issueBody += `\r\n- [${isTimingDashboardChecked ? 'x' : ' '}] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
                 // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-mobile-app/crashlytics/app/ios:com.expensify.expensifylite/issues?state=open&time=last-seven-days&types=crash&tag=all&sort=eventCount) for **this release version** and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
                 // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) for **the previous release version** and verified that the release did not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-mobile-app/crashlytics/app/android:org.me.mobiexpensifyg/issues?state=open&time=last-seven-days&types=crash&tag=all&sort=eventCount) for **the previous release version** and verified that the release did not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
                 // eslint-disable-next-line max-len
                 issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
                 issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';