From e64ccbdd2b038b38be3d2af9c7489842dac9fe30 Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <maxim@loki.network>
Date: Thu, 31 Oct 2019 17:40:26 +1100
Subject: [PATCH] Clean up RSS conversation

---
 js/views/conversation_view.js          | 10 ++++++++++
 stylesheets/_conversation.scss         | 16 ++++++++++++++++
 ts/components/conversation/Message.tsx |  9 +++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index cd7d14cf7..b545850b1 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -732,6 +732,16 @@
 
       this.model.updateLastMessage();
 
+      if (this.model.isRss()) {
+        $('.compose').hide();
+        $('.conversation-stack').removeClass('conversation-stack-no-border');
+        $('.conversation-stack').addClass('conversation-stack-border');
+      } else {
+        $('.compose').show();
+        $('.conversation-stack').removeClass('conversation-stack-border');
+        $('.conversation-stack').addClass('conversation-stack-no-border');
+      }
+
       // const statusPromise = this.throttledGetProfiles();
       // // eslint-disable-next-line more/no-then
       // this.statusFetch = statusPromise.then(() =>
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 8ea4f05b4..e2a2a52f2 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -190,6 +190,22 @@
   margin-bottom: -5px;
 }
 
+.conversation-stack-border {
+  border-bottom: solid;
+  border-color: white;
+  border-width: 4px;
+}
+
+.conversation-stack-no-border {
+  border-bottom: none;
+}
+
+.dark-theme {
+  .conversation-stack-border {
+    border-color: black;
+  }
+}
+
 .bottom-bar .preview-wrapper {
   margin-top: 3px;
   margin-left: 37px;
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 99fbc6904..7059817a2 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1009,6 +1009,7 @@ export class Message extends React.PureComponent<Props, State> {
       authorColor,
       direction,
       id,
+      isRss,
       timestamp,
     } = this.props;
     const { expired, expiring } = this.state;
@@ -1049,7 +1050,9 @@ export class Message extends React.PureComponent<Props, State> {
             )}
           >
             {this.renderError(direction === 'incoming')}
-            {this.renderMenu(direction === 'outgoing', triggerId)}
+            {isRss
+              ? null
+              : this.renderMenu(direction === 'outgoing', triggerId)}
             <div
               className={classNames(
                 'module-message__container',
@@ -1073,7 +1076,9 @@ export class Message extends React.PureComponent<Props, State> {
               {this.renderAvatar()}
             </div>
             {this.renderError(direction === 'outgoing')}
-            {this.renderMenu(direction === 'incoming', triggerId)}
+            {isRss
+              ? null
+              : this.renderMenu(direction === 'incoming', triggerId)}
             {this.renderContextMenu(triggerId)}
             {this.renderContextMenu(rightClickTriggerId)}
           </div>