Merge branch 'main' into clem-fix-about-text

# Conflicts:
#	src/languages/en.js

.github/actions/bumpVersion/action.yml

@@ -2,7 +2,7 @@ name: 'Bump npm version'
 description: 'Increase the application version (JS and native), based on git tags'
 inputs:
     GITHUB_TOKEN:
-        description: Auth token for Expensify.cash Github
+        description: Auth token for New Expensify Github
         required: true
     SEMVER_LEVEL:
         description: Semantic Versioning Level

.github/actions/bumpVersion/index.js

@@ -97,8 +97,8 @@ const getBuildVersion = __nccwpck_require__(16);
 const BUILD_GRADLE_PATH = process.env.NODE_ENV === 'test'
     ? path.resolve(__dirname, '../../android/app/build.gradle')
     : './android/app/build.gradle';
-const PLIST_PATH = './ios/ExpensifyCash/Info.plist';
-const PLIST_PATH_TEST = './ios/ExpensifyCashTests/Info.plist';
+const PLIST_PATH = './ios/NewExpensify/Info.plist';
+const PLIST_PATH_TEST = './ios/NewExpensifyTests/Info.plist';
 
 exports.BUILD_GRADLE_PATH = BUILD_GRADLE_PATH;
 exports.PLIST_PATH = PLIST_PATH;

.github/actions/checkDeployBlockers/action.yml

@@ -2,7 +2,7 @@ name: 'Check Deploy blockers'
 description: 'Check a recently closed `ProductionDeployCash` issue for unchecked boxes or a missing `:shipit:` comment'
 inputs:
   GITHUB_TOKEN:
-    description: Auth token for Expensify.cash Github; necessary for accessing Octokit.
+    description: Auth token for New Expensify Github; necessary for accessing Octokit.
     required: true
   ISSUE_NUMBER:
     description: The number of the recently closed issue

.github/actions/checkDeployBlockers/index.js

@@ -93,8 +93,8 @@ const {GitHub, getOctokitOptions} = __nccwpck_require__(3030);
 const {throttling} = __nccwpck_require__(9968);
 
 const GITHUB_OWNER = 'Expensify';
