Merge branch 'main' of https://github.com/mananjadhav/App into feat/e…

…rror-page

# Conflicts:
#	src/styles/styles.js

.github/actions/createOrUpdateStagingDeploy/index.js

@@ -195,7 +195,7 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Object<{commit: String, subject: String}>}
  */
 function getMergeLogsAsJSON(fromRef, toRef) {
-    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}^...${toRef}`;
+    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
     console.log('Running command: ', command);
     const result = execSync(command).toString().trim();

.github/actions/getDeployPullRequestList/index.js

@@ -117,7 +117,7 @@ const {execSync} = __nccwpck_require__(3129);
  * @returns {Object<{commit: String, subject: String}>}
  */
 function getMergeLogsAsJSON(fromRef, toRef) {
-    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}^...${toRef}`;
+    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
     console.log('Running command: ', command);
     const result = execSync(command).toString().trim();

.github/libs/GitUtils.js

@@ -9,7 +9,7 @@ const {execSync} = require('child_process');
  * @returns {Object<{commit: String, subject: String}>}
  */
 function getMergeLogsAsJSON(fromRef, toRef) {
-    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}^...${toRef}`;
+    const command = `git log --format='{"commit": "%H", "subject": "%s"},' ${fromRef}...${toRef}`;
     console.log('Getting pull requests merged between the following refs:', fromRef, toRef);
     console.log('Running command: ', command);
     const result = execSync(command).toString().trim();

.github/workflows/test.yml

@@ -33,6 +33,10 @@ jobs:
           max_attempts: 5
           command: npm ci
 
-      - run: npm run test
+      - name: Jest Unit Tests
+        run: npm run test
         env:
           CI: true
+
+      - name: Pull Request Tests
+        run: tests/unit/getPullRequestsMergedBetweenTest.sh

.storybook/main.js

@@ -7,4 +7,7 @@ module.exports = {
         '@storybook/addon-essentials',
         '@storybook/addon-a11y',
     ],
+    staticDirs: [
+        './public',
+    ],
 };

.storybook/manager-head.html

@@ -0,0 +1,2 @@
+<link rel="icon" type="image/png" href="logo.png" />
+<link rel="stylesheet" type="text/css" href="index.css" />

.storybook/manager.js

@@ -0,0 +1,6 @@
+import {addons} from '@storybook/addons';
+import theme from './theme';
+
+addons.setConfig({
+    theme,
+});

.storybook/public/index.css

@@ -0,0 +1,20 @@
+.search-field *, .sidebar-item, .search-result-item--label {
+    color: #fff !important;
+}
+
+.sidebar-subheading *, .search-result-item {
+    color: #fff;
+}
+
+a.sidebar-item > svg {
+    color: #03d47c;
+}
+
+.search-result-item--label span {
+    color: #ffffffaa !important;
+}
+
+#panel-tab-content :is(input:checked ~ span:last-of-type, input:not(:checked) ~ span:first-of-type) {
+    background: #ff7101;
+    color: #fff;
+}

.storybook/theme.js

@@ -0,0 +1,15 @@
+import {create} from '@storybook/theming';
+import colors from '../src/styles/colors';
+
+export default create({
+    appBg: colors.dark,
+    barSelectedColor: colors.blue,
+    base: 'light',
+    brandTitle: 'Expensify UI Docs',
+    brandImage: 'logomark.svg',
+    colorPrimary: colors.dark,
+    colorSecondary: colors.orange,
+    fontBase: 'GTAmericaExp-Regular',
+    fontCode: 'monospace',
+    textInverseColor: colors.black,
+});

STYLE.md

@@ -222,12 +222,21 @@ Use `lodashGet()` to safely access object properties and `||` to short circuit n
    ```
 
 ## JSDocs
-- Avoid docs that don't add any additional information.
+
 - Always document parameters and return values.
-- Method descriptions are optional and should be added when it's not obvious what the purpose of the method is.
-- Use uppercase when referring to JS primitive values (e.g. `Boolean` not `bool`, `Number` not `int`, etc)
+- Optional parameters should be enclosed by `[]` e.g. `@param {String} [optionalText]`.
+- Document object parameters with separate lines e.g. `@param {Object} parameters` followed by `@param {String} parameters.field`.
+- If a parameter accepts more than one type use `*` to denote there is no single type.
+- Use uppercase when referring to JS primitive values (e.g. `Boolean` not `bool`, `Number` not `int`, etc).
 - When specifying a return value use `@returns` instead of `@return`. If there is no return value do not include one in the doc.
 
+- Avoid descriptions that don't add any additional information. Method descriptions should only be added when it's behavior is unclear.
+- Do not use block tags other than `@param` and `@returns` (e.g. `@memberof`, `@constructor`, etc).
+- Do not document default parameters. They are already documented by adding them to a declared function's arguments.
+- Do not use record types e.g. `{Object.<string, number>}`.
+- Do not create `@typedef` to use in JSDocs.
+- Do not use type unions e.g. `{(number|boolean)}`.
+
 ```javascript
 // Bad
 /**

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012707
-        versionName "1.1.27-7"
+        versionCode 1001012905
+        versionName "1.1.29-5"
     }
     splits {
         abi {

android/app/src/main/java/com/expensify/chat/MainActivity.java

@@ -18,7 +18,7 @@ protected String getMainComponentName() {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+    super.onCreate(null);
     if (getResources().getBoolean(R.bool.portrait_only)) {
       setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     }

android/build.gradle

@@ -13,6 +13,7 @@ buildscript {
     }
     repositories {
         google()
+        jcenter()
         mavenCentral()
     }
     dependencies {
@@ -28,6 +29,7 @@ buildscript {
 
 allprojects {
     repositories {
+        jcenter()
         mavenCentral()
         mavenLocal()
         maven {