Merge branch 'Expensify:main' into arrow-feature-signed

Expensify · Nov 3, 2022 · a7200ba · a7200ba
2 parents 05e8623 + 63ccac8
commit a7200ba
Show file tree

Hide file tree

Showing 146 changed files with 15,212 additions and 9,424 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Standard.md b/.github/ISSUE_TEMPLATE/Standard.md
@@ -1,7 +1,7 @@
 ---
 name: Standard issue template
 about: A standard template to follow when creating a new issue in this repository
-labels: AutoAssignerTriage, Daily
+labels: Bug, Daily
 ---
 
 If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/contributingGuides/CONTRIBUTING.md) for onboarding and email contributors@expensify.com to request to join our Slack channel!

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -50,11 +50,11 @@ For example:
 
 - [ ] Verify that no errors appear in the JS console
 
-### PR Review Checklist
+### PR Author Checklist
 <!--
-This is a checklist for PR authors & reviewers. Please make sure to complete all tasks and check them off once you do, or else Expensify has the right not to merge your PR!
+This is a checklist for PR authors. Please make sure to complete all tasks and check them off once you do, or else your PR will not be merged!
 -->
-#### PR Author Checklist
+
 - [ ] I linked the correct issue in the `### Fixed Issues` section above
 - [ ] I wrote clear testing steps that cover the changes made in this PR
     - [ ] I added steps for local testing in the `Tests` section

diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -14,7 +14,7 @@ runs:
         cache: npm
 
     - name: Install node packages
-      uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb
+      uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
       with:
         timeout_minutes: 10
         max_attempts: 5

diff --git a/.github/actions/composite/updateProtectedBranch/action.yml b/.github/actions/composite/updateProtectedBranch/action.yml
@@ -99,8 +99,8 @@ runs:
     - name: Check changed files
       if: ${{ inputs.TARGET_BRANCH == 'main' }}
       id: changedFiles
-      # Version: 3.3.0
-      uses: umani/changed-files@1d252c611c64289d35243fc37ece7323ea5e93e1
+      # TODO: Remove and switch back to upstream when https://github.com/umani/changed-files/pull/27 is merged
+      uses: roryabraham/changed-files@c14fad74000cf77ff62b7f78cfd34c2124665c35
       with:
         repo-token: ${{ github.token }}
         pr-number: ${{ steps.createPullRequest.outputs.PR_NUMBER }}

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

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -138,7 +138,7 @@ jobs:
           bundler-cache: true
 
       - name: Install cocoapods
-        uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb
+        uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
         with:
           timeout_minutes: 10
           max_attempts: 5

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001022000
-        versionName "1.2.20-0"
+        versionCode 1001022306
+        versionName "1.2.23-6"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {