diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index 228c2bffe7f4e143b2f79c0eec631f1021a6c516..12c432ff29480ec1b7523778687d519544b4a1fd 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -501,7 +501,9 @@ export default function MessageBox({ channel }: Props) { {/*<IconButton onClick={emojiPicker}> <HappyAlt size={20} /> </IconButton>*/} - <IconButton className="mobile" onClick={send}> + <IconButton + className="mobile" onClick={send} + onMouseDown={e => e.preventDefault()}> <Send size={20} /> </IconButton> </Action> diff --git a/src/components/navigation/left/HomeSidebar.tsx b/src/components/navigation/left/HomeSidebar.tsx index c4ef1e1de7c01b67b23f89e6ed0661f269c64669..932bc6acdd7f9e80838be9bbd3fb07bbe031bc23 100644 --- a/src/components/navigation/left/HomeSidebar.tsx +++ b/src/components/navigation/left/HomeSidebar.tsx @@ -82,16 +82,16 @@ function HomeSidebar(props: Props) { <GenericSidebarBase padding> <ConnectionStatus /> <GenericSidebarList> + <ConditionalLink active={pathname === "/"} to="/"> + <ButtonItem active={pathname === "/"}> + <Home size={20} /> + <span> + <Text id="app.navigation.tabs.home" /> + </span> + </ButtonItem> + </ConditionalLink> {!isTouchscreenDevice && ( <> - <ConditionalLink active={pathname === "/"} to="/"> - <ButtonItem active={pathname === "/"}> - <Home size={20} /> - <span> - <Text id="app.navigation.tabs.home" /> - </span> - </ButtonItem> - </ConditionalLink> <ConditionalLink active={pathname === "/friends"} to="/friends"> diff --git a/src/components/navigation/left/ServerListSidebar.tsx b/src/components/navigation/left/ServerListSidebar.tsx index 2ca6c076f8a4fe94789c0c9faeaf8831bafe9457..f8dd70e318a46b42ef039c8a5c732a0e290323c9 100644 --- a/src/components/navigation/left/ServerListSidebar.tsx +++ b/src/components/navigation/left/ServerListSidebar.tsx @@ -28,6 +28,7 @@ import IconButton from "../../ui/IconButton"; import LineDivider from "../../ui/LineDivider"; import { mapChannelWithUnread } from "./common"; +import logoSVG from '../../../assets/logo.svg'; import { Children } from "../../../types/Preact"; import UserHover from "../../common/user/UserHover"; @@ -237,17 +238,22 @@ export function ServerListSidebar({ unreads, lastOpened }: Props) { active={homeActive} to={lastOpened.home ? `/channel/${lastOpened.home}` : "/"}> <ServerEntry home active={homeActive}> - <div - onContextMenu={attachContextMenu("Status")} - onClick={() => - homeActive && openContextMenu("Status") - }> - <UserHover user={self}> - <Icon size={42} unread={homeUnread}> - <UserIcon target={self} size={32} status /> - </Icon> - </UserHover> - </div> + { isTouchscreenDevice ? + <Icon size={42} unread={homeUnread}> + <img style={{ width: 32, height: 32 }} src={logoSVG} /> + </Icon> : + <div + onContextMenu={attachContextMenu("Status")} + onClick={() => + homeActive && openContextMenu("Status") + }> + <UserHover user={self}> + <Icon size={42} unread={homeUnread}> + <UserIcon target={self} size={32} status /> + </Icon> + </UserHover> + </div> + } <span /> </ServerEntry> </ConditionalLink>