Merge pull request #1 from PrashantMangukiya/main

Merged main with prashant-5102
Expensify · Oct 20, 2021 · 93ab606 · 93ab606
2 parents 0c29d63 + 1ff4397
commit 93ab606
Show file tree

Hide file tree

Showing 290 changed files with 11,424 additions and 8,970 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Accessibility.md b/.github/ISSUE_TEMPLATE/Accessibility.md
@@ -0,0 +1,51 @@
+---
+name: Accessibility issue template
+about: A template to follow when creating a new issue for accessibility failures
+---
+
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
+___
+
+## Action Performed:
+Break down in numbered steps
+
+## Expected Result:
+Describe what you think should've happened
+
+## Actual Result:
+Describe what actually happened
+
+## Workaround:
+Can the user still use Expensify without this being fixed? Have you informed them of the workaround?
+
+## Area issue was found in:
+Where did we find this issue?
+
+## Failed WCAG checkpoints
+What WCAG checkpoints were failed?
+
+## User impact:
+How does this affect the user?
+
+## Suggested resolution:
+What can we do to fix the issue?
+
+## Platform:
+<!--- 
+Remove any platforms that aren't affected by this issue
+--->
+Where is this issue occurring?
+
+- Web
+- iOS
+- Android
+- Desktop App
+- Mobile Web
+
+**Version Number:**
+**Reproducible in staging?:**
+**Reproducible in production?:**
+**Notes/Photos/Videos:** Any additional supporting documentation
+**Issue reported by:**
+
+[View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)
diff --git a/.github/ISSUE_TEMPLATE/Standard.md b/.github/ISSUE_TEMPLATE/Standard.md
@@ -32,6 +32,8 @@ Where is this issue occurring?
 - Mobile Web
 
 **Version Number:**
+**Reproducible in staging?:**
+**Reproducible in production?:**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
 **Notes/Photos/Videos:** Any additional supporting documentation
 **Expensify/Expensify Issue URL:**

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,9 +11,9 @@ It MUST be an entire link to the issue; otherwise, the linking will not work as
 
 Make sure this section looks similar to this (you can link multiple issues using the same formatting, just add a new line):
 
-$ https://github.com/Expensify/App/issues/4723
+$ https://github.com/Expensify/App/issues/<number-of-the-issue>
 
-Do NOT only link the issue number like this: $ #1234
+Do NOT only link the issue number like this: $ #<number-of-the-issue>
 --->
 $ GH_LINK
 

diff --git a/.github/actions/checkDeployBlockers/index.js b/.github/actions/checkDeployBlockers/index.js
@@ -206,23 +206,23 @@ class GithubUtils {
      * @returns {Array<Object>} - [{url: String, number: Number, isVerified: Boolean}]
      */
     static getStagingDeployCashPRList(issue) {
-        let PRListSection = issue.body.match(/pull requests:\*\*\r?\n((?:.*\r?\n)+)\r?\n/) || [];
+        let PRListSection = issue.body.match(/pull requests:\*\*(?:\r?\n)*((?:.*\r?\n(?:\s+-\s.*\r?\n)+\r?\n)+)/) || [];
         if (PRListSection.length !== 2) {
             // No PRs, return an empty array
             console.log('Hmmm...The open StagingDeployCash does not list any pull requests, continuing...');
             return [];
         }
         PRListSection = PRListSection[1];
         const unverifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[ ] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
                 isVerified: false,
             }),
         );
         const verifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[x] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
@@ -250,15 +250,15 @@ class GithubUtils {
         }
         deployBlockerSection = deployBlockerSection[1];
         const unresolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[ ] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
                 isResolved: false,
             }),
         );
         const resolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[x] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
@@ -277,6 +277,7 @@ class GithubUtils {
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
      * @param {Array} [verifiedPRList] - The list of PR URLs which have passed QA.
+     * @param {Array} [accessablePRList] - The list of PR URLs which have passed the accessability check.
      * @param {Array} [deployBlockers] - The list of DeployBlocker URLs.
      * @param {Array} [resolvedDeployBlockers] - The list of DeployBlockers URLs which have been resolved.
      * @returns {Promise}
@@ -285,6 +286,7 @@ class GithubUtils {
         tag,
         PRList,
         verifiedPRList = [],
+        accessablePRList = [],
         deployBlockers = [],
         resolvedDeployBlockers = [],
     ) {
@@ -311,23 +313,24 @@ class GithubUtils {
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                    issueBody += '\r\n**This release contains changes from the following pull requests:**';
                     _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedPRList, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(verifiedPRList, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
+                        issueBody += _.contains(accessablePRList, URL) ? '\r\n  - [x] Accessibility' : '\r\n  - [ ] Accessibility';
                     });
                 }
 
                 // Deploy blockers
                 if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '\r\n**Deploy Blockers:**\r\n';
+                    issueBody += '\r\n\r\n\r\n**Deploy Blockers:**';
                     _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
                     });
                 }
 
