Merge pull request #1334 from Bilb/fix-left-border-blocked

stylesheets/_modules.scss

@@ -1520,6 +1520,12 @@
   .module-avatar {
     background-color: $color-dark-85;
   }
+
+  &--is-blocked {
+    @include themify($themes) {
+      border-left: 4px solid themed('destructive') !important;
+    }
+  }
 }
 
 .module-conversation-list-item__unread-count {

stylesheets/_session.scss

@@ -344,8 +344,6 @@ textarea {
   }
 }
 
-$session-element-border-green: 4px solid $session-color-green;
-
 /* CONVERSATION AND MESSAGES */
 
 @mixin standard-icon-button() {

stylesheets/_session_group_panel.scss

@@ -132,7 +132,9 @@
             margin: 0 auto;
             width: 70%;
             padding-top: 0.5rem;
-            border-bottom: $session-element-border-green;
+            @include themify($themes) {
+              border-bottom: themed('sessionUnreadBorder');
+            }
           }
         }
       }

stylesheets/_session_left_pane.scss

@@ -48,8 +48,8 @@ $session-compose-margin: 20px;
     }
 
     &--has-unread {
-      border-left: $session-element-border-green !important;
       @include themify($themes) {
+        border-left: themed('sessionUnreadBorder');
         background: themed('conversationItemHasUnread');
       }
     }

stylesheets/_theme_dark.scss

@@ -664,17 +664,8 @@
   .module-empty-state {
     color: $color-dark-55;
   }
-
   // Module: Conversation List Item
 
-  .module-conversation-list-item--has-unread {
-    border-left: 4px solid $color-loki-green;
-  }
-
-  .module-conversation-list-item--is-blocked {
-    border-left: 4px solid $session-color-danger;
-  }
-
   .module-conversation-list-item--is-selected {
     background-color: $color-dark-70;
   }

stylesheets/themes.scss

@@ -41,6 +41,7 @@ $themes: (
     conversationItemSelected: #f0f0f0,
     clickableHovered: #dfdfdf,
     sessionBorder: 1px solid #f1f1f1,
+    sessionUnreadBorder: 4px solid $accentLightTheme,
     leftpaneOverlayBackground: $white,
     // scrollbars
       scrollBarTrack: #fcfcfc,
@@ -91,6 +92,7 @@ $themes: (
     conversationItemSelected: #404040,
     clickableHovered: #414347,
     sessionBorder: 1px solid rgba($white, 0.06),
+    sessionUnreadBorder: 4px solid $accentDarkTheme,
     leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
     // scrollbars
       scrollBarTrack: #1b1b1b,

ts/components/ConversationListItem.tsx

@@ -309,7 +309,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
       mentionedUs,
     } = this.props;
 
-    const triggerId = `${phoneNumber}-ctxmenu-${Date.now()}`;
+    const triggerId = `conversation-item-${phoneNumber}-ctxmenu`;
 
     return (
       <div>

ts/components/conversation/ConversationHeader.tsx

@@ -389,7 +389,7 @@ export class ConversationHeader extends React.Component<Props> {
 
   public render() {
     const { id, isKickedFromGroup } = this.props;
-    const triggerId = `conversation-${id}-${Date.now()}`;
+    const triggerId = `conversation-header-${id}`;
 
     return (
       <>
@@ -475,6 +475,7 @@ export class ConversationHeader extends React.Component<Props> {
       isPublic,
       isRss,
       isGroup,
+      isBlocked,
       onResetSession,
       i18n
     );

ts/components/conversation/Message.tsx

@@ -1073,11 +1073,11 @@ export class Message extends React.PureComponent<Props, State> {
     //   It needs to be unique.
     // The Date.now() is a workaround to be sure a single triggerID with this id exists
     const triggerId = id
-      ? String(`${id}-${Date.now()}`)
-      : String(`${authorPhoneNumber}-${timestamp}`);
+      ? String(`message-${id}-${Date.now()}`)
+      : String(`message-${authorPhoneNumber}-${timestamp}`);
     const rightClickTriggerId = id
-      ? String(`${id}-ctx-${Date.now()}`)
-      : String(`${authorPhoneNumber}-ctx-${timestamp}`);
+      ? String(`message-ctx-${id}-${Date.now()}`)
+      : String(`message-ctx-${authorPhoneNumber}-${timestamp}`);
     if (expired) {
       return null;
     }

ts/session/utils/Menu.tsx

@@ -32,9 +32,10 @@ function showSafetyNumber(
 function showResetSession(
   isPublic: boolean,
   isRss: boolean,
-  isGroup: boolean
+  isGroup: boolean,
+  isBlocked: boolean
 ): boolean {
-  return !isPublic && !isRss && !isGroup;
+  return !isPublic && !isRss && !isGroup && !isBlocked;
 }
 
 function showBlock(isMe: boolean, isPrivate: boolean): boolean {
@@ -299,10 +300,18 @@ export function getResetSessionMenuItem(
   isPublic: boolean | undefined,
   isRss: boolean | undefined,
   isGroup: boolean | undefined,
+  isBlocked: boolean | undefined,
   action: any,
   i18n: LocalizerType
 ): JSX.Element | null {
-  if (showResetSession(Boolean(isPublic), Boolean(isRss), Boolean(isGroup))) {
+  if (
+    showResetSession(
+      Boolean(isPublic),
+      Boolean(isRss),
+      Boolean(isGroup),
+      Boolean(isBlocked)
+    )
+  ) {
     return <MenuItem onClick={action}>{i18n('resetSession')}</MenuItem>;
   }
   return null;