fix: make sure all dialog "cancel" cancel the dialog

ts/components/conversation/message/message-content/ClickToTrustSender.tsx

@@ -106,6 +106,9 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
             })
           );
         },
+        onClickClose: () => {
+          window.inboxStore?.dispatch(updateConfirmModal(null));
+        },
       })
     );
   };

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

@@ -10,8 +10,8 @@ type Props = {
 
 const StyledLabelContainer = styled(Flex)`
   div {
-    min-width: 50%;
     // we want 2 items per row and that's the easiest to make it happen
+    min-width: 50%;
   }
 `;
 

ts/components/dialog/DeleteAccountModal.tsx

@@ -95,6 +95,9 @@ async function deleteEverythingAndNetworkData() {
             await deleteDbLocally();
             window.restart();
           },
+          onClickClose: () => {
+            window.inboxStore?.dispatch(updateConfirmModal(null));
+          },
         })
       );
       return;
@@ -122,6 +125,9 @@ async function deleteEverythingAndNetworkData() {
             await deleteDbLocally();
             window.restart();
           },
+          onClickClose: () => {
+            window.inboxStore?.dispatch(updateConfirmModal(null));
+          },
         })
       );
       return;

ts/components/dialog/SessionConfirm.tsx

@@ -1,5 +1,6 @@
 import { shell } from 'electron';
 import React, { Dispatch, useEffect, useState } from 'react';
+import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 import { useLastMessage } from '../../hooks/useParamSelector';
 import { MessageInteraction } from '../../interactions';
@@ -69,6 +70,7 @@ export interface SessionConfirmDialogProps {
 }
 
 export const SessionConfirm = (props: SessionConfirmDialogProps) => {
+  const dispatch = useDispatch();
   const {
     title = '',
     message = '',
@@ -113,7 +115,7 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
     }
 
     if (closeAfterInput) {
-      window.inboxStore?.dispatch(updateConfirmModal(null));
+      dispatch(updateConfirmModal(null));
     }
   };
 
@@ -137,13 +139,9 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
    * Performs specified on close action then removes the modal.
    */
   const onClickCancelHandler = () => {
-    if (onClickCancel) {
+    onClickCancel?.();
-      onClickCancel();
-    }
 
-    if (onClickClose) {
+    onClickClose?.();
-      onClickClose();
-    }
   };
 
   return (

ts/components/leftpane/conversation-list-item/InteractionItem.tsx

@@ -58,7 +58,7 @@ export const InteractionItem = (props: InteractionItemProps) => {
 
   switch (interactionType) {
     case ConversationInteractionType.Hide:
-      // if it's hidden or pending hiding, we don't show it any text
+      // if it's hidden or pending hiding, we don't show any text
       break;
     case ConversationInteractionType.Leave:
       errorText = isCommunity

ts/components/settings/section/CategoryPrivacy.tsx

@@ -32,6 +32,9 @@ async function toggleLinkPreviews(isToggleOn: boolean, forceUpdate: () => void)
           await window.setSettingValue(SettingsKey.settingsLinkPreview, newValue);
           forceUpdate();
         },
+        onClickClose: () => {
+          window.inboxStore?.dispatch(updateConfirmModal(null));
+        },
       })
     );
   } else {

ts/interactions/conversations/unsendingInteractions.ts

@@ -377,6 +377,7 @@ export async function deleteMessagesById(messageIds: Array<string>, conversation
 
   const messageCount = selectedMessages.length;
   const moreThanOne = selectedMessages.length > 1;
+  const closeDialog = () => window.inboxStore?.dispatch(updateConfirmModal(null));
 
   window.inboxStore?.dispatch(
     updateConfirmModal({
@@ -401,6 +402,7 @@ export async function deleteMessagesById(messageIds: Array<string>, conversation
         window.inboxStore?.dispatch(resetRightOverlayMode());
       },
       closeAfterInput: false,
+      onClickClose: closeDialog,
     })
   );
 }

ts/session/conversations/createClosedGroup.ts

@@ -116,7 +116,6 @@ async function sendToGroupMembers(
   const allInvitesSent = _.every(inviteResults, inviteResult => inviteResult !== false);
 
   if (allInvitesSent) {
-    // if (true) {
     if (isRetry) {
       const invitesTitle =
         inviteResults.length > 1
@@ -128,6 +127,9 @@ async function sendToGroupMembers(
           title: invitesTitle,
           message: window.i18n('closedGroupInviteSuccessMessage'),
           hideCancel: true,
+          onClickClose: () => {
+            window.inboxStore?.dispatch(updateConfirmModal(null));
+          },
         })
       );
     }
@@ -167,6 +169,9 @@ async function sendToGroupMembers(
           );
         }
       },
+      onClickClose: () => {
+        window.inboxStore?.dispatch(updateConfirmModal(null));
+      },
     })
   );