yobble/Views/Chat/PrivateChatView.swift

@@ -61,20 +61,20 @@ struct PrivateChatView: View {
         }
         .navigationTitle(toolbarTitle)
         .navigationBarTitleDisplayMode(.inline)
-//        .navigationBarBackButtonHidden(true)
+        .navigationBarBackButtonHidden(true)
 //        .toolbar {
 //            ToolbarItem(placement: .principal) {
 //                chatToolbarContent
 //            }
 //        }
         .toolbar {
-//            ToolbarItem(placement: .navigationBarLeading) {
+            ToolbarItem(placement: .navigationBarLeading) {
-//                Button(action: { dismiss() }) {
+                Button(action: { dismiss() }) {
-//                    Image(systemName: "chevron.left")
+                    Image(systemName: "chevron.left")
-//                        .font(.system(size: 17, weight: .semibold))
+                        .font(.system(size: 17, weight: .semibold))
-//                        .foregroundColor(.accentColor)
+                        .foregroundColor(.accentColor)
-//                }
+                }
-//            }
+            }
             
             ToolbarItem(placement: .principal) {
                 Button(action: openProfile) {
@@ -117,11 +117,6 @@ struct PrivateChatView: View {
         } else if let error = viewModel.errorMessage, viewModel.messages.isEmpty {
             errorView(message: error)
         } else {
-            messagesList
-        }
-    }
-
-    private var messagesList: some View {
             ScrollView {
                 LazyVStack(alignment: .leading, spacing: 12) {
                     if viewModel.isLoadingMore {
@@ -159,6 +154,10 @@ struct PrivateChatView: View {
                     isComposerFocused = false
                 }
             )
+            .refreshable {
+                viewModel.refresh()
+            }
+        }
     }
 
     private var emptyState: some View {
@@ -200,26 +199,23 @@ struct PrivateChatView: View {
         return HStack(alignment: .bottom, spacing: 12) {
             if isCurrentUser { Spacer(minLength: 32) }
 
-            messageBubble(for: message, isCurrentUser: isCurrentUser)
+            VStack(alignment: isCurrentUser ? .trailing : .leading, spacing: 6) {
+//                if !isCurrentUser {
+//                    Text(senderName(for: message))
+//                        .font(.caption)
+//                        .foregroundColor(.secondary)
+//                }
 
-            if !isCurrentUser { Spacer(minLength: 32) }
+                HStack(alignment: .bottom) {
-        }
-        .padding(.horizontal, 16)
-    }
-
-    private func messageBubble(for message: MessageItem, isCurrentUser: Bool) -> some View {
-        let timeText = timestamp(for: message)
-
-        return VStack(alignment: isCurrentUser ? .trailing : .leading, spacing: 4) {
                     Text(contentText(for: message))
                         .font(.body)
                         .foregroundColor(isCurrentUser ? .white : .primary)
                         .multilineTextAlignment(.leading)
                     
-            if !timeText.isEmpty {
+                    Text(timestamp(for: message))
-                Text(timeText)
                         .font(.caption2)
-                    .foregroundColor(isCurrentUser ? Color.white.opacity(0.85) : .secondary)
+                        .foregroundColor(isCurrentUser ? Color.white.opacity(0.8) : .secondary)
+                    
                 }
             }
             .padding(.vertical, 10)
@@ -228,6 +224,10 @@ struct PrivateChatView: View {
             .clipShape(RoundedRectangle(cornerRadius: 16, style: .continuous))
             .frame(maxWidth: messageBubbleMaxWidth, alignment: isCurrentUser ? .trailing : .leading)
             .fixedSize(horizontal: false, vertical: true)
+
+            if !isCurrentUser { Spacer(minLength: 32) }
+        }
+        .padding(.horizontal, 16)
     }
 
     private var messageBubbleMaxWidth: CGFloat {