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

Display user badges

Browse source
This commit is contained in:
Evan Hahn 2021-11-02 18:01:13 -05:00 • committed by GitHub
parent 927c22ef73
commit f647c4e053
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
95 changed files with 2891 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/state/smart/ConversationHeader.tsx
View file

@ -7,6 +7,7 @@ import {
ConversationHeader,
OutgoingCallButtonStyle,
} from '../../components/conversation/ConversationHeader';
import { getPreferredBadgeSelector } from '../selectors/badges';
import {
getConversationSelector,
isMissingRequiredProfileSharing,
@ -16,7 +17,7 @@ import { CallMode } from '../../types/Calling';
import type { ConversationType } from '../ducks/conversations';
import { getConversationCallMode } from '../ducks/conversations';
import { getActiveCall, isAnybodyElseInGroupCall } from '../ducks/calling';
import { getUserUuid, getIntl } from '../selectors/user';
import { getUserUuid, getIntl, getTheme } from '../selectors/user';
import { getOwn } from '../../util/getOwn';
import { missingCaseError } from '../../util/missingCaseError';
import { isConversationSMSOnly } from '../../util/isConversationSMSOnly';
@ -104,6 +105,7 @@ const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
'type',
'unblurredAvatarPath',
]),
badge: getPreferredBadgeSelector(state)(conversation.badges),
conversationTitle: state.conversations.selectedConversationTitle,
isMissingMandatoryProfileSharing: isMissingRequiredProfileSharing(
conversation
@ -112,6 +114,7 @@ const mapStateToProps = (state: StateType, ownProps: OwnProps) => {
i18n: getIntl(state),
showBackButton: state.conversations.selectedConversationPanelDepth > 0,
outgoingCallButtonStyle: getOutgoingCallButtonStyle(conversation, state),
theme: getTheme(state),
};
};