Merge remote-tracking branch 'upstream/main' into feat/waterim/unreport-transaction-v2

Author: waterim

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

@@ -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 1009016701
-        versionName "9.1.67-1"
+        versionCode 1009016803
+        versionName "9.1.68-3"
         // 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",

assets/emojis/index.ts

@@ -11,6 +11,7 @@ import {translate} from '@libs/Localize';
 import Log from '@libs/Log';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
+import TranslationStore from '@src/languages/TranslationStore';
 import type {TranslationPaths} from '@src/languages/types';
 import type PlatformSpecificUpdater from '@src/setup/platformSetup/types';
 import type {Locale} from '@src/types/onyx';
@@ -665,10 +666,12 @@ const mainWindow = (): Promise<void> => {
                 // because the only way code can be shared between the main and renderer processes at runtime is via the context bridge
                 // So we track preferredLocale separately via ELECTRON_EVENTS.LOCALE_UPDATED
                 ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale: Locale) => {
-                    preferredLocale = updatedLocale;
-                    Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
-                    disposeContextMenu?.();
-                    disposeContextMenu = createContextMenu(updatedLocale);
+                    TranslationStore.load(updatedLocale).then(() => {
+                        preferredLocale = updatedLocale;
+                        Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
+                        disposeContextMenu?.();
+                        disposeContextMenu = createContextMenu(updatedLocale);
+                    });
                 });
 
                 ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {

assets/images/menu.svg

@@ -170,6 +170,12 @@ To resolve duplicates, you can [merge the expenses](https://help.expensify.com/a
 
 **Note:** Employees under a workspace may have expenses auto-labeled. Ask a Workspace Admin if anything looks incorrect.
 
+## Can I upload a PDF receipt from the mobile app? 
+
+The Expensify mobile app has access to your photo gallery, not your files. To upload a file outside of the photo gallery, you can use one of these methods:
+1. For a single-page receipt, take a screenshot and upload it from your gallery
+2. For a multi-page receipt, use your email app to send it to receipts@expensify.com
+
 ## Why don’t I see a certain expense type?
 
 Your company’s workspace settings may limit what expense types are visible to you.