From 6393a4ff273f7fcc45c25d108eb2b2a975950fc0 Mon Sep 17 00:00:00 2001 From: Warrick Corfe-Tan Date: Fri, 18 Jun 2021 15:44:11 +1000 Subject: [PATCH] Confirmation box appearing on link paste but no functionality is changed yet. --- ts/components/session/SessionConfirm.tsx | 2 -- .../session/conversation/SessionCompositionBox.tsx | 9 +++++++++ .../session/conversation/SessionConversation.tsx | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ts/components/session/SessionConfirm.tsx b/ts/components/session/SessionConfirm.tsx index 9296475ab..bd51938ea 100644 --- a/ts/components/session/SessionConfirm.tsx +++ b/ts/components/session/SessionConfirm.tsx @@ -115,11 +115,9 @@ const SessionConfirmInner = (props: SessionConfirmDialogProps) => {
- {/* */} {!hideCancel && ( - // void; showSettingsSection: (category: SessionSettingCategory) => void; theme: DefaultTheme; + updateConfirmModal: (props: SessionConfirmDialogProps) => any; } interface State { @@ -235,6 +238,12 @@ export class SessionCompositionBox extends React.Component { // message: window.i18n('linkPreviewsConfirmMessage'), // okTheme: SessionButtonColor.Danger, // })) + this.props.updateConfirmModal({ + shouldShowConfirm: () => !window.getSettingValue('link-preview-setting'), + title: window.i18n('linkPreviewsTitle'), + message: window.i18n('linkPreviewsConfirmMessage'), + okTheme: SessionButtonColor.Danger, + }) } } diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx index c17cf2b93..702e062f7 100644 --- a/ts/components/session/conversation/SessionConversation.tsx +++ b/ts/components/session/conversation/SessionConversation.tsx @@ -43,8 +43,6 @@ import { AddModeratorsDialog } from '../../conversation/ModeratorsAddDialog'; import { RemoveModeratorsDialog } from '../../conversation/ModeratorsRemoveDialog'; import { UpdateGroupNameDialog } from '../../conversation/UpdateGroupNameDialog'; import { UpdateGroupMembersDialog } from '../../conversation/UpdateGroupMembersDialog'; -import { getOurNumber } from '../../../state/selectors/user'; -import { useSelector } from 'react-redux'; import { InviteContactsDialog } from '../../conversation/InviteContactsDialog'; interface State { @@ -314,6 +312,7 @@ export class SessionConversation extends React.Component { removeAttachment={this.removeAttachment} onChoseAttachments={this.onChoseAttachments} theme={this.props.theme} + updateConfirmModal={actions.updateConfirmModal} />