Name the impound claims impound_claim, not claim

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: sethherr

app/components/registrations/show/current_alerts/claim_impound/component.html.erb

@@ -3,15 +3,15 @@
     data-controller="ui--collapse"
     data-ui--collapse-param-value="contact_owner"
   >
-    <% if claim.present? %>
-      <% if claim.unsubmitted? %>
-        <%= form_with(model: claim, url: impound_claim_path(claim), builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
+    <% if impound_claim.present? %>
+      <% if impound_claim.unsubmitted? %>
+        <%= form_with(model: impound_claim, url: impound_claim_path(impound_claim), builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
           <%= render(UI::Forms::Group::Component.new(form_builder: form, attribute: :message, kind: :text_area,
-            label_text: translation(".prove_its_yours", bike_type: claim.bike_type), html_options: {rows: 4})) %>
+            label_text: translation(".prove_its_yours", bike_type: impound_claim.bike_type), html_options: {rows: 4})) %>
 
           <%= render(UI::Button::Component.new(text: translation(".save_message"), color: :secondary, kind: :submit)) %>
         <% end %>
-        <%= form_with(model: claim, url: impound_claim_path(claim), builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
+        <%= form_with(model: impound_claim, url: impound_claim_path(impound_claim), builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
           <%= form.hidden_field :status, value: "submitting" %>
 
           <div class="tw:mt-4">
@@ -25,22 +25,22 @@
       <% else %>
         <p>
           <%= translation(".claim_submitted") %>
-          <%= render(UI::Time::Component.new(time: claim.submitted_at)) %>
+          <%= render(UI::Time::Component.new(time: impound_claim.submitted_at)) %>
         </p>
-        <% if claim.successful? %>
+        <% if impound_claim.successful? %>
           <p class="tw:mt-2">
-            <%= translation(".claim_was_status", status: claim.status_humanized) %>
+            <%= translation(".claim_was_status", status: impound_claim.status_humanized) %>
           </p>
         <% end %>
       <% end %>
-    <% elsif submitting_claim.present? %>
+    <% elsif submitting_impound_claim.present? %>
       <p>
-        <%= translation(".claim_with_this_bike_type", status: submitting_claim.status_humanized, bike_type: @bike.type) %>
+        <%= translation(".claim_with_this_bike_type", status: submitting_impound_claim.status_humanized, bike_type: @bike.type) %>
       </p>
-      <% if submitting_claim.bike_claimed.present? %>
+      <% if submitting_impound_claim.bike_claimed.present? %>
         <p class="tw:mt-2">
-          <%= link_to translation(".view_claimed_bike_type", kind: submitting_claim.kind, bike_type: submitting_claim.bike_claimed.type),
-              registration_path(submitting_claim.bike_claimed), class: "twlink" %>
+          <%= link_to translation(".view_claimed_bike_type", kind: submitting_impound_claim.kind, bike_type: submitting_impound_claim.bike_claimed.type),
+              registration_path(submitting_impound_claim.bike_claimed), class: "twlink" %>
         </p>
       <% end %>
     <% elsif sign_in_redirect %>
@@ -53,7 +53,7 @@
           data: {"ui--collapse-target": "trigger", action: "ui--collapse#toggle"}
         )) %>
       <div data-ui--collapse-target="content" class="tw:hidden">
