matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge pull request #5985 from aaronraimist/blank-device-name

Browse Source 
Show device ID in UserInfo when there is no device name
This commit is contained in:
Michael Telatynski
2021-05-10 16:19:56 +01:00
committed by GitHub
parent 1b372b17e0 fa307ee14c
commit 95b43d1284
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/right_panel/UserInfo.tsx
View File

@@ -187,9 +187,15 @@ function DeviceItem({userId, device}: {userId: string, device: IDevice}) {
verifyDevice(cli.getUser(userId), device); verifyDevice(cli.getUser(userId), device);
}; };
const deviceName = device.ambiguous ? let deviceName;
(device.getDisplayName() ? device.getDisplayName() : "") + " (" + device.deviceId + ")" : if (!device.getDisplayName()?.trim()) {
deviceName = device.deviceId;
} else {
deviceName = device.ambiguous ?
device.getDisplayName() + " (" + device.deviceId + ")" :
device.getDisplayName(); device.getDisplayName();
}
let trustedLabel = null; let trustedLabel = null;
if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted"); if (userTrust.isVerified()) trustedLabel = isVerified ? _t("Trusted") : _t("Not trusted");