-
Notifications
You must be signed in to change notification settings - Fork 2.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Task shared in admin-only room can be marked done in chat, but not in the task report #28268
Changes from 1 commit
4a17c1b
d2b8d08
15a30eb
46d88bb
839e52b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,9 +49,8 @@ function TaskView(props) { | |
const taskTitle = convertToLTR(props.report.reportName || ''); | ||
const isCompleted = ReportUtils.isCompletedTaskReport(props.report); | ||
const isOpen = ReportUtils.isOpenTaskReport(props.report); | ||
const isCanceled = ReportUtils.isCanceledTaskReport(props.report); | ||
const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID); | ||
const disableState = !canModifyTask || isCanceled; | ||
const disableState = !canModifyTask; | ||
const isDisableInteractive = !canModifyTask || !isOpen; | ||
return ( | ||
<View> | ||
|
@@ -102,7 +101,7 @@ function TaskView(props) { | |
containerBorderRadius={8} | ||
caretSize={16} | ||
accessibilityLabel={taskTitle || props.translate('task.task')} | ||
disabled={isCanceled || !canModifyTask} | ||
disabled={disableState} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it's more readable directly using There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated in commit 15a30eb. I think we should use the existing flag |
||
/> | ||
<View style={[styles.flexRow, styles.flex1]}> | ||
<Text | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We also need to use
withCurrentUserPersonalDetailsDefaultProps
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated in commit d2b8d08