From c055240dc5974cfccb82d8746293e59291a4a221 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Thu, 3 Jun 2021 14:46:38 -0400
Subject: [PATCH] Fix for per chat color selection

---
 ts/models/conversations.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 6a09532c6907..a1bc2fe5f38d 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4878,10 +4878,6 @@ export class ConversationModel extends window.Backbone
       'defaultConversationColor'
     );
 
-    if (defaultConversationColor.customColorData) {
-      return 'custom';
-    }
-
     return this.get('conversationColor') || defaultConversationColor.color;
   }
 
@@ -4893,6 +4889,13 @@ export class ConversationModel extends window.Backbone
       'defaultConversationColor'
     );
 
+    if (this.getConversationColor() !== 'custom') {
+      return {
+        customColor: undefined,
+        customColorId: undefined,
+      };
+    }
+
     return {
       customColor:
         this.get('customColor') ||