Skip to content

regression: Stop audio player on user logout #41603

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
dionisio-bot merged 3 commits into from
Jul 30, 2026
Merged

regression: Stop audio player on user logout #41603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f404759
stop audio player on logout
yash-rajpal Jul 28, 2026
50fdd37
use useOnLogout hook
yash-rajpal Jul 28, 2026
19a2374
fix review: unmount media player provider on logout
yash-rajpal Jul 30, 2026
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
5 changes: 1 addition & 4 deletions apps/meteor/client/providers/MeteorProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { DeviceProvider } from './DeviceProvider/DeviceProvider';
import EmojiPickerProvider from './EmojiPickerProvider';
import LayoutProvider from './LayoutProvider';
import MediaCallProvider from './MediaCallProvider';
import MediaPlayerProvider from './MediaPlayerProvider';
import OmnichannelProvider from './OmnichannelProvider';
import RouterProvider from './RouterProvider';
import ServerProvider from './ServerProvider';
Expand Down Expand Up @@ -49,9 +48,7 @@ const MeteorProvider = ({ children }: MeteorProviderProps) => (
<ActionManagerProvider>
<VideoConfProvider>
<MediaCallProvider>
<OmnichannelProvider>
<MediaPlayerProvider>{children}</MediaPlayerProvider>
</OmnichannelProvider>
<OmnichannelProvider>{children}</OmnichannelProvider>
</MediaCallProvider>
</VideoConfProvider>
</ActionManagerProvider>
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/client/views/root/MainLayout/LoggedInArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useUser } from '@rocket.chat/ui-contexts';
import type { ReactNode } from 'react';

import MediaPlayerProvider from '../../../providers/MediaPlayerProvider';
import { useCustomEmoji } from '../hooks/loggedIn/useCustomEmoji';
import { useE2EEncryption } from '../hooks/loggedIn/useE2EEncryption';
import { useFingerprintChange } from '../hooks/loggedIn/useFingerprintChange';
Expand Down Expand Up @@ -43,7 +44,7 @@ const LoggedInArea = ({ children }: LoggedInAreaProps) => {
useLogoutCleanup();
useE2EEncryption();

return children;
return <MediaPlayerProvider>{children}</MediaPlayerProvider>;
};

export default LoggedInArea;
Loading