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

Merge pull request #3963 from matrix-org/jryans/user-info-device-id

Browse source 
Add device IDs in user info tooltips
This commit is contained in:
J. Ryan Stinnett 2020-01-28 20:05:43 +00:00 • committed by GitHub
commit 02ba548a62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/right_panel/UserInfo.js
View file

@ -183,11 +183,17 @@ function DeviceItem({userId, device}) {
(device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" : (device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" :
device.getDisplayName(); device.getDisplayName();
const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted"); const trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");
return (<AccessibleButton className={classes} onClick={onDeviceClick}> return (
<div className={iconClasses} /> <AccessibleButton
<div className="mx_UserInfo_device_name">{deviceName}</div> className={classes}
<div className="mx_UserInfo_device_trusted">{trustedLabel}</div> title={device.deviceId}
</AccessibleButton>); onClick={onDeviceClick}
>
<div className={iconClasses} />
<div className="mx_UserInfo_device_name">{deviceName}</div>
<div className="mx_UserInfo_device_trusted">{trustedLabel}</div>
</AccessibleButton>
);
} }
function DevicesSection({devices, userId, loading}) { function DevicesSection({devices, userId, loading}) {