Merge pull request #4 from jcktm/show-identity-key

added identity key above the conversation box
pull/6/head
sachaaaaa 7 years ago committed by GitHub
commit cf8afb167e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -65,6 +65,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class='identityKeyWrapper'>
Your identity key: <span class='identityKey'>{{ identityKey }}</span>
</div>
<div class='underneathIdentityWrapper'>
<div class='conversation-stack'> <div class='conversation-stack'>
<div class='conversation placeholder'> <div class='conversation placeholder'>
<div class='conversation-header'></div> <div class='conversation-header'></div>
@ -78,6 +82,7 @@
</div> </div>
</div> </div>
<div class='lightbox-container'></div> <div class='lightbox-container'></div>
</div>
</script> </script>
<script type='text/x-tmpl-mustache' id='scroll-down-button-view'> <script type='text/x-tmpl-mustache' id='scroll-down-button-view'>
<button class='text module-scroll-down__button {{ buttonClass }}' alt='{{ moreBelow }}'> <button class='text module-scroll-down__button {{ buttonClass }}' alt='{{ moreBelow }}'>

Binary file not shown.

@ -162,11 +162,15 @@
this.$el.addClass('expired'); this.$el.addClass('expired');
} }
}, },
render_attributes: { render_attributes() {
const identityKey = textsecure.storage.get('identityKey').pubKey;
return {
welcomeToSignal: i18n('welcomeToSignal'), welcomeToSignal: i18n('welcomeToSignal'),
selectAContact: i18n('selectAContact'), selectAContact: i18n('selectAContact'),
searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'), searchForPeopleOrGroups: i18n('searchForPeopleOrGroups'),
settings: i18n('settings'), settings: i18n('settings'),
identityKey: StringView.bytesToBase64(new Uint8Array(identityKey))
};
}, },
events: { events: {
click: 'onClick', click: 'onClick',

@ -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-stack {
.conversation { .conversation {
display: none; display: none;

Loading…
Cancel
Save