Merge branch 'main' into fix/28070

.storybook/preview.js

@@ -6,7 +6,7 @@ import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
 import OnyxProvider from '../src/components/OnyxProvider';
-import {LocaleContextProvider} from '../src/components/withLocalize';
+import {LocaleContextProvider} from '../src/components/LocaleContextProvider';
 import {KeyboardStateProvider} from '../src/components/withKeyboardState';
 import {EnvironmentProvider} from '../src/components/withEnvironment';
 import {WindowDimensionsProvider} from '../src/components/withWindowDimensions';

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001037500
-        versionName "1.3.75-0"
+        versionCode 1001037508
+        versionName "1.3.75-8"
     }
 
     flavorDimensions "default"

docs/Gemfile

@@ -32,3 +32,6 @@ gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
 gem "webrick", "~> 1.7"
 
 gem 'jekyll-seo-tag'
+
+gem 'jekyll-redirect-from'
+

docs/Gemfile.lock

@@ -263,11 +263,12 @@ DEPENDENCIES
   github-pages
   http_parser.rb (~> 0.6.0)
   jekyll-feed (~> 0.12)
+  jekyll-redirect-from
   jekyll-seo-tag
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.4.3
+   2.4.19

docs/_config.yml

@@ -17,3 +17,7 @@ exclude: [README.md, TEMPLATE.md, vendor]
 
 plugins:
   - jekyll-seo-tag
+  - jekyll-redirect-from
+
+whitelist:
+  - jekyll-redirect-from

docs/articles/expensify-classic/account-settings/Account-Details.md

@@ -0,0 +1,5 @@
+---
+title: Account Details
+description: Account Details
+---
+## Resource Coming Soon!

docs/articles/expensify-classic/exports/Insights.md

@@ -1,6 +1,7 @@
 ---
 title: Custom Reporting and Insights
 description: How to get the most out of the Custom Reporing and Insights
+redirect_from: articles/other/Insights/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
 {% raw %}

docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md

@@ -48,11 +48,11 @@ You can also create a number of future 'placeholder' expenses for your recurring
 # How to Edit Bulk Expenses
 Editing expenses in bulk will allow you to apply the same coding across multiple expenses and is a web-only feature. To bulk edit expenses:
 Go to the Expenses page.
-To narrow down your selection, use the filters (e.g. "Merchant" and "Open") to find the specific expenses you want to edit.
+To narrow down your selection, use the filters (e.g. "Merchant" and "Draft") to find the specific expenses you want to edit.
 Select all the expenses you want to edit.
 Click on the **Edit Multiple** button at the top of the page. 
 # How to Edit Expenses on a Report
-If you’d like to edit expenses within an Open report:
+If you’d like to edit expenses within a Draft report:
 
 1. Click on the Report containing all the expenses. 
 2. Click on **Details**.
@@ -61,8 +61,8 @@ If you’d like to edit expenses within an Open report:
 
 If you've already submitted your report, you'll need to Retract it or have it Unapproved first before you can edit the expenses.
 
-
 # FAQ
+
 ## Does Expensify account for duplicates?
 
 Yes, Expensify will account for duplicates. Expensify works behind the scenes to identify duplicate expenses before they are submitted, warning employees when they exist. If a duplicate expense is submitted, the same warning will be shown to the approver responsible for reviewing the report. 
@@ -71,6 +71,7 @@ If two expenses are SmartScanned on the same day for the same amount, they will
 The expenses were split from a single expense, 
 The expenses were imported from a credit card, or
 Matching email receipts sent to [email protected] were received with different timestamps. 
+
 ## How do I resolve a duplicate expense?
 
 If Concierge has let you know it's flagged a receipt as a duplicate, scanning the receipt again will trigger the same duplicate flagging.Users have the ability to resolve duplicates by either deleting the duplicated transactions, merging them, or ignoring them (if they are legitimately separate expenses of the same date and amount). 
@@ -88,21 +89,23 @@ Click the **Undelete** button and you're all set. You’ll find the expense on y
 ## What are the different Expense statuses?
 
 There are a number of different expense statuses in Expensify:
-1. **Unreported**: Unreported expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
-2. **Open**: Open expenses are on a report that's still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making it a collaborative step toward reimbursement.
+1. **Personal**: Personal expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
+2. **Draft**: Draft expenses are seen as still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making this a collaborative step toward reimbursement.
 3. **Processing**: Processing expenses are submitted, but waiting for approval.
 4. **Approved**: If it's a non-reimbursable expense, the workflow is complete at this point. If it's a reimbursable expense, you're one step closer to getting paid.
 5. **Reimbursed**: Reimbursed expenses are fully settled. You can check the Report Comments to see when you'll get paid.
 6. **Closed**: Sometimes an expense accidentally ends up on your Individual Policy, falling into the Closed status. You’ll need to reopen the report and change the Policy by clicking on the **Details** tab in order to resubmit your report.
