diff --git a/src/components/animated-number.tsx b/src/components/animated-number.tsx index 86a2603da..ea5a82411 100644 --- a/src/components/animated-number.tsx +++ b/src/components/animated-number.tsx @@ -20,7 +20,7 @@ interface IAnimatedNumber { } const AnimatedNumber: React.FC = ({ value, obfuscate }) => { - const reduceMotion = useSettings().get('reduceMotion'); + const { reduceMotion } = useSettings(); const [direction, setDirection] = useState(1); const [displayedValue, setDisplayedValue] = useState(value); diff --git a/src/components/announcements/emoji.tsx b/src/components/announcements/emoji.tsx index b3dd0fcc5..1f6f8ed18 100644 --- a/src/components/announcements/emoji.tsx +++ b/src/components/announcements/emoji.tsx @@ -13,7 +13,7 @@ interface IEmoji { } const Emoji: React.FC = ({ emoji, emojiMap, hovered }) => { - const autoPlayGif = useSettings().get('autoPlayGif'); + const { autoPlayGif } = useSettings(); // @ts-ignore if (unicodeMapping[emoji]) { diff --git a/src/components/announcements/reactions-bar.tsx b/src/components/announcements/reactions-bar.tsx index 97324b89e..4ae41f030 100644 --- a/src/components/announcements/reactions-bar.tsx +++ b/src/components/announcements/reactions-bar.tsx @@ -20,7 +20,7 @@ interface IReactionsBar { } const ReactionsBar: React.FC = ({ announcementId, reactions, addReaction, removeReaction, emojiMap }) => { - const reduceMotion = useSettings().get('reduceMotion'); + const { reduceMotion } = useSettings(); const handleEmojiPick = (data: Emoji) => { addReaction(announcementId, (data as NativeEmoji).native.replace(/:/g, '')); diff --git a/src/components/helmet.tsx b/src/components/helmet.tsx index ee2ce3317..131e4c470 100644 --- a/src/components/helmet.tsx +++ b/src/components/helmet.tsx @@ -23,7 +23,7 @@ const Helmet: React.FC = ({ children }) => { const instance = useInstance(); const { unreadChatsCount } = useStatContext(); const unreadCount = useAppSelector((state) => getNotifTotals(state) + unreadChatsCount); - const demetricator = useSettings().get('demetricator'); + const { demetricator } = useSettings(); const hasUnreadNotifications = React.useMemo(() => !(unreadCount < 1 || demetricator), [unreadCount, demetricator]); diff --git a/src/components/media-gallery.tsx b/src/components/media-gallery.tsx index 368afc6e4..eb4f1988a 100644 --- a/src/components/media-gallery.tsx +++ b/src/components/media-gallery.tsx @@ -72,8 +72,7 @@ const Item: React.FC = ({ last, total, }) => { - const settings = useSettings(); - const autoPlayGif = settings.get('autoPlayGif') === true; + const { autoPlayGif } = useSettings(); const { mediaPreview } = useSoapboxConfig(); const handleMouseEnter: React.MouseEventHandler = ({ currentTarget: video }) => { diff --git a/src/components/navlinks.tsx b/src/components/navlinks.tsx index 4670f8015..448bfff2b 100644 --- a/src/components/navlinks.tsx +++ b/src/components/navlinks.tsx @@ -9,9 +9,8 @@ interface INavlinks { } const Navlinks: React.FC = ({ type }) => { - const settings = useSettings(); + const { locale } = useSettings(); const { copyright, navlinks } = useSoapboxConfig(); - const locale = settings.get('locale') as string; return (