Merge branch 'main' into revert-73877-revert-72677-follow-up-71057

Author: nkdengineer

.github/workflows/test.yml

@@ -44,7 +44,7 @@ jobs:
           key: ${{ runner.os }}-jest
 
       - name: Jest tests
-        run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }} --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
+        run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npm test -- --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --maxWorkers=4 --coverage --coverageDirectory=coverage/shard-${{ matrix.chunk }}
 
       - name: Upload coverage to Codecov (PRs - tokenless)
         if: ${{ github.event_name == 'pull_request' }}

Mobile-Expensify

@@ -13,8 +13,7 @@ const request = jest.fn(() => RESULTS.GRANTED as string);
 const checkLocationAccuracy: jest.Mock<string> = jest.fn(() => 'full');
 const requestLocationAccuracy: jest.Mock<string> = jest.fn(() => 'full');
 
-// eslint-disable-next-line unicorn/prefer-set-has
-const notificationOptions: string[] = ['alert', 'badge', 'sound', 'carPlay', 'criticalAlert', 'provisional'];
+const notificationOptions = new Set<string>(['alert', 'badge', 'sound', 'carPlay', 'criticalAlert', 'provisional']);
 
 const notificationSettings: NotificationSettings = {
     alert: true,
@@ -35,7 +34,7 @@ const checkNotifications: jest.Mock<Notification> = jest.fn(() => ({
 const requestNotifications: jest.Mock<Notification> = jest.fn((options: Record<string, string>) => ({
     status: RESULTS.GRANTED,
     settings: Object.keys(options)
-        .filter((option: string) => notificationOptions.includes(option))
+        .filter((option: string) => notificationOptions.has(option))
         .reduce(
             (acc: NotificationSettings, option: string) => {
                 acc[option] = true;

__mocks__/react-native-permissions.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009024801
-        versionName "9.2.48-1"
+        versionCode 1009025401
+        versionName "9.2.54-1"
         // 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

@@ -106,7 +106,7 @@ platforms:
 
       - href: concierge-ai
         title: Concierge AI
-        icon: /assets/images/lightbulb.svg
+        icon: /assets/images/simple-illustration__concierge-bot.svg
         description: Learn about Concierge AI and what it can do.
 
       - href: workspaces

docs/_data/_routes.yml

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.48</string>
+	<string>9.2.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.48.1</string>
+	<string>9.2.54.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

docs/assets/images/simple-illustration__concierge-bot.svg

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.48</string>
+	<string>9.2.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.48.1</string>
+	<string>9.2.54.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -3664,7 +3664,7 @@ PODS:
     - SocketRocket
     - Turf
     - Yoga
-  - RNNitroSQLite (9.1.11):
+  - RNNitroSQLite (9.2.0):
     - boost
     - DoubleConversion
     - fast_float
@@ -4810,7 +4810,7 @@ SPEC CHECKSUMS:
   RNLiveMarkdown: 8cdadb9f25254c6a6603723c7ed02b18913b1464
   RNLocalize: 0aa716b7d0f1316ca5f8f16ed42b79b9e3093279
   rnmapbox-maps: 870cd752e1d132e05465f3074b582ce6c7e742e9
-  RNNitroSQLite: d5cf8c550c51015e1ecc93ff6e7509187c6c1c9e
+  RNNitroSQLite: ddd882f7bab0370f6045782284c34862636bc8a7
   RNPermissions: d507f1fe0ee109c8f6f882808fcf8a173645e40b
   RNReactNativeHapticFeedback: 43c09eb41d8321be2e1375cb87ae734e58f677b0
   RNReanimated: 91d075aaf0c89d51a0708cd64cd6c77f7fa42cdc

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.48</string>
+	<string>9.2.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.48.1</string>
+	<string>9.2.54.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>