diff --git a/app/controllers/receipts_controller.rb b/app/controllers/receipts_controller.rb
index becb3e5e17..cc3c73153b 100644
--- a/app/controllers/receipts_controller.rb
+++ b/app/controllers/receipts_controller.rb
@@ -140,7 +140,8 @@ def create
         include_spacing: params[:upload_method] != :receipt_center,
         success: "#{"Receipt".pluralize(params[file_param].length)} added!",
         global_paste: !@receiptable,
-        turbo: true
+        turbo: true,
+        ledger_instance: @ledger_instance
       }
       if @receiptable
         receipt_upload_form_config[:enable_linking] = true
@@ -178,7 +179,7 @@ def create
         partial: "receipts/form_v3", locals: {
           upload_method: "receipt_center",
           restricted_dropzone: true,
-          error: e.message
+          error: e.message, ledger_instance: @ledger_instance
         }
       )
     )
@@ -309,7 +310,7 @@ def generate_streams
         turbo_stream.replace(
           "action-wrapper",
           partial: "reimbursement/reports/actions",
-          locals: { report: @receiptable.report, user: @receiptable.report.user }
+          locals: { report: @receiptable.report, user: @receiptable.report.user, event: @event }
         )
       )
     end
diff --git a/app/controllers/reimbursement/expenses_controller.rb b/app/controllers/reimbursement/expenses_controller.rb
index a5c4b8997d..fc49fcba00 100644
--- a/app/controllers/reimbursement/expenses_controller.rb
+++ b/app/controllers/reimbursement/expenses_controller.rb
@@ -120,7 +120,7 @@ def blankslate_turbo_stream
     end
 
     def actions_turbo_stream
-      turbo_stream.replace("action-wrapper", partial: "reimbursement/reports/actions", locals: { report: @expense.report, user: @expense.report.user })
+      turbo_stream.replace("action-wrapper", partial: "reimbursement/reports/actions", locals: { report: @expense.report, user: @expense.report.user, event: @event })
     end
 
     EXPENSE_TYPE_MAP = [Reimbursement::Expense, Reimbursement::Expense::Mileage, Reimbursement::Expense::Fee].index_by(&:to_s).freeze
diff --git a/app/views/admin/ledger_audits/tasks/show.html.erb b/app/views/admin/ledger_audits/tasks/show.html.erb
index 313d316548..9ce403a467 100644
--- a/app/views/admin/ledger_audits/tasks/show.html.erb
+++ b/app/views/admin/ledger_audits/tasks/show.html.erb
@@ -133,7 +133,7 @@
 <div style="max-width: 600px; margin-left: auto; margin-right: auto;" class="mt4">
   <h3>HCB Code Comments</h3>
   <%= render "comments/list", comments: @hcb_code.comments %>
-  <%= render "comments/form", commentable: @hcb_code %>
+  <%= render "comments/form", commentable: @hcb_code, comment: @comment, popover: @popover %>
 </div>
 
 <style>
diff --git a/app/views/admin/transaction.html.erb b/app/views/admin/transaction.html.erb
index 5c849f29b6..95f7e36522 100644
--- a/app/views/admin/transaction.html.erb
+++ b/app/views/admin/transaction.html.erb
@@ -125,7 +125,7 @@
           receiptable: @canonical_transaction.local_hcb_code,
           upload_method: "attach_receipt_page",
           turbo: false,
-          redirect_url: ledger_admin_index_path
+          redirect_url: ledger_admin_index_path, ledger_instance: @ledger_instance
         } %>
   </div>
 <% end %>
diff --git a/app/views/canonical_pending_transactions/show.html.erb b/app/views/canonical_pending_transactions/show.html.erb
index ac76f9de30..d69c368895 100644
--- a/app/views/canonical_pending_transactions/show.html.erb
+++ b/app/views/canonical_pending_transactions/show.html.erb
@@ -130,10 +130,10 @@
         enable_linking: true,
         upload_method: "transaction_page",
         include_spacing: true,
-        turbo: false
+        turbo: false, ledger_instance: @ledger_instance
       } %>
 
   <h2>Comments</h2>
   <%= render "comments/list", comments: @hcb_code.comments %>
-  <%= render "comments/form", commentable: @hcb_code %>
+  <%= render "comments/form", commentable: @hcb_code, comment: @comment, popover: @popover %>
 <% end %>
diff --git a/app/views/card_grants/show.html.erb b/app/views/card_grants/show.html.erb
index d5eae02a35..807734d2bb 100644
--- a/app/views/card_grants/show.html.erb
+++ b/app/views/card_grants/show.html.erb
@@ -86,5 +86,5 @@
 <% if policy(@card_grant.comments.build).create? %>
   <h2>Comments</h2>
   <%= render "comments/list", comments: @card_grant.comments, show_blankslate: true %>
