Skip to content

Commit 5da0d43

Browse files
committed
chore: merge main
1 parent be22021 commit 5da0d43

117 files changed

Lines changed: 1596 additions & 1232 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/createNewVersion.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ jobs:
126126
echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
127127
git fetch origin main
128128
if ! git rebase origin/main; then
129-
echo "::error:: Rebase failed while retrying Mobile-Expensify push"
129+
echo "::error:: Rebase failed while retrying E/App push"
130130
exit 1
131131
fi
132132
if ! git push origin main; then
133-
echo "::error:: Mobile-Expensify change failed to push after rebase"
133+
echo "::error:: E/App change failed to push after rebase"
134134
exit 1
135135
fi
136136
fi

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 1009018008
118-
versionName "9.1.80-8"
117+
versionCode 1009018106
118+
versionName "9.1.81-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"

cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,8 @@
688688
"zxcv",
689689
"zxldvw",
690690
"مثال",
691-
"pnrs"
691+
"pnrs",
692+
"POLICYCHANGELOG_ADD_EMPLOYEE"
692693
],
693694
"ignorePaths": [
694695
"src/languages/de.ts",

desktop/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"electron-context-menu": "^2.3.0",
88
"electron-log": "^4.4.8",
9-
"electron-updater": "^6.6.4",
9+
"electron-updater": "^6.6.5",
1010
"mime-types": "^2.1.35",
1111
"node-machine-id": "^1.1.12"
1212
},

docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Inside the draft report, tap **Add expense** to include expense items.
2727

2828
**Option A:** Create a new expense:
2929

30-
1. Tap **Add expense** > **Create new expense**.
30+
1. Tap **Add expense** > **Create expense**.
3131
2. Enter the expense details (amount, merchant, category).
3232
3. The expense is added directly to the report.
3333

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
---
2+
title: Customize and Enforce Report Titles
3+
description: Learn how to set dynamic report titles using custom formulas and enforce naming consistency across your workspace.
4+
keywords: [New Expensify, default report title, report naming, enforce report title, report formula, dynamic report name, workspace report titles]
5+
---
6+
<div id="new-expensify" markdown="1">
7+
8+
Automatically generate standardized report titles across your workspace using formulas. Admins can pull in dynamic data like report type or member name, and even lock naming rules to prevent edits.
9+
10+
---
11+
12+
# Customize Report Titles Using Formulas
13+
14+
**Navigation:**
15+
**Settings > Workspaces > [Workspace Name] > Reports**
16+
17+
1. Scroll to the **Report title** section.
18+
2. Click to open the formula editor.
19+
3. Use the formula list below to build your title.
20+
4. (Optional) Enable **Prevent members from changing custom report names** to lock naming rules.
21+
22+
**Example formula:**
23+
`{report:type} - {report:submit:from:firstname} {report:startdate}`
24+
**Result:** `Expense Report - Alice 2025-05-15`
25+
26+
---
27+
28+
# How Dynamic Titles Work
29+
30+
- Custom report names update automatically when the value of the fields they reference is updated. For example:
31+
- {report:total} will update when new expenses are added to the report.
32+
- {report:workspaceName} will update when the workspace name changes.
33+
- Report titles freeze once a report is **Approved** or **Reimbursed**.
34+
- Fields related to report submission are snapshots of the data at the time the report was submitted. For example:
35+
- {report:submit:from:firstName} may capture the first name of Joanne and won't be updated if Joanne changes her first name to "Jo" in Expensify
36+
- The report title will need to be manually edited by an admin, or the report unapproved and submitted again
37+
---
38+
39+
# Report Title Formula Reference
40+
41+
## Report-level data
42+
43+
| Formula | Example | Description |
44+
| -- | -- | -- |
45+
| `{report:id}` | R00I7J3xs5fn | Unique report ID in a base 62 representation |
46+
| `{report:oldID}` | R3513250790654885 | unique report ID |
47+
| `{report:total}` | $325.34 | Total amount on report |
48+
| `{report:type}` | Expense Report | Report type (Expense Report, Invoice, Bill) |
49+
| `{report:reimbursable}` | $143.43 | Reimbursable amount |
50+
| `{report:currency}` | USD | Currency used |
51+
| `{field:Employee ID}` | 123456 | Custom field from the report |
52+
| `{report:created}` | 2024-09-15 12:00:00 | When report was created |
53+
| `{report:created:yyyy-MM-dd}` | 2024-09-15 | Created date (custom format - see below for more formats) |
54+
| `{report:startdate}` | 2024-09-15 | Earliest expense date |
55+
| `{report:enddate}` | 2024-09-26 | Latest expense date |
56+
| `{report:submit:date}` | 2023-09-15 12:00:00 | Submission time |
57+
| `{report:submit:date:yyyy-MM-dd}` | 2023-09-15 | Submission date (formatted) |
58+
| `{report:approve:date}` | 2011-09-25 12:00:00 | Approval timestamp |
59+
| `{report:approve:date:yyyy-MM-dd}` | 2011-09-25 | Approval date (formatted) |
60+
| `{report:expensescount}` | 10 | Number of expenses |
61+
| `{report:workspaceName}` | Sales | Name of the workspace |
62+
| `{report:status}` | Approved | Current report status |
63+
| `{report:submit:to}` | alice@email.com | Approver’s email |
64+
| `{report:submit:from}` | Sally Ride | Submitter full name |
65+
| `{report:submit:from:firstname}` | Sally | Submitter’s first name |
66+
| `{report:submit:from:lastname}` | Ride | Submitter’s last name |
67+
| `{report:submit:from:fullname}` | Sally Ride | Submitter full name |
68+
| `{report:submit:from:email}` | sride@email.com | Submitter email |
69+
| `{report:submit:from:customfield1}` | 100 | Submitter custom field 1 |
70+
| `{report:submit:from:customfield2}` | 1234 | Submitter custom field 2 |
71+
72+
---
73+
74+
# Date Format Options
75+
76+
Customize date appearance with these formats:
77+
78+
| Format | Example |
79+
| -- | -- |
80+
| M/dd/yyyy | 5/23/2024 |
81+
| MMMM dd, yyyy | May 23, 2024 |
82+
| dd MMM yyyy | 23 May 2024 |
83+
| yyyy/MM/dd | 2024/05/23 |
84+
| MMMM, yyyy | May, 2024 |
85+
| yy/MM/dd | 24/05/23 |
86+
| dd/MM/yy | 23/05/24 |
87+
| yyyy | 2024 |
88+
89+
---
90+
91+
# Advanced Formula Functions
92+
93+
Add `|` functions to format results:
94+
95+
| Function | Example | Description |
96+
| -- | -- | -- |
97+
| `frontpart` | `{report:submit:from:email|frontpart}` → alice | Gets first word or string before `@` |
98+
| `substr:x` | `{report:policyname|substr:20}` → Sales Expenses | Trims to first `x` characters |
99+
| `substr:x:y` | `{report:policyname|substr:20|frontpart}` → Sales | Chains multiple functions |
100+
| `domain` | `{report:submit:from:email|domain}` → email.com | Returns email domain |
101+
102+
</div>

docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ You can add expenses to a report in two ways:
1515

1616
### Create a new expense
1717
1. Open the draft report.
18-
2. Select **Add expense** > **Create new expense**.
18+
2. Select **Add expense** > **Create expense**.
1919
3. Enter the expense details and click **Save**.
2020
4. The new expense appears instantly in the report.
2121

help/ref/search/index.md

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,50 @@
11
---
22
layout: product
3-
title: Reports
3+
title: Reports Page
44
---
55

6-
# Reports
6+
# Reports Page
77

8-
Virtually all data can be analyzed and reported upon in the Reports page. The major elements of this page include:
8+
The Reports page helps you explore and filter all reports and related expenses. It complements the Inbox by giving you a complete view of your expense history and what expenses and reports require your action. Use this page to create and download spending reports, track report actions, and view the recent expense activity on your workspace(s).
99

10-
## Data type
10+
---
11+
12+
## Expenses & Reports
1113

12-
Start first by choosing the type of data you want to analyze, which can be:
14+
- **Managing expenses**: Click on any expense row to see its details in a side panel. Use checkboxes to select multiple expenses, then use bulk actions like Move, Download, or Delete from the action menu.
1315

14-
- **Expense** - Individual standalone expenses.
15-
- **Expense reports** - Groups of expenses processed in a batch.
16-
- **Chats** - Comments written by you and others.
17-
- **Invoices** - Expenses submitted to clients for payment.
18-
- **Trips** - Travel expenses booked with Expensify Travel or scanned with SmartScan.
16+
- **Filters**: Looking for something specific? Use filters to narrow things down by date, category, merchant, tag, workspace, or report status. You can also combine filters with keywords for even more precise results.
1917

20-
## Search
18+
- **Sort reports by status**:
19+
- Draft – Only you can see it
20+
- Outstanding – Waiting on someone else
21+
- Approved – Ready to pay
22+
- Done or Paid – All wrapped up
2123

22-
A quick method of narrowing the results by keyword or more.
24+
- **Download what you need**: Generate a report to download filtered expense data as a CSV. Perfect for spreadsheets, monthly close, or syncing with accounting.
2325

24-
## State filter
26+
---
2527

26-
Simple methods to filter the results by "state", including:
28+
## Chats
2729

28-
- **All**
29-
- **Expenses/Expense/Invoices reports:**
30-
- Draft - Only you can see that hasn't been shared yet.
31-
- Outstanding - Submitted to someone and awaiting action.
32-
- Approved - Approved, but awaiting payment.
33-
- Done - Fully processed, no further action needed.
34-
- Paid - Fully paid, no further action needed.
30+
- **Viewing report previews**: Each report preview shows up right in your workspace chat with the status, up to 10 expenses, and buttons like Submit or Approve, depending on your role.
3531

36-
- **Chats:**
37-
- Unread - Not seen yet by you.
38-
- Sent - Sent by you.
39-
- Attachments - Image, movie, or document.
40-
- Links - Hyperlinks.
41-
- Pinned - Highlighted by you as important.
32+
- **Filter chats:** Use filters to find the exact chat you're looking for.
33+
34+
---
4235

43-
- **Trips:**
44-
- Current - Happening or in the future.
45-
- Past - Already happened.
36+
## To-Do
37+
38+
- **Stay on top of tasks**: The To-do section shows exactly what needs your attention. This is your go-to spot to keep things moving.
39+
40+
- **Action items:** Whether you need to submit, approve, or pay expenses, you can click the corresponding action to complete any outstanding to-dos.
41+
42+
---
4643

47-
## Results
44+
## Learn More
4845

49-
The core of the Reports page are the search results themselves.
46+
- [The Reports Page](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Getting-Started-with-the-Reports-Page)
47+
- [Understanding Reports Statuses and Actions](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Understanding-Report-Statuses-and-Actions)
48+
- [Suggested Search](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Suggested-Search)
49+
- [Search and Download Expenses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses)
5050

51-
- Select a row to see additional options.
52-
- Tap on a row to see more detail.

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.1.80</string>
26+
<string>9.1.81</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.1.80.8</string>
47+
<string>9.1.81.6</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

0 commit comments

Comments
 (0)