Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

♻️(frontend) refactor disconnection reason handling and state

lebaudantoine8072d2c950f7
diff --git a/src/frontend/src/features/rooms/components/Conference.tsx b/src/frontend/src/features/rooms/components/Conference.tsx
index 2a25a797..56a1a447 100644
--- a/src/frontend/src/features/rooms/components/Conference.tsx
+++ b/src/frontend/src/features/rooms/components/Conference.tsx
@@ -25,12 +25,12 @@ import { VideoConference } from '../livekit/prefabs/VideoConference'
import { css } from '@/styled-system/css'
import { BackgroundProcessorFactory } from '../livekit/components/blur'
import { LocalUserChoices } from '@/stores/userChoices'
-import { navigateTo } from '@/navigation/navigateTo'
import { MediaDeviceErrorAlert } from './MediaDeviceErrorAlert'
import { usePostHog } from 'posthog-js/react'
import { useConfig } from '@/api/useConfig'
import { isFireFox } from '@/utils/livekit'
import { useIsMobile } from '@/utils/useIsMobile'
+import { navigateTo } from '@/navigation/navigateTo'
export const Conference = ({
roomId,
@@ -230,10 +230,16 @@ export const Conference = ({
onDisconnected={(e) => {
switch (e) {
case DisconnectReason.CLIENT_INITIATED:
- navigateTo('feedback', { duplicateIdentity: false })
+ navigateTo('feedback')
return
case DisconnectReason.DUPLICATE_IDENTITY:
- navigateTo('feedback', { duplicateIdentity: true })
+ navigateTo(
+ 'feedback',
+ {},
+ {
+ state: { reason: 'duplicateIdentity' },
+ }
+ )
return
}
}}
diff --git a/src/frontend/src/features/rooms/routes/Feedback.tsx b/src/frontend/src/features/rooms/routes/Feedback.tsx
index f23c2f15..7f760260 100644
--- a/src/frontend/src/features/rooms/routes/Feedback.tsx
+++ b/src/frontend/src/features/rooms/routes/Feedback.tsx
@@ -3,7 +3,7 @@ import { Button } from '@/primitives'
import { Screen } from '@/layout/Screen'
import { Center, HStack, styled, VStack } from '@/styled-system/jsx'
import { Rating } from '@/features/rooms/components/Rating.tsx'
-import { useLocation, useSearchParams } from 'wouter'
+import { useLocation } from 'wouter'
// fixme - duplicated with home, refactor in a proper style
const Heading = styled('h1', {
@@ -24,16 +24,14 @@ export const FeedbackRoute = () => {
const { t } = useTranslation('rooms')
const [, setLocation] = useLocation()
- const [searchParams] = useSearchParams()
+ const state = window.history.state
return (
<Screen layout="centered" footer={false}>
<Center>
<VStack>
<Heading>
- {t(
- `feedback.heading.${searchParams.get('duplicateIdentity') ? 'duplicateIdentity' : 'normal'}`
- )}
+ {t(`feedback.heading.${state?.reason || 'normal'}`)}
</Heading>
<HStack>
<Button variant="secondary" onPress={() => window.history.back()}>
diff --git a/src/frontend/src/routes.ts b/src/frontend/src/routes.ts
index 6a02165c..ed2ff1ac 100644
--- a/src/frontend/src/routes.ts
+++ b/src/frontend/src/routes.ts
@@ -43,11 +43,6 @@ export const routes: Record<
feedback: {
name: 'feedback',
path: '/feedback',
- to: (params: { duplicateIdentity?: false }) =>
- '/feedback' +
- (params.duplicateIdentity
- ? `?duplicateIdentity=${params?.duplicateIdentity}`
- : ''),
Component: FeedbackRoute,
},
legalTerms: {