Skip to content

Commit 84e2456

Browse files
committed
merge main
2 parents 5935c96 + 0d83ebf commit 84e2456

File tree

235 files changed

+2428
-1595
lines changed

Some content is hidden

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

235 files changed

+2428
-1595
lines changed

.well-known/assetlinks.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
"target": {
1212
"namespace": "android_app",
1313
"package_name": "org.me.mobiexpensifyg",
14-
"sha256_cert_fingerprints": ["87:03:DC:2B:20:99:CB:F7:AF:39:0C:8F:F2:E4:78:F2:61:E9:D1:7E:F4:AF:E5:02:D9:72:F2:4D:1F:29:FF:65"]
14+
"sha256_cert_fingerprints": [
15+
"87:03:DC:2B:20:99:CB:F7:AF:39:0C:8F:F2:E4:78:F2:61:E9:D1:7E:F4:AF:E5:02:D9:72:F2:4D:1F:29:FF:65",
16+
"70:49:D6:9F:CC:6F:7E:B1:E6:4D:65:93:E6:29:80:E1:A7:E7:6D:FA:95:86:C9:8D:2F:29:43:F1:78:BF:40:55"
17+
]
1518
}
1619
}]

Mobile-Expensify

__mocks__/reportData/connections.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const syncOptions: NetSuiteConnectionConfig['syncOptions'] = {
2525

2626
const netSuiteConnection: Pick<Connections, 'netsuite'> = {
2727
netsuite: {
28+
// cspell:disable-next-line
2829
accountID: 'TESTACC68486',
2930
config: {
3031
autoSync: {
@@ -169,7 +170,7 @@ const netSuiteConnection: Pick<Connections, 'netsuite'> = {
169170
{
170171
171172
id: '3',
172-
name: 'Jesse Pinkman, Inc.',
173+
name: 'Jesse Pink Man, Inc.',
173174
},
174175
],
175176
},

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 1009014705
118-
versionName "9.1.47-5"
117+
versionCode 1009014906
118+
versionName "9.1.49-6"
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"
File renamed without changes.
File renamed without changes.
File renamed without changes.

cspell.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@
281281
"LDFLAGS",
282282
"LHNGBR",
283283
"LIBCPP",
284+
"libexec",
284285
"licence",
285286
"LIGHTBOXES",
286287
"Limpich",
@@ -308,6 +309,7 @@
308309
"mediumitalic",
309310
"memberof",
310311
"metainfo",
312+
"metatags",
311313
"microtime",
312314
"Microtransaction",
313315
"microtransactions",
@@ -404,6 +406,7 @@
404406
"payrollcode",
405407
"pbxproj",
406408
"pdfreport",
409+
"pdfs",
407410
"Perfetto",
408411
"persistable",
409412
"Pettinella",
@@ -475,6 +478,7 @@
475478
"RNVP",
476479
"Rosiclair",
477480
"rpartition",
481+
"rstrip",
478482
"RTER",
479483
"s3uqn2oe4m85tufi6mqflbfbuajrm2i3",
480484
"SAASPASS",

docs/articles/expensify-classic/domains/Domain-Migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords: [Expensify Classic, domain migration, change email address, update com
66

77
<div id="expensify-classic" markdown="1">
88

9-
If your company updates its email domain (e.g., from `@olddomain.com` to `@newdomain.com`), Expensify offers two migration options: **automatic** and **manual**. This guide walks you through both.
9+
If your company updates its email domain (e.g., from `@old-domain.com` to `@new-domain.com`), Expensify offers two migration options: **automatic** and **manual**. This guide walks you through both.
1010

1111
**Important:** If your company uses the Expensify Card, do not request cards or create a new domain manually. Contact the Concierge or your Account Manager to have Expensify handle the migration.
1212

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
@@ -97,7 +97,7 @@ You can flag rule violations for:
9797
- **Expense violations** – Set limits and thresholds.
9898
- **Cash expenses** – Define policies.
9999
- **Rebilling** – Enable/disable rebilling.
100-
- **eReceipts** – Turn on automatic receipts for non-loding expenses under $75 (_**Note:** eReceipts are IRS-compliant for expenses under $75. Additionally, all lodging expenses require a paper receipt_.
100+
- **eReceipts** – Turn on automatic receipts for non-loading expenses under $75 (_**Note:** eReceipts are IRS-compliant for expenses under $75. Additionally, all lodging expenses require a paper receipt_.
101101
- **Receipt visibility** – Set access controls.
102102
- **Time expenses** – Enable time tracking if needed.
103103
3. Go to **Settings > Workspace > [Workspace Name] > Distance rates** to set mileage reimbursement rates.
Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,118 @@
11
---
2-
title: billing-and-subscriptions.md
2+
title: Billing and Subscriptions
33
description: Understand how Collect and Control plans are billed in Expensify, including pricing tiers, eligibility, and how to transfer billing ownership.
4-
keywords: [billing, subscription, pricing, collect plan, control plan, expensify card, billing owner, workspace billing, transfer billing]
4+
keywords: [New Expensify, subscription, pricing, collect plan, control plan, transfer billing]
55
---
66
<div id="new-expensify" markdown="1">
77

8-
Here’s everything you need to know about how Expensify bills for Collect and Control plans. Learn how pricing works, who gets billed, and how to transfer billing ownership.
8+
Expensify offers two plans: **Collect** and **Control**:
9+
- **Collect** is ideal for small teams that need a simple way to track receipts and get reimbursed.
10+
- **Control** is built for growing businesses that want more control over spending, smoother approvals, and automated workflows.
911

10-
# Billing and subscriptions
12+
For a full breakdown, visit the [Expensify pricing page](https://www.expensify.com/pricing).
1113

12-
Expensify has two plans: Collect and Control.
13-
14-
Collect is perfect for small teams that need an easy way to track receipts and get reimbursed, while Control is built for growing businesses that want more control over spending, smoother approvals, and smarter policy automation. For a full breakdown of features across plans, visit [the Expensify pricing page](https://www.expensify.com/pricing).
14+
---
1515

16-
## Collect plan
16+
# Collect Plan
1717

18-
### 💵 Pricing
18+
## 💵 Pricing
1919

20-
- $5 per **unique member** per month
21-
- Fully month-to-month (no annual contracts)
20+
- $5 per **unique member** per month
21+
- Fully month-to-month no annual contracts
2222

23-
### 👤 Who gets billed
23+
## 👤 Who gets billed
2424

2525
- Every **unique member** added to a workspace, regardless of activity
2626

27-
### 💳 Expensify Card not required
27+
## 💳 Expensify Card not required
2828

29-
- You do **not** need to use the Expensify Card to access this pricing
30-
- However, 1% cash back still applies if you do use it
29+
- The Expensify Card is optional, but using it earns **1% cash back** on US purchases
3130

32-
### 📅 Eligibility
31+
## 📅 Eligibility
3332

3433
- Applies to new Collect customers whose **first workspace** was created on or after **April 1, 2025**
3534

36-
### 🌍 Localized pricing
35+
## 🌍 Localized pricing
3736

38-
- Equivalent pricing available in **GBP**, **AUD**, and **NZD**
37+
- Pricing available in **GBP**, **AUD**, and **NZD**
3938

40-
### 🔄 Flexible scaling
39+
## 🔄 Flexible scaling
4140

42-
- Add or remove members anytime — your bill automatically adjusts each month
41+
- Add or remove members anytime — your bill automatically adjusts monthly
4342

44-
### 🧾 Receipts
43+
## 🧾 Receipts
4544

46-
- Receipts show: `X Collect members @ $5.00`
47-
- View receipts under `Settings > Account > Subscription > Billing History`
45+
- Your billing receipts show: `X Collect members @ $5.00`
46+
- View them in **Workspaces > Subscription**
4847

4948
---
5049

51-
## Control plan
50+
# Control Plan
5251

53-
### 💸 Best way to save
52+
## 💸 Best Way to Save
5453

55-
- Combine an **annual subscription** with the **Expensify Visa® Commercial Card**
56-
- Price: **$9 per active member/month**
54+
- Pair an **Annual Subscription** with the **Expensify Visa® Commercial Card**
55+
- Pricing: **$9 per active member/month**
5756

58-
**To qualify:**
59-
Use the Expensify Card for **50% or more** of your total settled **US spend** for the month
57+
**To qualify:** Use the Expensify Card for **50% or more** of your total settled **US spend** in the month
6058

61-
**Bonus:**
62-
Earn **1%–2% cash back**
63-
- 1% for all US purchases
64-
- 2% if monthly spend reaches **$250,000+**
65-
- Cash back is applied to your bill first, then to your bank
59+
**Bonus:**
60+
- Earn up to **2% cash back**
61+
- 1% for all US purchases
62+
- 2% if monthly spend reaches **$250,000+**
63+
- Cash back is applied to your Expensify bill first, then to your bank account
6664

6765
👉 Use the [savings calculator](https://use.expensify.com/resource-center/tools/savings-calculator) to estimate your monthly savings.
6866

69-
### 📅 Annual subscription only
67+
## 📅 Annual Subscription
7068

71-
- Without card usage, pricing is **$18 per active member/month**
72-
- Add users anytime (extends your term)
73-
- You can only reduce users after your current term ends
74-
- Extra users above your committed quantity are billed at **$36/month**
69+
- Without card usage: **$18 per active member/month**
70+
- Add users anytime (this extends your commitment term)
71+
- Reduce users only after your current term ends
72+
- Extra users over your committed amount: **$36/month**
7573

76-
### 🔁 Pay-per-use (no commitment)
74+
## 🔁 Pay-per-use (No Commitment)
7775

78-
- Price: **$36 per active member/month**
79-
- This option allows flexibility without a long-term commitment
76+
- Price: **$36 per active member/month**
77+
- Best for flexible teams with fluctuating membership
8078

81-
### 👤 Who gets billed
79+
## 👤 Who Gets Billed
8280

83-
- Every **active member** (anyone who creates, submits, approves, reimburses, or exports reports during the month)
81+
- Every **active member** (anyone who creates, submits, approves, reimburses, or exports reports)
8482
- Includes Copilots and automated Concierge actions
8583

86-
### 💳 Expensify Card access
84+
## 💳 Expensify Card Access
8785

88-
- Required for discounted pricing
89-
- Cashback still applies even if discounted rate isn’t reached
86+
- Required for discounted pricing
87+
- Cash back applies even if the discount threshold isn't met
9088

91-
### 🌍 Localized pricing
89+
## 🌍 Localized Pricing
9290

93-
- Equivalent pricing available in **GBP**, **AUD**, and **NZD**
91+
- Available in **GBP**, **AUD**, and **NZD**
9492

95-
### 🧾 Receipts
93+
## 🧾 Receipts
9694

97-
- View billing receipts at `Settings > Account > Subscription > Billing History`
98-
- We recommend having **one billing owner** per workspace
95+
- View billing receipts under **Workspaces > Subscription**
96+
- Each workspace can only have **one billing owner**
9997

10098
---
10199

102-
## Transfer billing ownership
100+
# Transfer Billing Ownership
103101

104-
To change the billing owner of a workspace:
102+
To transfer billing ownership of a workspace:
105103

106-
1. Ensure the new billing owner is a **Workspace Admin**
107-
2. Go to: `Settings > Workspaces > [Workspace Name] > Members`
108-
3. Click the name of the **current billing owner**
109-
4. Select **Transfer Ownership**
110-
5. The new owner adds a payment card and will be billed starting the 1st of the next month
104+
1. Make sure the new billing owner is a **Workspace Admin**
105+
2. Use the **left-hand navigation bar (LHB)** to go to: **Workspaces > [Workspace Name] > Members**
106+
3. Click the current billing owner’s name
107+
4. Select **Transfer Ownership**
108+
5. The new owner will need to add a payment card and will be billed starting on the 1st of the next month
111109

112110
---
113111

114112
# FAQ
115113

116114
## Why am I being charged more than $5 per user for a Collect plan?
117115

118-
The Collect plan pricing changed in **April 2025**. If your first workspace was created **before April 1, 2025**, your billing is based on the **previous pricing structure**. Reach out to **Concierge or your Account Manager** in chat if you need help understanding your charges.
116+
If your first workspace was created **before April 1, 2025**, your billing follows our previous pricing structure. If you need help understanding your charges, reach out to **Concierge** or your **Account Manager** via chat.
119117

120118
</div>
Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
---
2-
title: Changing-Your-Workspace-Plan.md
2+
title: Change Workspace Plan
33
description: Learn how to update your Expensify workspace subscription, downgrade to a free account, or delete your workspace with step-by-step instructions.
4-
keywords: [New Expensify, workspace plan, subscription, downgrade, cancel subscription, delete workspace, company cards, reactivation, cancel workspace subscription]
4+
keywords: [New Expensify, workspace plan, subscription, downgrade, cancel subscription, delete workspace]
55
---
66
<div id="new-expensify" markdown="1">
77

8-
Learn how to update your Expensify workspace subscription, downgrade to a free account, or delete your workspace.
8+
Take a look at this resource to learn how to update your Expensify workspace subscription, downgrade to a free account, or delete your workspace entirely.
99

10-
# How to change your subscription on a Group plan
10+
---
11+
12+
# Change Your Subscription
1113

12-
To change your subscription:
14+
To update your subscription plan:
1315

14-
1. Go to **Settings > Account > Subscription**.
15-
2. Click **Explore all plans** and select your preferred plan.
16+
1. Use the **left-hand navigation bar (LHB)** to go to **Workspaces > Subscription**.
17+
2. Click **Explore all plans** and choose the one that best fits your needs.
1618

1719
---
1820

19-
# How to downgrade to a free account from a subscription
21+
# Downgrade from an Annual Subscription to a Free Account
2022

21-
If you're on an Annual Subscription (a 12-month commitment), you may be eligible to request an early cancellation:
23+
If you're on an Annual Subscription (a 12-month commitment), you may be eligible to request early cancellation and switch to a free account:
2224

23-
1. Go to **Settings > Account > Workspaces**.
24-
2. Click **Subscription**.
25-
3. Select **Request early cancellation**.
25+
1. Use the **left-hand navigation bar** to go to **Workspaces > Subscription**.
26+
2. Click **Request early cancellation**.
2627

2728
**Note:** Early cancellations are subject to eligibility review.
2829

2930
---
3031

31-
# How to downgrade from a Pay Per Use plan
32+
# Delete a Workspace
3233

33-
To downgrade from a Pay Per Use plan:
34+
If you're on a Pay-per-use plan and want to switch to a free account:
3435

35-
1. Go to **Settings > Account > Workspaces**.
36-
2. Click the three dots **(⋮)** next to the workspace name and select **Delete workspace**.
36+
1. Go to **Workspaces > Subscription**.
37+
2. Click the three dots **(⋮)** next to your workspace name.
38+
3. Select **Delete workspace**.
3739

38-
**Note:** Deleting your workspace does not delete your personal account or expenses.
40+
**Note:** Deleting your workspace will not remove your personal account or expenses.
3941

4042
---
4143

@@ -45,17 +47,12 @@ To downgrade from a Pay Per Use plan:
4547

4648
No. Expensify retains your expenses and reports even if your workspace is deleted. Your data is only removed if you close your entire Expensify account.
4749

48-
---
49-
5050
## Can I reopen a deleted workspace?
5151

52-
No. Once a workspace is deleted, it cannot be reopened or reactivated. You would need to create a new workspace to continue using Expensify with a group setup.
53-
54-
---
52+
No. Once a workspace is deleted, it cannot be reopened or reactivated. To use Expensify again with a group setup, you'll need to create a new workspace.
5553

5654
## What happens to company cards if I delete a workspace?
5755

58-
Deleting a workspace will permanently remove workspace-specific settings like company cards. However, your expenses and reports will remain unless you close your entire Expensify account.
59-
56+
Deleting a workspace will permanently remove workspace-specific settings like company cards. However, your expenses and reports will remain unless you close your Expensify account entirely.
6057

6158
</div>

0 commit comments

Comments
 (0)