Merge

.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts

@@ -24,6 +24,9 @@ const run = (): boolean => {
 
 =======
         const measurement = regressionOutput.countChanged[i];
+<<<<<<< HEAD
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
         const baseline: MeasureEntry = measurement.baseline;
         const current: MeasureEntry = measurement.current;

src/components/ButtonWithDropdownMenu/index.tsx

@@ -175,8 +175,11 @@ function ButtonWithDropdownMenu<IValueType>({
 =======
                     onPress={(event) => onPress(event, options[0].value)}
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
                     large={buttonSize === CONST.DROPDOWN_BUTTON_SIZE.LARGE}
                     medium={buttonSize === CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}

src/components/LHNOptionsList/OptionRowLHN.tsx

@@ -211,11 +211,15 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                                     }
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
 =======
 
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
+
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
                                     // Prevent composer blur on left click
                                     event.preventDefault();
@@ -252,13 +256,18 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                                                 <SubscriptAvatar
                                                     backgroundColor={hovered && !isFocused ? hoveredBackgroundColor : subscriptAvatarBorderColor}
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                                                     mainAvatar={optionItem.icons.at(0)}
                                                     secondaryAvatar={optionItem.icons.at(1)}
 =======
                                                     mainAvatar={optionItem.icons[0]}
                                                     secondaryAvatar={optionItem.icons[1]}
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+                                                    mainAvatar={optionItem.icons[0]}
+                                                    secondaryAvatar={optionItem.icons[1]}
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
                                                     mainAvatar={optionItem.icons[0]}
                                                     secondaryAvatar={optionItem.icons[1]}

src/components/RoomHeaderAvatars.tsx

@@ -46,10 +46,13 @@ function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) {
                 style={styles.noOutline}
                 onPress={() => navigateToAvatarPage(icons[0])}
                 accessibilityRole={CONST.ROLE.BUTTON}
+<<<<<<< HEAD
 <<<<<<< HEAD
                 accessibilityLabel={icon.name ?? ''}
                 disabled={icon.source === Expensicons.FallbackAvatar}
 =======
+=======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
                 accessibilityLabel={icons[0].name ?? ''}
                 disabled={icons[0].source === Expensicons.FallbackAvatar}
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/libs/SearchUtils.ts

@@ -719,8 +719,11 @@ function buildFilterString(filterName: string, queryFilters: QueryFilter[], deli
 =======
         if ((queryFilter.operator === 'eq' && queryFilters[index - 1]?.operator === 'eq') || (queryFilter.operator === 'neq' && queryFilters[index - 1]?.operator === 'neq')) {
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
             filterValueString += `${delimiter}${sanitizeString(queryFilter.value.toString())}`;
         } else {

src/libs/SidebarUtils.ts

@@ -304,10 +304,13 @@ function getOptionData({
 
     const participantPersonalDetailList = Object.values(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails));
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     const personalDetail = participantPersonalDetailList.at(0) ?? ({} as PersonalDetails);
 =======
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
     const personalDetail = participantPersonalDetailList[0] ?? {};
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52

src/libs/actions/Workflow.ts

@@ -127,8 +127,11 @@ function updateApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWork
 =======
     const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers[0].email : undefined;
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
     const previousEmployeeList = Object.fromEntries(Object.entries(policy.employeeList ?? {}).map(([key, value]) => [key, {...value, pendingAction: null}]));
     const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({

src/pages/home/ReportScreen.tsx

@@ -720,12 +720,16 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
         Report.readNewestAction(report.reportID);
     }, [report]);
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     const mostRecentReportAction = reportActions.at(0);
 =======
     const mostRecentReportAction = reportActions[0];
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+    const mostRecentReportAction = reportActions[0];
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
     const mostRecentReportAction = reportActions[0];
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/pages/home/report/ReportActionsList.tsx

@@ -288,8 +288,11 @@ function ReportActionsList({
 =======
         const mostRecentReportActionCreated = sortedVisibleReportActions[0]?.created ?? '';
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
         if (mostRecentReportActionCreated === unreadMarkerTime) {
             return;

src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx

@@ -153,11 +153,15 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
                     CONST.POLICY.CONNECTIONS.NAME.QBO,
                     CONST.QUICKBOOKS_CONFIG.COLLECTION_ACCOUNT_ID,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions].at(0)?.id,
 =======
                     isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id,
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+                    isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id,
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
                     isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id,
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx

@@ -72,11 +72,15 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
                     {
                         [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                         [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts.at(0),
 =======
                         [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+                        [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
                         [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
@@ -105,11 +109,15 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
             onSelectRow={(selection: SelectorType) => selectExportCompanyCard(selection as MenuItem)}
             shouldSingleExecuteRowSelect
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             initiallyFocusedOptionKey={sections.at(0)?.data.find((mode) => mode.isSelected)?.keyForList}
 =======
             initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+            initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
             initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx

@@ -75,11 +75,15 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
             onSelectRow={selectVendor}
             shouldSingleExecuteRowSelect
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
             initiallyFocusedOptionKey={sections.at(0)?.data.find((mode) => mode.isSelected)?.keyForList}
 =======
             initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+            initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
             initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx

@@ -91,11 +91,15 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
                     {
                         [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                         [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts.at(0),
 =======
                         [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
 >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52
+=======
+                        [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
 =======
                         [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa

src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx

@@ -75,6 +75,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
             {!isMultiLevelTags && (
                 <OfflineWithFeedback
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
                     errors={policyTags?.[policyTagLists.at(0)?.name ?? '']?.errors}
                     onClose={() => Tag.clearPolicyTagListErrors(policyID, policyTagLists.at(0)?.orderWeight ?? 0)}
@@ -116,6 +117,8 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
                     </View>
 =======
 =======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
                     errors={policyTags?.[policyTagLists[0]?.name]?.errors}
                     onClose={() => Tag.clearPolicyTagListErrors(policyID, policyTagLists[0].orderWeight)}
@@ -185,6 +188,33 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
                     </View>
                 </OfflineWithFeedback>
             )}
+            <OfflineWithFeedback
+                errors={policy?.errorFields?.requiresTag}
+                pendingAction={policy?.pendingFields?.requiresTag}
+                errorRowStyles={styles.mh5}
+            >
+                <View style={[styles.flexRow, styles.mh5, styles.mv4, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                    <Text style={[styles.textNormal]}>{translate('workspace.tags.requiresTag')}</Text>
+                    <Switch
+                        isOn={policy?.requiresTag ?? false}
+                        accessibilityLabel={translate('workspace.tags.requiresTag')}
+                        onToggle={updateWorkspaceRequiresTag}
+                        disabled={!policy?.areTagsEnabled || !hasEnabledOptions}
+                    />
+                </View>
+            </OfflineWithFeedback>
+            {canUseWorkspaceRules && policy?.areRulesEnabled && (
+                <OfflineWithFeedback pendingAction={billableExpensesPending(policy)}>
+                    <View style={[styles.flexRow, styles.mh5, styles.mv4, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                        <Text style={[styles.textNormal]}>{translate('workspace.tags.trackBillable')}</Text>
+                        <Switch
+                            isOn={!(policy?.disabledFields?.defaultBillable ?? false)}
+                            accessibilityLabel={translate('workspace.tags.trackBillable')}
+                            onToggle={() => toggleBillableExpenses(policy)}
+                        />
+                    </View>
+                </OfflineWithFeedback>
+            )}
         </View>
     );
     return (

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

@@ -246,6 +246,22 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
         [translate, styles.textSupporting, styles.pb10],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TurtleInShell}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workflowsPage.emptyContent.title')}
+                subtitle={translate('workflowsPage.emptyContent.approverSubtitle')}
+                subtitleStyle={styles.textSupporting}
+                containerStyle={styles.pb10}
+                contentFitImage="contain"
+            />
+        ),
+        [translate, styles.textSupporting, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx

@@ -59,18 +59,24 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
             return;
         }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
         // Remove the approval workflow using the initial data as it could be already edited
         Workflow.removeApprovalWorkflow(route.params.policyID, initialApprovalWorkflow);
         setIsDeleteModalVisible(false);
         Navigation.dismissModal();
 =======
+=======
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
         setIsDeleteModalVisible(false);
         Navigation.dismissModal();
         InteractionManager.runAfterInteractions(() => {
             // Remove the approval workflow using the initial data as it could be already edited
             Workflow.removeApprovalWorkflow(route.params.policyID, initialApprovalWorkflow);
         });
+<<<<<<< HEAD
+>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
+=======
 >>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa
     }, [initialApprovalWorkflow, route.params.policyID]);
 

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx

@@ -226,6 +226,22 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
         [translate, styles.textSupporting, styles.pb10],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TurtleInShell}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workflowsPage.emptyContent.title')}
+                subtitle={translate('workflowsPage.emptyContent.expensesFromSubtitle')}
+                subtitleStyle={styles.textSupporting}
+                containerStyle={styles.pb10}
+                contentFitImage="contain"
+            />
+        ),
+        [translate, styles.textSupporting, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={route.params.policyID}