Merge pull request #72 from Bilb/fix-unpin-groups-readonly

fix: allow unpin legacy readonly groups & add sample date
pull/3281/head
Audric Ackermann 2 months ago committed by GitHub
commit 571f05923e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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 ? (

@ -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) =>
<SessionContextMenuContainer>
<Menu id={triggerId} animation={getMenuAnimation()}>
<DeleteDeprecatedLegacyGroupMenuItem />
{isPinned ? <PinConversationMenuItem /> : null}
</Menu>
</SessionContextMenuContainer>
);

@ -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(', ');
}

Loading…
Cancel
Save