Merge delete for me/everyone into one modal

This commit is contained in:
Jamie Kyle 2023-04-10 14:38:34 -07:00 committed by GitHub
parent c956c0e025
commit 822b162136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 658 additions and 672 deletions

View file

@ -21,6 +21,7 @@ import { SmartStoriesSettingsModal } from './StoriesSettingsModal';
import { getConversationsStoppingSend } from '../selectors/conversations';
import { getIntl, getTheme } from '../selectors/user';
import { useGlobalModalActions } from '../ducks/globalModals';
import { SmartDeleteMessagesModal } from './DeleteMessagesModal';
function renderEditHistoryMessagesModal(): JSX.Element {
return <SmartEditHistoryMessagesModal />;
@ -34,6 +35,10 @@ function renderContactModal(): JSX.Element {
return <SmartContactModal />;
}
function renderDeleteMessagesModal(): JSX.Element {
return <SmartDeleteMessagesModal />;
}
function renderForwardMessagesModal(): JSX.Element {
return <SmartForwardMessagesModal />;
}
@ -62,6 +67,7 @@ export function SmartGlobalModalContainer(): JSX.Element {
contactModalState,
editHistoryMessages,
errorModalProps,
deleteMessagesProps,
forwardMessagesProps,
isProfileEditorVisible,
isShortcutGuideModalVisible,
@ -128,6 +134,7 @@ export function SmartGlobalModalContainer(): JSX.Element {
contactModalState={contactModalState}
editHistoryMessages={editHistoryMessages}
errorModalProps={errorModalProps}
deleteMessagesProps={deleteMessagesProps}
forwardMessagesProps={forwardMessagesProps}
hasSafetyNumberChangeModal={hasSafetyNumberChangeModal}
hideUserNotFoundModal={hideUserNotFoundModal}
@ -142,6 +149,7 @@ export function SmartGlobalModalContainer(): JSX.Element {
renderContactModal={renderContactModal}
renderEditHistoryMessagesModal={renderEditHistoryMessagesModal}
renderErrorModal={renderErrorModal}
renderDeleteMessagesModal={renderDeleteMessagesModal}
renderForwardMessagesModal={renderForwardMessagesModal}
renderProfileEditor={renderProfileEditor}
renderSafetyNumber={renderSafetyNumber}