-  <%= render "comments/form", commentable: @card_grant %>
+  <%= render "comments/form", commentable: @card_grant, comment: @comment, popover: @popover %>
 <% end %>
diff --git a/app/views/comments/_comments.html.erb b/app/views/comments/_comments.html.erb
index e844cd5bd7..0b1191a692 100644
--- a/app/views/comments/_comments.html.erb
+++ b/app/views/comments/_comments.html.erb
@@ -1,4 +1,4 @@
-<%# locals: () %>
+<%# locals: (comment: nil, commentable: nil, comments: nil, popover: nil) %>
 
-<%= render "comments/list", comments: @comments || [] %>
-<%= render "comments/form", commentable: @commentable if current_user %>
+<%= render "comments/list", comments: comments || [] %>
+<%= render "comments/form", commentable: commentable, comment: comment, popover: popover if current_user %>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 38b9db465a..25c645e51e 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,8 +1,8 @@
-<%# locals: (commentable:, admin_only: nil, comment: nil, submit_text: nil) %>
+<%# locals: (commentable:, admin_only: nil, comment: nil, submit_text: nil, popover: nil) %>
 
-<%= form_with model: @comment&.new_record? ? [@comment.commentable, @comment] : @comment || [commentable, Comment.new] do |form| %>
+<%= form_with model: comment&.new_record? ? [comment.commentable, comment] : comment || [commentable, Comment.new] do |form| %>
   <%= form.hidden_field :redirect_url, value: url_for(only_path: false) %>
-  <%= form_errors @comment || Comment.new, "message", "We couldn't update your" %>
+  <%= form_errors comment || Comment.new, "message", "We couldn't update your" %>
 
   <div class="comment__name mt2">
     <%= user_mention current_user if organizer_signed_in? %>
@@ -25,7 +25,7 @@
 
   <div class="flex flex-row mb2 justify-between items-center">
 
-    <% if @comment&.persisted? %>
+    <% if comment&.persisted? %>
       <% if comment.file.attached? %>
         <div class="field mb0">
           <%= link_to "📎 1 attachment", url_for(comment.file), target: "_blank" %>
@@ -57,7 +57,7 @@
 
   </div>
 
-  <% if commentable.shared_commentable? && !@comment&.persisted? %>
+  <% if commentable.shared_commentable? && !comment&.persisted? %>
     <% disbursement = commentable.outgoing_disbursement || commentable.incoming_disbursement %>
     <div data-controller="commentable"
          data-commentable-shared-type-value="<%= commentable.shared_commentable.class.to_s %>"
@@ -83,7 +83,7 @@
   <% end %>
 <% end %>
 
-<% unless @popover %>
+<% unless popover %>
   <%= turbo_stream_from commentable, :comments %>
   <% turbo_refreshes_with method: :morph, scroll: :preserve %>
 <% end %>
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index 02510d3782..424aec5803 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -4,4 +4,4 @@
 
 <h1>Edit note</h1>
 
-<%= render "comments/form", comment: @comment, commentable: @commentable %>
+<%= render "comments/form", comment: @comment, commentable: @commentable, popover: @popover %>
diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb
index 2431b34fed..b2c4bc1e0f 100644
--- a/app/views/comments/new.html.erb
+++ b/app/views/comments/new.html.erb
@@ -4,4 +4,4 @@
 
 <h1>New note</h1>
 
-<%= render "comments/form", commentable: @commentable if current_user %>
+<%= render "comments/form", commentable: @commentable, comment: @comment, popover: @popover if current_user %>
diff --git a/app/views/disbursements/show.html.erb b/app/views/disbursements/show.html.erb
index 7ff250f13c..a4a5ffd452 100644
--- a/app/views/disbursements/show.html.erb
+++ b/app/views/disbursements/show.html.erb
@@ -132,10 +132,10 @@
         enable_linking: true,
         upload_method: "transaction_page",
         include_spacing: true,
-        turbo: false
+        turbo: false, ledger_instance: @ledger_instance
       } %>
 
   <h2>Comments</h2>
   <%= render "comments/list", comments: @disbursement.all_comments, viewing_commentable: @disbursement %>
-  <%= render "comments/form", commentable: @disbursement, submit_text: "Add comment (visible to both organizations)" %>
+  <%= render "comments/form", commentable: @disbursement, submit_text: "Add comment (visible to both organizations)", comment: @comment, popover: @popover %>
 <% end %>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 7d6ba7209b..6dcaf362e4 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -24,7 +24,7 @@
 <% elsif @settings_tab == "audit_log" %>
   <%= render "events/settings/audit_log", event: @event, activities: @activities, activities_before: @activities_before %>
 <% elsif @settings_tab == "admin" && auditor_signed_in? %>
