From 5f0888d14478a5932b8360b0736da8a44eb64fcd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 5 Feb 2024 16:33:17 +1100 Subject: [PATCH] fix: make sure all dialog "cancel" cancel the dialog --- .../message/message-content/ClickToTrustSender.tsx | 3 +++ .../message-info/components/AttachmentInfo.tsx | 2 +- ts/components/dialog/DeleteAccountModal.tsx | 6 ++++++ ts/components/dialog/SessionConfirm.tsx | 12 +++++------- .../conversation-list-item/InteractionItem.tsx | 2 +- ts/components/settings/section/CategoryPrivacy.tsx | 3 +++ .../conversations/unsendingInteractions.ts | 2 ++ ts/session/conversations/createClosedGroup.ts | 7 ++++++- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx index 25afee8a7..d54733a1a 100644 --- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx +++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx @@ -106,6 +106,9 @@ export const ClickToTrustSender = (props: { messageId: string }) => { }) ); }, + onClickClose: () => { + window.inboxStore?.dispatch(updateConfirmModal(null)); + }, }) ); }; diff --git a/ts/components/conversation/right-panel/overlay/message-info/components/AttachmentInfo.tsx b/ts/components/conversation/right-panel/overlay/message-info/components/AttachmentInfo.tsx index 6ba94a25b..44344b5a6 100644 --- a/ts/components/conversation/right-panel/overlay/message-info/components/AttachmentInfo.tsx +++ b/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%; } `; diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx index 23d97d8ef..9b886b97e 100644 --- a/ts/components/dialog/DeleteAccountModal.tsx +++ b/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; diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index a964a3612..932a8a66c 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/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 ( diff --git a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx index 8df8e7733..0e7b0031f 100644 --- a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx +++ b/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 diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx index 4e0f5be3b..59e836d52 100644 --- a/ts/components/settings/section/CategoryPrivacy.tsx +++ b/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 { diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 7cf73422b..c73c77117 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -377,6 +377,7 @@ export async function deleteMessagesById(messageIds: Array, 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, conversation window.inboxStore?.dispatch(resetRightOverlayMode()); }, closeAfterInput: false, + onClickClose: closeDialog, }) ); } diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index f1a6ad23f..e30afa86a 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/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)); + }, }) );