UI fixes for conversation details screen

This commit is contained in:
Josh Perez 2021-02-01 17:57:42 -05:00 committed by GitHub
parent ddebbf8121
commit 267ae80442
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 134 additions and 51 deletions

View file

@ -487,13 +487,15 @@ export class ConversationHeader extends React.Component<PropsType> {
private renderHeader(): JSX.Element {
const {
conversationTitle,
groupVersion,
id,
isMe,
onShowContactModal,
onShowConversationDetails,
type,
} = this.props;
if (conversationTitle) {
if (conversationTitle !== undefined) {
return (
<div className="module-conversation-header__title-flex">
<div className="module-conversation-header__title">
@ -503,6 +505,35 @@ export class ConversationHeader extends React.Component<PropsType> {
);
}
const hasGV2AdminEnabled =
groupVersion === 2 &&
window.Signal.RemoteConfig.isEnabled('desktop.gv2Admin');
if (type === 'group' && hasGV2AdminEnabled) {
const onHeaderClick = () => onShowConversationDetails();
const onKeyDown = (e: React.KeyboardEvent): void => {
if (e.key === 'Enter' || e.key === ' ') {
e.stopPropagation();
e.preventDefault();
onShowConversationDetails();
}
};
return (
<div
className="module-conversation-header__title-flex module-conversation-header__title-clickable"
onClick={onHeaderClick}
onKeyDown={onKeyDown}
role="button"
tabIndex={0}
>
{this.renderAvatar()}
{this.renderTitle()}
</div>
);
}
if (type === 'group' || isMe) {
return (
<div className="module-conversation-header__title-flex">