fix: unsend for legacy groups was broken

pull/3205/head
Audric Ackermann 1 year ago
parent b833a2f862
commit 7d179ef8b3
No known key found for this signature in database

@ -309,7 +309,6 @@ const doDeleteSelectedMessages = async ({
} }
// #region deletion for 1-1 and closed groups // #region deletion for 1-1 and closed groups
if (deleteForEveryone) { if (deleteForEveryone) {
if (!isAllOurs) { if (!isAllOurs) {
ToastUtils.pushMessageDeleteForbidden(); ToastUtils.pushMessageDeleteForbidden();
@ -392,6 +391,7 @@ export async function deleteMessagesById(messageIds: Array<string>, conversation
const isMe = conversation.isMe(); const isMe = conversation.isMe();
const closeDialog = () => window.inboxStore?.dispatch(updateConfirmModal(null)); const closeDialog = () => window.inboxStore?.dispatch(updateConfirmModal(null));
const clearMessagesForEveryone = 'clearMessagesForEveryone';
window.inboxStore?.dispatch( window.inboxStore?.dispatch(
updateConfirmModal({ updateConfirmModal({
@ -399,8 +399,11 @@ export async function deleteMessagesById(messageIds: Array<string>, conversation
i18nMessage: { token: 'deleteMessage', args: { count: selectedMessages.length } }, i18nMessage: { token: 'deleteMessage', args: { count: selectedMessages.length } },
radioOptions: !isMe radioOptions: !isMe
? [ ? [
{ label: window.i18n('clearMessagesForMe'), value: 'clearMessagesForMe' }, { label: window.i18n('clearMessagesForMe'), value: 'clearMessagesForMe' as const },
{ label: window.i18n('clearMessagesForEveryone'), value: 'clearMessagesForEveryone' }, {
label: window.i18n('clearMessagesForEveryone'),
value: clearMessagesForEveryone,
},
] ]
: undefined, : undefined,
okText: window.i18n('delete'), okText: window.i18n('delete'),
@ -409,7 +412,7 @@ export async function deleteMessagesById(messageIds: Array<string>, conversation
await doDeleteSelectedMessages({ await doDeleteSelectedMessages({
selectedMessages, selectedMessages,
conversation, conversation,
deleteForEveryone: args === 'deleteForEveryone', // chosenOption from radioOptions deleteForEveryone: args === clearMessagesForEveryone,
}); });
window.inboxStore?.dispatch(updateConfirmModal(null)); window.inboxStore?.dispatch(updateConfirmModal(null));
window.inboxStore?.dispatch(closeRightPanel()); window.inboxStore?.dispatch(closeRightPanel());

@ -345,7 +345,7 @@ export async function deleteEverythingAndNetworkData() {
title: window.i18n('clearDataAll'), title: window.i18n('clearDataAll'),
i18nMessage: { token: 'clearDataErrorDescriptionGeneric' }, i18nMessage: { token: 'clearDataErrorDescriptionGeneric' },
okTheme: SessionButtonColor.Danger, okTheme: SessionButtonColor.Danger,
okText: window.i18n('clearDeviceOnly'), okText: window.i18n('clearDevice'),
cancelText: window.i18n('cancel'), cancelText: window.i18n('cancel'),
onClickOk: async () => { onClickOk: async () => {
await deleteDbLocally(); await deleteDbLocally();

Loading…
Cancel
Save