From 061556bb7d2bf0cf4f3da4f6b4e2d4a15b67c76a Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric.ackermann@smile.fr>
Date: Thu, 28 Nov 2019 15:12:40 +1100
Subject: [PATCH] trigger showUserDetails on message's avatar clicks

---
 js/background.js         | 5 ++---
 ts/components/Avatar.tsx | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/background.js b/js/background.js
index d2f7ffe44..70ea77759 100644
--- a/js/background.js
+++ b/js/background.js
@@ -994,9 +994,8 @@
           pubkey: userPubKey,
           avatarPath,
           avatarColor: conversation.getColor(),
-          onOk: async () => {},
-          onStartConversation: async () => {
-            window.Whisper.events.trigger('showConversation', userPubKey);
+          onStartConversation: () => {
+            Whisper.events.trigger('showConversation', userPubKey);
           },
         });
       }
diff --git a/ts/components/Avatar.tsx b/ts/components/Avatar.tsx
index 800dff04d..bc4394b05 100644
--- a/ts/components/Avatar.tsx
+++ b/ts/components/Avatar.tsx
@@ -26,7 +26,7 @@ interface State {
 
 export class Avatar extends React.PureComponent<Props, State> {
   public handleImageErrorBound: () => void;
-  public onAvatarClickBound: () => void;
+  public onAvatarClickBound: (e: any) => void;
 
   public constructor(props: Props) {
     super(props);
@@ -174,7 +174,9 @@ export class Avatar extends React.PureComponent<Props, State> {
           hasImage ? 'module-avatar--with-image' : 'module-avatar--no-image',
           !hasImage ? `module-avatar--${color}` : null
         )}
-        onClick={this.onAvatarClickBound}
+        onClick={e => {
+          this.onAvatarClickBound(e);
+        }}
         role="button"
       >
         {hasImage ? this.renderAvatarOrIdenticon() : this.renderNoImage()}
@@ -182,8 +184,9 @@ export class Avatar extends React.PureComponent<Props, State> {
     );
   }
 
-  private onAvatarClick() {
+  private onAvatarClick(e: any) {
     if (this.props.onAvatarClick) {
+      e.stopPropagation();
       this.props.onAvatarClick();
     }
   }