Merge branch 'main' of github.com:Expensify/App into jsenyitko-reenable-export

Author: JS00001

.github/workflows/createNewVersion.yml

@@ -126,11 +126,11 @@ jobs:
             echo "Race condition! E/App main was updated while this workflow was running, so push failed. Fetching remote, rebasing, and retrying push once."
             git fetch origin main
             if ! git rebase origin/main; then
-              echo "::error:: Rebase failed while retrying Mobile-Expensify push"
+              echo "::error:: Rebase failed while retrying E/App push"
               exit 1
             fi
             if ! git push origin main; then
-              echo "::error:: Mobile-Expensify change failed to push after rebase"
+              echo "::error:: E/App change failed to push after rebase"
               exit 1
             fi
           fi

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018003
-        versionName "9.1.80-3"
+        versionCode 1009018102
+        versionName "9.1.81-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.4",
+    "electron-updater": "^6.6.5",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

@@ -141,6 +141,9 @@ The submitter can only delete expenses, and the report must be in the Open state
 
 # FAQ
 
+## Can I add multiple attachments to a single expense?
+No, it's only possible to add one attachment per expense. 
+
 ## Who can edit an expense?
 - **Expense owner**: Can edit expenses if the report is Open.
 - **Approvers and Workspace Admins**: Can edit submitted expenses before final approval.

desktop/package.json

@@ -66,7 +66,7 @@ Earn **1%–2% cash back**
 - 2% if monthly spend reaches **$250,000+**  
 - Cash back is applied to your bill first, then to your bank account
 
