Merge pull request #26924 from daordonez11/fix/avoid-task-pages

Expensify · Sep 11, 2023 · b2f3d44 · b2f3d44
2 parents f4affe5 + d45118b
commit b2f3d44
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.js b/src/pages/tasks/TaskAssigneeSelectorModal.js
@@ -18,7 +18,7 @@ import compose from '../../libs/compose';
 import personalDetailsPropType from '../personalDetailsPropType';
 import reportPropTypes from '../reportPropTypes';
 import ROUTES from '../../ROUTES';
-
+import * as ReportUtils from '../../libs/ReportUtils';
 import * as Task from '../../libs/actions/Task';
 
 const propTypes = {
@@ -124,6 +124,12 @@ function TaskAssigneeSelectorModal(props) {
         return props.reports[`${ONYXKEYS.COLLECTION.REPORT}${props.route.params.reportID}`];
     }, [props.reports, props.route.params]);
 
+    if (report && !ReportUtils.isTaskReport(report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(report.reportID);
+        });
+    }
+
     const sections = useMemo(() => {
         const sectionsList = [];
         let indexOffset = 0;

diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
@@ -15,6 +15,8 @@ import * as Task from '../../libs/actions/Task';
 import CONST from '../../CONST';
 import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
 import * as Browser from '../../libs/Browser';
+import * as ReportUtils from '../../libs/ReportUtils';
+import Navigation from '../../libs/Navigation/Navigation';
 
 const propTypes = {
     /** Current user session */
@@ -46,6 +48,11 @@ function TaskDescriptionPage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
     const inputRef = useRef(null);
 
     return (

diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js
@@ -14,6 +14,8 @@ import reportPropTypes from '../reportPropTypes';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
 import CONST from '../../CONST';
+import * as ReportUtils from '../../libs/ReportUtils';
+import Navigation from '../../libs/Navigation/Navigation';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -58,6 +60,12 @@ function TaskTitlePage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
+
     const inputRef = useRef(null);
 
     return (