Skip to content

Commit 2d49fd6

Browse files
committed
fix: "Reply in direct message" should always appear if you have create-d permission
When PR RocketChat#36217 refactored useReplyInDMAction, it introduced a regression. We previously checked for `!canCreateDM` (with a bang!) but that PR accidentally negated it to `canCreateDM`. Additionally, the conditional that includes `canCreateDM` was duplicated. DRY it out.
1 parent d7c97ed commit 2d49fd6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

apps/meteor/client/components/message/toolbar/useReplyInDMAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const useReplyInDMAction = (
2727
[message.u._id, user],
2828
);
2929

30-
const shouldFindRoom = useMemo(() => !!user && canCreateDM && user._id !== message.u._id, [canCreateDM, message.u._id, user]);
30+
const shouldFindRoom = useMemo(() => !!user && !canCreateDM && user._id !== message.u._id, [canCreateDM, message.u._id, user]);
3131
const dmRoom = Rooms.use(useShallow((state) => (shouldFindRoom ? state.find(roomPredicate) : undefined)));
3232

3333
const subsPredicate = useCallback(
@@ -40,7 +40,7 @@ export const useReplyInDMAction = (
4040
if (!subscription || room.t === 'd' || room.t === 'l' || isLayoutEmbedded) {
4141
return false;
4242
}
43-
if (!!user && user._id !== message.u._id && canCreateDM) {
43+
if (shouldFindRoom) {
4444
if (!dmRoom || !dmSubs) {
4545
return false;
4646
}

0 commit comments

Comments
 (0)