From 09a0c466379c72c626d349637a8581e0c2159430 Mon Sep 17 00:00:00 2001
From: jcktm <kitten@protonmail.com>
Date: Sat, 18 Aug 2018 21:48:38 +1000
Subject: [PATCH] added identity key above the conversation box

---
 background.html             |  23 ++++++++++++++---------
 js/views/.inbox_view.js.swp | Bin 0 -> 24576 bytes
 js/views/inbox_view.js      |  14 +++++++++-----
 stylesheets/_index.scss     |  20 ++++++++++++++++++++
 4 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 js/views/.inbox_view.js.swp

diff --git a/background.html b/background.html
index 541973519..ac4c1869c 100644
--- a/background.html
+++ b/background.html
@@ -65,19 +65,24 @@
         </div>
       </div>
     </div>
-    <div class='conversation-stack'>
-      <div class='conversation placeholder'>
-        <div class='conversation-header'></div>
-        <div class='container'>
-          <div class='content'>
-            <img src='images/icon_128.png' />
-            <h3>{{ welcomeToSignal }}</h3>
-            <p>{{ selectAContact }}</p>
+    <div class='identityKeyWrapper'>
+      Your identity key: <span class='identityKey'>{{ identityKey }}</span>
+    </div>
+    <div class='underneathIdentityWrapper'>
+      <div class='conversation-stack'>
+        <div class='conversation placeholder'>
+          <div class='conversation-header'></div>
+          <div class='container'>
+            <div class='content'>
+              <img src='images/icon_128.png' />
+              <h3>{{ welcomeToSignal }}</h3>
+              <p>{{ selectAContact }}</p>
+            </div>
           </div>
         </div>
       </div>
+      <div class='lightbox-container'></div>
     </div>
-    <div class='lightbox-container'></div>
   </script>
   <script type='text/x-tmpl-mustache' id='scroll-down-button-view'>
     <button class='text module-scroll-down__button {{ buttonClass }}' alt='{{ moreBelow }}'>
diff --git a/js/views/.inbox_view.js.swp b/js/views/.inbox_view.js.swp
new file mode 100644
index 0000000000000000000000000000000000000000..460fcffa56b5a06b899333d606641f374dcf6c98
GIT binary patch
literal 24576
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
Z)w=3W>8D&7Y;G4X+_+Egw9a(z{{WDX@WcQB

literal 0
HcmV?d00001

diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 6064c23ab..7cc65f034 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -162,11 +162,15 @@
         this.$el.addClass('expired');
       }
     },
-    render_attributes: {
-      welcomeToSignal: i18n('welcomeToSignal'),
-      selectAContact: i18n('selectAContact'),
-      searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'),
-      settings: i18n('settings'),
+    render_attributes() {
+      const identityKey = textsecure.storage.get('identityKey').pubKey;
+      return {
+        welcomeToSignal: i18n('welcomeToSignal'),
+        selectAContact: i18n('selectAContact'),
+        searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'),
+        settings: i18n('settings'),
+        identityKey: StringView.bytesToBase64(new Uint8Array(identityKey))
+      };
     },
     events: {
       click: 'onClick',
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index ef7111075..3b940a1c3 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -71,6 +71,26 @@
   }
 }
 
+.identityKeyWrapper {
+  background-color: $color-black-008-no-tranparency;
+  text-align: center;
+  height: 50px;
+  line-height: 50px;
+  white-space: nowrap;
+}
+
+.identityKey {
+  font-weight: bold;
+}
+
+.underneathIdentityWrapper {
+  position: absolute;
+  top: 50px;
+  bottom: 0;
+  left: 300px;
+  right: 0;
+}
+
 .conversation-stack {
   .conversation {
     display: none;