Merge master into feature branch

Resolved conflict in CommentsComponents.swift by keeping the unvote swipe action logic and hidden row separators from the feature branch.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <[email protected]>

Author: weiran

Features/Comments/Sources/Comments/CommentsComponents.swift

@@ -319,7 +319,6 @@ struct CommentRow: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
-            Divider().padding(.bottom, 6)
             HStack {
                 Text(comment.by)
                     .scaledFont(.subheadline)
@@ -354,11 +353,12 @@ struct CommentRow: View {
                     .foregroundColor(.primary)
             }
         }
-        .listRowInsets(.init(top: 12, leading: CGFloat((comment.level + 1) * 16), bottom: 8, trailing: 16))
+        .listRowInsets([.top, .bottom, .trailing], 16)
+        .listRowInsets([.leading], CGFloat((comment.level + 1) * 16))
         .contentShape(Rectangle())
         .onTapGesture { onToggle() }
         .accessibilityAddTraits(.isButton)
-        .accessibilityHint(comment.visibility == .visible ? "Double-tap to collapse" : "Double-tap to expand")
+        .accessibilityHint(comment.visibility == .visible ? "Tap to collapse" : "Tap to expand")
         .contextMenu {
             VotingContextMenuItems.commentVotingMenuItems(
                 for: comment,

Features/Feed/Sources/Feed/FeedView.swift

@@ -92,6 +92,10 @@ public struct FeedView<NavigationStore: NavigationStoreProtocol>: View {
                     searchText = newValue
                 }
             }
+            .onChange(of: selectedPostType) { _ in
+                // Clear selection when category changes to prevent stale sidebar selection
+                selectedPostId = nil
+            }
         .task { @Sendable in
             // Set the navigation store for the voting view model
             votingViewModel.navigationStore = navigationStore
@@ -128,7 +132,7 @@ public struct FeedView<NavigationStore: NavigationStoreProtocol>: View {
         Group {
             if viewModel.hasActiveSearch {
                 searchContentView
-            } else if viewModel.isLoading, viewModel.posts.isEmpty {
+            } else if viewModel.isLoading && viewModel.posts.isEmpty && viewModel.postType != .bookmarks {
                 AppLoadingStateView(message: "Loading...")
             } else if shouldShowBookmarksEmptyState {
                 AppEmptyStateView(
@@ -179,6 +183,7 @@ public struct FeedView<NavigationStore: NavigationStoreProtocol>: View {
         .if(isSidebar) { view in view.listStyle(.sidebar) }
         .if(!isSidebar) { view in view.listStyle(.plain) }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .id(selectedPostType)
     }
 
     @ViewBuilder

Features/Feed/Sources/Feed/FeedViewModel.swift

@@ -213,11 +213,15 @@ public final class FeedViewModel: @unchecked Sendable {
 
         postType = newType
         persistLastFeedCategoryIfNeeded()
-        await refreshFeed()
+        reset(clearPosts: true)  // Clear posts immediately to prevent flash of old data
+        await feedLoader.refresh()
     }
 
     @MainActor
-    private func reset() {
+    private func reset(clearPosts: Bool = false) {
+        if clearPosts {
+            feedLoader.data = []
+        }
         postIds = Set()
         pageIndex = 1
         lastPostId = 0