From c122457565540482a104f97d8c150c9fcbb3f72e Mon Sep 17 00:00:00 2001
From: Mega-Mewthree <Mega-Mewthree@users.noreply.github.com>
Date: Sat, 11 Aug 2018 10:11:56 -0700
Subject: [PATCH] Style the lock context menu.

---
 client/src/builtin/E2EEComponent.vue          | 18 ++++++++-------
 .../src/styles/partials/bdsettings/e2ee.scss  | 23 +++++++++++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/client/src/builtin/E2EEComponent.vue b/client/src/builtin/E2EEComponent.vue
index bc5dd14a..dde55fbd 100644
--- a/client/src/builtin/E2EEComponent.vue
+++ b/client/src/builtin/E2EEComponent.vue
@@ -9,7 +9,7 @@
 */
 
 <template>
-    <div class="bd-e2eeTaContainer" @contextmenu.prevent="location.pathname.match(/\/channels\/@me\/\d+/) && $refs.ee2eContextMenu.open()">
+    <div class="bd-e2eeTaContainer" @contextmenu.prevent="location.pathname.match(/\/channels\/@me\/\d+/) && $refs.ee2eLockContextMenu.open()">
         <div v-if="error" class="bd-e2eeTaBtn bd-e2eeLock bd-error">
             <MiLock v-tooltip="error" />
         </div>
@@ -24,9 +24,9 @@
         </div>
 
         <div class="bd-taDivider"></div>
-        <context-menu id="context-menu" ref="ee2eContextMenu" v-if="location.pathname.match(/\/channels\/@me\/\d+/)">
-            <li @click="generatePublicKey()">Generate Public Key</li>
-            <li @click="computeSharedSecret()">Receive Public Key</li>
+        <context-menu id="bd-e2eeLockContextMenu" class="bd-e2eeLockContextMenu" ref="ee2eLockContextMenu" v-if="location.pathname.match(/\/channels\/@me\/\d+/)">
+            <li class="bd-e2eeLockContextMenuOption" @click="generatePublicKey()">Generate Public Key</li>
+            <li class="bd-e2eeLockContextMenuOption" @click="computeSharedSecret()">Receive Public Key</li>
         </context-menu>
     </div>
 </template>
@@ -48,10 +48,12 @@
     }
 
     function computeSharedSecret() {
-        const userID = location.pathname.split("/")[3];
-        const otherPublicKey = document.getElementsByClassName("da-textArea")[0].value;
-        const secret = E2EE.computeSecret(userID, otherPublicKey);
-        clipboard.writeText(secret);
+        try {
+          const userID = location.pathname.split("/")[3];
+          const otherPublicKey = document.getElementsByClassName("da-textArea")[0].value;
+          const secret = E2EE.computeSecret(userID, otherPublicKey);
+          clipboard.writeText(secret);
+        } catch (e) {}
     }
 
     export default {
diff --git a/client/src/styles/partials/bdsettings/e2ee.scss b/client/src/styles/partials/bdsettings/e2ee.scss
index b0aaba54..d7166fa3 100644
--- a/client/src/styles/partials/bdsettings/e2ee.scss
+++ b/client/src/styles/partials/bdsettings/e2ee.scss
@@ -39,6 +39,29 @@
         height: 37px;
         margin-top: 5px;
     }
+
+    .bd-e2eeLockContextMenu {
+
+        border: none;
+
+        .ctx-menu {
+            background: #23272A;
+            border-radius: 4px;
+            box-shadow: none;
+            padding: 0;
+
+            .bd-e2eeLockContextMenuOption {
+                background: #23272A;
+                color: #99AAB5;
+                padding: 5px 5px;
+                cursor: default;
+
+                &:hover {
+                    background: #000000;
+                }
+            }
+        }
+    }
 }
 
 .bd-e2eeMdContainer {