Skip to content

Commit f474f9a

Browse files
DylanDylannDylanDylann
committed
Merge branch 'main' into release-1-set-pin
2 parents faceaf4 + f43469c commit f474f9a

149 files changed

Lines changed: 3781 additions & 2359 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.

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009033501
115-
versionName "9.3.35-1"
114+
versionCode 1009033600
115+
versionName "9.3.36-0"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

‎docs/articles/expensify-classic/expenses/Expense-Rules.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
title: Expense Rules
33
description: Automatically categorize, tag, and report expenses based on the merchant's name.
44
keywords: [Expense Rules, individual automation, expense rule setup, personal rules, Classic, reimbursement settings]
5-
internalScope: Audience is individual members. Covers setting up and managing personal expense rules at the account level. Does not cover workspace-level enforcement, or accounting integration configuration.
5+
internalScope: Audience is individual members. Covers setting up and managing personal expense rules at the account level. Does not cover Workspace Merchant Rules, workspace-level enforcement, or accounting integration configuration.
66
---
77

88
Expense rules in Expensify help automate the categorization, tagging, and reporting of expenses based on merchant names, reducing manual work. By setting up these rules at the account level, employees can streamline expense management and ensure consistency across reports.
99

1010
**Note:** These are **personal expense rules** that apply only to your individual account.
1111

12+
Workspace Admins who need to enforce merchant-based coding across all workspace members can set up [**Workspace Merchant Rules**](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules), which apply to all expenses but can only be configured in New Expensify.
13+
1214
---
1315

1416
# Create an Expense Rule

‎docs/articles/new-expensify/reports-and-expenses/Create-an-Expense.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ If you're submitting expenses for a personal payment, you can send them directly
2323

2424
You can create an expense by scanning a receipt, entering details manually, or tracking distance. The steps below walk you through each method so you can quickly capture and submit expenses for reimbursement or record-keeping.
2525

26+
**Note:** When creating an expense, Workspace Merchant Rules set by your workspace may automatically apply categories, tags, descriptions, reimbursable status, billable status, and other fields based on the merchant name.
27+
2628
## How to use SmartScan to create an expense
2729

2830
**On mobile:**
@@ -122,6 +124,7 @@ The total amount will be calculated automatically using the hourly rate set for
122124
## What happens after submitting an expense to a workspace
123125

124126
- Expenses are automatically added to a report.
127+
- [Workspace Merchant Rules](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules) may automatically apply categories, tags, descriptions, and other coding based on the merchant name.
125128
- Workspace rules check for violations or missing fields.
126129
- Approvers are notified to review and approve.
127130
- Reports can be submitted manually or automatically.

‎docs/articles/new-expensify/workspaces/Create-expense-categories.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ Expensify learns your category preferences over time and suggests them automatic
114114
- Existing expenses are not updated retroactively.
115115
- These suggestions are based on patterns and may vary by user.
116116

117+
## Workspace Merchant Rules
118+
119+
Workspace Admins can configure [**Workspace Merchant Rules**](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules) to apply consistent categories based on merchant name across all workspace members.
120+
121+
- Rules apply across all expenses on the workspace.
122+
- Rules take precedence over learned suggestions.
123+
- If a category is already set manually, Expensify won't override it.
124+
117125
---
118126

119127
# FAQ

