From c552fc5f348f954b796cc63891a4e1d4bbeb2336 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Thu, 13 Feb 2025 14:27:57 +0100 Subject: [PATCH] Delete Message Modal: Fix modal window closing animation (#5580) --- src/components/common/DeleteMessageModal.tsx | 11 ++++------- .../modals/paidReaction/PaidReactionModal.module.scss | 5 ----- .../modals/paidReaction/PaidReactionModal.tsx | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/components/common/DeleteMessageModal.tsx b/src/components/common/DeleteMessageModal.tsx index b80f82ddc..2e68590e9 100644 --- a/src/components/common/DeleteMessageModal.tsx +++ b/src/components/common/DeleteMessageModal.tsx @@ -129,8 +129,9 @@ const DeleteMessageModal: FC = ({ } const global = getGlobal(); const senderArray = getSendersFromSelectedMessages(global, chat.id, messageIds); - return senderArray ? unique(senderArray).filter((peer) => peer?.id !== chat?.id && peer?.id !== linkedChatId) : MEMO_EMPTY_ARRAY; - }, [chat, isChannel, messageIds]); + return senderArray ? unique(senderArray) + .filter((peer) => peer?.id !== chat?.id && peer?.id !== linkedChatId) : MEMO_EMPTY_ARRAY; + }, [chat, isChannel, linkedChatId, messageIds]); const buildNestedOptionListWithAvatars = useLastCallback(() => { return peerList.map((member) => { @@ -411,10 +412,6 @@ const DeleteMessageModal: FC = ({ ); } - if (!messageIds) { - return undefined; - } - return ( = ({ )} {(canDeleteForAll || chatBot || !shouldShowOption) && ( <> -

{messageIds.length > 1 +

{messageIds && messageIds.length > 1 ? lang('AreYouSureDeleteFewMessages') : lang('AreYouSureDeleteSingleMessage')}

{willDeleteForCurrentUserOnly && ( diff --git a/src/components/modals/paidReaction/PaidReactionModal.module.scss b/src/components/modals/paidReaction/PaidReactionModal.module.scss index 1fdfdbf48..91cf189b4 100644 --- a/src/components/modals/paidReaction/PaidReactionModal.module.scss +++ b/src/components/modals/paidReaction/PaidReactionModal.module.scss @@ -57,11 +57,6 @@ flex-grow: 1; } -.checkbox { - align-self: center; - margin-bottom: 1.5rem; -} - .disclaimer { font-size: 0.875rem; align-self: center; diff --git a/src/components/modals/paidReaction/PaidReactionModal.tsx b/src/components/modals/paidReaction/PaidReactionModal.tsx index 2854a1106..77a1d5989 100644 --- a/src/components/modals/paidReaction/PaidReactionModal.tsx +++ b/src/components/modals/paidReaction/PaidReactionModal.tsx @@ -204,7 +204,7 @@ const PaidReactionModal = ({ )}