mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Group disparate status together, but show metadata if different

Browse source
This commit is contained in:
Scott Nonnenberg 2022-03-28 15:55:12 -07:00 • committed by GitHub
parent 2602db97f0
commit 1ad284d22c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 282 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/components/conversation/CallingNotification.tsx
View file

@ -17,7 +17,6 @@ import {
} from '../../util/callingNotification';
import { missingCaseError } from '../../util/missingCaseError';
import { Tooltip, TooltipPlacement } from '../Tooltip';
import type { TimelineItemType } from './TimelineItem';
import * as log from '../../logging/log';
export type PropsActionsType = {
@ -31,7 +30,7 @@ export type PropsActionsType = {
type PropsHousekeeping = {
i18n: LocalizerType;
conversationId: string;
nextItem: undefined | TimelineItemType;
isNextItemCallingNotification: boolean;
};
type PropsType = CallingNotificationType & PropsActionsType & PropsHousekeeping;
@ -86,12 +85,12 @@ function renderCallingNotificationButton(
activeCallConversationId,
conversationId,
i18n,
nextItem,
isNextItemCallingNotification,
returnToActiveCall,
startCallingLobby,
} = props;
if (nextItem?.type === 'callHistory') {
if (isNextItemCallingNotification) {
return null;
}