-  <%= render "events/settings/admin", event: @event %>
+  <%= render "events/settings/admin", event: @event, comment: @comment, popover: @popover %>
 <% else %>
   <%= render "events/settings/account_info", event: @event %>
   <%= render "events/settings/details", event: @event %>
diff --git a/app/views/events/settings/_admin.html.erb b/app/views/events/settings/_admin.html.erb
index 3ccc1d8537..9d4b6c796c 100644
--- a/app/views/events/settings/_admin.html.erb
+++ b/app/views/events/settings/_admin.html.erb
@@ -1,4 +1,4 @@
-<%# locals: (event:) %>
+<%# locals: (event:, comment: nil, popover: nil) %>
 
 <% disabled = !admin_signed_in? %>
 
@@ -7,9 +7,9 @@
     <strong>Organization’s slug history:</strong> <%= event.slugs.pluck(:slug).join ", " %>
   <% end %>
 
-  <% if @event.application.present? %>
+  <% if event.application.present? %>
     <% admin_tool "p-3" do %>
-      <%= link_to "Go to organization's application", submission_application_path(@event.application) %>
+      <%= link_to "Go to organization's application", submission_application_path(event.application) %>
     <% end %>
   <% end %>
 
@@ -234,7 +234,7 @@
 
   <% admin_tool "p-3" do %>
     <%= render "comments/list", comments: event.comments, show_blankslate: true %>
-    <%= render "comments/form", commentable: event, admin_only: true %>
+    <%= render "comments/form", commentable: event, admin_only: true, comment: comment, popover: popover %>
   <% end %>
 
 </div>
diff --git a/app/views/hcb_codes/_admin_tools.html.erb b/app/views/hcb_codes/_admin_tools.html.erb
index 98f489a6eb..0956bf0cc1 100644
--- a/app/views/hcb_codes/_admin_tools.html.erb
+++ b/app/views/hcb_codes/_admin_tools.html.erb
@@ -1,36 +1,36 @@
-<%# locals: () %>
+<%# locals: (hcb_code:) %>
 
-<%= turbo_frame_tag "#{@hcb_code.public_id}:admin_tools", target: "_top" do %>
+<%= turbo_frame_tag "#{hcb_code.public_id}:admin_tools", target: "_top" do %>
   <% admin_tool("mt3 pb1") do %>
     <div class="overflow-x-auto mb3 max-w-full">
       <table class="mb2">
         <tr>
           <th>HCB CODE</th>
-          <% if @hcb_code.ledger_item.present? %><th class="w-full">LEDGER ITEM</th><% end %>
+          <% if hcb_code.ledger_item.present? %><th class="w-full">LEDGER ITEM</th><% end %>
         </tr>
         <tr>
-          <td><%= @hcb_code.hcb_code %></td>
-          <% if @hcb_code.ledger_item.present? %><td><%= link_to @hcb_code.ledger_item.hashid, ledger_item_path(@hcb_code.ledger_item) %></td><% end %>
+          <td><%= hcb_code.hcb_code %></td>
+          <% if hcb_code.ledger_item.present? %><td><%= link_to hcb_code.ledger_item.hashid, ledger_item_path(hcb_code.ledger_item) %></td><% end %>
         </tr>
       </table>
       <%= render(
             partial: "transactions_table",
             locals: {
               canonical_transactions:
-                @hcb_code
+                hcb_code
                 .canonical_pending_transactions
                 .preload(:category)
                 .strict_loading,
               canonical_pending_transactions:
-                @hcb_code
+                hcb_code
                 .canonical_transactions
                 .preload(:category)
                 .strict_loading
                 .to_a,
-              t_transaction: @hcb_code.ach_transfer&.t_transaction
+              t_transaction: hcb_code.ach_transfer&.t_transaction
             }
           ) %>
     </div>
   <% end %>
-  <%= render partial: "application/admin_viewer", locals: { record: @hcb_code } %>
+  <%= render partial: "application/admin_viewer", locals: { record: hcb_code } %>
 <% end %>
diff --git a/app/views/hcb_codes/_pending_transaction_history.html.erb b/app/views/hcb_codes/_pending_transaction_history.html.erb
index 28747981f4..f62c95d186 100644
--- a/app/views/hcb_codes/_pending_transaction_history.html.erb
+++ b/app/views/hcb_codes/_pending_transaction_history.html.erb
@@ -1,8 +1,8 @@
-<%# locals: () %>
+<%# locals: (hcb_code:) %>
 
 <h2 class="mt-0">Pending transaction history</h2>
 
-<% if @hcb_code.canonical_pending_transactions.exists? %>
+<% if hcb_code.canonical_pending_transactions.exists? %>
   <article class="table-container">
     <table>
       <thead>
@@ -14,7 +14,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @hcb_code.canonical_pending_transactions.each do |ct| %>
+        <% hcb_code.canonical_pending_transactions.each do |ct| %>
           <tr>
             <td><%= format_date ct.date %></td>
             <td><%= ct.smart_memo %></td>
