Tweak conflict style

// FREEBIE
2016-02-16 10:41:10 -08:00 · 2016-02-16 10:41:10 -08:00 · f221921127
commit f221921127
parent 28c763992a
4 changed files with 44 additions and 36 deletions
--- a/js/views/message_detail_view.js
+++ b/js/views/message_detail_view.js
@ -37,7 +37,8 @@
                conflict : this.conflict,
                errors   : this.errors,
                verify   : i18n('verify'),
-                cancel   : i18n('cancel')
+                cancel   : i18n('cancel'),
+                newIdentity: i18n('newIdentity')
            };
        }
    });
@ -140,7 +141,7 @@
                failedToSend: i18n('failedToSend'),
                errorLabel  : i18n('error'),
                hasRetry    : hasRetry,
-                hasConflict : hasConflict
+                hasConflict : this.model.hasKeyConflicts()
            }));
            this.view.$el.prependTo(this.$('.message-container'));