From 2ad5ec867046742d2a07d2c218d0e5751e110281 Mon Sep 17 00:00:00 2001 From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Wed, 20 Sep 2023 08:43:38 +0200 Subject: [PATCH 01/15] Update Task Report System Messages and LHN Display for Consistency --- src/components/TaskHeaderActionButton.js | 2 +- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/libs/ReportUtils.js | 10 +++++----- src/libs/actions/Task.js | 6 +++--- src/pages/home/HeaderView.js | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/TaskHeaderActionButton.js b/src/components/TaskHeaderActionButton.js index aa7694095f5b..bd903b8bcade 100644 --- a/src/components/TaskHeaderActionButton.js +++ b/src/components/TaskHeaderActionButton.js @@ -36,7 +36,7 @@ function TaskHeaderActionButton(props) { success isDisabled={ReportUtils.isCanceledTaskReport(props.report) || !Task.canModifyTask(props.report, props.session.accountID)} medium - text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsDone')} + text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsComplete')} onPress={() => ReportUtils.isCompletedTaskReport(props.report) ? Task.reopenTask(props.report, props.report.reportName) : Task.completeTask(props.report, props.report.reportName) } diff --git a/src/languages/en.ts b/src/languages/en.ts index b0f5801a30c3..2af7083a4b2e 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1518,7 +1518,7 @@ export default { reopened: 'reopened task', error: 'You do not have the permission to do the requested action.', }, - markAsDone: 'Mark as done', + markAsComplete: 'Mark as complete', markAsIncomplete: 'Mark as incomplete', assigneeError: 'There was an error assigning this task, please try another assignee.', }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 1984624e8683..5c2297a36600 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1540,7 +1540,7 @@ export default { reopened: 'tarea reabrir', error: 'No tiene permiso para realizar la acción solicitada.', }, - markAsDone: 'Marcar como completada', + markAsComplete: 'Marcar como completada', markAsIncomplete: 'Marcar como incompleta', assigneeError: 'Hubo un error al asignar esta tarea, inténtalo con otro usuario.', }, diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 7c807112613c..3b648301189b 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -2465,7 +2465,7 @@ function buildOptimisticCreatedReportAction(emailCreatingAction) { { type: CONST.REPORT.MESSAGE.TYPE.TEXT, style: 'strong', - text: emailCreatingAction === currentUserEmail ? 'You' : emailCreatingAction, + text: emailCreatingAction, }, { type: CONST.REPORT.MESSAGE.TYPE.TEXT, @@ -2504,7 +2504,7 @@ function buildOptimisticEditedTaskReportAction(emailEditingTask) { { type: CONST.REPORT.MESSAGE.TYPE.TEXT, style: 'strong', - text: emailEditingTask === currentUserEmail ? 'You' : emailEditingTask, + text: emailEditingTask, }, { type: CONST.REPORT.MESSAGE.TYPE.TEXT, @@ -2545,7 +2545,7 @@ function buildOptimisticClosedReportAction(emailClosingReport, policyName, reaso { type: CONST.REPORT.MESSAGE.TYPE.TEXT, style: 'strong', - text: emailClosingReport === currentUserEmail ? 'You' : emailClosingReport, + text: emailClosingReport, }, { type: CONST.REPORT.MESSAGE.TYPE.TEXT, @@ -3496,8 +3496,8 @@ function getTaskAssigneeChatOnyxData(accountID, assigneeEmail, assigneeAccountID // If you're choosing to share the task in the same DM as the assignee then we don't need to create another reportAction indicating that you've been assigned if (assigneeChatReportID !== parentReportID) { - optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `Assigned a task to you: ${title}`, parentReportID); - + const displayname = lodashGet(allPersonalDetails, [assigneeAccountID, 'displayName']) || lodashGet(personalDetails, [assigneeAccountID, 'login'], ''); + optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `assigned to: ${displayname}`, parentReportID); const lastAssigneeCommentText = formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text); const optimisticAssigneeReport = { lastVisibleActionCreated: currentTime, diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index f1fb4d96f523..b0014666839a 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -69,7 +69,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail // Parent ReportAction indicating that a task has been created const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail); - const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `Created a task: ${title}`, parentReportID); + const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `task for ${title}`, parentReportID); optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID; const currentTime = DateUtils.getDBTime(); @@ -222,7 +222,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail */ function completeTask(taskReport, taskTitle) { const taskReportID = taskReport.reportID; - const message = `completed task: ${taskTitle}`; + const message = `marked as complete`; const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED, message); const optimisticData = [ @@ -306,7 +306,7 @@ function completeTask(taskReport, taskTitle) { */ function reopenTask(taskReport, taskTitle) { const taskReportID = taskReport.reportID; - const message = `reopened task: ${taskTitle}`; + const message = `marked as incomplete`; const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKREOPENED, message); const optimisticData = [ diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 477d063c1747..6f9663852980 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -106,7 +106,7 @@ function HeaderView(props) { if (ReportUtils.isOpenTaskReport(props.report) && canModifyTask) { threeDotMenuItems.push({ icon: Expensicons.Checkmark, - text: props.translate('task.markAsDone'), + text: props.translate('task.markAsComplete'), onSelected: () => Task.completeTask(props.report, title), }); } From a9f58ef7febfa191402181002e697446f88ddc8b Mon Sep 17 00:00:00 2001 From: Getabalew Tesfaye Date: Thu, 21 Sep 2023 01:17:12 +0300 Subject: [PATCH 02/15] add condition for no onPreviewPressed prop --- src/components/ReportActionItem/MoneyRequestPreview.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 3a0741cf9bd2..6e6c615a5344 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -232,7 +232,12 @@ function MoneyRequestPreview(props) { errorRowStyles={[styles.mbn1]} needsOffscreenAlphaCompositing > - + {hasReceipt && ( Date: Thu, 21 Sep 2023 01:19:01 +0300 Subject: [PATCH 03/15] fix container corners not rounded while scanning --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index 7e8ad488d2ee..1d5807f783d9 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -3837,6 +3837,7 @@ const styles = (theme) => ({ reportPreviewBoxHoverBorder: { borderColor: theme.border, backgroundColor: theme.border, + borderRadius: variables.componentBorderRadiusLarge, }, reportPreviewBoxBody: { From c4b6378cec78e1ab614f2ae55f36ab0860a69834 Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:36:16 +0000 Subject: [PATCH 04/15] fix lint errors --- src/components/ReportActionItem/TaskPreview.js | 4 ++-- src/components/ReportActionItem/TaskView.js | 4 ++-- src/components/TaskHeaderActionButton.js | 4 +--- src/libs/ReportUtils.js | 2 +- src/libs/actions/Task.js | 6 ++---- src/pages/home/HeaderView.js | 4 ++-- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js index d0181e3d736a..1f00f55251ca 100644 --- a/src/components/ReportActionItem/TaskPreview.js +++ b/src/components/ReportActionItem/TaskPreview.js @@ -94,9 +94,9 @@ function TaskPreview(props) { disabled={ReportUtils.isCanceledTaskReport(props.taskReport)} onPress={Session.checkIfActionIsAllowed(() => { if (isTaskCompleted) { - Task.reopenTask(props.taskReport, taskTitle); + Task.reopenTask(props.taskReport); } else { - Task.completeTask(props.taskReport, taskTitle); + Task.completeTask(props.taskReport); } })} accessibilityLabel={props.translate('task.task')} diff --git a/src/components/ReportActionItem/TaskView.js b/src/components/ReportActionItem/TaskView.js index f2a1758a050b..7bf408a9daa8 100644 --- a/src/components/ReportActionItem/TaskView.js +++ b/src/components/ReportActionItem/TaskView.js @@ -82,9 +82,9 @@ function TaskView(props) { { if (isCompleted) { - Task.reopenTask(props.report, taskTitle); + Task.reopenTask(props.report); } else { - Task.completeTask(props.report, taskTitle); + Task.completeTask(props.report); } })} isChecked={isCompleted} diff --git a/src/components/TaskHeaderActionButton.js b/src/components/TaskHeaderActionButton.js index bd903b8bcade..b22b5c92bf70 100644 --- a/src/components/TaskHeaderActionButton.js +++ b/src/components/TaskHeaderActionButton.js @@ -37,9 +37,7 @@ function TaskHeaderActionButton(props) { isDisabled={ReportUtils.isCanceledTaskReport(props.report) || !Task.canModifyTask(props.report, props.session.accountID)} medium text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsComplete')} - onPress={() => - ReportUtils.isCompletedTaskReport(props.report) ? Task.reopenTask(props.report, props.report.reportName) : Task.completeTask(props.report, props.report.reportName) - } + onPress={() => (ReportUtils.isCompletedTaskReport(props.report) ? Task.reopenTask(props.report) : Task.completeTask(props.report))} style={[styles.flex1]} /> diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 3b648301189b..db1296f294cd 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -3496,7 +3496,7 @@ function getTaskAssigneeChatOnyxData(accountID, assigneeEmail, assigneeAccountID // If you're choosing to share the task in the same DM as the assignee then we don't need to create another reportAction indicating that you've been assigned if (assigneeChatReportID !== parentReportID) { - const displayname = lodashGet(allPersonalDetails, [assigneeAccountID, 'displayName']) || lodashGet(personalDetails, [assigneeAccountID, 'login'], ''); + const displayname = lodashGet(allPersonalDetails, [assigneeAccountID, 'displayName']) || lodashGet(allPersonalDetails, [assigneeAccountID, 'login'], ''); optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `assigned to: ${displayname}`, parentReportID); const lastAssigneeCommentText = formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text); const optimisticAssigneeReport = { diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index b0014666839a..12a21e047975 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -218,9 +218,8 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail /** * Complete a task * @param {Object} taskReport task report - * @param {String} taskTitle Title of the task */ -function completeTask(taskReport, taskTitle) { +function completeTask(taskReport) { const taskReportID = taskReport.reportID; const message = `marked as complete`; const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED, message); @@ -302,9 +301,8 @@ function completeTask(taskReport, taskTitle) { /** * Reopen a closed task * @param {Object} taskReport task report - * @param {String} taskTitle Title of the task */ -function reopenTask(taskReport, taskTitle) { +function reopenTask(taskReport) { const taskReportID = taskReport.reportID; const message = `marked as incomplete`; const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKREOPENED, message); diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 6f9663852980..96149ce97a41 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -107,7 +107,7 @@ function HeaderView(props) { threeDotMenuItems.push({ icon: Expensicons.Checkmark, text: props.translate('task.markAsComplete'), - onSelected: () => Task.completeTask(props.report, title), + onSelected: () => Task.completeTask(props.report), }); } @@ -116,7 +116,7 @@ function HeaderView(props) { threeDotMenuItems.push({ icon: Expensicons.Checkmark, text: props.translate('task.markAsIncomplete'), - onSelected: () => Task.reopenTask(props.report, title), + onSelected: () => Task.reopenTask(props.report), }); } From c3ba15f9aaac3aaaed758210a8aa8c2c98915fd4 Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:55:25 +0000 Subject: [PATCH 05/15] update task messages --- src/languages/en.ts | 4 ++-- src/languages/es.ts | 4 ++-- src/libs/SidebarUtils.js | 4 ++-- src/libs/actions/Task.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 2af7083a4b2e..a8c19b957721 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1513,9 +1513,9 @@ export default { assignee: 'Assignee', completed: 'Completed', messages: { - completed: 'completed task', + completed: 'marked as complete', canceled: 'deleted task', - reopened: 'reopened task', + reopened: 'marked as incomplete', error: 'You do not have the permission to do the requested action.', }, markAsComplete: 'Mark as complete', diff --git a/src/languages/es.ts b/src/languages/es.ts index 5c2297a36600..f74754bbe2fb 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1535,9 +1535,9 @@ export default { assignee: 'Usuario asignado', completed: 'Completada', messages: { - completed: 'tarea completada', + completed: 'marcada como completa', canceled: 'tarea eliminado', - reopened: 'tarea reabrir', + reopened: 'marcada como incompleta', error: 'No tiene permiso para realizar la acción solicitada.', }, markAsComplete: 'Marcar como completada', diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js index f645697690e6..497bec400e1d 100644 --- a/src/libs/SidebarUtils.js +++ b/src/libs/SidebarUtils.js @@ -340,9 +340,9 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale, const newName = lodashGet(lastAction, 'originalMessage.newName', ''); result.alternateText = Localize.translate(preferredLocale, 'newRoomPage.roomRenamedTo', {newName}); } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED) { - result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}: ${report.reportName}`; + result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}`; } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED) { - result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}: ${report.reportName}`; + result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}`; } else { result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet'); } diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 12a21e047975..1976bea07965 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -938,7 +938,7 @@ function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) { taskStatusText = Localize.translateLocal('task.task'); } - return `${taskStatusText} ${report.reportName}`; + return `${taskStatusText}`; } export { From cc2e28203c7521d82710f695fed1bd16906f09d9 Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:03:18 +0000 Subject: [PATCH 06/15] update task messages --- src/libs/actions/Task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 1976bea07965..e4b8274ee1fe 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -921,7 +921,7 @@ function clearEditTaskErrors(reportID) { function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) { const report = ReportUtils.getReport(reportID); if (isCreateTaskAction) { - return `Created a task: ${report.reportName}`; + return `task for ${title} ${report.reportName}`; } let taskStatusText = ''; switch (actionName) { From 30609b274448a2b88f8bef183b3d449e464a076e Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:09:03 +0000 Subject: [PATCH 07/15] update task messages --- src/libs/actions/Task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index e4b8274ee1fe..e7a383a8894a 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -921,7 +921,7 @@ function clearEditTaskErrors(reportID) { function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) { const report = ReportUtils.getReport(reportID); if (isCreateTaskAction) { - return `task for ${title} ${report.reportName}`; + return `task for ${report.reportName}`; } let taskStatusText = ''; switch (actionName) { From c93a9612999ec2433a605359510535f307205e1d Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:18:10 +0000 Subject: [PATCH 08/15] update task messages --- src/libs/actions/Task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index e7a383a8894a..77219c0b0930 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -69,7 +69,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail // Parent ReportAction indicating that a task has been created const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail); - const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `task for ${title}`, parentReportID); + const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `${currentUserAccountID}: task for ${title}`, parentReportID); optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID; const currentTime = DateUtils.getDBTime(); From a8eeafd62e32c56837898d70a604b57208ca2dac Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:22:48 +0000 Subject: [PATCH 09/15] update task messages --- src/libs/actions/Task.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 77219c0b0930..e03b06156533 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -69,7 +69,8 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail // Parent ReportAction indicating that a task has been created const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail); - const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `${currentUserAccountID}: task for ${title}`, parentReportID); + const displayName = lodashGet(personalDetails, [currentUserAccountID, 'displayName']) || lodashGet(personalDetails, [currentUserAccountID, 'login']); + const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `${displayName}: task for ${title}`, parentReportID); optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID; const currentTime = DateUtils.getDBTime(); From 9358bb525240d58ac58bd1850e8189eaa58957f0 Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:26:29 +0000 Subject: [PATCH 10/15] update task messages --- src/libs/actions/Task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index e03b06156533..2e825f5f41b4 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -69,7 +69,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail // Parent ReportAction indicating that a task has been created const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail); - const displayName = lodashGet(personalDetails, [currentUserAccountID, 'displayName']) || lodashGet(personalDetails, [currentUserAccountID, 'login']); + const displayName = lodashGet(allPersonalDetails, [currentUserAccountID, 'displayName']) || lodashGet(allPersonalDetails, [currentUserAccountID, 'login']); const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `${displayName}: task for ${title}`, parentReportID); optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID; From b63b77a2181aa94325b8535957fb5f4b508224bb Mon Sep 17 00:00:00 2001 From: Rayane Djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Fri, 22 Sep 2023 11:31:51 +0000 Subject: [PATCH 11/15] update task messages --- src/libs/actions/Task.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js index 2e825f5f41b4..e7a383a8894a 100644 --- a/src/libs/actions/Task.js +++ b/src/libs/actions/Task.js @@ -69,8 +69,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail // Parent ReportAction indicating that a task has been created const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail); - const displayName = lodashGet(allPersonalDetails, [currentUserAccountID, 'displayName']) || lodashGet(allPersonalDetails, [currentUserAccountID, 'login']); - const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `${displayName}: task for ${title}`, parentReportID); + const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `task for ${title}`, parentReportID); optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID; const currentTime = DateUtils.getDBTime(); From 822199cd9b1f0af527059f7f6cb5bcc6dab574c2 Mon Sep 17 00:00:00 2001 From: Getabalew Tesfaye Date: Sun, 24 Sep 2023 13:56:02 +0300 Subject: [PATCH 12/15] apply border radius only on RequestPreview --- src/components/ReportActionItem/MoneyRequestPreview.js | 2 +- src/styles/styles.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 6e6c615a5344..b865a8c01d71 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -234,7 +234,7 @@ function MoneyRequestPreview(props) { > diff --git a/src/styles/styles.js b/src/styles/styles.js index 1d5807f783d9..124a8e79f0f6 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -3837,6 +3837,9 @@ const styles = (theme) => ({ reportPreviewBoxHoverBorder: { borderColor: theme.border, backgroundColor: theme.border, + }, + + reportContainerBorderRadius: { borderRadius: variables.componentBorderRadiusLarge, }, From 71c6450ae653a35f0b7411a116a4a08fd844dbdf Mon Sep 17 00:00:00 2001 From: Getabalew Tesfaye Date: Mon, 25 Sep 2023 12:54:36 +0300 Subject: [PATCH 13/15] simplify styling --- src/components/ReportActionItem/MoneyRequestPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js index 77510597d98d..35215cadd15d 100644 --- a/src/components/ReportActionItem/MoneyRequestPreview.js +++ b/src/components/ReportActionItem/MoneyRequestPreview.js @@ -235,7 +235,7 @@ function MoneyRequestPreview(props) { > From 3956c52fe7cbd37a4a4dc049f303515baf09c01a Mon Sep 17 00:00:00 2001 From: rayane-djouah <77965000+rayane-djouah@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:04:37 +0100 Subject: [PATCH 14/15] Update assigned to message Co-authored-by: Eugene Voloshchak --- src/libs/ReportUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 16a34fcaf47d..8b77f1ad599b 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -3567,7 +3567,7 @@ function getTaskAssigneeChatOnyxData(accountID, assigneeEmail, assigneeAccountID // If you're choosing to share the task in the same DM as the assignee then we don't need to create another reportAction indicating that you've been assigned if (assigneeChatReportID !== parentReportID) { const displayname = lodashGet(allPersonalDetails, [assigneeAccountID, 'displayName']) || lodashGet(allPersonalDetails, [assigneeAccountID, 'login'], ''); - optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `assigned to: ${displayname}`, parentReportID); + optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `assigned to ${displayname}`, parentReportID); const lastAssigneeCommentText = formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text); const optimisticAssigneeReport = { lastVisibleActionCreated: currentTime, From 529e9656d0583e97da3c72cd20f69c2ccda4df79 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 28 Sep 2023 15:05:10 +0800 Subject: [PATCH 15/15] Run prettier --- src/ROUTES.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ROUTES.ts b/src/ROUTES.ts index c3f8f6e58243..b2dafa643b22 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -92,7 +92,7 @@ export default { route += `&backTo=${encodeURIComponent(backTo)}`; } return route; - } + }, }, SETTINGS_CONTACT_METHODS: 'settings/profile/contact-methods', SETTINGS_CONTACT_METHOD_DETAILS: {