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

Add badges to all conversation lists

Browse source
This commit is contained in:
Evan Hahn 2021-11-17 15:11:21 -06:00 • committed by GitHub
parent 2c4dfc74c4
commit 2cbcd59609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 131 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@ import {
getBadgesSelector,
getPreferredBadgeSelector,
} from '../selectors/badges';
import type { BadgeType } from '../../badges/types';
import { assert } from '../../util/assert';
import { SignalService as Proto } from '../../protobuf';
@ -81,24 +80,15 @@ const mapStateToProps = (
const badges = getBadgesSelector(state)(conversation.badges);
const preferredBadgeByConversation: Record<string, BadgeType> = {};
const getPreferredBadge = getPreferredBadgeSelector(state);
groupMemberships.memberships.forEach(({ member }) => {
const preferredBadge = getPreferredBadge(member.badges);
if (preferredBadge) {
preferredBadgeByConversation[member.id] = preferredBadge;
}
});
return {
...props,
badges,
canEditGroupInfo,
candidateContactsToAdd,
conversation,
getPreferredBadge: getPreferredBadgeSelector(state),
i18n: getIntl(state),
isAdmin,
preferredBadgeByConversation,
...groupMemberships,
userAvatarData: conversation.avatars || [],
hasGroupLink,