Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-03 14:51:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
6 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ts/state/smart/ChatColorPicker.tsx
View File

@@ -12,6 +12,7 @@ import {
getConversationsWithCustomColorSelector,
} from '../selectors/conversations';
import { getIntl } from '../selectors/user';
import { getDefaultConversationColor } from '../selectors/items';
import { getConversationColorAttributes } from '../../util/getConversationColorAttributes';
export type SmartChatColorPickerProps = {
@@ -25,7 +26,11 @@ const mapStateToProps = (
const conversation = props.conversationId
? getConversationSelector(state)(props.conversationId)
: {};
const colorValues = getConversationColorAttributes(conversation);
const defaultConversationColor = getDefaultConversationColor(state);
const colorValues = getConversationColorAttributes(
conversation,
defaultConversationColor
);
const { customColors } = state.items;