diff --git a/src/components/common/messaging/Message.tsx b/src/components/common/messaging/Message.tsx index 8c71ae63efb9d179085ccc53e04fa696d12fa078..d504f9667c268b46fdc491861035779d790ab6bb 100644 --- a/src/components/common/messaging/Message.tsx +++ b/src/components/common/messaging/Message.tsx @@ -38,7 +38,7 @@ function Message({ attachContext, message, contrast, content: replacement, head: <> { message.replies?.map((message_id, index) => <MessageReply index={index} id={message_id} channel={message.channel} />) } <MessageBase id={message._id} - head={head && !message.replies} + head={head && !(message.replies && message.replies.length > 0)} contrast={contrast} sending={typeof queued !== 'undefined'} mention={message.mentions?.includes(client.user!._id)} diff --git a/src/components/navigation/BottomNavigation.tsx b/src/components/navigation/BottomNavigation.tsx index 6a9ffd40f688502eb0b0ff7562a8708b1a29bba9..4afa8f9b7aadc41ed40db4570d7e12eb2f51f5e3 100644 --- a/src/components/navigation/BottomNavigation.tsx +++ b/src/components/navigation/BottomNavigation.tsx @@ -1,9 +1,9 @@ -import styled, { css } from "styled-components"; -import { Link } from "react-router-dom"; import IconButton from "../ui/IconButton"; import UserIcon from "../common/user/UserIcon"; +import styled, { css } from "styled-components"; import { useSelf } from "../../context/revoltjs/hooks"; import { useHistory, useLocation } from "react-router"; +import ConditionalLink from "../../lib/ConditionalLink"; import { MessageCircle, Users } from "@styled-icons/feather"; const NavigationBase = styled.div` @@ -54,18 +54,18 @@ export default function BottomNavigation() { </IconButton> </Button> <Button active={friendsActive}> - <Link to="/friends"> + <ConditionalLink active={friendsActive} to="/friends"> <IconButton> <Users size={26} /> </IconButton> - </Link> + </ConditionalLink> </Button> <Button active={settingsActive}> - <Link to="/settings"> + <ConditionalLink active={settingsActive} to="/settings"> <IconButton> <UserIcon target={user} size={26} status={true} /> </IconButton> - </Link> + </ConditionalLink> </Button> </NavigationBase> ); diff --git a/src/components/ui/Button.tsx b/src/components/ui/Button.tsx index 2f3231430695e22e461939aa23a2dec893bac6a1..9c4b3a2bd6b240808e25c17ba6a35ccf8e3a8276 100644 --- a/src/components/ui/Button.tsx +++ b/src/components/ui/Button.tsx @@ -10,6 +10,7 @@ export default styled.button<Props>` padding: 8px; font-size: 16px; text-align: center; + font-family: 'Open Sans', sans-serif; transition: 0.2s ease opacity; transition: 0.2s ease background-color; diff --git a/src/redux/reducers/settings.ts b/src/redux/reducers/settings.ts index bcab75c2450ad7c52fa2dae2a3659d9a0fc1a968..a37d7ef14ceb95cb36e111c79745eea3e623c4f1 100644 --- a/src/redux/reducers/settings.ts +++ b/src/redux/reducers/settings.ts @@ -2,6 +2,7 @@ import { filter } from "."; import { SyncUpdateAction } from "./sync"; import { Sounds } from "../../assets/sounds/Audio"; import { Theme, ThemeOptions } from "../../context/Theme"; +import { setEmojiPack } from "../../components/common/Emoji"; export type SoundOptions = { [key in Sounds]?: boolean @@ -57,7 +58,7 @@ export function settings( state = {} as Settings, action: SettingsAction ): Settings { - // setEmojiPack(state.appearance?.emojiPack ?? 'mutant'); + setEmojiPack(state.appearance?.emojiPack ?? 'mutant'); switch (action.type) { case "SETTINGS_SET_THEME":