This commit is contained in:
Jamie Kyle 2023-04-20 10:03:43 -07:00 committed by GitHub
parent 1f2cde6d04
commit 0e490542a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
196 changed files with 2117 additions and 1217 deletions

View file

@ -9,7 +9,6 @@ import { Intl } from './Intl';
import { Theme } from '../util/theme';
import { getParticipantName } from '../util/callingGetParticipantName';
import { ContactName } from './conversation/ContactName';
import { Emojify } from './conversation/Emojify';
import type { LocalizerType } from '../types/Util';
import { AvatarColors } from '../types/Colors';
import { CallMode } from '../types/Calling';
@ -20,6 +19,7 @@ import {
useIncomingCallShortcuts,
useKeyboardShortcuts,
} from '../hooks/useKeyboardShortcuts';
import { UserText } from './UserText';
export type PropsType = {
acceptCall: (_: AcceptCallType) => void;
@ -94,8 +94,8 @@ function GroupCallMessage({
// As an optimization, we only process the first two names.
const [first, second] = otherMembersRung
.slice(0, 2)
.map(member => <Emojify text={getParticipantName(member)} />);
const ringerNode = <Emojify text={getParticipantName(ringer)} />;
.map(member => <UserText text={getParticipantName(member)} />);
const ringerNode = <UserText text={getParticipantName(ringer)} />;
switch (otherMembersRung.length) {
case 0:
@ -195,7 +195,7 @@ export function IncomingCallBar(props: PropsType): JSX.Element | null {
case CallMode.Group: {
const { otherMembersRung, ringer } = props;
isVideoCall = true;
headerNode = <Emojify text={title} />;
headerNode = <UserText text={title} />;
messageNode = (
<GroupCallMessage
i18n={i18n}