+
 ## What are Violations?
 
 Violations represent errors or discrepancies that Expensify has picked up and need to be corrected before a report can be successfully submitted. The one exception is when an expense comment is added, it will override the violation - as the user is providing a valid reason for submission.
 
 To enable or configure violations according to your policy, go to **Settings > Policies > _Policy Name_ > Expenses > Expense Violations**. Keep in mind that Expensify includes certain system mandatory violations that can't be disabled, even if your policy has violations turned off.
 
 You can spot violations by the exclamation marks (!) attached to expenses. Hovering over the symbol will provide a brief description and you can find more detailed information below the list of expenses. The two types of violations are:
-**Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
-**Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+1. **Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
+2. **Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+
 ## How to Track Attendees
 
 Attendee tracking makes it easy to track shared expenses and maintain transparency in your group spending. 
@@ -116,9 +119,10 @@ External attendees are considered users outside your group policy or domain. To
 1. Click or tap the **Attendee** field within your expense.
 2. Type in the individual's name or email address.
 3. Tap **Add** to include the attendee.
-You can continue adding more attendees or save the Expense.
+4. You can continue adding more attendees or save the Expense.
+
 To remove an attendee from an expense:
-Open the expense.
-Click or tap the **Attendees** field to display the list of attendees.
-From the list, de-select the attendees you'd like to remove from the expense.
 
+1. Open the expense.
+2. Click or tap the **Attendees** field to display the list of attendees.
+3. From the list, de-select the attendees you'd like to remove from the expense.

docs/articles/expensify-classic/getting-started/Referral-Program.md

@@ -1,6 +1,7 @@
 ---
 title: Expensify Referral Program
 description: Send your joining link, submit a receipt or invoice, and we'll pay you if your referral adopts Expensify.
+redirect_from: articles/other/Referral-Program/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
 

docs/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners.md

@@ -1,6 +1,7 @@
 ---
 title: Expensify Card revenue share for ExpensifyApproved! partners
 description: Earn money when your clients adopt the Expensify Card
+redirect_from: articles/other/Card-Revenue-Share-for-ExpensifyApproved!-Partners/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
 

docs/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager.md

@@ -1,6 +1,7 @@
 ---
 title: Your Expensify Partner Manager
 description: Everything you need to know about your Expensify Partner Manager
+redirect_from: articles/other/Your-Expensify-Partner-Manager/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md

@@ -1,6 +1,7 @@
 ---
 title: Expensify Playbook for Small to Medium-Sized Businesses
 description: Best practices for how to deploy Expensify for your business
+redirect_from: articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses/
 ---
 ## Overview
 This guide provides practical tips and recommendations for small businesses with 100 to 250 employees to effectively use Expensify to improve spend visibility, facilitate employee reimbursements, and reduce the risk of fraudulent expenses.

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-Bootstrapped-Startups.md

@@ -1,6 +1,7 @@
 ---
 title: Expensify Playbook for US-Based Bootstrapped Startups
 description: Best practices for how to deploy Expensify for your business
+redirect_from: articles/playbooks/Expensify-Playbook-for-US-Based-Bootstrapped-Startups/
 ---
 
 This playbook details best practices on how Bootstrapped Startups with less than 5 employees can use Expensify to prioritize product development while capturing business-related receipts for future reimbursement.

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md

@@ -1,6 +1,7 @@
 ---
 title: Expensify Playbook for US-Based VC-Backed Startups
 description: Best practices for how to deploy Expensify for your business
+redirect_from: articles/playbooks/Expensify-Playbook-for-US-based-VC-Backed-Startups/
 ---
 This playbook details best practices on how Seed to Series A startups with under 100 employees can use Expensify to prioritize top-line revenue growth while managing spend responsibly.
 

docs/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager.md

@@ -1,6 +1,7 @@
 ---
 title: Your Expensify Account Manager
 description: Everything you need to know about Having an Expensify account manager
+redirect_from: articles/other/Your-Expensify-Account-Manager/
 ---
 
 <!-- The lines above are required by Jekyll to process the .md file -->

docs/articles/expensify-classic/getting-started/tips-and-tricks/Enable-Location-Access-On-Web.md

@@ -1,6 +1,7 @@
 ---
 title: Enable Location Access on Web
 description: How to enable location access for Expensify websites on your browser
+redirect_from: articles/other/Enable-Location-Access-on-Web/
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->
 

docs/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles.md

@@ -9,34 +9,34 @@ This guide is for those who are part of a **Group Workspace**.
 
 Each member has a role that defines what they can see and do in the workspace. Most members will have the role of "Employee."
 
-# How to Manage User Roles
+# How to manage user roles
 
