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

Fix default conversation color to use state

Browse source
This commit is contained in:
ayumi-signal 2023-09-01 10:03:44 -07:00 • committed by GitHub
parent f3eee779a0
commit cf28e2dc2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/state/smart/ConversationDetails.tsx
View file

@ -16,7 +16,10 @@ import {
} from '../selectors/conversations';
import { getGroupMemberships } from '../../util/getGroupMemberships';
import { getActiveCallState } from '../selectors/calling';
import { getAreWeASubscriber } from '../selectors/items';
import {
getAreWeASubscriber,
getDefaultConversationColor,
} from '../selectors/items';
import { getIntl, getTheme } from '../selectors/user';
import {
getBadgesSelector,
@ -82,6 +85,7 @@ const mapStateToProps = (
);
const badges = getBadgesSelector(state)(conversation.badges);
const defaultConversationColor = getDefaultConversationColor(state);
const groupsInCommon =
conversation.type === 'direct'
@ -107,7 +111,7 @@ const mapStateToProps = (
canAddNewMembers,
conversation: {
...conversation,
...getConversationColorAttributes(conversation),
...getConversationColorAttributes(conversation, defaultConversationColor),
},
getPreferredBadge: getPreferredBadgeSelector(state),
hasActiveCall: Boolean(getActiveCallState(state)),