-👉 Use the [savings calculator](https://use.expensify.com/resource-center/tools/savings-calculator) to estimate your monthly savings.
+👉 Use the [savings calculator](https://use.expensify.com/savings-calculator) to estimate your monthly savings.
 
 ## 📅 Annual Subscription Only
 

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

@@ -272,33 +272,31 @@ You can export full reports for archiving or analysis.
    - **Default CSV** – Expensify’s built-in layout.
    - **Create new CSV export layout** – Customize your export format.
 
+---
+
 # FAQ
 
 ## Can I view my teammate's expense reports?
 
 Yes, if you have **Copilot access**. Ask your teammate to add you as a Copilot so you can view, edit, or submit their reports.
 
----
 
 ## Can I export an expense report as a spreadsheet?
 
 Yes! Open the report, click **Details**, then choose **Export to CSV**.
 
----
 
 ## How are credits or refunds displayed?
 
 They appear as **negative expenses** (e.g., -$1.00) and reduce the report total.
 
----
 
 ## What’s the difference between an expense, a receipt, and a report attachment?
 
 - **Expense** – Created when a receipt is scanned or manually entered.
 - **Receipt** – Image attached to an expense.
 - **Attachment** – Additional files added at the bottom of the report (e.g., documents).
 
----
 
 ## What’s the difference between reports, invoices, and bills?
 

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

@@ -62,7 +62,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
   - 2% if monthly spend reaches **$250,000+**
 - Cash back is applied to your Expensify bill first, then to your bank account
 
-👉 Use the [savings calculator](https://use.expensify.com/resource-center/tools/savings-calculator) to estimate your monthly savings.
+👉 Use the [savings calculator](https://use.expensify.com/savings-calculator) to estimate your monthly savings.
 
 ## 📅 Annual Subscription
 

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

@@ -0,0 +1,102 @@
+---
+title: Customize and Enforce Report Titles
+description: Learn how to set dynamic report titles using custom formulas and enforce naming consistency across your workspace.
+keywords: [New Expensify, default report title, report naming, enforce report title, report formula, dynamic report name, workspace report titles]
+---
+<div id="new-expensify" markdown="1">
+
+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.
+
+---
+
+# Customize Report Titles Using Formulas
+
+**Navigation:**  
+**Settings > Workspaces > [Workspace Name] > Reports**
+
+1. Scroll to the **Report title** section.
+2. Click to open the formula editor.
+3. Use the formula list below to build your title.
+4. (Optional) Enable **Prevent members from changing custom report names** to lock naming rules.
+
+**Example formula:**  
+`{report:type} - {report:submit:from:firstname} {report:startdate}`  
+**Result:** `Expense Report - Alice 2025-05-15`
+
+---
+
+# How Dynamic Titles Work
+
+- Custom report names update automatically when the value of the fields they reference is updated. For example:
+    - {report:total} will update when new expenses are added to the report.
+    - {report:workspaceName} will update when the workspace name changes.
+- Report titles freeze once a report is **Approved** or **Reimbursed**.
+- Fields related to report submission are snapshots of the data at the time the report was submitted. For example:
+    - {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
+    - The report title will need to be manually edited by an admin, or the report unapproved and submitted again
+---
+
+# Report Title Formula Reference
+
+## Report-level data
+
+| Formula | Example | Description |
+| -- | -- | -- |
+| `{report:id}` | R00I7J3xs5fn | Unique report ID in a base 62 representation |
+| `{report:oldID}` | R3513250790654885 | unique report ID |
+| `{report:total}` | $325.34 | Total amount on report |
+| `{report:type}` | Expense Report | Report type (Expense Report, Invoice, Bill) |
+| `{report:reimbursable}` | $143.43 | Reimbursable amount |
+| `{report:currency}` | USD | Currency used |
+| `{field:Employee ID}` | 123456 | Custom field from the report |
+| `{report:created}` | 2024-09-15 12:00:00 | When report was created |
+| `{report:created:yyyy-MM-dd}` | 2024-09-15 | Created date (custom format - see below for more formats) |
+| `{report:startdate}` | 2024-09-15 | Earliest expense date |
+| `{report:enddate}` | 2024-09-26 | Latest expense date |
+| `{report:submit:date}` | 2023-09-15 12:00:00 | Submission time |
+| `{report:submit:date:yyyy-MM-dd}` | 2023-09-15 | Submission date (formatted) |
+| `{report:approve:date}` | 2011-09-25 12:00:00 | Approval timestamp |
+| `{report:approve:date:yyyy-MM-dd}` | 2011-09-25 | Approval date (formatted) |
+| `{report:expensescount}` | 10 | Number of expenses |
+| `{report:workspaceName}` | Sales | Name of the workspace |
+| `{report:status}` | Approved | Current report status |
+| `{report:submit:to}` | alice@email.com | Approver’s email |
+| `{report:submit:from}` | Sally Ride | Submitter full name |
+| `{report:submit:from:firstname}` | Sally | Submitter’s first name |
+| `{report:submit:from:lastname}` | Ride | Submitter’s last name |
+| `{report:submit:from:fullname}` | Sally Ride | Submitter full name |
+| `{report:submit:from:email}` | sride@email.com | Submitter email |
+| `{report:submit:from:customfield1}` | 100 | Submitter custom field 1 |
+| `{report:submit:from:customfield2}` | 1234 | Submitter custom field 2 |
+
+---
+
+# Date Format Options
+
+Customize date appearance with these formats:
+
+| Format | Example |
+| -- | -- |
+| M/dd/yyyy | 5/23/2024 |
+| MMMM dd, yyyy | May 23, 2024 |
+| dd MMM yyyy | 23 May 2024 |
+| yyyy/MM/dd | 2024/05/23 |
+| MMMM, yyyy | May, 2024 |
+| yy/MM/dd | 24/05/23 |
+| dd/MM/yy | 23/05/24 |
+| yyyy | 2024 |
+
+---
+
+# Advanced Formula Functions
+
+Add `|` functions to format results:
+
+| Function | Example | Description |
+| -- | -- | -- |
+| `frontpart` | `{report:submit:from:email|frontpart}` → alice | Gets first word or string before `@` |
+| `substr:x` | `{report:policyname|substr:20}` → Sales Expenses | Trims to first `x` characters |
+| `substr:x:y` | `{report:policyname|substr:20|frontpart}` → Sales | Chains multiple functions |
+| `domain` | `{report:submit:from:email|domain}` → email.com | Returns email domain |
+
+</div>