Merge branch 'main' into chore/66574-refactor-policy-to-use-useonyx-3

Author: bernhardoj

.claude/settings.json

@@ -6,7 +6,7 @@
                 "hooks": [
                     {
                         "type": "command",
-                        "command": "FILE=$(jq -r '.tool_input.file_path') && [ -f \"$FILE\" ] && ./node_modules/.bin/prettier --experimental-cli --write --ignore-unknown \"$FILE\""
+                        "command": "FILE=$(jq -r '.tool_input.file_path') && [ -f \"$FILE\" ] && ./node_modules/.bin/prettier --experimental-cli --no-cache --write --ignore-unknown \"$FILE\""
                     }
                 ]
             }

.storybook/preview.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import type {Parameters} from 'storybook/internal/types';
-import {EnvironmentProvider} from '@components/EnvironmentContext';
+import EnvironmentProvider from '@components/EnvironmentContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import {SearchContextProvider} from '@components/Search/SearchContext';
 import ComposeProviders from '@src/components/ComposeProviders';

Mobile-Expensify

@@ -1,57 +1,101 @@
 ---
 title: Merge Expenses
-description: Learn how to merge two expenses to eliminate duplicates and simplify your reports.
-keywords: [New Expensify, merge expenses, duplicate expenses, SmartScan, manual merge, combine expenses, combine duplicate expenses, merge receipts, expense matching]
+description: Learn how to merge duplicate expenses in Expensify, including cash and card transactions, eligibility rules, and step-by-step instructions for web and mobile.
+keywords: [merge expenses, duplicate expenses, combine expenses, merge duplicate expenses, merge receipts, SmartScan duplicate, cash expense, card expense, expense matching, fix duplicate expense]
+internalScope: Audience is all members. Covers manually merging duplicate expenses and eligibility rules. Does not cover SmartScan automation logic or expense deletion workflows.
 ---
 
 
 Use merging to resolve duplicates when SmartScan doesn’t catch them. This guide walks you through manually merging two expenses from the expense view or Reports page.
 
 # Merge expenses
 
-You can merge two expenses if at least one is a cash expense. You cannot merge two card expenses. Merging is only available for editable expenses (such as those that are unsubmitted or awaiting first-level approval).
+If you have duplicate expenses that SmartScan didn’t automatically match, you can manually merge them. Merging helps clean up duplicates and keeps your reports accurate.
 
-## Merging from an individual expense
+You can merge:
+- Two cash expenses
+- One cash expense and one card expense
+
+You cannot merge two card expenses.
+
+---
+
+## Who can merge expenses 
+
+You can merge expenses if you have permission to edit both expenses.
+
+- **Submitters** can merge their own:
+  - Unreported expenses  
+  - Expenses on Draft reports  
+  - Expenses on Outstanding reports  
+
+- **Approvers and Workspace Admins** can merge expenses on the same Draft or Outstanding report.
+
+You cannot merge expenses that are fully approved or paid.
+
+---
+
+## What types of expenses can be merged 
+
+To merge two expenses, one of the following must be true:
+
+- Both expenses are cash expenses  
+- One expense is a cash expense and the other is an imported card expense  
+
+You cannot merge two imported card expenses.
+
+Note: Merging does not convert expense types.
+
+---
+
+## How to merge duplicate expenses from an individual expense
 
 1. In the navigation tabs (on the left on web, and at the bottom on mobile), select **Reports > Expenses**
-2. Tap the expense you'd like to merge from.
-3. Tap the **More** button, then select **Merge**.
-4. Choose another eligible expense to merge with.
-   - You can only select one.
-   - Expenses are sorted by date (newest first).
-   - If there are no eligible matches, you'll see:
-     *"You don’t have any expenses that can be merged with this one. [Learn more](#eligible-expenses)."*
-5. If only one expense has a receipt, it’s selected automatically. If both do, you’ll be asked to choose.
-6. Select the details you want to keep from each expense—like merchant name, amount, or category.
-7. Tap **Continue**, then **Confirm** to complete the merge.
+2. Click on the expense you want to merge to open it. 
+3. Choose **More**, then select **Merge**.
+4. Choose one eligible expense to merge with.
+5. If both expenses have receipts, select which receipt to keep.
+6. Choose the details to keep from each expense such as merchant name, date or report.
+7. Select **Continue**, then **Merge expenses**.
+
+---
 
