Skip to content

Commit 9c5b13f

Browse files
authored
Merge branch 'master' into fix/whats_new
2 parents 7f79305 + b2ab1f5 commit 9c5b13f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/custom/Carousel/style.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export const CarouselButton = styled('button')(({ theme }) => ({
66
transform: 'translateY(-50%)',
77
zIndex: '1',
88
background: theme.palette.background.paper,
9+
color: theme.palette.mode === 'dark' ? theme.palette.common.white : theme.palette.common.black,
910
border: 'none',
1011
cursor: 'pointer',
1112
padding: '0.5rem',

src/custom/PerformersSection/styles.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ export const Title = styled(Typography)(({ theme }) => ({
9090
}));
9191

9292
export const StyledCard = styled(Card)<StyledCardProps>(({ theme }) => ({
93-
width: 'inherit',
94-
minWidth: '150px',
93+
width: '200px',
9594
borderRadius: '16px',
9695
position: 'relative',
9796
overflow: 'hidden',

src/hooks/useRoomActivity.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ interface CollaborationConfigParams {
1919
}
2020

2121
interface CollaborationConfig {
22-
signaling: string[];
22+
signalingUrl: string[];
2323
user: UserProfile;
2424
authToken: string;
2525
refreshAuthToken: () => Promise<string>;
@@ -113,7 +113,7 @@ export const getCollaborationConfig = async ({
113113
};
114114

115115
return {
116-
signaling: [getSignalingUrlFromProviderUrl(provider_url)],
116+
signalingUrl: [getSignalingUrlFromProviderUrl(provider_url)],
117117
user: userProfile,
118118
authToken: accessToken,
119119
refreshAuthToken: refreshToken,
@@ -143,7 +143,7 @@ const subscribeToRoomActivity = async (
143143
});
144144

145145
// Create the websocket connection with proper headers
146-
const ws = new WebSocket(config.signaling[0], ['auth', config.authToken]);
146+
const ws = new WebSocket(config.signalingUrl[0], ['auth', config.authToken]);
147147
wsRef.current = ws;
148148

149149
ws.addEventListener('open', () => {

0 commit comments

Comments
 (0)