From e2a3e8538a1594524f4f0ee600dee15a461719ad Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 23 Feb 2024 14:06:25 +0100 Subject: [PATCH] Search: Fix results in chat search (#4303) --- src/global/actions/api/localSearch.ts | 3 ++- src/global/helpers/reactions.ts | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/global/actions/api/localSearch.ts b/src/global/actions/api/localSearch.ts index 4e8490474..2660e3b71 100644 --- a/src/global/actions/api/localSearch.ts +++ b/src/global/actions/api/localSearch.ts @@ -72,7 +72,8 @@ addActionHandler('searchTextMessagesLocal', async (global, actions, payload): Pr global = getGlobal(); currentSearch = selectCurrentTextSearch(global, tabId); - if (!currentSearch || query !== currentSearch.query || !isSameReaction(savedTag, currentSearch.savedTag)) { + const hasTagChanged = !isSameReaction(savedTag, currentSearch?.savedTag); + if (!currentSearch || query !== currentSearch.query || hasTagChanged) { return; } diff --git a/src/global/helpers/reactions.ts b/src/global/helpers/reactions.ts index f4c31152d..f7b444be8 100644 --- a/src/global/helpers/reactions.ts +++ b/src/global/helpers/reactions.ts @@ -32,6 +32,10 @@ export function getReactionKey(reaction: ApiReaction): ApiReactionKey { } export function isSameReaction(first?: ApiReaction, second?: ApiReaction) { + if (first === second) { + return true; + } + if (!first || !second) { return false; }