-## Eligible expenses for merging
+## How to merge duplicate expenses from the Expenses page
 
-To merge two expenses, they must meet all of the following:
+Use this method when you already see both duplicate expenses in a list.
 
-- **By type**:
-  - You can merge a cash expense with another cash expense, or a cash expense with a card expense.
-  - You cannot merge two card expenses.
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), select **Reports > Expenses**
+2. Select two expenses to merge.
+3. Choose **Selected**, then select **Merge**.
+4. If both expenses have receipts, select the one you want to keep.
+5. Choose the details to keep from each expense such as merchant name, date or report. 
+6. Select **Continue**, then **Merge expenses**.
 
-- **By permission**:
-  - **Submitters** can merge their own expenses (including unreported and in-progress ones).
-  - **Approvers and Admins** can merge expenses on the same report
+---
 
-- **By status**:
-  - Both expenses must be editable. That includes unreported expenses, or ones on a Draft or Outstanding report that hasn’t yet been approved.
+## What happens when expenses are merged
 
-## What happens when you merge?
+When you merge expenses:
 
-- One expense is kept, and the details you choose will be used for the final version.
-- The other expense is **merged into the final one** and no longer shown separately.
-- If one expense is a card transaction, it will always be the one that’s kept.
-- If both are cash expenses, the one you started the merge from will be kept.
+- One expense becomes the final expense.
+- The other expense is merged into it and no longer appears separately.
+- The details you selected are applied to the final expense.
 
-## Can I change an expense from cash to credit card?
-You can’t change an expense from cash to credit card, or the other way around.  
+**Additional rules:**
 
-- Expenses imported directly from a connected credit card are always **credit card expenses**.  
-- Expenses you create manually, or those created from uploaded receipts, are always **cash expenses**.  
+- If one expense is a card transaction, the card expense is always kept.
+- If both expenses are cash expenses, the one you started the merge from is kept.
+
+---
+
+## Can expenses be converted from cash to card?
+
+You can’t change an expense from cash to card, or card to cash.
+
+- Expenses imported directly from a connected credit card are always **card expenses**.  
+- Expenses you create manually or from uploaded receipts are always **cash expenses**.  
+
+---
 
 # FAQ
 
@@ -61,18 +105,20 @@ No. Only one card expense can be part of a merge. You can merge:
 - Two cash expenses
 - One cash and one card expense
 
-## What happens to the other expense?
+## What happens to the other expense after merging?
 
-It’s merged into the final expense and no longer appears separately. Its details are combined based on what you selected.
+The second expense is merged into the final expense and no longer appears separately. The final expense reflects the details you selected during the merge process.
 
 ## What if the expenses have the same details?
 
-If there are no differences to resolve, the system automatically keeps the shared values without prompting you.
+If there are no differences between the two expenses, Expensify automatically keeps the shared values without prompting you to choose.
+
+## Why is the Merge option not showing?
 
-## Why don’t I see the Merge option?
+You won’t see **Merge** if:
 
-Check these conditions:
-- You must have permission to edit both expenses.
-- At least one expense must be a cash transaction.
-- The expenses must be editable (not submitted or fully approved).
+- You don’t have permission to edit both expenses.
+- Both expenses are card transactions.
+- One or both expenses are fully approved or paid.
+- The expenses are no longer editable.
 

docs/articles/new-expensify/reports-and-expenses/Merging-expenses.md

