From 614054f35d9100d54ad4b973d274058f5fd7b14c Mon Sep 17 00:00:00 2001 From: locphamtran Date: Sat, 27 Jun 2026 17:51:19 +0700 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20ph=E1=BA=A7n=20code=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/MemberDashboard.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frontend/src/pages/MemberDashboard.tsx b/frontend/src/pages/MemberDashboard.tsx index 0a6a0f7..5dc662b 100644 --- a/frontend/src/pages/MemberDashboard.tsx +++ b/frontend/src/pages/MemberDashboard.tsx @@ -4,7 +4,6 @@ import React, { useEffect, useState, useRef } from 'react'; import { io, Socket } from 'socket.io-client'; import { Capacitor } from '@capacitor/core'; import { BACKEND_URL } from '@/utils/backendEndpoint'; ->>>>>>> Stashed changes import { Compass, Users, @@ -541,12 +540,6 @@ export const MemberDashboard: React.FC = ({ useEffect(() => { if (!user?.id) return; -<<<<<<< Updated upstream - const handleMessageReceived = (e: Event) => { - const message = (e as CustomEvent).detail; - // If we are actively chatting with the sender of this message - if (activeChatUser && (message.senderId === activeChatUser.id || message.receiverId === activeChatUser.id)) { -======= // Connect to WebSocket: absolute URL on native, relative (Vite proxy) on web const socket = Capacitor.isNativePlatform() ? io(BACKEND_URL) @@ -562,7 +555,6 @@ export const MemberDashboard: React.FC = ({ // Check against window-global activeChatUserId so stale closure doesn't block updates const activeChatUserId = (window as any).activeChatUserId; if (activeChatUserId && (message.senderId === activeChatUserId || message.receiverId === activeChatUserId)) { ->>>>>>> Stashed changes setChatMessages(prev => [...prev, message]); } else { // Add to unread states From 9fae6afaac44c4d9f8def031bb048d3cb856a743 Mon Sep 17 00:00:00 2001 From: locphamtran Date: Sat, 27 Jun 2026 17:52:42 +0700 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20ph=E1=BA=A7n=20code=20s=E1=BB=ADa=20?= =?UTF-8?q?sau=20tr=C3=AAn=20m=C3=A1y=20B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/dist/index.html | 80 +++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/frontend/dist/index.html b/frontend/dist/index.html index e3ae735..f1d8228 100644 --- a/frontend/dist/index.html +++ b/frontend/dist/index.html @@ -1,38 +1,44 @@ - - - - - - - - Travel Planner - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + Travel Planner + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file