From b9dbef86a5bbf70cb1604203fa89d8850af9fccf Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 4 Nov 2020 11:14:06 +1100
Subject: [PATCH] click on image message in convo while selection mode, selects
 message

---
 stylesheets/_session_theme.scss        |  3 ---
 stylesheets/_theme_dark.scss           |  1 -
 ts/components/conversation/Message.tsx | 11 ++++++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 39991d809..9fc7ae020 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -80,9 +80,6 @@
     }
   }
 
-  &__container {
-    transition: background-color $session-transition-duration;
-  }
 }
 
 .message {
diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss
index a42cb5986..a4a53b013 100644
--- a/stylesheets/_theme_dark.scss
+++ b/stylesheets/_theme_dark.scss
@@ -400,7 +400,6 @@
     @include color-svg('../images/timer-00.svg', $color-white-08);
   }
 
-
   // When status indicators are overlaid on top of an image, they use different colors
   .module-expire-timer--with-image-no-caption {
     background-color: $color-dark-05;
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index c74639f71..500b5a4af 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -344,6 +344,7 @@ export class Message extends React.PureComponent<Props, State> {
   // tslint:disable-next-line max-func-body-length cyclomatic-complexity
   public renderAttachment() {
     const {
+      id,
       attachments,
       text,
       collapseMetadata,
@@ -351,6 +352,8 @@ export class Message extends React.PureComponent<Props, State> {
       direction,
       quote,
       onClickAttachment,
+      multiSelectMode,
+      onSelectMessage,
     } = this.props;
     const { imageBroken } = this.state;
 
@@ -391,7 +394,13 @@ export class Message extends React.PureComponent<Props, State> {
             bottomOverlay={!collapseMetadata}
             i18n={window.i18n}
             onError={this.handleImageErrorBound}
-            onClickAttachment={onClickAttachment}
+            onClickAttachment={(attachment: AttachmentType) => {
+              if (multiSelectMode) {
+                onSelectMessage(id);
+              } else if (onClickAttachment) {
+                onClickAttachment(attachment);
+              }
+            }}
           />
         </div>
       );