mirror of
https://github.com/maybe-finance/maybe.git
synced 2025-08-08 06:55:21 +02:00
Merge branch 'main' of github.com:maybe-finance/maybe into zachgoll/maybe-916-add-additional-details-to-balances-table-during-data-sync
This commit is contained in:
commit
27133f665c
2 changed files with 2 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
||||||
<%= turbo_frame_tag dom_id(account, "entries") do %>
|
<%= turbo_frame_tag dom_id(account, "entries") do %>
|
||||||
<div class="bg-container p-5 shadow-border-xs rounded-xl">
|
<div class="bg-container p-5 shadow-border-xs rounded-xl">
|
||||||
<div class="flex items-center justify-between mb-4" data-testid="activity-menu">
|
<div class="flex items-center justify-between mb-4" data-testid="activity-menu">
|
||||||
<%= tag.h2 t(".title"), class: "font-medium text-lg" %>
|
<%= tag.h2 "Activity", class: "font-medium text-lg" %>
|
||||||
|
|
||||||
<% if account.manual? %>
|
<% if account.manual? %>
|
||||||
<%= render DS::Menu.new(variant: "button") do |menu| %>
|
<%= render DS::Menu.new(variant: "button") do |menu| %>
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<% if @entry.account_id %>
|
<% if @entry.account_id %>
|
||||||
<%= f.hidden_field :account_id %>
|
<%= f.hidden_field :account_id %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= f.collection_select :account_id, Current.family.accounts.manual.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true, class: "form-field__input text-ellipsis" %>
|
<%= f.collection_select :account_id, Current.family.accounts.manual.active.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account") }, required: true, class: "form-field__input text-ellipsis" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= f.money_field :amount, label: t(".amount"), required: true %>
|
<%= f.money_field :amount, label: t(".amount"), required: true %>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue