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.

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

feat: merge main to dev #2031

Merged
merged 3 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/hms-video-web/src/error/ErrorCodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const ErrorCodes = {
DEVICE_IN_USE: 3003,

// Lost access to capture device midway - {device_type}
DEVICE_LOST_MIDWAY: 3008,
DEVICE_LOST_MIDWAY: 3004,

// There is no media to return. Please select either video or audio or both.
NOTHING_TO_RETURN: 3005,
Expand Down
2 changes: 2 additions & 0 deletions packages/roomkit-react/src/Prebuilt/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import FullPageProgress from './components/FullPageProgress';
import { Init } from './components/init/Init';
// @ts-ignore: No implicit Any
import { KeyboardHandler } from './components/Input/KeyboardInputManager';
import { MwebLandscapePrompt } from './components/MwebLandscapePrompt';
import { Notifications } from './components/Notifications';
import { HeadlessEndRoomListener } from './components/Notifications/HeadlessEndRoomListener';
// @ts-ignore: No implicit Any
Expand Down Expand Up @@ -349,6 +350,7 @@ function AppRoutes({
<>
<ToastContainer />
<Notifications />
<MwebLandscapePrompt />
<BackSwipe />
{!isNotificationsDisabled && <FlyingEmoji />}
<RemoteStopScreenshare />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Box, Flex } from '../../Layout';
import { Dialog } from '../../Modal';
import { Text } from '../../Text';
import { PrebuiltDialogPortal } from './PrebuiltDialogPortal';
// @ts-ignore: No implicit Any
import { isAndroid, isIOS } from '../common/constants';

export const MwebLandscapePrompt = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const RaiseHand = () => {
const { isHandRaised, toggleHandRaise } = useMyMetadata();
return (
<Tooltip title={isHandRaised ? 'Lower hand' : 'Raise hand'}>
<IconButton active={!isHandRaised} onClick={async () => await toggleHandRaise()}>
<IconButton data-testid="hand_raise_btn" active={!isHandRaised} onClick={async () => await toggleHandRaise()}>
<HandIcon />
</IconButton>
</Tooltip>
Expand Down