Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Close incoming Element call toast when viewing the call lobby (#9375)

Browse Source
This commit is contained in:
Šimon Brandner 2022-10-07 19:31:22 +02:00 committed by GitHub
parent 6b1ee13c28
commit 4ff9681408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/toasts/IncomingCallToast.tsx
View File

@ -34,6 +34,8 @@ import {
import { useCall } from "../hooks/useCall";
import { useRoomState } from "../hooks/useRoomState";
import { ButtonEvent } from "../components/views/elements/AccessibleButton";
import { useDispatcher } from "../hooks/useDispatcher";
import { ActionPayload } from "../dispatcher/payloads";
export const getIncomingCallToastKey = (stateKey: string) => `call_${stateKey}`;
@ -60,6 +62,16 @@ export function IncomingCallToast({ callEvent }: Props) {
}
}, [latestEvent, dismissToast]);
useDispatcher(defaultDispatcher, useCallback((payload: ActionPayload) => {
if (
payload.action === Action.ViewRoom
&& payload.room_id === roomId
&& payload.view_call
) {
dismissToast();
}
}, [roomId, dismissToast]));
const onJoinClick = useCallback((e: ButtonEvent): void => {
e.stopPropagation();

14
test/toasts/IncomingCallToast-test.tsx
View File

@ -155,4 +155,18 @@ describe("IncomingCallEvent", () => {
defaultDispatcher.unregister(dispatcherRef);
});
it("closes toast when the call lobby is viewed", async () => {
renderToast();
defaultDispatcher.dispatch({
action: Action.ViewRoom,
room_id: room.roomId,
view_call: true,
});
await waitFor(() => expect(toastStore.dismissToast).toHaveBeenCalledWith(
getIncomingCallToastKey(call.event.getStateKey()!),
));
});
});