diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 17d72465b..bf9ce0cc6 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -70,6 +70,8 @@ import { } from '../../state/selectors/selectedConversation'; import { useSelectedDisableLegacyGroupDeprecatedActions } from '../../hooks/useRefreshReleasedFeaturesTimestamp'; import { useAreGroupsCreatedAsNewGroupsYet } from '../../state/selectors/releasedFeatures'; +import { Constants } from '../../session'; +import { formatDateWithDateAndTime } from '../../util/i18n/formatting/conversationItemTimestamp'; const DEFAULT_JPEG_QUALITY = 0.85; @@ -686,7 +688,11 @@ function OutdatedLegacyGroupBanner() { : localize( weAreAdmin ? 'legacyGroupBeforeDeprecationAdmin' : 'legacyGroupBeforeDeprecationMember' ) - .withArgs({ date: '[Date]' }) + .withArgs({ + date: formatDateWithDateAndTime( + new Date(Constants.FEATURE_RELEASE_TIMESTAMPS.LEGACY_GROUP_READONLY) + ), + }) .toString(); return isLegacyGroup && newGroupsCanBeCreated ? ( diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index ffe476a78..a0dd83dca 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -50,6 +50,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) => const convoIdFromContext = useConvoIdFromContext(); const disabledLegacyGroup = useDisableLegacyGroupDeprecatedActions(convoIdFromContext); + const isPinned = useIsPinned(convoIdFromContext); if (isSearching) { return null; @@ -60,6 +61,7 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) => + {isPinned ? : null} ); diff --git a/ts/util/i18n/formatting/conversationItemTimestamp.ts b/ts/util/i18n/formatting/conversationItemTimestamp.ts index 3a28e3d61..a8c7448ec 100644 --- a/ts/util/i18n/formatting/conversationItemTimestamp.ts +++ b/ts/util/i18n/formatting/conversationItemTimestamp.ts @@ -40,3 +40,22 @@ export const getConversationItemString = (date: Date) => { }); return formatter.format(date); }; + +/** + * Returns a date like 11:00 am, 25 Jan 2026 + */ +export function formatDateWithDateAndTime(date: Date) { + const dateFormatted = new Intl.DateTimeFormat(getBrowserLocale(), { + day: 'numeric', + month: 'short', + year: 'numeric', + }).format(date); + + const timeFormatted = new Intl.DateTimeFormat(getBrowserLocale(), { + hour: 'numeric', + minute: '2-digit', + hour12: true, + }).format(date); + + return [timeFormatted, dateFormatted].join(', '); +}