diff --git a/ui/StatusQ b/ui/StatusQ index 5e19140c8b..35d12f444d 160000 --- a/ui/StatusQ +++ b/ui/StatusQ @@ -1 +1 @@ -Subproject commit 5e19140c8b066b5058110fc27b20296726c40a87 +Subproject commit 35d12f444d4e1dacc56f47e25853281477177063 diff --git a/ui/app/AppLayouts/Chat/popups/ProfilePopup.qml b/ui/app/AppLayouts/Chat/popups/ProfilePopup.qml index 42fcbe01b2..f7ca27ea33 100644 --- a/ui/app/AppLayouts/Chat/popups/ProfilePopup.qml +++ b/ui/app/AppLayouts/Chat/popups/ProfilePopup.qml @@ -89,12 +89,21 @@ StatusModal { anchors.top: parent.top width: parent.width + // Blocked User Status Bar + StatusBanner { + id: blockedUsrBar + width: parent.width + visible: isBlocked + type: StatusBanner.Type.Danger + statusText: qsTr("Blocked") + } + Item { height: 16 width: parent.width } - StatusDescriptionListItem { + StatusDescriptionListItem { title: ((isCurrentUser && profileModel.ens.preferredUsername) || isEnsVerified) ? qsTr("ENS username") : qsTr("Username") subTitle: isCurrentUser ? profileModel.ens.preferredUsername || userName : userName tooltip.text: qsTr("Copy to clipboard") @@ -121,11 +130,6 @@ StatusModal { width: parent.width } - StatusModalDivider { - topPadding: 12 - bottomPadding: 16 - } - StatusDescriptionListItem { title: qsTr("Share Profile URL") subTitle: { @@ -163,12 +167,6 @@ StatusModal { width: parent.width } - StatusModalDivider { - visible: !isCurrentUser - topPadding: 8 - bottomPadding: 12 - } - StatusDescriptionListItem { visible: !isCurrentUser title: qsTr("Chat settings") diff --git a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml index 382301d19d..0f24d47c8d 100644 --- a/ui/app/AppLayouts/Chat/views/ChatColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ChatColumnView.qml @@ -261,25 +261,13 @@ Item { } } - Item { - Layout.fillWidth: true - Layout.preferredHeight: 40 - Layout.alignment: Qt.AlignHCenter + // Blocked User Status Bar + StatusBanner { + id: blockedUsrBar + width: parent.width visible: isBlocked - - Rectangle { - id: blockedBanner - anchors.fill: parent - color: Style.current.red - opacity: 0.1 - } - - Text { - id: blockedText - anchors.centerIn: blockedBanner - color: Style.current.red - text: qsTr("Blocked") - } + type: StatusBanner.Type.Danger + statusText: qsTr("Blocked") } StackLayout {