Skip to content

[FIX] Omnichannel rooms breaking after return to queue or forward #20089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renatobecker merged 2 commits into from
Jan 8, 2021
Merged

[FIX] Omnichannel rooms breaking after return to queue or forward #20089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e30e7
Fix livechat room breaking after return
gabriellsh Jan 6, 2021
37b5b88
Merge branch 'develop' into fix/livechat
renatobecker Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/components/RoomForeword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const RoomForeword = ({ _id: rid }) => {
const user = useUser();
const room = useReactiveValue(useCallback(() => Rooms.findOne({ _id: rid }), [rid]));

if (room.t !== 'd') {
if (room?.t !== 'd') {
return t('Start_of_conversation');
}

Expand Down
15 changes: 10 additions & 5 deletions client/views/room/providers/RoomProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,16 @@ const RoomProvider = ({ rid, children }: Props): JSX.Element => {
const _room = useUserRoom(rid, fields) as unknown as IRoom;

const room = uid ? subscription || _room : _room;
room._id = rid;
const context = useMemo(() => ({
rid,
room: { ...room, name: roomTypes.getRoomName(room.t, room) },
}), [room, rid]);
const context = useMemo(() => {
if (!room) {
return null;
}
room._id = rid;
return {
rid,
room: { ...room, name: roomTypes.getRoomName(room.t, room) },
};
}, [room, rid]);

if (!room) {
return <></>;
Expand Down
4 changes: 2 additions & 2 deletions client/views/room/providers/ToolboxProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { ReactNode, useContext, useMemo, useState, useCallback, useLayoutEffect } from 'react';
import { useDebouncedState, useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useDebouncedState, useMutableCallback, useSafely } from '@rocket.chat/fuselage-hooks';
import { Handler } from '@rocket.chat/emitter';

import { ToolboxContext } from '../lib/Toolbox/ToolboxContext';
Expand Down Expand Up @@ -56,7 +56,7 @@ export const ToolboxProvider = ({ children, room }: { children: ReactNode; room:
const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead');
const uid = useUserId();
const [activeTabBar, setActiveTabBar] = useState<[ToolboxActionConfig|undefined, string?]>([undefined]);
const [list, setList] = useDebouncedState<Store<ToolboxAction>>(new Map(), 5);
const [list, setList] = useSafely(useDebouncedState<Store<ToolboxAction>>(new Map(), 5));
const handleChange = useMutableCallback((fn) => { fn(list); setList((list) => new Map(list)); });
const { listen, actions } = useToolboxActions(room);

Expand Down