refactor: integrate approval ui review changes

lib/mv_web/live/join_request_live/show.ex

@@ -22,10 +22,12 @@ defmodule MvWeb.JoinRequestLive.Show do
   alias Mv.Constants
   alias Mv.Membership
   alias MvWeb.Helpers.DateFormatter
+  alias MvWeb.JoinRequestLive.Helpers, as: JoinRequestHelpers
+  alias MvWeb.Translations.MemberFields, as: MemberFieldsTranslations
 
   @impl true
   def mount(_params, _session, socket) do
-    if join_form_enabled?() do
+    if Membership.join_form_enabled?() do
       {:ok,
        socket
        |> assign(:join_request, nil)
@@ -40,7 +42,7 @@ defmodule MvWeb.JoinRequestLive.Show do
   def handle_params(%{"id" => id}, _url, socket) do
     actor = current_actor(socket)
 
-    if join_form_enabled?() and can_access_page?(actor, "/join_requests/:id") do
+    if Membership.join_form_enabled?() and can_access_page?(actor, "/join_requests/:id") do
       case Membership.get_join_request(id, actor: actor) do
         {:ok, nil} ->
           {:noreply,
@@ -106,13 +108,6 @@ defmodule MvWeb.JoinRequestLive.Show do
     end
   end
 
-  defp join_form_enabled? do
-    case Membership.get_settings() do
-      {:ok, %{join_form_enabled: true}} -> true
-      _ -> false
-    end
-  end
-
   @impl true
   def render(assigns) do
     ~H"""
@@ -154,8 +149,8 @@ defmodule MvWeb.JoinRequestLive.Show do
               <div class="flex gap-2">
                 <span class="text-base-content/60 min-w-32 shrink-0">{gettext("Status")}:</span>
                 <span>
-                  <.badge variant={status_badge_variant(@join_request.status)}>
-                    {format_status(@join_request.status)}
+                  <.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}>
+                    {JoinRequestHelpers.format_status(@join_request.status)}
                   </.badge>
                 </span>
               </div>
@@ -191,7 +186,7 @@ defmodule MvWeb.JoinRequestLive.Show do
                 <% end %>
                 <.field_row
                   label={gettext("Review by")}
-                  value={reviewer_display(@join_request)}
+                  value={JoinRequestHelpers.reviewer_display(@join_request)}
                   empty_text="-"
                 />
               </div>
@@ -245,33 +240,6 @@ defmodule MvWeb.JoinRequestLive.Show do
     """
   end
 
-  defp format_status(:pending_confirmation), do: gettext("Pending confirmation")
-  defp format_status(:submitted), do: gettext("Submitted")
-  defp format_status(:approved), do: gettext("Approved")
-  defp format_status(:rejected), do: gettext("Rejected")
-  defp format_status(other), do: to_string(other)
-
-  defp status_badge_variant(:submitted), do: :info
-  defp status_badge_variant(:approved), do: :success
-  defp status_badge_variant(:rejected), do: :error
-  defp status_badge_variant(_), do: :neutral
-
-  defp reviewer_display(%{reviewed_by_user: user}) do
-    case user do
-      nil ->
-        nil
-
-      %{email: email} when not is_nil(email) ->
-        s = to_string(email) |> String.trim()
-        if s == "", do: nil, else: s
-
-      _ ->
-        nil
-    end
-  end
-
-  defp reviewer_display(_), do: nil
-
   # Formats form_data for display in join-form order; legacy keys (not in current
   # join_form_field_ids) are appended at the end, sorted by label for stability.
   # Labels: member field keys → human-readable; UUID keys kept as-is (custom field IDs).
@@ -307,14 +275,10 @@ defmodule MvWeb.JoinRequestLive.Show do
   end
 
   defp field_key_to_label(key, member_field_strings) when is_binary(key) do
-    if key in member_field_strings, do: humanize_field(key), else: key
+    if key in member_field_strings,
+      do: MemberFieldsTranslations.label(String.to_existing_atom(key)),
+      else: key
   end
 
   defp field_key_to_label(key, _), do: to_string(key)
-
-  defp humanize_field(key) when is_binary(key) do
-    key
-    |> String.replace("_", " ")
-    |> String.capitalize()
-  end
 end