-                issueBody += '\r\ncc @Expensify/applauseleads\r\n';
+                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
                 return issueBody;
             })
             .catch(err => console.warn(

diff --git a/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js b/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
@@ -101,8 +101,9 @@ const run = function () {
                         // Since this is the second argument to _.union,
                         // it will appear later in the array than any duplicate.
                         // Since it is later in the array, it will be truncated by _.unique,
-                        // and the original value of isVerified will be preserved.
+                        // and the original value of isVerified and isAccessible will be preserved.
                         isVerified: false,
+                        isAccessible: false,
                     }))),
                     false,
                     item => item.number,
@@ -124,6 +125,7 @@ const run = function () {
                 tag,
                 _.pluck(PRList, 'url'),
                 _.pluck(_.where(PRList, {isVerified: true}), 'url'),
+                _.pluck(_.where(PRList, {isAccessible: true}), 'url'),
                 _.pluck(deployBlockers, 'url'),
                 _.pluck(_.where(deployBlockers, {isResolved: true}), 'url'),
             );

diff --git a/.github/actions/createOrUpdateStagingDeploy/index.js b/.github/actions/createOrUpdateStagingDeploy/index.js
@@ -111,8 +111,9 @@ const run = function () {
                         // Since this is the second argument to _.union,
                         // it will appear later in the array than any duplicate.
                         // Since it is later in the array, it will be truncated by _.unique,
-                        // and the original value of isVerified will be preserved.
+                        // and the original value of isVerified and isAccessible will be preserved.
                         isVerified: false,
+                        isAccessible: false,
                     }))),
                     false,
                     item => item.number,
@@ -134,6 +135,7 @@ const run = function () {
                 tag,
                 _.pluck(PRList, 'url'),
                 _.pluck(_.where(PRList, {isVerified: true}), 'url'),
+                _.pluck(_.where(PRList, {isAccessible: true}), 'url'),
                 _.pluck(deployBlockers, 'url'),
                 _.pluck(_.where(deployBlockers, {isResolved: true}), 'url'),
             );
@@ -333,23 +335,23 @@ class GithubUtils {
      * @returns {Array<Object>} - [{url: String, number: Number, isVerified: Boolean}]
      */
     static getStagingDeployCashPRList(issue) {
-        let PRListSection = issue.body.match(/pull requests:\*\*\r?\n((?:.*\r?\n)+)\r?\n/) || [];
+        let PRListSection = issue.body.match(/pull requests:\*\*(?:\r?\n)*((?:.*\r?\n(?:\s+-\s.*\r?\n)+\r?\n)+)/) || [];
         if (PRListSection.length !== 2) {
             // No PRs, return an empty array
             console.log('Hmmm...The open StagingDeployCash does not list any pull requests, continuing...');
             return [];
         }
         PRListSection = PRListSection[1];
         const unverifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[ ] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
                 isVerified: false,
             }),
         );
         const verifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[x] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
@@ -377,15 +379,15 @@ class GithubUtils {
         }
         deployBlockerSection = deployBlockerSection[1];
         const unresolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[ ] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
                 isResolved: false,
             }),
         );
         const resolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[x] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
@@ -404,6 +406,7 @@ class GithubUtils {
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
      * @param {Array} [verifiedPRList] - The list of PR URLs which have passed QA.
+     * @param {Array} [accessablePRList] - The list of PR URLs which have passed the accessability check.
      * @param {Array} [deployBlockers] - The list of DeployBlocker URLs.
      * @param {Array} [resolvedDeployBlockers] - The list of DeployBlockers URLs which have been resolved.
      * @returns {Promise}
@@ -412,6 +415,7 @@ class GithubUtils {
         tag,
         PRList,
         verifiedPRList = [],
+        accessablePRList = [],
         deployBlockers = [],
         resolvedDeployBlockers = [],
     ) {
@@ -438,23 +442,24 @@ class GithubUtils {
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                    issueBody += '\r\n**This release contains changes from the following pull requests:**';
                     _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedPRList, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(verifiedPRList, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
+                        issueBody += _.contains(accessablePRList, URL) ? '\r\n  - [x] Accessibility' : '\r\n  - [ ] Accessibility';
                     });
                 }
 
                 // Deploy blockers
                 if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '\r\n**Deploy Blockers:**\r\n';
+                    issueBody += '\r\n\r\n\r\n**Deploy Blockers:**';
                     _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
                     });
                 }
 
