Skip to content
Snippets Groups Projects
Unverified Commit 76ca88ca authored by Douglas Fabris's avatar Douglas Fabris Committed by GitHub
Browse files

Regression: UserInfo/RoomInfo Menu (#26252)

parent ea266e3e
No related merge requests found
......@@ -301,7 +301,8 @@ export const UserInfoActions = ({ username, _id, isActive, isAdmin, onChange, on
mi='x4'
placement='bottom-start'
small={false}
ghost={false}
secondary
maxHeight='initial'
flexShrink={0}
key='menu'
renderItem={({ label: { label, icon }, ...props }) => <Option label={label} title={label} icon={icon} {...props} />}
......
......@@ -96,7 +96,8 @@ const RoomInfo = ({
flexShrink={0}
mi='x2'
key='menu'
ghost={false}
maxHeight='initial'
secondary
renderItem={({ label: { label, icon }, ...props }) => <Option {...props} label={label} icon={icon} />}
options={menuOptions}
/>
......
......@@ -12,6 +12,7 @@ const UserActions = ({ username, _id, rid, reload }) => {
return (
<Menu
flexShrink={0}
maxHeight='initial'
key='menu'
tiny
renderItem={({ label: { label, icon }, ...props }) => <Option {...props} label={label} icon={icon} />}
......
......@@ -64,9 +64,11 @@ function UserInfo({
<InfoPanel.Section>
<InfoPanel.Title icon={status} title={getUserDisplayName(name, username, !!showRealNames)} />
<InfoPanel.Text>
<MarkdownText content={customStatus} parseEmoji={true} variant='inline' />
</InfoPanel.Text>
{customStatus && (
<InfoPanel.Text>
<MarkdownText content={customStatus} parseEmoji={true} variant='inline' />
</InfoPanel.Text>
)}
</InfoPanel.Section>
<InfoPanel.Section>
......
......@@ -17,8 +17,9 @@ const UserActions = ({ user, rid, backToList }) => {
<Menu
key='menu'
mi='x4'
ghost={false}
secondary
small={false}
maxHeight='initial'
renderItem={({ label: { label, icon }, ...props }) => <Option {...props} label={label} icon={icon} />}
flexShrink={0}
options={menuOptions}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment