Skip to content

Commit 468563a

Browse files
committed
Merge branch 'main' into VickyStash/refactor/65022-bumb-eslint-config-version
# Conflicts: # src/components/SettlementButton/index.tsx
2 parents 8a3ecbf + 7323ec5 commit 468563a

195 files changed

Lines changed: 2783 additions & 2282 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/deployNewHelp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# v4
5959
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
6060
with:
61-
node-version: '20.19.1'
61+
node-version-file: '.nvmrc'
6262

6363
# Wil install the _help/package.js
6464
- name: Install Node.js Dependencies

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.1
1+
20.19.3

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 1009018001
118-
versionName "9.1.80-1"
117+
versionCode 1009018100
118+
versionName "9.1.81-0"
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@
455455
"positionMillis",
456456
"Postharvest",
457457
"Postproduction",
458+
"Powerform",
459+
"POWERFORM",
458460
"Précédent",
459461
"precheck",
460462
"Precheck",

docs/articles/expensify-classic/expenses/Edit-expenses.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ The submitter can only delete expenses, and the report must be in the Open state
141141

142142
# FAQ
143143

144+
## Can I add multiple attachments to a single expense?
145+
No, it's only possible to add one attachment per expense.
146+
144147
## Who can edit an expense?
145148
- **Expense owner**: Can edit expenses if the report is Open.
146149
- **Approvers and Workspace Admins**: Can edit submitted expenses before final approval.

docs/articles/expensify-classic/expensify-billing/Billing-Overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Earn **1%–2% cash back**
6666
- 2% if monthly spend reaches **$250,000+**
6767
- Cash back is applied to your bill first, then to your bank account
6868

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

7171
## 📅 Annual Subscription Only
7272

docs/articles/expensify-classic/reports/Edit-and-Submit-Expense-Reports.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,33 +272,31 @@ You can export full reports for archiving or analysis.
272272
- **Default CSV** – Expensify’s built-in layout.
273273
- **Create new CSV export layout** – Customize your export format.
274274

275+
---
276+
275277
# FAQ
276278

277279
## Can I view my teammate's expense reports?
278280

279281
Yes, if you have **Copilot access**. Ask your teammate to add you as a Copilot so you can view, edit, or submit their reports.
280282

281-
---
282283

283284
## Can I export an expense report as a spreadsheet?
284285

285286
Yes! Open the report, click **Details**, then choose **Export to CSV**.
286287

287-
---
288288

289289
## How are credits or refunds displayed?
290290

291291
They appear as **negative expenses** (e.g., -$1.00) and reduce the report total.
292292

293-
---
294293

295294
## What’s the difference between an expense, a receipt, and a report attachment?
296295

297296
- **Expense** – Created when a receipt is scanned or manually entered.
298297
- **Receipt** – Image attached to an expense.
299298
- **Attachment** – Additional files added at the bottom of the report (e.g., documents).
300299

301-
---
302300

303301
## What’s the difference between reports, invoices, and bills?
304302

docs/articles/new-expensify/billing-and-subscriptions/Billing-Overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
6262
- 2% if monthly spend reaches **$250,000+**
6363
- Cash back is applied to your Expensify bill first, then to your bank account
6464

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

6767
## 📅 Annual Subscription
6868

docs/redirects.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,6 @@ https://help.expensify.com/articles/expensify-classic/expensify-billing/Out-of-d
837837
https://help.expensify.com/articles/new-expensify/settings/Add-or-Act-As-a-Copilot,https://help.expensify.com/articles/new-expensify/settings/Copilot-Access
838838
https://help.expensify.com/articles/new-expensify/settings/Change-or-add-email-address,https://help.expensify.com/articles/new-expensify/settings/Update-Email-Address
839839
https://help.expensify.com/articles/new-expensify/settings/Enable-Two-Factor-Authentication,https://help.expensify.com/articles/new-expensify/settings/Two-Factor-Authentication
840-
https://help.expensify.com/articles/new-expensify/settings/Merge-Accounts,https://help.expensify.com/articles/expensify-classic/settings/Merge-Accounts
841840
https://help.expensify.com/articles/new-expensify/settings/Close-account,https://help.expensify.com/articles/new-expensify/settings/Close-Account
842841
https://help.expensify.com/articles/new-expensify/settings/Manage-Profile-and-Account-Preferences,https://help.expensify.com/articles/new-expensify/settings/Account-Settings
843842
https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-expense,https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-Expense

0 commit comments

Comments
 (0)