mirror of
https://github.com/element-hq/element-web
synced 2024-10-27 05:05:56 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
94cf33d836
1 changed files with 3 additions and 1 deletions
|
@ -62,7 +62,9 @@ const GroupTile = React.createClass({
|
||||||
const profile = this.state.profile || {};
|
const profile = this.state.profile || {};
|
||||||
const name = profile.name || this.props.groupId;
|
const name = profile.name || this.props.groupId;
|
||||||
const desc = profile.shortDescription;
|
const desc = profile.shortDescription;
|
||||||
const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(profile.avatarUrl, 50, 50) : null;
|
const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
|
||||||
|
profile.avatarUrl, 50, 50, "crop",
|
||||||
|
) : null;
|
||||||
return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
|
return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
|
||||||
<div className="mx_GroupTile_avatar">
|
<div className="mx_GroupTile_avatar">
|
||||||
<BaseAvatar name={name} url={httpUrl} width={50} height={50} />
|
<BaseAvatar name={name} url={httpUrl} width={50} height={50} />
|
||||||
|
|
Loading…
Reference in a new issue