Move to new colors, switch incoming/outgoing colors

js/models/conversations.js

@@ -37,19 +37,15 @@
 
   const COLORS = [
     'red',
+    'deep_orange',
+    'brown',
     'pink',
     'purple',
-    'deep_purple',
     'indigo',
     'blue',
-    'light_blue',
-    'cyan',
     'teal',
     'green',
     'light_green',
-    'orange',
-    'deep_orange',
-    'amber',
     'blue_grey',
   ];
 

js/models/messages.js

@@ -394,7 +394,6 @@
       const contact = this.findAndFormatContact(phoneNumber);
       const contactModel = this.findContact(phoneNumber);
 
-      const authorColor = contactModel ? contactModel.getColor() : null;
       const authorAvatar = contactModel ? contactModel.getAvatar() : null;
       const authorAvatarPath = authorAvatar ? authorAvatar.url : null;
 
@@ -407,6 +406,7 @@
 
       const conversation = this.getConversation();
       const isGroup = conversation && !conversation.isPrivate();
+      const conversationColor = conversation && conversation.getColor();
 
       const attachments = this.get('attachments');
       const firstAttachment = attachments && attachments[0];
@@ -421,7 +421,7 @@
         authorName: contact.name,
         authorProfileName: contact.profileName,
         authorPhoneNumber: contact.phoneNumber,
-        authorColor,
+        conversationColor,
         conversationType: isGroup ? 'group' : 'direct',
         attachment: this.getPropsForAttachment(firstAttachment),
         quote: this.getPropsForQuote(),
@@ -536,7 +536,6 @@
       const authorPhoneNumber = author;
       const authorProfileName = contact ? contact.getProfileName() : null;
       const authorName = contact ? contact.getName() : null;
-      const authorColor = contact ? contact.getColor() : 'grey';
       const isFromMe = contact ? contact.id === this.OUR_NUMBER : false;
       const onClick = () => {
         this.trigger('scroll-to-message', {
@@ -557,7 +556,6 @@
         authorPhoneNumber,
         authorProfileName,
         authorName,
-        authorColor,
         onClick,
         referencedMessageNotFound,
       };