diff --git a/app/controllers/transaction_categories_controller.rb b/app/controllers/transaction_categories_controller.rb index dac6b5be0..6ca3aa70c 100644 --- a/app/controllers/transaction_categories_controller.rb +++ b/app/controllers/transaction_categories_controller.rb @@ -27,6 +27,11 @@ class TransactionCategoriesController < ApplicationController partial: "categories/menu", locals: { transaction: transaction } ), + turbo_stream.replace( + "category_name_mobile_#{transaction.id}", + partial: "categories/category_name_mobile", + locals: { transaction: transaction } + ), *flash_notification_stream_items ] end diff --git a/app/views/categories/_badge_mobile.html.erb b/app/views/categories/_badge_mobile.html.erb new file mode 100644 index 000000000..4f96f25b4 --- /dev/null +++ b/app/views/categories/_badge_mobile.html.erb @@ -0,0 +1,14 @@ +<%# locals: (category:) %> +<% category ||= Category.uncategorized %> + +
+ + <% if category.lucide_icon.present? %> + <%= icon category.lucide_icon, size: "sm", color: "current" %> + <% end %> + +
\ No newline at end of file diff --git a/app/views/categories/_category_name_mobile.html.erb b/app/views/categories/_category_name_mobile.html.erb new file mode 100644 index 000000000..febe4b15a --- /dev/null +++ b/app/views/categories/_category_name_mobile.html.erb @@ -0,0 +1,3 @@ + + <%= transaction.category&.name %> + diff --git a/app/views/categories/_menu.html.erb b/app/views/categories/_menu.html.erb index f7c74eaca..ad7dc4f5c 100644 --- a/app/views/categories/_menu.html.erb +++ b/app/views/categories/_menu.html.erb @@ -2,7 +2,12 @@ <%= render DS::Menu.new(variant: "button") do |menu| %> <% menu.with_button do %> - <% render partial: "categories/badge", locals: { category: transaction.category } %> + +
+ <%= render partial: "categories/badge_mobile", locals: { category: transaction.category } %> +
<% end %> <% menu.with_custom_content do %> diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erb index 6e25d478f..0a4927dcd 100644 --- a/app/views/category/dropdowns/_row.html.erb +++ b/app/views/category/dropdowns/_row.html.erb @@ -13,6 +13,7 @@ } ), method: :patch, + data: { turbo_frame: "category_dropdown" }, class: "flex w-full items-center gap-1.5 cursor-pointer focus:outline-none" do %> <%= icon("check") if is_selected %> diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb index 86dd0e193..2a0d70cdf 100644 --- a/app/views/transactions/_transaction.html.erb +++ b/app/views/transactions/_transaction.html.erb @@ -24,12 +24,17 @@ class: "w-6 h-6 rounded-full", loading: "lazy" %> <% else %> - <%= render DS::FilledIcon.new( - variant: :text, - text: entry.name, - size: "sm", - rounded: true - ) %> + +
+ <%= render "transactions/transaction_category", transaction: transaction %> +
<% end %>
@@ -72,16 +77,19 @@
-