Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys
MemberDeviceInfo: Use the device name, where availablepull/21833/head
commit
42f6703112
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue