Skip to content

fix: Prevent app remount when VoIP license/permission changes #41200

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 4 commits into from
Jul 11, 2026
Merged

fix: Prevent app remount when VoIP license/permission changes #41200

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ece2fd2
fix: prevent app remount when VoIP availability changes
dougfabris Jul 6, 2026
ba05818
chore: changeset
dougfabris Jul 6, 2026
786deaa
fix: add explicit enable property instead of relying on userId
gabriellsh Jul 8, 2026
62b3088
Merge branch 'develop' into fix/media-callprovider
dougfabris Jul 9, 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
6 changes: 6 additions & 0 deletions .changeset/voip-provider-app-remount.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/ui-voip': patch
'@rocket.chat/meteor': patch
---

Fixes an issue where the whole app remounts when VoIP availability changes
25 changes: 3 additions & 22 deletions apps/meteor/client/providers/MediaCallProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Emitter } from '@rocket.chat/emitter';
import { usePermission } from '@rocket.chat/ui-contexts';
import { MediaCallProvider as MediaCallProviderBase, MediaCallInstanceContext } from '@rocket.chat/ui-voip';
import { MediaCallProvider as MediaCallProviderBase } from '@rocket.chat/ui-voip';
import type { ReactNode } from 'react';
import { useMemo } from 'react';

import { useHasLicenseModule } from '../hooks/useHasLicenseModule';

Expand All @@ -12,26 +10,9 @@ const MediaCallProvider = ({ children }: { children: ReactNode }) => {

const { data: hasModule = false } = useHasLicenseModule('teams-voip');

const unauthorizedContextValue = useMemo(
() => ({
currentViews: [],
registerView: () => undefined,
unregisterView: () => undefined,
instance: undefined,
signalEmitter: new Emitter<any>(),
audioElement: undefined,
openRoomId: undefined,
setOpenRoomId: () => undefined,
getAutocompleteOptions: () => Promise.resolve([]),
}),
[],
);
const enabled = hasModule && (canMakeInternalCall || canMakeExternalCall);

if (!hasModule || (!canMakeInternalCall && !canMakeExternalCall)) {
return <MediaCallInstanceContext.Provider value={unauthorizedContextValue}>{children}</MediaCallInstanceContext.Provider>;
}

return <MediaCallProviderBase>{children}</MediaCallProviderBase>;
return <MediaCallProviderBase enabled={enabled}>{children}</MediaCallProviderBase>;
};

export default MediaCallProvider;
5 changes: 3 additions & 2 deletions packages/ui-voip/src/providers/MediaCallInstanceProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ import type { Signals } from '../context/MediaCallInstanceContext';

type MediaCallInstanceProviderProps = {
children: ReactNode;
enabled?: boolean;
};

const MediaCallInstanceProvider = ({ children }: MediaCallInstanceProviderProps) => {
const MediaCallInstanceProvider = ({ children, enabled = true }: MediaCallInstanceProviderProps) => {
const [openRoomId, setOpenRoomId] = useState<string | undefined>(undefined);
const { currentViews, registerView, unregisterView } = useAvailableViewTracker();
const user = useUser();
const instance = useMediaSessionInstance(user?._id);
const instance = useMediaSessionInstance(enabled ? user?._id : undefined);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
Comment thread
gabriellsh marked this conversation as resolved.
Outdated
const [signalEmitter] = useState(() => new Emitter<Signals>());

const [remoteStreamRefCallback, audioElement] = useAudioStream(instance);
Expand Down
21 changes: 13 additions & 8 deletions packages/ui-voip/src/providers/MediaCallProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,22 @@ import MediaCallPopout from '../views/MediaCallPopout';

type MediaCallProviderProps = {
children: ReactNode;
enabled?: boolean;
};

const MediaCallProvider = ({ children }: MediaCallProviderProps) => {
const MediaCallProvider = ({ children, enabled = true }: MediaCallProviderProps) => {
return (
<MediaCallInstanceProvider>
<MediaCallViewProvider>
<AnchorPortal id='rcx-media-call-widget-portal'>
<MediaCallWidget />
</AnchorPortal>
</MediaCallViewProvider>
<MediaCallPopout />
<MediaCallInstanceProvider enabled={enabled}>
{enabled && (
<>
<MediaCallViewProvider>
<AnchorPortal id='rcx-media-call-widget-portal'>
<MediaCallWidget />
</AnchorPortal>
</MediaCallViewProvider>
<MediaCallPopout />
</>
)}
{children}
</MediaCallInstanceProvider>
);
Expand Down
Loading