-const EXPENSIFY_CASH_REPO = 'Expensify.cash';
-const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/Expensify.cash';
+const EXPENSIFY_CASH_REPO = 'App';
+const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/App';
 
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const PULL_REQUEST_REGEX = new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`);
@@ -307,7 +307,7 @@ class GithubUtils {
 
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/Expensify.cash/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
@@ -381,13 +381,13 @@ class GithubUtils {
     }
 
     /**
-     * Get the most recent workflow run for the given Expensify.cash workflow.
+     * Get the most recent workflow run for the given New Expensify workflow.
      *
      * @param {String} workflow
      * @returns {Promise}
      */
     static getLatestWorkflowRunID(workflow) {
-        console.log(`Fetching Expensify.cash workflow runs for ${workflow}...`);
+        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
         return this.octokit.actions.listWorkflowRuns({
             owner: GITHUB_OWNER,
             repo: EXPENSIFY_CASH_REPO,
@@ -410,7 +410,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the URL of an Expensify.cash pull request given the PR number.
+     * Generate the URL of an New Expensify pull request given the PR number.
      *
      * @param {Number} number
      * @returns {String}
@@ -473,6 +473,23 @@ class GithubUtils {
     static isAutomatedPullRequest(pullRequest) {
         return _.isEqual(lodashGet(pullRequest, 'user.login', ''), 'OSBotify');
     }
+
+    /**
+     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
+     *
+     * @param {Number} issueNumber
+     * @returns {Promise<String>}
+     */
+    static getActorWhoClosedIssue(issueNumber) {
+        return this.octokit.paginate(this.octokit.issues.listEvents, {
+            owner: GITHUB_OWNER,
+            repo: EXPENSIFY_CASH_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        })
+            .then(events => _.filter(events, event => event.event === 'closed'))
+            .then(closedEvents => lodashGet(_.last(closedEvents), 'actor.login', ''));
+    }
 }
 
 module.exports = GithubUtils;

.github/actions/createOrUpdateStagingDeploy/action.yml

@@ -2,7 +2,7 @@ name: 'Create or Update StagingDeployCash'
 description: 'Creates a new StagingDeployCash issue if there is not one open, or updates the existing one.'
 inputs:
     GITHUB_TOKEN:
-        description: Auth token for Expensify.cash Github
+        description: Auth token for New Expensify Github
         required: true
     NPM_VERSION:
         description: The new NPM version of the StagingDeployCash issue.

.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js

@@ -138,7 +138,7 @@ const run = function () {
             if (shouldCreateNewStagingDeployCash) {
                 return GithubUtils.octokit.issues.create({
                     ...defaultPayload,
-                    title: `Deploy Checklist: Expensify.cash ${moment().format('YYYY-MM-DD')}`,
+                    title: `Deploy Checklist: New Expensify ${moment().format('YYYY-MM-DD')}`,
                     labels: [GithubUtils.STAGING_DEPLOY_CASH_LABEL],
                     assignees: [GithubUtils.APPLAUSE_BOT],
                 });

.github/actions/createOrUpdateStagingDeploy/index.js

@@ -148,7 +148,7 @@ const run = function () {
             if (shouldCreateNewStagingDeployCash) {
                 return GithubUtils.octokit.issues.create({
                     ...defaultPayload,
-                    title: `Deploy Checklist: Expensify.cash ${moment().format('YYYY-MM-DD')}`,
+                    title: `Deploy Checklist: New Expensify ${moment().format('YYYY-MM-DD')}`,
                     labels: [GithubUtils.STAGING_DEPLOY_CASH_LABEL],
                     assignees: [GithubUtils.APPLAUSE_BOT],
                 });
@@ -220,8 +220,8 @@ const {GitHub, getOctokitOptions} = __nccwpck_require__(3030);
 const {throttling} = __nccwpck_require__(9968);
 
 const GITHUB_OWNER = 'Expensify';
-const EXPENSIFY_CASH_REPO = 'Expensify.cash';
-const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/Expensify.cash';
+const EXPENSIFY_CASH_REPO = 'App';
+const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/App';
 
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const PULL_REQUEST_REGEX = new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`);
@@ -434,7 +434,7 @@ class GithubUtils {
 
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/Expensify.cash/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
@@ -508,13 +508,13 @@ class GithubUtils {
     }
 
     /**
-     * Get the most recent workflow run for the given Expensify.cash workflow.
+     * Get the most recent workflow run for the given New Expensify workflow.
      *
      * @param {String} workflow
      * @returns {Promise}
      */
     static getLatestWorkflowRunID(workflow) {
-        console.log(`Fetching Expensify.cash workflow runs for ${workflow}...`);
+        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
         return this.octokit.actions.listWorkflowRuns({
             owner: GITHUB_OWNER,
             repo: EXPENSIFY_CASH_REPO,
@@ -537,7 +537,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the URL of an Expensify.cash pull request given the PR number.
+     * Generate the URL of an New Expensify pull request given the PR number.
      *
      * @param {Number} number
      * @returns {String}
@@ -600,6 +600,23 @@ class GithubUtils {
     static isAutomatedPullRequest(pullRequest) {
         return _.isEqual(lodashGet(pullRequest, 'user.login', ''), 'OSBotify');
     }
+
+    /**
+     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
+     *
+     * @param {Number} issueNumber
+     * @returns {Promise<String>}
+     */
+    static getActorWhoClosedIssue(issueNumber) {
+        return this.octokit.paginate(this.octokit.issues.listEvents, {
+            owner: GITHUB_OWNER,
+            repo: EXPENSIFY_CASH_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        })
+            .then(events => _.filter(events, event => event.event === 'closed'))
+            .then(closedEvents => lodashGet(_.last(closedEvents), 'actor.login', ''));
+    }
 }
 
 module.exports = GithubUtils;

.github/actions/getMergeCommitForPullRequest/action.yml

@@ -2,7 +2,7 @@ name: 'Get merge commit for a pull request'
 description: 'Get the merge_commit_sha for a pull request'
 inputs:
   GITHUB_TOKEN:
-    description: Auth token for Expensify.cash Github
+    description: Auth token for New Expensify Github
     required: true
   PULL_REQUEST_NUMBER:
     description: The number of the pull request

.github/actions/getMergeCommitForPullRequest/index.js

@@ -121,8 +121,8 @@ const {GitHub, getOctokitOptions} = __nccwpck_require__(3030);
 const {throttling} = __nccwpck_require__(9968);
 
 const GITHUB_OWNER = 'Expensify';
-const EXPENSIFY_CASH_REPO = 'Expensify.cash';
-const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/Expensify.cash';
+const EXPENSIFY_CASH_REPO = 'App';
+const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/App';
 
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const PULL_REQUEST_REGEX = new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`);
@@ -335,7 +335,7 @@ class GithubUtils {
 
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/Expensify.cash/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
@@ -409,13 +409,13 @@ class GithubUtils {
     }
 
     /**
-     * Get the most recent workflow run for the given Expensify.cash workflow.
+     * Get the most recent workflow run for the given New Expensify workflow.
      *
      * @param {String} workflow
      * @returns {Promise}
      */
     static getLatestWorkflowRunID(workflow) {
-        console.log(`Fetching Expensify.cash workflow runs for ${workflow}...`);
+        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
         return this.octokit.actions.listWorkflowRuns({
             owner: GITHUB_OWNER,
             repo: EXPENSIFY_CASH_REPO,
@@ -438,7 +438,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the URL of an Expensify.cash pull request given the PR number.
+     * Generate the URL of an New Expensify pull request given the PR number.
      *
      * @param {Number} number
      * @returns {String}
@@ -501,6 +501,23 @@ class GithubUtils {
     static isAutomatedPullRequest(pullRequest) {
         return _.isEqual(lodashGet(pullRequest, 'user.login', ''), 'OSBotify');
     }
+
+    /**
+     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
+     *
+     * @param {Number} issueNumber
+     * @returns {Promise<String>}
+     */
+    static getActorWhoClosedIssue(issueNumber) {
+        return this.octokit.paginate(this.octokit.issues.listEvents, {
+            owner: GITHUB_OWNER,
+            repo: EXPENSIFY_CASH_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        })
+            .then(events => _.filter(events, event => event.event === 'closed'))
+            .then(closedEvents => lodashGet(_.last(closedEvents), 'actor.login', ''));
+    }
 }
 
 module.exports = GithubUtils;

.github/actions/getReleaseBody/index.js

@@ -64,8 +64,8 @@ const {GitHub, getOctokitOptions} = __nccwpck_require__(3030);
 const {throttling} = __nccwpck_require__(9968);
 
 const GITHUB_OWNER = 'Expensify';
-const EXPENSIFY_CASH_REPO = 'Expensify.cash';
-const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/Expensify.cash';
+const EXPENSIFY_CASH_REPO = 'App';
+const EXPENSIFY_CASH_URL = 'https://github.com/Expensify/App';
 
 const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
 const PULL_REQUEST_REGEX = new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`);
@@ -278,7 +278,7 @@ class GithubUtils {
 
                 // Tag version and comparison URL
                 // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/Expensify.cash/compare/production...staging\r\n`;
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
@@ -352,13 +352,13 @@ class GithubUtils {
     }
 
     /**
-     * Get the most recent workflow run for the given Expensify.cash workflow.
+     * Get the most recent workflow run for the given New Expensify workflow.
      *
      * @param {String} workflow
      * @returns {Promise}
      */
     static getLatestWorkflowRunID(workflow) {
-        console.log(`Fetching Expensify.cash workflow runs for ${workflow}...`);
+        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
         return this.octokit.actions.listWorkflowRuns({
             owner: GITHUB_OWNER,
             repo: EXPENSIFY_CASH_REPO,
@@ -381,7 +381,7 @@ class GithubUtils {
     }
 
     /**
-     * Generate the URL of an Expensify.cash pull request given the PR number.
+     * Generate the URL of an New Expensify pull request given the PR number.
      *
      * @param {Number} number
      * @returns {String}
@@ -444,6 +444,23 @@ class GithubUtils {
     static isAutomatedPullRequest(pullRequest) {
         return _.isEqual(lodashGet(pullRequest, 'user.login', ''), 'OSBotify');
     }
+
+    /**
+     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
+     *
+     * @param {Number} issueNumber
+     * @returns {Promise<String>}
+     */
+    static getActorWhoClosedIssue(issueNumber) {
+        return this.octokit.paginate(this.octokit.issues.listEvents, {
+            owner: GITHUB_OWNER,
+            repo: EXPENSIFY_CASH_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        })
+            .then(events => _.filter(events, event => event.event === 'closed'))
+            .then(closedEvents => lodashGet(_.last(closedEvents), 'actor.login', ''));
+    }
 }
 
 module.exports = GithubUtils;