diff --git a/app/views/hcb_codes/_transaction_history.html.erb b/app/views/hcb_codes/_transaction_history.html.erb
index abc9f31bf9..26ca55a1cf 100644
--- a/app/views/hcb_codes/_transaction_history.html.erb
+++ b/app/views/hcb_codes/_transaction_history.html.erb
@@ -1,8 +1,8 @@
-<%# locals: () %>
+<%# locals: (hcb_code:) %>
 
 <h2 class="mt-0">Transaction history</h2>
 
-<% if @hcb_code.canonical_transactions.exists? %>
+<% if hcb_code.canonical_transactions.exists? %>
   <article class="table-container mb-2">
     <table>
       <thead>
@@ -14,7 +14,7 @@
         </tr>
       </thead>
       <tbody>
-        <% @hcb_code.canonical_transactions.each do |ct| %>
+        <% hcb_code.canonical_transactions.each do |ct| %>
           <tr>
             <td><%= format_date ct.date %></td>
             <td><%= ct.smart_memo %></td>
diff --git a/app/views/hcb_codes/attach_receipt.html.erb b/app/views/hcb_codes/attach_receipt.html.erb
index 6efd94cfba..ce4e544914 100644
--- a/app/views/hcb_codes/attach_receipt.html.erb
+++ b/app/views/hcb_codes/attach_receipt.html.erb
@@ -18,7 +18,7 @@
         show_banner: true,
         secret: @secret,
         global_paste: true,
-        turbo: false
+        turbo: false, ledger_instance: @ledger_instance
       } %>
 
   <% admin_tool("mt2") do %>
diff --git a/app/views/hcb_codes/show.html.erb b/app/views/hcb_codes/show.html.erb
index 4784f98228..7cdd14fc33 100644
--- a/app/views/hcb_codes/show.html.erb
+++ b/app/views/hcb_codes/show.html.erb
@@ -5,7 +5,7 @@
 <% title @hcb_code.pretty_title(show_event_name: false, show_amount: true, event: @event) unless content_for? :title %>
 
 <%= turbo_frame_tag @hcb_code.public_id, target: "_top" do %>
-  <%= render partial: "hcb_codes/admin_tools" %>
+  <%= render partial: "hcb_codes/admin_tools", locals: { hcb_code: @hcb_code } %>
   <div id="rich_metadata">
     <%= render partial: "hcb_codes/rich_metadata" %>
   </div>
@@ -31,7 +31,8 @@
           enable_linking: true,
           upload_method: "transaction_page",
           include_spacing: true,
-          turbo: true
+          turbo: true,
+          ledger_instance: @ledger_instance
         }
               receipt_upload_form_config[:restricted_dropzone] = true if @frame
               receipt_upload_form_config[:inline_linking] = true if @frame
@@ -57,11 +58,11 @@
       </p>
     <% end %>
   <% end %>
-  <%= render "comments/form", commentable: @hcb_code %>
+  <%= render "comments/form", commentable: @hcb_code, comment: @comment, popover: @popover %>
 
   <% admin_tool("mt2 p-3") do %>
-    <%= render partial: "hcb_codes/transaction_history" %>
-    <%= render partial: "hcb_codes/pending_transaction_history" %>
+    <%= render partial: "hcb_codes/transaction_history", locals: { hcb_code: @hcb_code } %>
+    <%= render partial: "hcb_codes/pending_transaction_history", locals: { hcb_code: @hcb_code } %>
   <% end %>
 
   <% admin_tool("p-2 my-3") do %>
diff --git a/app/views/ledger/items/show.html.erb b/app/views/ledger/items/show.html.erb
index 0d6755d206..49fb61053f 100644
--- a/app/views/ledger/items/show.html.erb
+++ b/app/views/ledger/items/show.html.erb
@@ -110,7 +110,8 @@
           enable_linking: true,
           upload_method: "transaction_page",
           include_spacing: true,
-          turbo: true
+          turbo: true,
+          ledger_instance: @ledger_instance
         }
               receipt_upload_form_config[:restricted_dropzone] = true if @frame
               receipt_upload_form_config[:inline_linking] = true if @frame
@@ -133,7 +134,7 @@
         </p>
       <% end %>
     <% end %>
-    <%= render "comments/form", commentable: @item.hcb_code %>
+    <%= render "comments/form", commentable: @item.hcb_code, comment: @comment, popover: @popover %>
   <% end %>
 
   <% admin_tool("p-2 my-3") do %>
diff --git a/app/views/my/inbox.html.erb b/app/views/my/inbox.html.erb
index c98067b661..9c9d18f9a3 100644
--- a/app/views/my/inbox.html.erb
+++ b/app/views/my/inbox.html.erb
@@ -83,7 +83,7 @@
         upload_method: "receipt_center",
         restricted_dropzone: true,
         turbo: true,
