mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Don't double-render key conflict errors

Browse source 
// FREEBIE
This commit is contained in:
lilia 2015-10-02 12:28:40 -07:00
parent 7ec4700431
commit b42626923c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/views/message_detail_view.js
View file

@ -10,7 +10,10 @@
templateName: 'contact-detail', templateName: 'contact-detail',
initialize: function(options) { initialize: function(options) {
this.conflict = options.conflict; this.conflict = options.conflict;
this.errors = options.errors; this.errors = _.reject(options.errors, function(e) {
return (e.name === 'IncomingIdentityKeyError' ||
e.name === 'OutgoingIdentityKeyError');
});
}, },
events: { events: {
'click .conflict': 'triggerConflict' 'click .conflict': 'triggerConflict'