Skip to content

fix(pinned/search popups): use short date format #19338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2025
Merged

fix(pinned/search popups): use short date format #19338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions storybook/pages/ActivityNotificationTransferOwnershipPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import utils
ActivityNotificationBaseLayout {
id: root

property bool showFullTimestamp

showBaseEditorFields: false
communityEditorActive: true
contactEditorActive: false
Expand All @@ -24,7 +22,6 @@ ActivityNotificationBaseLayout {
type: setType(notification)
communityName: communityEditor.communityMock.name
communityColor: communityEditor.communityMock.color
showFullTimestamp: root.showFullTimestamp

onFinaliseOwnershipClicked: logs.logEvent("ActivityNotificationTransferOwnership::onFinaliseOwnershipClicked")
onNavigateToCommunityClicked: logs.logEvent("ActivityNotificationTransferOwnership::onNavigateToCommunityClicked")
Expand Down Expand Up @@ -58,12 +55,6 @@ ActivityNotificationBaseLayout {
text: "No longer control node"
onCheckedChanged: if(checked) baseEditor.notificationBaseMock.notificationType = ActivityCenterTypes.ActivityCenterNotificationType.OwnershipLost
}

Switch {
text: "Show full timestamp"
checked: root.showFullTimestamp
onCheckedChanged: root.showFullTimestamp = checked
}
}

}
Expand Down
5 changes: 2 additions & 3 deletions ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ Control {
onClicked: (sender) => root.senderNameClicked(sender)
onResendClicked: root.resendClicked()
timestamp: root.timestamp
showFullTimestamp: root.isInPinnedPopup
Copy link
Member Author

@caybro caybro Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes the PinnedMessagesPopup

displayNameClickable: root.profileClickable
outgoingStatus: root.outgoingStatus
showOutgointStatusLabel: root.hovered && !root.isInPinnedPopup
Expand Down Expand Up @@ -383,7 +382,7 @@ Control {

Loader {
Layout.fillWidth: true
Layout.rightMargin: 16
Layout.rightMargin: Theme.padding
active: root.editMode
visible: active
sourceComponent: StatusEditMessage {
Expand Down Expand Up @@ -418,7 +417,7 @@ Control {
active: root.hovered && root.quickActions.length > 0
anchors.right: parent.right
anchors.rightMargin: Theme.padding
anchors.top: root.top
anchors.top: parent.top
sourceComponent: StatusMessageQuickActions {
items: root.quickActions
}
Expand Down
1 change: 0 additions & 1 deletion ui/app/AppLayouts/ActivityCenter/views/ActivityNotificationTransferOwnership.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ ActivityNotificationBase {
required property string communityName
required property string communityColor
required property int type // Possible values [OwnershipState]
property bool showFullTimestamp: false
Copy link
Member Author

@caybro caybro Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unused


signal finaliseOwnershipClicked
signal navigateToCommunityClicked
Expand Down
4 changes: 2 additions & 2 deletions ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Item {

Connections {
target: Qt.application
onStateChanged: {
if (Qt.application.state == Qt.ApplicationActive) {
function onStateChanged() {
if (Qt.application.state === Qt.ApplicationActive) {
d.markAllMessagesReadIfMostRecentMessageIsInViewport()
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/mainui/AppSearch.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Item {
searchOptionsPopupMenu: searchPopupMenu
searchResults: root.store.resultModel
formatTimestampFn: function (ts) {
return LocaleUtils.formatDateTime(parseInt(ts, 10))
return LocaleUtils.formatDateTime(parseInt(ts, 10), Locale.ShortFormat)
Copy link
Member Author

@caybro caybro Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes the AppSearch popup

}
onSearchTextChanged: {
if (searchPopup.searchText !== "") {
Expand Down
1 change: 0 additions & 1 deletion ui/imports/shared/views/chat/MessageView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,6 @@ Loader {
StatusTimeStampLabel {
Layout.alignment: Qt.AlignVCenter
timestamp: root.messageTimestamp
showFullTimestamp: false
}
}
}
Expand Down