Skip to content

Commit 1be19a7

Browse files
committed
Merge branch 'main' into korytko/fix-reverted-62645
2 parents 00c189f + 625b425 commit 1be19a7

167 files changed

Lines changed: 1922 additions & 1210 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/cherryPick.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,14 @@ jobs:
3434
uses: ./.github/workflows/createNewVersion.yml
3535
secrets: inherit
3636
with:
37-
# In order to submit a new build for production review, it must have a higher PATCH version than the previously-submitted build
38-
SEMVER_LEVEL: ${{ inputs.TARGET == 'staging' && 'BUILD' || 'PATCH' }}
37+
# In order to submit a new build for production review, it must have a higher PATCH version than the previously-submitted build.
38+
# The typical case is that with each staging deploy, we bump the BUILD version, and with each prod deploy we bump the PATCH version.
39+
# However, if PULL_REQUEST_URL is empty, we assume we want to do a PATCH version bump.
40+
# The reason we assume that is because the use-case for a no-PR CP is after a CP to Production.
41+
# In that case, we need to bump the staging version to be higher than prod.
42+
# We use a patch version so that there's a diff in both `CFBundleVersion` and `CFBundleShortVersion` on iOS,
43+
# so that when we later CP that version bump to staging, the `CFBundleShortVersion` diff is picked up as well.
44+
SEMVER_LEVEL: ${{ (inputs.TARGET == 'production' || inputs.PULL_REQUEST_URL == '') && 'PATCH' || 'BUILD' }}
3945

4046
cherryPick:
4147
needs: createNewVersion
@@ -231,7 +237,7 @@ jobs:
231237
gh pr create \
232238
--title "🍒 Cherry pick PR #${{ steps.getPRInfo.outputs.PR_NUMBER }} to ${{ inputs.TARGET }} 🍒" \
233239
--body "$PR_DESCRIPTION" \
234-
--label "Engineering,Hourly" \
240+
--label "Engineering,Hourly,${{ inputs.TARGET == 'staging' && 'CP Staging' || 'CP Production' }}" \
235241
--base "${{ inputs.TARGET }}"
236242
sleep 5
237243
env:

.github/workflows/cspell.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 🧙 Check spell
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
branches: [main]
7+
8+
jobs:
9+
spellcheck:
10+
runs-on: ubuntu-latest
11+
name: 🔍 spellcheck
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: streetsidesoftware/cspell-action@v6
15+
with:
16+
files: "**/*"
17+
root: "."
18+
config: "./cspell.json"
19+
inline: error
20+
strict: true
21+
use_cspell_files: false
22+
incremental_files_only: true

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 1009015601
118-
versionName "9.1.56-1"
117+
versionCode 1009015803
118+
versionName "9.1.58-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: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"appleid",
2727
"applesignin",
2828
"applinks",
29+
"approvable",
2930
"approvalstatus",
3031
"appversion",
3132
"archivado",
@@ -101,6 +102,7 @@
101102
"cleartext",
102103
"CLIENTID",
103104
"clippath",
105+
"cloudflarestream",
104106
"cmaps",
105107
"cmjs",
106108
"cocoapods",
@@ -285,6 +287,7 @@
285287
"Krasoń",
286288
"Lagertha",
287289
"laggy",
290+
"lastiPhoneLogin",
288291
"lastname",
289292
"LDFLAGS",
290293
"LHNGBR",
@@ -515,11 +518,13 @@
515518
"shellcheck",
516519
"shellenv",
517520
"shipit",
521+
"shouldshowellipsis",
518522
"signingkey",
519523
"signup",
520524
"Signup",
521525
"simctl",
522526
"skip_codesigning",
527+
"Slurper",
523528
"SMARTREPORT",
524529
"Smartscan",
525530
"soloader",
@@ -625,6 +630,7 @@
625630
"workletization",
626631
"worklets",
627632
"workshopping",
633+
"workspacename",
628634
"writeitdown",
629635
"xcconfig",
630636
"xcodeproj",
@@ -646,6 +652,7 @@
646652
"yourcompany",
647653
"yourname",
648654
"YYMM",
655+
"zencdn",
649656
"Zenefit",
650657
"Zenefits",
651658
"zipalign",
@@ -656,8 +663,6 @@
656663
"مثال"
657664
],
658665
"ignorePaths": [
659-
".github",
660-
"node_modules",
661666
"src/languages/es.ts",
662667
"android/app/BUCK",
663668
"android/app/build_defs.bzl",
@@ -687,19 +692,11 @@
687692
"tests/unit/LocaleCompareTest.ts",
688693
"tests/unit/removeInvisibleCharacters.ts",
689694
"tests/unit/searchCountryOptionsTest.ts",
690-
"tests/unit/splitLongWordTest.ts",
691695
"tests/unit/currencyList.json",
692696
"tests/unit/ValidationUtilsTest.ts",
693697
"src/CONST.ts",
694-
"src/libs/SearchParser/*",
695-
".gitignore"
698+
"src/libs/SearchParser/*"
696699
],
697700
"ignoreRegExpList": ["@assets/.*"],
698-
"useGitignore": true,
699-
"overrides": [
700-
{
701-
"filename": "src/languages/es.ts",
702-
"language": "es"
703-
}
704-
]
701+
"useGitignore": true
705702
}

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.3",
9+
"electron-updater": "^6.6.4",
1010
"mime-types": "^2.1.35",
1111
"node-machine-id": "^1.1.12"
1212
},
Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,59 @@
11
---
22
title: Automatically Submit Employee Reports
3-
description: Set a schedule to automatically gather and submit employee expenses using Delay Submissions.
4-
keywords: [Expensify Classic, automate report submission, automatic report approval, delay submissions, employee expense schedule]
3+
description: Learn how to configure automatic report submissions in Expensify Classic using Delay Submissions in your Workspace settings.
4+
keywords: [Expensify Classic, automatic report submission, delay submissions, submission frequency, expense report schedule}
55
---
66

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

