fix: pr review fixes

ts/components/dialog/ReactListModal.tsx

@@ -216,15 +216,17 @@ const handleSenders = (senders: Array<string>, me: string) => {
 export const ReactListModal = (props: Props): ReactElement => {
   const { reaction, messageId } = props;
 
+  const dispatch = useDispatch();
   const [reactions, setReactions] = useState<SortedReactionList>([]);
   const reactionsMap = (reactions && Object.fromEntries(reactions)) || {};
   const [currentReact, setCurrentReact] = useState('');
   const [reactAriaLabel, setReactAriaLabel] = useState<string | undefined>();
   const [count, setCount] = useState<number | null>(null);
   const [senders, setSenders] = useState<Array<string>>([]);
-  const me = UserUtils.getOurPubKeyStrFromCache();
 
   const msgProps = useMessageReactsPropsById(messageId);
+  const weAreModerator = useWeAreModerator(msgProps?.convoId);
+  const me = UserUtils.getOurPubKeyStrFromCache();
 
   // tslint:disable: cyclomatic-complexity
   useEffect(() => {
@@ -281,10 +283,7 @@ export const ReactListModal = (props: Props): ReactElement => {
     return <></>;
   }
 
-  const dispatch = useDispatch();
+  const { isPublic } = msgProps;
-
-  const { convoId, isPublic } = msgProps;
-  const weAreModerator = useWeAreModerator(convoId);
 
   const handleSelectedReaction = (emoji: string): boolean => {
     return currentReact === emoji;

ts/session/apis/open_group_api/sogsv3/sogsV3MutationCache.ts

@@ -57,10 +57,8 @@ export function updateMutationCache(entry: SogsV3Mutation, seqno: number) {
   } else {
     const entryIndex = findIndex(sogsMutationCache, entry);
     if (entryIndex >= 0) {
-      const updatedEntry = entry;
+      sogsMutationCache[entryIndex].seqno = seqno;
-      updatedEntry.seqno = seqno;
+      window.log.info('SOGS Mutation Cache: Entry updated!', sogsMutationCache[entryIndex]);
-      sogsMutationCache[entryIndex] = updatedEntry;
-      window.log.info('SOGS Mutation Cache: Entry updated!', updatedEntry);
     } else {
       window.log.error('SOGS Mutation Cache: Updated failed! Cannot find entry', entry);
     }
@@ -75,7 +73,6 @@ export async function processMessagesUsingCache(
   const updatedReactions = message.reactions;
   const roomMatches: Array<SogsV3Mutation> = filter(sogsMutationCache, { server, room });
 
-  if (roomMatches?.length) {
   for (const roomMatch of roomMatches) {
     if (message.seqno && roomMatch.seqno && roomMatch.seqno <= message.seqno) {
       const removedEntry = remove(sogsMutationCache, roomMatch);
@@ -94,7 +91,7 @@ export async function processMessagesUsingCache(
             emoji: reaction,
           },
         });
-          if (reactionMatches?.length) {
+
         for (const reactionMatch of reactionMatches) {
           switch (reactionMatch.metadata.action) {
             case 'ADD':
@@ -120,18 +117,13 @@ export async function processMessagesUsingCache(
               );
           }
         }
-
-            const removedMatches = remove(sogsMutationCache, ...roomMatches);
-            window.log.info(
-              'SOGS Mutation Cache: Removed processed entries from cache!',
-              removedMatches
-            );
-          }
-        }
       }
     }
   }
 
+  const removedMatches = remove(sogsMutationCache, ...roomMatches);
+  window.log.info('SOGS Mutation Cache: Removed processed entries from cache!', removedMatches);
+
   message.reactions = updatedReactions;
   await handleOpenGroupMessageReactions(message.reactions, message.id);
 }