From d251bd50d85f3b6d7030d37bceaeb3ef7e788c22 Mon Sep 17 00:00:00 2001
From: Yu Sung <hwchon1234@gmail.com>
Date: Wed, 3 Sep 2025 23:28:18 +0900
Subject: [PATCH] =?UTF-8?q?feat(chat-room)=20=EC=B1=84=ED=8C=85=EB=B0=A9?=
 =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=91=9C=EC=8B=9C=20-=20botto?=
 =?UTF-8?q?m=20=EC=A0=95=EB=A0=AC=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sources/Chat/Talk/Room/ChatRoomView.swift | 38 ++++++++++++-------
 .../Chat/Talk/Room/ChatRoomViewModel.swift    | 25 +-----------
 2 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift
index 012e701..9345486 100644
--- a/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift
+++ b/SodaLive/Sources/Chat/Talk/Room/ChatRoomView.swift
@@ -106,23 +106,33 @@ struct ChatRoomView: View {
                 .cornerRadius(16)
                 .frame(width: screenSize().width - 48)
                 
-                ScrollView(.vertical, showsIndicators: false) {
-                    VStack(spacing: 16) {
-                        Spacer()
-                        
-                        ForEach(0..<viewModel.messages.count, id: \.self) {
-                            let message = viewModel.messages[$0]
-                            if message.mine {
-                                UserMessageItemView(message: message)
-                            } else {
-                                AiMessageItemView(
-                                    message: message,
-                                    characterName: viewModel.characterName
-                                )
+                GeometryReader { geometry in
+                    ScrollViewReader { proxy in
+                        ScrollView(.vertical, showsIndicators: false) {
+                            LazyVStack(spacing: 16) {
+                                ForEach(0..<viewModel.messages.count, id: \.self) { index in
+                                    let message = viewModel.messages[index]
+                                    if message.mine {
+                                        UserMessageItemView(message: message)
+                                    } else {
+                                        AiMessageItemView(
+                                            message: message,
+                                            characterName: viewModel.characterName
+                                        )
+                                    }
+                                }
+                            }
+                            .padding(.horizontal, 24)
+                            .frame(minHeight: geometry.size.height, alignment: .bottom)
+                        }
+                        .onChange(of: viewModel.messages.count) { _ in
+                            if !viewModel.messages.isEmpty {
+                                withAnimation(.easeOut(duration: 0.3)) {
+                                    proxy.scrollTo(viewModel.messages.count - 1, anchor: .bottom)
+                                }
                             }
                         }
                     }
-                    .padding(.horizontal, 24)
                 }
                 .frame(width: screenSize().width)
                 .frame(maxHeight: .infinity)
diff --git a/SodaLive/Sources/Chat/Talk/Room/ChatRoomViewModel.swift b/SodaLive/Sources/Chat/Talk/Room/ChatRoomViewModel.swift
index 083736b..c4fc60e 100644
--- a/SodaLive/Sources/Chat/Talk/Room/ChatRoomViewModel.swift
+++ b/SodaLive/Sources/Chat/Talk/Room/ChatRoomViewModel.swift
@@ -21,30 +21,7 @@ final class ChatRoomViewModel: ObservableObject {
     
     // MARK: - Message State
     @Published var messageText: String = ""
-    @Published private(set) var messages: [ServerChatMessage] = [
-        ServerChatMessage(
-            messageId: 1,
-            message: "(만약에) 멈춰 인프피",
-            profileImageUrl: "",
-            mine: true,
-            createdAt: Date().currentTimeMillis(),
-            messageType: "text",
-            imageUrl: nil,
-            price: nil,
-            hasAccess: true
-        ),
-        ServerChatMessage(
-            messageId: 2,
-            message: "(언제부턴가) 너랑 노는게 제일 재밌고\n너랑 이야기 하는게 제일 신나더라,\n앞으로도 그럴 것 같아❤️",
-            profileImageUrl: "https://example.com/profile.jpg",
-            mine: false,
-            createdAt: Date().currentTimeMillis(),
-            messageType: "text",
-            imageUrl: nil,
-            price: nil,
-            hasAccess: true
-        )
-    ]
+    @Published private(set) var messages: [ServerChatMessage] = []
     
     // MARK: - Private
     private let userRepository = UserRepository()