Merge branch 'main' of github.com:Expensify/App into snyk-fix-b51ba1095f2dbeceede6adc51fe1f017

Author: pecanoro

README.md

@@ -27,6 +27,7 @@
 * [Expensify Code of Conduct](CODE_OF_CONDUCT.md)
 * [Contributor License Agreement](contributingGuides/CLA.md)
 * [React StrictMode](contributingGuides/STRICT_MODE.md)
+* [Left Hand Navigation(LHN)](contributingGuides/LEFT_HAND_NAVIGATION.md)
 
 ----
 

contributingGuides/LEFT_HAND_NAVIGATION.md

@@ -0,0 +1,44 @@
+## OVERVIEW
+
+The Left Hand Navigation (LHN) is designed to show different types of reports based on their status, user settings, and specific conditions. Each report type has unique visual indicators and sorting rules to help users quickly identify and prioritize their tasks.
+
+### Types of report displayed in the LHN
+
+The following outlines the expected behavior regarding which reports are displayed in the LHN:
+
+- The report currently being viewed by the user is highlighted as the active report in the LHN, making it easy for users to locate their focus point within the navigation.
+If a report has unresolved issues, like an unapproved expense or outstanding violations, it will display a red dot next to it, indicating urgent action is required. These reports are displayed at the top of the LHN list (under pinned chats) and sorted alphabetically by report name for easy access.
+- Reports that need user action, such as responding to a message that mentions them, completing an assigned task, or addressing an expense, will display a green dot next to them.  Additionally, if a system or concierge message indicates a trial period has expired and a payment method is missing, it will prompt the user with a similar green dot. This visual indicator helps users quickly identify where their attention is required.
+- If a user has started drafting a comment in a report, a pencil icon as indicator appears next to it in the LHN, letting users know there is an incomplete draft. These reports are sorted alphabetically by report name.
+- Pinned reports are always displayed at the top of the LHN list and are sorted alphabetically by name, giving quick access to reports the user wants to keep top-of-mind.
+- When the user has focus mode enabled, unread chat messages will display in bold in the LHN. This also applies to reports where notifications are hidden. Unread chats in focus mode are sorted alphabetically by report name to help users locate them more easily.
+- Archived reports are displayed in the LHN when the user is in default mode. These reports are shown with an indication that they are archived and are sorted by the date of the last visible action, with the most recent appearing first.
+- Self-DM messages will now be displayed in LHN. This allows users who want to track their own notes or messages in the LHN to do so without needing to look elsewhere.
+
+### Types of report excluded from the LHN
+
+Certain reports are excluded from the LHN to avoid clutter and to focus on relevant content for the user:
+
+- Reports that are explicitly marked as hidden.
+- Reports with no participants are not displayed, as they lack meaningful content.
+- If the user does not have permission to access a report (due to policy restrictions), it will not be shown.
+- Transaction threads that contain only one transaction are excluded.
+- If a report is an empty chat, unless it's a report user is actively looking at.
+- For users with domain-based email addresses, reports are hidden if the includeDomainEmail setting is disabled.
+- Reports with a parent message pending deletion.
+- When focus mode is enabled and there are no unread messages.
+
+### Sorting priorities for displayed report groups
+
+1. Pinned, RBR and attention-required (GBR) reports:
+    - Always sorted alphabetically by report name.
+2.  Error reports:
+    - Sorted alphabetically by report name.
+3.  Draft reports:
+    - Sorted alphabetically by report name.
+4. Non-Archived reports:
+    - In default mode, these are sorted by the lastVisibleActionCreated date, so the most recently updated reports appear first.
+    - In focus mode, these reports are sorted alphabetically by name for quicker navigation.
+5. Archived eports:
+    - In default mode, these are sorted by lastVisibleActionCreated, with recent reports displayed first.
+    - In focus mode, archived reports are sorted alphabetically by name.

docs/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md

@@ -18,7 +18,7 @@ This error occurs when the account applied as a category to the expense in Expen
 5. Click on the pencil icon on the right to check if you have "In multiple accounts" selected:
 6. If "In multiple accounts" is selected, go to Chart of Accounts and click Edit for the account in question.
 7. Check the billable option and select an income account within your chart of accounts
-8. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+8. Sync your QuickBooks Online connection in Settings > Workspaces > Workspace Name > Connections.
 9. Open the report and click the Export to button and then the QuickBooks Online option.
 
 # ExpensiError QBO046: Feature Not Included in Subscription
@@ -44,11 +44,11 @@ QuickBooks Online requires all expenses exported from Expensify to use a categor
 
 ## How to fix it
 
