From 3f1adff28891f772dd14d73ed89e4ad499f2a37b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 5 Feb 2025 13:28:58 +1100 Subject: [PATCH] chore: address PR reviews --- ts/components/conversation/header/ConversationHeader.tsx | 2 +- .../message/message-content/MessageContentWithStatus.tsx | 5 +++++ ts/components/leftpane/overlay/OverlayClosedGroup.tsx | 8 +++++--- ts/state/ducks/metaGroups.ts | 3 +-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ts/components/conversation/header/ConversationHeader.tsx b/ts/components/conversation/header/ConversationHeader.tsx index d8f5a3eae..fe4433d39 100644 --- a/ts/components/conversation/header/ConversationHeader.tsx +++ b/ts/components/conversation/header/ConversationHeader.tsx @@ -132,7 +132,7 @@ function RecreateGroupButton() { buttonColor={SessionButtonColor.Primary} margin="var(--margins-sm)" onClick={() => { - showRecreateGroupModal(name || 'Unknown group name', members); + showRecreateGroupModal(name || localize('groupUnknown').toString(), members); }} > {localize('recreateGroup').toString()} diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx index 482b85dd1..39c82fd5d 100644 --- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx +++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx @@ -19,6 +19,7 @@ import { MessageContextMenu } from './MessageContextMenu'; import { MessageReactions } from './MessageReactions'; import { MessageStatus } from './MessageStatus'; import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation'; +import { useSelectedDisableLegacyGroupDeprecatedActions } from '../../../../hooks/useRefreshReleasedFeaturesTimestamp'; export type MessageContentWithStatusSelectorProps = { isGroup: boolean } & Pick< MessageRenderingProps, @@ -62,6 +63,7 @@ export const MessageContentWithStatuses = (props: Props) => { const hideAvatar = useHideAvatarInMsgList(props.messageId); const multiSelectMode = useIsMessageSelectionMode(); + const legacyGroupActionsDisabled = useSelectedDisableLegacyGroupDeprecatedActions(); const onClickOnMessageOuterContainer = useCallback( (event: MouseEvent) => { @@ -75,6 +77,9 @@ export const MessageContentWithStatuses = (props: Props) => { ); const onDoubleClickReplyToMessage = (e: MouseEvent) => { + if (legacyGroupActionsDisabled) { + return; + } const currentSelection = window.getSelection(); const currentSelectionString = currentSelection?.toString() || undefined; diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index b507166d2..f0f8081ce 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -144,6 +144,10 @@ export const OverlayClosedGroupV2 = () => { dispatch(resetLeftOverlayMode()); } + function onValueChanged(value: string) { + dispatch(groupInfoActions.updateGroupCreationName({ name: value })); + } + async function onEnterPressed() { setGroupNameError(undefined); if (isCreatingGroup) { @@ -209,9 +213,7 @@ export const OverlayClosedGroupV2 = () => { type="text" placeholder={window.i18n('groupNameEnter')} value={groupName} - onValueChanged={value => { - dispatch(groupInfoActions.updateGroupCreationName({ name: value })); - }} + onValueChanged={onValueChanged} onEnterPressed={onEnterPressed} error={groupNameError} maxLength={LIBSESSION_CONSTANTS.BASE_GROUP_MAX_NAME_LENGTH} diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 135254ad3..95151b9ee 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1273,8 +1273,7 @@ const metaGroupSlice = createSlice({ if (state.creationMembersSelected.includes(payload.memberToAdd)) { return state; } - const together = state.creationMembersSelected.concat(payload.memberToAdd); - state.creationMembersSelected = uniq(together); + state.creationMembersSelected.push(payload.memberToAdd); return state; },