Merge branch 'main' into fix/28007-city-field-is-not-clear-when-selec…

…t-another-country

.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 1001037512
+ versionName "1.3.75-12"
  }
 
  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 receipts@expensify.com 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/Individual-Users.md

@@ -1,5 +1,43 @@
 ---
 title: Individual Users
-description: Individual Users
+description: Learn how Expensify can help you track and submit your personal or self-employed business expenses. 
 ---
-## Resource Coming Soon!
+# Overview
+If you're an individual using Expensify, the Track and Submit plans are designed to assist self-employed users in effectively managing both their personal and business finances.
+
+# How to use the Track plan
+
+The Track plan is tailored for solo Expensify users who don't require expense submission to others. Individuals or sole proprietors can choose the Track plan to customize their Individual Workspace to align with their personal expense tracking requirements.
+
+You can select the Track plan from the Workspace settings. Navigate to **Settings > Workspace > Individual > *[Workspace Name]* > Plan** to select Track. 
+You can also do this from the Pricing page at https://www.expensify.com/pricing.
+
+The Track plan includes a predefined set of categories designed to align with IRS Schedule C expense categories. However, you have the flexibility to add extra categories as needed. For a more detailed breakdown, you can also set up tags to create another layer of coding.
+
+The Track plan offers 25 free SmartScans per month. If you require more than 25 SmartScans, you can upgrade to a Monthly Individual subscription at a cost of $4.99 USD per month.
+
+# How to use the Submit plan
+The Submit plan is designed for individuals who need to keep track of their expenses and share them with someone else, such as their boss, accountant, or even a housemate. It's specifically tailored for single users who want to both track and submit their expenses efficiently.
+
+You can select the Track plan from the Workspace settings. Navigate to **Settings > Workspaces > Individual > *[Workspace Name]* > Plan** to select "Submit" or from the Pricing page at https://www.expensify.com/pricing.
+
+You will select who your expenses get sent to under **Settings > Workspace > Individual > *[Workspace Name]* > Reports**. If the recipient already has an Expensify account, they'll be able to see the report directly in the Expensify app. Otherwise, non-Expensify users will receive a PDF copy of the report attached to the email so it can be processed.
+
+The Submit plan includes a predefined set of categories designed to align with IRS Schedule C expense categories. However, you have the flexibility to add extra categories as needed. For a more detailed breakdown, you can also set up tags to create another layer of coding.
+
+The Submit plan offers 25 free SmartScans per month.If you require more than 25 SmartScans, you can upgrade to a Monthly Individual subscription at a cost of $4.99 USD per month.
+
+# FAQ
+
+## Who should use the Track plan?
+An individual who wants to store receipts, look to track spending by category to help with budgeting and a self-employed user who needs to track receipts and mileage for tax purposes.
+
+## Who should use the Submit plan?
+An individual who seeks to utilize the features of the track plan to monitor their expenses while also requiring the ability to submit those expenses to someone else.
+
+## How can I keep track of personal and business expenses in the same account? 
+You have the capability to create distinct "business" and "personal" tags and assign them to your expenses for proper categorization. By doing so, you can effectively code your expenses based on their nature. Additionally, you can utilize filters to ensure that you only view the expenses that are relevant to your specific needs, whether they are business-related or personal.
+
+## How can I export expenses for tax purposes? 
+From the expense page, you have the option to select all of your expenses and export them to a CSV (Comma-Separated Values) file. This CSV file can be conveniently imported directly into your tax software for easier tax preparation.
+

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/integrations/HR-integrations/Zenefits.md

@@ -1,5 +1,39 @@
 ---
-title: Coming Soon
-description: Coming Soon
+title: Zenefits Integration
+description: Automatically sync employees between Zenefits and Expensify
 ---
-## Resource Coming Soon!
+# How the Zenefits integration works with Expensify
+
+Expensify's direct integration with Zenefits will automatically:
+- **Create new Expensify accounts** for full-time, active employees when they're hired
+- **Update the approval workflow in Expensify** based on any changes in Zenefits
+- **Deprovision an employee's Expensify account** upon Zenefits termination date
+
+# How to connect the Zenefits integration
+## Before connecting Expensify with Zenefits, please review the prerequisites:
+
+- You must be an admin in Zenefits and in Expensify to establish the integration
+- You must have a Control or Collect workspace in Expensify to integrate with Zenefits. If you do not, you'll be given the opportunity to upgrade to Control or Collect during the integration setup.
+- Every employee record in Zenefits must have a work email address since we use this as the unique identifier in Expensify. 
+- Zenefits will add all your employees to one Expensify workspace. If your company uses multiple Expensify workspaces, you'll be given the option to choose which workspace to connect to when you're setting up the integration.
+
+## To connect your Expensify workspace to Gusto:
+
+1. Navigate to **Settings > Workspaces > Group > _[Workspace Name]_ > Connections**
+2. Scroll down to HR Integrations, click the **Connect to Zenefits** radio button, then click **Sync with Zenefits**
+3. Login to your Zenefits account using your Zenefits admin credentials and authorize Expensify to access your Zenefits account.
+4. If you want to exclude an individual user from syncing with Expensify, make your selections before clicking **Authorize**
+
+## To configure the connection:
+
+1. Select the Approval Workflow that works best for your team:
+ - **Basic Approval:** Each employee will submit expense reports to one final approver. By default, the final approver is the workspace's Billing Owner.
+ - **Manager Approval:** Expense reports will first be submitted to each employee's direct manager, and then forwarded to one final approver. By default, the final approver is the workspace's Billing Owner.
+ - **Configure Manually:** Use the members table to manually configure how employees submit reports. In this case, you're choosing to not import an employee's manager. You will need to set and update the approval workflow for each employee manually. If your team has a highly complex approval workflow, this option will allow for multi-tiered approval chains.
+
+# Zenefit integration FAQs
+## Will this notify my employees?
+Each employee will receive a welcome email at their work email address along with a request to validate their account and choose a password. They can also download our mobile app for iOS and Android devices. Please note that there is no way to disable the welcome email.
+
+## Should I connect the integration from Expensify or from Zenefits?
+It's totally up to you! You'll have the same options available to you when syncing from either product.