Fix avatar color consistency
This commit is contained in:
parent
e9e3906371
commit
cc4470bb6f
3 changed files with 10 additions and 2 deletions
|
@ -129,7 +129,7 @@ export function AddUserToAnotherGroupModal({
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...pick(convo, 'id', 'avatarUrl', 'title', 'hasAvatar'),
|
...pick(convo, 'id', 'avatarUrl', 'title', 'hasAvatar', 'color'),
|
||||||
memberships,
|
memberships,
|
||||||
membersCount,
|
membersCount,
|
||||||
disabledReason,
|
disabledReason,
|
||||||
|
|
|
@ -16,7 +16,12 @@ export enum DisabledReason {
|
||||||
|
|
||||||
export type GroupListItemConversationType = Pick<
|
export type GroupListItemConversationType = Pick<
|
||||||
ConversationType,
|
ConversationType,
|
||||||
'avatarPlaceholderGradient' | 'id' | 'title' | 'avatarUrl' | 'hasAvatar'
|
| 'avatarPlaceholderGradient'
|
||||||
|
| 'id'
|
||||||
|
| 'title'
|
||||||
|
| 'avatarUrl'
|
||||||
|
| 'hasAvatar'
|
||||||
|
| 'color'
|
||||||
> & {
|
> & {
|
||||||
disabledReason: DisabledReason | undefined;
|
disabledReason: DisabledReason | undefined;
|
||||||
membersCount: number;
|
membersCount: number;
|
||||||
|
@ -57,6 +62,7 @@ export function GroupListItem({
|
||||||
<Avatar
|
<Avatar
|
||||||
avatarPlaceholderGradient={group.avatarPlaceholderGradient}
|
avatarPlaceholderGradient={group.avatarPlaceholderGradient}
|
||||||
avatarUrl={group.avatarUrl}
|
avatarUrl={group.avatarUrl}
|
||||||
|
color={group.color}
|
||||||
conversationType="group"
|
conversationType="group"
|
||||||
hasAvatar={group.hasAvatar}
|
hasAvatar={group.hasAvatar}
|
||||||
i18n={i18n}
|
i18n={i18n}
|
||||||
|
|
|
@ -72,6 +72,7 @@ export const SmartHeroRow = memo(function SmartHeroRow({
|
||||||
about,
|
about,
|
||||||
acceptedMessageRequest,
|
acceptedMessageRequest,
|
||||||
avatarUrl,
|
avatarUrl,
|
||||||
|
color,
|
||||||
groupDescription,
|
groupDescription,
|
||||||
hasAvatar,
|
hasAvatar,
|
||||||
isMe,
|
isMe,
|
||||||
|
@ -95,6 +96,7 @@ export const SmartHeroRow = memo(function SmartHeroRow({
|
||||||
acceptedMessageRequest={acceptedMessageRequest}
|
acceptedMessageRequest={acceptedMessageRequest}
|
||||||
avatarUrl={avatarUrl}
|
avatarUrl={avatarUrl}
|
||||||
badge={badge}
|
badge={badge}
|
||||||
|
color={color}
|
||||||
conversationType={type}
|
conversationType={type}
|
||||||
fromOrAddedByTrustedContact={fromOrAddedByTrustedContact}
|
fromOrAddedByTrustedContact={fromOrAddedByTrustedContact}
|
||||||
groupDescription={groupDescription}
|
groupDescription={groupDescription}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue