From 0b4f9b2c978bcbc8fbcc8585f9c1786a4089c39f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Oct 2023 10:19:23 +1100 Subject: [PATCH] chore: rename useSelectedisNoteToSelf to useSelectedIsNoteToSelf --- ts/components/conversation/ConversationHeader.tsx | 8 ++++---- ts/components/conversation/SubtleNotification.tsx | 6 +++--- .../message/message-content/MessageContextMenu.tsx | 4 ++-- ts/state/selectors/selectedConversation.ts | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 1d81aec0c..b81aef425 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -36,13 +36,13 @@ import { useSelectedIsBlocked, useSelectedIsGroup, useSelectedIsKickedFromGroup, + useSelectedIsNoteToSelf, useSelectedIsPrivate, useSelectedIsPrivateFriend, useSelectedIsPublic, useSelectedMembersCount, useSelectedNotificationSetting, useSelectedSubscriberCount, - useSelectedisNoteToSelf, } from '../../state/selectors/selectedConversation'; import { ExpirationTimerOptions } from '../../util/expiringMessages'; import { Flex } from '../basic/Flex'; @@ -65,7 +65,7 @@ const SelectionOverlay = () => { const selectedConversationKey = useSelectedConversationKey(); const isPublic = useSelectedIsPublic(); const dispatch = useDispatch(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const { i18n } = window; @@ -216,7 +216,7 @@ const CallButton = () => { const isPrivate = useSelectedIsPrivate(); const isBlocked = useSelectedIsBlocked(); const isActive = useSelectedIsActive(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const selectedConvoKey = useSelectedConversationKey(); const hasIncomingCall = useSelector(getHasIncomingCall); @@ -295,7 +295,7 @@ const ConversationHeaderTitle = () => { const isPublic = useSelectedIsPublic(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const isGroup = useSelectedIsGroup(); let memberCount = useSelectedMembersCount(); diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 598deb784..efce31456 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; +import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { getSelectedHasMessages, hasSelectedConversationIncomingMessages, @@ -9,12 +10,11 @@ import { getSelectedCanWrite, useSelectedConversationKey, useSelectedHasDisabledBlindedMsgRequests, + useSelectedIsNoteToSelf, useSelectedNicknameOrProfileNameOrShortenedPubkey, - useSelectedisNoteToSelf, } from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; -import { useIsIncomingRequest } from '../../hooks/useParamSelector'; const Container = styled.div` display: flex; @@ -60,7 +60,7 @@ export const NoMessageInConversation = () => { const hasMessage = useSelector(getSelectedHasMessages); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const canWrite = useSelector(getSelectedCanWrite); const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); // TODOLATER use this selector accross the whole application (left pane excluded) diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index a8235576f..150dd5891 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -39,10 +39,10 @@ import { import { useSelectedConversationKey, useSelectedIsBlocked, + useSelectedIsNoteToSelf, useSelectedIsPublic, useSelectedWeAreAdmin, useSelectedWeAreModerator, - useSelectedisNoteToSelf, } from '../../../../state/selectors/selectedConversation'; import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil'; import { Reactions } from '../../../../util/reactions'; @@ -89,7 +89,7 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>` const DeleteForEveryone = ({ messageId }: { messageId: string }) => { const convoId = useSelectedConversationKey(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); if (!convoId || !isDeletableForEveryone) { return null; diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index f7cf07e00..10d9dc898 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -233,7 +233,7 @@ export function useSelectedIsActive() { return useSelector(getIsSelectedActive); } -export function useSelectedisNoteToSelf() { +export function useSelectedIsNoteToSelf() { return useSelector(getIsSelectedNoteToSelf); } @@ -297,7 +297,7 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() { const nickname = useSelectedNickname(); const profileName = useSelectedDisplayNameInProfile(); const shortenedPubkey = useSelectedShortenedPubkeyOrFallback(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const libGroupName = useLibGroupName(selectedId); if (isMe) { return window.i18n('noteToSelf');