From ca09d00e2e6f9bea3c3fec1f5541bd1c86b5ebbf Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 14 May 2018 12:48:07 -0400
Subject: [PATCH 1/2] Use signal id as avatar color seed if possible.

---
 .../ViewModels/ContactShareViewModel.swift            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/SignalMessaging/ViewModels/ContactShareViewModel.swift b/SignalMessaging/ViewModels/ContactShareViewModel.swift
index 81ab28a7c..6b9ee342f 100644
--- a/SignalMessaging/ViewModels/ContactShareViewModel.swift
+++ b/SignalMessaging/ViewModels/ContactShareViewModel.swift
@@ -47,9 +47,18 @@ public class ContactShareViewModel: NSObject {
             return avatarImage
         }
 
+        var colorSeed = name.displayName
+        let recipientIds = systemContactsWithSignalAccountPhoneNumbers(contactsManager)
+        if let firstRecipientId = recipientIds.first {
+            // Try to use the first signal id as the default
+            // avatar's color seed, so that it is as consistent
+            // as possible with the user's avatar in other views.
+            colorSeed = firstRecipientId
+        }
+
         // TODO: What's the best colorSeed value to use?
         let avatarBuilder = OWSContactAvatarBuilder(nonSignalName: displayName,
-                                                    colorSeed: displayName,
+                                                    colorSeed: colorSeed,
                                                     diameter: UInt(diameter),
                                                     contactsManager: contactsManager)
         return avatarBuilder.build()

From 152e1d79837e1b7a5babbb335c87daddebcfba85 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 14 May 2018 14:00:22 -0400
Subject: [PATCH 2/2] Respond to CR.

---
 SignalMessaging/ViewModels/ContactShareViewModel.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SignalMessaging/ViewModels/ContactShareViewModel.swift b/SignalMessaging/ViewModels/ContactShareViewModel.swift
index 6b9ee342f..dfb071fd1 100644
--- a/SignalMessaging/ViewModels/ContactShareViewModel.swift
+++ b/SignalMessaging/ViewModels/ContactShareViewModel.swift
@@ -56,7 +56,6 @@ public class ContactShareViewModel: NSObject {
             colorSeed = firstRecipientId
         }
 
-        // TODO: What's the best colorSeed value to use?
         let avatarBuilder = OWSContactAvatarBuilder(nonSignalName: displayName,
                                                     colorSeed: colorSeed,
                                                     diameter: UInt(diameter),