Merge remote-tracking branch 'origin/main' into bump/react-navigation-7

Author: staszekscp

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

@@ -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};

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016702
-        versionName "9.1.67-2"
+        versionCode 1009016802
+        versionName "9.1.68-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",

assets/emojis/index.ts

@@ -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.

cspell.json

@@ -0,0 +1,61 @@
+---
+title: How to Pay Expenses in New Expensify
+description: Learn how to pay expenses submitted by employees, friends, or family using New Expensify.
+keywords: [New Expensify, pay expenses, reimburse friends, personal payments, pay with Expensify, expense approval]
+---
+<div id="new-expensify" markdown="1">
+
+Paying expenses in New Expensify is simple, whether you're reimbursing a teammate or sending money to a friend. Here's how to make payments from a connected bank account or your Expensify Wallet.
+
+---
+
+# Pay Expenses Submitted to a Workspace
+Before you can pay workspace expenses:
+
+- Connect a [business bank account](https://help.expensify.com/articles/new-expensify/expenses-and-payments/Connect-a-Business-Bank-Account)
+- The submitter must connect a [personal bank account](https://help.expensify.com/articles/new-expensify/expenses-and-payments/Connect-a-Personal-Bank-Account)
+
+## How to Pay Workspace Expenses
+
+In the left-hand menu, select **Reports > Expense Reports** or follow the notification prompt.
+
+1. You'll receive an email, in-app notification, or text (if your contact method is a phone number).
+2. Click or tap **Pay** to open the expense report in New Expensify.
+3. Choose how to pay:
+   - **Pay with Expensify** – Use your connected business bank account.
+   - **Pay elsewhere** – Record that you paid outside Expensify.
+
+![Click Pay Button]({{site.url}}/assets/images/Reports_PayExpense_02.png){:width="100%"}
+
+---
+
+# Paying Personal Expenses
+
+To send personal payments, you’ll need to [set up your Wallet](https://help.expensify.com/articles/new-expensify/expenses-and-payments/Set-up-your-wallet). This feature is available for U.S. customers only.
+
+## How to Pay a Personal Expense
+
+In the left-hand menu, select **Reports > Expense Reports** or click on the notification you received.
+
+1. You'll be notified via email, in-app alert, or text when someone submits an expense to you.
+2. Click or tap **Pay** to view the details.
+3. Review the expense, then select your payment method:
+   - **Pay with Expensify** – Pay using your connected Wallet.
+   - **Pay elsewhere** – Mark the expense as paid outside Expensify.
+
+---
+
+# FAQ
+
+## Once I pay an expense, how long does it take for the deposit to reach the submitter’s bank account?
+
+- If the payment is coming from a **personal bank account** and is under $100, it will process in one business day. 
+- If the payment is coming from a **business bank account** and the total withdrawal amount has not exceeded $10,000 in the last 24 hours, the payment will process in one business day. 
+
+Otherwise, the payment will follow the standard bank transfer timeframe, and the recipient can expect to receive their payment within 4-5 business days. 
+
+## Can I pay someone in another currency?
+
+You can record expenses in different currencies, but all payments are made to U.S.-based personal or business bank accounts.
+
+</div>

docs/articles/expensify-classic/expenses/Add-an-expense.md

@@ -863,3 +863,4 @@ https://help.expensify.com/articles/new-expensify/reports-and-expenses/Distance-
 https://help.expensify.com/articles/new-expensify/travel/Expensify-Travel-demo-video,https://help.expensify.com/articles/expensify-classic/travel/Expensify-Travel-Tutorial
 https://help.expensify.com/articles/new-expensify/expensify-card/Check-Expensify-Card-limit,https://help.expensify.com/articles/new-expensify/expensify-card/Cardholder-Settings-and-Features#view-your-smart-limit
 https://help.expensify.com/articles/new-expensify/expensify-card/Manage-Expensify-Cards,https://help.expensify.com/articles/new-expensify/expensify-card/Set-Up-and-Manage-the-Expensify-Card
+https://help.expensify.com/articles/new-expensify/wallet-and-payments/Pay-an-expense,https://help.expensify.com/articles/new-expensify/wallet-and-payments/Pay-Expenses