Merge pull request #47 from 4bujak-4bujak/feature/meetingroomQA

fix: 앱 처음 진입 시, 지점 설정 안하고 예약 탭에서 처음 설정된 강남1호점 미팅룸 예약 페이지 진입 후 지점 상세보기…
4bujak-4bujak · Jun 10, 2024 · 5d99c79 · 5d99c79
2 parents 6d93f89 + 2f537ab
commit 5d99c79
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx b/src/components/reservation/meetingRoom/MeetingRoomInfo.tsx
@@ -56,9 +56,9 @@ const MeetingRoomInfo = () => {
     const updatedTimeReserved = useBranchStore2((state) => state.updatedTimeReserved);
 
     const currentBranch =
-        updatedTimeSelected && updatedTimeReserved && updatedTimeSelected > updatedTimeReserved
-            ? selectedBranch
-            : reservedBranch;
+    updatedTimeSelected && updatedTimeReserved && updatedTimeSelected > updatedTimeReserved
+      ? selectedBranch
+      : reservedBranch || selectedBranch;
 
 
     console.log(`current Branch = ${currentBranch?.branchName}`);
@@ -132,7 +132,6 @@ const MeetingRoomInfo = () => {
             const officeInfo = data.data;
             console.log(officeInfo);
             router.push({
-                // pathname: `/branches/${encodeURIComponent(officeInfo!.branchName)}`,
                 pathname: `/branches/${encodeURIComponent(currentBranch!.branchName)}`,
                 query: {
                     name: officeInfo.branchName,