From 953515d7860759c8dbcfe1426dc6ad4d51afddbb Mon Sep 17 00:00:00 2001
From: Roscoe Rubin-Rottenberg <roscoe@knotbin.com>
Date: Fri, 10 Jul 2026 14:30:46 -0400
Subject: [PATCH] refactor: simplify callback ownership and feature actions

---
 .../molecules/profile_action_buttons.dart     |  10 +-
 .../components/molecules/profile_card.dart    |  19 +-
 .../templates/chat_list_page_template.dart    |   3 -
 .../templates/profile_page_template.dart      |  18 +-
 .../data/repositories/graph_repository.dart   |  12 -
 .../repositories/graph_repository_impl.dart   |  25 --
 lib/src/core/routing/app_router.dart          |  12 +-
 lib/src/core/routing/pages.dart               |   2 -
 .../feed/ui/pages/standalone_post_page.dart   |  17 +-
 .../action_buttons/side_action_bar.dart       |   6 -
 .../feed/ui/widgets/feed/feeds_bar.dart       |  12 +-
 .../ui/widgets/post/feed_post_widget.dart     |  18 --
 .../feed/ui/widgets/post/post_overlay.dart    |  32 ++-
 .../feed/ui/widgets/post_likes_sheet.dart     |   2 -
 .../messages/ui/pages/messages_page.dart      |  13 +-
 .../ui/pages/new_chat_search_page.dart        |   2 -
 .../profile/providers/profile_provider.dart   |  57 +++--
 .../profile/ui/pages/profile_page.dart        |  13 +-
 .../profile/ui/widgets/blocks_list_view.dart  |   2 -
 .../ui/widgets/profile_feed_post_widget.dart  |  27 +-
 .../profile/ui/widgets/user_list_view.dart    |  18 +-
 .../search/ui/pages/user_results.dart         |  15 +-
 .../settings/providers/settings_provider.dart |  59 +++--
 .../settings/ui/pages/feed_list_page.dart     |  83 +-----
 .../ui/widgets}/settings_feed_card.dart       | 241 +++++++++++-------
 .../features/sound/ui/pages/sound_page.dart   |  12 +-
 .../sound/ui/widgets/sound_header_card.dart   |  16 +-
 .../stories/ui/pages/author_stories_page.dart |   1 -
 .../features/stories/ui/pages/story_page.dart |   1 -
 .../components/profile_card_test.dart         |  79 ++++++
 .../ui/widgets/settings_feed_card_test.dart   |  42 +++
 widgetbook/lib/molecules/profile_card.dart    |   4 +-
 .../lib/templates/profile_page_template.dart  |  12 +-
 33 files changed, 427 insertions(+), 458 deletions(-)
 rename lib/src/{core/design_system/components/molecules => features/settings/ui/widgets}/settings_feed_card.dart (50%)
 create mode 100644 test/src/core/design_system/components/profile_card_test.dart
 create mode 100644 test/src/features/settings/ui/widgets/settings_feed_card_test.dart

diff --git a/lib/src/core/design_system/components/molecules/profile_action_buttons.dart b/lib/src/core/design_system/components/molecules/profile_action_buttons.dart
index 02b1940..f17a17c 100644
--- a/lib/src/core/design_system/components/molecules/profile_action_buttons.dart
+++ b/lib/src/core/design_system/components/molecules/profile_action_buttons.dart
@@ -12,8 +12,7 @@ class ProfileActionButtons extends StatelessWidget {
     this.isFollowing = false,
     this.isBlocking = false,
     this.onEditTap,
-    this.onFollowTap,
-    this.onUnfollowTap,
+    this.onFollowingChanged,
     this.onUnblockTap,
   });
 
