From 6d0607cb2e31b4f9282fa9c4266f65979307ed33 Mon Sep 17 00:00:00 2001 From: MyNameIsBatman Date: Mon, 6 Sep 2021 03:14:19 -0300 Subject: [PATCH 1/2] GroupMembers update --- src/views/groups/views/members/GroupMembersView.scss | 2 -- src/views/groups/views/members/GroupMembersView.tsx | 2 +- src/views/room/widgets/context-menu/ContextMenu.scss | 2 ++ .../widgets/furniture/context-menu/FurnitureContextMenuView.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/groups/views/members/GroupMembersView.scss b/src/views/groups/views/members/GroupMembersView.scss index d405bd57..e8d4215d 100644 --- a/src/views/groups/views/members/GroupMembersView.scss +++ b/src/views/groups/views/members/GroupMembersView.scss @@ -7,8 +7,6 @@ } .members-list { - height: 300px; - .list-member { border: 1px solid #ced4da; diff --git a/src/views/groups/views/members/GroupMembersView.tsx b/src/views/groups/views/members/GroupMembersView.tsx index 53890df8..04b2af27 100644 --- a/src/views/groups/views/members/GroupMembersView.tsx +++ b/src/views/groups/views/members/GroupMembersView.tsx @@ -22,7 +22,7 @@ export const GroupMembersView: FC = props => { if(!groupId) return; - SendMessageHook(new GroupMembersComposer(groupId, pageId, searchQuery, newLevelId !== null ? newLevelId : searchLevelId)); + SendMessageHook(new GroupMembersComposer(groupId, pageId, searchQuery, newLevelId !== undefined ? newLevelId : searchLevelId)); }, [ groupId, searchQuery, searchLevelId ]); const onGroupMembersEvent = useCallback((event: GroupMembersEvent) => diff --git a/src/views/room/widgets/context-menu/ContextMenu.scss b/src/views/room/widgets/context-menu/ContextMenu.scss index 06d98dce..4df6199d 100644 --- a/src/views/room/widgets/context-menu/ContextMenu.scss +++ b/src/views/room/widgets/context-menu/ContextMenu.scss @@ -34,6 +34,8 @@ .menu-header { background-color: $william; color: $white; + width: 117px; + max-width: 117px; height: 25px; max-height: 25px; font-size: 16px; diff --git a/src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx b/src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx index 8b3f879a..20453f54 100644 --- a/src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx +++ b/src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx @@ -183,7 +183,7 @@ export const FurnitureContextMenuView: FC<{}> = props => } { (mode === GROUP_FURNITURE) && groupData && <> - GetGroupInformation(groupData.guildId) }> + GetGroupInformation(groupData.guildId) }> { groupData.guildName } { !isGroupMember && processAction('join_group') }> From 7707b1c7aa477e5a0d3eeb00a36dc8ddef642c82 Mon Sep 17 00:00:00 2001 From: MyNameIsBatman Date: Mon, 6 Sep 2021 03:54:00 -0300 Subject: [PATCH 2/2] Fix User Motto div --- .../widgets/infostand/views/user/InfoStandWidgetUserView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx index c952eff7..c2560891 100644 --- a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx +++ b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx @@ -125,7 +125,7 @@ export const InfoStandWidgetUserView: FC = props =
- { userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
{ motto }
} + { userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
{ motto }
} { userData.type === RoomWidgetUpdateInfostandUserEvent.OWN_USER &&