From aa3855e49f93f407016c6b8197555d2deca63731 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 15 May 2023 14:30:11 +1000
Subject: [PATCH] feat: getConversationQuotes selector for memoising quotes
 lookup state

---
 ts/state/selectors/conversations.ts | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 6b4f66205..e61e4d4c7 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -9,6 +9,7 @@ import {
   MessageModelPropsWithoutConvoProps,
   MessagePropsDetails,
   PropsForQuote,
+  QuoteLookupType,
   ReduxConversationType,
   SortedMessageModelProps,
 } from '../ducks/conversations';
@@ -56,6 +57,13 @@ export const getConversationsCount = createSelector(getConversationLookup, (stat
   return Object.values(state).length;
 });
 
+export const getConversationQuotes = createSelector(
+  getConversations,
+  (state: ConversationsStateType): QuoteLookupType | undefined => {
+    return state.quotes;
+  }
+);
+
 export const getSelectedConversationKey = createSelector(
   getConversations,
   (state: ConversationsStateType): string | undefined => {
@@ -973,10 +981,10 @@ export const getMessageLinkPreviewProps = createSelector(getMessagePropsByMessag
 });
 
 export const getMessageQuoteProps = createSelector(
-  getConversations,
+  getConversationQuotes,
   getMessagePropsByMessageId,
-  (convosProps, msgProps) => {
-    if (!convosProps || isEmpty(convosProps) || !msgProps || isEmpty(msgProps)) {
+  (quotesProps, msgProps) => {
+    if (!msgProps || isEmpty(msgProps)) {
       return undefined;
     }
 
@@ -990,7 +998,12 @@ export const getMessageQuoteProps = createSelector(
       return undefined;
     }
 
-    const sourceMessage = convosProps.quotes[`${messageId}-${sender}`];
+    // NOTE: if the message is not found, we still want to render the quote
+    if (!quotesProps || isEmpty(quotesProps)) {
+      return { direction, quote: { sender, referencedMessageNotFound: true } };
+    }
+
+    const sourceMessage = quotesProps[`${messageId}-${sender}`];
     if (!sourceMessage) {
       return { direction, quote: { sender, referencedMessageNotFound: true } };
     }