diff --git a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts index c039e0581c9a..3134fb3a41ef 100644 --- a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts +++ b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts @@ -15,12 +15,16 @@ const run = (): boolean => { console.log(`Processing ${regressionOutput.countChanged.length} measurements...`); for (let i = 0; i < regressionOutput.countChanged.length; i++) { +<<<<<<< HEAD const measurement = regressionOutput.countChanged.at(i); if (!measurement) { continue; } +======= + const measurement = regressionOutput.countChanged[i]; +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa const baseline: MeasureEntry = measurement.baseline; const current: MeasureEntry = measurement.current; diff --git a/docs/articles/new-expensify/expenses-&-payments/pay-an-invoice.md b/docs/articles/new-expensify/expenses-&-payments/Pay-an-invoice.md similarity index 100% rename from docs/articles/new-expensify/expenses-&-payments/pay-an-invoice.md rename to docs/articles/new-expensify/expenses-&-payments/Pay-an-invoice.md diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx index 71fe3d919e66..d6c21d741378 100644 --- a/src/components/ButtonWithDropdownMenu/index.tsx +++ b/src/components/ButtonWithDropdownMenu/index.tsx @@ -174,7 +174,10 @@ function ButtonWithDropdownMenu({ }} ======= onPress={(event) => onPress(event, options[0].value)} +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa large={buttonSize === CONST.DROPDOWN_BUTTON_SIZE.LARGE} medium={buttonSize === CONST.DROPDOWN_BUTTON_SIZE.MEDIUM} small={buttonSize === CONST.DROPDOWN_BUTTON_SIZE.SMALL} diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx index a4aec2f02d34..f7c77413ed19 100644 --- a/src/components/LHNOptionsList/OptionRowLHN.tsx +++ b/src/components/LHNOptionsList/OptionRowLHN.tsx @@ -210,9 +210,13 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti return; } <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa // Prevent composer blur on left click event.preventDefault(); }} @@ -247,6 +251,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti (optionItem.shouldShowSubscript ? ( {}, opti mainAvatar={optionItem.icons[0]} secondaryAvatar={optionItem.icons[1]} >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + mainAvatar={optionItem.icons[0]} + secondaryAvatar={optionItem.icons[1]} +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa size={isInFocusMode ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT} /> ) : ( diff --git a/src/components/RoomHeaderAvatars.tsx b/src/components/RoomHeaderAvatars.tsx index 9806c2eb9bd4..94a88b51b537 100644 --- a/src/components/RoomHeaderAvatars.tsx +++ b/src/components/RoomHeaderAvatars.tsx @@ -46,8 +46,13 @@ function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) { style={styles.noOutline} onPress={() => navigateToAvatarPage(icons[0])} accessibilityRole={CONST.ROLE.BUTTON} +<<<<<<< HEAD accessibilityLabel={icon.name ?? ''} disabled={icon.source === Expensicons.FallbackAvatar} +======= + accessibilityLabel={icons[0].name ?? ''} + disabled={icons[0].source === Expensicons.FallbackAvatar} +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa > >>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa filterValueString += `${delimiter}${sanitizeString(queryFilter.value.toString())}`; } else { filterValueString += ` ${filterName}${operatorToSignMap[queryFilter.operator]}${sanitizeString(queryFilter.value.toString())}`; diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 62a5631b2e1c..dc58c2544487 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -303,9 +303,12 @@ function getOptionData({ const visibleParticipantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, true); const participantPersonalDetailList = Object.values(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails)); +<<<<<<< HEAD <<<<<<< HEAD const personalDetail = participantPersonalDetailList.at(0) ?? ({} as PersonalDetails); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa const personalDetail = participantPersonalDetailList[0] ?? {}; >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 const hasErrors = Object.keys(result.allReportErrors ?? {}).length !== 0; diff --git a/src/libs/actions/Workflow.ts b/src/libs/actions/Workflow.ts index 058f2c8f66a8..4a99f3aa080a 100644 --- a/src/libs/actions/Workflow.ts +++ b/src/libs/actions/Workflow.ts @@ -126,7 +126,10 @@ function updateApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWork const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers.at(0)?.email : undefined; ======= const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers[0].email : undefined; +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa const previousEmployeeList = Object.fromEntries(Object.entries(policy.employeeList ?? {}).map(([key, value]) => [key, {...value, pendingAction: null}])); const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({ previousEmployeeList, diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx index 2a66a3b3d186..497daa678190 100644 --- a/src/pages/home/ReportScreen.tsx +++ b/src/pages/home/ReportScreen.tsx @@ -719,12 +719,16 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro // After creating the task report then navigating to task detail we don't have any report actions and the last read time is empty so We need to update the initial last read time when opening the task report detail. Report.readNewestAction(report.reportID); }, [report]); +<<<<<<< HEAD <<<<<<< HEAD const mostRecentReportAction = reportActions.at(0); ======= const mostRecentReportAction = reportActions[0]; >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + const mostRecentReportAction = reportActions[0]; +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa const shouldShowMostRecentReportAction = !!mostRecentReportAction && !ReportActionsUtils.isActionOfType(mostRecentReportAction, CONST.REPORT.ACTIONS.TYPE.CREATED) && diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx index 51a35ac00434..7e986b5099f3 100644 --- a/src/pages/home/report/ReportActionsList.tsx +++ b/src/pages/home/report/ReportActionsList.tsx @@ -287,7 +287,10 @@ function ReportActionsList({ const mostRecentReportActionCreated = sortedVisibleReportActions.at(0)?.created ?? ''; ======= const mostRecentReportActionCreated = sortedVisibleReportActions[0]?.created ?? ''; +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa if (mostRecentReportActionCreated === unreadMarkerTime) { return; } diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx index 6ed19d426f5c..6552ff8be544 100644 --- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx +++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx @@ -152,11 +152,15 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) { policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICKBOOKS_CONFIG.COLLECTION_ACCOUNT_ID, +<<<<<<< HEAD <<<<<<< HEAD isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions].at(0)?.id, ======= isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id, >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + isSyncReimbursedSwitchOn ? '' : [...qboAccountOptions, ...invoiceAccountCollectionOptions][0].id, +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa qboConfig?.collectionAccountID, ), subscribedSetting: CONST.QUICKBOOKS_CONFIG.COLLECTION_ACCOUNT_ID, diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx index 8e1a8cef6d01..c0111d103c5c 100644 --- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx +++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx @@ -71,11 +71,15 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC CONST.POLICY.CONNECTIONS.NAME.QBO, { [CONST.QUICKBOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value, +<<<<<<< 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_BILL_DEFAULT_VENDOR]: row.defaultVendor, }, { @@ -100,11 +104,15 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC listItem={RadioListItem} onSelectRow={(selection: SelectorType) => selectExportCompanyCard(selection as MenuItem)} shouldSingleExecuteRowSelect +<<<<<<< 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 connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO} onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID))} listFooterContent={ diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx index aed327b388d5..8a333f98d77d 100644 --- a/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx +++ b/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx @@ -74,11 +74,15 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo listItem={RadioListItem} onSelectRow={selectVendor} shouldSingleExecuteRowSelect +<<<<<<< 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 listEmptyContent={listEmptyContent} connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO} onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID))} diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx index 84aa33b6c16f..3ba84854392b 100644 --- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx +++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx @@ -90,11 +90,15 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec CONST.POLICY.CONNECTIONS.NAME.QBO, { [CONST.QUICKBOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value, +<<<<<<< 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_EXPORT_DESTINATION]: qboConfig?.reimbursableExpensesExportDestination, diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx index 416ff9f197c5..3cf6717be7f2 100644 --- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx @@ -74,6 +74,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag {!isMultiLevelTags && ( Tag.clearPolicyTagListErrors(policyID, policyTagLists.at(0)?.orderWeight ?? 0)} @@ -114,6 +115,8 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag /> ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa errors={policyTags?.[policyTagLists[0]?.name]?.errors} onClose={() => Tag.clearPolicyTagListErrors(policyID, policyTagLists[0].orderWeight)} pendingAction={policyTags?.[policyTagLists[0]?.name]?.pendingAction} @@ -155,6 +158,33 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag )} + + + {translate('workspace.tags.requiresTag')} + + + + {canUseWorkspaceRules && policy?.areRulesEnabled && ( + + + {translate('workspace.tags.trackBillable')} + toggleBillableExpenses(policy)} + /> + + + )} ); return ( diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx index 05d27ba4fc3e..d53d86f717fc 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx @@ -230,6 +230,22 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa [translate, styles.textSupporting, styles.pb10], ); + const listEmptyContent = useMemo( + () => ( + + ), + [translate, styles.textSupporting, styles.pb10], + ); + return ( { + // Remove the approval workflow using the initial data as it could be already edited + Workflow.removeApprovalWorkflow(route.params.policyID, initialApprovalWorkflow); + }); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }, [initialApprovalWorkflow, route.params.policyID]); const {currentApprovalWorkflow, defaultWorkflowMembers, usedApproverEmails} = useMemo(() => { diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx index 326c78616b96..4e6664caba20 100644 --- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx +++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx @@ -210,6 +210,22 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat [translate, styles.textSupporting, styles.pb10], ); + const listEmptyContent = useMemo( + () => ( + + ), + [translate, styles.textSupporting, styles.pb10], + ); + return ( { const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -144,6 +145,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -194,6 +200,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Two'); // this has `hasDraft` flag enabled so it will be on top expect(displayNames.at(1)).toHaveTextContent('Email Four'); @@ -203,6 +210,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Two'); // this has `hasDraft` flag enabled so it will be on top + expect(displayNames[1]).toHaveTextContent('Email Four'); + expect(displayNames[2]).toHaveTextContent('Email Three'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -251,6 +263,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Two'); expect(displayNames.at(1)).toHaveTextContent('Email Four'); @@ -260,6 +273,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Two'); + expect(displayNames[1]).toHaveTextContent('Email Four'); + expect(displayNames[2]).toHaveTextContent('Email Three'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -321,7 +339,10 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -392,17 +413,23 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Four owes $100.00'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email Four'); expect(displayNames[1]).toHaveTextContent('Email Four owes $100.00'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -478,17 +505,23 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email One'); expect(displayNames.at(1)).toHaveTextContent('Workspace-Test-001 owes $100.00'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email One'); expect(displayNames[1]).toHaveTextContent('Workspace-Test-001 owes $100.00'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -545,6 +578,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Three'); expect(displayNames.at(1)).toHaveTextContent('Email Four'); @@ -554,6 +588,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Three'); + expect(displayNames[1]).toHaveTextContent('Email Four'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -719,17 +758,23 @@ describe('Sidebar', () => { expect(displayNames).toHaveLength(4); expect(screen.queryAllByTestId('Pin Icon')).toHaveLength(1); expect(screen.queryAllByTestId('Pencil Icon')).toHaveLength(1); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Two'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Five'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email Four'); expect(displayNames[1]).toHaveTextContent('Email Two'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Five'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -779,6 +824,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -788,6 +834,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) // When a new report is added @@ -798,17 +849,23 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Five'); expect(displayNames.at(1)).toHaveTextContent('Email Four'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email Five'); expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -861,6 +918,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -870,6 +928,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) // When a new report is added @@ -887,17 +950,23 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Five'); expect(displayNames.at(1)).toHaveTextContent('Email Four'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email Five'); expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -949,6 +1018,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -958,6 +1028,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Report (archived)'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Report (archived)'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -998,6 +1073,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -1007,6 +1083,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -1044,6 +1125,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -1053,6 +1135,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Email Two'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Email Two'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) // When a new report is added @@ -1063,17 +1150,23 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(4); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Five'); expect(displayNames.at(1)).toHaveTextContent('Email Four'); expect(displayNames.at(2)).toHaveTextContent('Email Three'); expect(displayNames.at(3)).toHaveTextContent('Email Two'); ======= +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa expect(displayNames[0]).toHaveTextContent('Email Five'); expect(displayNames[1]).toHaveTextContent('Email Four'); expect(displayNames[2]).toHaveTextContent('Email Three'); expect(displayNames[3]).toHaveTextContent('Email Two'); +<<<<<<< HEAD >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); }); @@ -1124,6 +1217,7 @@ describe('Sidebar', () => { const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames'); const displayNames = screen.queryAllByLabelText(hintText); expect(displayNames).toHaveLength(3); +<<<<<<< HEAD <<<<<<< HEAD expect(displayNames.at(0)).toHaveTextContent('Email Four'); expect(displayNames.at(1)).toHaveTextContent('Email Three'); @@ -1133,6 +1227,11 @@ describe('Sidebar', () => { expect(displayNames[1]).toHaveTextContent('Email Three'); expect(displayNames[2]).toHaveTextContent('Report (archived)'); >>>>>>> 0c618acc8b5a0b77eb27dfa049a18e3135c51c52 +======= + expect(displayNames[0]).toHaveTextContent('Email Four'); + expect(displayNames[1]).toHaveTextContent('Email Three'); + expect(displayNames[2]).toHaveTextContent('Report (archived)'); +>>>>>>> 4a9725c73b9338a3901a9dfdf13d14916f33f4aa }) ); });