From 6bdda4e06f25017095c00a449759af0bf2796787 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Fri, 23 Dec 2022 17:27:41 -0300 Subject: [PATCH] [FIX] Message for VideoConf on SidebarItemExtended (#27626) --- .../client/sidebar/RoomList/SideBarItemTemplateWithData.tsx | 5 ++++- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 1 + packages/core-typings/src/IMessage/IMessage.ts | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx index 02004a34da7..14f28b43552 100644 --- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx +++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx @@ -1,6 +1,6 @@ /* eslint-disable react/display-name */ import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings'; -import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom, isVideoConfMessage } from '@rocket.chat/core-typings'; import { Badge, Sidebar, SidebarItemAction } from '@rocket.chat/fuselage'; import type { useTranslation } from '@rocket.chat/ui-contexts'; import { useLayout } from '@rocket.chat/ui-contexts'; @@ -17,6 +17,9 @@ const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnTyp if (!lastMessage) { return t('No_messages_yet'); } + if (isVideoConfMessage(lastMessage)) { + return t('Call_started'); + } if (!lastMessage.u) { return normalizeSidebarMessage(lastMessage, t); } diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index faff0773293..8951421b974 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -798,6 +798,7 @@ "call-management": "Call Management", "call-management_description": "Permission to start a meeting", "Call_ongoing": "Call ongoing", + "Call_started": "Call started", "Call_unavailable_for_federation": "Call is unavailable for Federated rooms", "Call_was_not_answered": "Call was not answered", "Caller": "Caller", diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts index 01fee9455cc..89073ac0b87 100644 --- a/packages/core-typings/src/IMessage/IMessage.ts +++ b/packages/core-typings/src/IMessage/IMessage.ts @@ -328,5 +328,10 @@ export type IOTRMessage = IMessage & { t: 'otr' | 'otr-ack'; }; +export type IVideoConfMessage = IMessage & { + t: 'videoconf'; +}; + export const isE2EEMessage = (message: IMessage): message is IE2EEMessage => message.t === 'e2e'; export const isOTRMessage = (message: IMessage): message is IOTRMessage => message.t === 'otr' || message.t === 'otr-ack'; +export const isVideoConfMessage = (message: IMessage): message is IVideoConfMessage => message.t === 'videoconf';