Merge branch 'main' of https://github.com/Expensify/App into feat/65911-usd-6th-step

Author: MrMuzyk

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018300
-        versionName "9.1.83-0"
+        versionCode 1009018403
+        versionName "9.1.84-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"

android/app/build.gradle

@@ -232,6 +232,22 @@ This error may appear after execution of `npm run pod-install`. In this case you
 1. cd to `Mobile-Expensify/ios`
 2. run `pod repo remove trunk`
 
+### Error: `Build service could not create build operation`
+This might also appear when trying to clean build folder.
+1. Manually clean `rm -rf ~/Library/Developer/Xcode/DerivedData`
+2. Quit XCode and macOS build services:
+    1. Close XCode
+    2. `sudo pkill -9 -f xcodebuild`
+    3. `sudo pkill -9 -f XCBBuildService`
+    4. `sudo pkill -9 -f com.apple.dt.Xcode`
+    5. Restart XCode
+3. Further cleaning:
+    1. `rm -rf ~/Library/Developer/Xcode/ModuleCache.noindex`
+    2. `rm -rf ~/Library/Caches/com.apple.dt.Xcode`
+    3. `rm -rf NewExpensify.xcodeproj/project.xcworkspace/xcuserdata`
+    4. `rm -rf NewExpensify.xcodeproj/project.xcworkspace/xcshareddata`
+4. Restart your Mac
+
 ### How to build a `release` iOS app?
 If you'd like to build HybridApp in `release` configuration, the best way to do it is to:
 1. open XCode

assets/images/simple-illustrations/simple-illustration__rules.svg

@@ -38,7 +38,7 @@ This document lists specific guidelines for all PR reviews and aims to clarify i
 ## Good code patterns to require
 
 1. Check that functions have comments when appropriate.
