From b42626923ce4dc9ee5983b00af54963937b730bc Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Fri, 2 Oct 2015 12:28:40 -0700
Subject: [PATCH] Don't double-render key conflict errors

// FREEBIE
---
 js/views/message_detail_view.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/views/message_detail_view.js b/js/views/message_detail_view.js
index e4347fcb..2f0b8e9b 100644
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@@ -10,7 +10,10 @@
         templateName: 'contact-detail',
         initialize: function(options) {
             this.conflict = options.conflict;
-            this.errors = options.errors;
+            this.errors = _.reject(options.errors, function(e) {
+                return (e.name === 'IncomingIdentityKeyError' ||
+                        e.name === 'OutgoingIdentityKeyError');
+            });
         },
         events: {
             'click .conflict': 'triggerConflict'