Skip to content

Commit a72b4a1

Browse files
committed
merge main
2 parents 0b86c1a + 338777e commit a72b4a1

380 files changed

Lines changed: 12956 additions & 4058 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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
const useCameraDevice = jest.fn(() => null);
2+
const useCameraFormat = jest.fn(() => null);
3+
const useCameraPermission = jest.fn(() => ({hasPermission: false, requestPermission: jest.fn(() => Promise.resolve(false))}));
4+
5+
const Camera = Object.assign(
6+
jest.fn(() => null),
7+
{
8+
getCameraPermissionStatus: jest.fn(() => 'not-determined'),
9+
requestCameraPermission: jest.fn(() => Promise.resolve('granted')),
10+
},
11+
);
12+
13+
export {Camera, useCameraDevice, useCameraFormat, useCameraPermission};

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 1009036801
115-
versionName "9.3.68-1"
114+
versionCode 1009036803
115+
versionName "9.3.68-3"
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"

assets/images/camera-flip.svg

Lines changed: 1 addition & 0 deletions
Loading

config/eslint/eslint.seatbelt.tsv

Lines changed: 51 additions & 7 deletions
Large diffs are not rendered by default.

contributingGuides/CONTRIBUTING.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ You can create as many accounts as needed in order to test your changes directly
99

1010
**Notes**:
1111

