Restore iOS-specific theme; colors on left in android theme

2018-10-09 15:56:14 -07:00
parent ca61c9cb85
commit 7d9711ba65
19 changed files with 1280 additions and 538 deletions
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1374,6 +1374,10 @@
    },

    getColor() {
+      if (!this.isPrivate()) {
+        return null;
+      }
+
      const { migrateColor } = Util;
      return migrateColor(this.get('color'));
    },