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

Fixes global chat color setting

Browse Source
This commit is contained in:
Josh Perez
2021-06-02 17:05:09 -04:00
committed by GitHub
parent a6ce00ff37
commit bd46e3afd6
14 changed files with 250 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,13 +13,13 @@ import { StateType } from '../reducer';
import {
getConversationSelector,
getConversationsWithCustomColorSelector,
getMe,
} from '../selectors/conversations';
import { getDefaultConversationColor } from '../selectors/items';
import { getIntl } from '../selectors/user';
export type SmartChatColorPickerProps = {
conversationId?: string;
isInModal?: boolean;
isGlobal?: boolean;
onChatColorReset?: () => unknown;
onSelectColor: (
color: ConversationColorType,
@@ -34,9 +34,14 @@ const mapStateToProps = (
state: StateType,
props: SmartChatColorPickerProps
): PropsDataType => {
const conversation = props.conversationId
const defaultConversationColor = getDefaultConversationColor(state);
const colorValues = props.conversationId
? getConversationSelector(state)(props.conversationId)
: getMe(state);
: {
conversationColor: defaultConversationColor.color,
customColorId: defaultConversationColor.customColorData?.id,
customColor: defaultConversationColor.customColorData?.value,
};
const { customColors } = state.items;
@@ -47,10 +52,10 @@ const mapStateToProps = (
state
),
i18n: getIntl(state),
selectedColor: conversation.conversationColor,
selectedColor: colorValues.conversationColor,
selectedCustomColor: {
id: conversation.customColorId,
value: conversation.customColor,
id: colorValues.customColorId,
value: colorValues.customColor,
},
};
};