diff --git a/src/app/atoms/context-menu/ContextMenu.jsx b/src/app/atoms/context-menu/ContextMenu.jsx index 69734518..3c914c34 100644 --- a/src/app/atoms/context-menu/ContextMenu.jsx +++ b/src/app/atoms/context-menu/ContextMenu.jsx @@ -67,7 +67,7 @@ function MenuHeader({ children }) { } MenuHeader.propTypes = { - children: PropTypes.string.isRequired, + children: PropTypes.node.isRequired, }; function MenuItem({ diff --git a/src/app/molecules/sidebar-avatar/SidebarAvatar.jsx b/src/app/molecules/sidebar-avatar/SidebarAvatar.jsx index 882c00c9..e67b69fd 100644 --- a/src/app/molecules/sidebar-avatar/SidebarAvatar.jsx +++ b/src/app/molecules/sidebar-avatar/SidebarAvatar.jsx @@ -2,6 +2,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import './SidebarAvatar.scss'; +import { twemojify } from '../../../util/twemojify'; + import Avatar from '../../atoms/avatar/Avatar'; import Text from '../../atoms/text/Text'; import Tooltip from '../../atoms/tooltip/Tooltip'; @@ -16,7 +18,7 @@ const SidebarAvatar = React.forwardRef(({ if (active) activeClass = ' sidebar-avatar--active'; return ( {tooltip}} + content={{twemojify(tooltip)}} placement="right" >