From 1e7953461563b0615a5df764989c6fe32d308f49 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 9 Jan 2020 16:02:05 +1100
Subject: [PATCH] make avatar in actionpanel not clickable
---
.../_session_theme_dark_left_pane.scss | 2 +-
ts/components/session/ActionsPanel.tsx | 43 +++++++------------
2 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/stylesheets/_session_theme_dark_left_pane.scss b/stylesheets/_session_theme_dark_left_pane.scss
index a8ced0678..ea77938fc 100644
--- a/stylesheets/_session_theme_dark_left_pane.scss
+++ b/stylesheets/_session_theme_dark_left_pane.scss
@@ -475,7 +475,7 @@ $session-compose-margin: 20px;
span {
padding: 5px 10px;
border-radius: 50px;
- @include session-dark-background-lighter;
+ background-color: #121212;
color: $session-color-light-grey;
border: 1px solid $session-color-dark-grey;
}
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index d764f448a..d13fd42c1 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -40,38 +40,25 @@ const Section = ({
}) => {
const handleClick = onSelect
? () => {
- onSelect(type);
+ if(type !== SectionType.Profile) {
+ onSelect(type);
+ }
}
: undefined;
if (type === SectionType.Profile) {
- if (!isSelected) {
- return (
- <Avatar
- avatarPath={avatarPath}
- conversationType="direct"
- i18n={window.i18n}
- // tslint:disable-next-line: no-backbone-get-set-outside-model
- phoneNumber={window.storage.get('primaryDevicePubKey')}
- size={28}
- onAvatarClick={handleClick}
- />
- );
- } else {
- return (
- <Avatar
- avatarPath={avatarPath}
- conversationType="direct"
- i18n={window.i18n}
- // tslint:disable-next-line: no-backbone-get-set-outside-model
- phoneNumber={window.storage.get('primaryDevicePubKey')}
- size={28}
- onAvatarClick={handleClick}
- borderColor={'#fff'}
- />
- );
- }
- }
+ return (
+ <Avatar
+ avatarPath={avatarPath}
+ conversationType="direct"
+ i18n={window.i18n}
+ // tslint:disable-next-line: no-backbone-get-set-outside-model
+ phoneNumber={window.storage.get('primaryDevicePubKey')}
+ size={28}
+ onAvatarClick={handleClick}
+ />
+ );
+}
let iconType: SessionIconType;
switch (type) {