Skip to content
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

fix: remove peer, end room flow #1849

Merged
merged 5 commits into from
Sep 7, 2023
Merged

fix: remove peer, end room flow #1849

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ad94e4
fix: remove peer, end room flow
raviteja83 Sep 6, 2023
242b814
fix: pr comments
raviteja83 Sep 7, 2023
c7bf80a
fix: remove roomCode
raviteja83 Sep 7, 2023
49f32b3
refactor: move to custom hook
raviteja83 Sep 7, 2023
8a2d2ba
Merge remote-tracking branch 'origin/main' into fix/WEB-2166-remove-peer
raviteja83 Sep 7, 2023
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
10 changes: 6 additions & 4 deletions packages/roomkit-react/src/Prebuilt/components/Notifications/Notifications.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { ReconnectNotifications } from './ReconnectNotifications';
import { TrackBulkUnmuteModal } from './TrackBulkUnmuteModal';
import { TrackNotifications } from './TrackNotifications';
import { TrackUnmuteModal } from './TrackUnmuteModal';
import { useRoomLayoutLeaveScreen } from '../../provider/roomLayoutProvider/hooks/useRoomLayoutScreen';
import { useIsNotificationDisabled, useSubscribedNotifications } from '../AppData/useUISettings';
import { getMetadata } from '../../common/utils';
import { ROLE_CHANGE_DECLINED } from '../../common/constants';
Expand All @@ -32,6 +33,7 @@ export function Notifications() {
const roomState = useHMSStore(selectRoomState);
const updateRoomLayoutForRole = useUpdateRoomLayout();
const isNotificationDisabled = useIsNotificationDisabled();
const { isLeaveScreenEnabled } = useRoomLayoutLeaveScreen();

const handleRoleChangeDenied = useCallback(request => {
ToastManager.addToast({
Expand Down Expand Up @@ -92,10 +94,10 @@ export function Notifications() {
// goto leave for terminal if any action is not performed within 2secs
// if network is still unavailable going to preview will throw an error
setTimeout(() => {
const previewLocation = window.location.pathname.replace('meeting', 'leave');
const previewLocation = window.location.pathname.replace('/meeting', isLeaveScreenEnabled ? '/leave' : '');
raviteja83 marked this conversation as resolved.
Show resolved Hide resolved
ToastManager.clearAllToast();
navigate(previewLocation);
}, 2000);
}, 1000);
return;
}
// Autoplay error or user denied screen share (cancelled browser pop-up)
Expand Down Expand Up @@ -134,10 +136,10 @@ export function Notifications() {
${notification.data.reason && `Reason: ${notification.data.reason}`}`,
});
setTimeout(() => {
const leaveLocation = window.location.pathname.replace('meeting', 'leave');
const leaveLocation = window.location.pathname.replace('/meeting', isLeaveScreenEnabled ? '/leave' : '');
raviteja83 marked this conversation as resolved.
Show resolved Hide resolved
navigate(leaveLocation);
ToastManager.clearAllToast();
}, 2000);
}, 1000);
break;
case HMSNotificationTypes.DEVICE_CHANGE_UPDATE:
ToastManager.addToast({
Expand Down
Loading