From b93201fbe6da64d61a0cb316146abdb1fdf565c9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Apr 2022 13:58:25 +1000 Subject: [PATCH] When deleting multiple messages, inform the user of the number taken from #2263 by @ianmacd --- _locales/en/messages.json | 2 +- stylesheets/_session_conversation.scss | 2 +- ts/interactions/conversations/unsendingInteractions.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 817ea7794..760076d6c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -94,7 +94,7 @@ "messageDeletionForbidden": "You don’t have permission to delete others’ messages", "deleteJustForMe": "Delete just for me", "deleteForEveryone": "Delete for everyone", - "deleteMessagesQuestion": "Delete those messages?", + "deleteMessagesQuestion": "Delete $count$ messages?", "deleteMessageQuestion": "Delete this message?", "deleteMessages": "Delete Messages", "deleted": "Deleted", diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss index bed162339..55e870ac7 100644 --- a/stylesheets/_session_conversation.scss +++ b/stylesheets/_session_conversation.scss @@ -91,7 +91,7 @@ .selection-mode { .messages-container > *:not(.message-selected) { animation: toShadow $session-transition-duration; - opacity: 0.40; + opacity: 0.4; } } } diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index f5ed02d6d..064bfba95 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -336,13 +336,14 @@ export async function deleteMessagesByIdForEveryone( await Promise.all(messageIds.map(m => getMessageById(m, false))) ); - const moreThanOne = selectedMessages.length > 1; + const messageCount = selectedMessages.length; + const moreThanOne = messageCount > 1; window.inboxStore?.dispatch( updateConfirmModal({ title: window.i18n('deleteForEveryone'), message: moreThanOne - ? window.i18n('deleteMessagesQuestion') + ? window.i18n('deleteMessagesQuestion', [messageCount.toString()]) : window.i18n('deleteMessageQuestion'), okText: window.i18n('deleteForEveryone'), okTheme: SessionButtonColor.Danger,