Merge branch 'main' into mrejdak/remove-unnecessary-types-batch-3

Author: mrejdak

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027806
-        versionName "9.2.78-6"
+        versionCode 1009027807
+        versionName "9.2.78-7"
         // 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

@@ -96,6 +96,7 @@
         "buildscript",
         "Buildscript",
         "Bushwick",
+        "BYOC",
         "capitalone",
         "CAROOT",
         "Carta",

cspell.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^4.1.1",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.8",
+    "electron-updater": "^6.7.2",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.6</string>
+	<string>9.2.78.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

desktop/package.json

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.6</string>
+	<string>9.2.78.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.6</string>
+	<string>9.2.78.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/NotificationServiceExtension/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.2.78-6",
+  "version": "9.2.78-7",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -315,7 +315,7 @@
     "electron-builder": "26.0.19",
     "eslint": "^9.36.0",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-config-expensify": "2.0.100",
+    "eslint-config-expensify": "2.0.101",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-jsdoc": "^60.7.0",