-        global_paste: true
+        global_paste: true, ledger_instance: @ledger_instance
       } %>
 </div>
 
diff --git a/app/views/organizer_position_deletion_requests/show.html.erb b/app/views/organizer_position_deletion_requests/show.html.erb
index f80094858c..74213f3a57 100644
--- a/app/views/organizer_position_deletion_requests/show.html.erb
+++ b/app/views/organizer_position_deletion_requests/show.html.erb
@@ -158,4 +158,4 @@
   </article>
 </div>
 
-<%= render "comments/comments" %>
+<%= render "comments/comments", comment: @comment, commentable: @commentable, comments: @comments, popover: @popover %>
diff --git a/app/views/payments/show.html.erb b/app/views/payments/show.html.erb
index ceeb28c170..625a2514fb 100644
--- a/app/views/payments/show.html.erb
+++ b/app/views/payments/show.html.erb
@@ -121,9 +121,9 @@
         upload_method: "payment_page",
         include_spacing: true,
         redirect_url: payment_path(@payment),
-        turbo: false
+        turbo: false, ledger_instance: @ledger_instance
       } %>
 
   <%= render "comments/list", comments: @payment.all_comments, viewing_commentable: @payment %>
-  <%= render "comments/form", commentable: @payment if current_user %>
+  <%= render "comments/form", commentable: @payment, comment: @comment, popover: @popover if current_user %>
 <% end %>
diff --git a/app/views/receipts/_form_v3.html.erb b/app/views/receipts/_form_v3.html.erb
index 7b26792d2f..dccdcfb1c4 100644
--- a/app/views/receipts/_form_v3.html.erb
+++ b/app/views/receipts/_form_v3.html.erb
@@ -1,4 +1,4 @@
-<%# locals: (upload_method:, enable_linking: nil, error: nil, global_paste: nil, include_spacing: nil, inline_linking: nil, popover: nil, receiptable: nil, redirect_url: nil, restricted_dropzone: nil, secret: nil, show_author_img: nil, show_banner: nil, show_receipt_button: nil, success: nil, turbo: "false") %>
+<%# locals: (upload_method:, enable_linking: nil, error: nil, global_paste: nil, include_spacing: nil, inline_linking: nil, popover: nil, receiptable: nil, redirect_url: nil, restricted_dropzone: nil, secret: nil, show_author_img: nil, show_banner: nil, show_receipt_button: nil, success: nil, turbo: "false", ledger_instance: nil) %>
 
 <% instance = local_assigns.__id__ %>
 <div id="<%= receiptable ? "#{receiptable.id}_" : "" %>receipt_upload_form">
@@ -50,10 +50,10 @@
           <%= form.hidden_field :upload_method, value: upload_method, data: { "file-drop-target" => "uploadMethod" } %>
           <%= form.hidden_field :show_receipt_button, value: show_receipt_button %>
           <%= form.hidden_field :show_author_img, value: show_author_img %>
-          <%= form.hidden_field :ledger_instance, value: @ledger_instance %>
+          <%= form.hidden_field :ledger_instance, value: ledger_instance %>
           <%= form.hidden_field :s, value: secret %>
 
-          <%= form.file_field @ledger_instance.present? ? "file_#{@ledger_instance}" : "file",
+          <%= form.file_field ledger_instance.present? ? "file_#{ledger_instance}" : "file",
                               multiple: true,
                               include_hidden: false,
                               required: true,
@@ -70,7 +70,7 @@
                  array << "bg-error" if error
                  array << "disabled" if receiptable && current_user && !ReceiptablePolicy.new(current_user, receiptable).upload?
                end.join(", ") %>
-            <%= form.label @ledger_instance.present? ? "file_#{@ledger_instance}" : "file", class: "btn #{additional_classes}", id: "upload-receipt-button" do %>
+            <%= form.label ledger_instance.present? ? "file_#{ledger_instance}" : "file", class: "btn #{additional_classes}", id: "upload-receipt-button" do %>
               <%= inline_icon "cloud-upload" %>
               <% if success || error %>
                 <span id="upload-receipt-button-text"><%= success || error %></span>
diff --git a/app/views/reimbursement/reports/_actions.html.erb b/app/views/reimbursement/reports/_actions.html.erb
index d97836f668..461fbd8169 100644
--- a/app/views/reimbursement/reports/_actions.html.erb
+++ b/app/views/reimbursement/reports/_actions.html.erb
@@ -1,4 +1,4 @@
-<%# locals: (report:, user:) %>
+<%# locals: (report:, user:, event:) %>
 
 <% member_viewing = !OrganizerPosition.role_at_least?(current_user, report.event, :manager) && current_user != report.user && !admin_signed_in? %>
 <% payout_method = report.payout_method&.details %>
