From 4968244491178ef717f17f991ef37b171367c08f Mon Sep 17 00:00:00 2001
From: audric <audric@loki.network>
Date: Wed, 25 Aug 2021 15:29:13 +1000
Subject: [PATCH] fix tooltip error in debug run related to memory leak

---
 stylesheets/_session_theme.scss               |  4 --
 .../message/MessageAttachment.tsx             |  1 +
 .../conversation/message/MessageContent.tsx   |  2 +-
 .../session/SessionJoinableDefaultRooms.tsx   | 42 ++++++++++---------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 9b395ae11..1bd823702 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -137,10 +137,6 @@
     }
   }
 
-  &-incoming {
-    margin-inline-end: auto;
-  }
-
   &-outgoing {
     margin-inline-start: auto;
   }
diff --git a/ts/components/conversation/message/MessageAttachment.tsx b/ts/components/conversation/message/MessageAttachment.tsx
index 2accd57ca..dddda729a 100644
--- a/ts/components/conversation/message/MessageAttachment.tsx
+++ b/ts/components/conversation/message/MessageAttachment.tsx
@@ -137,6 +137,7 @@ export const MessageAttachment = (props: Props) => {
         onClick={(e: any) => {
           e.stopPropagation();
         }}
+        style={{ padding: '5px 10px' }}
       >
         <AudioPlayerWithEncryptedFile
           src={firstAttachment.url}
diff --git a/ts/components/conversation/message/MessageContent.tsx b/ts/components/conversation/message/MessageContent.tsx
index c5afc849a..5bcb87430 100644
--- a/ts/components/conversation/message/MessageContent.tsx
+++ b/ts/components/conversation/message/MessageContent.tsx
@@ -154,7 +154,7 @@ export const MessageContent = (props: Props) => {
         handleImageError={handleImageError}
       />
       {hasContentAfterAttachmentAndQuote ? (
-        <Flex padding="5px 5px 10px 5px">
+        <Flex padding="10px">
           <MessagePreview messageId={props.messageId} handleImageError={handleImageError} />
           <MessageText messageId={props.messageId} />
         </Flex>
diff --git a/ts/components/session/SessionJoinableDefaultRooms.tsx b/ts/components/session/SessionJoinableDefaultRooms.tsx
index 5a542626f..282f5bd23 100644
--- a/ts/components/session/SessionJoinableDefaultRooms.tsx
+++ b/ts/components/session/SessionJoinableDefaultRooms.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import {
   joinOpenGroupV2WithUIEvents,
   parseOpenGroupV2,
@@ -12,7 +12,7 @@ import { Flex } from '../basic/Flex';
 import { PillContainerHoverable, PillTooltipWrapper } from '../basic/PillContainer';
 import { H3 } from '../basic/Text';
 import { SessionSpinner } from './SessionSpinner';
-import styled, { DefaultTheme, useTheme } from 'styled-components';
+import styled from 'styled-components';
 // tslint:disable: no-void-expression
 
 export type JoinableRoomProps = {
@@ -25,34 +25,50 @@ export type JoinableRoomProps = {
 };
 
 const SessionJoinableRoomAvatar = (props: JoinableRoomProps) => {
+  const dispatch = useDispatch();
   useEffect(() => {
+    let isCancelled = false;
+
     try {
       const parsedInfos = parseOpenGroupV2(props.completeUrl);
       if (parsedInfos) {
         if (props.base64Data) {
           return;
         }
+        if (isCancelled) {
+          return;
+        }
         void downloadPreviewOpenGroupV2(parsedInfos)
           .then(base64 => {
+            if (isCancelled) {
+              return;
+            }
             const payload = {
               roomId: props.roomId,
               base64Data: base64 || '',
             };
-            window.inboxStore?.dispatch(updateDefaultBase64RoomData(payload));
+            dispatch(updateDefaultBase64RoomData(payload));
           })
           .catch(e => {
+            if (isCancelled) {
+              return;
+            }
             window?.log?.warn('downloadPreviewOpenGroupV2 failed', e);
             const payload = {
               roomId: props.roomId,
               base64Data: '',
             };
-            window.inboxStore?.dispatch(updateDefaultBase64RoomData(payload));
+            dispatch(updateDefaultBase64RoomData(payload));
           });
       }
     } catch (e) {
       window?.log?.warn(e);
     }
+    return () => {
+      isCancelled = true;
+    };
   }, [props.imageId, props.completeUrl]);
+
   return (
     <Avatar
       size={AvatarSize.XS}
@@ -70,7 +86,7 @@ const StyledRoomName = styled(Flex)`
   padding: 0 10px;
 `;
 
-const StyledToolTip = styled.div<{ theme: DefaultTheme }>`
+const StyledToolTip = styled.div`
   padding: ${props => props.theme.common.margins.sm};
   background: ${props => props.theme.colors.clickableHovered};
   font-size: ${props => props.theme.common.fonts.xs};
@@ -101,28 +117,16 @@ const SessionJoinableRoomName = (props: JoinableRoomProps) => {
 };
 
 const SessionJoinableRoomRow = (props: JoinableRoomProps) => {
-  const [hoverDelayReached, setHoverDelayReached] = useState(false);
   const [isHovering, setIsHovering] = useState(false);
-  const [delayHandler, setDelayHandler] = useState<null | number>(null);
-  const theme: DefaultTheme = useTheme();
 
   const handleMouseEnter = () => {
     setIsHovering(true);
-    setDelayHandler(
-      setTimeout(() => {
-        setHoverDelayReached(true);
-      }, 750)
-    );
   };
   const handleMouseLeave = () => {
     setIsHovering(false);
-    setHoverDelayReached(false);
-    if (delayHandler) {
-      clearTimeout(delayHandler);
-    }
   };
 
-  const showTooltip = hoverDelayReached && isHovering;
+  const showTooltip = isHovering;
 
   return (
     <PillTooltipWrapper>
@@ -139,7 +143,7 @@ const SessionJoinableRoomRow = (props: JoinableRoomProps) => {
         <SessionJoinableRoomName {...props} />
       </PillContainerHoverable>
 
-      {showTooltip && <StyledToolTip theme={theme}>{props.name}</StyledToolTip>}
+      {showTooltip && <StyledToolTip>{props.name}</StyledToolTip>}
     </PillTooltipWrapper>
   );
 };