From 09be936aa43b5ed6aabf3f9fb36d05c6322e38f8 Mon Sep 17 00:00:00 2001
From: Ian Macdonald <ian@caliban.org>
Date: Thu, 5 May 2022 12:56:34 +0200
Subject: [PATCH] Report number of deletions when a deletion operation
 completes.

---
 _locales/en/messages.json                              | 2 +-
 ts/interactions/conversations/unsendingInteractions.ts | 8 ++++----
 ts/session/utils/Toast.tsx                             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 760076d6c..af3f62d7d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -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:",
diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts
index 064bfba95..72734a37c 100644
--- a/ts/interactions/conversations/unsendingInteractions.ts
+++ b/ts/interactions/conversations/unsendingInteractions.ts
@@ -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
diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx
index cb64faad8..e2efc4b33 100644
--- a/ts/session/utils/Toast.tsx
+++ b/ts/session/utils/Toast.tsx
@@ -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() {