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: chat/particiants tab #1900

Merged
merged 2 commits into from
Sep 11, 2023
Merged

fix: chat/particiants tab #1900

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
de73fa2
fix: chat/particiants tab
raviteja83 Sep 11, 2023
061cf4a
fix: remove unused var
raviteja83 Sep 11, 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
4 changes: 3 additions & 1 deletion packages/react-sdk/src/hooks/usePreviewJoin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ export const usePreviewJoin = ({
}
try {
if (isConnected || roomState !== HMSRoomState.Disconnected) {
await actions.leave();
await actions.leave().catch(() => {
// Do nothing as this might lead to leave called before join
});
}
await actions.preview(config);
} catch (err) {
Expand Down
2 changes: 0 additions & 2 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 @@ -8,7 +8,6 @@ import {
useCustomEvent,
useHMSNotifications,
useHMSStore,
useHMSVanillaStore,
} from '@100mslive/react-sdk';
import { Button } from '../../../';
import { useUpdateRoomLayout } from '../../provider/roomLayoutProvider';
Expand All @@ -30,7 +29,6 @@ export function Notifications() {
const notification = useHMSNotifications();
const navigate = useNavigate();
const params = useParams();
const vanillaStore = useHMSVanillaStore();
const subscribedNotifications = useSubscribedNotifications() || {};
const roomState = useHMSStore(selectRoomState);
const updateRoomLayoutForRole = useUpdateRoomLayout();
Expand Down
4 changes: 4 additions & 0 deletions packages/roomkit-react/src/Prebuilt/components/SidePaneTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export const SidePaneTabs = React.memo<{
}
}, [showChat, activeTab, showParticipants, resetSidePane]);

useEffect(() => {
setActiveTab(active);
}, [active]);

return (
<Flex
direction="column"
Expand Down
Loading