99
By setting a submission schedule for your workspace, expenses are automatically added to a report and submitted for approval based on the schedule you choose. This ensures employee expenses are collected without requiring manual submission each time.
1010

11-
When an employee creates an expense, it's automatically added to a report. If no report exists, a new one is created. Expense reports are submitted at the cadence you select—daily, weekly, monthly, twice per month, or by trip.
11+
---
12+
13+
# Automatically Submit Employee Reports
1214

13-
**Note:** If you are using Delayed Submissions and an expense has a violation, it won’t be submitted until the issue is resolved. The expense is removed from the report and added to a new open report.
15+
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.
16+
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.
1418

1519
---
1620

1721
# Set an Expense Report Submission Schedule
1822

23+
To enable and configure automatic submissions:
24+
1925
1. Go to **Settings > Workspace > [Workspace Name] > Workflows**.
20-
2. Click the **Delay Submissions** toggle to enable it.
21-
3. Click **Submission frequency** and choose from:
22-
- **Daily**Submitted every evening. Violations are submitted once corrected.
23-
- **Weekly**Submitted once a week. Violations are submitted the following Sunday after correction.
24-
- **Twice a month**Submitted on the 15th and the last day of the month. Violations are submitted at the next applicable date.
25-
- **Monthly**Submitted once per month. You'll select which day. Violations are submitted the following month.
26-
- **By trip** – A report is submitted when no new expenses are added for two full days. A new trip report begins after that.
27-
- **Manually** – Expenses are auto-added to a report, but employees must submit manually. This helps organize expenses without submitting automatically.
26+
2. Turn on **Delay Submissions** by toggling it on.
27+
3. Select a **Submission frequency** from the following options:
28+
- **Daily**Reports are submitted every evening. Violations are submitted once corrected.
29+
- **Weekly**Reports are submitted weekly. Violations are submitted on Sunday after correction.
30+
- **Twice a month**Reports are submitted on the 15th and the last day of the month. Violations are submitted at the next applicable date.
31+
- **Monthly**Reports are submitted once a month on your selected day. Violations are submitted the following month.
32+
- **By trip** – A report is submitted when no new expenses are added for two full days. A new trip report starts after that.
33+
- **Manually** – Expenses are auto-added to a report, but employees must submit them manually.
2834

2935
---
3036

3137
# FAQ
3238

33-
## I turned off Delay Submissions. Why do I still get reports submitted by Concierge?
39+
## I turned off Delay Submissions. Why are reports still being submitted automatically?
3440

35-
Turning off **Delay Submissions** for a Workspace doesn’t override an employee’s Individual Workspace settings. If reports are still submitted automatically, the employee likely has Delay Submissions enabled on their Individual Workspace.
41+
Turning off Delay Submissions for a Workspace doesn't affect an employee's Workspace settings. If reports are still auto-submitted, the employee will likely have Delay Submissions enabled in their workspace.
3642

3743
## What time of day are reports submitted via Delay Submissions?
3844

39-
All automatic report submissions happen in the evening PST (Pacific Standard Time).
45+
All automatic report submissions occur in the evening Pacific Standard Time (PST).
4046

41-
## What happens if Delay Submissions is used on both my Individual and Company Workspace?
47+
## What happens if Delay Submissions is enabled on both the Individual and Company Workspace?
4248

