Merge branch 'main' of github.com:Expensify/App into beaman-newDispla…

…yNamePage

.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

.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

.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 }}

.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:

.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

.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:

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001022201
-        versionName "1.2.22-1"
+        versionCode 1001022401
+        versionName "1.2.24-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

android/build.gradle

@@ -42,6 +42,10 @@ allprojects {
     configurations.all {
         resolutionStrategy {
             force 'org.xerial:sqlite-jdbc:3.34.0'
+
+            // Manually set the react-native version to resolve this upstream issue: https://github.com/facebook/react-native/issues/35210
+            def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
         }
     }
     repositories {

contributingGuides/REVIEWER_CHECKLIST.md

@@ -0,0 +1,91 @@
+## Reviewer Checklist
+
+- [ ] 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 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 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
+- [ ] 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.
+
+### Screenshots/Videos
+<details>
+<summary>Web</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Chrome</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Safari</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<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>

desktop/main.js

@@ -265,7 +265,14 @@ const mainWindow = (() => {
                 }
 
                 evt.preventDefault();
-                browserWindow.hide();
+
+                // Check if window is fullscreen and exit fullscreen before hiding
+                if (browserWindow.isFullScreen()) {
+                    browserWindow.once('leave-full-screen', () => browserWindow.hide());
+                    browserWindow.setFullScreen(false);
+                } else {
+                    browserWindow.hide();
+                }
             });
 
             // Initiating a browser-back or browser-forward with mouse buttons should navigate history.

docs/404.html

@@ -1,6 +1,5 @@
 ---
 permalink: /404.html
-lhn_content: '404'
 ---
 <div class="centered-content with-lhn">
     <img class="icon" src="/assets/images/circle-hourglass.svg" />