oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

fix: pr review - create selectors for isDarkTheme and isLight Theme

Browse source
This commit is contained in:
William Grant 2022-10-14 14:58:44 +11:00
parent 6d919c677d
commit de94d2e64a
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ts/components/conversation/SessionLastSeenIndicator.tsx
View file

@ -2,7 +2,7 @@ import React, { useContext, useLayoutEffect } from 'react';
import { useSelector } from 'react-redux';
import styled from 'styled-components';
import { getQuotedMessageToAnimate } from '../../state/selectors/conversations';
import { getTheme } from '../../state/selectors/theme';
import { isDarkTheme } from '../../state/selectors/theme';
import { ScrollToLoadedMessageContext } from './SessionMessagesListContainer';
const LastSeenBar = styled.div`
@ -48,7 +48,7 @@ export const SessionLastSeenIndicator = (props: {
didScroll: boolean;
setDidScroll: (scroll: boolean) => void;
}) => {
const darkMode = useSelector(getTheme).includes('dark');
const darkMode = useSelector(isDarkTheme);
// if this unread-indicator is not unique it's going to cause issues
const quotedMessageToAnimate = useSelector(getQuotedMessageToAnimate);
const scrollToLoadedMessage = useContext(ScrollToLoadedMessageContext);

4
ts/components/conversation/message/reactions/ReactionPopup.tsx
View file

@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
import styled from 'styled-components';
import { Data } from '../../../../data/data';
import { PubKey } from '../../../../session/types/PubKey';
import { getTheme } from '../../../../state/selectors/theme';
import { isDarkTheme } from '../../../../state/selectors/theme';
import { nativeEmojiData } from '../../../../util/emoji';
export type TipPosition = 'center' | 'left' | 'right';
@ -96,7 +96,7 @@ const generateContactsString = async (
};
const Contacts = (contacts: Array<string>, count: number) => {
const darkMode = useSelector(getTheme).includes('dark');
const darkMode = useSelector(isDarkTheme);
if (!Boolean(contacts?.length > 0)) {
return;

4
ts/components/dialog/BanOrUnbanUserDialog.tsx
View file

@ -17,7 +17,7 @@ import {
sogsV3UnbanUser,
} from '../../session/apis/open_group_api/sogsv3/sogsV3BanUnban';
import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
import { getTheme } from '../../state/selectors/theme';
import { isDarkTheme } from '../../state/selectors/theme';
// tslint:disable: use-simple-attributes
@ -67,7 +67,7 @@ export const BanOrUnBanUserDialog = (props: {
const { i18n } = window;
const isBan = banType === 'ban';
const dispatch = useDispatch();
const darkMode = useSelector(getTheme).includes('dark');
const darkMode = useSelector(isDarkTheme);
const convo = getConversationController().get(conversationId);
const inputRef = useRef(null);

4
ts/components/dialog/ModeratorsAddDialog.tsx
View file

@ -10,7 +10,7 @@ import { SessionSpinner } from '../basic/SessionSpinner';
import { SessionWrapperModal } from '../SessionWrapperModal';
import { sogsV3AddAdmin } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods';
import { SessionHeaderSearchInput } from '../SessionHeaderSearchInput';
import { getTheme } from '../../state/selectors/theme';
import { isDarkTheme } from '../../state/selectors/theme';
type Props = {
conversationId: string;
@ -20,7 +20,7 @@ export const AddModeratorsDialog = (props: Props) => {
const { conversationId } = props;
const dispatch = useDispatch();
const darkMode = useSelector(getTheme).includes('dark');
const darkMode = useSelector(isDarkTheme);
const convo = getConversationController().get(conversationId);
const [inputBoxValue, setInputBoxValue] = useState('');

4
ts/state/selectors/theme.ts
View file

@ -2,3 +2,7 @@ import { ThemeStateType } from '../../themes/constants/colors';
import { StateType } from '../reducer';
export const getTheme = (state: StateType): ThemeStateType => state.theme;
export const isDarkTheme = (state: StateType): boolean => state.theme.includes('dark');
export const isLightTheme = (state: StateType): boolean => state.theme.includes('light');