From 391db5590e890dad4573910d42cd5e3565e59ab9 Mon Sep 17 00:00:00 2001 From: William Grant Date: Thu, 18 May 2023 17:30:52 +1000 Subject: [PATCH] fix: replace controller lookup with redux conversation lookup in getMessageQuoteProps this is more performance and relies on the latest redux state --- ts/state/selectors/conversations.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 6f8ba2e5b..5c20c7be4 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -983,9 +983,14 @@ export const getMessageLinkPreviewProps = createSelector(getMessagePropsByMessag // tslint:disable: cyclomatic-complexity export const getMessageQuoteProps = createSelector( + getConversationLookup, getConversationQuotes, getMessagePropsByMessageId, - (quotesProps, msgModel): { direction: MessageModelType; quote: PropsForQuote } | undefined => { + ( + conversationLookup, + quotesProps, + msgModel + ): { direction: MessageModelType; quote: PropsForQuote } | undefined => { if (!msgModel || isEmpty(msgModel)) { return undefined; } @@ -1028,14 +1033,14 @@ export const getMessageQuoteProps = createSelector( return quoteNotFound; } - const convo = getConversationController().get(sourceMsgProps.convoId); + const convo = conversationLookup[sourceMsgProps.convoId]; if (!convo) { return quoteNotFound; } const attachment = sourceMsgProps.attachments && sourceMsgProps.attachments[0]; - if (convo.isPublic() && PubKey.hasBlindedPrefix(sourceMsgProps.sender)) { + if (convo.isPublic && PubKey.hasBlindedPrefix(sourceMsgProps.sender)) { const room = OpenGroupData.getV2OpenGroupRoom(sourceMsgProps.convoId); if (room && roomHasBlindEnabled(room)) { const usFromCache = findCachedBlindedIdFromUnblinded(