Merge branch 'main' into arrow-feature-signed

.github/PULL_REQUEST_TEMPLATE.md

@@ -68,7 +68,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
     - [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
     - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
-
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I ran the tests on **all platforms** & verified they passed on:
     - [ ] iOS / native
@@ -109,81 +108,45 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
 - [ ] I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.
 
+### Screenshots/Videos
 <details>
-<summary><h4>PR Reviewer Checklist</h4>
-
-The reviewer will copy/paste it into a new comment and complete it after the author checklist is completed
-</summary>
-
-- [ ] I have verified the author checklist is complete (all boxes are checked off).
-- [ ] I verified the correct issue is linked in the `### Fixed Issues` section above
-- [ ] I verified testing steps are clear and they cover the changes made in this PR
-    - [ ] I verified the steps for local testing are in the `Tests` section
-    - [ ] I verified the steps for expected offline behavior are in the `Offline steps` section
-    - [ ] I verified the steps for Staging and/or Production testing are in the `QA steps` section
-    - [ ] I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
-    - [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
-    - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
-- [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
-- [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
-- [ ] I verified tests pass on **all platforms** & I tested again on:
-    - [ ] iOS / native
-    - [ ] Android / native
-    - [ ] iOS / Safari
-    - [ ] Android / Chrome
-    - [ ] MacOS / Chrome
-    - [ ] MacOS / Desktop
-- [ ] If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
-- [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
-    - [ ] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. `toggleReport` and not `onIconClick`).
-    - [ ] I verified that comments were added to code that is not self explanatory
-    - [ ] I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
-    - [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files
-    - [ ] I verified any copy / text that was added to the app is correct English and approved by marketing by adding the `Waiting for Copy` label for a copy review on the original GH to get the correct copy.
-    - [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
-    - [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs)) were followed
-- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
-- [ ] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/contributingGuides/PR_REVIEW_GUIDELINES.md)
-- [ ] I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` have been tested & I retested again)
-- [ ] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
-- [ ] I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
-- [ ] I verified that if a function's arguments changed that all usages have also been updated correctly
-- [ ] If a new component is created I verified that:
-    - [ ] A similar component doesn't exist in the codebase
-    - [ ] All props are defined accurately and each prop has a `/** comment above it */`
-    - [ ] The file is named correctly
-    - [ ] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
-    - [ ] The only data being stored in the state is data necessary for rendering and nothing else
-    - [ ] For Class Components, any internal methods passed to components event handlers are bound to `this` properly so there are no scoping issues (i.e. for `onClick={this.submit}` the method `this.submit` should be bound to `this` in the constructor)
-    - [ ] Any internal methods bound to `this` are necessary to be bound (i.e. avoid `this.submit = this.submit.bind(this);` if `this.submit` is never passed to a component event handler like `onClick`)
-    - [ ] All JSX used for rendering exists in the render method
-    - [ ] The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
-- [ ] If a new CSS style is added I verified that:
-    - [ ] A similar style doesn't already exist
-    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
-- [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
-- [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
-- [ ] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
+<summary>Web</summary>
+
+<!-- add screenshots or videos here -->
 
 </details>
 
-### Screenshots
-<!-- Add screenshots for all platforms tested. Pull requests won't be merged unless the screenshots show the app was tested on all platforms.-->
+<details>
+<summary>Mobile Web - Chrome</summary>
 
-#### Web
-<!-- Insert screenshots of your changes on the web platform-->
+<!-- add screenshots or videos here -->
 
-#### Mobile Web - Chrome
-<!-- Insert screenshots of your changes on the web platform (from chrome mobile browser)-->
+</details>
 
-#### Mobile Web - Safari
-<!-- Insert screenshots of your changes on the web platform (from safari mobile browser)-->
+<details>
+<summary>Mobile Web - Safari</summary>
 
-#### Desktop
-<!-- Insert screenshots of your changes on the desktop platform-->
+<!-- add screenshots or videos here -->
 
-#### iOS
-<!-- Insert screenshots of your changes on the iOS platform-->
+</details>
 
-#### Android
-<!-- Insert screenshots of your changes on the Android platform-->
+<details>
+<summary>Desktop</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>iOS</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Android</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>

.github/actions/composite/announceFailedWorkflowInSlack/action.yml

@@ -9,7 +9,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: 8398a7/action-slack@v3
+    - uses: 8398a7/action-slack@2780b654eb23ee546e54052f0d2b0ed66ea30eaa
       name: Job failed Slack notification
       with:
         status: custom
@@ -20,7 +20,7 @@ runs:
             attachments: [{
               color: "#DB4545",
               pretext: `<!subteam^S4TJJ3PSL>`,
-              text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`,
+              text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW_RUN} workflow 💥`,
             }]
           }
       env:

.github/actions/composite/configureAwsCredentials/action.yml

@@ -0,0 +1,21 @@
+name: 'Configure AWS Credentials'
+description: 'Configures AWS credentials for the workflow'
+
+inputs:
+  AWS_ACCESS_KEY_ID:
+    description: 'Access Key to AWS'
+    required: true
+  AWS_SECRET_ACCESS_KEY:
+    description: 'Secret Access Key to AWS'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Configure AWS Credentials
+      # Version: 1.5.5
+      uses: aws-actions/configure-aws-credentials@e97d7fbc8e0e5af69631c13daa0f4b5a8d88165b
+      with:
+        aws-access-key-id: ${{ inputs.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1

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

@@ -4,10 +4,6 @@ description: Set up Node
 runs:
   using: composite
   steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-      with:
-        fetch-depth: 0
-
     - uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516
       with:
         node-version-file: '.nvmrc'

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

@@ -14,7 +14,7 @@ const https = __nccwpck_require__(7211);
 const GitHubUtils = __nccwpck_require__(7999);
 
 const pathToReviewerChecklist = 'https://raw.githubusercontent.com/Expensify/App/main/contributingGuides/REVIEWER_CHECKLIST.md';
-const reviewerChecklistStartsWith = '## Reviewer Checklist';
+const reviewerChecklistContains = '# Reviewer Checklist';
 const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
 const combinedComments = [];
 
@@ -66,7 +66,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;
@@ -75,7 +75,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
                 console.log(`Comment ${i} starts with: ${comment.slice(0, 20)}...`);
 
                 // Found the reviewer checklist, so count how many completed checklist items there are
-                if (comment.startsWith(reviewerChecklistStartsWith)) {
+                if (comment.indexOf(reviewerChecklistContains) !== -1) {
                     console.log('Found the reviewer checklist!');
                     foundReviewerChecklist = true;
                     numberOfFinishedChecklistItems = (comment.match(/- \[x\]/gi) || []).length;

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

@@ -4,7 +4,7 @@ const https = require('https');
 const GitHubUtils = require('../../../libs/GithubUtils');
 
 const pathToReviewerChecklist = 'https://raw.githubusercontent.com/Expensify/App/main/contributingGuides/REVIEWER_CHECKLIST.md';
-const reviewerChecklistStartsWith = '## Reviewer Checklist';
+const reviewerChecklistContains = '# Reviewer Checklist';
 const issue = github.context.payload.issue ? github.context.payload.issue.number : github.context.payload.pull_request.number;
 const combinedComments = [];
 
@@ -56,7 +56,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;
@@ -65,7 +65,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
                 console.log(`Comment ${i} starts with: ${comment.slice(0, 20)}...`);
 
                 // Found the reviewer checklist, so count how many completed checklist items there are
-                if (comment.startsWith(reviewerChecklistStartsWith)) {
+                if (comment.indexOf(reviewerChecklistContains) !== -1) {
                     console.log('Found the reviewer checklist!');
                     foundReviewerChecklist = true;
                     numberOfFinishedChecklistItems = (comment.match(/- \[x\]/gi) || []).length;

.github/workflows/README.md

@@ -3,6 +3,8 @@
 ## Important tip for creating GitHub Workflows
 All inputs and outputs to GitHub Actions and any data passed between jobs or workflows is JSON-encoded (AKA, strings). Keep this in mind whenever writing GitHub workflows – you may need to JSON-decode variables to access them accurately. Here's an example of a common way to misuse GitHub Actions data:
 
+
+
 ```yaml
 name: CI
 on: pull_request

.github/workflows/createNewVersion.yml

@@ -55,8 +55,7 @@ jobs:
         with:
           GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
-      # TODO: Point back at upstream when https://github.com/softprops/turnstyle/pull/46 is merged
-      - uses: roryabraham/turnstyle@d50d3ffc3f2c8d280dec4cd802c1c735fcda77c8
+      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:

.github/workflows/e2ePerformanceRegressionTests.yml

@@ -7,10 +7,15 @@ on:
 jobs:
   e2e-tests:
     if: ${{ github.event.label.name == 'e2e' }}
-    name: "Run e2e performance regression tests"
+    name: Run e2e performance regression tests
     # Although the tests will run on an android emulator, using macOS as its more performant
     runs-on: macos-12
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -43,7 +48,7 @@ jobs:
           disable-animations: false
           script: echo "Generated AVD snapshot for caching."
 
-#     Note: if the android build fails the logs can be incomplete. It can help to run the build once manually to get a full log
+      # Note: if the android build fails the logs can be incomplete. It can help to run the build once manually to get a full log
       - name: Preheat build system
         env:
           JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
@@ -76,4 +81,3 @@ jobs:
           name: test-failure-logs
           path: e2e/.results
           retention-days: 5
-

.github/workflows/lint.yml

@@ -11,6 +11,11 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - run: npm run lint

.github/workflows/platformDeploy.yml

@@ -31,6 +31,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -100,6 +105,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
@@ -135,6 +145,11 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: macos-12
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -219,18 +234,21 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     runs-on: ubuntu-latest
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Setup Cloudflare CLI
         run: pip3 install cloudflare
 
       - name: Configure AWS Credentials
-        # Version: 1.5.5
-        uses: aws-actions/configure-aws-credentials@e97d7fbc8e0e5af69631c13daa0f4b5a8d88165b
+        uses: Expensify/App/.github/actions/composite/configureAwsCredentials@main
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build web for production
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -340,6 +358,11 @@ jobs:
     if: ${{ always() }}
     needs: [android, desktop, iOS, web]
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Set version

.github/workflows/preDeploy.yml

@@ -82,8 +82,7 @@ jobs:
     needs: [chooseDeployActions, createNewVersion]
     runs-on: ubuntu-latest
     steps:
-      # TODO: Point back at upstream when https://github.com/softprops/turnstyle/pull/46 is merged
-      - uses: roryabraham/turnstyle@d50d3ffc3f2c8d280dec4cd802c1c735fcda77c8
+      - uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
         with:
           poll-interval-seconds: 10
         env:

.github/workflows/test.yml

@@ -39,6 +39,11 @@ jobs:
         chunk: ${{fromJson(needs.config.outputs.MATRIX)}}
 
     steps:
+      # This action checks-out the repository, so the workflow can access it.
+      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        with:
+          fetch-depth: 0
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       # If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified