diff --git a/background.html b/background.html index f5a05f2e8..865269d81 100644 --- a/background.html +++ b/background.html @@ -71,7 +71,6 @@ -
diff --git a/js/modules/signal.js b/js/modules/signal.js index 4ed80eba7..b7755f25b 100644 --- a/js/modules/signal.js +++ b/js/modules/signal.js @@ -43,7 +43,6 @@ const { MediaGallery, } = require('../../ts/components/conversation/media-gallery/MediaGallery'); const { MainHeader } = require('../../ts/components/MainHeader'); -const { IdentityKeyHeader } = require('../../ts/components/IdentityKeyHeader'); const { Message } = require('../../ts/components/conversation/Message'); const { MessageBody } = require('../../ts/components/conversation/MessageBody'); const { @@ -185,7 +184,6 @@ exports.setup = (options = {}) => { Lightbox, LightboxGallery, MainHeader, - IdentityKeyHeader, MediaGallery, Message, MessageBody, diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index 74980bae6..cd3c13c56 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -115,16 +115,6 @@ this.listenTo(me, 'change', update); this.$('.main-header-placeholder').append(this.mainHeaderView.el); - this.identityKeyView = new Whisper.ReactWrapperView({ - className: 'identity-key-wrapper', - Component: Signal.Components.IdentityKeyHeader, - props: this._getIdentityKeyViewProps(), - }); - this.on('updateProfile', () => { - this.identityKeyView.update(this._getIdentityKeyViewProps()); - }) - this.$('.identity-key-placeholder').append(this.identityKeyView.el); - this.conversation_stack = new Whisper.ConversationStack({ el: this.$('.conversation-stack'), model: { window: options.window }, @@ -221,20 +211,6 @@ this.$el.addClass('expired'); } }, - _getIdentityKeyViewProps() { - const identityKey = textsecure.storage.get('identityKey').pubKey; - const pubKey = StringView.arrayBufferToHex(identityKey); - const profile = storage.getLocalProfile(); - const name = profile && profile.name && profile.name.displayName; - - return { - identityKey: pubKey, - name, - onEditProfile: async () => { - window.Whisper.events.trigger('onEditProfile'); - }, - } - }, render_attributes() { return { welcomeToSignal: i18n('welcomeToSignal'), diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 711ee8152..d9711c1d4 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -142,51 +142,9 @@ } } -.identity-key-wrapper { - background-color: $color-black-008-no-tranparency; - display: flex; - flex: 1; - height: $header-height; - padding-left: 16px; - padding-right: 16px; -} - -.identity-key-container { - display: flex; - flex: 1; - flex-direction: row; - align-items: center; - justify-content: space-around; - white-space: nowrap; - overflow-x: hidden; -} - -.identity-key-text-container { - flex: 1; - text-align: center; - flex-direction: column; -} - -.identity-key-container div { - overflow-x: hidden; - text-overflow: ellipsis; -} - -.identity-key_bold { - font-weight: bold; -} - -.identity-key-wrapper__pencil-icon { - @include color-svg('../images/lead-pencil.svg', $color-gray-60); - height: 20px; - width: 20px; - margin-left: 4px; - cursor: pointer; -} - .underneathIdentityWrapper { position: absolute; - top: $header-height; + top: 0; bottom: 0; left: 300px; right: 0; diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss index 8cfea9fe2..7d9137355 100644 --- a/stylesheets/_theme_dark.scss +++ b/stylesheets/_theme_dark.scss @@ -6,16 +6,6 @@ body.dark-theme { } .dark-theme { - // identity key - .identity-key-wrapper { - background-color:$color-gray-85; - } - - .identity-key-wrapper__pencil-icon { - @include color-svg('../images/lead-pencil.svg', $color-gray-25); - } - - // _conversation .conversation { diff --git a/ts/components/IdentityKeyHeader.tsx b/ts/components/IdentityKeyHeader.tsx deleted file mode 100644 index a345cef0e..000000000 --- a/ts/components/IdentityKeyHeader.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import React from 'react'; - -interface Props { - identityKey: string; - name?: string; - onEditProfile: () => void; -} - -export class IdentityKeyHeader extends React.Component { - public render() { - const { - name, - identityKey, - onEditProfile, - } = this.props; - - return ( -
-
-
- Your identity key: {identityKey} -
- {!!name && -
- Your display name: {name} -
- } -
-
-
- ); - } -}