pull/662/head
Audric Ackermann 6 years ago
parent bd7f587aa7
commit be5f932c08

@ -291,7 +291,7 @@
window.Whisper.events.trigger('inviteFriends', this.model); window.Whisper.events.trigger('inviteFriends', this.model);
}, },
onShowUserDetails: (pubkey) => { onShowUserDetails: pubkey => {
if (this.model.isPrivate()) { if (this.model.isPrivate()) {
window.Whisper.events.trigger('onShowUserDetails', { window.Whisper.events.trigger('onShowUserDetails', {
userPubKey: pubkey, userPubKey: pubkey,

@ -272,12 +272,10 @@
} }
} }
} }
} }
.dark-theme { .dark-theme {
.group-invitation { .group-invitation {
background-color: #242424; background-color: #242424;
border-color: #303030; border-color: #303030;
box-shadow: 2px 2px #4f4f4f; box-shadow: 2px 2px #4f4f4f;

@ -175,6 +175,7 @@ export class Avatar extends React.PureComponent<Props, State> {
!hasImage ? `module-avatar--${color}` : null !hasImage ? `module-avatar--${color}` : null
)} )}
onClick={this.onAvatarClickBound} onClick={this.onAvatarClickBound}
role="button"
> >
{hasImage ? this.renderAvatarOrIdenticon() : this.renderNoImage()} {hasImage ? this.renderAvatarOrIdenticon() : this.renderNoImage()}
</div> </div>
@ -183,7 +184,7 @@ export class Avatar extends React.PureComponent<Props, State> {
private onAvatarClick() { private onAvatarClick() {
if (this.props.onAvatarClick) { if (this.props.onAvatarClick) {
this.props.onAvatarClick() this.props.onAvatarClick();
} }
} }

@ -36,9 +36,7 @@ export class UserDetailsDialog extends React.Component<Props> {
return ( return (
<div className="content"> <div className="content">
<div className="avatar-center"> <div className="avatar-center">
<div className="avatar-center-inner"> <div className="avatar-center-inner">{this.renderAvatar()}</div>
{this.renderAvatar()}
</div>
</div> </div>
<div className="profile-name">{this.props.profileName}</div> <div className="profile-name">{this.props.profileName}</div>
<div className="message">{this.props.pubkey}</div> <div className="message">{this.props.pubkey}</div>

@ -298,6 +298,12 @@ export class ConversationHeader extends React.Component<Props> {
); );
} }
public onShowUserDetails(userPubKey: string) {
if (this.props.onShowUserDetails) {
this.props.onShowUserDetails(userPubKey);
}
}
private renderMemberCount() { private renderMemberCount() {
const memberCount = this.props.members.length; const memberCount = this.props.members.length;
@ -403,9 +409,4 @@ export class ConversationHeader extends React.Component<Props> {
</React.Fragment> </React.Fragment>
); );
} }
public onShowUserDetails(userPubKey: string) {
if (this.props.onShowUserDetails)
this.props.onShowUserDetails(userPubKey);
}
} }

@ -673,8 +673,7 @@ export class Message extends React.PureComponent<Props, State> {
} }
return ( return (
<div <div className="module-message__author-avatar">
className="module-message__author-avatar">
<Avatar <Avatar
avatarPath={authorAvatarPath} avatarPath={authorAvatarPath}
color={authorColor} color={authorColor}

Loading…
Cancel
Save