Merge remote-tracking branch 'upstream/clearnet' into settings-redesign

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Labs",

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,17 +67,19 @@ 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
-    // but to select
-    if (
-      !currentSelectionString ||
-      currentSelectionString.length === 0 ||
-      !currentSelectionString.includes(' ')
-    ) {
-      void replyToMessage(messageId);
-      currentSelection?.empty();
-      e.preventDefault();
-      return;
+    if ((e.target as any).localName !== 'em-emoji-picker') {
+      if (
+        !currentSelectionString ||
+        currentSelectionString.length === 0 ||
+        !/\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;
+      }
     }
   };