@@ -13,7 +13,8 @@ import { questionUseCases } from "../../domain/usecases/QuestionUseCases";
13
13
import { roomUseCases } from "../../domain/usecases/RoomUseCases" ;
14
14
import { Room } from "../../domain/entities/Room" ;
15
15
import { useAuth } from "../../domain/context/AuthContext" ;
16
- import { message , Spin } from "antd" ;
16
+ import { Spin } from "antd" ;
17
+ import { toast } from "react-toastify" ;
17
18
18
19
const CollaborationRoomPage : React . FC = ( ) => {
19
20
const location = useLocation ( ) ;
@@ -30,12 +31,7 @@ const CollaborationRoomPage: React.FC = () => {
30
31
const resizeTimeoutRef = useRef < NodeJS . Timeout > ( ) ;
31
32
32
33
// Extract details from location.state if available
33
- const {
34
- roomId,
35
- attemptStartedAt,
36
- matchUserId,
37
- questionId,
38
- } = locationState || { } ;
34
+ const { roomId, attemptStartedAt, matchUserId, questionId } = locationState || { } ;
39
35
40
36
const handleResize = useCallback ( ( ) => {
41
37
if ( resizeTimeoutRef . current ) {
@@ -52,11 +48,7 @@ const CollaborationRoomPage: React.FC = () => {
52
48
setError ( null ) ;
53
49
try {
54
50
// Check if location.state has all required details
55
- const hasAllDetails =
56
- roomId &&
57
- attemptStartedAt &&
58
- matchUserId &&
59
- questionId ;
51
+ const hasAllDetails = roomId && attemptStartedAt && matchUserId && questionId ;
60
52
61
53
if ( hasAllDetails ) {
62
54
// Populate room with details from location.state
@@ -65,10 +57,10 @@ const CollaborationRoomPage: React.FC = () => {
65
57
attemptStartedAt : attemptStartedAt ,
66
58
userIdOne : user . user ! . _id ,
67
59
userIdTwo : matchUserId ,
68
- questionId : questionId ,
60
+ questionId : questionId
69
61
} ) ;
70
62
} else {
71
- if ( ! urlRoomId ) return ;
63
+ if ( ! urlRoomId ) return ;
72
64
// Fetch room details from API
73
65
const fetchedRoom = await roomUseCases . getRoomDetails ( urlRoomId ) ;
74
66
// Ensure the current user is userIdOne
@@ -82,7 +74,7 @@ const CollaborationRoomPage: React.FC = () => {
82
74
} catch ( err ) {
83
75
console . error ( "Failed to populate room:" , err ) ;
84
76
setError ( "Failed to load room details." ) ;
85
- message . error ( "Failed to load room details." ) ;
77
+ toast . error ( "Failed to load room details." , { toastId : "roomError" } ) ;
86
78
} finally {
87
79
setLoading ( false ) ;
88
80
}
@@ -101,7 +93,7 @@ const CollaborationRoomPage: React.FC = () => {
101
93
} catch ( err ) {
102
94
console . warn ( "Failed to fetch question:" , err ) ;
103
95
setError ( "Failed to load question details." ) ;
104
- message . error ( "Failed to load question details." ) ;
96
+ toast . error ( "Failed to load question details." , { toastId : "questionError" } ) ;
105
97
}
106
98
}
107
99
} ;
0 commit comments