@@ -0,0 +1,95 @@
+---
+title: Fringe Benefits
+description: How to track your Fringe Benefits
+internalScope: Audience is Workspace Admins and Workspace Members. Covers setting up Fringe Benefits Tax tracking, submitting FBT expenses, and exporting FBT data. Does not cover general tag setup, non-FBT payroll codes, or non-FBT CSV reporting.
+keywords: [New Expensify, fringe benefits tax, FBT, track fringe benefits, attendee count, workspace tags, CSV export fringe benefits, fringe benefits reporting, payroll code]
+---
+
+# How to track Fringe Benefits Tax
+
+If you need to track and report expense data for **Fringe Benefits Tax (FBT)**, Expensify offers a workflow to capture the required information and export it to a spreadsheet.  
+
+---  
+
+## How to set up Fringe Benefits Tax tracking
+
+This section covers the **one-time Workspace Admin setup** required to enable Fringe Benefits Tax tracking.
+
+## Add attendee count tags for Fringe Benefits Tax
+
+To start tracking FBT, add the following tags to your **Workspace**:  
+- **Number of Internal Attendees**  
+- **Number of External Attendees**  
+
+These tags **must be named exactly** as written above, without extra spaces.  
+
+## How to create attendee count tags for Fringe Benefits Tax
+
+1. Navigate to **Workspaces > [Workspace Name] > Tags**.  
+2. Create tags with numeric values (for example, **01, 02, 03**) up to your expected maximum number of attendees.
+3. These tags can be used alongside existing accounting tags.
+   
+For more detailed guidance, see [Configure Tags on a Workspace](https://help.expensify.com/articles/new-expensify/workspaces/Create-expense-tags).
+
+## How to add the Fringe Benefits Tax payroll code
+
+1. Navigate to **Workspaces > [Workspace Name] > Categories**.  
+2. Select the category you want to track for Fringe Benefits Tax.
+3. Add the payroll code **TAG**.
+
+For more detailed guidance, see [Create expense tags](https://help.expensify.com/articles/new-expensify/workspaces/Create-expense-tags).
+
+---
+
+## How to enable the Fringe Benefits Tax workflow
+
+After adding the attendee count tags and payroll code, email **concierge@expensify.com** with the following request:
+
+> **Subject:** Enable Fringe Benefits Tax Workflow  
+> **Message:** Can you please add the custom workflow/DEW named **FRINGE_BENEFIT_TAX** to my company workspace named **[Workspace Name]**?
+
+Once enabled, expenses coded with **TAG** will require attendee count tags before they can be submitted.
+
+---  
+
+## How Workspace Members submit Fringe Benefits Tax expenses
+
+This section applies to **Workspace Members submitting expenses** under Fringe Benefits Tax categories.
+
+- When submitting expenses under **FBT-tracked categories**, both internal and external attendee counts are **required**.
+- If attendee counts are missing, the expense **cannot be submitted**.  
+
+---  
+
+## How Workspace Admins export Fringe Benefits Tax data
+
+This section applies to **Workspace Admins reporting and exporting** Fringe Benefits Tax data. 
+
+## How to export Fringe Benefits Tax data using CSV
+
+Before exporting, you must create a custom CSV template and add the formulas needed to capture attendee counts.
+
+**Note:** Creating custom CSV templates is currently only available in Expensify Classic. This limitation applies only to template setup, not to exporting reports.
+
+Add the following formulas to your CSV template:
+- `{expense:tag:ntag-3}` → **Internal Attendees**
+- `{expense:tag:ntag-4}` → **External Attendees**
+
+For instructions on creating a custom CSV template, see [Create a custom export template](https://help.expensify.com/articles/expensify-classic/spending-insights/Export-Expenses-And-Reports#create-a-custom-export-template).
+
+Once your template is set up, export expenses using the custom CSV template to capture Fringe Benefit Tax data. 
+
+For more detailed guidance on exporting expenses, see [Download via CSV](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses#export-as-csv).
+
+## Example of Fringe Benefits Tax expense coding levels
+
+If your Workspace uses multiple coding levels, a Fringe Benefits Tax report may include:
+
+- **GL Code** (Category)  
+- **Department** (Tag 1)  
+- **Location** (Tag 2)  
+- **Number of Internal Attendees** (Tag 3)  
+- **Number of External Attendees** (Tag 4)  
+
+For more details on exporting data, see [Search and download expenses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Search-and-Download-Expenses#export-as-csv).
+

docs/articles/new-expensify/workspaces/Fringe-Benefits.md

@@ -51,9 +51,9 @@
     "shellcheck": "./scripts/shellCheck.sh",
     "spell": "cspell --color **/*",
     "spell-changed": "cspell --color --no-must-find-files",
-    "prettier": "./scripts/runPrettier.sh",
-    "prettier-changed": "prettier --experimental-cli --write --ignore-unknown $(git diff --diff-filter=AMR --name-only origin/main HEAD)",
-    "prettier-watch": "onchange \"**/*.{js,mjs,ts,tsx}\" -- prettier --experimental-cli --write --ignore-unknown {{changed}}",
+    "prettier": "prettier --experimental-cli --no-cache --write .",
+    "prettier-changed": "prettier --experimental-cli --no-cache --write --ignore-unknown $(git diff --diff-filter=AMR --name-only origin/main HEAD)",
+    "prettier-watch": "onchange \"**/*.{js,mjs,ts,tsx}\" -- prettier --experimental-cli --no-cache --write --ignore-unknown {{changed}}",
     "print-version": "echo $npm_package_version",
     "storybook": "storybook dev -p 6006",
     "storybook-build": "ENV=production storybook build -o dist/docs",

package.json

@@ -93,6 +93,13 @@ async function main() {
         '**/*.config.js',
         '**/*.config.mjs',
         '**/eslint.config.mjs', // ESLint config itself might reference these for the rule
+        // Non-component .ts files that can't use hooks — icons are passed in as parameters from callers
+        'src/libs/ReportUtils.ts',
+        'src/libs/HeaderUtils.ts',
+        'src/libs/actions/Task.ts',
+        'src/libs/OptionsListUtils/index.ts',
+        'src/hooks/useAvatarMenu.ts',
+        'src/libs/PersonalDetailOptionsListUtils/index.ts',
     ];
 
     // Find all TypeScript files in src directory

scripts/checkLazyLoading.ts

@@ -13,7 +13,7 @@ import ComposeProviders from './components/ComposeProviders';
 import {CurrentUserPersonalDetailsProvider} from './components/CurrentUserPersonalDetailsProvider';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
 import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
-import {EnvironmentProvider} from './components/EnvironmentContext';
+import EnvironmentProvider from './components/EnvironmentContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
 import FullScreenBlockingViewContextProvider from './components/FullScreenBlockingViewContextProvider';
 import FullScreenLoaderContextProvider from './components/FullScreenLoaderContext';
@@ -36,8 +36,8 @@ import SidePanelContextProvider from './components/SidePanel/SidePanelContextPro
 import SVGDefinitionsProvider from './components/SVGDefinitionsProvider';
 import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
 import ThemeProvider from './components/ThemeProvider';
-import ThemeStylesProvider from './components/ThemeStylesProvider';
-import {FullScreenContextProvider} from './components/VideoPlayerContexts/FullScreenContext';
+import ThemeStylesProvider from './components/ThemeStylesContextProvider';
+import FullScreenContextProvider from './components/VideoPlayerContexts/FullScreenContextProvider';
 import {PlaybackContextProvider} from './components/VideoPlayerContexts/PlaybackContext';
 import {VideoPopoverMenuContextProvider} from './components/VideoPlayerContexts/VideoPopoverMenuContext';
 import {VolumeContextProvider} from './components/VideoPlayerContexts/VolumeContext';