Skip to content

Commit 963a604

Browse files
authored
Merge pull request #187 from prgrms-web-devcourse-final-project/main
dev 최신화: hotfix 포함한 main 브랜치 내용을 반영
2 parents d9f37b9 + 5e6f3e3 commit 963a604

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/components/product/ProductInfo.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export default function ProductInfo({ initialProduct, me }: ProductInfo) {
186186
</Button>
187187
)}
188188

189-
{getLiveEnterStatus(product?.liveTime) === "ONGOING" ? (
189+
{getLiveEnterStatus(product?.liveTime) === "ONGOING" && (
190190
<Button
191191
onClick={() => {
192192
addSubscribedAuctionId(product.auctionRoomId);
@@ -197,7 +197,9 @@ export default function ProductInfo({ initialProduct, me }: ProductInfo) {
197197
>
198198
라이브 입장하기
199199
</Button>
200-
) : (
200+
)}
201+
202+
{getLiveStatus(product?.auctionStatus) === "CLOSE" && (
201203
<Button className="flex-1" disabled>
202204
라이브 종료
203205
</Button>

src/features/auction/store/useLiveRoomStore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ interface LiveRoomState {
1212
}
1313

1414
export const useLiveRoomStore = create<LiveRoomState>(set => ({
15-
activeAuctionId: 8,
16-
subscribedAuctionIds: [8, 9],
15+
activeAuctionId: null,
16+
subscribedAuctionIds: [],
1717
chatRoomIds: {},
1818

1919
setActiveAuctionId: id => set({ activeAuctionId: id }),

0 commit comments

Comments
 (0)