@@ -21,8 +20,7 @@ class ProfileActionButtons extends StatelessWidget {
   final bool isFollowing;
   final bool isBlocking;
   final VoidCallback? onEditTap;
-  final VoidCallback? onFollowTap;
-  final VoidCallback? onUnfollowTap;
+  final ValueChanged<bool>? onFollowingChanged;
   final VoidCallback? onUnblockTap;
 
   @override
@@ -49,10 +47,8 @@ class ProfileActionButtons extends StatelessWidget {
             onChanged: (isSelected) {
               if (isBlocking && onUnblockTap != null) {
                 onUnblockTap!();
-              } else if (isSelected) {
-                onFollowTap?.call();
               } else {
-                onUnfollowTap?.call();
+                onFollowingChanged?.call(isSelected);
               }
             },
             width: double.infinity,
diff --git a/lib/src/core/design_system/components/molecules/profile_card.dart b/lib/src/core/design_system/components/molecules/profile_card.dart
index a5a38b4..f3c2fc8 100644
--- a/lib/src/core/design_system/components/molecules/profile_card.dart
+++ b/lib/src/core/design_system/components/molecules/profile_card.dart
@@ -12,9 +12,8 @@ class ProfileCard extends StatelessWidget {
     required this.userName,
     required this.userHandle,
     required this.isFollowing,
-    required this.onFollow,
-    required this.onUnfollow,
     this.isBlocking = false,
+    this.onFollowingChanged,
     this.onUnblock,
     this.showFollowButton = true,
     this.description,
@@ -30,10 +29,9 @@ class ProfileCard extends StatelessWidget {
     required String userName,
     required String userHandle,
     required bool isFollowing,
-    required VoidCallback onFollow,
-    required VoidCallback onUnfollow,
     required String description,
     bool isBlocking = false,
+    ValueChanged<bool>? onFollowingChanged,
     VoidCallback? onUnblock,
     bool showFollowButton = true,
     VoidCallback? onTap,
@@ -45,9 +43,8 @@ class ProfileCard extends StatelessWidget {
          userName: userName,
          userHandle: userHandle,
          isFollowing: isFollowing,
-         onFollow: onFollow,
-         onUnfollow: onUnfollow,
          isBlocking: isBlocking,
+         onFollowingChanged: onFollowingChanged,
          onUnblock: onUnblock,
          showFollowButton: showFollowButton,
          description: description,
@@ -62,8 +59,7 @@ class ProfileCard extends StatelessWidget {
   final String userHandle;
   final bool isFollowing;
   final bool isBlocking;
-  final VoidCallback onFollow;
-  final VoidCallback onUnfollow;
+  final ValueChanged<bool>? onFollowingChanged;
   final VoidCallback? onUnblock;
   final bool showFollowButton;
   final String? description;
@@ -134,7 +130,8 @@ class ProfileCard extends StatelessWidget {
                     ],
                   ),
                 ),
-                if (showFollowButton) ...[
+                if (showFollowButton &&
+                    (onFollowingChanged != null || onUnblock != null)) ...[
                   const SizedBox(width: 8),
                   ToggleButton(
                     isSelected: isBlocking && onUnblock != null
@@ -150,10 +147,8 @@ class ProfileCard extends StatelessWidget {
                     onChanged: (isSelected) {
                       if (isBlocking && onUnblock != null) {
                         onUnblock!();
-                      } else if (isSelected) {
-                        onFollow();
                       } else {
-                        onUnfollow();
+                        onFollowingChanged?.call(isSelected);
                       }
                     },
                   ),
diff --git a/lib/src/core/design_system/templates/chat_list_page_template.dart b/lib/src/core/design_system/templates/chat_list_page_template.dart
index ed041f3..8faf9a0 100644
--- a/lib/src/core/design_system/templates/chat_list_page_template.dart
+++ b/lib/src/core/design_system/templates/chat_list_page_template.dart
@@ -33,7 +33,6 @@ class ChatListPageTemplate extends StatelessWidget {
     this.loading = false,
     this.loadingItemCount = 8,
     this.onAddTap,
-    this.onSearchTap,
     this.onRefresh,
   });
 
@@ -42,7 +41,6 @@ class ChatListPageTemplate extends StatelessWidget {
     this.title = 'Chat',
     this.loadingItemCount = 8,
     this.onAddTap,
-    this.onSearchTap,
     this.onRefresh,
   }) : items = const [],
        onItemTap = _noopItemTap,
@@ -54,7 +52,6 @@ class ChatListPageTemplate extends StatelessWidget {
   final bool loading;
   final int loadingItemCount;
   final VoidCallback? onAddTap;
-  final VoidCallback? onSearchTap;
   final Future<void> Function()? onRefresh;
 
   @override
diff --git a/lib/src/core/design_system/templates/profile_page_template.dart b/lib/src/core/design_system/templates/profile_page_template.dart
index a39425c..dc99e5f 100644
--- a/lib/src/core/design_system/templates/profile_page_template.dart
+++ b/lib/src/core/design_system/templates/profile_page_template.dart
@@ -35,8 +35,7 @@ class ProfilePageTemplate extends StatelessWidget {
     this.onFollowersTap,
     this.onFollowingTap,
     this.onEditTap,
-    this.onFollowTap,
-    this.onUnfollowTap,
+    this.onFollowingChanged,
     this.onUnblockTap,
     this.onEarlySupporterTap,
     this.onKnownFollowersTap,
@@ -71,8 +70,7 @@ class ProfilePageTemplate extends StatelessWidget {
   final VoidCallback? onFollowersTap;
   final VoidCallback? onFollowingTap;
   final VoidCallback? onEditTap;
-  final VoidCallback? onFollowTap;
-  final VoidCallback? onUnfollowTap;
+  final ValueChanged<bool>? onFollowingChanged;
   final VoidCallback? onUnblockTap;
   final VoidCallback? onEarlySupporterTap;
   final VoidCallback? onKnownFollowersTap;
@@ -133,8 +131,7 @@ class ProfilePageTemplate extends StatelessWidget {
                     onFollowersTap: onFollowersTap,
                     onFollowingTap: onFollowingTap,
                     onEditTap: onEditTap,
-                    onFollowTap: onFollowTap,
-                    onUnfollowTap: onUnfollowTap,
+                    onFollowingChanged: onFollowingChanged,
                     onUnblockTap: onUnblockTap,
                     onEarlySupporterTap: onEarlySupporterTap,
                     onKnownFollowersTap: onKnownFollowersTap,
@@ -179,8 +176,7 @@ class _ProfileHeaderSection extends StatelessWidget {
     this.onFollowersTap,
     this.onFollowingTap,
     this.onEditTap,
-    this.onFollowTap,
-    this.onUnfollowTap,
+    this.onFollowingChanged,
     this.onUnblockTap,
     this.onEarlySupporterTap,
     this.onKnownFollowersTap,
@@ -206,8 +202,7 @@ class _ProfileHeaderSection extends StatelessWidget {
   final VoidCallback? onFollowersTap;
   final VoidCallback? onFollowingTap;
   final VoidCallback? onEditTap;
-  final VoidCallback? onFollowTap;
-  final VoidCallback? onUnfollowTap;
+  final ValueChanged<bool>? onFollowingChanged;
   final VoidCallback? onUnblockTap;
   final VoidCallback? onEarlySupporterTap;
   final VoidCallback? onKnownFollowersTap;
@@ -294,8 +289,7 @@ class _ProfileHeaderSection extends StatelessWidget {
               isFollowing: isFollowing,
               isBlocking: isBlocking,
               onEditTap: onEditTap,
-              onFollowTap: onFollowTap,
-              onUnfollowTap: onUnfollowTap,
+              onFollowingChanged: onFollowingChanged,
               onUnblockTap: onUnblockTap,
             ),
           ),
diff --git a/lib/src/core/network/atproto/data/repositories/graph_repository.dart b/lib/src/core/network/atproto/data/repositories/graph_repository.dart
index 05e55ac..5062d47 100644
--- a/lib/src/core/network/atproto/data/repositories/graph_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/graph_repository.dart
@@ -39,18 +39,6 @@ abstract class GraphRepository {
   /// [followUri] The URI of the follow record to delete
   Future<void> unfollowUser(AtUri followUri);
 
-  /// Toggle follow status for a user
-  ///
-  /// [did] The DID of the user to toggle follow for
-  /// [currentFollowUri] The follow URI if following, null if not
-  /// [bsky] Whether to use Bluesky follow records instead of Spark
-  /// Returns the follow URI if now following, null if unfollowed
-  Future<String?> toggleFollow(
-    String did,
-    AtUri? currentFollowUri, {
-    bool bsky = false,
-  });
-
   /// Get blocks for a DID
   ///
   /// [did] The DID to get blocks for
diff --git a/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
index e7b0b31..26fdcd5 100644
--- a/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
@@ -226,31 +226,6 @@ class GraphRepositoryImpl implements GraphRepository {
     });
   }
 
-  @override
-  Future<String?> toggleFollow(
-    String did,
-    AtUri? currentFollowUri, {
-    bool bsky = false,
-  }) async {
-    _logger.d(
-      'Toggling follow for DID: $did, current URI: $currentFollowUri, '
-      'bsky: $bsky',
-    );
-    return _client.executeWithRetry(() async {
-      if (currentFollowUri != null) {
-        // User is following, so unfollow
-        await unfollowUser(currentFollowUri);
-        _logger.i('User unfollowed via toggle');
-        return null;
-      } else {
-        // User is not following, so follow
-        final response = await followUser(did, bsky: bsky);
-        _logger.i('User followed via toggle: ${response.uri}');
-        return response.uri.toString();
-      }
-    });
-  }
-
   @override
   Future<sprk_get_blocks.GraphGetBlocksOutput> getBlocks(
     String did, {
diff --git a/lib/src/core/routing/app_router.dart b/lib/src/core/routing/app_router.dart
index c94f2b4..83cc1e4 100644
--- a/lib/src/core/routing/app_router.dart
+++ b/lib/src/core/routing/app_router.dart
@@ -164,17 +164,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: RecordingRoute.page, path: '/recording'),
 
     // Stories pages
-    AutoRoute(
-      page: AllStoriesRoute.page,
-      path: '/stories',
-      children: [
-        AutoRoute(
-          page: AuthorStoriesRoute.page,
-          path: 'author',
-          children: [AutoRoute(page: StoryRoute.page, path: 'story')],
-        ),
-      ],
-    ),
+    AutoRoute(page: AllStoriesRoute.page, path: '/stories'),
 
     // Story Manager
     AutoRoute(page: StoryManagerRoute.page, path: '/story-manager'),
diff --git a/lib/src/core/routing/pages.dart b/lib/src/core/routing/pages.dart
index 4f6ffe0..fe481c2 100644
--- a/lib/src/core/routing/pages.dart
+++ b/lib/src/core/routing/pages.dart
@@ -36,6 +36,4 @@ export 'package:spark/src/features/settings/ui/pages/labeler_management_page.dar
 export 'package:spark/src/features/settings/ui/pages/settings_page.dart';
 export 'package:spark/src/features/sound/ui/pages/sound_page.dart';
 export 'package:spark/src/features/stories/ui/pages/all_stories_page.dart';
-export 'package:spark/src/features/stories/ui/pages/author_stories_page.dart';
 export 'package:spark/src/features/stories/ui/pages/story_manager_page.dart';
-export 'package:spark/src/features/stories/ui/pages/story_page.dart';
diff --git a/lib/src/features/feed/ui/pages/standalone_post_page.dart b/lib/src/features/feed/ui/pages/standalone_post_page.dart
index 3cef35d..ba3f440 100644
--- a/lib/src/features/feed/ui/pages/standalone_post_page.dart
+++ b/lib/src/features/feed/ui/pages/standalone_post_page.dart
@@ -239,24 +239,9 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
                   post: postData,
                   isLiked: postData.viewer?.like != null,
                   labels: postData.labels ?? [],
-                  onProfilePressed: () {
-                    // Pause video before navigating to profile
+                  onMediaPauseRequested: () {
                     _videoPlayerKey.currentState?.pauseVideo();
                   },
-                  onUsernameTap: () {
-                    // Pause video before navigating to profile
-                    _videoPlayerKey.currentState?.pauseVideo();
-                    final isBskyPost = postData.uri.collection
-                        .toString()
-                        .startsWith('app.bsky');
-                    context.router.push(
-                      ProfileRoute(
-                        did: postData.author.did,
-                        initialProfile: postData.author,
-                        bsky: isBskyPost,
-                      ),
-                    );
-                  },
                 ),
               ),
             ],
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart b/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
index 2d25c1e..47199ed 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
@@ -32,9 +32,6 @@ class SideActionBar extends ConsumerStatefulWidget {
     this.commentCount = '0',
     this.shareCount = '0',
     this.isLiked = false,
-    this.profileImageUrl,
-    this.isImage = false,
-    this.onProfilePressed,
     this.onMediaPauseRequested,
     this.showBlockOption = true,
   });
@@ -43,10 +40,7 @@ class SideActionBar extends ConsumerStatefulWidget {
   final String commentCount;
   final String shareCount;
   final bool isLiked;
-  final String? profileImageUrl;
   final PostView post;
-  final bool isImage;
-  final VoidCallback? onProfilePressed;
   final VoidCallback? onMediaPauseRequested;
 
   /// Whether to show the block option in the options panel.
diff --git a/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart b/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
index c6c6860..3318fa6 100644
--- a/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
+++ b/lib/src/features/feed/ui/widgets/feed/feeds_bar.dart
@@ -83,15 +83,9 @@ class _FeedsBarState extends ConsumerState<FeedsBar> {
                     ),
                     onTap: () async {
                       Navigator.pop(context);
-                      if (isLiked) {
-                        await ref
-                            .read(settingsProvider.notifier)
-                            .unlikeFeed(feed);
-                      } else {
-                        await ref
-                            .read(settingsProvider.notifier)
-                            .likeFeed(feed);
-                      }
+                      await ref
+                          .read(settingsProvider.notifier)
+                          .setFeedLiked(feed, liked: !isLiked);
                     },
                   ),
                 // Delete option
diff --git a/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart b/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
index 48a7521..60f5d0f 100644
--- a/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
+++ b/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
@@ -1,12 +1,10 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/design_system/tokens/colors.dart';
-import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/widgets/content_warning_overlay.dart';
 import 'package:spark/src/core/ui/widgets/heart_animation.dart';
 import 'package:spark/src/core/utils/label_utils.dart';
@@ -258,25 +256,9 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
                     isLiked:
                         _overrideIsLiked ?? (currentPost.viewer?.like != null),
                     labels: labels,
-                    onProfilePressed: () {
-                      _mediaViewerKey.currentState?.pauseMedia();
-                    },
                     onMediaPauseRequested: () {
                       _mediaViewerKey.currentState?.pauseMedia();
                     },
-                    onUsernameTap: () {
-                      _mediaViewerKey.currentState?.pauseMedia();
-                      final isBskyPost = currentPost.uri.collection
-                          .toString()
-                          .startsWith('app.bsky');
-                      context.router.push(
-                        ProfileRoute(
-                          did: currentPost.author.did,
-                          initialProfile: currentPost.author,
-                          bsky: isBskyPost,
-                        ),
-                      );
-                    },
                   ),
                 ),
               ],
diff --git a/lib/src/features/feed/ui/widgets/post/post_overlay.dart b/lib/src/features/feed/ui/widgets/post/post_overlay.dart
index a8f40b9..9750e30 100644
--- a/lib/src/features/feed/ui/widgets/post/post_overlay.dart
+++ b/lib/src/features/feed/ui/widgets/post/post_overlay.dart
@@ -1,8 +1,10 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/known_interactions_bar.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/utils/label_utils.dart';
 import 'package:spark/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart';
 import 'package:spark/src/features/feed/ui/widgets/post/info_bar.dart';
@@ -14,8 +16,7 @@ class PostOverlay extends ConsumerWidget {
     super.key,
     this.feed,
     this.isLiked = false,
-    this.onProfilePressed,
-    this.onUsernameTap,
+    this.onAuthorTap,
     this.onMediaPauseRequested,
     this.labels = const [],
     this.showBlockOption = true,
@@ -24,15 +25,33 @@ class PostOverlay extends ConsumerWidget {
   final PostView post;
   final Feed? feed;
   final bool isLiked;
-  final VoidCallback? onProfilePressed;
-  final VoidCallback? onUsernameTap;
   final VoidCallback? onMediaPauseRequested;
+
+  final VoidCallback? onAuthorTap;
+
   final List<Label> labels;
 
   /// Whether to show the block option in the options panel.
   /// Set to false for profile feeds where blocking doesn't make sense.
   final bool showBlockOption;
 
+  void _handleAuthorTap(BuildContext context) {
+    onMediaPauseRequested?.call();
+    final authorTap = onAuthorTap;
+    if (authorTap != null) {
+      authorTap();
+      return;
+    }
+
+    context.router.push(
+      ProfileRoute(
+        did: post.author.did,
+        initialProfile: post.author,
+        bsky: post.uri.collection.toString().startsWith('app.bsky'),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final bottomPadding = MediaQuery.of(context).padding.bottom;
@@ -108,7 +127,7 @@ class PostOverlay extends ConsumerWidget {
                               informLabels: informLabels,
                               isSprk: post.uri.toString().contains('so.sprk'),
                               audio: post.localSound,
-                              onUsernameTap: onUsernameTap,
+                              onUsernameTap: () => _handleAuthorTap(context),
                             );
                           },
                         ),
@@ -126,9 +145,6 @@ class PostOverlay extends ConsumerWidget {
                       commentCount: '${post.replyCount ?? 0}',
                       shareCount: '${post.repostCount ?? 0}',
                       isLiked: isLiked,
-                      profileImageUrl: post.author.avatar.toString(),
-                      isImage: post.imageUrls.length > 1,
-                      onProfilePressed: onProfilePressed,
                       onMediaPauseRequested: onMediaPauseRequested,
                       showBlockOption: showBlockOption,
                     ),
diff --git a/lib/src/features/feed/ui/widgets/post_likes_sheet.dart b/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
index 89129a3..0530449 100644
--- a/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
+++ b/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
@@ -126,8 +126,6 @@ class _PostLikesSheetState extends ConsumerState<_PostLikesSheet> {
                       userHandle: '@${actor.handle}',
                       description: actor.description,
                       isFollowing: actor.viewer?.following != null,
-                      onFollow: () {},
-                      onUnfollow: () {},
                       showFollowButton: false,
                       onTap: () {
                         final router = context.router;
diff --git a/lib/src/features/messages/ui/pages/messages_page.dart b/lib/src/features/messages/ui/pages/messages_page.dart
index 8b25b70..1b22266 100644
--- a/lib/src/features/messages/ui/pages/messages_page.dart
+++ b/lib/src/features/messages/ui/pages/messages_page.dart
@@ -19,6 +19,10 @@ class MessagesPage extends ConsumerStatefulWidget {
 }
 
 class _MessagesPageState extends ConsumerState<MessagesPage> {
+  void _openNewChat() {
+    context.router.push(const NewChatSearchRoute());
+  }
+
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context);
@@ -78,16 +82,11 @@ class _MessagesPageState extends ConsumerState<MessagesPage> {
               ),
             );
           },
-          onAddTap: () => context.router.push(const NewChatSearchRoute()),
-          onSearchTap: () {},
+          onAddTap: _openNewChat,
           onRefresh: refreshAndInvalidate,
         );
       },
-      loading: () {
-        return ChatListPageTemplate.loading(
-          onAddTap: () => context.router.push(const NewChatSearchRoute()),
-        );
-      },
+      loading: () => ChatListPageTemplate.loading(onAddTap: _openNewChat),
       error: (error, stack) {
         final theme = Theme.of(context);
         return Center(
diff --git a/lib/src/features/messages/ui/pages/new_chat_search_page.dart b/lib/src/features/messages/ui/pages/new_chat_search_page.dart
index 60a66e4..cfe5f35 100644
--- a/lib/src/features/messages/ui/pages/new_chat_search_page.dart
+++ b/lib/src/features/messages/ui/pages/new_chat_search_page.dart
@@ -246,8 +246,6 @@ class _UserResultsState extends ConsumerState<_UserResults> {
             userHandle: '@${actor.handle}',
             description: actor.description ?? '',
             isFollowing: false,
-            onFollow: () {},
-            onUnfollow: () {},
             showFollowButton: false, // Not relevant when starting a chat
             onTap: () => _startChat(actor),
           ),
diff --git a/lib/src/features/profile/providers/profile_provider.dart b/lib/src/features/profile/providers/profile_provider.dart
index 028b7d5..1aa6c35 100644
--- a/lib/src/features/profile/providers/profile_provider.dart
+++ b/lib/src/features/profile/providers/profile_provider.dart
@@ -141,39 +141,50 @@ class ProfileNotifier extends _$ProfileNotifier {
     return authRepository.isAuthenticated && authRepository.did == profileDid;
   }
 
-  Future<String?> toggleFollow() async {
+  Future<void> setFollowing({required bool following}) async {
     final currentData = state.asData!.value;
     final profile = currentData.profile;
 
     if (profile == null) {
-      logger.w('Cannot toggle follow, profile not loaded.');
-      throw Exception('Profile not loaded, cannot toggle follow.');
+      logger.w('Cannot update follow state, profile not loaded.');
+      throw Exception('Profile not loaded, cannot update follow state.');
     }
     if (!authRepository.isAuthenticated) {
       logger.i(
         'User not authenticated, showing auth prompt for follow action.',
       );
       state = AsyncData(currentData.copyWith(showAuthPrompt: true));
-      return null;
+      return;
+    }
+
+    final currentFollowUri = profile.viewer?.following;
+    if ((currentFollowUri != null) == following) {
+      return;
     }
 
     logger.d(
-      'Toggling follow for profile: ${profile.did}, '
-      'current follow URI: ${profile.viewer?.following ?? 'none'}',
+      'Setting follow state for profile ${profile.did} to $following, '
+      'current follow URI: ${currentFollowUri ?? 'none'}',
     );
     final originalStateValue = currentData;
 
     try {
-      final newFollowUriResult = await sprkRepository.graph.toggleFollow(
-        profile.did,
-        profile.viewer?.following,
-        bsky: bsky,
-      );
+      final AtUri? newFollowUri;
+      if (following) {
+        final followRef = await sprkRepository.graph.followUser(
+          profile.did,
+          bsky: bsky,
+        );
+        newFollowUri = followRef.uri;
+      } else {
+        await sprkRepository.graph.unfollowUser(currentFollowUri!);
+        newFollowUri = null;
+      }
 
-      if (newFollowUriResult != null) {
+      if (following) {
         logger.i(
           'Successfully followed ${profile.did}. '
-          'New follow URI: $newFollowUriResult',
+          'New follow URI: $newFollowUri',
         );
       } else {
         logger.i('Successfully unfollowed ${profile.did}.');
@@ -183,21 +194,13 @@ class ProfileNotifier extends _$ProfileNotifier {
       final currentFollowersCount = profile.followersCount ?? 0;
 
       // Update follower count: increment on follow, decrement on unfollow
-      final newFollowersCount = newFollowUriResult != null
+      final newFollowersCount = following
           ? currentFollowersCount + 1
           : (currentFollowersCount > 0 ? currentFollowersCount - 1 : 0);
 
       final optimisticViewer =
-          profile.viewer?.copyWith(
-            following: newFollowUriResult != null
-                ? AtUri.parse(newFollowUriResult)
-                : null,
-          ) ??
-          actor_viewer.ViewerState(
-            following: newFollowUriResult != null
-                ? AtUri.parse(newFollowUriResult)
-                : null,
-          );
+          profile.viewer?.copyWith(following: newFollowUri) ??
+          actor_viewer.ViewerState(following: newFollowUri);
 
       final optimisticProfile = profile.copyWith(
         viewer: optimisticViewer,
@@ -207,16 +210,14 @@ class ProfileNotifier extends _$ProfileNotifier {
       state = AsyncData(
         originalStateValue.copyWith(profile: optimisticProfile),
       );
-
-      return newFollowUriResult;
     } catch (e, s) {
       logger.e(
-        'Error toggling follow for ${profile.did}',
+        'Error updating follow state for ${profile.did}',
         error: e,
         stackTrace: s,
       );
       state = AsyncData(originalStateValue);
-      throw Exception('Failed to toggle follow: $e');
+      throw Exception('Failed to update follow state: $e');
     }
   }
 
diff --git a/lib/src/features/profile/ui/pages/profile_page.dart b/lib/src/features/profile/ui/pages/profile_page.dart
index e353fbd..4f8f5be 100644
--- a/lib/src/features/profile/ui/pages/profile_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_page.dart
@@ -289,18 +289,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
               }
             });
           },
-          onFollowTap: () async {
+          onFollowingChanged: (following) async {
             try {
-              await notifier.toggleFollow();
+              await notifier.setFollowing(following: following);
             } catch (e) {
-              _logger.e('Error unfollowing profile', error: e);
-            }
-          },
-          onUnfollowTap: () async {
-            try {
-              await notifier.toggleFollow();
-            } catch (e) {
-              _logger.e('Error unfollowing profile', error: e);
+              _logger.e('Error updating follow state', error: e);
             }
           },
           onUnblockTap: () async {
diff --git a/lib/src/features/profile/ui/widgets/blocks_list_view.dart b/lib/src/features/profile/ui/widgets/blocks_list_view.dart
index 99010a6..8d571f4 100644
--- a/lib/src/features/profile/ui/widgets/blocks_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/blocks_list_view.dart
@@ -50,8 +50,6 @@ class BlocksListView extends ConsumerWidget {
             description: user.description,
             isFollowing: false,
             isBlocking: true,
-            onFollow: () {},
-            onUnfollow: () {},
             onUnblock: () {
               ref.read(blocksProvider(did: did).notifier).unblockUser(user.did);
             },
diff --git a/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart b/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
index 26d1592..43df502 100644
--- a/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
+++ b/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
@@ -6,7 +6,6 @@ import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/design_system/tokens/colors.dart';
-import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/widgets/content_warning_overlay.dart';
 import 'package:spark/src/core/ui/widgets/heart_animation.dart';
 import 'package:spark/src/core/utils/label_utils.dart';
@@ -237,35 +236,15 @@ class _ProfileFeedPostWidgetState extends ConsumerState<ProfileFeedPostWidget> {
               Positioned.fill(
                 child: PostOverlay(
                   post: post,
+                  onAuthorTap: post.author.did == widget.profileUri.hostname
+                      ? () => context.router.maybePop()
+                      : null,
                   isLiked: _overrideIsLiked ?? (post.viewer?.like != null),
                   labels: post.labels ?? [],
                   showBlockOption: false,
                   onMediaPauseRequested: () {
                     _mediaViewerKey.currentState?.pauseMedia();
                   },
-                  onUsernameTap: () {
-                    _mediaViewerKey.currentState?.pauseMedia();
-                    // Extract DID from the profile URI
-                    final currentProfileDid = widget.profileUri.hostname;
-
-                    // If clicking on same profile we're viewing, navigate back
-                    if (post.author.did == currentProfileDid) {
-                      context.router.maybePop();
-                    } else {
-                      // Check if post is from Bluesky
-                      final isBskyPost = post.uri.collection
-                          .toString()
-                          .startsWith('app.bsky');
-                      // Otherwise, navigate to the new profile
-                      context.router.push(
-                        ProfileRoute(
-                          did: post.author.did,
-                          initialProfile: post.author,
-                          bsky: isBskyPost,
-                        ),
-                      );
-                    }
-                  },
                 ),
               ),
             ],
diff --git a/lib/src/features/profile/ui/widgets/user_list_view.dart b/lib/src/features/profile/ui/widgets/user_list_view.dart
index 2aa6495..1f0d182 100644
--- a/lib/src/features/profile/ui/widgets/user_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/user_list_view.dart
@@ -66,15 +66,15 @@ class UserListView extends ConsumerWidget {
             userHandle: '@${user.handle}',
             description: user.description,
             isFollowing: user.viewer?.following != null,
-            onFollow: () {
-              ref
-                  .read(userListProvider(did: did, type: type).notifier)
-                  .followUser(user.did);
-            },
-            onUnfollow: () {
-              ref
-                  .read(userListProvider(did: did, type: type).notifier)
-                  .unfollowUser(user.did);
+            onFollowingChanged: (shouldFollow) {
+              final notifier = ref.read(
+                userListProvider(did: did, type: type).notifier,
+              );
+              if (shouldFollow) {
+                notifier.followUser(user.did);
+              } else {
+                notifier.unfollowUser(user.did);
+              }
             },
             showFollowButton: !ref
                 .read(userListProvider(did: did, type: type).notifier)
diff --git a/lib/src/features/search/ui/pages/user_results.dart b/lib/src/features/search/ui/pages/user_results.dart
index b751dcf..20a0d0e 100644
--- a/lib/src/features/search/ui/pages/user_results.dart
+++ b/lib/src/features/search/ui/pages/user_results.dart
@@ -195,14 +195,17 @@ class _UserResultsState extends ConsumerState<UserResults>
             userHandle: '@${actor.handle}',
             description: actor.description ?? '',
             isFollowing: isFollowing,
-            onFollow: () =>
-                ref.read(searchProvider.notifier).followUser(actor.did),
-            onUnfollow: () => ref
-                .read(searchProvider.notifier)
-                .unfollowUser(
+            onFollowingChanged: (shouldFollow) {
+              final notifier = ref.read(searchProvider.notifier);
+              if (shouldFollow) {
+                notifier.followUser(actor.did);
+              } else {
+                notifier.unfollowUser(
                   actor.did,
                   actor.viewer?.following ?? AtUri.parse(''),
-                ),
+                );
+              }
+            },
             showFollowButton: !ref
                 .read(searchProvider.notifier)
                 .isCurrentUser(actor.did),
diff --git a/lib/src/features/settings/providers/settings_provider.dart b/lib/src/features/settings/providers/settings_provider.dart
index 5a45903..d1479be 100644
--- a/lib/src/features/settings/providers/settings_provider.dart
+++ b/lib/src/features/settings/providers/settings_provider.dart
@@ -339,21 +339,26 @@ class Settings extends _$Settings {
     }
   }
 
-  /// Likes a feed generator
-  Future<void> likeFeed(Feed feed) async {
-    if (feed.view != null) {
+  /// Updates whether the current user likes a feed generator.
+  Future<void> setFeedLiked(Feed feed, {required bool liked}) async {
+    final generator = feed.view;
+    if (generator == null || (generator.viewer?.like != null) == liked) {
+      return;
+    }
+
+    if (liked) {
       final likeRef = await feedRepository.likePost(
-        feed.view!.cid,
-        feed.view!.uri,
+        generator.cid,
+        generator.uri,
       );
 
       // Update the feed with the like information
       final updatedFeed = Feed(
         type: feed.type,
         config: feed.config,
-        view: feed.view?.copyWith(
+        view: generator.copyWith(
           viewer:
-              feed.view!.viewer?.copyWith(like: likeRef.uri) ??
+              generator.viewer?.copyWith(like: likeRef.uri) ??
               GeneratorViewerState(like: likeRef.uri),
         ),
       );
@@ -370,35 +375,29 @@ class Settings extends _$Settings {
       }
 
       state = state.copyWith(feeds: updatedFeeds, likedFeeds: likedFeeds);
+      return;
     }
-  }
 
-  /// Unlikes a feed generator
-  Future<void> unlikeFeed(Feed feed) async {
-    if (feed.view?.viewer?.like != null) {
-      await feedRepository.unlikePost(feed.view!.viewer!.like!);
+    await feedRepository.unlikePost(generator.viewer!.like!);
 
-      // Update the feed to remove like information
-      final updatedFeed = Feed(
-        type: feed.type,
-        config: feed.config,
-        view: feed.view?.copyWith(
-          viewer: feed.view!.viewer?.copyWith(like: null),
-        ),
-      );
+    // Update the feed to remove like information
+    final updatedFeed = Feed(
+      type: feed.type,
+      config: feed.config,
+      view: generator.copyWith(viewer: generator.viewer!.copyWith(like: null)),
+    );
 
-      // Update feeds list
-      final updatedFeeds = state.feeds
-          .map((f) => f.config.id == updatedFeed.config.id ? updatedFeed : f)
-          .toList();
+    // Update feeds list
+    final updatedFeeds = state.feeds
+        .map((f) => f.config.id == updatedFeed.config.id ? updatedFeed : f)
+        .toList();
 
-      // Remove from liked feeds
-      final likedFeeds = state.likedFeeds
-          .where((f) => f.config.id != updatedFeed.config.id)
-          .toList();
+    // Remove from liked feeds
+    final likedFeeds = state.likedFeeds
+        .where((f) => f.config.id != updatedFeed.config.id)
+        .toList();
 
-      state = state.copyWith(feeds: updatedFeeds, likedFeeds: likedFeeds);
-    }
+    state = state.copyWith(feeds: updatedFeeds, likedFeeds: likedFeeds);
   }
 
   /// Syncs all preferences from server
diff --git a/lib/src/features/settings/ui/pages/feed_list_page.dart b/lib/src/features/settings/ui/pages/feed_list_page.dart
index df755fd..314e41a 100644
--- a/lib/src/features/settings/ui/pages/feed_list_page.dart
+++ b/lib/src/features/settings/ui/pages/feed_list_page.dart
@@ -4,11 +4,11 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_leading_button.dart';
-import 'package:spark/src/core/design_system/components/molecules/settings_feed_card.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/features/settings/providers/settings_provider.dart';
 import 'package:spark/src/features/settings/providers/settings_state.dart';
+import 'package:spark/src/features/settings/ui/widgets/settings_feed_card.dart';
 
 @RoutePage()
 class FeedListPage extends ConsumerStatefulWidget {
@@ -26,7 +26,7 @@ class _FeedListPageState extends ConsumerState<FeedListPage>
   @override
   bool get wantKeepAlive => true;
 
-  void _showFeedUpdateError() {
+  void _showFeedReorderError() {
     if (!mounted) return;
     final l10n = AppLocalizations.of(context);
     ScaffoldMessenger.of(
@@ -109,7 +109,7 @@ class _FeedListPageState extends ConsumerState<FeedListPage>
                         beforeFeedId: beforeFeedId,
                       );
                 } catch (_) {
-                  _showFeedUpdateError();
+                  _showFeedReorderError();
                 }
               },
               proxyDecorator: (child, index, animation) {
@@ -140,12 +140,6 @@ class _FeedListPageState extends ConsumerState<FeedListPage>
               itemBuilder: (context, index) {
                 final filteredFeeds = _getFilteredFeeds(settingsState);
                 final feed = filteredFeeds[index];
-                final isActive = settingsState.activeFeed == feed;
-
-                // Determine if feed can be deleted (Following can't be deleted)
-                final canDelete =
-                    !(feed.type == 'timeline' &&
-                        feed.config.value == 'following');
 
                 return Padding(
                   key: ValueKey(feed.config.id),
@@ -155,77 +149,8 @@ class _FeedListPageState extends ConsumerState<FeedListPage>
                     mode: _isEditMode
                         ? SettingsFeedCardMode.edit
                         : SettingsFeedCardMode.display,
-                    isActive: isActive,
                     index: index,
-                    onTap: _isEditMode || _isReordering
-                        ? null
-                        : () {
-                            ref
-                                .read(settingsProvider.notifier)
-                                .setActiveFeed(feed);
-                          },
-                    onDelete: _isEditMode && canDelete
-                        ? () async {
-                            // Handle delete action
-                            try {
-                              await ref
-                                  .read(settingsProvider.notifier)
-                                  .removeFeed(feed);
-                            } catch (_) {
-                              _showFeedUpdateError();
-                            }
-                          }
-                        : null,
-                    onPin: _isEditMode
-                        ? () async {
-                            // Handle pin action
-                            try {
-                              if (!feed.config.pinned) {
-                                await ref
-                                    .read(settingsProvider.notifier)
-                                    .setFeedPinned(feed, pinned: true);
-                              }
-                            } catch (_) {
-                              _showFeedUpdateError();
-                            }
-                          }
-                        : null,
-                    onUnpin: _isEditMode
-                        ? () async {
-                            // Handle unpin action
-                            try {
-                              if (feed.config.pinned) {
-                                await ref
-                                    .read(settingsProvider.notifier)
-                                    .setFeedPinned(feed, pinned: false);
-                              }
-                            } catch (_) {
-                              _showFeedUpdateError();
-                            }
-                          }
-                        : null,
-                    onLike: feed.view != null
-                        ? () async {
-                            try {
-                              await ref
-                                  .read(settingsProvider.notifier)
-                                  .likeFeed(feed);
-                            } catch (_) {
-                              _showFeedUpdateError();
-                            }
-                          }
-                        : null,
-                    onUnlike: feed.view?.viewer?.like != null
-                        ? () async {
-                            try {
-                              await ref
-                                  .read(settingsProvider.notifier)
-                                  .unlikeFeed(feed);
-                            } catch (_) {
-                              _showFeedUpdateError();
-                            }
-                          }
-                        : null,
+                    interactionEnabled: !_isReordering,
                   ),
                 );
               },
diff --git a/lib/src/core/design_system/components/molecules/settings_feed_card.dart b/lib/src/features/settings/ui/widgets/settings_feed_card.dart
similarity index 50%
rename from lib/src/core/design_system/components/molecules/settings_feed_card.dart
rename to lib/src/features/settings/ui/widgets/settings_feed_card.dart
index 4f1a5c2..ef97b37 100644
--- a/lib/src/core/design_system/components/molecules/settings_feed_card.dart
+++ b/lib/src/features/settings/ui/widgets/settings_feed_card.dart
@@ -1,5 +1,6 @@
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/interactive_pressable.dart';
 import 'package:spark/src/core/design_system/components/atoms/icons.dart';
 import 'package:spark/src/core/design_system/tokens/colors.dart';
@@ -7,65 +8,138 @@ import 'package:spark/src/core/design_system/tokens/shapes.dart';
 import 'package:spark/src/core/design_system/tokens/typography.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/features/settings/providers/settings_provider.dart';
 
 enum SettingsFeedCardMode { display, edit }
 
-class SettingsFeedCard extends StatelessWidget {
+class SettingsFeedCard extends ConsumerWidget {
   const SettingsFeedCard({
     required this.feed,
     required this.mode,
-    required this.isActive,
     required this.index,
-    this.onTap,
-    this.onDelete,
-    this.onPin,
-    this.onUnpin,
-    this.onLike,
-    this.onUnlike,
+    this.interactionEnabled = true,
     super.key,
   });
 
   final Feed feed;
   final SettingsFeedCardMode mode;
-  final bool isActive;
   final int index;
-  final VoidCallback? onTap;
-  final VoidCallback? onDelete;
-  final VoidCallback? onPin;
-  final VoidCallback? onUnpin;
-  final VoidCallback? onLike;
-  final VoidCallback? onUnlike;
+  final bool interactionEnabled;
 
-  GeneratorView? get generator => feed.view;
+  GeneratorView? get _generator => feed.view;
 
   bool get _isTimeline => feed.type == 'timeline';
 
-  bool get _isLiked => feed.view?.viewer?.like != null;
+  bool get _isLiked => _generator?.viewer?.like != null;
+
+  bool get _canDelete =>
+      !(feed.type == 'timeline' && feed.config.value == 'following');
 
   String _getTitle(AppLocalizations l10n) {
-    if (generator != null) {
-      return generator!.displayName;
+    return _generator?.displayName ??
+        (_isTimeline ? l10n.labelFollowing : feed.config.value);
+  }
+
+  String? _getSubtitle(AppLocalizations l10n) {
+    if (_generator != null) {
+      return l10n.labelFeedByCreator(_generator!.creator.handle);
     }
-    return _isTimeline ? l10n.labelFollowing : feed.config.value;
+    return _isTimeline ? l10n.messagePostsFromFollowing : null;
   }
 
-  String? get _subtitle {
-    if (generator != null) {
-      return 'by @${generator!.creator.handle}';
+  Future<void> _selectFeed(BuildContext context, WidgetRef ref) async {
+    try {
+      await ref.read(settingsProvider.notifier).setActiveFeed(feed);
+    } catch (_) {
+      if (!context.mounted) return;
+      _showFeedUpdateError(context);
     }
-    if (_isTimeline) {
-      return 'Posts from people you follow';
+  }
+
+  Future<void> _deleteFeed(BuildContext context, WidgetRef ref) async {
+    try {
+      await ref.read(settingsProvider.notifier).removeFeed(feed);
+    } catch (_) {
+      if (!context.mounted) return;
+      _showFeedUpdateError(context);
     }
-    return null;
   }
 
-  String get _avatarUrl {
-    if (generator?.avatar != null) {
-      return generator!.avatar.toString();
+  Future<void> _setLiked(
+    BuildContext context,
+    WidgetRef ref, {
+    required bool liked,
+  }) async {
+    try {
+      await ref
+          .read(settingsProvider.notifier)
+          .setFeedLiked(feed, liked: liked);
+    } catch (_) {
+      if (!context.mounted) return;
+      _showFeedUpdateError(context);
     }
-    return '';
   }
 
+  void _showFeedUpdateError(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    ScaffoldMessenger.of(
+      context,
+    ).showSnackBar(SnackBar(content: Text(l10n.errorUpdatingFeeds)));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final l10n = AppLocalizations.of(context);
+
+    return _SettingsFeedCardView(
+      title: _getTitle(l10n),
+      subtitle: _getSubtitle(l10n),
+      avatarUrl: _generator?.avatar?.toString() ?? '',
+      mode: mode,
+      index: index,
+      isTimeline: _isTimeline,
+      isLiked: _isLiked,
+      onTap:
+          mode == SettingsFeedCardMode.display &&
+              interactionEnabled &&
+              feed.config.pinned
+          ? () => _selectFeed(context, ref)
+          : null,
+      onDelete: mode == SettingsFeedCardMode.edit && _canDelete
+          ? () => _deleteFeed(context, ref)
+          : null,
+      onLikedChanged: _generator != null
+          ? (liked) => _setLiked(context, ref, liked: liked)
+          : null,
+    );
+  }
+}
+
+class _SettingsFeedCardView extends StatelessWidget {
+  const _SettingsFeedCardView({
+    required this.title,
+    required this.subtitle,
+    required this.avatarUrl,
+    required this.mode,
+    required this.index,
+    required this.isTimeline,
+    required this.isLiked,
+    required this.onTap,
+    required this.onDelete,
+    required this.onLikedChanged,
+  });
+
+  final String title;
+  final String? subtitle;
+  final String avatarUrl;
+  final SettingsFeedCardMode mode;
+  final int index;
+  final bool isTimeline;
+  final bool isLiked;
+  final VoidCallback? onTap;
+  final VoidCallback? onDelete;
+  final ValueChanged<bool>? onLikedChanged;
+
   @override
   Widget build(BuildContext context) {
     final isDark = Theme.of(context).brightness == Brightness.dark;
@@ -91,21 +165,24 @@ class SettingsFeedCard extends StatelessWidget {
       color: backgroundColor,
       shape: RoundedRectangleBorder(borderRadius: radius),
       clipBehavior: Clip.antiAlias,
-      child: Container(
+      child: Ink(
         decoration: BoxDecoration(
           borderRadius: radius,
           border: Border.all(color: borderColor),
         ),
-        child: Padding(
-          padding: const EdgeInsets.all(12),
-          child: Row(
-            children: [
-              _buildAvatar(),
-              const SizedBox(width: 12),
-              Expanded(child: _buildTextContent(context)),
-              const SizedBox(width: 8),
-              _buildLikeButton(),
-            ],
+        child: InkWell(
+          onTap: onTap,
+          child: Padding(
+            padding: const EdgeInsets.all(12),
+            child: Row(
+              children: [
+                _buildAvatar(),
+                const SizedBox(width: 12),
+                Expanded(child: _buildTextContent()),
+                const SizedBox(width: 8),
+                _buildLikeButton(),
+              ],
+            ),
           ),
         ),
       ),
@@ -135,11 +212,11 @@ class SettingsFeedCard extends StatelessWidget {
             children: [
               _buildAvatar(),
               const SizedBox(width: 12),
-              Expanded(child: _buildTextContent(context)),
+              Expanded(child: _buildTextContent()),
               const SizedBox(width: 8),
-              _buildEditActions(),
+              _buildDeleteButton(),
               const SizedBox(width: 8),
-              _buildDragHandle(index),
+              _buildDragHandle(),
             ],
           ),
         ),
@@ -150,13 +227,12 @@ class SettingsFeedCard extends StatelessWidget {
   Widget _buildAvatar() {
     return ClipRRect(
       borderRadius: BorderRadius.circular(8),
-      child: Container(
+      child: SizedBox(
         width: 40,
         height: 40,
-        decoration: BoxDecoration(borderRadius: BorderRadius.circular(8)),
-        child: _avatarUrl.isNotEmpty
+        child: avatarUrl.isNotEmpty
             ? Image.network(
-                _avatarUrl,
+                avatarUrl,
                 width: 40,
                 height: 40,
                 fit: BoxFit.cover,
@@ -169,15 +245,10 @@ class SettingsFeedCard extends StatelessWidget {
   }
 
   Widget _buildFallbackAvatar() {
-    return Container(
-      width: 40,
-      height: 40,
-      decoration: BoxDecoration(
-        color: AppColors.primary600,
-        borderRadius: BorderRadius.circular(8),
-      ),
+    return ColoredBox(
+      color: AppColors.primary600,
       child: Icon(
-        _isTimeline
+        isTimeline
             ? FluentIcons.people_24_regular
             : FluentIcons.feed_24_regular,
         size: 20,
@@ -186,22 +257,21 @@ class SettingsFeedCard extends StatelessWidget {
     );
   }
 
-  Widget _buildTextContent(BuildContext context) {
-    final l10n = AppLocalizations.of(context);
+  Widget _buildTextContent() {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
       children: [
         Text(
-          _getTitle(l10n),
+          title,
           style: AppTypography.textSmallBold,
           overflow: TextOverflow.ellipsis,
           maxLines: 1,
         ),
-        if (_subtitle != null) ...[
+        if (subtitle != null) ...[
           const SizedBox(height: 2),
           Text(
-            _subtitle!,
+            subtitle!,
             style: AppTypography.textExtraSmallThin,
             overflow: TextOverflow.ellipsis,
             maxLines: 1,
@@ -211,7 +281,7 @@ class SettingsFeedCard extends StatelessWidget {
     );
   }
 
-  Widget _buildDragHandle(int index) {
+  Widget _buildDragHandle() {
     return ReorderableDragStartListener(
       index: index,
       child: Icon(
@@ -223,50 +293,41 @@ class SettingsFeedCard extends StatelessWidget {
   }
 
   Widget _buildLikeButton() {
-    // Don't show like button for timeline
-    if (_isTimeline) return const SizedBox.shrink();
+    if (isTimeline) return const SizedBox.shrink();
 
     return InteractivePressable(
-      onTap: _isLiked ? onUnlike : onLike,
+      onTap: onLikedChanged == null ? null : () => onLikedChanged!(!isLiked),
       borderRadius: BorderRadius.circular(6),
       child: Container(
         padding: const EdgeInsets.all(8),
         decoration: BoxDecoration(
-          color: _isLiked ? AppColors.primary600 : Colors.transparent,
+          color: isLiked ? AppColors.primary600 : Colors.transparent,
           borderRadius: BorderRadius.circular(6),
           border: Border.all(
-            color: _isLiked
-                ? AppColors.primary600
-                : (Colors.grey.withAlpha(100)),
+            color: isLiked ? AppColors.primary600 : Colors.grey.withAlpha(100),
           ),
         ),
-        child: _isLiked
+        child: isLiked
             ? AppIcons.likeFilled(size: 16, color: Colors.white)
             : AppIcons.like(size: 16, color: Colors.grey),
       ),
     );
   }
 
-  Widget _buildEditActions() {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        if (onDelete != null) ...[
-          const SizedBox(width: 8),
-          InteractivePressable(
-            onTap: onDelete,
-            borderRadius: BorderRadius.circular(6),
-            child: Container(
-              padding: const EdgeInsets.all(8),
-              decoration: BoxDecoration(
-                color: Colors.red.shade500,
-                borderRadius: BorderRadius.circular(6),
-              ),
-              child: const Icon(Icons.delete, size: 16, color: Colors.white),
-            ),
-          ),
-        ],
-      ],
+  Widget _buildDeleteButton() {
+    if (onDelete == null) return const SizedBox.shrink();
+
+    return InteractivePressable(
+      onTap: onDelete,
+      borderRadius: BorderRadius.circular(6),
+      child: Container(
+        padding: const EdgeInsets.all(8),
+        decoration: BoxDecoration(
+          color: Colors.red.shade500,
+          borderRadius: BorderRadius.circular(6),
+        ),
+        child: const Icon(Icons.delete, size: 16, color: Colors.white),
+      ),
     );
   }
 }
diff --git a/lib/src/features/sound/ui/pages/sound_page.dart b/lib/src/features/sound/ui/pages/sound_page.dart
index 4d7f9e8..e31cbd0 100644
--- a/lib/src/features/sound/ui/pages/sound_page.dart
+++ b/lib/src/features/sound/ui/pages/sound_page.dart
@@ -86,17 +86,7 @@ class _SoundPageState extends ConsumerState<SoundPage> {
             controller: _scrollController,
             slivers: [
               // Header Card
-              SliverToBoxAdapter(
-                child: SoundHeaderCard(
-                  audio: state.audio,
-                  onAuthorTap: () => context.router.push(
-                    ProfileRoute(
-                      did: state.audio.author.did,
-                      initialProfile: state.audio.author,
-                    ),
-                  ),
-                ),
-              ),
+              SliverToBoxAdapter(child: SoundHeaderCard(audio: state.audio)),
 
               // Posts Grid
               if (state.posts.isEmpty)
diff --git a/lib/src/features/sound/ui/widgets/sound_header_card.dart b/lib/src/features/sound/ui/widgets/sound_header_card.dart
index a0e7156..edc5723 100644
--- a/lib/src/features/sound/ui/widgets/sound_header_card.dart
+++ b/lib/src/features/sound/ui/widgets/sound_header_card.dart
@@ -1,4 +1,5 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:spark/src/core/design_system/components/atoms/icons.dart';
 import 'package:spark/src/core/design_system/tokens/colors.dart';
@@ -7,16 +8,12 @@ import 'package:spark/src/core/design_system/tokens/typography.dart';
 import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/pro_video_editor/models/sound_audio_track.dart';
 import 'package:spark/src/core/pro_video_editor/ui/widgets/audio/sound_artwork.dart';
+import 'package:spark/src/core/routing/app_router.dart';
 
 class SoundHeaderCard extends StatefulWidget {
-  const SoundHeaderCard({
-    required this.audio,
-    required this.onAuthorTap,
-    super.key,
-  });
+  const SoundHeaderCard({required this.audio, super.key});
 
   final AudioView audio;
-  final VoidCallback onAuthorTap;
 
   @override
   State<SoundHeaderCard> createState() => _SoundHeaderCardState();
@@ -92,7 +89,12 @@ class _SoundHeaderCardState extends State<SoundHeaderCard> {
 
                 // Author
                 GestureDetector(
-                  onTap: widget.onAuthorTap,
+                  onTap: () => context.router.push(
+                    ProfileRoute(
+                      did: widget.audio.author.did,
+                      initialProfile: widget.audio.author,
+                    ),
+                  ),
                   child: Text(
                     '@${widget.audio.author.handle}',
                     style: AppTypography.textSmallThin.copyWith(
diff --git a/lib/src/features/stories/ui/pages/author_stories_page.dart b/lib/src/features/stories/ui/pages/author_stories_page.dart
index 2fe7f8f..b42178b 100644
--- a/lib/src/features/stories/ui/pages/author_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/author_stories_page.dart
@@ -10,7 +10,6 @@ import 'package:spark/src/core/design_system/components/atoms/user_avatar.dart';
 import 'package:spark/src/features/stories/ui/pages/story_page.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
-@RoutePage()
 class AuthorStoriesPage extends ConsumerStatefulWidget {
   const AuthorStoriesPage({
     required this.author,
diff --git a/lib/src/features/stories/ui/pages/story_page.dart b/lib/src/features/stories/ui/pages/story_page.dart
index 96ab1fb..392d302 100644
--- a/lib/src/features/stories/ui/pages/story_page.dart
+++ b/lib/src/features/stories/ui/pages/story_page.dart
@@ -11,7 +11,6 @@ import 'package:spark/src/core/network/atproto/data/models/story_embed_models.da
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:video_player/video_player.dart';
 
-@RoutePage()
 class StoryPage extends ConsumerStatefulWidget {
   const StoryPage({
     required this.story,
diff --git a/test/src/core/design_system/components/profile_card_test.dart b/test/src/core/design_system/components/profile_card_test.dart
new file mode 100644
index 0000000..542b436
--- /dev/null
+++ b/test/src/core/design_system/components/profile_card_test.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:spark/src/core/design_system/components/atoms/toggles/toggle_button.dart';
+import 'package:spark/src/core/design_system/components/molecules/profile_card.dart';
+import 'package:spark/src/core/l10n/app_localizations.dart';
+
+void main() {
+  testWidgets('reports follow and unfollow through one state-change intent', (
+    tester,
+  ) async {
+    final changes = <bool>[];
+
+    await tester.pumpWidget(
+      _TestApp(
+        child: ProfileCard(
+          imageUrl: '',
+          userName: 'Alice',
+          userHandle: '@alice',
+          isFollowing: false,
+          onFollowingChanged: changes.add,
+        ),
+      ),
+    );
+
+    await tester.tap(find.byType(ToggleButton));
+    await tester.pump();
+    expect(changes, [true]);
+
+    await tester.pumpWidget(
+      _TestApp(
+        child: ProfileCard(
+          imageUrl: '',
+          userName: 'Alice',
+          userHandle: '@alice',
+          isFollowing: true,
+          onFollowingChanged: changes.add,
+        ),
+      ),
+    );
+
+    await tester.tap(find.byType(ToggleButton));
+    await tester.pump();
+    expect(changes, [true, false]);
+  });
+
+  testWidgets('does not require a no-op callback when actions are hidden', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      const _TestApp(
+        child: ProfileCard(
+          imageUrl: '',
+          userName: 'Alice',
+          userHandle: '@alice',
+          isFollowing: false,
+          showFollowButton: false,
+        ),
+      ),
+    );
+
+    expect(find.text('Follow'), findsNothing);
+    expect(find.text('Unfollow'), findsNothing);
+  });
+}
+
+class _TestApp extends StatelessWidget {
+  const _TestApp({required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      home: Scaffold(body: child),
+    );
+  }
+}
diff --git a/test/src/features/settings/ui/widgets/settings_feed_card_test.dart b/test/src/features/settings/ui/widgets/settings_feed_card_test.dart
new file mode 100644
index 0000000..66d9900
--- /dev/null
+++ b/test/src/features/settings/ui/widgets/settings_feed_card_test.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:spark/src/core/l10n/app_localizations.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
+import 'package:spark/src/features/settings/ui/widgets/settings_feed_card.dart';
+
+void main() {
+  testWidgets('only pinned feeds can be selected', (tester) async {
+    Future<void> pumpCard({required bool pinned}) {
+      return tester.pumpWidget(
+        ProviderScope(
+          child: MaterialApp(
+            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            supportedLocales: AppLocalizations.supportedLocales,
+            home: Scaffold(
+              body: SettingsFeedCard(
+                feed: Feed(
+                  type: 'feed',
+                  config: makeSavedFeed(
+                    type: 'feed',
+                    value: 'at://did:plc:feed/app.bsky.feed.generator/test',
+                    pinned: pinned,
+                  ),
+                ),
+                mode: SettingsFeedCardMode.display,
+                index: 0,
+              ),
+            ),
+          ),
+        ),
+      );
+    }
+
+    await pumpCard(pinned: false);
+    expect(tester.widget<InkWell>(find.byType(InkWell)).onTap, isNull);
+
+    await pumpCard(pinned: true);
+    expect(tester.widget<InkWell>(find.byType(InkWell)).onTap, isNotNull);
+  });
+}
diff --git a/widgetbook/lib/molecules/profile_card.dart b/widgetbook/lib/molecules/profile_card.dart
index 01bcaa3..4fc834a 100644
--- a/widgetbook/lib/molecules/profile_card.dart
+++ b/widgetbook/lib/molecules/profile_card.dart
@@ -23,8 +23,8 @@ Widget buildProfileCardFollowCardUseCase(BuildContext context) {
         initialValue: '@janedoe',
       ),
       isFollowing: isFollowing,
-      onFollow: () => print('Follow'),
-      onUnfollow: () => print('Unfollow'),
+      onFollowingChanged: (isFollowing) =>
+          print(isFollowing ? 'Follow' : 'Unfollow'),
     ),
   );
 }
diff --git a/widgetbook/lib/templates/profile_page_template.dart b/widgetbook/lib/templates/profile_page_template.dart
index 5982f20..4692a6b 100644
--- a/widgetbook/lib/templates/profile_page_template.dart
+++ b/widgetbook/lib/templates/profile_page_template.dart
@@ -162,8 +162,8 @@ Widget buildProfilePageTemplateOtherUserNotFollowingUseCase(
     onAvatarTap: () => print('Avatar tapped'),
     onFollowersTap: () => print('Followers tapped'),
     onFollowingTap: () => print('Following tapped'),
-    onFollowTap: () => print('Follow tapped'),
-    onUnfollowTap: () => print('Unfollow tapped'),
+    onFollowingChanged: (isFollowing) =>
+        print(isFollowing ? 'Follow tapped' : 'Unfollow tapped'),
     onEarlySupporterTap: () => print('Early supporter badge tapped'),
     onMentionTap: (username) => print('Mention tapped: $username'),
     appBarActions: [
@@ -218,8 +218,8 @@ Widget buildProfilePageTemplateOtherUserFollowingUseCase(BuildContext context) {
     onAvatarTap: () => print('Avatar tapped'),
     onFollowersTap: () => print('Followers tapped'),
     onFollowingTap: () => print('Following tapped'),
-    onFollowTap: () => print('Follow tapped'),
-    onUnfollowTap: () => print('Unfollow tapped'),
+    onFollowingChanged: (isFollowing) =>
+        print(isFollowing ? 'Follow tapped' : 'Unfollow tapped'),
     onEarlySupporterTap: () => print('Early supporter badge tapped'),
     onMentionTap: (username) => print('Mention tapped: $username'),
     appBarActions: [
@@ -260,8 +260,8 @@ Widget buildProfilePageTemplateMinimalProfileUseCase(BuildContext context) {
     onAvatarTap: () => print('Avatar tapped'),
     onFollowersTap: () => print('Followers tapped'),
     onFollowingTap: () => print('Following tapped'),
-    onFollowTap: () => print('Follow tapped'),
-    onUnfollowTap: () => print('Unfollow tapped'),
+    onFollowingChanged: (isFollowing) =>
+        print(isFollowing ? 'Follow tapped' : 'Unfollow tapped'),
     appBarActions: [
       IconButton(
         icon: const Icon(FluentIcons.more_vertical_24_regular),
-- 
2.51.2