add callout

RocketChat · Mar 21, 2023 · 08f7a4c · 08f7a4c
1 parent dee7712
commit 08f7a4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/apps/meteor/client/views/admin/moderation/UserMessages.tsx b/apps/meteor/client/views/admin/moderation/UserMessages.tsx
@@ -1,4 +1,4 @@
-import { Box, Message } from '@rocket.chat/fuselage';
+import { Box, Callout, Message } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useRoute, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
@@ -59,6 +59,9 @@ const UserMessages = ({
 
 	return (
 		<Box display='flex' flexDirection='column' width='full' height='full' overflowY='auto' overflowX='hidden'>
+			<Callout margin={15} title='Duplicate messages' type='warning' icon='lightning'>
+				Following may contain duplicated messages sent across channels
+			</Callout>{' '}
 			{isLoadingUserMessages && <Message>{t('Loading')}</Message>}
 			{isSuccessUserMessages &&
 				userMessages.messages.map((message) => (

diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeactivateUserAction.tsx
@@ -33,11 +33,11 @@ const useDeactivateUserAction = (userId: string, onChange: () => void, onReload:
 	});
 
 	const onDeactivateUser = async () => {
+		setModal();
 		await handleDeleteMessages.mutateAsync({ userId });
 		await handleDeactivateUser.mutateAsync({ userId, activeStatus: false });
 		onChange();
 		onReload();
-		setModal();
 	};
 
 	const confirmDeactivateUser = (): void => {

diff --git a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
@@ -33,11 +33,11 @@ const useResetAvatarAction = (userId: string, onChange: () => void, onReload: ()
 	});
 
 	const onResetAvatar = async () => {
+		setModal();
 		await handleResetAvatar.mutateAsync({ userId });
 		await handleMarkAsChecked.mutateAsync({ userId });
 		onChange();
 		onReload();
-		setModal();
 	};
 
 	const confirmResetAvatar = (): void => {