@@ -7,7 +7,7 @@
   <% button_hint = "" %>
   <% button_hint = "This report has been approved and is pending reimbursement." if report.reimbursement_approved? %>
   <% button_hint = "The creator of this report has been reimbursed." if report.reimbursed? %>
-  <% button_hint = "This report has been approved by #{@event.name}, but it's still pending approval from the HCB team." if report.reimbursement_requested? %>
+  <% button_hint = "This report has been approved by #{event.name}, but it's still pending approval from the HCB team." if report.reimbursement_requested? %>
 
   <% unless (report.closed? && !report.payout_holding&.failed?) || member_viewing %>
     <div class="flex flex-col sm:flex-row !gap-2" id="actions">
diff --git a/app/views/reimbursement/reports/_conversation.html.erb b/app/views/reimbursement/reports/_conversation.html.erb
index f470bf4a6d..26050537ce 100644
--- a/app/views/reimbursement/reports/_conversation.html.erb
+++ b/app/views/reimbursement/reports/_conversation.html.erb
@@ -1,12 +1,12 @@
-<%# locals: () %>
+<%# locals: (report:, comment: nil, popover: nil) %>
 
 <h2 class="flex items-center">
   <span style="flex-grow: 1">Timeline</span>
 </h2>
 <article>
   <ul class="list-reset comments mb5">
-    <% versions = @report.versions.includes([:item]).select { |version| version.changeset.any? { |field, changes| changes.any?(&:present?) } } %>
-    <% comments = policy_scope(@report.comments) %>
+    <% versions = report.versions.includes([:item]).select { |version| version.changeset.any? { |field, changes| changes.any?(&:present?) } } %>
+    <% comments = policy_scope(report.comments) %>
     <% (versions + comments).sort_by(&:created_at).each do |item| %>
       <% if item.instance_of?(Comment) %>
         <div class="conversation_item">
@@ -15,25 +15,25 @@
       <% else %>
         <% reimbursed_change_text = capture do %>
           <%= error_boundary fallback_text: "initiated a transfer" do %>
-            <% raw_text = render_money(@report.payout_holding&.amount_cents) + " " + @report.transfer_text %>
-            <% payout_transfer_url = hcb_code_path(@report.payout_holding&.payout_transfer&.local_hcb_code) if @report.payout_holding&.payout_transfer&.local_hcb_code %>
+            <% raw_text = render_money(report.payout_holding&.amount_cents) + " " + report.transfer_text %>
+            <% payout_transfer_url = hcb_code_path(report.payout_holding&.payout_transfer&.local_hcb_code) if report.payout_holding&.payout_transfer&.local_hcb_code %>
 
-            <%= @report.initiated_transfer_text %> a
-            <% if payout_transfer_url && policy(@report.payout_holding&.payout_transfer&.local_hcb_code).show? %>
+            <%= report.initiated_transfer_text %> a
+            <% if payout_transfer_url && policy(report.payout_holding&.payout_transfer&.local_hcb_code).show? %>
               <%= link_to raw_text, payout_transfer_url, target: :_blank %>
             <% else %>
               <%= raw_text %>
             <% end %>
-            to <%= @report.user.name %>
+            to <%= report.user.name %>
           <% end %>
         <% end %>
         <% changes = {
              "submitted"               => ["send", "info", "submitted this report"],
              "rejected"                => ["thumbsdown", "error", "rejected this report"],
-             "reimbursement_requested" => ["thumbsup", "success", "approved on behalf of #{Event.find_by_id(item.object&.[]("event_id") || @report.event_id)&.name}"],
+             "reimbursement_requested" => ["thumbsup", "success", "approved on behalf of #{Event.find_by_id(item.object&.[]("event_id") || report.event_id)&.name}"],
              "reimbursement_approved"  => ["admin", "warning", "approved this report on behalf of the HCB team"],
              "draft"                   => ["docs", "muted", "converted this report to a draft"],
-             "draft_created"           => ["plus", "success", @report.card_grant.present? ? "converted a card grant into this draft report" : "created this draft report"],
+             "draft_created"           => ["plus", "success", report.card_grant.present? ? "converted a card grant into this draft report" : "created this draft report"],
              "reimbursed"              => ["payment-transfer", "purple", reimbursed_change_text],
              "reversed"                => ["sad", "warning", "canceled this reimbursement"],
            } %>
@@ -47,15 +47,15 @@
           <% whodunnit = User.find_by(id: item.whodunnit) %>
 
           <%# view https://github.com/hackclub/hcb/issues/8365 - @sampoder %>
-          <% if state_change == "draft" && item.changeset["aasm_state"]&.first.nil? && @report.from_public_reimbursement_form? %>
+          <% if state_change == "draft" && item.changeset["aasm_state"]&.first.nil? && report.from_public_reimbursement_form? %>
             <% whodunnit = nil %>
