Merge branch 'main' into remove-cache-eviction-code

Author: fabioh8010

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009034202
-        versionName "9.3.42-2"
+        versionCode 1009034302
+        versionName "9.3.43-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

@@ -84,7 +84,7 @@ This sends spans to the real Sentry project instead of the local console.
 
 Defined in `src/CONST/index.ts` under `CONST.TELEMETRY`:
 - Span names: `SPAN_OPEN_REPORT`, `SPAN_SEND_MESSAGE`
-- Tag names: `TAG_ACTIVE_POLICY`, `TAG_AUTHENTICATION_ERROR_TYPE`
+- Tag names: `TAGS.ACTIVE_POLICY`, `TAGS.AUTHENTICATION_ERROR_TYPE`
 - Attribute names: `ATTRIBUTE_REPORT_ID`, `ATTRIBUTE_MESSAGE_LENGTH`
 - Configuration: `CONFIG.SKELETON_MIN_DURATION`
 
@@ -163,7 +163,9 @@ Add span name, tags, and attributes to `src/CONST/index.ts`:
 ```typescript
 TELEMETRY: {
     SPAN_YOUR_OPERATION: 'ManualYourOperation',
-    TAG_YOUR_TAG: 'your_tag',
+    TAGS: {
+        YOUR_TAG: 'your_tag',
+    },
     ATTRIBUTE_YOUR_ATTR: 'your_attr'
 }
 ```