‎docs/articles/new-expensify/workspaces/Workspace-Merchant-Rules.md‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
---
2+
title: Workspace Merchant Rules
3+
description: Learn how to enable and use Workspace Merchant Rules to automatically apply consistent expense coding based on the merchant name.
4+
keywords: [New Expensify, workspace merchant rules, merchant rules, auto-categorize by merchant, expense automation, expense rules, workspace settings]
5+
internalScope: Audience is Workspace Admins on the Control plan. Covers enabling and using Workspace Merchant Rules to apply consistent expense coding based on merchant name. Does not cover personal expense rules, Category Rules, Tag Rules, or troubleshooting rule conflicts.
6+
---
7+
8+
Enable Workspace Merchant Rules to help Workspace Admins standardize how expenses from common merchants are coded across the workspace. These rules automatically apply consistent categories, tags, and other expense fields based on the merchant name, reducing manual cleanup and improving reporting accuracy.
9+
10+
These rules work in New Expensify, can only be configured in New Expensify, and apply consistently across all workspace members.
11+
12+
---
13+
14+
# How to create Workspace Merchant Rules
15+
16+
To create a Workspace Merchant Rule:
17+
18+
1. In the **navigation tabs** (on the left on web, and at the bottom on mobile), click **Workspaces**.
19+
2. Click your **workspace name**.
20+
3. Click **Rules**, then **Expenses**.
21+
4. Scroll to the **Merchant** section.
22+
5. Click **Add merchant rule**.
23+
6. Enter the merchant name and choose how it should match:
24+
- **Contains**
25+
- **Matches exactly**
26+
7. Select the fields you want the rule to update:
27+
- **Merchant** to update the merchant name.
28+
- **Category** to update the expense category.
29+
- **Tag** to update the expense tag.
30+
- **Tax** to update the tax rate (Tax must be enabled on the workspace).
31+
- **Description** to update the expense description.
32+
- **Reimbursable** to update whether the expense is reimbursable or non-reimbursable.
33+
- **Billable** to update whether the expense is billable or non-billable (Billable must be enabled on the workspace).
34+
8. Select whether the rule should be applied to existing unsubmitted expenses and preview matches (optional).
35+
9. Select **Save Rule**
36+
37+
**Note:** Workspace Merchant Rules are only available after **Workspace Rules** are enabled for the workspace. If you don't see the Merchant Rules section, first [enable Workspace Rules](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Rules#enable-workspace-rules).
38+
39+
9. Select **Save Rule**.
40+
41+
---
42+
43+
## When Workspace Merchant Rules apply to expenses
44+
45+
Workspace Merchant Rules apply under the following conditions:
46+
47+
- Rules are applied **when an expense is created**. They are not applied if the expense is edited later.
48+
- If multiple Workspace Merchant Rules match the same expense, only the **earliest-created rule applies**.
49+
- If a member manually sets a field when creating the expense, **that field won't be overridden by the rule**.
50+
51+
---
52+
53+
## How to use Workspace Merchant Rules
54+
55+
Use these best practices to ensure predictable results:
56+
57+
**Use specific merchant names**
58+
59+
- Start with **exactly matches** for common vendors (e.g., "Uber", "Slack") to avoid false matches.
60+
- Use **contains** carefully, since broad terms can match unintended merchants.
61+
62+
**Test Workspace Merchant Rules before rollout**
63+
64+
- Use **Preview matches** during setup.
65+
- Start with narrow rules and expand as needed.
66+
67+
---
68+
69+
## Examples of Workspace Merchant Rules
70+
71+
**Standardize rideshare expenses**
72+
73+
Use Workspace Merchant Rules to ensure rideshare expenses are always categorized the same way.
74+
75+
Examples:
76+
- If the merchant contains "Uber", apply Category: Travel, Tag: Ground Transportation, Reimbursable: Yes
77+
- If the merchant contains "Lyft", apply Category: Travel, Tag: Ground Transportation, Reimbursable: Yes
78+
79+
This helps keep travel reporting consistent across the workspace.
80+
81+
**Automatically code SaaS and subscription expenses**
82+
83+
Use Workspace Merchant Rules to consistently code recurring software and subscription charges.
84+
85+
Examples:
86+
87+
- If the merchant contains "Slack", apply Category: Software, Reimbursable: No
88+
- If the merchant contains "Adobe", apply Category: Software, Reimbursable: No
89+
90+
This is especially useful for marking subscription expenses as non-reimbursable.
91+
92+
**Standardize merchant name variations**
93+
94+
Use Workspace Merchant Rules to normalize merchant names that appear with multiple variations (e.g., "Starbucks #1234", "Starbucks Store 5678").
95+
96+
Example:
97+
98+
- If the merchant contains "Starbucks", apply Merchant: Starbucks, Category: Meals & Entertainment
99+
100+
This improves reporting accuracy and reduces duplicate merchant entries.
101+
102+
**Apply consistent coding for office supply purchases**
103+
104+
Use Workspace Merchant Rules to apply specific categories, tags, or descriptions to office supply expenses.
105+
106+
Examples:
107+
108+
- If the merchant contains "Staples", apply Category: Office Supplies, Tag: Office
109+
- If the merchant contains "Amazon Business", apply Category: Office Supplies, Tag: Office
110+
111+
This ensures office-related purchases follow company coding standards.
112+
113+
![Image of an expense with Workspace Merchant Rule applied]({{site.url}}/assets/images/ExpensiHelp-MerchantRules-2.png){:width="100%"}
114+
115+
---
116+
117+
# FAQ
118+
119+
## What fields can Workspace Merchant Rules update?
120+
121+
Workspace Merchant Rules can update expense fields such as the category, tag, reimbursable status, billable status, tax, merchant name, and description.
122+
123+
## Do Workspace Merchant Rules change how members submit expenses?
124+
125+
No. Members submit expenses the same way as before. Workspace Merchant Rules run automatically in the background.
126+
127+
## What happens if a personal expense rule and a Workspace Merchant Rule both apply?
128+
129+
Personal expense rules take precedence over Workspace Merchant Rules. Learn more about [Personal Expense Rules](https://help.expensify.com/articles/new-expensify/settings/Personal-Expense-Rules).
130+
131+
## How can I tell which Workspace Merchant Rule was applied?
132+
133+
When a Workspace Merchant Rule updates an expense, Expensify adds an automated message to the expense chat.
134+
135+
To check which rule was applied:
136+
137+
1. Open the expense.
138+
2. Scroll to the bottom of the expense details.
139+
3. Look for a message from Concierge indicating the update.
140+
141+
The message will explicitly say which fields were changed and that the update happened via workspace rules.
142+
143+
## Why didn't my Workspace Merchant Rule apply?
144+
145+
Common reasons include:
146+
- The merchant name didn't match the rule criteria.
147+
- The rule is disabled.
148+
- Another rule matched first.
149+
- A field was manually set during expense creation.
150+
- The rule was created after the expense and wasn't applied retroactively, unless you select "apply to existing expenses" when creating the rule.

‎docs/articles/new-expensify/workspaces/Workspace-Rules.md‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Workspace Rules
33
description: Configure and manage rules for your workspace to enforce expense policies and automate compliance.
4-
keywords: [New Expensify, workspace rules, expense rules, receipt requirements, category rules, self-approvals, prohibited expenses, disable Smartscan, automate expenses, subscription expense, non-reimbursable, default expense handling, control expenses, expense categorization, rule-based expenses, compliance, itemized receipt, itemized receipts required over, auto-categorize by merchant]
5-
internalScope: Audience is Workspace Admins on the Control plan. Covers enabling and managing workspace-level rules such as expense rules, prohibited expenses, category rules, tag rules, and report rules. Does not cover personal expense rules, or troubleshooting specific rule outcomes.
4+
keywords: [New Expensify, workspace rules, expense rules, receipt requirements, category rules, self-approvals, prohibited expenses, disable Smartscan, automate expenses, subscription expense, non-reimbursable, default expense handling, control expenses, expense categorization, rule-based expenses, compliance, itemized receipt, itemized receipts required over, merchant rules, workspace merchant rules, auto-categorize by merchant]
5+
internalScope: Audience is Workspace Admins on the Control plan. Covers enabling and managing workspace-level rules such as expense rules, prohibited expenses, category rules, tag rules, and report rules. Does not cover personal expense rules, Workspace Merchant Rules setup details, or troubleshooting specific rule outcomes.
66
---
77

88
# Workspace Rules
@@ -34,10 +34,13 @@ Once enabled, go to the **Rules** tab in the left menu to manage expense-level s
3434
- **Itemized receipt required over** – Require itemized receipts for expenses over a specific amount.
3535
- **Max expense amount** – Set a per-expense spending cap (supports decimals).
3636
- **Max expense age (Days)** – Define how old an expense can be (whole numbers only).
37-
- **Cash expense default** - Choose whether cash expenses are reimbursable by default.
38-
- **Billable default** – Choose whether expenses are billable by default.
37+
- **Cash expense default** - Choose whether cash expenses are reimbursable by default. Note: [Workspace Merchant Rules](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules) can also set reimbursable status on a per-merchant basis.
38+
- **Billable default** – Choose whether expenses are billable by default. Note: [Workspace Merchant Rules](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules) can also set billable status on a per-merchant basis.
3939
- **Require company cards for all purchases** - Flag out-of-pocket expenses that should have been made with a company card. Only available after company cards are connected to the workspace.
4040
- **eReceipts** – Enable automatic receipt generation for all USD card transactions up to $75 (requires USD as default currency).
41+
- **Merchant-based automation** – Automatically apply categories, tags, and other fields using Workspace Merchant Rules.
42+
43+
![]({{site.url}}/assets/images/ExpensifyHelp-FlagExpensesMissingItemizedReceipts_01.png){:width="100%"}
4144

4245
---
4346

@@ -49,6 +52,20 @@ When an expense breaks a Workspace Rule or Category Rule, the expense is flagged
4952

5053
---
5154

55+
# How to configure Workspace Merchant Rules
56+
57+
Workspace Merchant Rules let Workspace Admins automatically apply consistent coding to expenses based on the merchant name. These rules help standardize categories, tags, and other expense fields across all members, reducing manual cleanup and improving reporting consistency.
58+
59+
Workspace Merchant Rules:
60+
- Apply when an expense is created
61+
- Work at the workspace level (not per member)
62+
- Don't change how members submit expenses
63+
64+
To learn how to set up and manage Workspace Merchant Rules, see:
65+
[**Workspace Merchant Rules**](https://help.expensify.com/articles/new-expensify/workspaces/Workspace-Merchant-Rules)
66+
67+
---
68+
5269
# How to configure the Prohibited Expenses Rule
5370

5471
Use this AI-powered rule to flag receipts with restricted purchases.

‎ios/NewExpensify/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.3.35</string>
26+
<string>9.3.36</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.3.35.1</string>
47+
<string>9.3.36.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.3.35</string>
14+
<string>9.3.36</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.35.1</string>
16+
<string>9.3.36.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.3.35</string>
14+
<string>9.3.36</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.35.1</string>
16+
<string>9.3.36.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

0 commit comments

Comments
 (0)