fix: resolved missing selected conversation hooks imports

pull/2861/head
William Grant 2 years ago
parent 41af1e7865
commit 5285d4240a

@ -16,8 +16,8 @@ import {
getOldBottomMessageId, getOldBottomMessageId,
getOldTopMessageId, getOldTopMessageId,
getSortedMessagesTypesOfSelectedConversation, getSortedMessagesTypesOfSelectedConversation,
useSelectedConversationKey,
} from '../../state/selectors/conversations'; } from '../../state/selectors/conversations';
import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
import { MessageDateBreak } from './message/message-item/DateBreak'; import { MessageDateBreak } from './message/message-item/DateBreak';
import { GroupInvitation } from './message/message-item/GroupInvitation'; import { GroupInvitation } from './message/message-item/GroupInvitation';
import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage'; import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage';

@ -19,9 +19,9 @@ import { StateType } from '../../state/reducer';
import { import {
getQuotedMessageToAnimate, getQuotedMessageToAnimate,
getSelectedConversation, getSelectedConversation,
getSelectedConversationKey,
getSortedMessagesOfSelectedConversation, getSortedMessagesOfSelectedConversation,
} from '../../state/selectors/conversations'; } from '../../state/selectors/conversations';
import { getSelectedConversationKey } from '../../state/selectors/selectedConversation';
import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { ConversationMessageRequestButtons } from './MessageRequestButtons';
import { SessionMessagesList } from './SessionMessagesList'; import { SessionMessagesList } from './SessionMessagesList';
import { TypingBubble } from './TypingBubble'; import { TypingBubble } from './TypingBubble';

