Merge pull request #1465 from session-foundation/fix/SES-4050/incoming_message_request_message_info

fix: allow showing the message info panel for incoming message requests

Author: Bilb

ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx

@@ -53,6 +53,7 @@ import { PanelIconLucideIcon } from '../../../../buttons/PanelIconButton';
 import { useShowCopyAccountIdCb } from '../../../../menuAndSettingsHooks/useCopyAccountId';
 import { localize } from '../../../../../localization/localeTools';
 import { sectionActions } from '../../../../../state/ducks/section';
+import { useIsIncomingRequest } from '../../../../../hooks/useParamSelector';
 
 // NOTE we override the default max-widths when in the detail isDetailView
 const StyledMessageBody = styled.div`
@@ -272,6 +273,8 @@ export const OverlayMessageInfo = () => {
   // is always the currently selected conversation
   const convoId = useSelectedConversationKey();
 
+  const isIncomingMessageRequest = useIsIncomingRequest(convoId);
+
   const closePanel = useCallback(() => {
     dispatch(closeRightPanel());
     dispatch(sectionActions.resetRightOverlayMode());
@@ -379,7 +382,8 @@ export const OverlayMessageInfo = () => {
                 dataTestId="resend-msg-from-details"
               />
             )}
-            {hasAttachments && (
+            {/* Saving attachments sends a data extraction message so it must be disabled for message requests. */}
+            {hasAttachments && !isIncomingMessageRequest && (
               <PanelIconButton
                 text={localize('save').toString()}
                 iconElement={
@@ -399,7 +403,8 @@ export const OverlayMessageInfo = () => {
                 }}
               />
             )}
-            {isDeletable && !isLegacyGroup && (
+            {/* Deleting messages sends a "delete message" message so it must be disabled for message requests. */}
+            {isDeletable && !isLegacyGroup && !isIncomingMessageRequest && (
               <PanelIconButton
                 text={localize('delete').toString()}
                 iconElement={<PanelIconLucideIcon iconUnicode={LUCIDE_ICONS_UNICODE.TRASH2} />}

ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts

@@ -57,6 +57,7 @@ export const sendDataExtractionNotification = async (
     !convo ||
     !convo.isPrivate() ||
     convo.isMe() ||
+    convo.isIncomingRequest() ||
     UserUtils.isUsFromCache(attachmentSender) ||
     convo.isBlocked()
   ) {

ts/state/ducks/conversations.ts

@@ -636,14 +636,8 @@ const conversationsSlice = createSlice({
       ) {
         return state;
       }
-      const selected = state.conversationLookup[state.selectedConversation];
 
-      // we can open the right panel always for non private chats. and also when the chat is private, and we are friends with the other person
-      if (!selected.isPrivate || (selected.isApproved && selected.didApproveMe)) {
-        return { ...state, showRightPanel: true };
-      }
-
-      return state;
+      return { ...state, showRightPanel: true };
     },
     closeRightPanel(state: ConversationsStateType) {
       return { ...state, showRightPanel: false, messageInfoId: undefined };