OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4953 from matrix-org/t3chguy/fix/14402 

Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones
pull/21833/head
Michael Telatynski 2020-07-13 15:28:29 +01:00 committed by GitHub
parent 97734395f7 71ecd5dc85
commit 3c096fdf23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/avatars/RoomAvatar.tsx
View File

@ -126,16 +126,16 @@ export default class RoomAvatar extends React.Component<IProps, IState> {
};
public render() {
/*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
const roomName = room ? room.name : oobData.name;
return (
<BaseAvatar {...otherProps} name={roomName}
<BaseAvatar {...otherProps}
name={roomName}
idName={room ? room.roomId : null}
urls={this.state.urls}
onClick={this.props.viewAvatarOnClick && !this.state.urls[0] ? this.onRoomAvatarClick : null}
onClick={viewAvatarOnClick && this.state.urls[0] ? this.onRoomAvatarClick : null}
/>
);
}