-To find and edit the roles of group workspace members, go to **Settings > Workspaces > Group > [Your Specific Workspace Name] > Members > Workspace Members**
+To find and edit the roles of group workspace members, go to **Settings > Workspaces > Group > _[Workspace Name]_ > Members > Workspace Members**
 
 Here you'll see the list of members in your group workspace. To change their roles, click **Settings** next to the member’s name and choose the role that the member needs.
 
 Next, let’s go over the various user roles that are available on a group workspace.
 
-## The Employee Role
+### The Employee Role
 
 - **What can they do:** Employees can only see their own expense reports or reports that have been submitted to or shared with them. They can't change settings or invite new users.
 - **Who is it for:** Regular employees who only need to manage their own expenses, or managers who are reviewing expense reports for a few users but don’t need global visibility. 
 - **Approvers:** Members who approve expenses can either be Employees, Admins, or Workspace Auditors, depending on how much control they need.
 - **Billable:** Employees are billable actors if they take actions on a report on your Group Workspace (including **SmartScanning** a receipt).
 
-## Workspace Admin Role
+### Workspace Admin Role
 
 - **What can they do:** Admins have full control. They can change settings, invite members, and view all reports. They can also process reimbursements if they have access to the company’s account.
 - **Billing Owners:** Billing owners are Admins by default. **Workspace Admins** are assigned by the owner or another admin.
 - **Billable:** Yes, if they perform actions like changing settings or inviting users. Just viewing reports is not billable.
 
-## Workspace Auditor Role
+### Workspace Auditor Role
 
 - **What can they do:** Workspace Auditors can see all reports, make comments, and export them. They can also mark reports as reimbursed if they're the final approver.
 - **Who is it for:** Accountants, bookkeepers, and internal or external audit agents who need to view but not edit workspace settings.
 - **Billable:** Yes, if they perform any actions like commenting or exporting a report. Viewing alone doesn't incur a charge.
 
-## Technical Contact
+### Technical Contact
 
 - **What can they do:** In case of connection issues, alerts go to the billing owner by default. You can set a technical contact if you want alerts to go to an IT administrator instead.
 - **How to set one:** Go to **Settings > Workspaces > Group > [Workspace Name] > Connections > Technical Contact**.

docs/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate.md

@@ -1,8 +1,54 @@
 ---
-title: Coming Soon
-description: Coming Soon
+title: Vacation Delegate
+description: In Expensify, a vacation delegate is someone you choose to act on your behalf when you're on vacation or taking personal time off. 
 ---
-## Resource Coming Soon!
+
+# Overview
+
+A delegate is someone who can handle approving expense reports for you, which is especially useful when you're out of the office!
+
+In Expensify, a **Vacation Delegate** is someone you choose to act on your behalf when you're on vacation or taking personal time off. They will approve expense reports just like you would, and everything moves forward as usual afterward.
+
+The system keeps a detailed audit trail, showing exactly when your delegate stepped in to approve a report for you. And if your delegate also goes on vacation, they can have their own delegate, so reports keep getting approved.
+
+By using this feature, you ensure that all reports get the approvals they need, even when you're not around.
+
+# How to use Vacation Delegate
+
+If you're planning to take some time off, you can use the **Vacation Delegate** feature to assign someone to approve expense reports for you. The reports will continue on their usual path as if you had approved them yourself.
+
+## Set a Vacation Delegate for yourself
+
+1. Go to the Expensify website (note: you can't do this from the mobile app).
+2. Navigate to **Settings > Your Account > Account Details** and scroll down to find **Vacation Delegate**.
+3. Enter the email address of the person you're designating as your delegate and click **Set Delegate**.
+
+Voila! You've set a vacation delegate. Any reports that usually come to you will now go to your delegate instead. When you return, you can easily remove the delegate by clicking a link at the top of the Expensify homepage.
+
+## Setting a Vacation Delegate as a Domain Admin
+
+1. Head to **Settings > Domains > [Your Domain Name] > Domain Members > Edit Settings**
+2. Enter the delegate's email address and click **Save.**
+
+Your delegate's actions will be noted in the history and comments of each report they approve, so you can keep track of what happened while you were away.
+
+# Deep Dive 
+
+## An audit trail of delegate actions
+
+The system records every action your vacation delegate takes on your behalf in the **Report History and Comments**. So, you can see when they approved an expense report for you. 
+
+# FAQs
+
+## Why can't my Vacation Delegate reimburse reports that they approve? 
+
+If your **Vacation Delegate** also needs to reimburse reports on your behalf whilst you're away, they'll also need access to the reimbursement account.
+
+If they do not have access to the reimbursement account used on your workspace, they won’t have the option to reimburse reports, even as your **Vacation Delegate**. 
+
+## What if my Vacation Delegate is also on vacation?
+
+Don't worry, your delegate can also pick their own **Vacation Delegate**. This way, expense reports continue to get approved even if multiple people are away.
+
 
 
-Kayak.md Lyft.md TrainLine.md TravelPerk.md Trip Actions.md TripCatcher.md Uber.md