From 11cb90bb1560846454935c70d3daf525ad8e27a8 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Mon, 24 Apr 2023 11:33:42 -0400 Subject: [PATCH 1/2] Allow admins to report Groups --- app/soapbox/features/group/components/group-options-button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/features/group/components/group-options-button.tsx b/app/soapbox/features/group/components/group-options-button.tsx index d3f877292..7f24a3668 100644 --- a/app/soapbox/features/group/components/group-options-button.tsx +++ b/app/soapbox/features/group/components/group-options-button.tsx @@ -51,7 +51,7 @@ const GroupOptionsButton = ({ group }: IGroupActionButton) => { const menu: Menu = useMemo(() => { const items = []; - if (isMember) { + if (isMember || isAdmin) { items.push({ text: intl.formatMessage(messages.report), icon: require('@tabler/icons/flag.svg'), From 9b90289e7cd919cf8fe1857ff8b1d82980762f25 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Mon, 24 Apr 2023 11:34:09 -0400 Subject: [PATCH 2/2] Fix confirmation step in Group report --- .../ui/components/modals/report-modal/report-modal.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx index 04252424d..566e75981 100644 --- a/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx +++ b/app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx @@ -54,8 +54,8 @@ const reportSteps = { }, [ReportableEntities.GROUP]: { ONE: ReasonStep, - TWO: ConfirmationStep, - THREE: null, + TWO: null, + THREE: ConfirmationStep, }, };