From 9214aee3ec27e066df51fef6cbdaa15e1d8a8182 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 10 Jul 2020 11:41:00 -0700
Subject: [PATCH] Conversation.idForLogging: Show groupId or uuid/e164 instead
 of id

---
 js/models/conversations.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index baaa07792..cedaeec70 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -65,10 +65,13 @@
 
     idForLogging() {
       if (this.isPrivate()) {
-        return this.id;
+        const uuid = this.get('uuid');
+        const e164 = this.get('e164');
+        return `${uuid || e164} (${this.id})`;
       }
 
-      return `group(${this.id})`;
+      const groupId = this.get('groupId');
+      return `group(${groupId})`;
     },
 
     handleMessageError(message, errors) {