From 322201c843b9e77be98924950619eaf7a1e1440a Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 21 Sep 2023 10:43:29 +0700 Subject: [PATCH 1/4] edit the route of new task page --- src/ROUTES.ts | 2 -- src/libs/Navigation/linkingConfig.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 2c37116db395..6b26ec95b101 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -121,8 +121,6 @@ export default { getMoneyRequestTagRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`, SPLIT_BILL_DETAILS: `r/:reportID/split/:reportActionID`, getSplitBillDetailsRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`, - getNewTaskRoute: (reportID: string) => `${NEW_TASK}/${reportID}`, - NEW_TASK_WITH_REPORT_ID: `${NEW_TASK}/:reportID?`, TASK_TITLE: 'r/:reportID/title', TASK_DESCRIPTION: 'r/:reportID/description', TASK_ASSIGNEE: 'r/:reportID/assignee', diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js index f4420330fbd9..5cf8170632b8 100644 --- a/src/libs/Navigation/linkingConfig.js +++ b/src/libs/Navigation/linkingConfig.js @@ -263,7 +263,7 @@ export default { }, NewTask: { screens: { - NewTask_Root: ROUTES.NEW_TASK_WITH_REPORT_ID, + NewTask_Root: ROUTES.NEW_TASK, NewTask_TaskAssigneeSelector: ROUTES.NEW_TASK_ASSIGNEE, NewTask_TaskShareDestinationSelector: ROUTES.NEW_TASK_SHARE_DESTINATION, NewTask_Details: ROUTES.NEW_TASK_DETAILS, From e619c60dd0499eec7ae15b7c14ca74963bde396d Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 26 Sep 2023 15:17:41 +0700 Subject: [PATCH 2/4] merge main --- src/ROUTES.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 01c7c25caa01..78d5f4d54888 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -243,12 +243,12 @@ export default { IOU_SEND_ADD_DEBIT_CARD: 'send/new/add-debit-card', IOU_SEND_ENABLE_PAYMENTS: 'send/new/enable-payments', - NEW_TASK: 'new/task', - NEW_TASK_ASSIGNEE: 'new/task/assignee', - NEW_TASK_SHARE_DESTINATION: 'new/task/share-destination', - NEW_TASK_DETAILS: 'new/task/details', - NEW_TASK_TITLE: 'new/task/title', - NEW_TASK_DESCRIPTION: 'new/task/description', + NEW_TASK: 'new/task', + NEW_TASK_ASSIGNEE: 'new/task/assignee', + NEW_TASK_SHARE_DESTINATION: 'new/task/share-destination', + NEW_TASK_DETAILS: 'new/task/details', + NEW_TASK_TITLE: 'new/task/title', + NEW_TASK_DESCRIPTION: 'new/task/description', TEACHERS_UNITE: 'teachersunite', I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher', From 60c2029984b150cf7249e04cb8012f55643bed0c Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 26 Sep 2023 15:44:11 +0700 Subject: [PATCH 3/4] fix jest test --- src/ROUTES.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 78d5f4d54888..1b2e9330869f 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -244,6 +244,7 @@ export default { IOU_SEND_ENABLE_PAYMENTS: 'send/new/enable-payments', NEW_TASK: 'new/task', + NEW_TASK_WITH_REPORT_ID: 'new/task/:reportID?', NEW_TASK_ASSIGNEE: 'new/task/assignee', NEW_TASK_SHARE_DESTINATION: 'new/task/share-destination', NEW_TASK_DETAILS: 'new/task/details', From 184edfcc41a27ac142fff758af4267526ce8f22e Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 26 Sep 2023 15:44:57 +0700 Subject: [PATCH 4/4] fix lint --- src/ROUTES.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 1b2e9330869f..78d5f4d54888 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -244,7 +244,6 @@ export default { IOU_SEND_ENABLE_PAYMENTS: 'send/new/enable-payments', NEW_TASK: 'new/task', - NEW_TASK_WITH_REPORT_ID: 'new/task/:reportID?', NEW_TASK_ASSIGNEE: 'new/task/assignee', NEW_TASK_SHARE_DESTINATION: 'new/task/share-destination', NEW_TASK_DETAILS: 'new/task/details',