Preserve current handover feedback

lib/who_need_help_web/live/request_live/show.ex

@@ -591,6 +591,18 @@ defmodule WhoNeedHelpWeb.RequestLive.Show do
     )
   end
 
+  # The helper receives immediate feedback from the local `start` event. Suppress the
+  # same transition when it returns through PubSub so a delayed start broadcast cannot
+  # overwrite feedback from a newer action, such as handover-code verification.
+  defp maybe_put_status_transition_flash(
+         %{assigns: %{current_scope: %{user: %{id: user_id}}}} = socket,
+         _previous,
+         :in_progress,
+         _previous_assignment,
+         %{helper_id: user_id}
+       ),
+       do: socket
+
   defp maybe_put_status_transition_flash(
          socket,
          _previous,

test/who_need_help_web/live/mutual_aid_live_test.exs

@@ -1388,7 +1388,9 @@ defmodule WhoNeedHelpWeb.MutualAidLiveTest do
     |> element("button[phx-click='start']")
     |> render_click()
 
-    assert render(helper_view) =~ "Help is now in progress."
+    assert render(helper_view) =~ "Help is in progress."
+    refute render(helper_view) =~ "Help is now in progress."
+    assert render(requester_view) =~ "Help is now in progress."
 
     requester_view
     |> form("#matched-request-cancellation-form", %{