From dd984774796224bb47a3ac4c1200c8a8841f6185 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Fri, 7 Jun 2019 10:51:41 -0700
Subject: [PATCH] For 'me,' prefer signal profile avatar over address book info

---
 js/models/conversations.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index a3151c0ba3..98364b7865 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2019,7 +2019,9 @@
       return migrateColor(this.get('color'));
     },
     getAvatarPath() {
-      const avatar = this.get('avatar') || this.get('profileAvatar');
+      const avatar = this.isMe()
+        ? this.get('profileAvatar') || this.get('avatar')
+        : this.get('avatar') || this.get('profileAvatar');
 
       if (avatar && avatar.path) {
         return getAbsoluteAttachmentPath(avatar.path);