-                issueBody += '\r\ncc @Expensify/applauseleads\r\n';
+                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
                 return issueBody;
             })
             .catch(err => console.warn(

diff --git a/.github/actions/getPullRequestDetails/index.js b/.github/actions/getPullRequestDetails/index.js
@@ -259,23 +259,23 @@ class GithubUtils {
      * @returns {Array<Object>} - [{url: String, number: Number, isVerified: Boolean}]
      */
     static getStagingDeployCashPRList(issue) {
-        let PRListSection = issue.body.match(/pull requests:\*\*\r?\n((?:.*\r?\n)+)\r?\n/) || [];
+        let PRListSection = issue.body.match(/pull requests:\*\*(?:\r?\n)*((?:.*\r?\n(?:\s+-\s.*\r?\n)+\r?\n)+)/) || [];
         if (PRListSection.length !== 2) {
             // No PRs, return an empty array
             console.log('Hmmm...The open StagingDeployCash does not list any pull requests, continuing...');
             return [];
         }
         PRListSection = PRListSection[1];
         const unverifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[ ] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
                 isVerified: false,
             }),
         );
         const verifiedPRs = _.map(
-            [...PRListSection.matchAll(new RegExp(`- \\[x] (${PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...PRListSection.matchAll(new RegExp(`- (${PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getPullRequestNumberFromURL(match[1]),
@@ -303,15 +303,15 @@ class GithubUtils {
         }
         deployBlockerSection = deployBlockerSection[1];
         const unresolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[ ] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[ \\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
                 isResolved: false,
             }),
         );
         const resolvedDeployBlockers = _.map(
-            [...deployBlockerSection.matchAll(new RegExp(`- \\[x] (${ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))],
+            [...deployBlockerSection.matchAll(new RegExp(`- (${ISSUE_OR_PULL_REQUEST_REGEX.source})\\s+- \\[x\\] QA`, 'g'))],
             match => ({
                 url: match[1],
                 number: GithubUtils.getIssueOrPullRequestNumberFromURL(match[1]),
@@ -330,6 +330,7 @@ class GithubUtils {
      * @param {String} tag
      * @param {Array} PRList - The list of PR URLs which are included in this StagingDeployCash
      * @param {Array} [verifiedPRList] - The list of PR URLs which have passed QA.
+     * @param {Array} [accessablePRList] - The list of PR URLs which have passed the accessability check.
      * @param {Array} [deployBlockers] - The list of DeployBlocker URLs.
      * @param {Array} [resolvedDeployBlockers] - The list of DeployBlockers URLs which have been resolved.
      * @returns {Promise}
@@ -338,6 +339,7 @@ class GithubUtils {
         tag,
         PRList,
         verifiedPRList = [],
+        accessablePRList = [],
         deployBlockers = [],
         resolvedDeployBlockers = [],
     ) {
@@ -364,23 +366,24 @@ class GithubUtils {
 
                 // PR list
                 if (!_.isEmpty(sortedPRList)) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                    issueBody += '\r\n**This release contains changes from the following pull requests:**';
                     _.each(sortedPRList, (URL) => {
-                        issueBody += _.contains(verifiedPRList, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(verifiedPRList, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
+                        issueBody += _.contains(accessablePRList, URL) ? '\r\n  - [x] Accessibility' : '\r\n  - [ ] Accessibility';
                     });
                 }
 
                 // Deploy blockers
                 if (!_.isEmpty(deployBlockers)) {
-                    issueBody += '\r\n**Deploy Blockers:**\r\n';
+                    issueBody += '\r\n\r\n\r\n**Deploy Blockers:**';
                     _.each(sortedDeployBlockers, (URL) => {
-                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
+                        issueBody += `\r\n\r\n- ${URL}`;
+                        issueBody += _.contains(resolvedDeployBlockers, URL) ? '\r\n  - [x] QA' : '\r\n  - [ ] QA';
                     });
                 }
 
-                issueBody += '\r\ncc @Expensify/applauseleads\r\n';
+                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
                 return issueBody;
             })
             .catch(err => console.warn(