oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Report number of deletions when a deletion operation completes.

This commit is contained in:
Ian Macdonald 2022-05-05 12:56:34 +02:00
parent 6e2b2d44f8
commit 09be936aa4
No known key found for this signature in database
GPG Key ID: AE4C20556BA626FA
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_locales/en/messages.json
View File

@ -97,7 +97,7 @@
"deleteMessagesQuestion": "Delete $count$ messages?",
"deleteMessageQuestion": "Delete this message?",
"deleteMessages": "Delete Messages",
"deleted": "Deleted",
"deleted": "$count$ deleted",
"messageDeletedPlaceholder": "This message has been deleted",
"from": "From:",
"to": "To:",

8
ts/interactions/conversations/unsendingInteractions.ts
View File

@ -62,7 +62,7 @@ async function unsendMessagesForEveryone(
await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete);
window.inboxStore?.dispatch(resetSelectedMessageIds());
ToastUtils.pushDeleted();
ToastUtils.pushDeleted(msgsToDelete.length);
}
function getUnsendMessagesObjects(messages: Array<MessageModel>) {
@ -230,7 +230,7 @@ async function unsendMessageJustForThisUser(
// Update view and trigger update
window.inboxStore?.dispatch(resetSelectedMessageIds());
ToastUtils.pushDeleted();
ToastUtils.pushDeleted(msgsToDelete.length);
}
const doDeleteSelectedMessagesInSOGS = async (
@ -270,7 +270,7 @@ const doDeleteSelectedMessagesInSOGS = async (
})
);
// successful deletion
ToastUtils.pushDeleted();
ToastUtils.pushDeleted(toDeleteLocallyIds.length);
window.inboxStore?.dispatch(resetSelectedMessageIds());
//#endregion
};
@ -317,7 +317,7 @@ const doDeleteSelectedMessages = async ({
// Update view and trigger update
window.inboxStore?.dispatch(resetSelectedMessageIds());
ToastUtils.pushDeleted();
ToastUtils.pushDeleted(selectedMessages.length);
return;
}
// otherwise, delete that message locally, from our swarm and from our other devices

4
ts/session/utils/Toast.tsx
View File

@ -216,8 +216,8 @@ export function someDeletionsFailed() {
pushToastWarning('deletionError', 'Deletion error');
}
export function pushDeleted() {
pushToastSuccess('deleted', window.i18n('deleted'), undefined, 'check');
export function pushDeleted(messageCount: number) {
pushToastSuccess('deleted', window.i18n('deleted', [messageCount.toString()]), undefined, 'check');
}
export function pushCannotRemoveCreatorFromGroup() {