12-
1. When creating test accounts, include a `+` (plus sign) in the email address (e.g., matt+1@gmail.com). This marks the account and their associated workspaces as test accounts in Expensify, ensuring Expensify Guides are not assigned to help with account setup.
12+
1. When creating test accounts:
13+
- Include a `+` (plus sign) in the email address (e.g., matt+1@gmail.com). This marks the account and their associated workspaces as test accounts in Expensify, ensuring Expensify Guides are not assigned to help with account setup.
14+
- When testing on live servers with a private domain, stick to a single, consistent test domain. Please avoid generating random or "fake" domains (e.g., asdfkef23@asfdasfwaf.com).
1315
2. When testing chat functionality in the app please do this between accounts you or your fellow contributors own - **do not test chatting with Concierge**, as this diverts to our customer support team. Thank you.
1416
3. A member of our customer onboarding team gets auto-assigned to every new policy created by a non-paying account to help them set up. Please **do not interact with these teams, ask for calls, or support on your issues.** If you do need to test functionality inside the defaultRooms (#admins & #announce) for any issues you’re working on, please let them know that you are a contributor and don’t need assistance. They will proceed to ignore the chat.
1517
4. Please **do not post in any Expensify owned public room for testing** (e.g #exfy-roadmap, #new-expensify-feedback). These rooms include real customers and investors. You can create your own public rooms, or [use this test public room](https://staging.new.expensify.com/r/2091104345528462) on either staging or production. Thanks!

docs/articles/new-expensify/concierge-ai/Support-Agent.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ Anyone with an Expensify account can contact Concierge for help—whether you're
1717

1818
You can ask Concierge for help from anywhere in Expensify:
1919

20-
- **Account:** Go to **Account** > **Help** and select **Concierge**.
21-
- **Web:** Click the chat icon in the top-right corner
22-
- **Mobile:** Tap the hamburger menu in the top-left corner, then tap **Concierge**
20+
- **Web:** Click the **Concierge** icon in the top-right corner.
21+
- **Mobile:** Tap the **Concierge** icon in the top-right corner of the screen, or go to **Account** > **Help** and select **Concierge**.
2322
- **Workspace chat:** Mention Concierge in a chat room (e.g., `#admins`)
2423
- **Report or expense threads:** Ask a question in the thread
2524
- **Email:** Send a message to concierge@expensify.com

docs/articles/new-expensify/reports-and-expenses/Edit-Expense-Reports.md

Lines changed: 0 additions & 85 deletions
This file was deleted.
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
---
2+
title: Edit Expenses
3+
description: Learn how to edit individual expenses, and edit multiple expenses at once.
4+
keywords: [bulk edit expenses, edit multiple expenses Expensify, update expenses in bulk, modify multiple expenses]
5+
internalScope: Audience is all members. Covers editing expenses individually and in bulk editing multiple expenses at once. Does not cover creating, submitting or reopening reports.
6+
---
7+
8+
# Edit Expenses
9+
10+
You can edit a single expense from within a report, or update multiple expenses at once using bulk edit. Both options let you change details like merchant, category, amount, and more.
11+
12+
## Who can edit expenses
13+
14+
- **All members**: Can edit expenses on their own Draft or Outstanding reports.
15+
- **Current approver**: Can edit expenses on Outstanding reports pending their approval.
16+
- **Workspace Admin**: Can edit expenses on any Draft or Outstanding report on the Workspace.
17+
18+
Expenses on Approved reports must be unapproved before they can be edited. Expenses on Paid and Done reports cannot be edited.
19+
20+
---
21+
22+
## How to edit a single expense
23+
24+
1. In the navigation tabs (on the left on web, on the bottom on mobile), go to **Spend > Expenses**.
25+
2. Select the expense to open it.
26+
3. Select the field you want to edit.
27+
4. Make your update.
28+
5. Click **Save**.
29+
30+
---
31+
32+
## How to edit multiple expenses at once
33+
34+
Use edit multiple to update the same field across several expenses simultaneously.
35+
36+
1. In the navigation tabs (on the left on web, on the bottom on mobile), go to **Spend > Expenses**.
37+
2. Select 2 or more expenses using the checkboxes.
38+
3. Click **Selected**.
39+
4. Choose **Edit multiple**.
40+
5. In the side panel, select the field you want to update.
41+
6. Enter the new value.
42+
7. Click **Save**.
43+
44+
**Note:** If editing is not allowed on a field for any of the selected expenses, that field will not be available for editing.
45+
46+
---
47+
## What expense fields can be edited
48+
49+
On Draft and Outstanding reports, you can edit:
50+
51+
- Amount (cash expenses only)
52+
- Description
53+
- Merchant
54+
- Date
55+
- Other fields like Category, Tag and Attendees
56+
57+
**Note:** Expenses on Approved reports must be unapproved before they can be edited. Expenses on Paid or Done reports cannot be edited. [Learn how to unapprove a report](/articles/new-expensify/reports-and-expenses/Approve-Expenses).
58+
59+
---
60+
61+
## What happens after you edit expenses
62+
63+
- Edits apply to all selected expenses.
64+
- Changes are saved immediately for each expense.
65+
- Existing values are overwritten with the new values you enter.
66+
67+
---
68+
69+
# FAQ
70+
71+
## Can I edit expenses on Paid and Done reports?
72+
73+
No, Paid or Done reports are locked and cannot be reopened for editing.
74+
75+
## Why are some fields not editable in the Edit multiple panel?
76+
77+
If a field is restricted for any selected expense (for example, amount on a card expense), it will be disabled in the **Edit multiple** panel.
78+
79+
## Why can't I see the Edit multiple option?
80+
81+
**Edit multiple** only appears when you select 2 or more Unreported, Draft, or Outstanding expenses that have at least one editable field.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
title: Edit Reports
3+
description: Retract a submitted expense report to make changes, update expenses, and resubmit.
4+
keywords: [New Expensify, edit expense report, retract report, update submitted report, resubmit expense report, exported report changes]
5+
internalScope: Audience is Members and Workspace Admins. Covers retracting and updating submitted expense reports. Does not cover creating reports or detailed expense editing workflows.
6+
---
7+
8+
# Edit Reports
9+
10+
If you submitted a report too early or need to make changes, you can edit it by retracting the report using **Retract**. This returns the report to the Draft state so you can update expenses, receipts, or details before submitting again.
11+
12+
If you want to edit an expense on a report, [learn how to edit expenses](/articles/new-expensify/reports-and-expenses/Edit-Expenses).
13+
14+
---
15+
16+
## Who can retract a report
17+
18+
- **All members**: Can retract their own Outstanding and Done reports.
19+
- **Current approver**: Can retract Outstanding reports pending their approval.
20+
- **Workspace Admin**: Can retract any Done report on the Workspace.
21+
22+
**Note:** Approved reports can't be retracted, they must be unapproved first. [Learn how to unapprove a report](/articles/new-expensify/reports-and-expenses/Approve-Expenses).
23+
24+
---
25+
26+
## How to retract a report
27+
28+
1. In the navigation tabs (on the left on web, on the bottom on mobile) go to **Spend > Reports**.
29+
2. Open the Outstanding or Done report you want to retract.
30+
3. Choose **More**.
31+
4. Select **Retract**.
32+
33+
---
34+
35+
## What happens after you retract a report
36+
37+
- The report status will change to Draft.
38+
- A Retracted message appears in the report activity.
39+
- You can update, add, remove, or move expenses.
40+
- You can resubmit the report when ready.
41+
42+
---
43+
44+
# FAQ
45+
46+
## Why can't I retract a report?
47+
48+
You can’t retract a report that is already Approved or Paid. To make changes to an Approved report, the report will need to be unapproved first. Paid reports can't be retracted.
49+
50+
## What happens if I retract and edit a report after it’s exported to an accounting system?
51+
52+
You’ll see a warning before retracting. Retracting may cause data mismatches, and any changes made after retraction won’t sync to the accounting system. You’ll need to manually reconcile those updates.
53+
54+
## When should I retract a report?
55+
56+
Retracting a report is useful when:
57+
58+
- You submitted a report too early
59+
- Expenses were added by mistake
60+
- Additional receipts or notes are needed
61+
- You want to move expenses to a different report or create a new report

0 commit comments

Comments
 (0)