From 0b0a548f8cd450e2f19da2327817426915fd1dbe Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 25 Sep 2023 16:19:08 -0500 Subject: [PATCH] EmojiPickerDropdown: minor refactoring --- src/features/emoji/components/emoji-picker-dropdown.tsx | 6 ++---- .../emoji/containers/emoji-picker-dropdown-container.tsx | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/features/emoji/components/emoji-picker-dropdown.tsx b/src/features/emoji/components/emoji-picker-dropdown.tsx index 3f486502e..3ab977e57 100644 --- a/src/features/emoji/components/emoji-picker-dropdown.tsx +++ b/src/features/emoji/components/emoji-picker-dropdown.tsx @@ -5,7 +5,7 @@ import { createSelector } from 'reselect'; import { useEmoji } from 'soapbox/actions/emojis'; import { changeSetting } from 'soapbox/actions/settings'; -import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; +import { useAppDispatch, useAppSelector, useTheme } from 'soapbox/hooks'; import { RootState } from 'soapbox/store'; import { buildCustomEmojis } from '../../emoji'; @@ -130,10 +130,8 @@ const EmojiPickerDropdown: React.FC = ({ }) => { const intl = useIntl(); const dispatch = useAppDispatch(); - const settings = useSettings(); const title = intl.formatMessage(messages.emoji); - const userTheme = settings.get('themeMode'); - const theme = (userTheme === 'dark' || userTheme === 'light') ? userTheme : 'auto'; + const theme = useTheme(); const customEmojis = useAppSelector((state) => getCustomEmojis(state)); const frequentlyUsedEmojis = useAppSelector((state) => getFrequentlyUsedEmojis(state)); diff --git a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx index 7bc3cd055..af662f7ad 100644 --- a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx +++ b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx @@ -18,7 +18,6 @@ const EmojiPickerDropdownContainer = ( ) => { const intl = useIntl(); const title = intl.formatMessage(messages.emoji); - const [visible, setVisible] = useState(false); const { x, y, strategy, refs, update } = useFloating({