-1. Sync your QuickBooks Online connection in Expensify from Settings > Workspaces > [workspace name] > Connections, and click the **Sync Now** button.
+1. Sync your QuickBooks Online connection in Expensify from Settings > Workspaces > Workspace Name > Connections, and click the **Sync Now** button.
 2. Review the expenses on the report. If any appear with a red _Category no longer valid_ violation, recategorize the expense until all expenses are violation-free.
 3. Click the **Export t**o button and then the **QuickBooks Online** option.
     - If you receive the same error, continue.
-4. Note the categories used on the expenses and check the Settings > Workspaces > [workspace name] > Categories page to confirm the exact categories used on the report are enabled and connected to QuickBooks Online (you'll see a green QB icon next to all connected categories). 
+4. Note the categories used on the expenses and check the Settings > Workspaces > Workspace Name > Categories page to confirm the exact categories used on the report are enabled and connected to QuickBooks Online (you'll see a green QB icon next to all connected categories). 
 5. Confirm the categories used on the expenses in the report match exactly the accounts in your QuickBooks Online chart of accounts.
 6. If you make any changes in QuickBooks Online or in Expensify, always sync the connection and then try to export again. 
 
@@ -67,13 +67,13 @@ There are two different ways you can resolve this error.
 1. Log into QuickBooks Online.
 2. Access the Employee Records for your submitters. 
 3. Edit the name to differentiate them from the name they have on their account in Expensify.
-4. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+4. Sync your QuickBooks Online connection in Settings > Workspaces > Workspace Name > Connections.
 5. Open the report and click the Export to button and then the QuickBooks Online option.
 
 **Option 2**:
 1. Log into QuickBooks Online.
 2. Manually create all of your Vendor Records, making sure that the email matches the email address associated with the user in Expensify.
-    - In this case, we recommend disabling _Automatically Create Entities_ under Settings > Workspaces > [workspace name] > Connections > Configure > Advanced, so that you will receive the correct error messages when a vendor record doesn't exist.
+    - In this case, we recommend disabling _Automatically Create Entities_ under Settings > Workspaces > Workspace Name > Connections > Configure > Advanced, so that you will receive the correct error messages when a vendor record doesn't exist.
 
 # ExpensiError QBO097: When You Use Accounts Payable, You Must Choose a Vendor in the Name Field
 
@@ -84,8 +84,8 @@ This error occurs when you are exporting reimbursable expenses as Journal Entrie
 ## How to fix it
 
 There are three different ways you can resolve this error.
-- Select a different type of export for reimbursable expenses under Settings > Workspaces > [worksapce name] > Connections > Configure > Export tab. 
-- Enable _Automatically Create Entities_ under Settings > Workspaces > [workspace name] > Connections > Configure > Advanced to create vendor records automatically.
+- Select a different type of export for reimbursable expenses under Settings > Workspaces > Worksapce Name > Connections > Configure > Export tab. 
+- Enable _Automatically Create Entities_ under Settings > Workspaces > Workspace Name > Connections > Configure > Advanced to create vendor records automatically.
 - Manually create vendor records in QuickBooks Online for each employee.
 
 # ExpensiError QBO099: Items marked as billable must have sales information checked
@@ -102,7 +102,7 @@ This error occurs when an Item category on an expense does not have sales inform
 4. Check the option for **Sales**.
 5. Select an income account.
 6. Save your changes.
-7. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+7. Sync your QuickBooks Online connection in Settings > Workspaces > Workspace Name > Connections.
 8. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
 
 
@@ -116,7 +116,7 @@ _Note: This error message can also show up as, "QuickBooks Reconnect error: OAut
 
 ## How to fix it
 
-1. Navigate to Settings > Workspaces > Groups > [workspace name] > Connections.
+1. Navigate to Settings > Workspaces > Groups > Workspace Name > Connections.
 2. Click the **Sync Now** button.
 3. In the pop-up window, click **Reconnect** and enter your current QuickBooks Online credentials.
 
@@ -133,7 +133,7 @@ This error occurs when settings in QuickBooks Online are enabled to warn of dupl
 1. Log into QuickBooks Online.
 2. Navigate to Settings > Advanced. 
 3. Under the Other Preferences section, make sure "Warn if duplicate bill number is used" is set to "Off"
-4. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+4. Sync your QuickBooks Online connection in Settings > Workspaces > Workspace Name > Connections.
 5. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
 
 # Export error: QuickBooks Online: The transaction needs to be in the same currency as the A/R and A/P accounts
@@ -152,12 +152,12 @@ You can find the correct Vendor record by exporting your QuickBooks Online vendo
 If you have multiple Vendors with different currencies with the same email, Expensify is likely trying to export to the wrong one.
 
 1. Try removing the email address from the vendor in QuickBooks Online that you aren't trying to export to. 
-2. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections. 
+2. Sync your QuickBooks Online connection in Settings > Workspaces > Workspace Name > Connections. 
 3. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
 
 If this still fails, you'll need to confirm that the A/P account selected in Expensify is set to the correct currency for the export. 
 
-1. Navigate to Settings > Workspaces > [workspace name] > Connections.
+1. Navigate to Settings > Workspaces > Workspace Name > Connections.
 2. Under the Exports tab check that both A/P accounts are the correct currency.
 
 # Why are company card expenses exported to the wrong account in QuickBooks Online?
@@ -174,9 +174,9 @@ It’s important to note that expenses imported from a card linked at the indivi
 
 The user exporting the report must be a domain admin. You can check the history and comment section at the bottom of the report to see who exported the report.
 
-If your reports are being exported automatically by Concierge, the user listed as the Preferred Exporter under Settings > Workspaces > [workspace name] > Connections > click **Configure** must also be a domain admin. 
+If your reports are being exported automatically by Concierge, the user listed as the Preferred Exporter under Settings > Workspaces > Workspace Name > Connections > click **Configure** must also be a domain admin. 
 
-If the report exporter is not a domain admin, all company card expenses will export to the bank account set in Settings > Workspaces > [workspace name] > Connections > click **Configure** for non-reimbursable expenses. 
+If the report exporter is not a domain admin, all company card expenses will export to the bank account set in Settings > Workspaces > Workspace Name > Connections > click **Configure** for non-reimbursable expenses. 
 
 **Has the company card been mapped under the correct workspace?**
 

src/components/Button/index.tsx

@@ -290,7 +290,7 @@ function Button(
                 <View style={[isContentCentered ? styles.justifyContentCenter : styles.justifyContentBetween, styles.flexRow]}>
                     <View style={[styles.alignItemsCenter, styles.flexRow, styles.flexShrink1]}>
                         {!!icon && (
-                            <View style={[large ? styles.mr2 : styles.mr1, !text && styles.mr0, iconStyles]}>
+                            <View style={[styles.mr2, !text && styles.mr0, iconStyles]}>
                                 <Icon
                                     src={icon}
                                     fill={isHovered ? iconHoverFill ?? defaultFill : iconFill ?? defaultFill}

src/components/MoneyRequestConfirmationList.tsx

@@ -682,9 +682,12 @@ function MoneyRequestConfirmationList({
     useEffect(() => {
         let updatedTagsString = TransactionUtils.getTag(transaction);
         policyTagLists.forEach((tagList, index) => {
-            const enabledTags = Object.values(tagList.tags).filter((tag) => tag.enabled);
             const isTagListRequired = tagList.required ?? false;
-            if (!isTagListRequired || enabledTags.length !== 1 || TransactionUtils.getTag(transaction, index)) {
+            if (!isTagListRequired) {
+                return;
+            }
+            const enabledTags = Object.values(tagList.tags).filter((tag) => tag.enabled);
+            if (enabledTags.length !== 1 || TransactionUtils.getTag(transaction, index)) {
                 return;
             }
             updatedTagsString = IOUUtils.insertTagIntoTransactionTagsString(updatedTagsString, enabledTags.at(0)?.name ?? '', index);

src/components/Search/SearchStatusBar.tsx

@@ -180,7 +180,7 @@ function SearchStatusBar({queryJSON, onStatusChange}: SearchStatusBarProps) {
                     const query = SearchQueryUtils.buildSearchQueryString({...queryJSON, status: item.status});
                     Navigation.setParams({q: query});
                 });
-                const isActive = queryJSON.status === item.status;
+                const isActive = Array.isArray(queryJSON.status) ? queryJSON.status.includes(item.status) : queryJSON.status === item.status;
                 const isFirstItem = index === 0;
                 const isLastItem = index === options.length - 1;
 

src/components/Search/index.tsx

@@ -191,7 +191,11 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
 
     // There's a race condition in Onyx which makes it return data from the previous Search, so in addition to checking that the data is loaded
     // we also need to check that the searchResults matches the type and status of the current search
-    const isDataLoaded = searchResults?.data !== undefined && searchResults?.search?.type === type && searchResults?.search?.status === status;
+    const isDataLoaded =
+        searchResults?.data !== undefined && searchResults?.search?.type === type && Array.isArray(status)
+            ? searchResults?.search?.status === status.join(',')
+            : searchResults?.search?.status === status;
+
     const shouldShowLoadingState = !isOffline && !isDataLoaded;
     const shouldShowLoadingMoreItems = !shouldShowLoadingState && searchResults?.search?.isLoading && searchResults?.search?.offset > 0;
     const isSearchResultsEmpty = !searchResults?.data || SearchUIUtils.isSearchResultsEmpty(searchResults);
@@ -402,7 +406,7 @@ function Search({queryJSON, onSearchListScroll, contentContainerStyle}: SearchPr
     };
 
     const shouldShowYear = SearchUIUtils.shouldShowYear(searchResults?.data);
-    const shouldShowSorting = sortableSearchStatuses.includes(status);
+    const shouldShowSorting = Array.isArray(status) ? status.some((s) => sortableSearchStatuses.includes(s)) : sortableSearchStatuses.includes(status);
 
     return (
         <SelectionListWithModal<ReportListItemType | TransactionListItemType | ReportActionListItemType>

src/components/Search/types.ts

@@ -30,7 +30,7 @@ type ExpenseSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.EXPENSE>;
 type InvoiceSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.INVOICE>;
 type TripSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.TRIP>;
 type ChatSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.CHAT>;
-type SearchStatus = ExpenseSearchStatus | InvoiceSearchStatus | TripSearchStatus | ChatSearchStatus;
+type SearchStatus = ExpenseSearchStatus | InvoiceSearchStatus | TripSearchStatus | ChatSearchStatus | Array<ExpenseSearchStatus | InvoiceSearchStatus | TripSearchStatus | ChatSearchStatus>;
 
 type SearchContext = {
     currentSearchHash: number;

src/components/TabSelector/TabIcon.tsx

@@ -25,12 +25,14 @@ function TabIcon({icon, activeOpacity = 0, inactiveOpacity = 1}: TabIconProps) {
                         <Icon
                             src={icon}
                             fill={theme.icon}
+                            small
                         />
                     </Animated.View>
                     <Animated.View style={[StyleSheet.absoluteFill, {opacity: activeOpacity}]}>
                         <Icon
                             src={icon}
                             fill={theme.iconMenu}
+                            small
                         />
                     </Animated.View>
                 </>

src/libs/Firebase/index.native.ts

@@ -2,7 +2,7 @@
 import crashlytics from '@react-native-firebase/crashlytics';
 import perf from '@react-native-firebase/perf';
 import * as Environment from '@libs/Environment/Environment';
-import type {Log, StartTrace, StopTrace, TraceMap} from './types';
+import type {FirebaseAttributes, Log, StartTrace, StopTrace, TraceMap} from './types';
 import utils from './utils';
 
 const traceMap: TraceMap = {};
@@ -17,7 +17,7 @@ const startTrace: StartTrace = (customEventName) => {
         return;
     }
 
-    const attributes = utils.getAttributes();
+    const attributes: FirebaseAttributes = utils.getAttributes(['accountId', 'personalDetailsLength', 'reportActionsLength', 'reportsLength', 'policiesLength']);
 
     perf()
         .startTrace(customEventName)

src/libs/Firebase/index.web.ts

@@ -1,7 +1,7 @@
 import {trace} from '@firebase/performance';
 import * as Environment from '@libs/Environment/Environment';
 import {firebasePerfWeb} from './firebaseWebConfig';
-import type {Log, StartTrace, StopTrace, TraceMap} from './types';
+import type {FirebaseAttributes, Log, StartTrace, StopTrace, TraceMap} from './types';
 import utils from './utils';
 
 const traceMap: TraceMap = {};
@@ -19,7 +19,7 @@ const startTrace: StartTrace = (customEventName) => {
 
     const perfTrace = trace(firebasePerfWeb, customEventName);
 
-    const attributes = utils.getAttributes();
+    const attributes: FirebaseAttributes = utils.getAttributes(['accountId', 'personalDetailsLength', 'reportActionsLength', 'reportsLength', 'policiesLength']);
 
     Object.entries(attributes).forEach(([name, value]) => {
         perfTrace.putAttribute(name, value);

src/libs/Firebase/types.ts

@@ -9,7 +9,7 @@ type TraceMap = Record<string, Trace>;
 type StartTrace = (customEventName: string) => void;
 type StopTrace = (customEventName: string) => void;
 type Log = (action: string) => void;
-type FirebaseAttributes = {
+type PerfAttributes = {
     accountId: string;
     personalDetailsLength: string;
     reportsLength: string;
@@ -21,4 +21,7 @@ type FirebaseAttributes = {
     policyRole: string;
 };
 
-export type {StartTrace, StopTrace, TraceMap, Log, FirebaseAttributes};
+// TODO confirm which attributes are required for Firebase
+type FirebaseAttributes = Pick<PerfAttributes, 'accountId' | 'personalDetailsLength' | 'reportActionsLength' | 'reportsLength' | 'policiesLength'>;
+
+export type {StartTrace, StopTrace, TraceMap, Log, PerfAttributes, FirebaseAttributes};