-          <% elsif state_change == "draft" && item.changeset["aasm_state"]&.first.nil? && @report.user != whodunnit %>
-            <% message = "invited #{@report.user.initial_name} to this draft report" %>
+          <% elsif state_change == "draft" && item.changeset["aasm_state"]&.first.nil? && report.user != whodunnit %>
+            <% message = "invited #{report.user.initial_name} to this draft report" %>
           <% end %>
 
           <%# if "whodunnit" is the report's creator, team review was not required for this report. %>
           <%# if a team re-enables team reviews, we'll show each report as approved by it's creator.  %>
-          <% unless state_change == "reimbursement_requested" && whodunnit == @report.user && !@report.team_review_required? %>
+          <% unless state_change == "reimbursement_requested" && whodunnit == report.user && !report.team_review_required? %>
             <li class="conversation_item mt2" style="margin-bottom: 24px;">
               <div class="flex flex-row items-center" style="gap: 16px">
                 <div class="flex items-center justify-center z-[2] pop no_hover bg-<%= color %>-important" style="color: white; cursor: default">
@@ -117,5 +117,5 @@
       <% end %>
     <% end %>
   </ul>
-  <%= render "comments/form", commentable: @report %>
+  <%= render "comments/form", commentable: report, comment: comment, popover: popover %>
 </article>
diff --git a/app/views/reimbursement/reports/_edit_form.html.erb b/app/views/reimbursement/reports/_edit_form.html.erb
index c3bf88b387..bf88d53d6b 100644
--- a/app/views/reimbursement/reports/_edit_form.html.erb
+++ b/app/views/reimbursement/reports/_edit_form.html.erb
@@ -1,50 +1,50 @@
-<%# locals: () %>
+<%# locals: (report:) %>
 
-<%= form_with(model: @report, local: true) do |form| %>
+<%= form_with(model: report, local: true) do |form| %>
   <%= form.label :report_name, "Report name" %>
   <%= form.text_field :report_name, placeholder: "Chicago Trip Expenses", required: true %>
   <%= form.label :report_to, "Report to", class: "mt2" %>
-  <%= form.text_field :report_to, value: @report.user.email, readonly: true %>
-  <% if organizer_signed_in? && (@report.submitted? || @report.draft?) %>
+  <%= form.text_field :report_to, value: report.user.email, readonly: true %>
+  <% if organizer_signed_in? && (report.submitted? || report.draft?) %>
     <%= form.label :maximum_amount, "Maximum reimbursable value (optional)", class: "mt2" %>
     <div class="field">
       <div class="flex items-center">
         <span class="bold muted" style="width: 1rem;">$</span>
-        <%= form.number_field :maximum_amount, placeholder: "500.00", step: 0.01, min: 0.01, required: false, disabled: !(current_user.admin? || current_user != @report.user) && !@report.draft?, data: { controller: "truncate-decimal", action: "truncate-decimal#truncate blur->truncate-decimal#pad" } %>
+        <%= form.number_field :maximum_amount, placeholder: "500.00", step: 0.01, min: 0.01, required: false, disabled: !(current_user.admin? || current_user != report.user) && !report.draft?, data: { controller: "truncate-decimal", action: "truncate-decimal#truncate blur->truncate-decimal#pad" } %>
       </div>
     </div>
   <% end %>
-  <% if @report.submitted? || @report.draft? %>
+  <% if report.submitted? || report.draft? %>
     <div class="field event-select-target">
       <%= form.label :event_id, "Organization", class: "mt2" %>
       <%= form.select(:event_id,
           admin_signed_in? ?
             Event.not_demo_mode.reorder(Event::CUSTOM_SORT).map { |event| [event.name, event.id] } :
-            ((@report.event ? [@report.event] : []) + current_user.events.not_hidden.filter_demo_mode(false)).uniq.map { |event| [event.name, event.id] },
+            ((report.event ? [report.event] : []) + current_user.events.not_hidden.filter_demo_mode(false)).uniq.map { |event| [event.name, event.id] },
           { prompt: "Select an event…", required: true },
-          { disabled: !policy(@report).change_event? }) %>
-      <% if @report.card_grant.present? %>
+          { disabled: !policy(report).change_event? }) %>
+      <% if report.card_grant.present? %>
         <span class="muted">This reimbursement is backed by a card grant, so it can't be moved to a different organization.</span>
       <% elsif !admin_signed_in? %>
         <span class="muted">You can transfer a report to any organization you're a part of.</span>
       <% end %>
     </div>
   <% end %>
-  <% if organizer_signed_in? && (@report.submitted? || @report.draft?) && @report.event %>
+  <% if organizer_signed_in? && (report.submitted? || report.draft?) && report.event %>
    <div class="field">
       <%= form.label :reviewer_id, "Assigned reviewer", class: "mt2" %>
