Merge branch 'main' of github.com:Expensify/App into reapply-onyx-upg…

…rade-use-cache-with-fixes
Expensify · Aug 14, 2023 · 53323f0 · 53323f0
2 parents 6f9da52 + 8e799df
commit 53323f0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 7 deletions.
diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js
@@ -88,6 +88,7 @@ function BaseAnchorForCommentsOnly({onPressIn, onPressOut, href = '', rel = '',
                         event.preventDefault();
                         linkProps.onPress();
                     }}
+                    suppressHighlighting
                     // Add testID so it gets selected as an anchor tag by SelectionScraper
                     testID="a"
                     // eslint-disable-next-line react/jsx-props-no-spreading

diff --git a/src/components/Banner.js b/src/components/Banner.js
@@ -88,6 +88,7 @@ function Banner(props) {
                                 <Text
                                     style={[...props.textStyles]}
                                     onPress={props.onPress}
+                                    suppressHighlighting
                                 >
                                     {props.text}
                                 </Text>

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
@@ -70,6 +70,7 @@ function AnchorRenderer(props) {
             <Text
                 style={styles.link}
                 onPress={navigateToLink}
+                suppressHighlighting
             >
                 <TNodeChildrenRenderer tnode={props.tnode} />
             </Text>

diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
@@ -87,6 +87,7 @@ function ReportWelcomeText(props) {
                         <Text
                             style={[styles.textStrong]}
                             onPress={() => Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
+                            suppressHighlighting
                         >
                             {ReportUtils.getReportName(props.report)}
                         </Text>
@@ -105,6 +106,7 @@ function ReportWelcomeText(props) {
                                         <Text
                                             style={[styles.textStrong]}
                                             onPress={() => Navigation.navigate(ROUTES.getProfileRoute(accountID))}
+                                            suppressHighlighting
                                         >
                                             {displayName}
                                         </Text>

diff --git a/src/components/TextLink.js b/src/components/TextLink.js
@@ -71,6 +71,7 @@ function TextLink(props) {
             onMouseDown={props.onMouseDown}
             onKeyDown={openLinkIfEnterKeyPressed}
             ref={props.forwardedRef}
+            suppressHighlighting
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -459,7 +459,7 @@ function isConciergeChatReport(report) {
 function shouldDisableDetailPage(report) {
     const participantAccountIDs = lodashGet(report, 'participantAccountIDs', []);
 
-    if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report)) {
+    if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report) || isTaskReport(report)) {
         return false;
     }
     if (participantAccountIDs.length === 1) {
@@ -1451,7 +1451,7 @@ function getReport(reportID) {
 function navigateToDetailsPage(report) {
     const participantAccountIDs = lodashGet(report, 'participantAccountIDs', []);
 
-    if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report)) {
+    if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report) || isTaskReport(report)) {
         Navigation.navigate(ROUTES.getReportDetailsRoute(report.reportID));
         return;
     }
@@ -2208,6 +2208,7 @@ function buildOptimisticTaskReport(ownerAccountID, assigneeAccountID = 0, parent
         reportName: title,
         description,
         ownerAccountID,
+        participantAccountIDs: assigneeAccountID && assigneeAccountID !== ownerAccountID ? [assigneeAccountID] : [],
         managerID: assigneeAccountID,
         type: CONST.REPORT.TYPE.TASK,
         parentReportID,

diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
@@ -61,7 +61,7 @@ function ReportDetailsPage(props) {
     const policy = useMemo(() => props.policies[`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`], [props.policies, props.report.policyID]);
     const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy), [policy]);
     const shouldDisableSettings = useMemo(() => ReportUtils.shouldDisableSettings(props.report), [props.report]);
-    const shouldUseFullTitle = !shouldDisableSettings;
+    const shouldUseFullTitle = !shouldDisableSettings || ReportUtils.isTaskReport(props.report);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(props.report), [props.report]);
     const isThread = useMemo(() => ReportUtils.isChatThread(props.report), [props.report]);
     const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(props.report), [props.report]);

diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
@@ -97,7 +97,10 @@ function ReportParticipantsPage(props) {
                 <FullPageNotFoundView shouldShow={_.isEmpty(props.report) || ReportUtils.isArchivedRoom(props.report)}>
                     <HeaderWithBackButton
                         title={props.translate(
-                            ReportUtils.isChatRoom(props.report) || ReportUtils.isPolicyExpenseChat(props.report) || ReportUtils.isChatThread(props.report)
+                            ReportUtils.isChatRoom(props.report) ||
+                                ReportUtils.isPolicyExpenseChat(props.report) ||
+                                ReportUtils.isChatThread(props.report) ||
+                                ReportUtils.isTaskReport(props.report)
                                 ? 'common.members'
                                 : 'common.details',
                         )}

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
@@ -164,7 +164,7 @@ function HeaderView(props) {
                         <PressableWithoutFeedback
                             onPress={() => ReportUtils.navigateToDetailsPage(props.report)}
                             style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}
-                            disabled={(isTaskReport && !ReportUtils.isOpenTaskReport(props.report)) || shouldDisableDetailPage}
+                            disabled={shouldDisableDetailPage}
                             accessibilityLabel={title}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         >

diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
@@ -85,6 +85,7 @@ describe('Sidebar', () => {
                     .then(() =>
                         Onyx.multiSet({
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                         }),
                     )
 
@@ -100,7 +101,7 @@ describe('Sidebar', () => {
         it('includes an empty chat report if it has a draft', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
-            // Given a new report
+            // Given a new report with a draft text
             const report = {
                 ...LHNTestUtils.getFakeReport([1, 2], 0),
                 hasDraft: true,
@@ -113,10 +114,11 @@ describe('Sidebar', () => {
                         Onyx.multiSet({
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
                             [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                         }),
                     )
 
-                    // Then no reports are rendered in the LHN
+                    // Then the report should be rendered in the LHN since it has a draft
                     .then(() => {
                         const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                         const displayNames = screen.queryAllByLabelText(hintText);