From 5285d4240a68b193982e45e78f67b8e9666c5170 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 7 Aug 2023 14:11:45 +1000 Subject: [PATCH] fix: resolved missing selected conversation hooks imports --- ts/components/conversation/SessionMessagesList.tsx | 2 +- ts/components/conversation/SessionMessagesListContainer.tsx | 2 +- ts/components/conversation/StagedAttachmentList.tsx | 2 +- ts/components/conversation/SubtleNotification.tsx | 6 ++++-- ts/components/dialog/ReactListModal.tsx | 2 +- .../conversation-list-item/ConversationListItem.tsx | 2 +- ts/components/leftpane/overlay/OverlayMessageRequest.tsx | 6 ++---- ts/components/lightbox/LightboxGallery.tsx | 2 +- ts/components/menu/ConversationHeaderMenu.tsx | 2 +- ts/components/menu/Menu.tsx | 2 +- ts/hooks/useParamSelector.ts | 4 ++-- ts/hooks/useVideoEventListener.ts | 2 +- ts/state/selectors/call.ts | 3 ++- ts/state/selectors/stagedAttachments.ts | 2 +- ts/state/smart/SessionConversation.ts | 2 +- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index c4974c68b..409ad72f0 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -16,8 +16,8 @@ import { getOldBottomMessageId, getOldTopMessageId, getSortedMessagesTypesOfSelectedConversation, - useSelectedConversationKey, } from '../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { MessageDateBreak } from './message/message-item/DateBreak'; import { GroupInvitation } from './message/message-item/GroupInvitation'; import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage'; diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx index 9d14d1132..37eda011f 100644 --- a/ts/components/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/conversation/SessionMessagesListContainer.tsx @@ -19,9 +19,9 @@ import { StateType } from '../../state/reducer'; import { getQuotedMessageToAnimate, getSelectedConversation, - getSelectedConversationKey, getSortedMessagesOfSelectedConversation, } from '../../state/selectors/conversations'; +import { getSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { SessionMessagesList } from './SessionMessagesList'; import { TypingBubble } from './TypingBubble'; diff --git a/ts/components/conversation/StagedAttachmentList.tsx b/ts/components/conversation/StagedAttachmentList.tsx index 862e6b56e..cf5d3218a 100644 --- a/ts/components/conversation/StagedAttachmentList.tsx +++ b/ts/components/conversation/StagedAttachmentList.tsx @@ -6,7 +6,7 @@ import { removeAllStagedAttachmentsInConversation, removeStagedAttachmentInConversation, } from '../../state/ducks/stagedAttachments'; -import { useSelectedConversationKey } from '../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { AttachmentType, areAllAttachmentsVisual, diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 785dc199a..274f1f1d2 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -3,13 +3,15 @@ import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { - getSelectedCanWrite, getSelectedHasMessages, hasSelectedConversationIncomingMessages, +} from '../../state/selectors/conversations'; +import { + getSelectedCanWrite, useSelectedConversationKey, useSelectedIsNoteToSelf, useSelectedNicknameOrProfileNameOrShortenedPubkey, -} from '../../state/selectors/conversations'; +} from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx index d23613f30..b6ac1c840 100644 --- a/ts/components/dialog/ReactListModal.tsx +++ b/ts/components/dialog/ReactListModal.tsx @@ -14,7 +14,7 @@ import { import { useSelectedIsPublic, useSelectedWeAreModerator, -} from '../../state/selectors/conversations'; +} from '../../state/selectors/selectedConversation'; import { SortedReactionList } from '../../types/Reaction'; import { nativeEmojiData } from '../../util/emoji'; import { Reactions } from '../../util/reactions'; diff --git a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx index 9018b8462..f032d36ca 100644 --- a/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx +++ b/ts/components/leftpane/conversation-list-item/ConversationListItem.tsx @@ -19,7 +19,7 @@ import { useMentionedUs, } from '../../../hooks/useParamSelector'; import { isSearching } from '../../../state/selectors/search'; -import { useSelectedConversationKey } from '../../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation'; import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu'; import { ContextConversationProvider, useConvoIdFromContext } from './ConvoIdContext'; import { ConversationListItemHeaderItem } from './HeaderItem'; diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index a02813798..529ffd619 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -7,10 +7,8 @@ import { declineConversationWithoutConfirm } from '../../../interactions/convers import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils'; import { updateConfirmModal } from '../../../state/ducks/modalDialog'; import { resetOverlayMode } from '../../../state/ducks/section'; -import { - getConversationRequestsIds, - useSelectedConversationKey, -} from '../../../state/selectors/conversations'; +import { getConversationRequestsIds } from '../../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { SpacerLG } from '../../basic/Text'; import { ConversationListItem } from '../conversation-list-item/ConversationListItem'; diff --git a/ts/components/lightbox/LightboxGallery.tsx b/ts/components/lightbox/LightboxGallery.tsx index 2716ee50d..5ff18f6d5 100644 --- a/ts/components/lightbox/LightboxGallery.tsx +++ b/ts/components/lightbox/LightboxGallery.tsx @@ -5,7 +5,7 @@ import useKey from 'react-use/lib/useKey'; import { Lightbox } from './Lightbox'; import { showLightBox } from '../../state/ducks/conversations'; -import { useSelectedConversationKey } from '../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { MIME } from '../../types'; import { AttachmentTypeWithPath } from '../../types/Attachment'; import { saveAttachmentToDisk } from '../../util/attachmentsUtil'; diff --git a/ts/components/menu/ConversationHeaderMenu.tsx b/ts/components/menu/ConversationHeaderMenu.tsx index e14138c07..acc679e37 100644 --- a/ts/components/menu/ConversationHeaderMenu.tsx +++ b/ts/components/menu/ConversationHeaderMenu.tsx @@ -130,7 +130,7 @@ const DisappearingMessageMenuItem = (): JSX.Element | null => { key={item.value} onClick={() => { // TODO Confirm that this works? - void setDisappearingMessagesByConvoId(selectedConvoId, item.value); + void setDisappearingMessagesByConvoId(selectedConvoId, item.name, item.value); }} > {item.name} diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 4f394e7f0..23aacfadd 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -52,7 +52,7 @@ import { getIsMessageSection } from '../../state/selectors/section'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionButtonColor } from '../basic/SessionButton'; import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; -import { useSelectedConversationKey } from '../../state/selectors/conversations'; +import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; /** Menu items standardized */ diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 255b153d2..c5aeb970c 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -9,11 +9,11 @@ import { CONVERSATION } from '../session/constants'; import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { StateType } from '../state/reducer'; +import { getMessageReactsProps } from '../state/selectors/conversations'; import { getMessageExpirationProps, - getMessageReactsProps, isPrivateAndFriend, -} from '../state/selectors/conversations'; +} from '../state/selectors/selectedConversation'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); diff --git a/ts/hooks/useVideoEventListener.ts b/ts/hooks/useVideoEventListener.ts index c62b77a6b..06c984aa3 100644 --- a/ts/hooks/useVideoEventListener.ts +++ b/ts/hooks/useVideoEventListener.ts @@ -10,7 +10,7 @@ import { removeVideoEventsListener, } from '../session/utils/calling/CallManager'; import { getCallIsInFullScreen, getHasOngoingCallWithPubkey } from '../state/selectors/call'; -import { useSelectedConversationKey } from '../state/selectors/conversations'; +import { useSelectedConversationKey } from '../state/selectors/selectedConversation'; export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) { const selectedConversationKey = useSelectedConversationKey(); diff --git a/ts/state/selectors/call.ts b/ts/state/selectors/call.ts index cb4db0357..f6b32e30d 100644 --- a/ts/state/selectors/call.ts +++ b/ts/state/selectors/call.ts @@ -2,7 +2,8 @@ import { createSelector } from '@reduxjs/toolkit'; import { CallStateType, CallStatusEnum } from '../ducks/call'; import { ConversationsStateType, ReduxConversationType } from '../ducks/conversations'; import { StateType } from '../reducer'; -import { getConversations, getSelectedConversationKey } from './conversations'; +import { getConversations } from './conversations'; +import { getSelectedConversationKey } from './selectedConversation'; const getCallState = (state: StateType): CallStateType => state.call; diff --git a/ts/state/selectors/stagedAttachments.ts b/ts/state/selectors/stagedAttachments.ts index ad48d459f..eedbe881c 100644 --- a/ts/state/selectors/stagedAttachments.ts +++ b/ts/state/selectors/stagedAttachments.ts @@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit'; import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox'; import { StagedAttachmentsStateType } from '../ducks/stagedAttachments'; import { StateType } from '../reducer'; -import { getSelectedConversationKey } from './conversations'; +import { getSelectedConversationKey } from './selectedConversation'; export const getStagedAttachmentsState = (state: StateType): StagedAttachmentsStateType => state.stagedAttachments; diff --git a/ts/state/smart/SessionConversation.ts b/ts/state/smart/SessionConversation.ts index 141c374f5..6b40c2549 100644 --- a/ts/state/smart/SessionConversation.ts +++ b/ts/state/smart/SessionConversation.ts @@ -7,12 +7,12 @@ import { getIsSelectedConvoInitialLoadingInProgress, getLightBoxOptions, getSelectedConversation, - getSelectedConversationKey, getSelectedMessageIds, getSortedMessagesOfSelectedConversation, isMessageDetailView, isRightPanelShowing, } from '../selectors/conversations'; +import { getSelectedConversationKey } from '../selectors/selectedConversation'; import { getStagedAttachmentsForCurrentConversation } from '../selectors/stagedAttachments'; import { getTheme } from '../selectors/theme'; import { getOurNumber } from '../selectors/user';