imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys

Browse source 
MemberDeviceInfo: Use the device name, where available
This commit is contained in:
Richard van der Hoff 2016-08-03 15:26:37 +01:00 • committed by GitHub
commit 42f6703112
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,9 +97,11 @@ module.exports = React.createClass({
);
}
var deviceName = this.props.device.display_name || this.props.device.id;
return (
<div className="mx_MemberDeviceInfo">
<div className="mx_MemberDeviceInfo_deviceId">{this.props.device.id}</div>
<div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
{indicator}
{verifyButton}
{blockButton}