diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 6be052d18..60af7147c 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -291,7 +291,7 @@ window.Whisper.events.trigger('inviteFriends', this.model); }, - onShowUserDetails: (pubkey) => { + onShowUserDetails: pubkey => { if (this.model.isPrivate()) { window.Whisper.events.trigger('onShowUserDetails', { userPubKey: pubkey, diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index f6c5dc9f5..d7ef2896b 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -272,12 +272,10 @@ } } } - } .dark-theme { .group-invitation { - background-color: #242424; border-color: #303030; box-shadow: 2px 2px #4f4f4f; diff --git a/ts/components/Avatar.tsx b/ts/components/Avatar.tsx index 18fe80757..800dff04d 100644 --- a/ts/components/Avatar.tsx +++ b/ts/components/Avatar.tsx @@ -175,6 +175,7 @@ export class Avatar extends React.PureComponent { !hasImage ? `module-avatar--${color}` : null )} onClick={this.onAvatarClickBound} + role="button" > {hasImage ? this.renderAvatarOrIdenticon() : this.renderNoImage()} @@ -183,7 +184,7 @@ export class Avatar extends React.PureComponent { private onAvatarClick() { if (this.props.onAvatarClick) { - this.props.onAvatarClick() + this.props.onAvatarClick(); } } diff --git a/ts/components/UserDetailsDialog.tsx b/ts/components/UserDetailsDialog.tsx index bec36e7be..e52f49713 100644 --- a/ts/components/UserDetailsDialog.tsx +++ b/ts/components/UserDetailsDialog.tsx @@ -36,9 +36,7 @@ export class UserDetailsDialog extends React.Component { return (
-
- {this.renderAvatar()} -
+
{this.renderAvatar()}
{this.props.profileName}
{this.props.pubkey}
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index cff3383f5..cbad995cc 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -298,6 +298,12 @@ export class ConversationHeader extends React.Component { ); } + public onShowUserDetails(userPubKey: string) { + if (this.props.onShowUserDetails) { + this.props.onShowUserDetails(userPubKey); + } + } + private renderMemberCount() { const memberCount = this.props.members.length; @@ -403,9 +409,4 @@ export class ConversationHeader extends React.Component { ); } - - public onShowUserDetails(userPubKey: string) { - if (this.props.onShowUserDetails) - this.props.onShowUserDetails(userPubKey); - } } diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx index bbff200c1..2758a2628 100644 --- a/ts/components/conversation/Message.tsx +++ b/ts/components/conversation/Message.tsx @@ -673,8 +673,7 @@ export class Message extends React.PureComponent { } return ( -
+