PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #451 from matrix-org/rav/deviceinfo

Browse source 
Update MemberDeviceInfo display
This commit is contained in:
Richard van der Hoff 2016-09-09 14:08:42 +01:00 committed by GitHub
commit 17e763e8e6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/MemberDeviceInfo.js
View file

@ -99,12 +99,16 @@ export default class MemberDeviceInfo extends React.Component {
); );
} }
var deviceName = this.props.device.display_name || this.props.device.deviceId; var deviceName = this.props.device.getDisplayName() || this.props.device.deviceId;
// add the deviceId as a titletext to help with debugging
return ( return (
<div className="mx_MemberDeviceInfo"> <div className="mx_MemberDeviceInfo" title={this.props.device.deviceId}>
<div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div> <div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
{indicator} {indicator}
<div className="mx_MemberDeviceInfo_deviceKey">
{this.props.device.getFingerprint()}
</div>
{verifyButton} {verifyButton}
{blockButton} {blockButton}
</div> </div>