[FIX] Message for VideoConf on SidebarItemExtended (#27626)

pull/27629/head^2
Douglas Fabris 3 years ago committed by GitHub
parent 4792717182
commit 6bdda4e06f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
  2. 1
      apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
  3. 5
      packages/core-typings/src/IMessage/IMessage.ts

@ -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);
}

@ -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",

@ -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';

Loading…
Cancel
Save