-    - If the function has params or returns something, use [JSDocs syntax]((https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs)) to describe them.
+    - If the function has params or returns something, use [JSDocs syntax](https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#jsdocs) to describe them.
         - Indicate the param name(s), data type passed and / or returned, and purpose if not immediately obvious.
     - Obvious functions (with no params / return value) should not have comments.
     - **In short: _Add comments & docs, only when useful._**
@@ -66,8 +66,27 @@ Here are some guidelines we use in order to make the best decisions:
 1. Specialization
     - When one component is a special case of another, we should opt for the technique of composition. Here are the [React docs](https://reactjs.org/docs/composition-vs-inheritance.html#specialization) on Specialization. The idea is that it’s better to establish a pattern of creating increasingly specific components, instead of adding dozens of use cases to a single component.
     - You might consider this when a component is being reused because the new use case is “close enough” to the original. Rather than adding functionality to that component with subtle additions, it may be better to create a new, more specialized version of that component.
-1. Refactors
+2. Refactors
     - During a code review it often becomes apparent that a refactor is needed. In this case, we recommend following these steps:
         1. Identify the refactor and confirm with others that it’s needed.
         2. Do that refactor first (as a separate job, if it qualifies), merge it, test for regressions.
         3. Proceed with the original issue & job.
+
+# C+ Best Practices
+
+To reduce delays and improve PR turnaround, reviewers should follow these additional practices:
+
+1. **Continue reviewing the full PR even after spotting a bug.**
+    - Always complete a full review pass. Finding an issue early on shouldn’t stop you from checking the rest of the code. This helps the author address all feedback in one go, rather than dealing with staggered comments across days.
+
+2. **Don’t let minor merge conflicts block your review.**
+    - You can still review logic, structure, and tests while conflicts are being resolved.
+
+3. **If you find a bug, test if it exists on `main`.**
+    - If the issue also appears on `main`, **do not block the PR** — it likely wasn’t introduced by the current changes.
+    - Report such bug in `#expensify-bugs` Slack channel following the bug template to make sure its addressed.
+
+4. **Don’t block or delay review due to unrelated failing workflows or test flakes.**  
+   - If failures are clearly not introduced by the PR, don’t treat them as blockers. These can be resolved when syncing with `main` later.
+
+These practices help minimize asynchronous lag and keep development moving smoothly across time zones.

contributingGuides/HYBRID_APP.md

@@ -123,6 +123,7 @@
         "creditamount",
         "CREDS",
         "crios",
+        "csvg",
         "customairshipextender",
         "customfield",
         "customise",
@@ -430,6 +431,7 @@
         "otpauth",
         "parasharrajat",
         "Parcelable",
+        "passplus",
         "passwordless",
         "Passwordless",
         "payrollcode",
@@ -602,6 +604,8 @@
         "Transpiles",
         "trivago",
         "Typeform",
+        "uatp",
+        "UATP",
         "UBOI",
         "UBOS",
         "UDID",
@@ -688,8 +692,11 @@
         "zxcv",
         "zxldvw",
         "مثال",
+        "pkill",
         "pnrs",
-        "POLICYCHANGELOG_ADD_EMPLOYEE"
+        "POLICYCHANGELOG_ADD_EMPLOYEE",
+        "xcshareddata",
+        "xcuserdata"
     ],
     "ignorePaths": [
         "src/languages/de.ts",

contributingGuides/PR_REVIEW_GUIDELINES.md

@@ -70,14 +70,22 @@ This feature helps prevent policy violations and ensures accurate expense tracki
 
 ---
 
-## Option 4: Bulk Upload Receipts (Desktop Only)
+## Option 4: Scan Multiple Receipts (Mobile)
+
+1. On the mobile app, tap the green **+** button and select **Create expense**.
+2. Tap the multi-receipt icon in the bottom-right corner.
+3. Tap the green capture button to take a photo of each receipt.
+5. Once you’ve scanned all your receipts, tap the green arrow to confirm.
+6. Enter expense details for each receipt or just tap Create expenses for automatic scanning.
+
+---
+
+## Option 5: Bulk Upload Receipts (Desktop)
 
 1. Drag up to 30 PDF or image files (under 10MB each) into Expensify.
 2. Select **Scan Receipts** or **Add Attachments**.
 3. Follow the prompts to assign workspaces, recipients, and coding.
 
----
-
 # Next Steps for Individual Expenses
 
 - Expenses created and submitted to an individual are sent immediately.

cspell.json

@@ -0,0 +1,71 @@
+---
+title: Arrange Travel for Another User
+description: Learn how to arrange travel in Expensify on behalf of another member, using either Classic or New Expensify.
+keywords: [arrange travel, book for others, travel arranger, expensify travel, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+Once granted the Travel Arranger role, you can arrange travel for another member of your organization using Expensify Travel.
+
+---
+
+## How to access the travel tool
+
+- **In New Expensify:** Click the green **+** button in the bottom-left corner of your screen, then select **Book travel**.
+- **In Classic Expensify:** Click **Travel** in the left-hand menu, then select **Book or manage travel**.
+
+**Need to enable travel still?** Reach out to your Account Manager or Concierge to schedule a travel demo and get it enabled for your account.
+
+---
+
+## How to get access
+
+Before arranging travel for another traveler, a Travel Admin must assign you the **Travel Arranger** role.
+
+**To set the Travel Arranger role for another travel member:**
+
+1. Head to Expensify Travel.
+2. Click on **Program** > **Users** > search and select the name of the user who needs to arrange travel.
+3. Click the **Roles** tab and then select **Travel Arranger** from the dropdown.
+4. Click **Save**.
+
+---
+
+## How to book for another member
+
+1. Head to the [Booking](https://travel.expensify.com/flights) page of your travel account.
+2. Click the **Pencil** icon to the right of your name in the booking tool.
+3. Search for the traveler by name or email and select them.
+4. Choose a travel type:
+   - Flights
+   - Hotels
+   - Cars
+   - Rail
+5. Enter the relevant trip details for the selected travel type.
+6. Browse and select the desired travel accommodations.
+7. Apply the booking to an existing trip or create a new one.
+8. Confirm the payment method and finalize the booking.
+
+---
+
+## What happens next
+
+- The selected traveler will receive a confirmation email.
+- Receipts will automatically be sent to their Expensify account and added to a trip report.
+- As the arranger, you’ll see a history of bookings you’ve made for others.
+
+---
+
+# FAQ
+
+## Who can book travel for other members?
+Only members with the **Travel Arranger** role assigned by a Travel Admin can arrange travel for others.
+
+## Will I be charged or the traveler?
+The traveler's account is responsible for the charge. Receipts will route directly to them.
+
+## Can I manage trips I’ve booked for someone else?
+Yes. If you booked the trip on behalf of someone else, you can view and manage it from the Trips > My trips page. Click the **Pencil** icon to the right of your name in the traveler selection button and search for the traveler to pull up their trips.
+
+</div>

docs/articles/new-expensify/reports-and-expenses/Create-an-Expense.md

@@ -0,0 +1,63 @@
+---
+title: Book Rail Travel
+description: Learn how to book train travel using Expensify's integrated travel tool, with instructions for both Classic and New Expensify.
+keywords: [book rail, train travel, travel booking, rail tickets, expensify travel, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+Book rail tickets using Expensify's built-in travel portal, available in both Classic and New Expensify.
+
+---
+
+## How to access the travel tool
+
+- **In New Expensify:** Click the green **+** button in the bottom-left corner of your screen, then select **Book travel**.
+- **In Classic Expensify:** Click **Travel** in the left-hand menu, then select **Book or manage travel**.
+
+**Need to enable travel still?** Reach out to your Account Manager or Concierge to schedule a travel demo and get it enabled for your account.
+
+---
+
+## How to book rail travel
+
+1. Click the **Rail** tab.
+2. Enter the search parameters:
+   - Travel type: round trip, one way, or open return
+   - Departure and destination stations
+   - Travel dates
+   - Railcard (if applicable)
+3. Click **Search Rail** to view available train schedules.
+4. Browse train options by time, class, or duration.
+5. Click **Select** on your preferred ticket and then click **Continue**.
+6. On the first checkout screen, review:
+   - Traveler information
+   - Loyalty and railcard programs
+   - Seat preferences
+   - Optional extras
+7. Click **Next** to move to the second checkout screen.
+8. Choose an existing trip or create a new one, then confirm the trip details and payment method.
+9. Click **Confirm and pay**.
+
+---
+
+## What happens next
+
+- Your booking may require approval depending on your company’s travel policy.
+- You’ll receive a confirmation email once the train ticket is booked.
+- The booking receipt syncs with your Expensify account automatically for easy expense tracking.
+- If the payment card used is importing into your Expensify account, the receipt will automatically merge with the imported expense.
+
+**Note:** Not all regions currently support rail booking. Availability may vary.
+
+---
+
+# FAQ
+
+## Will I receive a digital ticket?
+Yes. Most rail bookings include a digital ticket or QR code in the confirmation email.
+
+## Can I choose a seat?
+Yes, seat selection is available on supported routes. This option will appear during checkout if eligible.
+
+</div>

docs/articles/travel/booking-travel/Arrange-Travel-for-Another-User.md

@@ -0,0 +1,67 @@
+---
+title: Book Travel for a Guest
+description: Learn how to book travel for guests in Expensify, even if they don’t have an Expensify account, with instructions for Classic and New Expensify.
+keywords: [book guest travel, guest traveler, expensify travel, book for non-member, travel booking, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+Any member with guest booking permission can book travel for a guest, aka someone who doesn’t have an Expensify account.
+
+---
+
+## How to access the travel tool
+
+- **In New Expensify:** Click the green **+** button in the bottom-left corner of your screen, then select **Book travel**.
+- **In Classic Expensify:** Click **Travel** in the left-hand menu, then select **Book or manage travel**.
+
+**Need to enable travel still?** Reach out to your Account Manager or Concierge to schedule a travel demo and get it enabled for your account.
+
+---
+
+## How to get access
+
+Before arranging travel for another traveler, a Travel Admin must assign you the **Travel Arranger** role.
+
+**To set the Travel Arranger role for another travel member:**
+
+1. Head to Expensify Travel.
+2. Click on **Program** > **Users** > search and select the name of the user who needs to arrange travel.
+3. Click the **Configuration** tab and then click the toggle for **Allow employee to book for guests**.
+
+---
+
+## How to book travel for a guest
+
+1. Click **Book for Guest** at the bottom of the booking tool.
+2. Choose a travel type:
+   - Flights
+   - Hotels
+   - Cars
+   - Rail
+3. Enter the relevant trip details for the selected travel type.
+4. Browse and select the desired travel accommodations.
+5. On the checkout page, enter the guest's information in the **Traveler information** section.
+6. Apply the booking to an existing trip or create a new one.
+7. Confirm the payment method and finalize the booking.
+
+---
+
+## What happens next
+
+- Bookings may require approval based on your company’s travel policy.
+- The guest will receive a confirmation email with their travel details.
+- Receipts will be added to your Expensify account and SmartScanned for reporting.
+- If the payment card is connected to your Expensify account, the receipt will auto-merge with the imported expense.
+
+---
+
+# FAQ
+
+## Will the guest need an Expensify account?
+No. Guest travelers don’t need an account to receive or use their travel reservation.
+
+## Will the travel show up in my reports?
+Yes. The booking appears in your Expensify account, and receipts are automatically added to an expense report.
+
+</div>