Merge branch 'main' into fix/64128

Author: nkdengineer

Mobile-Expensify

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

@@ -123,6 +123,7 @@
         "creditamount",
         "CREDS",
         "crios",
+        "csvg",
         "customairshipextender",
         "customfield",
         "customise",

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

@@ -0,0 +1,76 @@
+---
+title: Canceling Travel Arrangements
+description: Learn how to cancel flights, hotels, car rentals, or rail bookings directly in Expensify, and what to expect when doing so.
+keywords: [cancel trip, cancel booking, travel cancellation, refunds, travel credits, expensify travel, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+You can cancel flights, hotels, cars, or rail bookings directly from your trip view in Expensify and review refund or credit eligibility depending on the provider’s policy.
+
+---
+
+## 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 cancel a booking
+
+1. Go to **Trips** > **My Trips** and open the trip that contains the booking you want to cancel.
+2. In the **Trip view**, locate the booking (flight, hotel, car, or rail).
+3. Click the green **Cancel** button.
+5. Confirm the cancellation.
+
+If cancellation in product isn’t available for a particular booking, you’ll be directed to contact support.
+
+---
+
+## What to expect when canceling
+
+- **There is no fee to cancel a booking yourself** in Expensify.
+- If you contact support to cancel a booking, a **$25 fee per trip** applies.
+- If you cancel and later rebook under the same trip, you won’t be charged another trip fee.
+- Refunds or credits depend on the provider's cancellation policy and the fare or booking terms.
+
+**Refundable bookings**  
+- A full refund will be processed to the original payment method used at checkout.
+- Refundable bookings do not generate travel credits.
+
+**Non-refundable bookings**  
+- You may not receive a full refund.
+- If a credit is issued, it will be automatically associated with the traveler’s account and can be used toward a future booking.
+- The availability and amount of credit depend on the airline or vendor's policies.
+
+Canceled bookings can be shown in the Trip view using the *Show canceled items** toggle.
+
+---
+
+## Receipts and reporting
+
+If your payment card is connected to Expensify:
+- Charges and refunds will automatically import.
+- Canceled bookings will have their receipts marked as voided.
+- Travel credits will be stored in the **Unused Credits** section under **My Profile** and can be applied to future flights.
+
+---
+
+# FAQ
+
+## Will I be charged to cancel a booking?
+No. You can cancel bookings for free in Expensify. A $25 fee applies only if support cancels for you.
+
+## Can I rebook later on the same trip?
+Yes. If you rebook on the same trip, no new trip fee applies.
+
+## What if the cancel option is unavailable?
+Some bookings must be canceled through or directly with the travel provider. If this applies, you’ll be prompted.
+
+## Will I receive a refund or a credit?
+If the booking is refundable, you’ll receive a refund to your original payment method. If it’s non-refundable, you may receive a travel credit, depending on the provider’s terms.
+
+</div>

cspell.json

@@ -1,5 +1,5 @@
 ---
-title: creating-trips.md
+title: Creating Trips
 description: Learn how to create trips in Expensify before or during booking, and how to manage multiple travel components under one itinerary.
 keywords: [create trip, trip ID, travel booking, roundtrip, expensify travel, classic, new expensify]
 ---
@@ -15,13 +15,13 @@ Create a trip in Expensify to bundle all your flights, hotels, and car rentals i
 - **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**.
 
-**Don’t see the travel feature?** Reach out to your Account Manager or Concierge to schedule a travel demo and get it enabled for your account.
+**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.
 
 ---
 
 ## What is a trip?
 
-A trip in Expensify groups together all related bookings for the same journey under one umbrella. For example, a round-trip flight, hotel stay, and rental car in the same city can all be part of a single trip.
+A trip groups together all related bookings for the same journey in one bucket. For example, a round-trip flight, hotel stay, and rental car in the same city can all be part of a single trip.
 
 Each trip includes:
 - A **trip ID**
@@ -44,21 +44,7 @@ To create a trip during checkout:
     - If you create a new trip, enter a trip name and optionally a trip description.
 4. Click **Save** to create the trip and proceed with checkout.
 
-The trip will be created automatically and will include this booking. You can add more travel to it later.
-
----
-
-## How to create a trip in advance
-
-1. In the travel tool, go to **Trips** > **My Trips**.
-2. Click the green **New Trip** button in the upper-right corner.
-3. In the pop-up window:
-   - Enter a **Trip name**
-   - Optionally enter a **Trip description**
-   - To change the traveler, click the **pencil icon** next to your name and search for a teammate
-4. Click **Save**
-
-This trip will now be listed in your My Trips view and appear as a selectable option during checkout.
+The trip will be created automatically and will include this booking. You can add more travel bookings to it later.
 
 ---
 
@@ -81,12 +67,12 @@ Each new booking tied to this trip will appear here automatically.
 # FAQ
 
 ## Can I create multiple trips?
-Yes. You can create and manage as many trips as needed, either during booking or in advance.
+Yes. You can create and manage as many trips as needed.
 
 ## Will I be charged multiple times for one trip?
 No. There is a single $15 fee per trip, no matter how many bookings are added to it.
 
 ## Can I change the traveler for a trip?
-When you create a trip, you can change who the trip is for. When you create a booking, the trip is tied to the person you're booking for. Once a trip is created, its traveler cannot be changed.
+When you create a booking, the trip is tied to the person you're booking for. Once a trip is created, its traveler cannot be changed.
 
-</div>
+</div>

docs/articles/travel/managing-trips/Canceling-Travel-Arrangements.md

@@ -0,0 +1,73 @@
+---
+title: Editing Travel Arrangements
+description: Learn how to make changes to your existing travel bookings directly in Expensify, including flights, hotels, and car rentals.
+keywords: [edit travel, change booking, update itinerary, modify trip, expensify travel, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+Make changes to your travel bookings directly in Expensify without needing to contact support. You can edit flights, hotels, cars, or rail bookings as long as the travel booking allows it.
+
+---
+
+## 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 edit your travel booking
+
+1. Go to **Trips** > **My Trips** and click on the trip you'd like to update.
+2. In the **Trip view**, find the booking you want to edit (flight, hotel, car, or rail).
+3. Click the green **Modify** button.
+4. Select the booking you want to modify.
+5. Make allowed changes, then follow the prompts to confirm the changes.
+
+Depending on the provider, available edits may include:
+- Changing flight times or seats
+- Updating hotel check-in or check-out dates
+- Modifying car pickup or drop-off times
+- Adjusting passenger or loyalty details
+
+If a change cannot be made in product, you’ll be directed to contact support.
+
+---
+
+## What to know about editing bookings
+
+- **There is no fee to make changes yourself** in Expensify.
+- If you need help from support, a **$25 fee per trip** applies.
+- Any change made by support still counts as part of the same trip and does not trigger a new trip fee.
+- If you cancel and re-book a different flight within the **same trip**, you won’t be charged another booking fee.
+
+---
+
+## Can I make edits directly through the provider?
+
+Yes. For example, you can:
+- Make flight changes directly through the airline
+- Use hotel or car rental websites to update your booking
+
+However, these external changes may not sync back into your Expensify trip, and receipts will not automatically merge unless booked or modified in Expensify.
+
+---
+
+# FAQ
+
+## Can I edit my booking without contacting support?
+Yes. Most changes can be made directly in Expensify Travel. If a change is unavailable, you can contact support for help.
+
+## Will I be charged to edit my booking?
+No. You can make edits yourself for free. If support helps, a $25 fee applies per trip.
+
+## Can I rebook a flight and avoid a new fee?
+Yes, as long as you rebook within the same trip, no new trip fee is charged.
+
+## Can I change a booking directly through the airline?
+Yes, but the change may not automatically reflect in Expensify. For best results, make edits directly in Expensify.
+
+</div>

docs/articles/travel/managing-trips/Creating-Trips.md

@@ -0,0 +1,78 @@
+---
+title: View Upcoming and Past Trips
+description: Learn how to view, filter, and access upcoming, completed, and canceled trips in Expensify’s travel tool.
+keywords: [my trips, trip history, upcoming trips, past trips, all trips, canceled trips, travel admin, expensify travel, classic, new expensify]
+---
+
+<div id="new-expensify" markdown="1">
+
+Use the **Trips** dropdown in the travel tool to view and manage upcoming, completed, and canceled trips—either your own or your entire company's if you're a Travel Admin.
+
+---
+
+## 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.
+
+---
+
+## For individual travelers
+
+To see your own trips:
+
+1. Click **Trips** in the top navigation bar.
+2. Your trips will be under **My Trips**.
+
+You’ll see a list of all trips associated with your account.
+
+You can filter your trips by:
+- **Upcoming**
+- **Completed**
+- **Canceled**
+
+Click any trip to open the full **Trip view**, where you can:
+- Review all travel bookings
+- Add flights, hotels, or cars
+- Share or download the itinerary
+- View trip ID, travel dates, and expected cost
+
+---
+
+## For travel admins
+
+1. Click **Trips** in the top navigation bar.
+2. Click **All Trips**.
+3. Apply additional filters or edit the visible columns as needed.
+
+This view shows all trips booked by travelers in your organization. You can filter by:
+
+- **Upcoming**
+- **Completed**
+- **Canceled**
+- **Requires attention only**
+- **Trip start and end date**
+- **Booking type**
+- **Policy status** (in policy or out of policy)
+- **Traveler**
+
+To the far right of each trip row, click the **three-dot menu** to:
+- **Share** the trip by email
+- **Download** the trip as a PDF
+
+---
+
+# FAQ
+
+## Can I view trips I booked for someone else?
+Yes. Travel arrangers can view these under **My Trips** by filtering for the traveler using the Pencil icon on the traveler selector. All travel admins can access all company bookings under **All Trips**.
+
+## Will canceled bookings still show up?
+Yes. Use the **Canceled** filter or open the **Trip view** and toggle **Show canceled bookings** to see the individual canceled bookings within a specific trip.
+
+## Can I search for trips by name or traveler?
+Yes, travel admin can search for specific travelers on the **Trips** > **All Trips** page. Use the **Created by** filter and enter the name or email in the search bar. 
+
+</div>

docs/articles/travel/managing-trips/Editing-Travel-Arrangements.md

@@ -1,25 +1,27 @@
 ---
-title: overview-of-analytics.md
+title: Overview of Analytics
 description: Learn how to use Expensify Travel analytics to monitor spend, track bookings, and access company-wide travel insights.
 keywords: [travel analytics, reporting, travel spend, usage insights, expensify travel reports]
 ---
 
-# Overview of analytics
-
 Expensify Travel analytics give travelers, approvers, and admins real-time visibility into travel activity and spend. These insights help identify travel trends, ensure policy compliance, and support strategic decision-making across your organization.
 
+---
+
 ## How to access Expensify Travel
 
 - **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**.
 
-**Note:** Travelers, approvers, and admins can all access analytics. Only travel admins can view company-wide reports.
+**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.
 
 ---
 
 ## Traveler and approver analytics
 
-Once in Expensify Travel, click **Analytics** in the left-hand menu.
+1. Head to Expensify Travel.
+2. Click **Analytics** > **My Reports**.
+3. Filter for your own travel data, the data of your direct reports, or if you're an admin, your organization.
 
 ### Viewing data
 At the top left of the page, use the dropdown to toggle between:
@@ -42,7 +44,8 @@ All reports can be downloaded in the following formats:
 
 ## Company-wide analytics (admins only)
 
-Admins can access **Company reports** from the **Analytics** section to view comprehensive metrics and travel spend.
+1. Head to Expensify Travel.
+2. Click **Analytics** > **Company Reports**.
 
 ### Report selection
 A left-hand menu provides a list of built-in reports. Some examples include:
@@ -68,9 +71,6 @@ Most reports include a visual graph highlighting key metrics over time. Tile sum
 
 # FAQ
 
-**What should I do if the Analytics page appears blank?**  
-Click the icon at the far left of the URL in your browser’s address bar. Expand **Cookies and Site data**, then enable **third-party cookies**. Refresh the page and your reports should load correctly.
-
 **Can I see my team's travel activity if I’m not an admin?**  
 Yes, approvers can view data for their direct reports or organizational group using the dropdown at the top of the Analytics page.
 
@@ -83,4 +83,4 @@ Yes, analytics are updated automatically as bookings are made, changed, or cance
 **Can I filter company-wide reports by department or cost center?**  
 Yes, depending on how your organization is set up, filters for departments or cost centers may be available in the Company Reports view.
 
-</div>
+</div>