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

MemberDeviceInfo: Use the device name, where available

Browse Source 
we now have device name for e2e devices: use it!
This commit is contained in:
Richard van der Hoff
2016-08-03 14:18:09 +01:00
parent f431e62e6b
commit 55f4d23625
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}