From 81f82f275dbbf86879ec706540ed6f65d1768ad8 Mon Sep 17 00:00:00 2001 From: Zishan Ahmad Date: Sun, 21 Jan 2024 21:30:37 +0530 Subject: [PATCH 1/2] fixed channel password unset issue --- .../views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx index 2e41ec2904a8..09268dc6a43a 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx @@ -106,7 +106,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => await saveAction({ rid: room._id, ...data, - ...(data.joinCode && { joinCode: joinCodeRequired ? data.joinCode : '' }), + ...((data.joinCode || 'joinCodeRequired' in data) && { joinCode: joinCodeRequired ? data.joinCode : '' }), ...((data.systemMessages || !hideSysMes) && { systemMessages: hideSysMes && data.systemMessages, }), From fab5cfe046707cdf31cb7f06b11ff3f1d090c502 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Mon, 22 Jan 2024 13:53:14 -0300 Subject: [PATCH 2/2] chore: changeset --- .changeset/forty-dragons-juggle.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/forty-dragons-juggle.md diff --git a/.changeset/forty-dragons-juggle.md b/.changeset/forty-dragons-juggle.md new file mode 100644 index 000000000000..8abdfc63a7eb --- /dev/null +++ b/.changeset/forty-dragons-juggle.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +Fixed an issue not allowing users to remove the password to join the room on room edit