43-
The submission settings from the Company Workspace override those from the Individual Workspace.
49+
The Company Workspace settings override the Individual Workspace settings. However, suppose your Company Workspace is configured to **Manually** submit reports, but an employee has Delay Submissions enabled on their **Individual Workspace** with a set frequency (like daily or weekly. In that case, their personal settings will control submission timing. Reports will be submitted automatically based on the frequency selected in their workspace.
4450

45-
## Does using Delay Submissions automatically create separate reports for each of my credit cards?
51+
## Does Delay Submissions automatically create separate reports for each of my credit cards?
4652

47-
No, setting a submission schedule via **Delay Submissions** collects all expenses into a single report and submits them based on your selected frequency.
53+
No. All expenses are collected into a single report and submitted based on the selected frequency.
4854

49-
If you need reports organized by card:
50-
- Create separate reports for each card and manually assign expenses.
51-
- Use filters to group expenses by card and assign them to the correct report.
55+
If you need reports separated by card:
56+
- Manually create reports for each card and assign expenses accordingly.
57+
- Use filters to group expenses by card before assigning them to reports.
5258

5359
</div>

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

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
---
2-
title: Managing-Expenses-in-a-Report.md
2+
title: Managing Expenses in a Report
33
description: Learn how to add, remove, and move expenses within a report in New Expensify, and how they interact with comments and system messages.
44
keywords: [manage expenses, add expense, remove expense, delete expense, move expense, expense table, expense comments, audit trail, report troubleshooting, New Expensify]
55
---
66
<div id="new-expensify" markdown="1">
77

8-
This article walks you through how to manage expenses within a report in New Expensify—from adding and removing expenses to how they interact with comments and system messages.
9-
10-
# Managing Expenses in a Report
8+
This article walks you through managing expenses within a report in New Expensify, from adding and removing expenses to how they interact with comments and system messages.
119

1210
---
1311

14-
## Add Expenses to a Report
12+
# Add Expenses to a Report
1513

16-
You can add expenses to a report in two ways:
14+
There are two options for adding expenses to a report.
1715

18-
### Create a new expense
16+
**Create a new expense:**
1917
1. Open the draft report.
2018
2. Click **Add expense****Create new expense**.
2119
3. Fill in the expense details, then click **Save**.
2220
4. The new expense appears instantly in the report table.
2321

24-
### Add existing unreported expenses
22+
**Add existing unreported expenses:**
2523
1. Click **Add expense****Add unreported expenses**.
2624
2. Select one or more expenses from the list.
2725
3. Click **Add to report**.
@@ -30,24 +28,22 @@ You can add expenses to a report in two ways:
3028

3129
---
3230

33-
## Remove (Delete) Expenses From a Report
34-
35-
You can remove one or multiple expenses:
31+
# Remove (Delete) Expenses From a Report
3632

37-
### Remove a single expense
33+
**Remove a single expense:**
3834
1. Open the report.
3935
2. Check the box next to the expense you want to remove.
4036
3. Click the **Bulk actions** menu → Select **Delete**.
4137

42-
### Remove multiple expenses
38+
**Remove multiple expenses:**
4339
1. Select the checkboxes for the expenses you want to delete.
4440
2. From the **Bulk actions** menu, click **Delete**.
4541

4642
**Note:** Deleted expenses return to your **Self DM** and reappear in the **Add unreported expenses** list.
4743

4844
---
4945

50-
## Move Expenses to Another Report
46+
# Move Expenses to Another Report
5147

5248
To transfer expenses between reports:
5349

@@ -62,35 +58,35 @@ To transfer expenses between reports:
6258

6359
---
6460

65-
## How Expenses Appear in the Report Table
61+
# How Expenses Appear in the Report Table
6662

6763
Each report includes a table that shows all added expenses.
6864

69-
### What you’ll see in each row
65+
## What you’ll see in each row
7066
- Date
7167
- Merchant
7268
- Category
7369
- Amount
7470
- Policy violations (if applicable)
7571
- Clickable rows that open details in the side panel
7672

77-
### Behavior highlights
78-
- New expenses briefly highlight when added.
73+
## Behavior highlights
74+
- New expenses are briefly highlighted when added.
7975
- Checkboxes allow you to take group actions.
8076
- Expenses are listed in reverse chronological order (newest first).
8177

8278
---
8379

84-
## Comments and How They Relate to Expenses
80+
# Comments and How They Relate to Expenses
8581

8682
Every report has a comment thread for collaboration and context.
8783

88-
### Comment features
89-
- Thread appears below the report table.
84+
## Comment features
85+
- The thread appears below the report table.
9086
- Supports mentions, questions, and internal notes.
9187
- Updates live for all members in the workspace.
9288

93-
### How comments relate to expenses
89+
## How comments relate to expenses
9490
- Reference expenses manually (e.g., “Why is the $150 Uber charge included?”).
9591
- Comments stay with the report, even if expenses are moved or deleted.
9692
- Comments aren’t tied to a specific expense, but they’re context-aware.
@@ -99,16 +95,14 @@ Every report has a comment thread for collaboration and context.
9995

10096
---
10197

102-
## System Messages and Audit Trail
98+
# System Messages and Audit Trail
10399

104100
System messages like **“Expense moved”** or **“Report submitted”** appear in the same thread as comments to help keep a clear audit trail. This makes it easier to track changes and approval workflows.
105101

106102
---
107103

108104
# Troubleshooting the Reports Page
109105

110-
---
111-
112106
## Why Can’t I Find a Report I Just Created?
113107

114108
**Possible reasons:**

0 commit comments

Comments
 (0)