Merge branch 'main' into pr/4070

.eslintrc.js

@@ -2,10 +2,6 @@ module.exports = {
     extends: 'expensify',
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js'],
-    rules: {
-        'react/jsx-filename-extension': [1, {extensions: ['.js']}],
-        'comma-dangle': ['error', 'always-multiline'],
-    },
     plugins: ['detox'],
     env: {
         jest: true,

.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 contributors@expensify.com 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)

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

.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
 

.github/actions/bumpVersion/index.js

@@ -181,7 +181,9 @@ exports.updateiOSVersion = function updateiOSVersion(version) {
 /***/ }),
 
 /***/ 7:
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const _ = __nccwpck_require__(571);
 
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
@@ -199,7 +201,7 @@ const MAX_INCREMENTS = 99;
  */
 const getVersionNumberFromString = (versionString) => {
     const [version, build] = versionString.split('-');
-    const [major, minor, patch] = version.split('.').map(n => Number(n));
+    const [major, minor, patch] = _.map(version.split('.'), n => Number(n));
 
     return [major, minor, patch, Number.isInteger(Number(build)) ? Number(build) : 0];
 };

.github/actions/checkBundleVersionStringMatch/action.yml

@@ -0,0 +1,8 @@
+name: 'Check if Bundle Versions Match'
+description: "Check if the CFBundleVersion string is compatible with the CFBundleShortVersionString"
+outputs:
+  BUNDLE_VERSIONS_MATCH:
+    description: Whether or not the bundle versions match
+runs:
+  using: 'node12'
+  main: './index.js'

.github/actions/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js

@@ -0,0 +1,16 @@
+const core = require('@actions/core');
+const {execSync} = require('child_process');
+const {PLIST_PATH} = require('../../libs/nativeVersionUpdater');
+
+const bundleVersion = execSync(`/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" ${PLIST_PATH}`);
+const shortBundleVersion = execSync(`/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" ${PLIST_PATH}`);
+
+console.log(`Bundle Version: ${bundleVersion}`);
+console.log(`Short Bundle Version: ${shortBundleVersion}`);
+if (shortBundleVersion !== (bundleVersion.split('-') || [''])[0]) {
+    console.log('Bundle Versions do not match');
+    core.setOutput('BUNDLE_VERSIONS_MATCH', false);
+} else {
+    console.log('Bundle Versions match');
+    core.setOutput('BUNDLE_VERSIONS_MATCH', true);
+}