From 9433a1de99a54eb96753b48f545e68261b6da39e Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Tue, 14 Jul 2020 19:21:25 -0400
Subject: [PATCH] Don't reset panel on close of recent media pane

---
 js/views/conversation_view.js     |  1 -
 js/views/key_verification_view.js | 13 ++++++++++---
 ts/util/lint/exceptions.json      |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 288965a648..904d50ecb2 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1966,7 +1966,6 @@
         props: await getProps(),
         onClose: () => {
           this.stopListening(this.model.messageCollection, 'remove', update);
-          this.resetPanel();
         },
       });
 
diff --git a/js/views/key_verification_view.js b/js/views/key_verification_view.js
index 0e743a40f0..698b7dcab9 100644
--- a/js/views/key_verification_view.js
+++ b/js/views/key_verification_view.js
@@ -1,4 +1,4 @@
-/* global Whisper, Signal */
+/* global Backbone, Signal, Whisper */
 
 /* eslint-disable more/no-then */
 
@@ -14,7 +14,7 @@
     initialize(options) {
       this.render();
 
-      const view = new Whisper.ReactWrapperView({
+      this.view = new Whisper.ReactWrapperView({
         JSX: Signal.State.Roots.createSafetyNumberViewer(window.reduxStore, {
           contactID: options.model.get('id'),
         }),
@@ -25,7 +25,14 @@
         },
       });
 
-      this.$('.key-verification-wrapper').append(view.el);
+      this.$('.key-verification-wrapper').append(this.view.el);
+    },
+
+    remove() {
+      if (this.view) {
+        this.view.remove();
+      }
+      Backbone.View.prototype.remove.call(this);
     },
   });
 })();
diff --git a/ts/util/lint/exceptions.json b/ts/util/lint/exceptions.json
index 7dbbafd90e..05e9372ec5 100644
--- a/ts/util/lint/exceptions.json
+++ b/ts/util/lint/exceptions.json
@@ -694,7 +694,7 @@
   {
     "rule": "jQuery-$(",
     "path": "js/views/key_verification_view.js",
-    "line": "      this.$('.key-verification-wrapper').append(view.el);",
+    "line": "      this.$('.key-verification-wrapper').append(this.view.el);",
     "lineNumber": 28,
     "reasonCategory": "usageTrusted",
     "updated": "2020-06-23T06:48:06.829Z"
@@ -702,7 +702,7 @@
   {
     "rule": "jQuery-append(",
     "path": "js/views/key_verification_view.js",
-    "line": "      this.$('.key-verification-wrapper').append(view.el);",
+    "line": "      this.$('.key-verification-wrapper').append(this.view.el);",
     "lineNumber": 28,
     "reasonCategory": "usageTrusted",
     "updated": "2020-06-23T06:48:06.829Z"