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

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
parent f95a11a9bf 55f4d23625
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 ( return (
<div className="mx_MemberDeviceInfo"> <div className="mx_MemberDeviceInfo">
<div className="mx_MemberDeviceInfo_deviceId">{this.props.device.id}</div> <div className="mx_MemberDeviceInfo_deviceId">{deviceName}</div>
{indicator} {indicator}
{verifyButton} {verifyButton}
{blockButton} {blockButton}