matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Update MemberDeviceInfo display

Browse Source 
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
This commit is contained in:
Richard van der Hoff
2016-09-09 11:41:56 +01:00
parent dce2dd36ec
commit b724b0c6b6
1 changed files with 6 additions and 2 deletions
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 (
<div className="mx_MemberDeviceInfo">
<div className="mx_MemberDeviceInfo" title={this.props.device.deviceId}>
<div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
{indicator}
<div className="mx_MemberDeviceInfo_deviceKey">
{this.props.device.getFingerprint()}
</div>
{verifyButton}
{blockButton}
</div>