@@ -182,7 +184,7 @@ startSpan(spanId, {
 ```typescript
 const span = getSpan(spanId);
 span?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_YOUR_ATTR, value);
-span?.setTag(CONST.TELEMETRY.TAG_YOUR_TAG, value);
+span?.setTag(CONST.TELEMETRY.TAGS.YOUR_TAG, value);
 ```
 
 #### 5. Finish Span

assets/fonts/web/CustomEmojiWebFont.ttf

@@ -137,7 +137,7 @@ This document lists all implemented telemetry metrics in the Expensify App.
 
 ### Authentication Failures
 
-**Constants**: `CONST.TELEMETRY.TAG_AUTHENTICATION_FUNCTION`, `CONST.TELEMETRY.TAG_AUTHENTICATION_ERROR_TYPE`, `CONST.TELEMETRY.TAG_AUTHENTICATION_JSON_CODE` ([`src/CONST/index.ts`](https://github.com/Expensify/App/blob/8f123f449f1a4533830b18a1040c9a5f1949821d/src/CONST/index.ts#L1700-L1702))
+**Constants**: `CONST.TELEMETRY.TAGS.AUTHENTICATION_FUNCTION`, `CONST.TELEMETRY.TAGS.AUTHENTICATION_ERROR_TYPE`, `CONST.TELEMETRY.TAGS.AUTHENTICATION_JSON_CODE` ([`src/CONST/index.ts`](https://github.com/Expensify/App/blob/8f123f449f1a4533830b18a1040c9a5f1949821d/src/CONST/index.ts#L1700-L1702))
 **What's Measured**: Number of authentication failures tracked via `Sentry.captureException()` using [`trackAuthenticationError()`](https://github.com/Expensify/App/blob/8f123f449f1a4533830b18a1040c9a5f1949821d/src/libs/telemetry/trackAuthenticationError.ts#L23)
 **Error Types**:
 - `missing_params`: Missing required auth parameters ([`Authentication.ts:66`](https://github.com/Expensify/App/blob/8f123f449f1a4533830b18a1040c9a5f1949821d/src/libs/Authentication.ts#L66))

contributingGuides/OBSERVABILITY.md

@@ -99,7 +99,7 @@ Some expense actions are not currently supported in chat, but may be added in th
 - Attaching a receipt to an existing transaction via chat
 - Tagging expenses based on past behavior 
 
-If you request these actions, Concierge will notify you that the feature is not yet available."
+If you request these actions, Concierge will notify you that the feature is not yet available.
 
 ---
 

contributingGuides/OBSERVABILITY_METRICS.md

@@ -1,7 +1,8 @@
 ---
 title: Attach and edit receipts on expenses
 description: Learn how to properly attach, verify, and troubleshoot receipts on expenses in New Expensify for audits and accounting.
-keywords: [attach receipt, verify receipt, missing receipt, expense attachments, audit trail, New Expensify, receipt not showing]
+keywords: [New Expensify,attach receipt, verify receipt, missing receipt, expense attachments, audit trail, New Expensify, receipt not showing, crop receipt, rotate receipt, trim receipt]
+internalScope: Audience is Expensify members and Workspace Admins. Covers attaching, replacing, and cropping receipts on expenses. Does not cover SmartScan configuration or receipt forwarding via email.
 ---
 
 <div id="new-expensify" markdown="1">
@@ -41,15 +42,20 @@ Attaching receipts in the report comment thread does **not** link them to any ex
 
 ## How to replace an existing receipt
 
-**On web:**
-1. Open the expense and click on the receipt image. 
-2. Click the three dots > **Replace**.
-3. Click **Choose file** to add the receipt image file. 
+1. Open the expense and click on the receipt image.
+2. Click **Replace**.
+3. Take a photo or upload a receipt image file from your device.
 
-**On mobile:**
-1. Open the expense and tap the receipt image.
-2. Tap the three dots > **Replace**.
-3. Take a photo or upload a file from your device image gallery.
+## How to crop a receipt image
+
+You can crop a receipt image to remove unnecessary areas or focus on specific details.
+
+1. Open the expense and click on the receipt image.
+2. Click **Crop**.
+3. Drag the corners or edges of the crop rectangle to select the area you want to keep.
+4. Click **Save**.
+
+The cropped image will replace the original receipt on the expense.
 
 ---
 
@@ -105,5 +111,8 @@ Only the expense creator or a Workspace Admin can attach a receipt an expense.
 ## Will auditors see receipts added in report comments?
 No. Receipts in the comments section are considered supplemental and are not included in audits, exports, or downloadable reports.
 
+## Can I crop or rotate an eReceipt?
+No. The **Crop** and **Rotate** buttons are only available for image receipts that you uploaded or scanned. eReceipts cannot be cropped or rotated.
+
 ## Can I attach both the card and itemized restaurant receipts?
 Yes. Attach the **card receipt** to the expense itself, and upload the **itemized receipt** in the report comments as supporting documentation.

docs/articles/new-expensify/concierge-ai/Expense-Assistant.md

@@ -0,0 +1,99 @@
+---
+title: How to Delete Expenses
+description: Learn how to delete expenses in New Expensify, including how to remove expenses from reports, when you need to retract a report, and why some expenses can’t be deleted.
+keywords: [New Expensify, delete expenses, remove expense, delete expense report, company card expense delete, retract report delete expense, cannot delete expense Expensify]
+internalScope: Audience includes all members. Covers deleting individual expenses, deleting expenses from reports, retracting reports to enable deletion, company card deletion rules. Does not cover editing expenses, reimbursement workflows, expense approvals beyond deletion requirements.
+---
+
+# How to delete expenses 
+
+Deleting an expense depends on the expense type and the report status.
+
+Most expenses can be deleted directly. If an expense is on a submitted report or comes from a company card, you may need to take additional steps first.
+
+---
+
+## How to delete a single expense 
+
+1. Open the expense you want to delete. 
+2. From the expense, choose **More**.
+3. Choose **Delete**.
+
+---
+
+## How to delete multiple expenses
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile) select **Reports** > **Expenses**.
+2. Select the expenses you want to delete.
+3. Choose **Selected**, then **Delete**.
+
+**Note:** You can only delete your own Unreported, Draft, and Outstanding expenses. You can’t delete expenses created by other members.
+
+---
+
+## How to delete an expense from a report 
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile) select **Reports** > **Expenses**.
+2. Open the report that contains the expense.
+3. Select the expense you want to delete.
+4. Choose **Selected**, then **Delete**.
+
+**Note:** You can only delete expenses from your own Unreported, Draft, and Outstanding reports. If the report is Approved, Done or Paid, it will need to be retracted first before deleting the expense. [Learn how to retract a report](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Edit-Expense-Reports). 
+
+---
+
+## Why you can’t delete an expense
+
+Expenses can only be deleted when certain conditions are met.
+
+<!-- ADD LINK:
+link helpdot page explaining expense icons and what they mean
+https://github.com/Expensify/Expensify/issues/614406
+-->
+
+**Cash expenses can be deleted when:** 
+
+ - The expense was created by you.
+ - The expense is a manual cash expense, distance expense, or SmartScanned receipt. 
+ - The expense is Unreported or on a Draft or Outstanding report.
+
+**Imported company card expenses can be deleted when:**
+
+ - The workspace setting **Allow deleting transactions** was enabled at the time the expense was imported
+ - The expense is Unreported or on a Draft or Outstanding report
+
+If an expense can't be deleted, you can [remove the expense from the report](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report#how-to-move-or-remove-expenses-from-a-report) and move it to your personal space instead. 
+
+---
+ 
+# FAQ
+
+## How can I delete another member's expenses? 
+
+You can only delete expenses in your own account.
+
+If you need access to another member’s expenses, ask them to [add you as a Copilot](https://help.expensify.com/articles/new-expensify/settings/Copilot-Access). This allows you to manage expenses on their behalf.
+
+## How can a Workspace Admin allow members to delete company card expenses?
+
+Workspace Admins can allow deletion of future imported company card expenses by enabling **Allow deleting transactions**. 
+
+To enable this setting on a Workspace feed: 
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile), select **Workspaces > [Workspace Name] > Company cards**.
+2. Click **Settings**.
+3. Enable **Allow deleting transactions**.
+
+**Note:** This setting only applies to expenses imported after it’s enabled.
+
+## How can a Workspace Admin delete company card expenses imported after a certain date? 
+
+Workspace Admins can remove certain imported expenses by unassigning a card.
+
+To unassign a company card on a workspace feed: 
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile) select **Workspaces > [Workspace Name] > Company cards**.
+2. Select the card. 
+3. Click **Unassign Card**. 
+
+**Note:** This permanently deletes all Unreported and Draft expenses on that card. Expenses on Outstanding, Approved, Done, or Paid reports aren’t deleted.