Merge branch 'develop' into chore/perf-userslist

RocketChat · Nov 20, 2024 · ca83c4a · ca83c4a
2 parents 6524d32 + de6bd32
commit ca83c4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/meteor/client/components/message/content/ThreadMetrics.tsx b/apps/meteor/client/components/message/content/ThreadMetrics.tsx
@@ -11,10 +11,10 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useTimeAgo } from '../../../hooks/useTimeAgo';
-import { useGoToThread } from '../../../views/room/hooks/useGoToThread';
 import ThreadMetricsFollow from './ThreadMetricsFollow';
 import ThreadMetricsParticipants from './ThreadMetricsParticipants';
+import { useTimeAgo } from '../../../hooks/useTimeAgo';
+import { useGoToThread } from '../../../views/room/hooks/useGoToThread';
 
 type ThreadMetricsProps = {
 	unread: boolean;

diff --git a/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx b/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
@@ -4,8 +4,8 @@ import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-context
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
 
-import { useToggleFollowingThreadMutation } from '../../../views/room/contextualBar/Threads/hooks/useToggleFollowingThreadMutation';
 import ThreadMetricsBadge from './ThreadMetricsUnreadBadge';
+import { useToggleFollowingThreadMutation } from '../../../views/room/contextualBar/Threads/hooks/useToggleFollowingThreadMutation';
 
 type ThreadMetricsFollowProps = {
 	following: boolean;

diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -4,11 +4,11 @@ import { MessageAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
 
+import ThreadListMetrics from './ThreadListMetrics';
 import Emoji from '../../../../../components/Emoji';
 import ThreadMetricsFollow from '../../../../../components/message/content/ThreadMetricsFollow';
 import ThreadMetricsUnreadBadge from '../../../../../components/message/content/ThreadMetricsUnreadBadge';
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
-import ThreadListMetrics from './ThreadListMetrics';
 
 type ThreadListMessageProps = {
 	_id: IMessage['_id'];