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

Merge delete for me/everyone into one modal

Browse source
This commit is contained in:
Jamie Kyle 2023-04-10 14:38:34 -07:00 • committed by GitHub
parent c956c0e025
commit 822b162136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 658 additions and 672 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/components/CompositionArea.tsx
View file

@ -39,7 +39,6 @@ import { AudioCapture } from './conversation/AudioCapture';
import { CompositionUpload } from './CompositionUpload';
import type {
ConversationType,
MessageTimestamps,
PushPanelForConversationActionType,
ShowConversationType,
} from '../state/ducks/conversations';
@ -149,7 +148,6 @@ export type OwnProps = Readonly<{
props: SmartCompositionRecordingDraftProps
) => JSX.Element | null;
selectedMessageIds: ReadonlyArray<string> | undefined;
lastSelectedMessage: MessageTimestamps | undefined;
toggleSelectMode: (on: boolean) => void;
toggleForwardMessagesModal: (
messageIds: ReadonlyArray<string>,
@ -287,7 +285,6 @@ export function CompositionArea({
renderSmartCompositionRecordingDraft,
// Selected messages
selectedMessageIds,
lastSelectedMessage,
toggleSelectMode,
toggleForwardMessagesModal,
}: Props): JSX.Element | null {
@ -560,12 +557,13 @@ export function CompositionArea({
toggleSelectMode(false);
}}
onDeleteMessages={() => {
window.reduxActions.conversations.deleteMessages({
window.reduxActions.globalModals.toggleDeleteMessagesModal({
conversationId,
lastSelectedMessage,
messageIds: selectedMessageIds,
onDelete() {
toggleSelectMode(false);
},
});
toggleSelectMode(false);
}}
onForwardMessages={() => {
if (selectedMessageIds.length > 0) {