Merge branch 'main' into fix/70660-enable-unreported-expenses-restore

Author: koko57

.eslintrc.js

@@ -390,5 +390,11 @@ module.exports = {
                 'rulesdir/boolean-conditional-rendering': 'error',
             },
         },
+        {
+            files: ['src/**/*.ts', 'src/**/*.tsx'],
+            rules: {
+                'rulesdir/prefer-locale-compare-from-context': 'error',
+            },
+        },
     ],
 };

.github/workflows/test.yml

@@ -75,7 +75,7 @@ jobs:
         with:
           token: ${{ steps.load-codecov-token.outputs.CODECOV_TOKEN }}
           files: coverage/shard-${{ matrix.chunk }}/coverage-final.json,coverage/shard-${{ matrix.chunk }}/lcov.info
-          flags: unit,shard-${{ matrix.chunk }}
+          flags: unit
           name: jest-${{ matrix.chunk }}
           disable_search: true
           fail_ci_if_error: true

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009021806
-        versionName "9.2.18-6"
+        versionCode 1009021900
+        versionName "9.2.19-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -9,6 +9,7 @@ coverage:
       default:
         informational: true
         target: auto
+        threshold: 1%
 
 codecov:
   notify:
@@ -17,8 +18,9 @@ codecov:
 
 comment:
   require_changes: "coverage_drop OR uncovered_patch"
-  layout: "condensed_header, condensed_files, condensed_footer"
+  layout: "condensed_header, diff, condensed_footer"
   behavior: default
+  hide_project_coverage: true
 
 flags:
   unit:

codecov.yml

@@ -4,7 +4,11 @@
 
 Styles can either be theme-related or not. "Theme-related" means that a style contains some sort of color attributes (backgroundColor, color, borderColor). "Non-theme-related" styles may not contain no color attributes.
 
-All non-theme-related styles must be defined in the `/styles` directory and `styles.js` contains the final export after gathering all appropriate styles. Unlike some React Native applications, we are not using `StyleSheet.create()` and instead store styles as plain JS objects. There are also many helper styles available for direct use in components.
+All non-theme-related styles must be defined in the `/styles` directory and `styles.js` contains the final export after gathering all appropriate styles. There are also many helper styles available for direct use in components.
+
+The styles are grouped into:
+- `staticStyles` - object wrapped into `StyleSheet.create()` which contains static styles based on the `theme`.
+- `dynamicStyles` - object that contains functions which return dynamic styles
 
 All styles that contain theme colors have to be defined in the `ThemeStylesProvider` component, as those need to be dynamically created and animated.
 

contributingGuides/STYLING.md

@@ -21,6 +21,14 @@ Aim for the shortest possible URL that is also still human readable.
 Exceptions:
 - When abbreviated paths are used in specific instances like `r/` (for reports) and `a/` (for accounts) for strategic purposes
 
+### - SHOULD use human readable names before using IDs
+Example:
+1. `domain/expensify.com/settings` - It's better to use the domain name "expensify.com" rather than an ID because it is readable, won't ever change, and is not a privacy or security concern
+
+Exceptions:
+- When there would be PII (personally identifiable information) that would leak in the URL like email addresses, use an ID instead
+- When the name can be updated but the path remains the same (eg. a workspace name), use an ID instead
+
 ### - MUST use kebab-case for all parts of a URL (eg. words separated by hyphens)
 ### - MUST use all lower case words
 ### - MUST be defined in `ROUTES.ts`

contributingGuides/philosophies/ROUTING.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.18</string>
+	<string>9.2.19</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.18.6</string>
+	<string>9.2.19.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.18</string>
+	<string>9.2.19</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.18.6</string>
+	<string>9.2.19.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.18</string>
+	<string>9.2.19</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.18.6</string>
+	<string>9.2.19.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>