@ -6,7 +6,7 @@ import {
removeAllStagedAttachmentsInConversation, removeAllStagedAttachmentsInConversation,
removeStagedAttachmentInConversation, removeStagedAttachmentInConversation,
} from '../../state/ducks/stagedAttachments'; } from '../../state/ducks/stagedAttachments';
import { useSelectedConversationKey } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
import { import {
AttachmentType, AttachmentType,
areAllAttachmentsVisual, areAllAttachmentsVisual,

@ -3,13 +3,15 @@ import { useSelector } from 'react-redux';
import styled from 'styled-components'; import styled from 'styled-components';
import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { useIsIncomingRequest } from '../../hooks/useParamSelector';
import { import {
getSelectedCanWrite,
getSelectedHasMessages, getSelectedHasMessages,
hasSelectedConversationIncomingMessages, hasSelectedConversationIncomingMessages,
} from '../../state/selectors/conversations';
import {
getSelectedCanWrite,
useSelectedConversationKey, useSelectedConversationKey,
useSelectedIsNoteToSelf, useSelectedIsNoteToSelf,
useSelectedNicknameOrProfileNameOrShortenedPubkey, useSelectedNicknameOrProfileNameOrShortenedPubkey,
} from '../../state/selectors/conversations'; } from '../../state/selectors/selectedConversation';
import { LocalizerKeys } from '../../types/LocalizerKeys'; import { LocalizerKeys } from '../../types/LocalizerKeys';
import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';

@ -14,7 +14,7 @@ import {
import { import {
useSelectedIsPublic, useSelectedIsPublic,
useSelectedWeAreModerator, useSelectedWeAreModerator,
} from '../../state/selectors/conversations'; } from '../../state/selectors/selectedConversation';
import { SortedReactionList } from '../../types/Reaction'; import { SortedReactionList } from '../../types/Reaction';
import { nativeEmojiData } from '../../util/emoji'; import { nativeEmojiData } from '../../util/emoji';
import { Reactions } from '../../util/reactions'; import { Reactions } from '../../util/reactions';

@ -19,7 +19,7 @@ import {
useMentionedUs, useMentionedUs,
} from '../../../hooks/useParamSelector'; } from '../../../hooks/useParamSelector';
import { isSearching } from '../../../state/selectors/search'; import { isSearching } from '../../../state/selectors/search';
import { useSelectedConversationKey } from '../../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu'; import { MemoConversationListItemContextMenu } from '../../menu/ConversationListItemContextMenu';
import { ContextConversationProvider, useConvoIdFromContext } from './ConvoIdContext'; import { ContextConversationProvider, useConvoIdFromContext } from './ConvoIdContext';
import { ConversationListItemHeaderItem } from './HeaderItem'; import { ConversationListItemHeaderItem } from './HeaderItem';

@ -7,10 +7,8 @@ import { declineConversationWithoutConfirm } from '../../../interactions/convers
import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils'; import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils';
import { updateConfirmModal } from '../../../state/ducks/modalDialog'; import { updateConfirmModal } from '../../../state/ducks/modalDialog';
import { resetOverlayMode } from '../../../state/ducks/section'; import { resetOverlayMode } from '../../../state/ducks/section';
import { import { getConversationRequestsIds } from '../../../state/selectors/conversations';
getConversationRequestsIds, import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation';
useSelectedConversationKey,
} from '../../../state/selectors/conversations';
import { SessionButton, SessionButtonColor } from '../../basic/SessionButton'; import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
import { SpacerLG } from '../../basic/Text'; import { SpacerLG } from '../../basic/Text';
import { ConversationListItem } from '../conversation-list-item/ConversationListItem'; import { ConversationListItem } from '../conversation-list-item/ConversationListItem';

@ -5,7 +5,7 @@ import useKey from 'react-use/lib/useKey';
import { Lightbox } from './Lightbox'; import { Lightbox } from './Lightbox';
import { showLightBox } from '../../state/ducks/conversations'; import { showLightBox } from '../../state/ducks/conversations';
import { useSelectedConversationKey } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
import { MIME } from '../../types'; import { MIME } from '../../types';
import { AttachmentTypeWithPath } from '../../types/Attachment'; import { AttachmentTypeWithPath } from '../../types/Attachment';
import { saveAttachmentToDisk } from '../../util/attachmentsUtil'; import { saveAttachmentToDisk } from '../../util/attachmentsUtil';

@ -130,7 +130,7 @@ const DisappearingMessageMenuItem = (): JSX.Element | null => {
key={item.value} key={item.value}
onClick={() => { onClick={() => {
// TODO Confirm that this works? // TODO Confirm that this works?
void setDisappearingMessagesByConvoId(selectedConvoId, item.value); void setDisappearingMessagesByConvoId(selectedConvoId, item.name, item.value);
}} }}
> >
{item.name} {item.name}

@ -52,7 +52,7 @@ import { getIsMessageSection } from '../../state/selectors/section';
import { LocalizerKeys } from '../../types/LocalizerKeys'; import { LocalizerKeys } from '../../types/LocalizerKeys';
import { SessionButtonColor } from '../basic/SessionButton'; import { SessionButtonColor } from '../basic/SessionButton';
import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext';
import { useSelectedConversationKey } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation';
/** Menu items standardized */ /** Menu items standardized */

@ -9,11 +9,11 @@ import { CONVERSATION } from '../session/constants';
import { PubKey } from '../session/types'; import { PubKey } from '../session/types';
import { UserUtils } from '../session/utils'; import { UserUtils } from '../session/utils';
import { StateType } from '../state/reducer'; import { StateType } from '../state/reducer';
import { getMessageReactsProps } from '../state/selectors/conversations';
import { import {
getMessageExpirationProps, getMessageExpirationProps,
getMessageReactsProps,
isPrivateAndFriend, isPrivateAndFriend,
} from '../state/selectors/conversations'; } from '../state/selectors/selectedConversation';
export function useAvatarPath(convoId: string | undefined) { export function useAvatarPath(convoId: string | undefined) {
const convoProps = useConversationPropsById(convoId); const convoProps = useConversationPropsById(convoId);

@ -10,7 +10,7 @@ import {
removeVideoEventsListener, removeVideoEventsListener,
} from '../session/utils/calling/CallManager'; } from '../session/utils/calling/CallManager';
import { getCallIsInFullScreen, getHasOngoingCallWithPubkey } from '../state/selectors/call'; 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) { export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) {
const selectedConversationKey = useSelectedConversationKey(); const selectedConversationKey = useSelectedConversationKey();

@ -2,7 +2,8 @@ import { createSelector } from '@reduxjs/toolkit';
import { CallStateType, CallStatusEnum } from '../ducks/call'; import { CallStateType, CallStatusEnum } from '../ducks/call';
import { ConversationsStateType, ReduxConversationType } from '../ducks/conversations'; import { ConversationsStateType, ReduxConversationType } from '../ducks/conversations';
import { StateType } from '../reducer'; import { StateType } from '../reducer';
import { getConversations, getSelectedConversationKey } from './conversations'; import { getConversations } from './conversations';
import { getSelectedConversationKey } from './selectedConversation';
const getCallState = (state: StateType): CallStateType => state.call; const getCallState = (state: StateType): CallStateType => state.call;

@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox'; import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox';
import { StagedAttachmentsStateType } from '../ducks/stagedAttachments'; import { StagedAttachmentsStateType } from '../ducks/stagedAttachments';
import { StateType } from '../reducer'; import { StateType } from '../reducer';
import { getSelectedConversationKey } from './conversations'; import { getSelectedConversationKey } from './selectedConversation';
export const getStagedAttachmentsState = (state: StateType): StagedAttachmentsStateType => export const getStagedAttachmentsState = (state: StateType): StagedAttachmentsStateType =>
state.stagedAttachments; state.stagedAttachments;

@ -7,12 +7,12 @@ import {
getIsSelectedConvoInitialLoadingInProgress, getIsSelectedConvoInitialLoadingInProgress,
getLightBoxOptions, getLightBoxOptions,
getSelectedConversation, getSelectedConversation,
getSelectedConversationKey,
getSelectedMessageIds, getSelectedMessageIds,
getSortedMessagesOfSelectedConversation, getSortedMessagesOfSelectedConversation,
isMessageDetailView, isMessageDetailView,
isRightPanelShowing, isRightPanelShowing,
} from '../selectors/conversations'; } from '../selectors/conversations';
import { getSelectedConversationKey } from '../selectors/selectedConversation';
import { getStagedAttachmentsForCurrentConversation } from '../selectors/stagedAttachments'; import { getStagedAttachmentsForCurrentConversation } from '../selectors/stagedAttachments';
import { getTheme } from '../selectors/theme'; import { getTheme } from '../selectors/theme';
import { getOurNumber } from '../selectors/user'; import { getOurNumber } from '../selectors/user';

Loading…
Cancel
Save