-        <%= form_with(model: new_claim, url: impound_claims_path, builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
+        <%= form_with(model: new_impound_claim, url: impound_claims_path, builder: BikeIndexFormBuilder, data: {controller: "csrf-refresh"}) do |form| %>
           <%= form.hidden_field :impound_record_id, value: impound_record.id %>
 
           <%= render(UI::Forms::Group::Component.new(form_builder: form, attribute: :stolen_record_id,

app/components/registrations/show/current_alerts/claim_impound/component.rb

@@ -25,7 +25,7 @@ def render?
           private
 
           def heading
-            translation((claim || submitting_claim) ? ".your_claim" : ".does_this_look_like_your_bike")
+            translation((impound_claim || submitting_impound_claim) ? ".your_claim" : ".does_this_look_like_your_bike")
           end
 
           def claim_button_text
@@ -37,29 +37,29 @@ def impound_record
           end
 
           # The viewer's claim against this bike, once they've opened one
-          def claim
-            return @claim if defined?(@claim)
+          def impound_claim
+            return @impound_claim if defined?(@impound_claim)
 
-            @claim = viewer_claim(@bike.impound_claims_claimed)
+            @impound_claim = viewer_impound_claim(@bike.impound_claims_claimed)
           end
 
           # A claim the viewer opened with this bike - they're looking at the stolen bike
           # they submitted rather than the impounded one being claimed
-          def submitting_claim
-            return if claim.present?
-            return @submitting_claim if defined?(@submitting_claim)
+          def submitting_impound_claim
+            return if impound_claim.present?
+            return @submitting_impound_claim if defined?(@submitting_impound_claim)
 
-            @submitting_claim = viewer_claim(@bike.impound_claims_submitting)
+            @submitting_impound_claim = viewer_impound_claim(@bike.impound_claims_submitting)
           end
 
-          def viewer_claim(claims)
+          def viewer_impound_claim(impound_claims)
             return if @current_user.blank?
 
-            claims.where(user_id: @current_user.id).not_rejected.last
+            impound_claims.where(user_id: @current_user.id).not_rejected.last
           end
 
-          def new_claim
-            @new_claim ||= ImpoundClaim.new
+          def new_impound_claim
+            @new_impound_claim ||= ImpoundClaim.new
           end
 
           # The viewer's stolen bikes they could claim this impound with

app/components/registrations/show/wrapper/claim_impound/preview_scenarios.rb

@@ -24,11 +24,11 @@ def claim_page(current_user:, bike_id: nil)
             page(view: "consumer", bike_id: bike.id, current_user:, as_view: [:public, nil])
           end
 
-          def claim_page_for(claims)
-            claim = claims.where.not(bike_claimed_id: nil).last
-            return missing_notice("a matching impound claim") if claim.blank?
+          def claim_page_for(impound_claims)
+            impound_claim = impound_claims.where.not(bike_claimed_id: nil).last
+            return missing_notice("a matching impound claim") if impound_claim.blank?
 
-            claim_page(bike_id: claim.bike_claimed_id, current_user: claim.user)
+            claim_page(bike_id: impound_claim.bike_claimed_id, current_user: impound_claim.user)
           end
 
           # An organization's impound record can't be claimed, so only unorganized ones

app/components/registrations/show/wrapper/claim_impound/submitted_with_this_bike_preview.rb

@@ -10,10 +10,10 @@ class SubmittedWithThisBikePreview < ApplicationComponentPreview
           include PreviewScenarios
 
           def default
-            claim = ::ImpoundClaim.not_rejected.where.not(bike_submitting_id: nil).last
-            return missing_notice("an impound claim") if claim.blank?
+            impound_claim = ::ImpoundClaim.not_rejected.where.not(bike_submitting_id: nil).last
+            return missing_notice("an impound claim") if impound_claim.blank?
 
-            claim_page(bike_id: claim.bike_submitting_id, current_user: claim.user)
+            claim_page(bike_id: impound_claim.bike_submitting_id, current_user: impound_claim.user)
           end
         end
       end

app/components/registrations/show/wrapper/component.rb

@@ -8,7 +8,7 @@ module Wrapper
       class Component < ApplicationComponent
         # Digest of the markup inside the cache block — the cached_markup_digest spec
         # keeps it current, following what this tree renders out into UI:: and elsewhere
-        MARKUP_DIGEST = "b58d5bf84caf"
+        MARKUP_DIGEST = "40825799dc85"
 
         def initialize(bike:, current_user:, view:, available_views:, bike_sticker: nil, current_alerts: {})
           @bike = bike

spec/components/registrations/show/wrapper/component_spec.rb

@@ -22,8 +22,8 @@ def cache_key
     # The claim-impound card renders the viewer's own claim inside the cached body
     it "changes when the viewer edits their impound claim" do
       impound_record = FactoryBot.create(:impound_record, bike:)
-      claim = FactoryBot.create(:impound_claim, impound_record:, user: current_user)
-      expect { claim.update(message: "it has my sticker on it") }.to change { cache_key }
+      impound_claim = FactoryBot.create(:impound_claim, impound_record:, user: current_user)
+      expect { impound_claim.update(message: "it has my sticker on it") }.to change { cache_key }
     end
 
     # The alert renders the prompt inside the cached body, token and all, so two