From 876247b5ad9ed05a0c2a0d6d2f97340efd325a3d Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 4 Nov 2020 17:48:21 +1100
Subject: [PATCH] fix background of selectio overlay, and cleanup unused code

---
 js/models/conversations.js             | 72 --------------------------
 stylesheets/_session_conversation.scss |  3 ++
 stylesheets/themes.scss                |  4 +-
 3 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index c4c8ea547..77362074c 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1,5 +1,4 @@
 /* global
-  $,
   _,
   log,
   i18n,
@@ -246,77 +245,6 @@
       this.updateTextInputState();
       await textsecure.messaging.sendBlockedListSyncMessage();
     },
-    setMessageSelectionBackdrop() {
-      const messageSelected = this.selectedMessages.size > 0;
-
-      if (messageSelected) {
-        // Hide ellipses icon
-        $('.title-wrapper .session-icon.ellipses').css({ opacity: 0 });
-
-        $('.messages li, .messages > div').addClass('shadowed');
-        $('.message-selection-overlay').addClass('overlay');
-        $('.module-conversation-header').addClass('overlayed');
-
-        let messageId;
-        // eslint-disable-next-line no-restricted-syntax
-        for (const item of this.selectedMessages) {
-          messageId = item.propsForMessage.id;
-          $(`#${messageId}`).removeClass('shadowed');
-        }
-      } else {
-        // Hide ellipses icon
-        $('.title-wrapper .session-icon.ellipses').css({ opacity: 1 });
-
-        $('.messages li, .messages > div').removeClass('shadowed');
-        $('.message-selection-overlay').removeClass('overlay');
-        $('.module-conversation-header').removeClass('overlayed');
-      }
-    },
-
-    addMessageSelection(id) {
-      // If the selection is empty, then we chage the mode to
-      // multiple selection by making it non-empty
-      const modeChanged = this.selectedMessages.size === 0;
-      this.selectedMessages.add(id);
-
-      if (modeChanged) {
-        this.messageCollection.forEach(m => m.trigger('change'));
-      }
-
-      this.trigger('message-selection-changed');
-      this.setMessageSelectionBackdrop();
-    },
-
-    removeMessageSelection(id) {
-      this.selectedMessages.delete(id);
-      // If the selection is empty after the deletion then we
-      // must have unselected the last one (we assume the id is valid)
-      const modeChanged = this.selectedMessages.size === 0;
-
-      if (modeChanged) {
-        this.messageCollection.forEach(m => m.trigger('change'));
-      }
-
-      this.trigger('message-selection-changed');
-      this.setMessageSelectionBackdrop();
-    },
-
-    resetMessageSelection() {
-      this.selectedMessages.clear();
-      this.messageCollection.forEach(m => {
-        // on change for ALL messages without real changes is a really costly operation
-        // -> cause refresh of the whole conversation view even if not a single message was selected
-        if (m.selected) {
-          // eslint-disable-next-line no-param-reassign
-          m.selected = false;
-          m.trigger('change');
-        }
-      });
-
-      this.trigger('message-selection-changed');
-      this.setMessageSelectionBackdrop();
-    },
-
     async bumpTyping() {
       if (this.isPublic()) {
         window.console.debug('public conversation... No need to bumpTyping');
diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 02624abe5..a143ffe0d 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -91,6 +91,9 @@
     align-items: center;
     justify-content: space-between;
     height: $main-view-header-height;
+    @include themify($themes) {
+      background: themed('cellBackground');
+    }
 
     .close-button {
       float: left;
diff --git a/stylesheets/themes.scss b/stylesheets/themes.scss
index 8fa3951fc..afd3d31df 100644
--- a/stylesheets/themes.scss
+++ b/stylesheets/themes.scss
@@ -79,9 +79,9 @@ $themes: (
     textColorOpposite: $black,
     textHighlight: rgba($accentDarkTheme, 0.6),
     // inbox
+      // buttons
       inboxBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
-    // buttons
-      backgroundPrimary: #474646,
+    backgroundPrimary: #474646,
     foregroundPrimary: $white,
     buttonGreen: $accentDarkTheme,
     // conversation view