From 5109f9fddad8899f1a44e5c12462cb1307c70b62 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 14 Dec 2020 16:23:27 +1100
Subject: [PATCH] remove ConversationLoadingScreen (unused)

---
 js/modules/signal.js                          |  4 ----
 js/views/conversation_view.js                 |  4 ----
 stylesheets/_session.scss                     |  3 ++-
 ts/components/ConversationLoadingScreen.tsx   | 17 -----------------
 ts/components/conversation/Message.tsx        | 19 -------------------
 .../conversation/SessionRightPanel.tsx        |  6 +++---
 6 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 ts/components/ConversationLoadingScreen.tsx

diff --git a/js/modules/signal.js b/js/modules/signal.js
index f6c9a41f0..73255871e 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -15,9 +15,6 @@ const LinkPreviews = require('./link_previews');
 const AttachmentDownloads = require('./attachment_downloads');
 
 // Components
-const {
-  ConversationLoadingScreen,
-} = require('../../ts/components/ConversationLoadingScreen');
 const {
   ContactDetail,
 } = require('../../ts/components/conversation/ContactDetail');
@@ -223,7 +220,6 @@ exports.setup = (options = {}) => {
   });
 
   const Components = {
-    ConversationLoadingScreen,
     ContactDetail,
     ContactListItem,
     ContactName,
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index d8f725716..11f60d891 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -101,10 +101,6 @@
 
       this.model.updateTextInputState();
 
-      this.loadingScreen = new Whisper.ConversationLoadingScreen();
-      this.loadingScreen.render();
-      this.loadingScreen.$el.prependTo(this.$('.discussion-container'));
-
       this.window = options.window;
 
       Whisper.events.on('mediaPermissionsChanged', () =>
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index abf534c9c..26f6e44ef 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -614,7 +614,8 @@ label {
 }
 
 .react-contexify {
-  z-index: 3;
+  // be sure it is more than the one set for the More Informations screen of messages
+  z-index: 30;
   min-width: 200px;
   box-shadow: 0 10px 16px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19) !important;
   @include themify($themes) {
diff --git a/ts/components/ConversationLoadingScreen.tsx b/ts/components/ConversationLoadingScreen.tsx
deleted file mode 100644
index 677ffb810..000000000
--- a/ts/components/ConversationLoadingScreen.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-
-import { SessionSpinner } from './session/SessionSpinner';
-
-export class ConversationLoadingScreen extends React.PureComponent {
-  constructor(props: any) {
-    super(props);
-  }
-
-  public render() {
-    return (
-      <div className="conversation-loader">
-        <SessionSpinner />
-      </div>
-    );
-  }
-}
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index cbab17e26..f0fd91c98 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -278,25 +278,6 @@ class MessageInner extends React.PureComponent<Props, State> {
             e.stopPropagation();
           }}
         >
-          {/* <audio
-            role="button"
-            onClick={(e: any) => {
-              e.stopPropagation();
-            }}
-            controls={true}
-            className={classNames(
-              'module-message__audio-attachment',
-              withContentBelow
-                ? 'module-message__audio-attachment--with-content-below'
-                : null,
-              withContentAbove
-                ? 'module-message__audio-attachment--with-content-above'
-                : null
-            )}
-            key={firstAttachment.url}
-          >
-            <source src={firstAttachment.url} />
-          </audio> */}
           <H5AudioPlayer
             src={firstAttachment.url}
             layout="horizontal-reverse"
diff --git a/ts/components/session/conversation/SessionRightPanel.tsx b/ts/components/session/conversation/SessionRightPanel.tsx
index a3321559f..0166d6324 100644
--- a/ts/components/session/conversation/SessionRightPanel.tsx
+++ b/ts/components/session/conversation/SessionRightPanel.tsx
@@ -176,9 +176,9 @@ class SessionRightPanel extends React.Component<Props, State> {
       (message: { attachments: Array<any> }) => {
         // this is to not fail if the attachment is invalid (could be a Long Attachment type which is not supported)
         if (!message.attachments?.length) {
-          window.log.info(
-            'Got a message with an empty list of attachment. Skipping...'
-          );
+          // window.log.info(
+          //   'Got a message with an empty list of attachment. Skipping...'
+          // );
           return null;
         }
         const attachment = message.attachments[0];