change

apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/columns.tsx

@@ -2,7 +2,6 @@ import type { Dispatch, ReactNode, SetStateAction } from "react";
 import { Badge, Checkbox, Text, Tooltip } from "@mantine/core";
 import type { TFunction } from "i18next";
 import {
-  APPLICANT_NAME_TYPE_KEYS,
   STATUS_COLORS,
   STATUS_LABELS,
   applicantOrCompanyName,
@@ -14,11 +13,28 @@ import type { AdvancedColumn } from "@ema-platform/ui";
 import { dateDisplayer } from "@ema-platform/shared";
 import { computeSla } from "../../sla";
 
+/**
+ * Label for the Company/Applicant column, derived from the rows actually on
+ * screen rather than the route — a type-pinned queue (`/type/:typeCode`)
+ * happens to be one family, but nothing stops the mixed "All Applications"
+ * grid from holding both, and a static header can't be correct for both at
+ * once. Falls back to the combined label until the page has data to look at.
+ */
+function companyColumnHeader(t: TFunction, items: LicenseApplication[]): string {
+  if (items.length === 0) {
+    return t("queue.companyOrApplicant", "Applicant / Company");
+  }
+  const allLogistics = items.every((a) => a.familyKind === "LOGISTICS_LICENSE");
+  const allNonLogistics = items.every((a) => a.familyKind !== "LOGISTICS_LICENSE");
+  if (allLogistics) return t("queue.company", "Company");
+  if (allNonLogistics) return t("queue.applicant", "Applicant");
+  return t("queue.companyOrApplicant", "Applicant / Company");
+}
+
 export function licenseQueueColumns(
   t: TFunction,
   locale: string,
   opts: {
-    typeCode: string | undefined;
     items: LicenseApplication[];
     selected: string[];
     setSelected: Dispatch<SetStateAction<string[]>>;
@@ -29,8 +45,7 @@ export function licenseQueueColumns(
     ) => ReactNode;
   },
 ): AdvancedColumn<LicenseApplication>[] {
-  const { typeCode, items, selected, setSelected, allSelected, sortableHeader } =
-    opts;
+  const { items, selected, setSelected, allSelected, sortableHeader } = opts;
   return [
     {
       header: (
@@ -72,12 +87,13 @@ export function licenseQueueColumns(
       ),
     },
     {
-      header: sortableHeader(
-        typeCode && APPLICANT_NAME_TYPE_KEYS.includes(typeCode)
-          ? t("queue.applicant", "Applicant")
-          : t("queue.company", "Company"),
-        "companyName",
-      ),
+      // Header reflects what's actually on screen, not the route: a
+      // type-pinned queue (`typeCode` set) is always one family, but the
+      // mixed "All Applications" grid can hold logistics rows and
+      // certificate/document rows side by side, so no single static label is
+      // right for the whole column there — "Applicant / Company" covers
+      // both without claiming a row is one or the other.
+      header: sortableHeader(companyColumnHeader(t, items), "companyName"),
       label: t("queue.company", "Company"),
       cell: ({ row }) => (
         <Text size="sm">{applicantOrCompanyName(row.original) ?? "—"}</Text>
@@ -85,11 +101,17 @@ export function licenseQueueColumns(
     },
     {
       header: t("queue.tin", "TIN"),
-      cell: ({ row }) => (
-        <Text size="sm" c="dimmed">
-          {row.original.tinNumber ?? "—"}
-        </Text>
-      ),
+      cell: ({ row }) =>
+        // A certificate/document application is filed by a person, never a
+        // business — there is no TIN to show, not even a blank one. Hiding
+        // the cell (rather than "—") is what makes the row visibly not a
+        // logistics-licence row, which is the whole point of `familyKind`
+        // being a real column now instead of a frontend guess.
+        row.original.familyKind === "LOGISTICS_LICENSE" ? (
+          <Text size="sm" c="dimmed">
+            {row.original.tinNumber ?? "—"}
+          </Text>
+        ) : null,
     },
     {
       header: t("queue.typeCol", "Type"),

apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx

@@ -375,7 +375,6 @@ export function LicenseQueuePage() {
   const columns: AdvancedColumn<LicenseApplication>[] = useMemo(
     () => [
       ...licenseQueueColumns(t, i18n.language, {
-        typeCode,
         items,
         selected,
         setSelected,
@@ -397,7 +396,6 @@ export function LicenseQueuePage() {
       allSelected,
       items,
       claiming,
-      typeCode,
     ],
   );
 

apps/backoffice/src/app/i18n/locales/am.ts

@@ -823,6 +823,7 @@ export const am: Translations = {
     number: "ማመልከቻ ቁ.",
     company: "ኩባንያ",
     applicant: "አመልካች",
+    companyOrApplicant: "አመልካች / ኩባንያ",
     tin: "ቲን",
     submitted: "የቀረበበት",
     sla: "ዕድሜ / የጊዜ ገደብ",

apps/backoffice/src/app/i18n/locales/en.ts

@@ -827,6 +827,10 @@ export const en = {
     number: 'App #',
     company: 'Company',
     applicant: 'Applicant',
+    // Column header when the grid holds both logistics-licence rows (which
+    // have a company) and certificate/document rows (which have an
+    // applicant instead) — the mixed "All Applications" queue.
+    companyOrApplicant: 'Applicant / Company',
     tin: 'TIN',
     submitted: 'Submitted',
     sla: 'Age / SLA',