Merge branch 'main' of https://github.com/Expensify/App into feat/62281-business-tax-id-desc

Author: MrMuzyk

.github/actions/javascript/proposalPoliceComment/index.js

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches-ignore: [staging, production]
+    paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/remote-build-android.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches-ignore: [staging, production]
+    paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/remote-build-ios.yml

@@ -510,7 +510,7 @@ You can only build HybridApp if you have been granted access to [`Mobile-Expensi
     [submodule "Mobile-Expensify"]
         ignore = all
     ```
-4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App
+4. Run `git config --global submodule.recurse true` in order to have the submodule updated when you pull App.
 
 
 > [!Note]  

Mobile-Expensify

@@ -6,6 +6,13 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
+// eslint-disable-next-line no-restricted-syntax
+enum PermissionStatus {
+    Granted = 'granted',
+    Denied = 'denied',
+    NotDetermined = 'not_determined',
+}
+
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -71,4 +78,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS};
+export {EventType, iOS, PermissionStatus};

README.md

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016700
-        versionName "9.1.67-0"
+        versionCode 1009016902
+        versionName "9.1.69-2"
         // 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"

__mocks__/@ua/react-native-airship.ts

@@ -1,10 +1,10 @@
-import type {Locale} from '@src/types/onyx';
+import type {FullySupportedLocale} from '@src/CONST/LOCALES';
 import emojis from './common';
 import type {Emoji, EmojisList} from './types';
 
 type EmojiTable = Record<string, Emoji>;
 
-type LocaleEmojis = Partial<Record<Locale, EmojisList>>;
+type LocaleEmojis = Partial<Record<FullySupportedLocale, EmojisList>>;
 
 const emojiNameTable = emojis.reduce<EmojiTable>((prev, cur) => {
     const newValue = prev;
@@ -32,13 +32,12 @@ const localeEmojis: LocaleEmojis = {
     es: undefined,
 };
 
-const importEmojiLocale = (locale: Locale) => {
-    const normalizedLocale = locale.toLowerCase().split('-').at(0) as Locale;
-    if (!localeEmojis[normalizedLocale]) {
-        const emojiImportPromise = normalizedLocale === 'en' ? import('./en') : import('./es');
+const importEmojiLocale = (locale: FullySupportedLocale) => {
+    if (!localeEmojis[locale]) {
+        const emojiImportPromise = locale === 'en' ? import('./en') : import('./es');
         return emojiImportPromise.then((esEmojiModule) => {
             // it is needed because in jest test the modules are imported in double nested default object
-            localeEmojis[normalizedLocale] = esEmojiModule.default.default ? (esEmojiModule.default.default as unknown as EmojisList) : esEmojiModule.default;
+            localeEmojis[locale] = esEmojiModule.default.default ? (esEmojiModule.default.default as unknown as EmojisList) : esEmojiModule.default;
         });
     }
     return Promise.resolve();

android/app/build.gradle

@@ -450,6 +450,7 @@
         "positionMillis",
         "Postharvest",
         "Postproduction",
+        "Précédent",
         "precheck",
         "Precheck",
         "prescribers",
@@ -601,6 +602,7 @@
         "uimanager",
         "ukkonen",
         "unapprove",
+        "unapproves",
         "unassigning",
         "Unassigning",
         "unassigns",
@@ -678,7 +680,8 @@
         "zoneinfo",
         "zxcv",
         "zxldvw",
-        "مثال"
+        "مثال",
+        "pnrs"
     ],
     "ignorePaths": [
         "src/languages/de.ts",