From cf847e14fa151f0995099419a3c721dab889ab6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Fri, 9 Feb 2024 16:45:34 +0100 Subject: [PATCH] fix(profile key): use the same 3,6 elided key everywhere according to latest designs, the elided compressed key should be diplayed with 3 leading and 6 trailing characters, just like we already do in `Utils.getElidedCompressedPk(pubkey)` --- ui/StatusQ/src/StatusQ/Components/StatusMemberListItem.qml | 3 ++- ui/StatusQ/src/StatusQ/Components/StatusMessageHeader.qml | 2 +- ui/imports/shared/views/chat/SimplifiedMessageView.qml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMemberListItem.qml b/ui/StatusQ/src/StatusQ/Components/StatusMemberListItem.qml index 1fb712b3a5..ae6354d4d0 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusMemberListItem.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusMemberListItem.qml @@ -2,6 +2,7 @@ import QtQuick 2.14 import StatusQ.Core.Theme 0.1 import StatusQ.Core 0.1 +import StatusQ.Core.Utils 0.1 /*! \qmltype StatusMemberListItem @@ -113,7 +114,7 @@ StatusListItem { function composeShortKeyChat(pubKey) { if (!pubKey) return "" - return pubKey.substring(0, 5) + "..." + pubKey.substring(pubKey.length - 3) + return Utils.elideText(pubKey, 3, 6) } } diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMessageHeader.qml b/ui/StatusQ/src/StatusQ/Components/StatusMessageHeader.qml index b14a632844..ba9ce20461 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusMessageHeader.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusMessageHeader.qml @@ -121,7 +121,7 @@ Item { visible: text elide: Text.ElideMiddle color: Theme.palette.baseColor1 - text: Utils.elideText(root.tertiaryDetail, 5, 3) + text: Utils.elideText(root.tertiaryDetail, 3, 6) } } diff --git a/ui/imports/shared/views/chat/SimplifiedMessageView.qml b/ui/imports/shared/views/chat/SimplifiedMessageView.qml index 0e11b0d39c..ea7bcf7b29 100644 --- a/ui/imports/shared/views/chat/SimplifiedMessageView.qml +++ b/ui/imports/shared/views/chat/SimplifiedMessageView.qml @@ -56,7 +56,7 @@ RowLayout { sender: root.messageDetails.sender amISender: root.messageDetails.amISender messageOriginInfo: root.messageDetails.messageOriginInfo - tertiaryDetail: sender.isEnsVerified ? "" : Utils.getElidedCompressedPk(sender.id) + tertiaryDetail: sender.isEnsVerified ? "" : Utils.getCompressedPk(sender.id) timestamp: root.timestamp onClicked: root.openProfilePopup() }