mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix for per chat color selection

Browse source
This commit is contained in:
Josh Perez 2021-06-03 14:46:38 -04:00 committed by GitHub
parent 56f0e1ba46
commit c055240dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ts/models/conversations.ts
View file

@ -4878,10 +4878,6 @@ export class ConversationModel extends window.Backbone
'defaultConversationColor' 'defaultConversationColor'
); );
if (defaultConversationColor.customColorData) {
return 'custom';
}
return this.get('conversationColor') || defaultConversationColor.color; return this.get('conversationColor') || defaultConversationColor.color;
} }
@ -4893,6 +4889,13 @@ export class ConversationModel extends window.Backbone
'defaultConversationColor' 'defaultConversationColor'
); );
if (this.getConversationColor() !== 'custom') {
return {
customColor: undefined,
customColorId: undefined,
};
}
return { return {
customColor: customColor:
this.get('customColor') || this.get('customColor') ||