Merge pull request #2432 from oxen-io/clearnet

Merge clearing own reaction from modal closes it

ts/components/conversation/message/message-content/MessageContentWithStatus.tsx

@@ -30,6 +30,7 @@ type Props = {
   dataTestId?: string;
   enableReactions: boolean;
 };
+// tslint:disable: use-simple-attributes
 
 const StyledMessageContentContainer = styled.div<{ direction: 'left' | 'right' }>`
   display: flex;
@@ -66,18 +67,20 @@ export const MessageContentWithStatuses = (props: Props) => {
     const currentSelection = window.getSelection();
     const currentSelectionString = currentSelection?.toString() || undefined;
 
-    // if multiple word are selected, consider that this double click was actually NOT used to reply to
+    if ((e.target as any).localName !== 'em-emoji-picker') {
-    // but to select
       if (
         !currentSelectionString ||
         currentSelectionString.length === 0 ||
-      !currentSelectionString.includes(' ')
+        !/\s/.test(currentSelectionString)
       ) {
+        // if multiple word are selected, consider that this double click was actually NOT used to reply to
+        // but to select
         void replyToMessage(messageId);
         currentSelection?.empty();
         e.preventDefault();
         return;
       }
+    }
   };
 
   const { messageId, ctxMenuID, isDetailView, dataTestId, enableReactions } = props;

ts/components/dialog/ReactListModal.tsx

@@ -111,6 +111,10 @@ const ReactionSenders = (props: ReactionSendersProps) => {
 
   const handleRemoveReaction = async () => {
     await sendMessageReaction(messageId, currentReact);
+
+    if (senders.length <= 1) {
+      dispatch(updateReactListModal(null));
+    }
   };
 
   return (