Update to new design for avatars: individual/group icons/colors

And two initials.

js/models/conversations.js

@@ -174,8 +174,6 @@
     format() {
       const { format } = PhoneNumber;
       const regionCode = storage.get('regionCode');
-
-      const avatar = this.getAvatar();
       const color = this.getColor();
 
       return {
@@ -183,7 +181,7 @@
           ourRegionCode: regionCode,
         }),
         color,
-        avatarPath: avatar ? avatar.url : null,
+        avatarPath: this.getAvatarPath(),
         name: this.getName(),
         profileName: this.getProfileName(),
         title: this.getTitle(),
@@ -192,6 +190,7 @@
     getPropsForListItem() {
       const result = {
         ...this.format(),
+        conversationType: this.isPrivate() ? 'direct' : 'group',
 
         lastUpdated: this.get('timestamp'),
         unreadCount: this.get('unreadCount') || 0,
@@ -1369,6 +1368,15 @@
       const { migrateColor } = Util;
       return migrateColor(this.get('color'));
     },
+    getAvatarPath() {
+      const avatar = this.get('avatar') || this.get('profileAvatar');
+
+      if (avatar && avatar.path) {
+        return getAbsoluteAttachmentPath(avatar.path);
+      }
+
+      return null;
+    },
     getAvatar() {
       const title = this.get('name');
       const color = this.getColor();