OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use device IDs for nameless devices in device list (#7081)

pull/21833/head
Faye Duxovni 2021-11-04 06:24:48 -04:00 committed by GitHub
parent bd2f4b6c93
commit e31b126daa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/views/settings/DevicesPanelEntry.tsx
View File

@ -157,6 +157,16 @@ export default class DevicesPanelEntry extends React.Component<IProps, IState> {
<StyledCheckbox kind={CheckboxStyle.Outline} onChange={this.onDeviceToggled} checked={this.props.selected} /> <StyledCheckbox kind={CheckboxStyle.Outline} onChange={this.onDeviceToggled} checked={this.props.selected} />
</div>; </div>;
const deviceName = device.display_name ?
<React.Fragment>
<TextWithTooltip tooltip={device.display_name + " (" + device.device_id + ")"}>
{ device.display_name }
</TextWithTooltip>
</React.Fragment> :
<React.Fragment>
{ device.device_id }
</React.Fragment>;
const buttons = this.state.renaming ? const buttons = this.state.renaming ?
<form className="mx_DevicesPanel_renameForm" onSubmit={this.onRenameSubmit}> <form className="mx_DevicesPanel_renameForm" onSubmit={this.onRenameSubmit}>
<Field <Field
@ -182,9 +192,7 @@ export default class DevicesPanelEntry extends React.Component<IProps, IState> {
{ left } { left }
<div className="mx_DevicesPanel_deviceInfo"> <div className="mx_DevicesPanel_deviceInfo">
<div className="mx_DevicesPanel_deviceName"> <div className="mx_DevicesPanel_deviceName">
<TextWithTooltip tooltip={device.display_name + " (" + device.device_id + ")"}> { deviceName }
{ device.display_name }
</TextWithTooltip>
</div> </div>
<div className="mx_DevicesPanel_lastSeen"> <div className="mx_DevicesPanel_lastSeen">
{ lastSeen } { lastSeen }