Contact info modal for call link join requests

This commit is contained in:
ayumi-signal 2024-09-11 12:30:50 -07:00 committed by GitHub
parent 390eab2556
commit 84896d0fbb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 519 additions and 6 deletions

View file

@ -0,0 +1,41 @@
// Copyright 2024 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import React, { memo } from 'react';
import { useSelector } from 'react-redux';
import { CallLinkPendingParticipantModal } from '../../components/CallLinkPendingParticipantModal';
import { useCallingActions } from '../ducks/calling';
import { getIntl } from '../selectors/user';
import { useConversationsActions } from '../ducks/conversations';
import { useGlobalModalActions } from '../ducks/globalModals';
import { getConversationSelector } from '../selectors/conversations';
import { getCallLinkPendingParticipantContactId } from '../selectors/globalModals';
import { strictAssert } from '../../util/assert';
export const SmartCallLinkPendingParticipantModal = memo(
function SmartCallLinkPendingParticipantModal(): JSX.Element | null {
const contactId = useSelector(getCallLinkPendingParticipantContactId);
strictAssert(contactId, 'Expected contactId to be set');
const i18n = useSelector(getIntl);
const getConversation = useSelector(getConversationSelector);
const { updateSharedGroups } = useConversationsActions();
const { approveUser, denyUser } = useCallingActions();
const { toggleAboutContactModal, toggleCallLinkPendingParticipantModal } =
useGlobalModalActions();
const conversation = getConversation(contactId);
return (
<CallLinkPendingParticipantModal
i18n={i18n}
conversation={conversation}
approveUser={approveUser}
denyUser={denyUser}
onClose={toggleCallLinkPendingParticipantModal}
updateSharedGroups={updateSharedGroups}
toggleAboutContactModal={toggleAboutContactModal}
/>
);
}
);

View file

@ -458,8 +458,11 @@ export const SmartCallManager = memo(function SmartCallManager() {
toggleSettings,
} = useCallingActions();
const { pauseVoiceNotePlayer } = useAudioPlayerActions();
const { showContactModal, showShareCallLinkViaSignal } =
useGlobalModalActions();
const {
showContactModal,
showShareCallLinkViaSignal,
toggleCallLinkPendingParticipantModal,
} = useGlobalModalActions();
return (
<CallManager
@ -513,6 +516,9 @@ export const SmartCallManager = memo(function SmartCallManager() {
stopRingtone={stopRingtone}
switchFromPresentationView={switchFromPresentationView}
switchToPresentationView={switchToPresentationView}
toggleCallLinkPendingParticipantModal={
toggleCallLinkPendingParticipantModal
}
toggleParticipants={toggleParticipants}
togglePip={togglePip}
toggleScreenRecordingPermissionsDialog={

View file

@ -29,6 +29,7 @@ import { SmartNotePreviewModal } from './NotePreviewModal';
import { SmartCallLinkEditModal } from './CallLinkEditModal';
import { SmartCallLinkAddNameModal } from './CallLinkAddNameModal';
import { SmartConfirmLeaveCallModal } from './ConfirmLeaveCallModal';
import { SmartCallLinkPendingParticipantModal } from './CallLinkPendingParticipantModal';
function renderCallLinkAddNameModal(): JSX.Element {
return <SmartCallLinkAddNameModal />;
@ -38,6 +39,10 @@ function renderCallLinkEditModal(): JSX.Element {
return <SmartCallLinkEditModal />;
}
function renderCallLinkPendingParticipantModal(): JSX.Element {
return <SmartCallLinkPendingParticipantModal />;
}
function renderConfirmLeaveCallModal(): JSX.Element {
return <SmartConfirmLeaveCallModal />;
}
@ -107,6 +112,7 @@ export const SmartGlobalModalContainer = memo(
addUserToAnotherGroupModalContactId,
callLinkAddNameModalRoomId,
callLinkEditModalRoomId,
callLinkPendingParticipantContactId,
confirmLeaveCallModalState,
contactModalState,
deleteMessagesProps,
@ -188,6 +194,9 @@ export const SmartGlobalModalContainer = memo(
}
callLinkAddNameModalRoomId={callLinkAddNameModalRoomId}
callLinkEditModalRoomId={callLinkEditModalRoomId}
callLinkPendingParticipantContactId={
callLinkPendingParticipantContactId
}
confirmLeaveCallModalState={confirmLeaveCallModalState}
contactModalState={contactModalState}
editHistoryMessages={editHistoryMessages}
@ -213,6 +222,9 @@ export const SmartGlobalModalContainer = memo(
renderAddUserToAnotherGroup={renderAddUserToAnotherGroup}
renderCallLinkAddNameModal={renderCallLinkAddNameModal}
renderCallLinkEditModal={renderCallLinkEditModal}
renderCallLinkPendingParticipantModal={
renderCallLinkPendingParticipantModal
}
renderConfirmLeaveCallModal={renderConfirmLeaveCallModal}
renderContactModal={renderContactModal}
renderEditHistoryMessagesModal={renderEditHistoryMessagesModal}