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

Properly style call buttons across app, when already in a call

Browse source
This commit is contained in:
Scott Nonnenberg 2024-08-27 06:48:41 +10:00 • committed by GitHub
parent 3c25092f50
commit c251867699
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 610 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/state/smart/CallLinkEditModal.tsx
View file

@ -4,7 +4,7 @@ import React, { memo, useCallback, useMemo } from 'react';
import { useSelector } from 'react-redux';
import { CallLinkEditModal } from '../../components/CallLinkEditModal';
import { useCallingActions } from '../ducks/calling';
import { getCallLinkSelector } from '../selectors/calling';
import { getActiveCallState, getCallLinkSelector } from '../selectors/calling';
import * as log from '../../logging/log';
import { getIntl } from '../selectors/user';
import { useGlobalModalActions } from '../ducks/globalModals';
@ -74,6 +74,11 @@ export const SmartCallLinkEditModal = memo(
toggleCallLinkEditModal(null);
}, [callLink, startCallLinkLobby, toggleCallLinkEditModal]);
const activeCall = useSelector(getActiveCallState);
const hasActiveCall = Boolean(
activeCall && callLink && activeCall?.conversationId !== callLink?.roomId
);
if (!callLink) {
log.error(
'SmartCallLinkEditModal: No call link found for roomId',
@ -86,6 +91,7 @@ export const SmartCallLinkEditModal = memo(
<CallLinkEditModal
i18n={i18n}
callLink={callLink}
hasActiveCall={hasActiveCall}
onClose={handleClose}
onCopyCallLink={handleCopyCallLink}
onOpenCallLinkAddNameModal={handleOpenCallLinkAddNameModal}