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

Fix color of quotes in chats with custom colors

Browse source
This commit is contained in:
trevor-signal 2024-12-19 14:13:22 -05:00 • committed by GitHub
parent d4b0ae25c1
commit 187d06fd69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ts/components/conversation/Quote.tsx
View file

@ -477,6 +477,14 @@ export function Quote(props: Props): JSX.Element | null {
);
}
const customColorStyle = getCustomColorStyle(customColor, true);
// We don't set a custom color for outgoing quotes
const borderInlineStartColor =
isIncoming || isCompose
? customColorStyle?.borderInlineStartColor
: undefined;
function renderReferenceWarning() {
if (!referencedMessageNotFound || isStoryReply) {
return null;
@ -490,9 +498,7 @@ export function Quote(props: Props): JSX.Element | null {
? getClassName(`--incoming-${conversationColor}`)
: getClassName(`--outgoing-${conversationColor}`)
)}
style={{
...getCustomColorStyle(customColor, true),
}}
style={{ ...customColorStyle, borderInlineStartColor }}
>
<div
className={classNames(
@ -546,9 +552,14 @@ export function Quote(props: Props): JSX.Element | null {
!onClick && getClassName('--no-click'),
referencedMessageNotFound && getClassName('--with-reference-warning')
)}
style={{ ...getCustomColorStyle(customColor, true) }}
style={customColorStyle}
>
<div className={getClassName('__primary')}>
<div
className={getClassName('__primary')}
style={
borderInlineStartColor ? { borderInlineStartColor } : undefined
}
>
{renderAuthor()}
{renderGenericFile()}
{renderPayment()}