chore: rename useSelectedisNoteToSelf to useSelectedIsNoteToSelf

pull/2873/head
Audric Ackermann 2 years ago
parent b0e38670ab
commit 0b4f9b2c97

@ -36,13 +36,13 @@ import {
useSelectedIsBlocked, useSelectedIsBlocked,
useSelectedIsGroup, useSelectedIsGroup,
useSelectedIsKickedFromGroup, useSelectedIsKickedFromGroup,
useSelectedIsNoteToSelf,
useSelectedIsPrivate, useSelectedIsPrivate,
useSelectedIsPrivateFriend, useSelectedIsPrivateFriend,
useSelectedIsPublic, useSelectedIsPublic,
useSelectedMembersCount, useSelectedMembersCount,
useSelectedNotificationSetting, useSelectedNotificationSetting,
useSelectedSubscriberCount, useSelectedSubscriberCount,
useSelectedisNoteToSelf,
} from '../../state/selectors/selectedConversation'; } from '../../state/selectors/selectedConversation';
import { ExpirationTimerOptions } from '../../util/expiringMessages'; import { ExpirationTimerOptions } from '../../util/expiringMessages';
import { Flex } from '../basic/Flex'; import { Flex } from '../basic/Flex';
@ -65,7 +65,7 @@ const SelectionOverlay = () => {
const selectedConversationKey = useSelectedConversationKey(); const selectedConversationKey = useSelectedConversationKey();
const isPublic = useSelectedIsPublic(); const isPublic = useSelectedIsPublic();
const dispatch = useDispatch(); const dispatch = useDispatch();
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const { i18n } = window; const { i18n } = window;
@ -216,7 +216,7 @@ const CallButton = () => {
const isPrivate = useSelectedIsPrivate(); const isPrivate = useSelectedIsPrivate();
const isBlocked = useSelectedIsBlocked(); const isBlocked = useSelectedIsBlocked();
const isActive = useSelectedIsActive(); const isActive = useSelectedIsActive();
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const selectedConvoKey = useSelectedConversationKey(); const selectedConvoKey = useSelectedConversationKey();
const hasIncomingCall = useSelector(getHasIncomingCall); const hasIncomingCall = useSelector(getHasIncomingCall);
@ -295,7 +295,7 @@ const ConversationHeaderTitle = () => {
const isPublic = useSelectedIsPublic(); const isPublic = useSelectedIsPublic();
const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isKickedFromGroup = useSelectedIsKickedFromGroup();
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const isGroup = useSelectedIsGroup(); const isGroup = useSelectedIsGroup();
let memberCount = useSelectedMembersCount(); let memberCount = useSelectedMembersCount();

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import styled from 'styled-components'; import styled from 'styled-components';
import { useIsIncomingRequest } from '../../hooks/useParamSelector';
import { import {
getSelectedHasMessages, getSelectedHasMessages,
hasSelectedConversationIncomingMessages, hasSelectedConversationIncomingMessages,
@ -9,12 +10,11 @@ import {
getSelectedCanWrite, getSelectedCanWrite,
useSelectedConversationKey, useSelectedConversationKey,
useSelectedHasDisabledBlindedMsgRequests, useSelectedHasDisabledBlindedMsgRequests,
useSelectedIsNoteToSelf,
useSelectedNicknameOrProfileNameOrShortenedPubkey, useSelectedNicknameOrProfileNameOrShortenedPubkey,
useSelectedisNoteToSelf,
} from '../../state/selectors/selectedConversation'; } from '../../state/selectors/selectedConversation';
import { LocalizerKeys } from '../../types/LocalizerKeys'; import { LocalizerKeys } from '../../types/LocalizerKeys';
import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
import { useIsIncomingRequest } from '../../hooks/useParamSelector';
const Container = styled.div` const Container = styled.div`
display: flex; display: flex;
@ -60,7 +60,7 @@ export const NoMessageInConversation = () => {
const hasMessage = useSelector(getSelectedHasMessages); const hasMessage = useSelector(getSelectedHasMessages);
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const canWrite = useSelector(getSelectedCanWrite); const canWrite = useSelector(getSelectedCanWrite);
const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests();
// TODOLATER use this selector accross the whole application (left pane excluded) // TODOLATER use this selector accross the whole application (left pane excluded)

@ -39,10 +39,10 @@ import {
import { import {
useSelectedConversationKey, useSelectedConversationKey,
useSelectedIsBlocked, useSelectedIsBlocked,
useSelectedIsNoteToSelf,
useSelectedIsPublic, useSelectedIsPublic,
useSelectedWeAreAdmin, useSelectedWeAreAdmin,
useSelectedWeAreModerator, useSelectedWeAreModerator,
useSelectedisNoteToSelf,
} from '../../../../state/selectors/selectedConversation'; } from '../../../../state/selectors/selectedConversation';
import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil'; import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil';
import { Reactions } from '../../../../util/reactions'; import { Reactions } from '../../../../util/reactions';
@ -89,7 +89,7 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>`
const DeleteForEveryone = ({ messageId }: { messageId: string }) => { const DeleteForEveryone = ({ messageId }: { messageId: string }) => {
const convoId = useSelectedConversationKey(); const convoId = useSelectedConversationKey();
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId);
if (!convoId || !isDeletableForEveryone) { if (!convoId || !isDeletableForEveryone) {
return null; return null;

@ -233,7 +233,7 @@ export function useSelectedIsActive() {
return useSelector(getIsSelectedActive); return useSelector(getIsSelectedActive);
} }
export function useSelectedisNoteToSelf() { export function useSelectedIsNoteToSelf() {
return useSelector(getIsSelectedNoteToSelf); return useSelector(getIsSelectedNoteToSelf);
} }
@ -297,7 +297,7 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() {
const nickname = useSelectedNickname(); const nickname = useSelectedNickname();
const profileName = useSelectedDisplayNameInProfile(); const profileName = useSelectedDisplayNameInProfile();
const shortenedPubkey = useSelectedShortenedPubkeyOrFallback(); const shortenedPubkey = useSelectedShortenedPubkeyOrFallback();
const isMe = useSelectedisNoteToSelf(); const isMe = useSelectedIsNoteToSelf();
const libGroupName = useLibGroupName(selectedId); const libGroupName = useLibGroupName(selectedId);
if (isMe) { if (isMe) {
return window.i18n('noteToSelf'); return window.i18n('noteToSelf');

Loading…
Cancel
Save