Skip to content

Commit 5e6f715

Browse files
committed
Merge branch 'main' of github.com:Expensify/App into jsenyitko-reenable-export
2 parents 98ccbe8 + 94abb71 commit 5e6f715

166 files changed

Lines changed: 2893 additions & 1494 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/deployNewHelp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# v4
5959
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
6060
with:
61-
node-version: '20.19.1'
61+
node-version-file: '.nvmrc'
6262

6363
# Wil install the _help/package.js
6464
- name: Install Node.js Dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.1
1+
20.19.3

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009017911
118-
versionName "9.1.79-11"
117+
versionCode 1009018003
118+
versionName "9.1.80-3"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@
455455
"positionMillis",
456456
"Postharvest",
457457
"Postproduction",
458+
"Powerform",
459+
"POWERFORM",
458460
"Précédent",
459461
"precheck",
460462
"Precheck",

docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To connect Xero with Expensify, you must:
2020

2121
Follow these steps to set up the Xero integration:
2222

23-
1. Click **Settings** in the bottom left menu.
23+
1. Click **Settings** in the left-side navigation menu.
2424
2. Navigate to **Workspaces > [Workspace Name] > Accounting**.
2525
3. Click **Connect to Xero**.
2626
4. Click **Create a New Xero Connection**.

docs/articles/expensify-classic/getting-started/Create-a-Company-Workspace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ You can flag rule violations for:
104104
4. Set custom report names for consistency.
105105
5. Set the workspace **default currency** under **Settings > Workspace > [Workspace Name] > Overview > Default currency**.
106106
6. Go to **Settings > Workspace > [Workspace Name] > Workflows** to configure:
107-
- **Delayed submission** – Auto-submit based on a set schedule.
107+
- **Delay submission** – Auto-submit based on a set schedule.
108108
7. Go to **Settings > Workspace > [Workspace Name] > Report fields** to customize reports or invoices.
109109
8. Click the **Travel** tab to define flight class or hotel preferences.
110110
9. Use the **Per diem** tab to import location-specific expense rules.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ Set workspace-wide compliance policies under **Settings > Workspace > [Workspace
8080

8181
---
8282

83-
# Step 7: Enable Delayed Submission
83+
# Step 7: Enable Delay Submission
8484

85-
Automate expense submissions with **Delayed Submission**:
86-
1. Go to **Settings > Workspace > [Workspace Name] > Workflows > Delayed submission**.
87-
2. Enable **Delayed submission*** and set the frequency to **Daily**.
85+
Automate expense submissions with **Delay Submission**:
86+
1. Go to **Settings > Workspace > [Workspace Name] > Workflows > Delay submission**.
87+
2. Enable **Delay submission*** and set the frequency to **Daily**.
8888

8989
---
9090

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

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Expensify Playbook for US-Based Bootstrapped Startups
33
description: Learn best practices for using Expensify as a bootstrapped startup with fewer than five employees.
44
keywords: [Expensify, startup, bootstrapped, expense tracking, reimbursement, workspace]
55
---
6+
67
<div id="expensify-classic" markdown="1">
78

89
This playbook outlines best practices for bootstrapped startups with fewer than five employees to use Expensify efficiently. The goal is to focus on product development while seamlessly capturing business-related receipts for future reimbursement.
@@ -13,27 +14,26 @@ This playbook outlines best practices for bootstrapped startups with fewer than
1314
# Who You Are
1415
As a bootstrapped startup, you work with a small, trusted team and are focused on developing your concept. You may be self-funding or have limited support from friends and family. While the company isn’t profitable yet, you’re tracking expenses now to reimburse yourself later when you secure investment or generate revenue.
1516

17+
---
18+
1619
# Setting Up Expensify Step-by-Step
1720
This guide is based on best practices from processing expenses for thousands of companies. Use it as a starting point, knowing you can customize Expensify to fit your business needs.
1821

19-
## Step 1: Create an Expensify Account
20-
If you don’t have an account yet, sign up at [new.expensify.com](https://new.expensify.com) using your business email.
22+
---
2123

22-
## Step 2: Create a Workspace
23-
Expensify offers three plans (Individual, Collect and Control). We outline the features of both plans in our [pricing article](https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing), but for your needs, we recommend the Collect workspace for the following situations:
24+
# Step 1: Create a Workspace
25+
Expensify offers three plans (Individual, Collect, and Control). We outline the features of both plans in our [pricing article](https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing), but for your needs, we recommend the Collect workspace for the following situations:
2426

25-
- You are looking to capture receipts, but you don’t need an advanced approval workflow. Instead you can have a single approver for all expenses.
26-
- You are a small, highly collaborative group and project-oriented Chat functionality can help you stay organized.
27-
- When your business produces enough cash that you can pay yourself, you might want to reimburse yourself for the expenses you’ve captured.
27+
- You want to capture receipts, but you don’t need an advanced approval workflow. Instead, you can have a single approver for all expenses.
28+
- You are a small, highly collaborative group, and project-oriented Chat functionality can help you stay organized.
29+
- When your business produces enough cash that you can pay yourself, you might want to reimburse yourself for the expenses you’ve incurred.
2830

2931
Expensify provides you with direct access to lightning-fast 24/7 support via Concierge. Within *[new.expensify.com](https://new.expensify.com/concierge)*, you can start a direct message (DM) with Concierge to discuss which plan might be better for your business.
3032

31-
## Step 3: Invite Your Team
33+
# Step 2: Invite Your Team
3234
As a bootstrapped startup, you communicate with your team all day. Similarly, if you are a co-founder, you will have multiple people who will need to capture receipts for your project.
3335

34-
1. Click your profile photo or icon in the bottom left menu
35-
2. Click on your workspace
36-
3. From the workspace view, click **Members** on the left
36+
1. From the left-side navigation menu, click **Settings > Workspaces > [Workspace Name] > Members**
3737
4. Click **Invite member**
3838
5. Use the search field to find the individual by name, email, or phone number. Note: You can select multiple people
3939
6. Click **Next**
@@ -42,13 +42,17 @@ As a bootstrapped startup, you communicate with your team all day. Similarly, if
4242

4343
Inviting your team grants them unlimited receipt capture via SmartScan and access to Expensify’s free chat tool for seamless collaboration.
4444

45-
## Step 4: Link Your Business Bank Account (Optional)
45+
---
46+
47+
# Step 3: Link Your Business Bank Account (Optional)
48+
49+
If you are located in the US, you can unlock many great features by linking your US-based business bank account. For example, you can use the [Expensify Visa® Commercial Card](https://help.expensify.com/articles/new-expensify/expensify-card/Set-up-the-Expensify-Card) to streamline expense management and receive additional discounts and company perks.
4650

47-
If you are located in the US, you can unlock many great features by linking your US-based business bank account such as using the [Expensify Visa® Commercial Card](https://help.expensify.com/articles/new-expensify/expensify-card/Set-up-the-Expensify-Card) to streamline expense management and receive additional discounts and company perks.
51+
To set up a business bank account, follow the steps in this [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account).
4852

49-
To setup a business bank account, follow the steps in this [help article](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account).
53+
---
5054

51-
## Step 5: Get the Expensify Visa® Commercial Card
55+
# Step 4: Get the Expensify Visa® Commercial Card
5256
After linking your business bank account, you’re eligible for the Expensify Card. The card offers:
5357

5458
- **1% cash back** on all US purchases (2% if spending exceeds $250K/month).
@@ -67,24 +71,12 @@ To enable the Expensify Card:
6771

6872
A virtual card is available for immediate use, and a physical card will arrive in 1-3 business days. The Expensify Card is accepted anywhere Visa is.
6973

70-
## Step 6: View and Pay Bills
71-
If you have vendors or services essential to growing your project, you can pay bills directly through Expensify after linking your bank account.
72-
73-
Expensify provides you with a *_yourdomain.com@expensify.com_* email address. Have vendors send bills to this address for automatic organization.
74-
75-
To view and pay bills:
76-
77-
1. Click your profile photo or icon in the bottom left menu
78-
2. Select *Workspaces*.
79-
3. Click your workspace.
80-
4. Select **Bills**.
81-
82-
Click **View all bills** under the *Manage your bills* section to see an organized list of pending bills, which you can pay via ACH directly from Expensify.
74+
---
8375

8476
# You’re All Set!
8577
Congratulations! Your Expensify setup is complete. If you need assistance:
8678

87-
- Message Concierge anytime at [new.expensify.com/concierge](https://new.expensify.com/concierge).
79+
- Message Concierge support anytime!
8880
- Email concierge@expensify.com.
8981
- Upgrade to a Collect or Control Workspace to be assigned a dedicated Setup Specialist.
9082

docs/articles/expensify-classic/reports/Automatically-submit-employee-reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ By setting a submission schedule for your workspace, expenses are automatically
1414

1515
When an employee creates an expense, it's automatically added to a report. If no report exists, a new one is created. Reports are then submitted according to the schedule you choose—daily, weekly, monthly, twice per month, by trip, or manually.
1616

17-
**Note:** If you're using **Delayed Submissions** and an expense has a violation, it won't be submitted until the violation is fixed. That expense is removed from the current report and added to a new open report.
17+
**Note:** If you're using **Delay Submissions** and an expense has a violation, it won't be submitted until the violation is fixed. That expense is removed from the current report and added to a new open report.
1818

1919
---
2020

0 commit comments

Comments
 (0)