-      <%= form.collection_select :reviewer_id, @report.event.managers, :id, :name, include_blank: "Anyone" %>
+      <%= form.collection_select :reviewer_id, report.event.managers, :id, :name, include_blank: "Anyone" %>
     </div>
   <% end %>
   <div class="flex items-center w-full justify-between">
     <%= form.submit "Update report", class: "left mt2" %>
 
-    <% if current_user.admin? && !@report.draft? %>
+    <% if current_user.admin? && !report.draft? %>
       <% admin_tool("right mt2") do %>
-        <%= button_to "Delete report", reimbursement_report_path(@report), class: "bg-error btn", method: :delete, type: "button" %>
+        <%= button_to "Delete report", reimbursement_report_path(report), class: "bg-error btn", method: :delete, type: "button" %>
       <% end %>
     <% else %>
-      <%= button_to "Delete report", reimbursement_report_path(@report), class: "right mt2 bg-error btn", method: :delete, type: "button" %>
+      <%= button_to "Delete report", reimbursement_report_path(report), class: "right mt2 bg-error btn", method: :delete, type: "button" %>
     <% end %>
   </div>
 <% end %>
diff --git a/app/views/reimbursement/reports/edit.html.erb b/app/views/reimbursement/reports/edit.html.erb
index 9727f716cf..dc58462cba 100644
--- a/app/views/reimbursement/reports/edit.html.erb
+++ b/app/views/reimbursement/reports/edit.html.erb
@@ -15,4 +15,4 @@
     </h2>
 </div>
 
-<%= render "reimbursement/reports/edit_form" %>
+<%= render "reimbursement/reports/edit_form", report: @report %>
diff --git a/app/views/reimbursement/reports/show.html.erb b/app/views/reimbursement/reports/show.html.erb
index 887e58e255..e47a68c1bb 100644
--- a/app/views/reimbursement/reports/show.html.erb
+++ b/app/views/reimbursement/reports/show.html.erb
@@ -72,7 +72,7 @@
 
 <section data-behavior="modal" role="dialog" id="edit" class="modal modal--scroll bg-snow lg:max-w-[450px]">
   <%= modal_header "Edit report" %>
-  <%= render "reimbursement/reports/edit_form" %>
+  <%= render "reimbursement/reports/edit_form", report: @report %>
 </section>
 
 <section data-behavior="modal" role="dialog" id="request_changes" class="modal modal--scroll bg-snow">
@@ -261,7 +261,7 @@
   <%= render partial: "reimbursement/reports/payout_method_selector", locals: { report: @report } %>
 <% end %>
 
-<%= render partial: "reimbursement/reports/actions", locals: { report: @report, user: @user } %>
+<%= render partial: "reimbursement/reports/actions", locals: { report: @report, user: @user, event: @event } %>
 
 <% if @report.event.present? %>
   <%= render "events/mission_statement", event: @report.event, class_name: "mt-4 p-3" %>
@@ -273,7 +273,7 @@
   <% end %>
 <% end %>
 
-<%= render partial: "reimbursement/reports/conversation" %>
+<%= render partial: "reimbursement/reports/conversation", locals: { comment: @comment, popover: @popover, report: @report } %>
 
 <section data-behavior="modal" role="dialog" id="edit_payout" class="modal modal--scroll bg-snow">
   <%= modal_header "Add payout information" %>
diff --git a/app/views/transactions/show.html.erb b/app/views/transactions/show.html.erb
index e527cf8433..b37b476f3d 100644
--- a/app/views/transactions/show.html.erb
+++ b/app/views/transactions/show.html.erb
@@ -172,10 +172,10 @@
         enable_linking: true,
         upload_method: "transaction_page",
         include_spacing: true,
-        turbo: false
+        turbo: false, ledger_instance: @ledger_instance
       } %>
 
   <h2>Comments</h2>
   <%= render "comments/list", comments: @hcb_code.comments %>
-  <%= render "comments/form", commentable: @hcb_code %>
+  <%= render "comments/form", commentable: @hcb_code, comment: @comment, popover: @popover %>
 <% end %>
diff --git a/app/views/users/edit_admin.html.erb b/app/views/users/edit_admin.html.erb
index 93c4c0ac51..5ad7e36c88 100644
--- a/app/views/users/edit_admin.html.erb
+++ b/app/views/users/edit_admin.html.erb
@@ -142,6 +142,6 @@
   <% admin_tool "p-3" do %>
     <h3 class="mb2 mt1">Comments</h3>
     <%= render "comments/list", comments: @user.comments, show_blankslate: true %>
-    <%= render "comments/form", commentable: @user, admin_only: true %>
+    <%= render "comments/form", commentable: @user, admin_only: true, comment: @comment, popover: @popover %>
   <% end %>
 </turbo-frame>