jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show user badges in contact modal 

Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2021-11-11 09:38:18 -08:00 committed by GitHub
parent 90fc848f6d
commit d2342a05b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/components/conversation/ContactModal.stories.tsx
View File

@ -14,6 +14,7 @@ import { setupI18n } from '../../util/setupI18n';
import enMessages from '../../../_locales/en/messages.json';
import type { ConversationType } from '../../state/ducks/conversations';
import { getFakeBadges } from '../../test-both/helpers/getFakeBadge';
import { ThemeType } from '../../types/Util';
const i18n = setupI18n('en', enMessages);
@ -37,6 +38,7 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
isMember: boolean('isMember', overrideProps.isMember || true),
openConversationInternal: action('openConversationInternal'),
removeMemberFromGroup: action('removeMemberFromGroup'),
theme: ThemeType.light,
toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
toggleAdmin: action('toggleAdmin'),
updateConversationModelSharedGroups: action(

5
ts/components/conversation/ContactModal.tsx
View File

@ -9,7 +9,7 @@ import { Avatar } from '../Avatar';
import { AvatarLightbox } from '../AvatarLightbox';
import type { ConversationType } from '../../state/ducks/conversations';
import { Modal } from '../Modal';
import type { LocalizerType } from '../../types/Util';
import type { LocalizerType, ThemeType } from '../../types/Util';
import { BadgeDialog } from '../BadgeDialog';
import type { BadgeType } from '../../badges/types';
import { SharedGroupNames } from '../SharedGroupNames';
@ -24,6 +24,7 @@ export type PropsDataType = {
readonly i18n: LocalizerType;
isAdmin: boolean;
isMember: boolean;
theme: ThemeType;
};
type PropsActionType = {
@ -60,6 +61,7 @@ export const ContactModal = ({
isMember,
openConversationInternal,
removeMemberFromGroup,
theme,
toggleAdmin,
toggleSafetyNumberModal,
updateConversationModelSharedGroups,
@ -102,6 +104,7 @@ export const ContactModal = ({
profileName={contact.profileName}
sharedGroupNames={contact.sharedGroupNames}
size={96}
theme={theme}
title={contact.title}
unblurredAvatarPath={contact.unblurredAvatarPath}
onClick={() => {

3
ts/state/smart/ContactModal.tsx
View File

@ -7,7 +7,7 @@ import type { PropsDataType } from '../../components/conversation/ContactModal';
import { ContactModal } from '../../components/conversation/ContactModal';
import type { StateType } from '../reducer';
import { getIntl } from '../selectors/user';
import { getIntl, getTheme } from '../selectors/user';
import { getBadgesSelector } from '../selectors/badges';
import { getConversationSelector } from '../selectors/conversations';
@ -42,6 +42,7 @@ const mapStateToProps = (state: StateType): PropsDataType => {
i18n: getIntl(state),
isAdmin,
isMember,
theme: getTheme(state),
};
};