diff --git a/app/actions/ModActionPanel/QuickAction.tsx b/app/actions/ModActionPanel/QuickAction.tsx index 3b080e2..985551f 100644 --- a/app/actions/ModActionPanel/QuickAction.tsx +++ b/app/actions/ModActionPanel/QuickAction.tsx @@ -192,6 +192,7 @@ function Form( const isMuteReporterEvent = modEventType === MOD_EVENTS.MUTE_REPORTER const isCommentEvent = modEventType === MOD_EVENTS.COMMENT const isTakedownEvent = modEventType === MOD_EVENTS.TAKEDOWN + const isAckEvent = modEventType === MOD_EVENTS.ACKNOWLEDGE const shouldShowDurationInHoursField = isTakedownEvent || isMuteEvent || isMuteReporterEvent const canManageChat = usePermission('canManageChat') @@ -262,7 +263,7 @@ function Form( } if ( - modEventType === MOD_EVENTS.TAKEDOWN && + (isTakedownEvent || isAckEvent) && formData.get('acknowledgeAccountSubjects') ) { coreEvent.acknowledgeAccountSubjects = true @@ -740,7 +741,7 @@ function Form( /> )} - {isTakedownEvent && isSubjectDid && ( + {(isTakedownEvent || isAckEvent) && isSubjectDid && ( ) { } if ( - coreEvent.$type === MOD_EVENTS.TAKEDOWN && + (coreEvent.$type === MOD_EVENTS.TAKEDOWN || + coreEvent.$type === MOD_EVENTS.ACKNOWLEDGE) && formData.get('acknowledgeAccountSubjects') ) { coreEvent.acknowledgeAccountSubjects = true diff --git a/components/workspace/PanelActionForm.tsx b/components/workspace/PanelActionForm.tsx index e0ab867..d5de988 100644 --- a/components/workspace/PanelActionForm.tsx +++ b/components/workspace/PanelActionForm.tsx @@ -16,6 +16,7 @@ export const WorkspacePanelActionForm = ({ setModEventType: (action: string) => void onCancel: () => void }) => { + const isAckEvent = modEventType === MOD_EVENTS.ACKNOWLEDGE const isTakedownEvent = modEventType === MOD_EVENTS.TAKEDOWN const isCommentEvent = modEventType === MOD_EVENTS.COMMENT const isMuteEvent = modEventType === MOD_EVENTS.MUTE @@ -102,7 +103,7 @@ export const WorkspacePanelActionForm = ({ label="Update the subject's persistent note with this comment" /> )} - {isTakedownEvent && ( + {(isTakedownEvent || isAckEvent) && ( Acknowledge all open/escalated/appealed reports on subjects - created by accounts that you are taking down. + created by accounts that you are{' '} + {isAckEvent ? 'acknowledging' : 'taking down'}. } />