From bf6bd05645ebba93d89bc89e63cc0c9f4c96cd31 Mon Sep 17 00:00:00 2001
From: Alex Musayev <alex.musayev@gmail.com>
Date: Sun, 19 Jul 2026 00:19:18 +0300
Subject: [PATCH 1/4] Remove ApplicationHelper include

---
 app/components/feed_filter_dropdown_component.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/components/feed_filter_dropdown_component.rb b/app/components/feed_filter_dropdown_component.rb
index f377d7d38..d96d46b34 100644
--- a/app/components/feed_filter_dropdown_component.rb
+++ b/app/components/feed_filter_dropdown_component.rb
@@ -1,6 +1,4 @@
 class FeedFilterDropdownComponent < ViewComponent::Base
-  include ApplicationHelper
-
   def initialize(feeds:, selected_feed:, sort_params:, menu_id:)
     @feeds = feeds
     @selected_feed = selected_feed

From ea62b65e026e01b14cd50deb355d10548e1d9b14 Mon Sep 17 00:00:00 2001
From: Alex Musayev <alex.musayev@gmail.com>
Date: Sun, 19 Jul 2026 00:19:27 +0300
Subject: [PATCH 2/4] Remove ApplicationHelper include

---
 app/components/sort_dropdown_component.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/components/sort_dropdown_component.rb b/app/components/sort_dropdown_component.rb
index 2b43418c5..6c0d943cd 100644
--- a/app/components/sort_dropdown_component.rb
+++ b/app/components/sort_dropdown_component.rb
@@ -1,6 +1,4 @@
 class SortDropdownComponent < ViewComponent::Base
-  include ApplicationHelper
-
   def initialize(presenter:, menu_id:)
     @presenter = presenter
     @menu_id = menu_id

From b1fed7fe4ef0bdcd23ad451215c49a6b510568d0 Mon Sep 17 00:00:00 2001
From: Alex Musayev <alex.musayev@gmail.com>
Date: Sun, 19 Jul 2026 00:41:00 +0300
Subject: [PATCH 3/4] Use helper proxy in feed filter dropdown

---
 app/components/feed_filter_dropdown_component.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/feed_filter_dropdown_component.html.erb b/app/components/feed_filter_dropdown_component.html.erb
index 36e77d470..9fb6982fe 100644
--- a/app/components/feed_filter_dropdown_component.html.erb
+++ b/app/components/feed_filter_dropdown_component.html.erb
@@ -9,7 +9,7 @@
     aria-haspopup="true"
     aria-expanded="false">
     <span><%= button_label %></span>
-    <%= icon("chevron-down", css_class: "size-4 text-muted") %>
+    <%= helpers.icon("chevron-down", css_class: "size-4 text-muted") %>
   </button>
   <div
     id="<%= menu_id %>"
@@ -22,7 +22,7 @@
       <label for="<%= menu_id %>-search" class="sr-only">Search feeds</label>
       <div class="relative">
         <div class="pointer-events-none absolute inset-y-0 start-0 flex items-center ps-3">
-          <%= icon("search", css_class: "size-4 text-muted") %>
+          <%= helpers.icon("search", css_class: "size-4 text-muted") %>
         </div>
         <input
           type="text"

From 97f3f03b8c01556d7d5d2c3903da066e7e0ebd26 Mon Sep 17 00:00:00 2001
From: Alex Musayev <alex.musayev@gmail.com>
Date: Sun, 19 Jul 2026 00:41:16 +0300
Subject: [PATCH 4/4] Use helper proxy in sort dropdown

---
 app/components/sort_dropdown_component.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/sort_dropdown_component.html.erb b/app/components/sort_dropdown_component.html.erb
index 71ff7d8b2..6586a5410 100644
--- a/app/components/sort_dropdown_component.html.erb
+++ b/app/components/sort_dropdown_component.html.erb
@@ -7,12 +7,12 @@
     class="inline-flex items-center justify-center whitespace-nowrap rounded-md border border-border bg-surface px-4 py-2 text-base font-semibold text-body shadow-sm transition hover:bg-surface-muted focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-1 gap-2"
     aria-haspopup="true"
     aria-expanded="false">
-    <%= icon(direction_icon, css_class: "size-4 text-muted") %>
+    <%= helpers.icon(direction_icon, css_class: "size-4 text-muted") %>
     <span class="flex items-center gap-2">
       <span><%= presenter.current_title %></span>
       <span class="sr-only"><%= direction_label %></span>
     </span>
-    <%= icon("chevron-down", css_class: "size-4 text-muted") %>
+    <%= helpers.icon("chevron-down", css_class: "size-4 text-muted") %>
   </button>
   <div
     id="<%= menu_id %>"
@@ -26,7 +26,7 @@
             <span><%= option.title %></span>
             <% if option.icon_name.present? %>
               <span class="flex items-center text-muted">
-                <%= icon(option.icon_name, css_class: "size-4 text-muted") %>
+                <%= helpers.icon(option.icon_name, css_class: "size-4 text-muted") %>
                 <span class="sr-only"><%= option.active_direction == "asc" ? "Ascending" : "Descending" %></span>
               </span>
             <% end %>