From b458bae35cc75322133d31f3b651c03f04f9a338 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Sat, 22 Aug 2026 05:52:56 +0000
Subject: [PATCH 01/27] refactor: introduce hasUnclaimedPool helper to allow
 claim workflows for specific document-family queues

---
 .../pages/LicenseQueuePage/index.tsx          | 34 ++++++++++---------
 .../license-review/queue-views.test.ts        | 26 ++++++++++++++
 .../features/license-review/queue-views.ts    | 32 ++++++++++++++---
 3 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
index b8791eb4e..ed3a5576c 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
@@ -61,6 +61,7 @@ import {
   SAVED_VIEWS,
   filterFromSearchParams,
   readLastView,
+  hasUnclaimedPool,
   savedViewsForFamily,
   searchParamsFromFilter,
   writeLastView,
@@ -159,12 +160,16 @@ export function LicenseQueuePage() {
   const isLogistics = typeCode
     ? resolveFamilyKind(typeCode) === "LOGISTICS_LICENSE"
     : undefined;
-  const visibleViews = savedViewsForFamily(isLogistics !== false);
+  // Claiming is a workflow property, not a label one — Vessel Registration is
+  // a DOCUMENT family but is still triaged off a shared unclaimed pool, so it
+  // keeps the Unassigned tab and the claim actions.
+  const claimable = hasUnclaimedPool(typeCode);
+  const visibleViews = savedViewsForFamily(claimable);
 
   const [view, setView] = useState<SavedViewId>(
     () =>
       (searchParams.get("view") as SavedViewId) ||
-      (isLogistics === false ? "all" : readLastView()),
+      (claimable ? readLastView() : "all"),
   );
   const [page, setPage] = useState(() => Number(searchParams.get("page")) || 1);
   const [pageSize, setPageSize] = useState(PAGE_SIZE);
@@ -174,21 +179,17 @@ export function LicenseQueuePage() {
   const [helpOpen, setHelpOpen] = useState(false);
   const [debouncedSearch] = useDebouncedValue(searchInput, SEARCH_DEBOUNCE_MS);
 
-  // Non-logistics queues have no unassigned/unclaimed pool (see
-  // `savedViewsForFamily`), so a stale "unassigned" view — e.g. restored from
+  // Queues with no unclaimed pool (see `hasUnclaimedPool`) have no unassigned
+  // tab, so a stale "unassigned" view — e.g. restored from
   // `readLastView()` — must fall back to "all" rather than land on a tab that
   // no longer exists. Auto-created BTC requests specifically start at
   // PAYMENT_PENDING, outside "mine" too, so "all" is the one view guaranteed
   // to show them.
   useEffect(() => {
-    if (
-      isLogistics === false &&
-      !searchParams.has("view") &&
-      view === "unassigned"
-    ) {
+    if (!claimable && !searchParams.has("view") && view === "unassigned") {
       setView("all");
     }
-  }, [isLogistics, searchParams, view]);
+  }, [claimable, searchParams, view]);
 
   const urlFilter = useMemo(
     () => filterFromSearchParams(searchParams),
@@ -414,9 +415,9 @@ export function LicenseQueuePage() {
     onPrevious: () => setCursor((c) => Math.max(c - 1, 0)),
     onOpen: () => cursorRow && navigate(`/licence-review/${cursorRow.id}`),
     onClaim: () => {
-      // Only unclaimed rows on a logistics queue can be claimed; pressing c
+      // Only unclaimed rows on a claimable queue can be claimed; pressing c
       // elsewhere is a no-op rather than an error the officer has to read.
-      if (isLogistics !== false && cursorRow && cursorRow.assignedOfficerId === null)
+      if (claimable && cursorRow && cursorRow.assignedOfficerId === null)
         handleClaim(cursorRow.id);
     },
     onEscape: () => setSelected([]),
@@ -481,9 +482,9 @@ export function LicenseQueuePage() {
         claiming,
         onClaim: handleClaim,
         onOpen: (id) => navigate(`/licence-review/${id}`),
-        // Non-logistics applications aren't claimed off a shared queue (see
-        // `savedViewsForFamily`) — every row opens straight to Review.
-        claimable: isLogistics !== false,
+        // Applications with no unclaimed pool (see `hasUnclaimedPool`) are
+        // never claimed — every row opens straight to Review.
+        claimable,
       }),
     ],
     [
@@ -496,6 +497,7 @@ export function LicenseQueuePage() {
       items,
       claiming,
       isLogistics,
+      claimable,
     ],
   );
 
@@ -767,7 +769,7 @@ export function LicenseQueuePage() {
               >
                 {t("queue.export", "Export CSV")}
               </Button>
-              {isLogistics !== false && (
+              {claimable && (
                 <RequirePermission
                   anyOf={[LICENSE_PERMISSIONS.CLAIM_APPLICATION]}
                   hideOnly
diff --git a/apps/backoffice/src/app/features/license-review/queue-views.test.ts b/apps/backoffice/src/app/features/license-review/queue-views.test.ts
index 1d423bce9..dbf349813 100644
--- a/apps/backoffice/src/app/features/license-review/queue-views.test.ts
+++ b/apps/backoffice/src/app/features/license-review/queue-views.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { resolveFamilyKind } from "@ema-platform/api";
+import { hasUnclaimedPool, savedViewsForFamily } from "./queue-views";
 
 describe("resolveFamilyKind", () => {
   it("treats person-centric seafarer applications as document queues", () => {
@@ -8,3 +9,28 @@ describe("resolveFamilyKind", () => {
     expect(resolveFamilyKind("BTC_BASIC_TRAINING")).toBe("CERTIFICATE");
   });
 });
+
+describe("hasUnclaimedPool", () => {
+  it("keeps the unassigned pool for logistics licences", () => {
+    expect(hasUnclaimedPool("FREIGHT_FORWARDER")).toBe(true);
+  });
+
+  it("keeps it for vessel registration, a DOCUMENT queue that is still claimed", () => {
+    expect(resolveFamilyKind("VESSEL_REGISTRATION")).toBe("DOCUMENT");
+    expect(hasUnclaimedPool("VESSEL_REGISTRATION")).toBe(true);
+    expect(savedViewsForFamily(hasUnclaimedPool("VESSEL_REGISTRATION")).map((v) => v.id)).toContain(
+      "unassigned",
+    );
+  });
+
+  it("drops it for the person-centric services", () => {
+    expect(hasUnclaimedPool("SEAMAN_BOOK")).toBe(false);
+    expect(savedViewsForFamily(hasUnclaimedPool("SEAMAN_BOOK")).map((v) => v.id)).not.toContain(
+      "unassigned",
+    );
+  });
+
+  it("keeps it for the mixed All/Mine grids, where no type is pinned", () => {
+    expect(hasUnclaimedPool(undefined)).toBe(true);
+  });
+});
diff --git a/apps/backoffice/src/app/features/license-review/queue-views.ts b/apps/backoffice/src/app/features/license-review/queue-views.ts
index 6689b73a0..6b167779b 100644
--- a/apps/backoffice/src/app/features/license-review/queue-views.ts
+++ b/apps/backoffice/src/app/features/license-review/queue-views.ts
@@ -1,3 +1,4 @@
+import { resolveFamilyKind } from '@ema-platform/api';
 import type { LicenseStatus, QueueCounts, QueueFilter } from '@ema-platform/api';
 
 export type SavedViewId =
@@ -78,12 +79,33 @@ export const SAVED_VIEWS: SavedView[] = [
 export const DEFAULT_VIEW: SavedViewId = 'unassigned';
 
 /**
- * Non-logistics queues (Seafarer Registration, Seaman Book, BTC, CoC, ...)
- * have no unclaimed pool to triage — those applications aren't claimed off a
- * shared queue — so the tab that lists it doesn't apply there.
+ * Type keys reviewed off a shared unclaimed pool despite not being logistics
+ * licences. Whether a queue is claimed is an officer-workflow property, not a
+ * label one: vessel registrations arrive unassigned and officers claim them,
+ * even though the family kind is DOCUMENT because the certificate they produce
+ * is a document rather than a licence.
  */
-export function savedViewsForFamily(isLogistics: boolean): SavedView[] {
-  return isLogistics
+const CLAIMABLE_NON_LOGISTICS = new Set(['VESSEL_REGISTRATION']);
+
+/**
+ * Does this queue have an unclaimed pool to triage?
+ *
+ * True for the mixed All/Mine grids (no type pinned) — nothing is hidden when
+ * the queue spans every type. False for the person-centric services (Seafarer
+ * Registration, Seaman Book, BTC, CoC, ...), whose applications aren't claimed
+ * off a shared queue, so the tab and the claim actions don't apply there.
+ */
+export function hasUnclaimedPool(typeCode: string | undefined): boolean {
+  if (!typeCode) return true;
+  return (
+    resolveFamilyKind(typeCode) === 'LOGISTICS_LICENSE' ||
+    CLAIMABLE_NON_LOGISTICS.has(typeCode)
+  );
+}
+
+/** Drops the Unassigned tab on queues with no unclaimed pool. */
+export function savedViewsForFamily(claimable: boolean): SavedView[] {
+  return claimable
     ? SAVED_VIEWS
     : SAVED_VIEWS.filter((v) => v.id !== 'unassigned');
 }

From 841579468a4665c39ba55393ae45e64349f0f4f2 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Sat, 22 Aug 2026 06:09:44 +0000
Subject: [PATCH 02/27] feat: add claim application functionality to the
 license review page

---
 .../license-review/pages/LicenseReviewPage/index.tsx        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index c26ec2cc8..166b512eb 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -533,11 +533,11 @@ export function LicenseReviewPage() {
     try {
       switch (action.id) {
         case "claim":
-          // Usually fired from the queue, but an officer can also open an
-          // unclaimed application directly and claim it from here.
+          // Usually fired from the queue, but an officer who opened an
+          // unclaimed application directly claims it from here.
           await run(
             () => claimApplication(id).unwrap(),
-            t("review.done.claim", "Application claimed"),
+            t("review.done.claim", "Claimed — the application is now yours"),
           );
           break;
         case "complete-review":

From ae0dfdece36b9e738098dc0e8a62eda1d14a7c79 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Sat, 22 Aug 2026 06:57:22 +0000
Subject: [PATCH 03/27] refactor: update vessel registration route path in
 onboarding navigation

---
 .../app/features/onboarding/pages/OperationsOnboardingPage.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx b/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
index 34d98dc83..8499b8e4f 100644
--- a/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
+++ b/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
@@ -19,7 +19,7 @@ import { OperationsFormContent } from "../../profile/components/OperationsFormCo
  */
 const NEXT_STEP: Record<string, string> = {
   SEAFARER_REGISTRATION: "/seafarer-registration",
-  VESSEL_REGISTRATION: "/licensing/VESSEL_REGISTRATION/apply",
+  VESSEL_REGISTRATION: "/vessel-registration",
 };
 
 function nextStepFor(selectedKeys: string[]): string {

From 0ac969cca2c727fe8657a37304fa58536472bacf Mon Sep 17 00:00:00 2001
From: Fistum <fitsum.tria@gmail.com>
Date: Sat, 22 Aug 2026 07:54:35 +0000
Subject: [PATCH 04/27] logestics chnage

---
 .../components/AssignDialog.tsx               | 113 ++++++++++++++++++
 .../components/DecisionConfirmModal.tsx       |  14 ++-
 .../features/license-review/config/actions.ts |  54 ++++++++-
 .../pages/LicenseQueuePage/actions.tsx        |  29 +++--
 .../pages/LicenseQueuePage/index.tsx          |  98 ++++++---------
 .../pages/LicenseReviewPage/index.tsx         |  51 ++++++++
 apps/backoffice/src/app/i18n/locales/am.ts    |   9 ++
 apps/backoffice/src/app/i18n/locales/en.ts    |   9 ++
 .../lib/features/licensing/licensing-api.ts   |  64 ++++++++++
 .../features/licensing/licensing.helpers.ts   |   8 ++
 .../lib/features/licensing/licensing.types.ts |   4 +
 11 files changed, 380 insertions(+), 73 deletions(-)
 create mode 100644 apps/backoffice/src/app/features/license-review/components/AssignDialog.tsx

diff --git a/apps/backoffice/src/app/features/license-review/components/AssignDialog.tsx b/apps/backoffice/src/app/features/license-review/components/AssignDialog.tsx
new file mode 100644
index 000000000..9afca696c
--- /dev/null
+++ b/apps/backoffice/src/app/features/license-review/components/AssignDialog.tsx
@@ -0,0 +1,113 @@
+import { useEffect, useState } from 'react';
+import { Modal, Select, Stack, Text, Textarea } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import { useGetAssignableOfficersQuery } from '@ema-platform/api';
+import { ModalFooter } from '@ema-platform/ui';
+import { Button } from '@mantine/core';
+
+export type AssignKind = 'review' | 'inspection';
+
+interface AssignDialogProps {
+  opened: boolean;
+  onClose: () => void;
+  /** Which stage is being handed out — changes the wording, not the mechanics. */
+  kind: AssignKind;
+  /** Reference of the application being dispatched, shown for confirmation. */
+  applicationNumber?: string;
+  loading?: boolean;
+  onConfirm: (officerId: string, remark?: string) => void;
+}
+
+/**
+ * The team leader handing work to an employee.
+ *
+ * One dialog for both stages because the decision is identical — pick a person,
+ * optionally say why — and two near-identical modals would drift apart. The
+ * `kind` only selects wording.
+ *
+ * Confirm stays disabled until someone is picked: an assignment with no
+ * assignee is the one mistake this dialog exists to prevent.
+ */
+export function AssignDialog({
+  opened,
+  onClose,
+  kind,
+  applicationNumber,
+  loading,
+  onConfirm,
+}: AssignDialogProps) {
+  const { t } = useTranslation();
+  const { data: officers = [], isLoading } = useGetAssignableOfficersQuery();
+  const [officerId, setOfficerId] = useState<string | null>(null);
+  const [remark, setRemark] = useState('');
+
+  // Reopening for a different application must not offer the previous
+  // dialog's answers as if they had been chosen for this one.
+  useEffect(() => {
+    if (opened) {
+      setOfficerId(null);
+      setRemark('');
+    }
+  }, [opened]);
+
+  const title =
+    kind === 'review'
+      ? t('queue.assignReview', 'Assign document review')
+      : t('queue.assignInspection', 'Assign inspection');
+
+  return (
+    <Modal opened={opened} onClose={onClose} title={title} size="md">
+      <Stack gap="md">
+        {applicationNumber && (
+          <Text size="sm" c="dimmed">
+            {applicationNumber}
+          </Text>
+        )}
+
+        <Select
+          label={
+            kind === 'review'
+              ? t('queue.assignReviewTo', 'Employee to review the documents')
+              : t('queue.assignInspectionTo', 'Employee to conduct the inspection')
+          }
+          placeholder={t('queue.selectEmployee', 'Select an employee')}
+          data={officers.map((o) => ({
+            value: o.id,
+            label: o.name ?? o.id,
+          }))}
+          value={officerId}
+          onChange={setOfficerId}
+          disabled={isLoading}
+          searchable
+          withAsterisk
+        />
+
+        <Textarea
+          label={t('queue.assignRemark', 'Instructions')}
+          description={t(
+            'queue.assignRemarkHint',
+            'Optional. Sent with the assignment notification.',
+          )}
+          value={remark}
+          onChange={(e) => setRemark(e.currentTarget.value)}
+          autosize
+          minRows={2}
+        />
+
+        <ModalFooter>
+          <Button variant="default" onClick={onClose} size="sm">
+            {t('common.cancel', 'Cancel')}
+          </Button>
+          <Button
+            size="sm"
+            loading={loading}
+            disabled={!officerId}
+            onClick={() => officerId && onConfirm(officerId, remark || undefined)}
+          >
+            {t('queue.assignConfirm', 'Assign')}
+          </Button>
+        </ModalFooter>
+      </Stack>
+    </Modal>
+  );
+}
diff --git a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
index 2c34fc9cd..8c863538f 100644
--- a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
@@ -134,7 +134,13 @@ export function DecisionConfirmModal({
 
   if (!action) return null;
 
-  const needsOfficer = action.id === 'assign' || action.id === 'escalate';
+  // The push-model assignments name a person the same way Assign does, so they
+  // reuse this picker rather than each carrying a dialog of their own.
+  const needsOfficer =
+    action.id === 'assign' ||
+    action.id === 'escalate' ||
+    action.id === 'assign-reviewer' ||
+    action.id === 'assign-inspector';
   const reasonMissing = action.requiresReason && !reason.trim() && !reasonCode;
   const blocked =
     reasonMissing ||
@@ -177,7 +183,11 @@ export function DecisionConfirmModal({
             label={
               action.id === 'escalate'
                 ? t('review.supervisor', 'Supervisor')
-                : t('review.officer', 'Officer')
+                : action.id === 'assign-inspector'
+                  ? t('review.inspector', 'Inspector')
+                  : action.id === 'assign-reviewer'
+                    ? t('review.reviewer', 'Reviewer')
+                    : t('review.officer', 'Officer')
             }
             placeholder={t('review.officerPlaceholder', 'Select who takes this on')}
             data={officers.map((officer) => ({
diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 8653938e7..ce4e819fa 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -18,6 +18,10 @@ export type ActionTier =
 export type ActionId =
   | 'claim'
   | 'assign'
+  | 'assign-reviewer'
+  | 'report-review'
+  | 'assign-inspector'
+  | 'report-inspection'
   | 'escalate'
   | 'hold'
   | 'resume'
@@ -75,6 +79,46 @@ export const ACTIONS: ActionDefinition[] = [
     permissions: ['can:claim:license-application'],
     emphasis: 'light',
   },
+  /**
+   * The push-model actions.
+   *
+   * `assign-reviewer` and `assign-inspector` start a stage; `report-review`
+   * and `report-inspection` hand it back. An employee sees only the two report
+   * actions — the assign pair is gated on ASSIGN_APPLICATION, which their
+   * position type does not carry.
+   */
+  {
+    id: 'assign-reviewer',
+    tier: 'workflow',
+    labelKey: 'review.actions.assignReviewer',
+    from: ['SUBMITTED', 'ELIGIBILITY_PAID'],
+    permissions: ['can:assign:license-application'],
+    emphasis: 'filled',
+  },
+  {
+    id: 'report-review',
+    tier: 'workflow',
+    labelKey: 'review.actions.reportReview',
+    from: ['UNDER_REVIEW', 'UNDER_EVALUATION'],
+    permissions: ['can:review:license-application'],
+    emphasis: 'filled',
+  },
+  {
+    id: 'assign-inspector',
+    tier: 'workflow',
+    labelKey: 'review.actions.assignInspector',
+    from: ['REVIEW_REPORTED', 'UNDER_EVALUATION'],
+    permissions: ['can:assign:license-application'],
+    emphasis: 'filled',
+  },
+  {
+    id: 'report-inspection',
+    tier: 'workflow',
+    labelKey: 'review.actions.reportInspection',
+    from: ['INSPECTION_COMPLETED'],
+    permissions: ['can:update:inspection'],
+    emphasis: 'filled',
+  },
   {
     id: 'assign',
     tier: 'workflow',
@@ -162,7 +206,9 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'final-approve',
     tier: 'primary',
     labelKey: 'review.actions.finalApprove',
-    from: ['INSPECTION_COMPLETED', 'UNDER_EVALUATION'],
+    from: ['INSPECTION_COMPLETED',
+      'REVIEW_REPORTED',
+      'INSPECTION_REPORTED', 'UNDER_EVALUATION'],
     permissions: ['can:approve:license-application'],
     emphasis: 'filled',
     color: 'teal',
@@ -172,7 +218,9 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'request-adjustment',
     tier: 'primary',
     labelKey: 'review.actions.requestAdjustment',
-    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED'],
+    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED',
+      'REVIEW_REPORTED',
+      'INSPECTION_REPORTED'],
     permissions: ['can:request-adjustment:license-application'],
     emphasis: 'light',
     color: 'orange',
@@ -187,6 +235,8 @@ export const ACTIONS: ActionDefinition[] = [
       'UNDER_EVALUATION',
       'INSPECTION_PENDING',
       'INSPECTION_COMPLETED',
+      'REVIEW_REPORTED',
+      'INSPECTION_REPORTED',
     ],
     permissions: ['can:reject:license-application'],
     emphasis: 'light',
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/actions.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/actions.tsx
index bd3eb3753..ac28d13ab 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/actions.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/actions.tsx
@@ -7,11 +7,12 @@ import { LICENSE_PERMISSIONS, RequirePermission } from "@ema-platform/auth";
 export function licenseQueueActionsColumn(
   t: TFunction,
   handlers: {
-    claiming: boolean;
-    onClaim: (id: string) => void;
+    assigning: boolean;
+    /** Opens the assign dialog. Team leaders only — see below. */
+    onAssign: (application: LicenseApplication) => void;
     onOpen: (id: string) => void;
-    /** False for a non-logistics queue — there's no unclaimed pool to claim from. */
-    claimable?: boolean;
+    /** False for a non-logistics queue — nothing there is dispatched. */
+    assignable?: boolean;
   },
 ): AdvancedColumn<LicenseApplication> {
   return {
@@ -19,24 +20,32 @@ export function licenseQueueActionsColumn(
     label: t("queue.actionsColumn", "Actions"),
     align: "right",
     size: 140,
+    /**
+     * "Assign", not "Claim".
+     *
+     * Work is pushed, not picked up: an unassigned application is waiting for
+     * the team leader to hand it to someone, and no seeded position type holds
+     * `CLAIM_APPLICATION` any more. Guarded on `ASSIGN_APPLICATION`, so an
+     * employee sees only "Review" on the files that are already theirs.
+     */
     cell: ({ row }) =>
-      handlers.claimable !== false &&
+      handlers.assignable !== false &&
       row.original.assignedOfficerId === null &&
-      // Mirrors the CLAIM transition's `from` list: an examined cert
+      // Mirrors the ASSIGN_REVIEWER transition's `from` list: an examined cert
       // (CoC/CoP) sits in ELIGIBILITY_PAID once its eligibility fee clears,
       // not SUBMITTED.
       (row.original.status === "SUBMITTED" ||
         row.original.status === "ELIGIBILITY_PAID") ? (
         <RequirePermission
-          anyOf={[LICENSE_PERMISSIONS.CLAIM_APPLICATION]}
+          anyOf={[LICENSE_PERMISSIONS.ASSIGN_APPLICATION]}
           hideOnly
         >
           <Button
             size="xs"
-            loading={handlers.claiming}
-            onClick={() => handlers.onClaim(row.original.id)}
+            loading={handlers.assigning}
+            onClick={() => handlers.onAssign(row.original)}
           >
-            {t("queue.claim", "Claim")}
+            {t("queue.assign", "Assign")}
           </Button>
         </RequirePermission>
       ) : (
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
index 856b30581..395f98087 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage/index.tsx
@@ -35,7 +35,7 @@ import {
   familyLabels,
   localized,
   resolveFamilyKind,
-  useClaimApplicationMutation,
+  useAssignReviewerMutation,
   useGetAllApplicationsQuery,
   useGetAssignedToMeQuery,
   useGetLicenseTypesQuery,
@@ -54,7 +54,6 @@ import {
   AmharicDatePicker,
   type AdvancedColumn,
 } from "@ema-platform/ui";
-import { LICENSE_PERMISSIONS, RequirePermission } from "@ema-platform/auth";
 import {
   DEFAULT_VIEW,
   SAVED_VIEWS,
@@ -70,6 +69,7 @@ import { setDensity } from "../../../../store/preferences.slice";
 import { useAppDispatch, useAppSelector } from "../../../../store/hooks";
 import { KEYBOARD_SHORTCUTS, useQueueKeyboard } from "../../useQueueKeyboard";
 import { licenseQueueColumns } from "./columns";
+import { AssignDialog } from "../../components/AssignDialog";
 import { licenseQueueActionsColumn } from "./actions";
 import { PageHeader } from '@ema-platform/ui';
 
@@ -267,7 +267,8 @@ export function LicenseQueuePage() {
         ? mineQuery
         : allQuery;
 
-  const [claim, { isLoading: claiming }] = useClaimApplicationMutation();
+  const [assignReviewer, { isLoading: assigning }] = useAssignReviewerMutation();
+  const [assignTarget, setAssignTarget] = useState<LicenseApplication | null>(null);
   const [runExport, { isFetching: exporting }] =
     useLazyExportApplicationsQuery();
 
@@ -354,58 +355,40 @@ export function LicenseQueuePage() {
     setFacet({ sortBy: field, sortDir: dir });
   };
 
-  async function handleClaim(id: string) {
+  /**
+   * The team leader dispatching one application.
+   *
+   * Replaces the old self-service claim: nothing is picked up any more, so the
+   * queue's primary action is handing a file to an employee. The dialog holds
+   * the choice; this only sends it.
+   */
+  async function handleAssign(officerId: string, remark?: string) {
+    if (!assignTarget) return;
     try {
-      await claim(id).unwrap();
+      await assignReviewer({ id: assignTarget.id, officerId, remark }).unwrap();
       notifications.show({
         color: "teal",
-        title: t("queue.claimed", "Claimed"),
+        title: t("queue.assigned", "Assigned"),
         message: t(
-          "queue.claimedBody",
-          "The application is now assigned to you.",
+          "queue.assignedBody",
+          "The employee has been notified and the review has started.",
         ),
       });
-      changeView("mine");
+      setAssignTarget(null);
+      active.refetch();
     } catch (err) {
-      // A 409 means another officer got there first — refresh so the queue
-      // stops showing work that is no longer available.
       notifications.show({
         color: "red",
-        title: t("queue.claimFailed", "Could not claim"),
+        title: t("queue.assignFailed", "Could not assign"),
         message: extractErrorMessage(
           err,
-          t("queue.claimRace", "Another officer already claimed it."),
+          t("queue.assignError", "The application could not be assigned."),
         ),
       });
       active.refetch();
     }
   }
 
-  async function handleBulkClaim() {
-    const results = await Promise.allSettled(
-      selected.map((id) => claim(id).unwrap()),
-    );
-    const claimed = results.filter((r) => r.status === "fulfilled").length;
-    const lost = results.length - claimed;
-    notifications.show({
-      color: lost ? "yellow" : "teal",
-      title: t("queue.bulkClaimed", {
-        count: claimed,
-        defaultValue: "{{count}} claimed",
-      }),
-      // Partial success is the normal case in a shared queue, so it is
-      // reported rather than swallowed or treated as total failure.
-      message: lost
-        ? t("queue.bulkClaimPartial", {
-            count: lost,
-            defaultValue: "{{count}} were already taken by another officer.",
-          })
-        : "",
-    });
-    setSelected([]);
-    active.refetch();
-  }
-
   const cursorRow = items[cursor];
   useQueueKeyboard({
     enabled: !helpOpen,
@@ -414,10 +397,12 @@ export function LicenseQueuePage() {
     onPrevious: () => setCursor((c) => Math.max(c - 1, 0)),
     onOpen: () => cursorRow && navigate(`/licence-review/${cursorRow.id}`),
     onClaim: () => {
-      // Only unclaimed rows on a logistics queue can be claimed; pressing c
-      // elsewhere is a no-op rather than an error the officer has to read.
+      // "c" now opens the assign dialog on an undispatched row. Kept on the
+      // same key: it is still "do the queue's primary action to this row",
+      // and rebinding a shortcut officers have in their fingers costs more
+      // than the name mismatch.
       if (isLogistics !== false && cursorRow && cursorRow.assignedOfficerId === null)
-        handleClaim(cursorRow.id);
+        setAssignTarget(cursorRow);
     },
     onEscape: () => setSelected([]),
     onHelp: () => setHelpOpen(true),
@@ -478,12 +463,12 @@ export function LicenseQueuePage() {
         isLogistics,
       }),
       licenseQueueActionsColumn(t, {
-        claiming,
-        onClaim: handleClaim,
+        assigning,
+        onAssign: setAssignTarget,
         onOpen: (id) => navigate(`/licence-review/${id}`),
-        // Non-logistics applications aren't claimed off a shared queue (see
+        // Non-logistics applications aren't dispatched off a shared queue (see
         // `savedViewsForFamily`) — every row opens straight to Review.
-        claimable: isLogistics !== false,
+        assignable: isLogistics !== false,
       }),
     ],
     [
@@ -494,7 +479,7 @@ export function LicenseQueuePage() {
       selected,
       allSelected,
       items,
-      claiming,
+      assigning,
       isLogistics,
     ],
   );
@@ -763,23 +748,18 @@ export function LicenseQueuePage() {
               >
                 {t("queue.export", "Export CSV")}
               </Button>
-              {isLogistics !== false && (
-                <RequirePermission
-                  anyOf={[LICENSE_PERMISSIONS.CLAIM_APPLICATION]}
-                  hideOnly
-                >
-                  <Button loading={claiming} onClick={handleBulkClaim}>
-                    {t("queue.bulkClaim", {
-                      count: selected.length,
-                      defaultValue: "Claim {{count}}",
-                    })}
-                  </Button>
-                </RequirePermission>
-              )}
             </Group>
           </Group>
         </Paper>
       )}
+      <AssignDialog
+        opened={assignTarget !== null}
+        onClose={() => setAssignTarget(null)}
+        kind="review"
+        applicationNumber={assignTarget?.applicationNumber}
+        loading={assigning}
+        onConfirm={handleAssign}
+      />
     </Container>
   );
 }
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index d86070069..fdd4ab464 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -39,6 +39,10 @@ import {
   useLocalized,
   useApproveDocumentsMutation,
   useAssignApplicationMutation,
+  useAssignReviewerMutation,
+  useAssignInspectorMutation,
+  useReportReviewMutation,
+  useReportInspectionMutation,
   useCompleteReviewMutation,
   useConfirmPaymentMutation,
   useScheduleIssuanceMutation,
@@ -215,6 +219,13 @@ export function LicenseReviewPage() {
   const [resumeApplication] = useResumeApplicationMutation();
   const [escalateApplication] = useEscalateApplicationMutation();
   const [assignApplication] = useAssignApplicationMutation();
+  const [assignReviewer, { isLoading: assigningReviewer }] =
+    useAssignReviewerMutation();
+  const [assignInspector, { isLoading: assigningInspector }] =
+    useAssignInspectorMutation();
+  const [reportReview] = useReportReviewMutation();
+  const [reportInspection] = useReportInspectionMutation();
+
   // Real officer list, so Assign and Escalate name a person instead of
   // silently reassigning to whoever already held the application.
   const { data: officers = [] } = useGetAssignableOfficersQuery();
@@ -534,6 +545,46 @@ export function LicenseReviewPage() {
           // Claim is fired from the queue in practice; kept here for the case
           // where an officer opens an unclaimed application directly.
           break;
+        // Handing work out. Reuses the decision modal's officer picker rather
+        // than a dialog of its own — it already resolves the real officer list.
+        case "assign-reviewer":
+          if (!submission.officerId) return;
+          await run(
+            () =>
+              assignReviewer({
+                id,
+                officerId: submission.officerId as string,
+                remark: submission.reason,
+              }).unwrap(),
+            t("review.done.assignReviewer", "Review assigned"),
+          );
+          break;
+        case "assign-inspector":
+          if (!submission.officerId) return;
+          await run(
+            () =>
+              assignInspector({
+                id,
+                inspectorId: submission.officerId as string,
+                remark: submission.reason,
+              }).unwrap(),
+            t("review.done.assignInspector", "Inspection assigned"),
+          );
+          break;
+        // Handing work back. Parks the file with the team leader — an employee
+        // finishing their task decides nothing.
+        case "report-review":
+          await run(
+            () => reportReview({ id, remark: submission.reason }).unwrap(),
+            t("review.done.reportReview", "Sent to your team leader"),
+          );
+          break;
+        case "report-inspection":
+          await run(
+            () => reportInspection({ id, remark: submission.reason }).unwrap(),
+            t("review.done.reportInspection", "Inspection result sent"),
+          );
+          break;
         case "complete-review":
           await run(
             () =>
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index bf3dc571f..d2ec65d3c 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -867,6 +867,11 @@ export const am: Translations = {
     submitted: "የቀረበበት",
     sla: "ዕድሜ / የጊዜ ገደብ",
     claim: "ውሰድ",
+    assign: "መድብ",
+    assigned: "ተመድቧል",
+    assignedBody: "ባለሙያው ተነግሮታል፤ ግምገማው ተጀምሯል።",
+    assignFailed: "መመደብ አልተቻለም",
+    assignError: "ማመልከቻውን መመደብ አልተቻለም።",
     review: "ገምግም",
     claimed: "ተወስዷል",
     claimedBody: "ማመልከቻው አሁን ለእርስዎ ተመድቧል።",
@@ -966,6 +971,10 @@ export const am: Translations = {
     actions: {
       claim: "ውሰድ",
       assign: "መድብ",
+      assignReviewer: "ግምገማ መድብ",
+      reportReview: "ለቡድን መሪ አሳውቅ",
+      assignInspector: "ምርመራ መድብ",
+      reportInspection: "የምርመራ ውጤት አሳውቅ",
       escalate: "ወደ ላይ አሳድግ",
       hold: "አግድ",
       resume: "ቀጥል",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 650c3a8dc..8697095ce 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -875,6 +875,11 @@ export const en = {
     submitted: 'Submitted',
     sla: 'Age / SLA',
     claim: 'Claim',
+    assign: 'Assign',
+    assigned: 'Assigned',
+    assignedBody: 'The employee has been notified and the review has started.',
+    assignFailed: 'Could not assign',
+    assignError: 'The application could not be assigned.',
     review: 'Review',
     claimed: 'Claimed',
     claimedBody: 'The application is now assigned to you.',
@@ -974,6 +979,10 @@ export const en = {
     actions: {
       claim: 'Claim',
       assign: 'Assign',
+      assignReviewer: 'Assign review',
+      reportReview: 'Report to team leader',
+      assignInspector: 'Assign inspection',
+      reportInspection: 'Report inspection result',
       escalate: 'Escalate',
       hold: 'Put on hold',
       resume: 'Resume',
diff --git a/libs/api/src/lib/features/licensing/licensing-api.ts b/libs/api/src/lib/features/licensing/licensing-api.ts
index ac0fa0b02..7768628f0 100644
--- a/libs/api/src/lib/features/licensing/licensing-api.ts
+++ b/libs/api/src/lib/features/licensing/licensing-api.ts
@@ -755,6 +755,66 @@ export const licensingApi = baseApi
         query: () => ({ url: '/license-application-review/officers' }),
       }),
 
+      // ------------------------------------------------- team-leader dispatch
+      /**
+       * Handing work out, and handing it back.
+       *
+       * `assignApplication` below only re-points an application already in
+       * flight; these two *start* a stage, because under the push model
+       * assignment is how work begins — nothing is claimed from a queue.
+       */
+      assignReviewer: builder.mutation<
+        LicenseApplication,
+        { id: string; officerId: string; remark?: string }
+      >({
+        query: ({ id, ...body }) => ({
+          url: `/license-application-review/${id}/assign-reviewer`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_r, error, { id }) =>
+          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
+      }),
+
+      assignInspector: builder.mutation<
+        LicenseApplication,
+        { id: string; inspectorId: string; remark?: string }
+      >({
+        query: ({ id, ...body }) => ({
+          url: `/license-application-review/${id}/assign-inspector`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_r, error, { id }) =>
+          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
+      }),
+
+      reportReview: builder.mutation<
+        LicenseApplication,
+        { id: string; remark?: string }
+      >({
+        query: ({ id, ...body }) => ({
+          url: `/license-application-review/${id}/report-review`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_r, error, { id }) =>
+          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
+      }),
+
+      reportInspection: builder.mutation<
+        LicenseApplication,
+        { id: string; remark?: string }
+      >({
+        query: ({ id, ...body }) => ({
+          url: `/license-application-review/${id}/report-inspection`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_r, error, { id }) =>
+          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
+      }),
+
       // ----------------------------------------------------- workflow controls
       assignApplication: builder.mutation<
         LicenseApplication,
@@ -953,6 +1013,10 @@ export const {
   useRevokeLicenseMutation,
   useReinstateLicenseMutation,
   useAssignApplicationMutation,
+  useAssignReviewerMutation,
+  useAssignInspectorMutation,
+  useReportReviewMutation,
+  useReportInspectionMutation,
   useHoldApplicationMutation,
   useResumeApplicationMutation,
   useEscalateApplicationMutation,
diff --git a/libs/api/src/lib/features/licensing/licensing.helpers.ts b/libs/api/src/lib/features/licensing/licensing.helpers.ts
index 248de738b..d3a4c4613 100644
--- a/libs/api/src/lib/features/licensing/licensing.helpers.ts
+++ b/libs/api/src/lib/features/licensing/licensing.helpers.ts
@@ -65,7 +65,9 @@ export const STATUS_LABELS: Record<LicenseStatus, string> = {
   UNDER_EVALUATION: 'Under Evaluation',
   RESUBMIT_REQUIRED: 'Resubmit Required',
   INSPECTION_PENDING: 'Inspection Pending',
+  REVIEW_REPORTED: 'Review Reported',
   INSPECTION_COMPLETED: 'Inspection Completed',
+  INSPECTION_REPORTED: 'Inspection Reported',
   APPROVED: 'Approved',
   REJECTED: 'Rejected',
   ON_HOLD: 'On Hold',
@@ -92,7 +94,11 @@ export const STATUS_COLORS: Record<LicenseStatus, string> = {
   UNDER_EVALUATION: 'indigo',
   RESUBMIT_REQUIRED: 'orange',
   INSPECTION_PENDING: 'cyan',
+  // Both 'reported' states are waiting on the team leader, so they carry the
+  // same tone as anything else awaiting an officer decision.
+  REVIEW_REPORTED: 'orange',
   INSPECTION_COMPLETED: 'cyan',
+  INSPECTION_REPORTED: 'orange',
   APPROVED: 'teal',
   REJECTED: 'red',
   ON_HOLD: 'gray',
@@ -125,7 +131,9 @@ export const STATUS_PROGRESS: Record<LicenseStatus, number> = {
   UNDER_EVALUATION: 45,
   RESUBMIT_REQUIRED: 30,
   INSPECTION_PENDING: 55,
+  REVIEW_REPORTED: 50,
   INSPECTION_COMPLETED: 65,
+  INSPECTION_REPORTED: 70,
   APPROVED: 75,
   // Parked, so it keeps the progress of wherever it was held from.
   ON_HOLD: 45,
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index 029f45f92..a3a47d19b 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -26,9 +26,13 @@ export type LicenseStatus =
   | "SUBMITTED"
   | "UNDER_REVIEW"
   | "UNDER_EVALUATION"
+  // Employee filed their review; parked with the team leader for a decision.
+  | "REVIEW_REPORTED"
   | "RESUBMIT_REQUIRED"
   | "INSPECTION_PENDING"
   | "INSPECTION_COMPLETED"
+  // Inspector filed the result; parked with the team leader for a decision.
+  | "INSPECTION_REPORTED"
   | "APPROVED"
   | "REJECTED"
   | "ON_HOLD"

From 3d6deb03f6561cae4b2d9abb4085d69765b8ffe4 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Sat, 22 Aug 2026 07:58:08 +0000
Subject: [PATCH 05/27] feat: add payment and bypass actions to the in-flight
 vessel registration application table

---
 .../vessel-registration/inFlightColumns.tsx   | 61 ++++++++++++++++---
 .../pages/VesselRegistrationPage.tsx          | 32 ++++++++++
 2 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx b/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
index 43dc3e382..c03cbe472 100644
--- a/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
+++ b/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
@@ -12,7 +12,14 @@ import {
 /** Columns for the applicant's in-flight vessel registration applications. */
 export function inFlightColumns(
   t: TFunction,
-  deps: { onOpen: (app: LicenseApplication) => void },
+  deps: {
+    onOpen: (app: LicenseApplication) => void;
+    onPay: (app: LicenseApplication) => void;
+    onBypass: (app: LicenseApplication) => void;
+    isPaying: boolean;
+    bypassEnabled: boolean;
+    bypassing: boolean;
+  },
 ): AdvancedColumn<LicenseApplication>[] {
   return [
     {
@@ -38,15 +45,49 @@ export function inFlightColumns(
     },
     {
       header: t('applications.table.progress'),
-      size: 140,
-      cell: ({ row }) => (
-        <Progress
-          value={STATUS_PROGRESS[row.original.status]}
-          color={STATUS_COLORS[row.original.status]}
-          size="sm"
-          radius="xl"
-        />
-      ),
+      size: 300,
+      cell: ({ row }) => {
+        const app = row.original;
+        return (
+          <Group gap="xs" wrap="nowrap">
+            <Progress
+              value={STATUS_PROGRESS[app.status]}
+              color={STATUS_COLORS[app.status]}
+              size="sm"
+              radius="xl"
+              style={{ flex: 1, minWidth: 60 }}
+            />
+            {/* The fee stops the registration dead, so the payment action sits
+                on the bar rather than being hidden behind View. */}
+            {app.status === 'PAYMENT_PENDING' && (
+              <>
+                <Button
+                  size="compact-sm"
+                  color="yellow"
+                  loading={deps.isPaying}
+                  onClick={() => deps.onPay(app)}
+                >
+                  {t('applications.actions.pay', {
+                    amount: Number(app.feeAmount ?? 0).toLocaleString(),
+                    currency: app.feeCurrency,
+                  })}
+                </Button>
+                {deps.bypassEnabled && (
+                  <Button
+                    size="compact-sm"
+                    variant="default"
+                    loading={deps.bypassing}
+                    onClick={() => deps.onBypass(app)}
+                    title="Testing only — marks the fee paid"
+                  >
+                    {t('applications.actions.bypass')}
+                  </Button>
+                )}
+              </>
+            )}
+          </Group>
+        );
+      },
     },
     {
       header: '',
diff --git a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
index 7f896900b..4bf751431 100644
--- a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
+++ b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
@@ -30,11 +30,16 @@ import {
 import { StatusBadge, AdvancedTable } from '@ema-platform/ui';
 import { inFlightColumns } from '../inFlightColumns';
 import {
+  extractErrorMessage,
   TERMINAL_STATUSES,
   useApiMutation,
+  useBypassPaymentMutation,
   useGetMyApplicationsQuery,
+  useGetPaymentCapabilitiesQuery,
 } from '@ema-platform/api';
+import { notifications } from '@mantine/notifications';
 import { authStorage } from '@ema-platform/auth';
+import { useApplicationPayment } from '../../payments/hooks/useApplicationPayment';
 
 // ---------------------------------------------------------------------------
 // Types
@@ -132,6 +137,9 @@ export function VesselRegistrationPage() {
   const navigate = useNavigate();
   const { t } = useTranslation();
   const { data: applications, isFetching, refetch } = useGetMyApplicationsQuery();
+  const { pay, isPaying } = useApplicationPayment();
+  const { data: capabilities } = useGetPaymentCapabilitiesQuery();
+  const [bypassPayment, { isLoading: bypassing }] = useBypassPaymentMutation();
   const [page, setPage] = useState(0);
   const [registration, setRegistration] = useState<VesselRegistration | null>(null);
   const [fetchTrigger] = useApiMutation<VesselRegistration>();
@@ -155,9 +163,33 @@ export function VesselRegistrationPage() {
       !TERMINAL_STATUSES.includes(app.status),
   );
 
+  async function handleBypass(applicationId: string) {
+    try {
+      const result = await bypassPayment(applicationId).unwrap();
+      notifications.show({
+        color: 'teal',
+        title: 'Payment bypassed',
+        message: `Application is now ${result.status.replace(/_/g, ' ').toLowerCase()}.`,
+      });
+      refetch();
+    } catch (err) {
+      notifications.show({
+        color: 'red',
+        title: 'Bypass failed',
+        message: extractErrorMessage(err),
+      });
+    }
+  }
+
   const columns = inFlightColumns(t, {
     onOpen: (app) =>
       navigate(`/licensing/${REGISTRATION_TYPE_KEY}/applications/${app.id}`),
+    // Paying leaves the SPA for Telebirr — a provider hand-off, not a route change.
+    onPay: (app) => pay(app.id),
+    onBypass: (app) => handleBypass(app.id),
+    isPaying,
+    bypassEnabled: capabilities?.bypassEnabled ?? false,
+    bypassing,
   });
 
   const certs = registration?.category === 'Sea-going Vessel (International)'

From 573b2034225b459e75e06188b94011254435887b Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Sat, 22 Aug 2026 08:01:18 +0000
Subject: [PATCH 06/27] refactor: remove bypass payment capability check and
 enable bypass button unconditionally

---
 .../vessel-registration/inFlightColumns.tsx   | 24 +++++++++----------
 .../pages/VesselRegistrationPage.tsx          |  3 ---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx b/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
index c03cbe472..88e5c18b4 100644
--- a/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
+++ b/apps/portal/src/app/features/vessel-registration/inFlightColumns.tsx
@@ -17,7 +17,6 @@ export function inFlightColumns(
     onPay: (app: LicenseApplication) => void;
     onBypass: (app: LicenseApplication) => void;
     isPaying: boolean;
-    bypassEnabled: boolean;
     bypassing: boolean;
   },
 ): AdvancedColumn<LicenseApplication>[] {
@@ -72,17 +71,18 @@ export function inFlightColumns(
                     currency: app.feeCurrency,
                   })}
                 </Button>
-                {deps.bypassEnabled && (
-                  <Button
-                    size="compact-sm"
-                    variant="default"
-                    loading={deps.bypassing}
-                    onClick={() => deps.onBypass(app)}
-                    title="Testing only — marks the fee paid"
-                  >
-                    {t('applications.actions.bypass')}
-                  </Button>
-                )}
+                {/* ponytail: shown unconditionally — the licensing page hides
+                    this behind the API's bypassEnabled capability flag, which
+                    is off here. Re-gate on capabilities before prod. */}
+                <Button
+                  size="compact-sm"
+                  variant="default"
+                  loading={deps.bypassing}
+                  onClick={() => deps.onBypass(app)}
+                  title="Testing only — marks the fee paid"
+                >
+                  {t('applications.actions.bypass')}
+                </Button>
               </>
             )}
           </Group>
diff --git a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
index 4bf751431..a2c2e32ec 100644
--- a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
+++ b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
@@ -35,7 +35,6 @@ import {
   useApiMutation,
   useBypassPaymentMutation,
   useGetMyApplicationsQuery,
-  useGetPaymentCapabilitiesQuery,
 } from '@ema-platform/api';
 import { notifications } from '@mantine/notifications';
 import { authStorage } from '@ema-platform/auth';
@@ -138,7 +137,6 @@ export function VesselRegistrationPage() {
   const { t } = useTranslation();
   const { data: applications, isFetching, refetch } = useGetMyApplicationsQuery();
   const { pay, isPaying } = useApplicationPayment();
-  const { data: capabilities } = useGetPaymentCapabilitiesQuery();
   const [bypassPayment, { isLoading: bypassing }] = useBypassPaymentMutation();
   const [page, setPage] = useState(0);
   const [registration, setRegistration] = useState<VesselRegistration | null>(null);
@@ -188,7 +186,6 @@ export function VesselRegistrationPage() {
     onPay: (app) => pay(app.id),
     onBypass: (app) => handleBypass(app.id),
     isPaying,
-    bypassEnabled: capabilities?.bypassEnabled ?? false,
     bypassing,
   });
 

From 9f8f29d61478384d56ac530cc1ab6325a4157782 Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Mon, 24 Aug 2026 11:30:56 +0000
Subject: [PATCH 07/27] fix(exam): stop hiding non-CHOICE questions from
 OFFLINE assignment picker

eligibleQuestions filtered by q.form === exam.form, which matched the
backend's own restriction (assertUsable) only for ONLINE exams. Once
exam.form gained the "BOTH" value for OFFLINE mixed papers, no question
ever has form "BOTH", so the picker silently emptied out or, for a
plain CHOICE-form exam, looked CHOICE-only regardless of administration
method. Now mirrors the backend: CHOICE-only gate applies only when
administrationMethod is ONLINE.
---
 .../src/app/features/exam/pages/ExamDetailPage.tsx  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
index 8e9037840..5ce7a4ab5 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
@@ -121,18 +121,25 @@ export function ExamDetailPage() {
 
   // Only approved bank items may go on a paper (US-EXAM-003), so the picker
   // must not offer drafts or retired questions either.
+  //
+  // Form restriction mirrors the backend's assertUsable: ONLINE exams are
+  // CHOICE-only (auto-grading needs it), OFFLINE exams have no form
+  // restriction at all — mixing ESSAY and CHOICE by hand (exam.form
+  // "BOTH") is the sanctioned, only way to build a mixed paper. Matching
+  // `q.form === exam.form` here used to hide every question once "BOTH"
+  // became a real exam.form value, since no question itself is "BOTH".
   const eligibleQuestions = useMemo(() => {
     if (!exam) return [];
     return allQuestions
       .filter(
         (q) =>
           q.certificationId === exam.certificationId &&
-          q.form === exam.form &&
-          q.status === 'APPROVED',
+          q.status === 'APPROVED' &&
+          (exam.administrationMethod !== 'ONLINE' || q.form === 'CHOICE'),
       )
       .map((q) => ({ id: q.id, title: q.title, form: q.form, points: q.points }));
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [allQuestions, exam?.certificationId, exam?.form]);
+  }, [allQuestions, exam?.certificationId, exam?.administrationMethod]);
 
   if (isLoading)
     return <PageLoader label="Loading Exam Details…" height={400} />;

From 35961ec8099a9712254545a2cbbc56ea92581023 Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Mon, 24 Aug 2026 12:57:37 +0000
Subject: [PATCH 08/27] feat(exam): let ONLINE exams take ESSAY/BOTH form, add
 grading-sheet API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Frontend half of the backend change: ExamPage no longer disables the
form Select or force-resets it to CHOICE when administrationMethod is
ONLINE (backend's assertOnlineIsChoiceOnly is gone, matching gate
removed here). Also wires up GET .../grading-sheet as
useGetGradingSheetQuery — RecordResultModal wiring (show candidate
answers, prefill auto-computed CHOICE scores) is next.
---
 .../src/app/features/exam/api/exam-api.ts      | 11 +++++++++++
 .../app/features/exam/pages/ExamPage/index.tsx | 15 +--------------
 .../src/app/features/exam/types/exam.ts        | 18 ++++++++++++++++++
 apps/backoffice/src/app/i18n/locales/am.ts     |  1 -
 apps/backoffice/src/app/i18n/locales/en.ts     |  1 -
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/apps/backoffice/src/app/features/exam/api/exam-api.ts b/apps/backoffice/src/app/features/exam/api/exam-api.ts
index d313a38ac..4dbe8f713 100644
--- a/apps/backoffice/src/app/features/exam/api/exam-api.ts
+++ b/apps/backoffice/src/app/features/exam/api/exam-api.ts
@@ -12,6 +12,7 @@ import type {
   CreateIncidentPayload,
   ResolveIncidentPayload,
   RegradeOutcome,
+  GradingSheet,
 } from '../types/exam';
 
 const examApi = baseApi.injectEndpoints({
@@ -101,6 +102,15 @@ const examApi = baseApi.injectEndpoints({
       }),
       invalidatesTags: ['Api'],
     }),
+    /** The candidate's answers plus auto-computable CHOICE scores, for RecordResultModal. */
+    getGradingSheet: builder.query<
+      GradingSheet,
+      { examId: string; profileId: string }
+    >({
+      query: ({ examId, profileId }) =>
+        `/exam-attempts/exam/${examId}/candidate/${profileId}/grading-sheet`,
+      providesTags: ['Api'],
+    }),
   }),
   overrideExisting: false,
 });
@@ -119,4 +129,5 @@ export const {
   useRecordIncidentMutation,
   useResolveIncidentMutation,
   useRegradeAttemptMutation,
+  useGetGradingSheetQuery,
 } = examApi;
diff --git a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
index 034d203ae..34039328c 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
@@ -255,12 +255,6 @@ function ExamForm({
                   onChange={setForm}
                   size="sm"
                   required
-                  disabled={adminMethod === "ONLINE"}
-                  description={
-                    adminMethod === "ONLINE"
-                      ? t("exam.form.onlineChoiceOnlyHint")
-                      : undefined
-                  }
                 />
                 <Select
                   label={t("exam.detail.administration")}
@@ -270,14 +264,7 @@ function ExamForm({
                     { value: "ONLINE", label: t("exam.form.online") },
                   ]}
                   value={adminMethod}
-                  onChange={(value) => {
-                    setAdminMethod(value);
-                    // Online exams are graded automatically, and that only
-                    // has an answer model for CHOICE — matches the backend
-                    // rule (online_exam_requires_choice_form), not just a
-                    // UI nicety.
-                    if (value === "ONLINE") setForm("CHOICE");
-                  }}
+                  onChange={setAdminMethod}
                   size="sm"
                   required
                 />
diff --git a/apps/backoffice/src/app/features/exam/types/exam.ts b/apps/backoffice/src/app/features/exam/types/exam.ts
index 28752ae64..9ca4676d4 100644
--- a/apps/backoffice/src/app/features/exam/types/exam.ts
+++ b/apps/backoffice/src/app/features/exam/types/exam.ts
@@ -136,6 +136,24 @@ export type RegradeOutcome =
   | { graded: true; resultId: string }
   | { graded: false; reason: string };
 
+/** One question's row on the staff grading sheet — the candidate's own
+ * answer plus the auto-computable score, where one exists. */
+export interface GradingSheetQuestion {
+  questionId: string;
+  form: QuestionForm;
+  points: number;
+  answerText: string | null;
+  selectedOptionId: string | null;
+  selectedOptionText: { en?: string; am?: string } | null;
+  /** null means "no auto-score" — examiner enters one by hand. */
+  autoScore: number | null;
+}
+
+export interface GradingSheet {
+  attemptStatus: 'IN_PROGRESS' | 'SUBMITTED' | 'EXPIRED';
+  questions: GradingSheetQuestion[];
+}
+
 export interface RecordAttendancePayload {
   registrationId: string;
   status: AttendanceStatus;
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 458b638e6..1e75f20eb 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -260,7 +260,6 @@ export const am: Translations = {
       both: "ሁለቱም",
       offline: "ከመስመር ውጪ",
       online: "በመስመር",
-      onlineChoiceOnlyHint: "የመስመር ላይ ፈተናዎች በራስ-ሰር ይመዘገባሉ፣ ይህም ለምርጫ ጥያቄዎች ብቻ ይሰራል።",
       sum: "ድምር",
       average: "አማካይ",
       percentage: "መቶኛ",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 73a9d96d7..3af7597f0 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -259,7 +259,6 @@ export const en = {
       both: 'Both',
       offline: 'Offline',
       online: 'Online',
-      onlineChoiceOnlyHint: 'Online exams are graded automatically, which only works for multiple choice.',
       sum: 'Sum',
       average: 'Average',
       percentage: 'Percentage',

From 34208ed0d663bc3be6895ef4f61184ed591f660e Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Mon, 24 Aug 2026 13:02:08 +0000
Subject: [PATCH 09/27] feat(exam): show candidate answers + prefill
 auto-scores in RecordResultModal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Wires useGetGradingSheetQuery into the grading modal: a new 'Candidate's
Answer' column shows the selected option or essay text per question, and
whichever CHOICE scores auto-grading could already compute get prefilled
into the score inputs (tagged 'Auto-graded', still editable — the examiner
can override). Grading a mixed or ESSAY paper no longer means guessing at
what was answered or re-deriving the CHOICE portion by eye.

Degrades to blank inputs exactly as before for an OFFLINE candidate or one
who hasn't sat an online attempt (gradingSheet returns empty answers for
those, not an error).
---
 .../components/RecordResultModal/columns.tsx  | 51 ++++++++++++++-----
 .../components/RecordResultModal/index.tsx    | 32 +++++++++++-
 apps/backoffice/src/app/i18n/locales/am.ts    |  3 ++
 apps/backoffice/src/app/i18n/locales/en.ts    |  3 ++
 4 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/apps/backoffice/src/app/features/result/components/RecordResultModal/columns.tsx b/apps/backoffice/src/app/features/result/components/RecordResultModal/columns.tsx
index f224aa828..9503b1120 100644
--- a/apps/backoffice/src/app/features/result/components/RecordResultModal/columns.tsx
+++ b/apps/backoffice/src/app/features/result/components/RecordResultModal/columns.tsx
@@ -1,7 +1,7 @@
-import { NumberInput, Text, TextInput } from '@mantine/core';
+import { Badge, Group, NumberInput, Text, TextInput } from '@mantine/core';
 import type { TFunction } from 'i18next';
 import type { AdvancedColumn } from '@ema-platform/ui';
-import type { QuestionBrief } from '../../../exam/types/exam';
+import type { GradingSheetQuestion, QuestionBrief } from '../../../exam/types/exam';
 
 export function recordResultColumns(
   t: TFunction,
@@ -11,6 +11,9 @@ export function recordResultColumns(
     questionRemarks: Record<string, string>;
     onScoreChange: (questionId: string, value: number) => void;
     onRemarkChange: (questionId: string, value: string) => void;
+    /** The candidate's own answer + auto-score, when available (empty for
+     *  an OFFLINE candidate or one who hasn't sat an online attempt). */
+    answersByQuestion: Map<string, GradingSheetQuestion>;
   },
 ): AdvancedColumn<QuestionBrief>[] {
   return [
@@ -22,6 +25,20 @@ export function recordResultColumns(
         </Text>
       ),
     },
+    {
+      header: t('result.recordModal.candidateAnswer'),
+      cell: ({ row }) => {
+        const answer = handlers.answersByQuestion.get(row.original.id);
+        if (!answer || (!answer.answerText && !answer.selectedOptionText)) {
+          return <Text fz="xs" c="dimmed">{t('result.recordModal.noAnswer')}</Text>;
+        }
+        return (
+          <Text fz="sm" maw={220} lineClamp={3}>
+            {answer.selectedOptionText?.[locale] ?? answer.answerText}
+          </Text>
+        );
+      },
+    },
     {
       header: t('result.recordModal.maxPoints'),
       cell: ({ row }) => (
@@ -32,16 +49,26 @@ export function recordResultColumns(
     },
     {
       header: t('result.recordModal.score'),
-      cell: ({ row }) => (
-        <NumberInput
-          value={handlers.scores[row.original.id] ?? 0}
-          onChange={(v) => handlers.onScoreChange(row.original.id, Number(v))}
-          min={0}
-          max={row.original.points}
-          size="xs"
-          style={{ width: 80 }}
-        />
-      ),
+      cell: ({ row }) => {
+        const autoGraded = handlers.answersByQuestion.get(row.original.id)?.autoScore != null;
+        return (
+          <Group gap={4} wrap="nowrap">
+            <NumberInput
+              value={handlers.scores[row.original.id] ?? 0}
+              onChange={(v) => handlers.onScoreChange(row.original.id, Number(v))}
+              min={0}
+              max={row.original.points}
+              size="xs"
+              style={{ width: 80 }}
+            />
+            {autoGraded && (
+              <Badge size="xs" variant="light" color="teal">
+                {t('result.recordModal.autoGraded')}
+              </Badge>
+            )}
+          </Group>
+        );
+      },
     },
     {
       header: t('result.recordModal.remark'),
diff --git a/apps/backoffice/src/app/features/result/components/RecordResultModal/index.tsx b/apps/backoffice/src/app/features/result/components/RecordResultModal/index.tsx
index 15ed50335..b073b1ca1 100644
--- a/apps/backoffice/src/app/features/result/components/RecordResultModal/index.tsx
+++ b/apps/backoffice/src/app/features/result/components/RecordResultModal/index.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Modal,
@@ -20,7 +20,7 @@ import { extractErrorMessage } from '@ema-platform/api';
 import { LICENSE_PERMISSIONS, RequirePermission } from '@ema-platform/auth';
 import { recordResultColumns } from './columns';
 import { useCreateResultMutation } from '../../api/result-api';
-import { useGetExamRegistrationsQuery } from '../../../exam/api/exam-api';
+import { useGetExamRegistrationsQuery, useGetGradingSheetQuery } from '../../../exam/api/exam-api';
 import type { Exam } from '../../../exam/types/exam';
 
 function InfoRow({ label, value }: { label: string; value: string }) {
@@ -55,12 +55,39 @@ export function RecordResultModal({
   const { data: registrations } = useGetExamRegistrationsQuery(exam.id, {
     skip: !opened,
   });
+  // The candidate's own answers plus whatever score auto-grading could
+  // already compute for the CHOICE portion — degrades to "no data" for an
+  // OFFLINE candidate or one who never sat an online attempt, same as
+  // before this existed.
+  const { data: gradingSheet } = useGetGradingSheetQuery(
+    { examId: exam.id, profileId: selectedSeafarerId ?? '' },
+    { skip: !opened || !selectedSeafarerId },
+  );
+  const answersByQuestion = new Map(
+    (gradingSheet?.questions ?? []).map((q) => [q.questionId, q]),
+  );
   const [createResult, { isLoading: isSaving }] = useCreateResultMutation();
   const table = useServerTable();
 
   const questions = exam.questions ?? [];
   const pagedQuestions = table.paginate(questions);
 
+  // Prefill (never override) the CHOICE questions auto-grading already
+  // scored — the examiner only has to key in the ESSAY marks. A fresh
+  // seafarer selection always starts from an empty scores map, so this
+  // only ever fills in blanks, never stomps a manual edit already made.
+  useEffect(() => {
+    if (!gradingSheet) return;
+    const autoScores: Record<string, number> = {};
+    for (const q of gradingSheet.questions) {
+      if (q.autoScore !== null) autoScores[q.questionId] = q.autoScore;
+    }
+    if (Object.keys(autoScores).length) {
+      setScores((prev) => ({ ...autoScores, ...prev }));
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [gradingSheet]);
+
   const seafarerOptions = (registrations ?? [])
     .filter((registration) =>
       ['PRESENT', 'LATE'].includes(registration.attendanceStatus),
@@ -175,6 +202,7 @@ export function RecordResultModal({
                 questionRemarks,
                 onScoreChange: handleScoreChange,
                 onRemarkChange: handleQuestionRemarkChange,
+                answersByQuestion,
               })}
               data={pagedQuestions.rows}
               itemCount={pagedQuestions.itemCount}
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 1e75f20eb..292a374ae 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -657,6 +657,9 @@ export const am: Translations = {
       seafarerPlaceholder: "መርከበኛ ይፈልጉ እና ይምረጡ",
       scorePerQuestion: "በጥያቄ ውጤት",
       question: "ጥያቄ",
+      candidateAnswer: "የተፈታኙ መልስ",
+      noAnswer: "የተመዘገበ መልስ የለም",
+      autoGraded: "በራስ-ሰር የተመዘነ",
       maxPoints: "ከፍተኛ ውጤት",
       score: "ውጤት",
       remark: "ማስታወሻ",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 3af7597f0..8c0ff66ff 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -657,6 +657,9 @@ export const en = {
       seafarerPlaceholder: 'Search and select a seafarer',
       scorePerQuestion: 'Score per Question',
       question: 'Question',
+      candidateAnswer: "Candidate's Answer",
+      noAnswer: 'No answer on file',
+      autoGraded: 'Auto-graded',
       maxPoints: 'Max Points',
       score: 'Score',
       remark: 'Remark',

From b49de1c1a8580e7a9b89b56355ec375689576bad Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Mon, 24 Aug 2026 14:04:24 +0000
Subject: [PATCH 10/27] fix(exam): guard question assignment once the paper is
 locked
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The detail page fired assign/draw requests blind and surfaced the raw
backend key to the user — a locked paper showed up as the literal string
"paper_locked_after_registration" in a toast.

Manage Questions is now disabled once any candidate has registered, with a
tooltip and badge explaining why; both the manual assign and the random draw
live behind that modal, so one guard covers the same ground the backend's
assertPaperEditable does. The empty-paper alert now explains the deadlock
instead of telling the user to click a button that will fail, and both
error handlers translate paper_locked_after_registration in case someone
registers while the modal is open.

Registrations come from the query ExamCandidatesPanel already runs on this
page, so RTK Query serves it from cache rather than issuing a second request.
---
 .../features/exam/pages/ExamDetailPage.tsx    | 62 +++++++++++++++----
 apps/backoffice/src/app/i18n/locales/am.ts    |  3 +
 apps/backoffice/src/app/i18n/locales/en.ts    |  3 +
 3 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
index 4abe06117..ff8759458 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
@@ -22,6 +22,7 @@ import {
   TextInput,
   ThemeIcon,
   Box,
+  Tooltip,
   rem,
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
@@ -48,6 +49,7 @@ import {
   useUpdateExamMutation,
   useAssignQuestionsMutation,
   useSelectRandomQuestionsMutation,
+  useGetExamRegistrationsQuery,
 } from '../api/exam-api';
 import { useGetQuestionsQuery } from '../../question/api/question-api';
 import { useGetCertificationsQuery } from '../../certification/api/certification-api';
@@ -114,6 +116,12 @@ export function ExamDetailPage() {
   const [selectRandom, { isLoading: isDrawing }] = useSelectRandomQuestionsMutation();
 
   const { data: exam, isLoading, isError } = useGetExamQuery(id ?? '', { skip: !id });
+  // The backend locks the paper the moment the first candidate registers
+  // (ExamService.assertPaperEditable) — every candidate must sit the same
+  // paper. Same query ExamCandidatesPanel already runs, so RTK Query serves
+  // it from cache rather than issuing a second request.
+  const { data: registrations } = useGetExamRegistrationsQuery(id ?? '', { skip: !id });
+  const paperLocked = (registrations?.length ?? 0) > 0;
   const { data: qRes } = useGetQuestionsQuery();
   const { data: certRes } = useGetCertificationsQuery();
   const allQuestions = qRes?.items ?? [];
@@ -183,7 +191,9 @@ export function ExamDetailPage() {
     } catch (error) {
       const key = extractErrorMessage(error, t('exam.randomError'));
       notify.error(
-        key.startsWith('insufficient_approved_questions')
+        key === 'paper_locked_after_registration'
+          ? t('exam.paperLockedHint', { count: registrations?.length ?? 0 })
+          : key.startsWith('insufficient_approved_questions')
           ? `${t('exam.notEnoughApproved')} (${key.split(':')[1] ?? ''})`
           : key.startsWith('paper_cannot_reach_cutting_point')
             ? t('exam.cannotReachCuttingPoint', {
@@ -204,7 +214,9 @@ export function ExamDetailPage() {
     } catch (error) {
       const key = extractErrorMessage(error, 'Failed to assign questions');
       notify.error(
-        key.startsWith('question_not_approved')
+        key === 'paper_locked_after_registration'
+          ? t('exam.paperLockedHint', { count: registrations?.length ?? 0 })
+          : key.startsWith('question_not_approved')
           ? t('question.qc.onlyApprovedUsable')
           : key.startsWith('paper_cannot_reach_cutting_point')
             ? t('exam.cannotReachCuttingPoint', {
@@ -456,19 +468,45 @@ export function ExamDetailPage() {
             {t("exam.detail.questionsSection", { pts: totalPoints })}
           </Title>
           <RequirePermission anyOf={[LICENSE_PERMISSIONS.MANAGE_EXAMS]} hideOnly>
-            <Button
-              variant="light"
-              size="xs"
-              leftSection={<IconPlus size={14} />}
-              onClick={openAssignModal}
-            >
-              {t("exam.manageQuestions")}
-            </Button>
+            <Group gap="xs">
+              {paperLocked && (
+                <Badge size="sm" variant="light" color="gray">
+                  {t("exam.paperLocked")}
+                </Badge>
+              )}
+              <Tooltip
+                label={t("exam.paperLockedHint", {
+                  count: registrations?.length ?? 0,
+                })}
+                disabled={!paperLocked}
+                multiline
+                w={280}
+              >
+                {/* Wrapped: a disabled Mantine Button fires no pointer events,
+                    so the tooltip needs an enabled element to hang off. */}
+                <Box>
+                  <Button
+                    variant="light"
+                    size="xs"
+                    leftSection={<IconPlus size={14} />}
+                    onClick={openAssignModal}
+                    disabled={paperLocked}
+                  >
+                    {t("exam.manageQuestions")}
+                  </Button>
+                </Box>
+              </Tooltip>
+            </Group>
           </RequirePermission>
         </Group>
         {(exam.questions ?? []).length === 0 ? (
-          <Alert color="gray" icon={<IconInfoCircle size={16} />}>
-            {t("exam.noQuestionsAssigned")}
+          <Alert
+            color={paperLocked ? "red" : "gray"}
+            icon={<IconInfoCircle size={16} />}
+          >
+            {paperLocked
+              ? t("exam.paperLockedHint", { count: registrations?.length ?? 0 })
+              : t("exam.noQuestionsAssigned")}
           </Alert>
         ) : (
           <Stack gap="md">
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 292a374ae..c8e51193d 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -387,6 +387,9 @@ export const am: Translations = {
     notEnoughApproved: "ለዚህ ትምህርት በቂ የጸደቁ ጥያቄዎች የሉም።",
     cannotReachCuttingPoint:
       "ይህ ወረቀት የማለፊያ ነጥቡን ሊደርስ አይችልም (ከፍተኛ {{max}}፣ የማለፊያ ነጥብ {{cuttingPoint}})። ተጨማሪ ወይም ከፍ ያለ ነጥብ ያላቸው ጥያቄዎችን ጨምር፣ ወይም የማለፊያ ነጥቡን ቀንስ።",
+    paperLocked: "ወረቀቱ ተቆልፏል",
+    paperLockedHint:
+      "ለዚህ ፈተና {{count}} ተፈታኝ(ዎች) ተመዝግበዋል። ሁሉም ተፈታኞች አንድ ዓይነት ወረቀት መፈተን ስላለባቸው ጥያቄዎቹ ከዚህ በኋላ አይቀየሩም።",
   },
 
   country: {
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 8c0ff66ff..7152067ce 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -386,6 +386,9 @@ export const en = {
       'Not enough approved questions in the bank for this subject.',
     cannotReachCuttingPoint:
       'This paper cannot reach the passing mark (max {{max}}, pass mark {{cuttingPoint}}). Add more/higher-point questions, or lower the cutting point.',
+    paperLocked: 'Paper locked',
+    paperLockedHint:
+      '{{count}} candidate(s) have registered for this session. Every candidate must sit the same paper, so questions can no longer be changed.',
   },
 
   country: {

From bd65fc0eab9fad000a79f4ce02f9788c19cf6c87 Mon Sep 17 00:00:00 2001
From: Nati <natinigussie7@gmail.com>
Date: Mon, 24 Aug 2026 14:15:55 +0000
Subject: [PATCH 11/27] Enhance certificate designer and seafarer registration
 features with image support and dynamic department/rank options

---
 .../components/BlockPropertiesPanel.tsx       | 133 +++++++++++-------
 .../components/TemplateCanvas.tsx             |  26 +++-
 .../components/TemplateVariableList.tsx       |  19 +--
 .../config/layout-compiler.ts                 |  31 +++-
 .../hooks/useTemplateDraft.ts                 |  57 +++++---
 .../pages/CertificateDesignerPage.tsx         |   2 +-
 .../pages/CertificationPage/index.tsx         |  11 +-
 .../certification/types/certification.ts      |  18 ---
 .../features/exam/pages/ExamPage/index.tsx    |   7 +-
 .../pages/SeafarerRegistrationQueuePage.tsx   |  14 +-
 .../pages/SeafarerRegistrationReviewPage.tsx  |   9 +-
 .../components/ConfigDrivenSection.tsx        |  60 +++++++-
 .../components/RegistrationSummary.tsx        |  10 +-
 .../components/steps.tsx                      |  19 ++-
 .../lib/features/licensing/licensing.types.ts |   7 +-
 .../seafarer-registration.constants.ts        |  12 +-
 16 files changed, 320 insertions(+), 115 deletions(-)

diff --git a/apps/backoffice/src/app/features/certificate-designer/components/BlockPropertiesPanel.tsx b/apps/backoffice/src/app/features/certificate-designer/components/BlockPropertiesPanel.tsx
index 8e8684350..b0f91cab9 100644
--- a/apps/backoffice/src/app/features/certificate-designer/components/BlockPropertiesPanel.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/components/BlockPropertiesPanel.tsx
@@ -1,5 +1,6 @@
 import {
   ActionIcon,
+  Button,
   ColorInput,
   Group,
   NumberInput,
@@ -11,7 +12,7 @@ import {
   TextInput,
   Tooltip,
 } from '@mantine/core';
-import { IconTrash } from '@tabler/icons-react';
+import { IconBold, IconItalic, IconTrash } from '@tabler/icons-react';
 import { useTranslation } from 'react-i18next';
 import type { TemplateFieldPlacement, TemplateVariable } from '@ema-platform/api';
 
@@ -43,7 +44,17 @@ export function BlockPropertiesPanel({
     );
   }
 
-  const isLiteral = block.variable === null;
+  const current = block;
+  const isLiteral = current.variable === null;
+  const isImage = current.type === 'image';
+  const variableByKey = new Map(variables.map((v) => [v.key, v]));
+
+  const selectVariable = (key: string | null) => {
+    if (!key) return;
+    const kind: 'text' | 'image' =
+      variableByKey.get(key)?.kind === 'image' ? 'image' : 'text';
+    onChange({ ...current, variable: key, type: kind });
+  };
 
   return (
     <Paper withBorder p="md" radius="md">
@@ -70,11 +81,9 @@ export function BlockPropertiesPanel({
           value={isLiteral ? 'text' : 'variable'}
           disabled={disabled}
           onChange={(value) =>
-            onChange(
-              value === 'text'
-                ? { ...block, variable: null, text: block.text ?? '' }
-                : { ...block, variable: variables[0]?.key ?? 'companyName' },
-            )
+            value === 'text'
+              ? onChange({ ...block, variable: null, type: 'text', text: block.text ?? '' })
+              : selectVariable(variables[0]?.key ?? 'companyName')
           }
           data={[
             { value: 'variable', label: t('designer.blockVariable', 'Variable') },
@@ -94,24 +103,26 @@ export function BlockPropertiesPanel({
             label={t('designer.blockVariableLabel', 'Variable')}
             data={variables.map((variable) => ({
               value: variable.key,
-              label: variable.label,
+              label: variable.kind === 'image' ? `🖼 ${variable.label}` : variable.label,
             }))}
             value={block.variable}
-            onChange={(value) => onChange({ ...block, variable: value })}
+            onChange={selectVariable}
             searchable
             disabled={disabled}
           />
         )}
 
         <Group gap="xs" grow>
-          <NumberInput
-            label={t('designer.blockFontSize', 'Font size')}
-            value={block.fontSize ?? 14}
-            onChange={(value) => onChange({ ...block, fontSize: Number(value) || 14 })}
-            min={4}
-            max={200}
-            disabled={disabled}
-          />
+          {!isImage && (
+            <NumberInput
+              label={t('designer.blockFontSize', 'Font size')}
+              value={block.fontSize ?? 14}
+              onChange={(value) => onChange({ ...block, fontSize: Number(value) || 14 })}
+              min={4}
+              max={200}
+              disabled={disabled}
+            />
+          )}
           <NumberInput
             label={t('designer.blockWidth', 'Width (%)')}
             value={block.widthPct}
@@ -149,42 +160,62 @@ export function BlockPropertiesPanel({
           />
         </Group>
 
-        <SegmentedControl
-          fullWidth
-          size="xs"
-          value={block.align ?? 'left'}
-          disabled={disabled}
-          onChange={(value) =>
-            onChange({ ...block, align: value as TemplateFieldPlacement['align'] })
-          }
-          data={[
-            { value: 'left', label: t('designer.alignLeft', 'Left') },
-            { value: 'center', label: t('designer.alignCenter', 'Centre') },
-            { value: 'right', label: t('designer.alignRight', 'Right') },
-          ]}
-        />
+        {!isImage && (
+          <>
+            <SegmentedControl
+              fullWidth
+              size="xs"
+              value={block.align ?? 'left'}
+              disabled={disabled}
+              onChange={(value) =>
+                onChange({ ...block, align: value as TemplateFieldPlacement['align'] })
+              }
+              data={[
+                { value: 'left', label: t('designer.alignLeft', 'Left') },
+                { value: 'center', label: t('designer.alignCenter', 'Centre') },
+                { value: 'right', label: t('designer.alignRight', 'Right') },
+                { value: 'justify', label: t('designer.alignJustify', 'Justify') },
+              ]}
+            />
 
-        <SegmentedControl
-          fullWidth
-          size="xs"
-          value={block.fontWeight ?? 'normal'}
-          disabled={disabled}
-          onChange={(value) =>
-            onChange({ ...block, fontWeight: value as TemplateFieldPlacement['fontWeight'] })
-          }
-          data={[
-            { value: 'normal', label: t('designer.weightNormal', 'Normal') },
-            { value: 'bold', label: t('designer.weightBold', 'Bold') },
-          ]}
-        />
+            <Group gap="xs">
+              <Button
+                size="xs"
+                variant={block.fontWeight === 'bold' ? 'filled' : 'default'}
+                disabled={disabled}
+                onClick={() =>
+                  onChange({
+                    ...block,
+                    fontWeight: block.fontWeight === 'bold' ? 'normal' : 'bold',
+                  })
+                }
+              >
+                <IconBold size={14} />
+              </Button>
+              <Button
+                size="xs"
+                variant={block.fontStyle === 'italic' ? 'filled' : 'default'}
+                disabled={disabled}
+                onClick={() =>
+                  onChange({
+                    ...block,
+                    fontStyle: block.fontStyle === 'italic' ? 'normal' : 'italic',
+                  })
+                }
+              >
+                <IconItalic size={14} />
+              </Button>
+            </Group>
 
-        <ColorInput
-          label={t('designer.blockColor', 'Colour')}
-          value={block.color ?? '#111111'}
-          onChange={(value) => onChange({ ...block, color: value })}
-          disabled={disabled}
-          format="hex"
-        />
+            <ColorInput
+              label={t('designer.blockColor', 'Colour')}
+              value={block.color ?? '#111111'}
+              onChange={(value) => onChange({ ...block, color: value })}
+              disabled={disabled}
+              format="hex"
+            />
+          </>
+        )}
       </Stack>
     </Paper>
   );
diff --git a/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx b/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
index db0530f2f..d04f360dc 100644
--- a/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Box, Paper, Text } from '@mantine/core';
+import { IconPhoto } from '@tabler/icons-react';
 import { useTranslation } from 'react-i18next';
 import type { TemplateFieldPlacement, TemplateLogoPlacement } from '@ema-platform/api';
 
@@ -233,6 +234,7 @@ export function TemplateCanvas({
 
         {placements.map((block) => {
           const isSelected = block.id === selectedId;
+          const isImage = block.type === 'image';
           return (
             <div
               key={block.id}
@@ -247,6 +249,7 @@ export function TemplateCanvas({
                 width: `${block.widthPct}%`,
                 fontSize: block.fontSize ?? 14,
                 fontWeight: block.fontWeight ?? 'normal',
+                fontStyle: block.fontStyle ?? 'normal',
                 textAlign: block.align ?? 'left',
                 color: block.color ?? '#111111',
                 cursor: disabled ? 'default' : 'move',
@@ -259,9 +262,30 @@ export function TemplateCanvas({
                 lineHeight: 1.3,
                 wordWrap: 'break-word',
                 userSelect: 'none',
+                // An image block has no real image to show here — the actual
+                // data URI is only resolved server-side at render/preview
+                // time — so it gets a fixed square footprint and an icon
+                // instead of stretching to a text block's shape.
+                ...(isImage
+                  ? {
+                      aspectRatio: '1',
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'center',
+                      background: isSelected
+                        ? 'rgba(34,139,230,0.08)'
+                        : 'var(--mantine-color-gray-1)',
+                    }
+                  : {}),
               }}
             >
-              {block.variable ? `{{${block.variable}}}` : block.text || ' '}
+              {isImage ? (
+                <IconPhoto size={18} color="var(--mantine-color-gray-6)" />
+              ) : block.variable ? (
+                `{{${block.variable}}}`
+              ) : (
+                block.text || ' '
+              )}
 
               {isSelected && !disabled && (
                 <span
diff --git a/apps/backoffice/src/app/features/certificate-designer/components/TemplateVariableList.tsx b/apps/backoffice/src/app/features/certificate-designer/components/TemplateVariableList.tsx
index ff5b3ad3a..0ad8316fb 100644
--- a/apps/backoffice/src/app/features/certificate-designer/components/TemplateVariableList.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/components/TemplateVariableList.tsx
@@ -1,19 +1,15 @@
 import { Button, Code, ScrollArea, Stack, Text, Tooltip } from '@mantine/core';
-import { IconPlus } from '@tabler/icons-react';
+import { IconPhoto, IconPlus } from '@tabler/icons-react';
 import { useTranslation } from 'react-i18next';
-
-interface Variable {
-  key: string;
-  label: string;
-}
+import type { TemplateVariable } from '@ema-platform/api';
 
 interface Props {
-  variables: Variable[];
+  variables: TemplateVariable[];
   disabled: boolean;
   /** Canvas mode: drops a block onto the page. Source mode: inserts at caret. */
   canvasMode: boolean;
   onInsert: (key: string) => void;
-  onAddBlock: (key: string) => void;
+  onAddBlock: (key: string, kind: 'text' | 'image') => void;
   onAddTextBlock: () => void;
 }
 
@@ -60,8 +56,13 @@ export function TemplateVariableList({
                 variant="default"
                 justify="flex-start"
                 disabled={disabled}
+                leftSection={
+                  variable.kind === 'image' ? <IconPhoto size={12} /> : undefined
+                }
                 onClick={() =>
-                  canvasMode ? onAddBlock(variable.key) : onInsert(variable.key)
+                  canvasMode
+                    ? onAddBlock(variable.key, variable.kind === 'image' ? 'image' : 'text')
+                    : onInsert(variable.key)
                 }
               >
                 <Code fz={10}>{`{{${variable.key}}}`}</Code>
diff --git a/apps/backoffice/src/app/features/certificate-designer/config/layout-compiler.ts b/apps/backoffice/src/app/features/certificate-designer/config/layout-compiler.ts
index 9488bcd2f..e21bd7a17 100644
--- a/apps/backoffice/src/app/features/certificate-designer/config/layout-compiler.ts
+++ b/apps/backoffice/src/app/features/certificate-designer/config/layout-compiler.ts
@@ -41,14 +41,43 @@ function logoHtml(logoUrl: string, placement: TemplateLogoPlacement): string {
   return `    <img class="ema-logo" src="${escapeHtml(logoUrl)}" alt="" style="position:absolute;${position}width:${width}%;" />\n`;
 }
 
+/**
+ * Variable keys the renderer fills with a data URI — the fallback for a
+ * block placed before `type` existed on it. Keep in sync with
+ * `IMAGE_VARIABLE_KEYS` in the server's template-variables.ts; a new image
+ * variable added there should be added here too.
+ */
+const IMAGE_VARIABLE_KEYS = new Set([
+  'logo',
+  'holderPhoto',
+  'qrImage',
+  'sealImage',
+  'signatureImage',
+  'seafarerSignature',
+]);
+
+function isImageBlock(block: TemplateFieldPlacement): boolean {
+  if (block.type) return block.type === 'image';
+  return !!block.variable && IMAGE_VARIABLE_KEYS.has(block.variable);
+}
+
 function blockHtml(block: TemplateFieldPlacement): string {
   const x = pct(block.xPct, 0);
   const y = pct(block.yPct, 0);
   // Minimum 1%, matching the server compiler: a zero-width block would render
   // as an invisible sliver rather than as the mistake it is.
   const width = pct(block.widthPct, 30, 1);
+
+  if (isImageBlock(block) && block.variable) {
+    // Triple-brace: the value is a data URI, not markup — escaping it turns
+    // every "&" into "&amp;" and corrupts the src.
+    const style = `position:absolute;left:${x}%;top:${y}%;width:${width}%;object-fit:contain;`;
+    return `    <img class="ema-block" style="${style}" src="{{{${block.variable}}}}" alt="" />\n`;
+  }
+
   const size = block.fontSize ?? 14;
   const weight = block.fontWeight === 'bold' ? 'bold' : 'normal';
+  const style_ = block.fontStyle === 'italic' ? 'italic' : 'normal';
   const align = block.align ?? 'left';
   const color = escapeHtml(block.color ?? '#111111');
 
@@ -58,7 +87,7 @@ function blockHtml(block: TemplateFieldPlacement): string {
 
   const style =
     `position:absolute;left:${x}%;top:${y}%;width:${width}%;` +
-    `font-size:${size}px;font-weight:${weight};text-align:${align};color:${color};`;
+    `font-size:${size}px;font-weight:${weight};font-style:${style_};text-align:${align};color:${color};`;
 
   return `    <div class="ema-block" style="${style}">${content}</div>\n`;
 }
diff --git a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
index 19a28fe34..14abcd909 100644
--- a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
+++ b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
@@ -81,23 +81,46 @@ export function useTemplateDraft(templates: LicenseTemplate[]) {
   const selectedBlock =
     placements.find((block) => block.id === selectedBlockId) ?? null;
 
-  /** Drops a new block near the top-left, where it is immediately visible. */
-  const addBlock = useCallback((variable: string | null, text?: string) => {
-    const block: TemplateFieldPlacement = {
-      id: blockId(),
-      variable,
-      text,
-      xPct: 10,
-      yPct: 10,
-      widthPct: 30,
-      fontSize: 14,
-      fontWeight: 'normal',
-      align: 'left',
-      color: '#111111',
-    };
-    setPlacements((prev) => [...prev, block]);
-    setSelectedBlockId(block.id);
-  }, []);
+  /**
+   * Drops a new block near the top-left, where it is immediately visible.
+   *
+   * An image block gets a square-ish default footprint instead of the text
+   * defaults (fontSize/color/align mean nothing on an `<img>`) — a seal or
+   * signature dropped at 30% width and no explicit height would otherwise
+   * stretch to whatever the image's own aspect ratio makes of that width,
+   * which reads as broken until the author manually resizes it.
+   */
+  const addBlock = useCallback(
+    (variable: string | null, text?: string, kind: 'text' | 'image' = 'text') => {
+      const block: TemplateFieldPlacement =
+        kind === 'image'
+          ? {
+              id: blockId(),
+              variable,
+              type: 'image',
+              xPct: 10,
+              yPct: 10,
+              widthPct: 15,
+            }
+          : {
+              id: blockId(),
+              variable,
+              text,
+              type: 'text',
+              xPct: 10,
+              yPct: 10,
+              widthPct: 30,
+              fontSize: 14,
+              fontWeight: 'normal',
+              fontStyle: 'normal',
+              align: 'left',
+              color: '#111111',
+            };
+      setPlacements((prev) => [...prev, block]);
+      setSelectedBlockId(block.id);
+    },
+    [],
+  );
 
   const updateBlock = useCallback((next: TemplateFieldPlacement) => {
     setPlacements((prev) =>
diff --git a/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx b/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
index 73f5f9c91..61d3f5ef9 100644
--- a/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
@@ -392,7 +392,7 @@ export function CertificateDesignerPage() {
             disabled={editingLocked}
             canvasMode={mode === 'canvas'}
             onInsert={draft.insertVariable}
-            onAddBlock={(key) => draft.addBlock(key)}
+            onAddBlock={(key, kind) => draft.addBlock(key, undefined, kind)}
             onAddTextBlock={() => draft.addBlock(null, 'Text')}
           />
         </Group>
diff --git a/apps/backoffice/src/app/features/certification/pages/CertificationPage/index.tsx b/apps/backoffice/src/app/features/certification/pages/CertificationPage/index.tsx
index e3f9ed214..323703738 100644
--- a/apps/backoffice/src/app/features/certification/pages/CertificationPage/index.tsx
+++ b/apps/backoffice/src/app/features/certification/pages/CertificationPage/index.tsx
@@ -4,23 +4,26 @@ import { useDisclosure } from '@mantine/hooks';
 import { useTranslation } from 'react-i18next';
 import {IconPlus} from '@tabler/icons-react';
 import { AdvancedTable, ErrorState, ModalFooter, notify, PageHeader, useErrorHandler, useServerTable } from '@ema-platform/ui';
+import { useGetRanksQuery, useLocalized } from '@ema-platform/api';
 import {
   useGetCertificationsQuery,
   useCreateCertificationMutation,
   useUpdateCertificationMutation,
   useDeleteCertificationMutation,
 } from '../../api/certification-api';
-import { RANK_KEY_OPTIONS, type Certification } from '../../types/certification';
+import { type Certification } from '../../types/certification';
 import { certificationColumns } from './columns';
 import { certificationActionsColumn } from './actions';
 
 function CertificationForm({
   editing,
+  rankOptions,
   isSubmitting,
   onSubmit,
   onCancel,
 }: {
   editing: Certification | null;
+  rankOptions: { value: string; label: string }[];
   isSubmitting: boolean;
   onSubmit: (values: { nameEn: string; nameAm: string; descEn: string; descAm: string; rankKey: string | null }, isEdit: boolean) => void;
   onCancel: () => void;
@@ -53,7 +56,7 @@ function CertificationForm({
             label={t('certification.form.rankKey', 'STCW rank (for exam scheduling)')}
             description={t('certification.form.rankKeyHint', 'Leave blank if this certification is not part of the examined CoC/CoP ladder.')}
             placeholder={t('certification.form.rankKeyPlaceholder', 'Not rank-specific')}
-            data={RANK_KEY_OPTIONS as unknown as { value: string; label: string }[]}
+            data={rankOptions}
             value={rankKey}
             onChange={setRankKey}
             size="sm"
@@ -74,7 +77,10 @@ export function CertificationPage() {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
   const { handleError } = useErrorHandler();
+  const localized = useLocalized();
   const { data, isFetching, isError, refetch } = useGetCertificationsQuery();
+  const { data: rankRes } = useGetRanksQuery();
+  const rankOptions = (rankRes?.items ?? []).map((r) => ({ value: r.key, label: localized(r.name) }));
   const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [createCert, { isLoading: isCreating }] = useCreateCertificationMutation();
   const [updateCert, { isLoading: isUpdating }] = useUpdateCertificationMutation();
@@ -154,6 +160,7 @@ export function CertificationPage() {
       {showForm && (
         <CertificationForm
           editing={editing}
+          rankOptions={rankOptions}
           isSubmitting={isCreating || isUpdating}
           onSubmit={handleSubmit}
           onCancel={resetForm}
diff --git a/apps/backoffice/src/app/features/certification/types/certification.ts b/apps/backoffice/src/app/features/certification/types/certification.ts
index a3298f5af..d0ea25d7c 100644
--- a/apps/backoffice/src/app/features/certification/types/certification.ts
+++ b/apps/backoffice/src/app/features/certification/types/certification.ts
@@ -3,24 +3,6 @@ export interface LocalePair {
   am: string;
 }
 
-/**
- * STCW rank an exam certification is for — the join that lets the
- * schedule-exam picker offer only sittings valid for an application's rank.
- * Matches `LicenseApplication.formData.certificate.rank` / `rankEngine` /
- * `proficiency` on the backend. Not every certification is on the examined
- * ladder, so this stays a plain optional string rather than a required enum.
- */
-export const RANK_KEY_OPTIONS = [
-  { value: 'OOW_DECK', label: 'Officer of the Watch (Deck)' },
-  { value: 'CHIEF_MATE', label: 'Chief Mate' },
-  { value: 'MASTER', label: 'Master' },
-  { value: 'OOW_ENGINE', label: 'Officer of the Watch (Engine)' },
-  { value: 'SECOND_ENGINEER', label: 'Second Engineer' },
-  { value: 'CHIEF_ENGINEER', label: 'Chief Engineer' },
-  { value: 'ABLE_SEAFARER_DECK', label: 'Able Seafarer Deck' },
-  { value: 'ABLE_SEAFARER_ENGINE', label: 'Able Seafarer Engine' },
-] as const;
-
 export interface Certification {
   id: string;
   name: LocalePair;
diff --git a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
index 034d203ae..874526c70 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
@@ -24,7 +24,7 @@ import {
 import { notify, useErrorHandler, AdvancedTable, useServerTable, ModalFooter, AmharicDatePicker } from "@ema-platform/ui";
 import { LICENSE_PERMISSIONS, RequirePermission } from "@ema-platform/auth";
 import { useGetCertificationsQuery } from "../../../certification/api/certification-api";
-import { RANK_KEY_OPTIONS } from "../../../certification/types/certification";
+import { useGetRanksQuery, useLocalized } from "@ema-platform/api";
 import {
   useGetExamsQuery,
   useCreateExamMutation,
@@ -364,7 +364,10 @@ export function ExamPage() {
   const { t, i18n } = useTranslation();
   const { handleError } = useErrorHandler();
   const locale = i18n.language as "en" | "am";
+  const localized = useLocalized();
   const { data: certRes } = useGetCertificationsQuery();
+  const { data: rankRes } = useGetRanksQuery();
+  const rankLabelByKey = new Map((rankRes?.items ?? []).map((r) => [r.key, localized(r.name)]));
   const { data, isFetching, isError, refetch } = useGetExamsQuery();
   const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [createExam, { isLoading: isCreating }] = useCreateExamMutation();
@@ -391,7 +394,7 @@ export function ExamPage() {
   const certOptions = certifications
     .filter((c) => c.isActive)
     .map((c) => {
-      const rank = RANK_KEY_OPTIONS.find((r) => r.value === c.rankKey)?.label;
+      const rank = c.rankKey ? rankLabelByKey.get(c.rankKey) : undefined;
       return {
         value: c.id,
         label: rank ? `${c.name[locale]} — ${rank}` : c.name[locale],
diff --git a/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationQueuePage.tsx b/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationQueuePage.tsx
index 6c9a7f1b5..4a3787697 100644
--- a/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationQueuePage.tsx
+++ b/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationQueuePage.tsx
@@ -7,7 +7,9 @@ import {
   SEAFARER_REGISTRATION_STATUS_TONES,
   SEAFARER_REGISTRATION_STATUS_LABELS,
   displaySeafarerAnswer,
+  useGetActiveDepartmentsQuery,
   useListSeafarerRegistrationsQuery,
+  useLocalized,
   type SeafarerRegistration,
   type SeafarerRegistrationStatus,
 } from '@ema-platform/api';
@@ -28,12 +30,16 @@ export function applicantName(r: Pick<SeafarerRegistration, 'firstName' | 'middl
 export function SeafarerRegistrationQueuePage() {
   const navigate = useNavigate();
   const showDate = useDateDisplayer();
+  const localized = useLocalized();
   const [status, setStatus] = useState<SeafarerRegistrationStatus | null>(null);
   const [search, setSearch] = useState('');
   const [debouncedSearch] = useDebouncedValue(search, 300);
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(PAGE_SIZE);
 
+  const { data: departments } = useGetActiveDepartmentsQuery();
+  const departmentOptions = departments?.map((d) => ({ value: d.code, label: localized(d.name) }));
+
   const { data, isLoading, isFetching, refetch } = useListSeafarerRegistrationsQuery({
     status: status ?? undefined,
     search: debouncedSearch || undefined,
@@ -69,7 +75,11 @@ export function SeafarerRegistrationQueuePage() {
       {
         header: 'Department',
         accessorKey: 'department',
-        cell: ({ row }) => <Text size="sm">{displaySeafarerAnswer('department', row.original.department)}</Text>,
+        cell: ({ row }) => (
+          <Text size="sm">
+            {displaySeafarerAnswer('department', row.original.department, departmentOptions)}
+          </Text>
+        ),
       },
       {
         header: 'Submitted',
@@ -100,7 +110,7 @@ export function SeafarerRegistrationQueuePage() {
         ),
       },
     ],
-    [showDate],
+    [showDate, departmentOptions],
   );
 
   return (
diff --git a/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationReviewPage.tsx b/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationReviewPage.tsx
index d8f99215b..536367886 100644
--- a/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationReviewPage.tsx
+++ b/apps/backoffice/src/app/features/seafarer-registration-review/pages/SeafarerRegistrationReviewPage.tsx
@@ -11,7 +11,9 @@ import {
   displaySeafarerAnswer,
   extractErrorMessage,
   useApproveSeafarerRegistrationMutation,
+  useGetActiveDepartmentsQuery,
   useGetSeafarerRegistrationReviewQuery,
+  useLocalized,
   useRejectSeafarerRegistrationMutation,
   useRequestSeafarerRegistrationChangesMutation,
 } from '@ema-platform/api';
@@ -31,7 +33,10 @@ const DECISION_COPY: Record<Decision, { title: string; label: string; color: str
 export function SeafarerRegistrationReviewPage() {
   const { id = '' } = useParams();
   const navigate = useNavigate();
+  const localized = useLocalized();
   const { data, isLoading, error } = useGetSeafarerRegistrationReviewQuery(id, { skip: !id });
+  const { data: departments } = useGetActiveDepartmentsQuery();
+  const departmentOptions = departments?.map((d) => ({ value: d.code, label: localized(d.name) }));
 
   const [approve, { isLoading: approving }] = useApproveSeafarerRegistrationMutation();
   const [reject, { isLoading: rejecting }] = useRejectSeafarerRegistrationMutation();
@@ -166,7 +171,9 @@ export function SeafarerRegistrationReviewPage() {
                           </Text>
                         </Table.Td>
                         <Table.Td>
-                          <Text size="sm">{displaySeafarerAnswer(field, registration[field])}</Text>
+                          <Text size="sm">
+                            {displaySeafarerAnswer(field, registration[field], departmentOptions)}
+                          </Text>
                         </Table.Td>
                       </Table.Tr>
                     ))}
diff --git a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
index 52e3cebc5..4dddf30bb 100644
--- a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
+++ b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
@@ -9,9 +9,14 @@ import {
 } from '@mantine/core';
 import {
   conditionHolds,
+  useGetActiveDepartmentsQuery,
+  useGetRanksQuery,
   useLocalized,
+  type Bilingual,
+  type Department,
   type FormFieldConfig,
   type FormSectionConfig,
+  type Rank,
   type Vessel,
 } from '@ema-platform/api';
 import { AmharicDatePicker, CountrySelect, PhoneInput } from '@ema-platform/ui';
@@ -82,6 +87,41 @@ export function fillFromVessel(
   }
 }
 
+/**
+ * Options for a SELECT field.
+ *
+ * A department/rank field's seed `options` are a label cache that goes stale
+ * the moment a backoffice admin adds a department or rank — the field's
+ * value is already resolved server-side (profile department, or
+ * `eligibility.nextRank`), correct either way, but a value missing from a
+ * stale cache renders as a blank Select. Live-fetched departments/ranks take
+ * over the labels for these two `source`s; the seed's own `options` still
+ * cover every other SELECT unchanged.
+ */
+function selectOptions(
+  field: FormFieldConfig,
+  currentValue: string | undefined,
+  departments: Department[] | undefined,
+  ranks: Rank[],
+  localized: (v?: Bilingual) => string,
+): { value: string; label: string }[] {
+  if (field.source === 'profile.seafarerDepartment' && departments) {
+    return departments.map((d) => ({ value: d.code, label: localized(d.name) }));
+  }
+  if (field.source === 'eligibility.nextRank') {
+    const options = ranks.map((r) => ({ value: r.key, label: localized(r.name) }));
+    // The resolved rank might not be on THIS field's ladder (rank/rankEngine,
+    // proficiencyDeck/Engine share one `eligibility.nextRank` source but only
+    // one is ever populated) — still show it rather than a blank Select.
+    if (currentValue && !options.some((o) => o.value === currentValue)) {
+      const known = ranks.find((r) => r.key === currentValue);
+      options.push({ value: currentValue, label: known ? localized(known.name) : currentValue });
+    }
+    return options;
+  }
+  return (field.options ?? []).map((o) => ({ value: o.value, label: localized(o.label) }));
+}
+
 /**
  * Renders one form section from the license type's configuration.
  *
@@ -105,6 +145,21 @@ export function ConfigDrivenSection({
     (a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0),
   );
 
+  // A department/rank SELECT ships with a hardcoded `options` label list in
+  // the seed, so a department or rank added later in the backoffice has no
+  // label there and would render as a blank Select even though the field's
+  // value (resolved server-side) is correct. Skipped when the section has
+  // neither kind of field, so most sections never pay for these two queries.
+  const needsDepartmentLabels = fields.some(
+    (f) => f.source === 'profile.seafarerDepartment',
+  );
+  const needsRankLabels = fields.some((f) => f.source === 'eligibility.nextRank');
+  const { data: departments } = useGetActiveDepartmentsQuery(undefined, {
+    skip: !needsDepartmentLabels,
+  });
+  const { data: rankRes } = useGetRanksQuery(undefined, { skip: !needsRankLabels });
+  const ranks = rankRes?.items ?? [];
+
   return (
     <Grid>
       {fields.map((field) => {
@@ -183,10 +238,7 @@ export function ConfigDrivenSection({
             ) : field.type === 'SELECT' ? (
               <Select
                 {...common}
-                data={(field.options ?? []).map((o) => ({
-                  value: o.value,
-                  label: localized(o.label),
-                }))}
+                data={selectOptions(field, value as string | undefined, departments, ranks, localized)}
                 value={(value as string) ?? null}
                 onChange={(v) => onChange(field.key, v)}
                 clearable={!field.required}
diff --git a/apps/portal/src/app/features/seafarer-registration/components/RegistrationSummary.tsx b/apps/portal/src/app/features/seafarer-registration/components/RegistrationSummary.tsx
index 80a72c793..d8a180a29 100644
--- a/apps/portal/src/app/features/seafarer-registration/components/RegistrationSummary.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/components/RegistrationSummary.tsx
@@ -3,6 +3,8 @@ import {
   SEAFARER_REGISTRATION_FIELD_LABELS,
   SEAFARER_REGISTRATION_SECTIONS,
   displaySeafarerAnswer,
+  useGetActiveDepartmentsQuery,
+  useLocalized,
   type Attachment,
   type SaveSeafarerRegistration,
 } from '@ema-platform/api';
@@ -16,6 +18,10 @@ export function RegistrationSummary({
   answers: SaveSeafarerRegistration;
   attachments?: Attachment[];
 }) {
+  const localized = useLocalized();
+  const { data: departments } = useGetActiveDepartmentsQuery();
+  const departmentOptions = departments?.map((d) => ({ value: d.code, label: localized(d.name) }));
+
   return (
     <Stack gap="md">
       {SEAFARER_REGISTRATION_SECTIONS.map((section) => (
@@ -35,7 +41,9 @@ export function RegistrationSummary({
                       </Text>
                     </Table.Td>
                     <Table.Td>
-                      <Text size="sm">{displaySeafarerAnswer(field, answers[field])}</Text>
+                      <Text size="sm">
+                        {displaySeafarerAnswer(field, answers[field], departmentOptions)}
+                      </Text>
                     </Table.Td>
                   </Table.Tr>
                 ))}
diff --git a/apps/portal/src/app/features/seafarer-registration/components/steps.tsx b/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
index d75e7f585..bccc92480 100644
--- a/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
@@ -6,6 +6,8 @@ import {
   GENDER_OPTIONS,
   HAIR_COLOR_OPTIONS,
   MARITAL_STATUS_OPTIONS,
+  useGetActiveDepartmentsQuery,
+  useLocalized,
 } from '@ema-platform/api';
 import {
   DateField,
@@ -72,8 +74,21 @@ export function IdentityDetailsStep(
   );
 }
 
-/** Step 2 — Identity, Address and Physical Characteristics. */
+/**
+ * Step 2 — Identity, Address and Physical Characteristics.
+ *
+ * The department list is backoffice-managed (see the Ranks & Departments
+ * configuration tab), so this fetches the live set rather than a fixed
+ * three — falling back to it only until the query resolves, so the field
+ * is never an empty flash.
+ */
 export function ApplicantDetailsStep(p: StepProps) {
+  const localized = useLocalized();
+  const { data: departments } = useGetActiveDepartmentsQuery();
+  const departmentOptions =
+    departments?.map((d) => ({ value: d.code, label: localized(d.name) })) ??
+    DEPARTMENT_OPTIONS;
+
   return (
     <Stack gap="lg">
       <SectionTitle title="Identity" />
@@ -94,7 +109,7 @@ export function ApplicantDetailsStep(p: StepProps) {
           name="department"
           label="Department"
           required
-          options={DEPARTMENT_OPTIONS}
+          options={departmentOptions}
           description="The STCW department you serve in. Determines which certificates, examinations and services apply to you."
         />
       </Grid>
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index 9a5a2b8bd..57a0919c2 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -572,12 +572,15 @@ export interface TemplateFieldPlacement {
   /** Variable rendered here, or null when the block carries literal `text`. */
   variable: string | null;
   text?: string;
+  /** Renders as `<img>` when "image" — see TemplateVariable.kind. */
+  type?: "text" | "image";
   xPct: number;
   yPct: number;
   widthPct: number;
   fontSize?: number;
   fontWeight?: "normal" | "bold";
-  align?: "left" | "center" | "right";
+  fontStyle?: "normal" | "italic";
+  align?: "left" | "center" | "right" | "justify";
   color?: string;
 }
 
@@ -639,6 +642,8 @@ export interface LicenseTemplate {
 export interface TemplateVariable {
   key: string;
   label: string;
+  /** "image" means the value is a data URI to place as `<img>`, not text. */
+  kind?: "text" | "image";
 }
 
 export interface Paginated<T> {
diff --git a/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts b/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
index e3406a4f0..1112e2bdf 100644
--- a/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
+++ b/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
@@ -210,14 +210,22 @@ const OPTION_LABELS: Partial<Record<keyof SeafarerRegistrationAnswers, { value:
   bloodType: BLOOD_TYPE_OPTIONS,
 };
 
-/** Display value for one answer: option label for enums, "—" when blank. */
+/**
+ * Display value for one answer: option label for enums, "—" when blank.
+ *
+ * `departmentOptions` overrides the hardcoded `DEPARTMENT_OPTIONS` fallback
+ * for the `department` field — the live list from `GET /departments`, so a
+ * department added in the backoffice after this constants file was written
+ * still gets its name instead of falling back to the raw code.
+ */
 export function displaySeafarerAnswer(
   field: keyof SeafarerRegistrationAnswers,
   value: unknown,
+  departmentOptions?: { value: string; label: string }[],
 ): string {
   if (value === null || value === undefined || value === '') return '—';
   if (typeof value === 'boolean') return value ? 'Yes' : 'No';
-  const options = OPTION_LABELS[field];
+  const options = field === 'department' && departmentOptions ? departmentOptions : OPTION_LABELS[field];
   if (options) return options.find((o) => o.value === value)?.label ?? String(value);
   return String(value);
 }

From 5ad43ba7609e6c29b8e19b4c9961cbf9186b6350 Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Wed, 26 Aug 2026 06:23:06 +0000
Subject: [PATCH 12/27] fix(exam): step the exam form instead of validating
 hidden tabs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Submitting from Basic Info complained that required fields on the Settings
tab were empty — a correct error the user could not act on, since Settings
had not been shown yet.

The primary action now reads "Next" while Basic Info is open and validates
only that tab before moving on; Create/Update appears on Settings, the final
step, alongside a Back button. Submit still checks both tabs, since the tab
headers stay clickable and a user can reach Settings without going through
Next.
---
 .../features/exam/pages/ExamPage/index.tsx    | 66 +++++++++++++++----
 apps/backoffice/src/app/i18n/locales/am.ts    |  2 +
 apps/backoffice/src/app/i18n/locales/en.ts    |  2 +
 3 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
index 34039328c..1bdf2c247 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage/index.tsx
@@ -79,21 +79,44 @@ function ExamForm({
   const [status, setStatus] = useState<string | null>(editing?.status ?? null);
   const [activeTab, setActiveTab] = useState<string | null>("basic");
 
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
+  /**
+   * Split per tab so "Next" can check just the tab in front of the user.
+   * Submitting from Basic Info used to complain about Settings fields the
+   * user had not been shown yet — the error was correct and unactionable at
+   * the same time. Each returns the message key for what is missing, or null.
+   */
+  const validateBasic = (): string | null => {
     if (!certificationId || !titleEn || !titleAm || !date || !venue) {
-      setActiveTab("basic");
-      notify.error(t("exam.form.fillRequiredBasic"));
-      return;
+      return "exam.form.fillRequiredBasic";
     }
     if ((directionEn || directionAm) && !(directionEn && directionAm)) {
-      setActiveTab("basic");
-      notify.error(t("exam.form.directionBothLanguages"));
+      return "exam.form.directionBothLanguages";
+    }
+    return null;
+  };
+
+  const validateSettings = (): string | null =>
+    !type || !form || !adminMethod || !evalMethod || !cuttingPoint
+      ? "exam.form.fillRequiredSettings"
+      : null;
+
+  const goNext = () => {
+    const error = validateBasic();
+    if (error) {
+      notify.error(t(error));
       return;
     }
-    if (!type || !form || !adminMethod || !evalMethod || !cuttingPoint) {
-      setActiveTab("settings");
-      notify.error(t("exam.form.fillRequiredSettings"));
+    setActiveTab("settings");
+  };
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    // Still checks both: the tabs are clickable, so a user can reach Settings
+    // without going through Next.
+    const error = validateBasic() ?? validateSettings();
+    if (error) {
+      setActiveTab(error === "exam.form.fillRequiredSettings" ? "settings" : "basic");
+      notify.error(t(error));
       return;
     }
     onSubmit(
@@ -337,9 +360,26 @@ function ExamForm({
           <Button variant="default" onClick={onCancel} size="sm">
             {t("exam.cancel")}
           </Button>
-          <Button type="submit" size="sm" loading={isSubmitting}>
-            {editing ? t("exam.update") : t("exam.create")}
-          </Button>
+          {activeTab === "basic" ? (
+            /* Not type="submit": Basic Info is not the last step, so the
+               primary action advances rather than saves. */
+            <Button size="sm" onClick={goNext}>
+              {t("exam.form.next")}
+            </Button>
+          ) : (
+            <>
+              <Button
+                variant="default"
+                size="sm"
+                onClick={() => setActiveTab("basic")}
+              >
+                {t("exam.form.back")}
+              </Button>
+              <Button type="submit" size="sm" loading={isSubmitting}>
+                {editing ? t("exam.update") : t("exam.create")}
+              </Button>
+            </>
+          )}
         </ModalFooter>
       </form>
     </Modal>
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index c8e51193d..9bdb4e114 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -271,6 +271,8 @@ export const am: Translations = {
       cuttingPointPercentageHint: "የመቶኛ ግምገማ — ከ100 አይበልጥም።",
       fillRequiredBasic: "በመሠረታዊ መረጃ ውስጥ ያሉ አስፈላጊ መስኮችን ይሙሉ።",
       fillRequiredSettings: "በቅንብሮች ውስጥ ያሉ አስፈላጊ መስኮችን ይሙሉ — ዓይነት፣ ቅጽ፣ የአስተዳደር ዘዴ፣ የግምገማ ዘዴ እና የማለፊያ ነጥብ።",
+      next: "ቀጣይ",
+      back: "ተመለስ",
       directionBothLanguages: "መመሪያ በሁለቱም እንግሊዝኛ እና አማርኛ ጽሑፍ ያስፈልገዋል፣ ወይም ሁለቱንም ባዶ ይተዉ።",
       status: "ሁኔታ",
       statusPlaceholder: "የፈተና ሁኔታ",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 7152067ce..ceb6e6c38 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -271,6 +271,8 @@ export const en = {
       fillRequiredBasic: 'Please fill all required fields in Basic Info.',
       fillRequiredSettings: 'Please fill all required fields in Settings — type, form, administration method, evaluation method, and cutting point.',
       directionBothLanguages: 'Direction needs text in both English and Amharic, or leave both empty.',
+      next: 'Next',
+      back: 'Back',
       status: 'Status',
       statusPlaceholder: 'Exam status',
       pending: 'Pending',

From 207994df698e0413e2ab2ab3ad8d8040dd7d419d Mon Sep 17 00:00:00 2001
From: Nati <natinigussie7@gmail.com>
Date: Wed, 26 Aug 2026 09:14:45 +0000
Subject: [PATCH 13/27] Implement nationality-based document requirements and
 add cancellation feature for seafarer registration

---
 .../components/RegistrationDocuments.tsx      | 12 ++-
 .../components/steps.tsx                      | 34 ++++++--
 .../pages/SeafarerRegistrationPage.tsx        | 82 ++++++++++++++++---
 .../seafarer/pages/SeaRecords/index.tsx       | 21 +++++
 .../seafarer-registration-api.ts              |  6 ++
 .../seafarer-registration.constants.ts        | 21 ++++-
 6 files changed, 151 insertions(+), 25 deletions(-)

diff --git a/apps/portal/src/app/features/seafarer-registration/components/RegistrationDocuments.tsx b/apps/portal/src/app/features/seafarer-registration/components/RegistrationDocuments.tsx
index 8afdde637..e1fb715e3 100644
--- a/apps/portal/src/app/features/seafarer-registration/components/RegistrationDocuments.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/components/RegistrationDocuments.tsx
@@ -3,6 +3,7 @@ import { Alert, Badge, Button, Card, FileButton, Group, Loader, Stack, Text } fr
 import { IconAlertTriangle, IconCheck, IconFileUpload } from '@tabler/icons-react';
 import {
   SEAFARER_REGISTRATION_DOCUMENTS,
+  isEthiopianNationality,
   uploadDocument,
   type Attachment,
 } from '@ema-platform/api';
@@ -10,22 +11,25 @@ import {
 const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024;
 
 /** The document slots a registration asks for. */
-export function documentSlots(passportDeclared: boolean) {
+export function documentSlots(passportDeclared: boolean, nationality?: string | null) {
+  const ethiopian = isEthiopianNationality(nationality);
   return SEAFARER_REGISTRATION_DOCUMENTS.map((d) => ({
     ...d,
-    isRequired: d.required === 'passport' ? passportDeclared : d.required,
-  })).filter((d) => d.required !== 'passport' || passportDeclared);
+    isRequired: d.required === 'passport' ? passportDeclared : d.required === 'ethiopian' ? ethiopian : d.required,
+  })).filter((d) => (d.required !== 'passport' || passportDeclared) && (d.required !== 'ethiopian' || ethiopian));
 }
 
 export function RegistrationDocuments({
   registrationId,
   passportDeclared,
+  nationality,
   attachments,
   readOnly,
   onUploaded,
 }: {
   registrationId: string;
   passportDeclared: boolean;
+  nationality?: string | null;
   attachments: Attachment[];
   readOnly?: boolean;
   onUploaded: () => void;
@@ -62,7 +66,7 @@ export function RegistrationDocuments({
           {error}
         </Alert>
       )}
-      {documentSlots(passportDeclared).map((slot) => {
+      {documentSlots(passportDeclared, nationality).map((slot) => {
         const existing = attachments.find((a) => a.documentKey === slot.key);
         const uploaded = Boolean(existing?.files?.length);
         return (
diff --git a/apps/portal/src/app/features/seafarer-registration/components/steps.tsx b/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
index bccc92480..1ca06da9a 100644
--- a/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/components/steps.tsx
@@ -6,6 +6,7 @@ import {
   GENDER_OPTIONS,
   HAIR_COLOR_OPTIONS,
   MARITAL_STATUS_OPTIONS,
+  isEthiopianNationality,
   useGetActiveDepartmentsQuery,
   useLocalized,
 } from '@ema-platform/api';
@@ -44,6 +45,7 @@ function SectionTitle({ title, description }: { title: string; description?: str
 export function IdentityDetailsStep(
   p: StepProps & { account: { email?: string; phoneNumber?: string } },
 ) {
+  const ethiopian = isEthiopianNationality(p.form.nationality);
   return (
     <Stack gap="lg">
       <SectionTitle title="Contact Details" />
@@ -68,7 +70,18 @@ export function IdentityDetailsStep(
         <DateField {...p} name="dateOfBirth" label="Date of Birth" required />
         <SelectField {...p} name="maritalStatus" label="Marital Status" required options={MARITAL_STATUS_OPTIONS} />
         <NationalityField {...p} name="nationality" label="Nationality" required />
-        <TextField {...p} name="nationalIdNumber" label="National ID (Fayda) Number" required maxLength={64} />
+        {ethiopian ? (
+          <TextField {...p} name="nationalIdNumber" label="National ID (Fayda) Number" required maxLength={64} />
+        ) : (
+          <TextField
+            {...p}
+            name="passportNumber"
+            label="Passport Number"
+            required
+            maxLength={32}
+            description="Required for non-Ethiopian applicants in place of a National ID."
+          />
+        )}
       </Grid>
     </Stack>
   );
@@ -88,19 +101,24 @@ export function ApplicantDetailsStep(p: StepProps) {
   const departmentOptions =
     departments?.map((d) => ({ value: d.code, label: localized(d.name) })) ??
     DEPARTMENT_OPTIONS;
+  // Non-Ethiopians already declare their passport number as their primary ID
+  // on the Identity step — asking again here would just duplicate the field.
+  const ethiopian = isEthiopianNationality(p.form.nationality);
 
   return (
     <Stack gap="lg">
       <SectionTitle title="Identity" />
       <Grid>
         <TextField {...p} name="placeOfBirth" label="Place of Birth" required maxLength={128} />
-        <TextField
-          {...p}
-          name="passportNumber"
-          label="Passport Number"
-          maxLength={32}
-          description="Required later for international sea service; optional at registration."
-        />
+        {ethiopian && (
+          <TextField
+            {...p}
+            name="passportNumber"
+            label="Passport Number"
+            maxLength={32}
+            description="Required later for international sea service; optional at registration."
+          />
+        )}
         {p.form.passportNumber && (
           <DateField {...p} name="passportExpiry" label="Passport Expiry Date" />
         )}
diff --git a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
index bcef33bf2..838bc1e77 100644
--- a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import {
   Alert,
   Button,
@@ -8,13 +9,14 @@ import {
   Grid,
   Group,
   Loader,
+  Modal,
   Paper,
   Stack,
   Stepper,
   Text,
   Title,
 } from '@mantine/core';
-import { IconAlertTriangle, IconCheck, IconInfoCircle, IconPencil } from '@tabler/icons-react';
+import { IconAlertTriangle, IconCheck, IconInfoCircle, IconPencil, IconTrash } from '@tabler/icons-react';
 import { notifications } from '@mantine/notifications';
 import {
   PHYSICAL_BOUNDS,
@@ -23,6 +25,8 @@ import {
   SEAFARER_REGISTRATION_STATUS_LABELS,
   extractErrorMessage,
   extractValidationIssues,
+  isEthiopianNationality,
+  useCancelSeafarerRegistrationMutation,
   useGetAttachmentsQuery,
   useGetMySeafarerRegistrationQuery,
   useSaveSeafarerRegistrationMutation,
@@ -48,15 +52,26 @@ const STEPS = [
   { label: 'Review', description: 'Check & submit' },
 ];
 
-/** Which answers each step must have before "Continue" — mirrors the API's submission check. */
+/**
+ * Which answers each step must have before "Continue" — mirrors the API's
+ * submission check. National ID vs Passport Number depends on the declared
+ * nationality, so that slot is added dynamically in `requiredForStep`.
+ */
 const REQUIRED_BY_STEP: AnswerKey[][] = [
-  ['firstName', 'lastName', 'gender', 'dateOfBirth', 'maritalStatus', 'nationality', 'nationalIdNumber'],
+  ['firstName', 'lastName', 'gender', 'dateOfBirth', 'maritalStatus', 'nationality'],
   ['placeOfBirth', 'department', 'locationId', 'hairColor', 'eyeColor', 'heightCm', 'weightKg'],
   ['medicalCertificateNumber', 'medicalIssuerName', 'medicalIssueDate'],
   [],
   ['declarationAccepted'],
 ];
 
+/** Ethiopians must give a National ID; everyone else must give a Passport Number instead. */
+function requiredForStep(index: number, nationality: string | null | undefined): AnswerKey[] {
+  const base = REQUIRED_BY_STEP[index] ?? [];
+  if (index !== 0) return base;
+  return [...base, isEthiopianNationality(nationality) ? 'nationalIdNumber' : 'passportNumber'];
+}
+
 const ANSWER_KEYS = Object.keys(SEAFARER_REGISTRATION_FIELD_LABELS) as AnswerKey[];
 
 function answersOf(registration: SeafarerRegistration): SaveSeafarerRegistration {
@@ -119,15 +134,18 @@ function withProfileDefaults(
  * still missing. A submitted registration opens to a read-only summary.
  */
 export function SeafarerRegistrationPage() {
+  const navigate = useNavigate();
   const accountUser = useAppSelector((state) => state.auth.user);
   const { profile } = useCurrentProfile();
   const { data, isLoading } = useGetMySeafarerRegistrationQuery();
   const registration = data?.registration ?? null;
 
   const [start] = useStartSeafarerRegistrationMutation();
+  const [cancelDraft, { isLoading: cancelling }] = useCancelSeafarerRegistrationMutation();
   const [save, { isLoading: saving }] = useSaveSeafarerRegistrationMutation();
   const [submit, { isLoading: submitting }] = useSubmitSeafarerRegistrationMutation();
   const [startError, setStartError] = useState<string | null>(null);
+  const [confirmingCancel, setConfirmingCancel] = useState(false);
   const started = useRef(false);
 
   useEffect(() => {
@@ -204,7 +222,7 @@ export function SeafarerRegistrationPage() {
 
   function validateStep(index: number): boolean {
     const found: Partial<Record<AnswerKey, string>> = {};
-    for (const key of REQUIRED_BY_STEP[index] ?? []) {
+    for (const key of requiredForStep(index, form.nationality)) {
       if (blank(form[key])) found[key] = `${SEAFARER_REGISTRATION_FIELD_LABELS[key]} is required.`;
     }
     if (index === 1) {
@@ -232,7 +250,7 @@ export function SeafarerRegistrationPage() {
     }
     if (index === 3) {
       const supplied = new Set(attachments.filter((a) => a.files?.length).map((a) => a.documentKey));
-      const missing = documentSlots(Boolean(form.passportNumber))
+      const missing = documentSlots(Boolean(form.passportNumber), form.nationality)
         .filter((d) => d.isRequired && !supplied.has(d.key))
         .map((d) => d.name);
       if (missing.length) {
@@ -302,6 +320,19 @@ export function SeafarerRegistrationPage() {
     }
   }
 
+  async function handleCancel() {
+    if (!registration) return;
+    try {
+      await cancelDraft(registration.id).unwrap();
+      notifications.show({ color: 'teal', title: 'Draft discarded', message: 'Nothing was saved.' });
+      navigate('/dashboard');
+    } catch (err) {
+      notifications.show({ color: 'red', title: 'Could not discard the draft', message: extractErrorMessage(err) });
+    } finally {
+      setConfirmingCancel(false);
+    }
+  }
+
   const stepProps = { form, set, errors, disabled: readOnly };
 
   return (
@@ -319,11 +350,24 @@ export function SeafarerRegistrationPage() {
             />
           </Group>
         </div>
-        {showSummary && !readOnly && (
-          <Button size="xs" variant="default" leftSection={<IconPencil size={14} />} onClick={() => setViewingSummary(false)}>
-            Edit details
-          </Button>
-        )}
+        <Group gap="xs">
+          {registration.status === 'DRAFT' && (
+            <Button
+              size="xs"
+              variant="subtle"
+              color="red"
+              leftSection={<IconTrash size={14} />}
+              onClick={() => setConfirmingCancel(true)}
+            >
+              Cancel &amp; discard draft
+            </Button>
+          )}
+          {showSummary && !readOnly && (
+            <Button size="xs" variant="default" leftSection={<IconPencil size={14} />} onClick={() => setViewingSummary(false)}>
+              Edit details
+            </Button>
+          )}
+        </Group>
       </Group>
 
       {registration.status === 'APPROVED' && (
@@ -386,6 +430,7 @@ export function SeafarerRegistrationPage() {
             <RegistrationDocuments
               registrationId={registration.id}
               passportDeclared={Boolean(form.passportNumber)}
+              nationality={form.nationality}
               attachments={attachments}
               readOnly={readOnly}
               onUploaded={refetchAttachments}
@@ -426,6 +471,23 @@ export function SeafarerRegistrationPage() {
           </Group>
         </Paper>
       )}
+
+      <Modal opened={confirmingCancel} onClose={() => setConfirmingCancel(false)} title="Discard this draft?" centered>
+        <Stack>
+          <Text size="sm">
+            Everything you have entered will be deleted, including any documents already uploaded. This cannot be
+            undone. You can start a new registration at any time.
+          </Text>
+          <Group justify="flex-end">
+            <Button variant="default" onClick={() => setConfirmingCancel(false)} disabled={cancelling}>
+              Keep draft
+            </Button>
+            <Button color="red" loading={cancelling} onClick={handleCancel}>
+              Discard draft
+            </Button>
+          </Group>
+        </Stack>
+      </Modal>
     </Container>
   );
 }
diff --git a/apps/portal/src/app/features/seafarer/pages/SeaRecords/index.tsx b/apps/portal/src/app/features/seafarer/pages/SeaRecords/index.tsx
index bdf96eef2..286c3f4fd 100644
--- a/apps/portal/src/app/features/seafarer/pages/SeaRecords/index.tsx
+++ b/apps/portal/src/app/features/seafarer/pages/SeaRecords/index.tsx
@@ -298,6 +298,22 @@ function SeaServiceTab() {
           })
         : null;
 
+  // Shown once the field has something in it — a blank required field is left
+  // to the button being disabled, same as the rest of the form; only an
+  // actual too-short value gets called out.
+  const vesselNameError =
+    form.vesselName && form.vesselName.trim().length <= 1
+      ? t('seaRecords.seaService.fields.vesselNameTooShort', {
+          defaultValue: 'Must be at least 2 characters.',
+        })
+      : null;
+  const rankError =
+    form.rank && form.rank.trim().length <= 1
+      ? t('seaRecords.seaService.fields.rankTooShort', {
+          defaultValue: 'Must be at least 2 characters.',
+        })
+      : null;
+
   const valid =
     form.vesselName.trim().length > 1 &&
     form.rank.trim().length > 1 &&
@@ -391,6 +407,7 @@ function SeaServiceTab() {
               required
               value={form.vesselName}
               onChange={(e) => setForm({ ...form, vesselName: e.target.value })}
+              error={vesselNameError}
             />
             <TextInput
               label={t('seaRecords.seaService.fields.imoNumber')}
@@ -418,9 +435,13 @@ function SeaServiceTab() {
           </Group>
           <TextInput
             label={t('seaRecords.seaService.fields.rank')}
+            description={t('seaRecords.seaService.fields.rankHint', {
+              defaultValue: 'Must be at least 2 characters, e.g. "AB" or "2nd Officer".',
+            })}
             required
             value={form.rank}
             onChange={(e) => setForm({ ...form, rank: e.target.value })}
+            error={rankError}
           />
           <Group grow>
             <AmharicDatePicker
diff --git a/libs/api/src/lib/features/seafarer-registration/seafarer-registration-api.ts b/libs/api/src/lib/features/seafarer-registration/seafarer-registration-api.ts
index f1fa79373..4b42681eb 100644
--- a/libs/api/src/lib/features/seafarer-registration/seafarer-registration-api.ts
+++ b/libs/api/src/lib/features/seafarer-registration/seafarer-registration-api.ts
@@ -36,6 +36,11 @@ export const seafarerRegistrationApi = baseApi
         invalidatesTags: (_r, error) => (error ? [] : [LIST]),
       }),
 
+      cancelSeafarerRegistration: builder.mutation<void, string>({
+        query: (id) => ({ url: `/seafarer-registrations/${id}`, method: 'DELETE' }),
+        invalidatesTags: (_r, error, id) => (error ? [] : [LIST, item(id)]),
+      }),
+
       saveSeafarerRegistration: builder.mutation<
         SeafarerRegistration,
         { id: string; body: SaveSeafarerRegistration }
@@ -108,6 +113,7 @@ export const seafarerRegistrationApi = baseApi
 export const {
   useGetMySeafarerRegistrationQuery,
   useStartSeafarerRegistrationMutation,
+  useCancelSeafarerRegistrationMutation,
   useSaveSeafarerRegistrationMutation,
   useSubmitSeafarerRegistrationMutation,
   useListSeafarerRegistrationsQuery,
diff --git a/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts b/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
index 1112e2bdf..46e1e618a 100644
--- a/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
+++ b/libs/api/src/lib/features/seafarer-registration/seafarer-registration.constants.ts
@@ -64,13 +64,28 @@ export const PHYSICAL_BOUNDS = {
   weightKg: { min: 30, max: 250 },
 } as const;
 
+/**
+ * How the platform spells Ethiopia in the `nationality` free-text field
+ * (CountrySelect's country name — matches the API's ETHIOPIAN_NATIONALITY).
+ */
+export const ETHIOPIAN_NATIONALITY = 'Ethiopia';
+
+/** Whether a declared nationality is Ethiopian — drives National ID vs Passport requirements. */
+export function isEthiopianNationality(nationality: string | null | undefined): boolean {
+  return nationality === ETHIOPIAN_NATIONALITY;
+}
+
 /** Upload slots, keyed as the API's submission check expects them. */
 export const SEAFARER_REGISTRATION_DOCUMENTS: {
   key: string;
   name: string;
   description?: string;
-  /** `'passport'`: required only once a passport number is declared. */
-  required: boolean | 'passport';
+  /**
+   * `'passport'`: required once a passport number is declared (always true
+   * for non-Ethiopians, who must declare one). `'ethiopian'`: required only
+   * for applicants who declared Ethiopian nationality.
+   */
+  required: boolean | 'passport' | 'ethiopian';
   accept?: string;
 }[] = [
   {
@@ -80,7 +95,7 @@ export const SEAFARER_REGISTRATION_DOCUMENTS: {
     required: true,
     accept: 'image/jpeg,image/png',
   },
-  { key: 'nationalId', name: 'National ID (Fayda) or Kebele ID', required: true },
+  { key: 'nationalId', name: 'National ID (Fayda) or Kebele ID', required: 'ethiopian' },
   { key: 'passport', name: 'Passport Copy', required: 'passport' },
   { key: 'graduation', name: 'Educational Certificate', required: false },
   {

From 13c3e8974d112e607e29901661fbe47fe0802624 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 09:39:24 +0000
Subject: [PATCH 14/27] feat: consolidate CoC and GOC endorsement workflows
 into a new ENDORSEMENT_SEAFARER type and add anyOf support to conditional
 form field logic.

---
 .../license-review/config/license-types.ts    | 14 +++++++--
 apps/backoffice/src/app/i18n/locales/am.ts    |  4 +--
 apps/backoffice/src/app/i18n/locales/en.ts    |  4 +--
 apps/backoffice/src/app/layouts/nav-config.ts |  3 +-
 apps/backoffice/src/app/router/index.tsx      |  6 +++-
 .../endorsement/pages/EndorsementPage.tsx     | 31 +++++++++----------
 .../components/RequireOperations.tsx          |  4 +++
 .../pages/OperationsOnboardingPage.tsx        |  6 ++++
 .../components/OperationsFormContent.tsx      | 11 +++++--
 apps/portal/src/app/i18n/locales/am.ts        |  5 ++-
 apps/portal/src/app/i18n/locales/en.ts        |  5 ++-
 apps/portal/src/app/layouts/PortalLayout.tsx  |  2 +-
 .../features/licensing/licensing.helpers.ts   | 14 +++++++--
 .../lib/features/licensing/licensing.types.ts |  8 +++--
 14 files changed, 78 insertions(+), 39 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/config/license-types.ts b/apps/backoffice/src/app/features/license-review/config/license-types.ts
index 379d74c28..7e920efa5 100644
--- a/apps/backoffice/src/app/features/license-review/config/license-types.ts
+++ b/apps/backoffice/src/app/features/license-review/config/license-types.ts
@@ -116,11 +116,21 @@ const PRESENTATION: Record<string, LicenseTypePresentation> = {
     // no capital threshold, no staff roles.
     detailSections: ['overview', 'documents'],
   },
+  ENDORSEMENT_SEAFARER: {
+    key: 'ENDORSEMENT_SEAFARER',
+    icon: IconRubberStamp,
+    // Person-centric, same as seafarer registration: no company entity, no
+    // capital threshold, no staff roles, no inspection. Covers CoC and GOC
+    // together — the `endorsementScope` field on the application decides
+    // which certificate section(s) actually have data.
+    detailSections: ['overview', 'documents'],
+  },
+  // Retired by ENDORSEMENT_SEAFARER (see endorsements.seed-data.ts). Kept so
+  // an application filed before the switch still renders with the right
+  // presentation instead of falling back to the generic company layout.
   ENDORSEMENT_COC: {
     key: 'ENDORSEMENT_COC',
     icon: IconRubberStamp,
-    // Person-centric, same as seafarer registration: no company entity, no
-    // capital threshold, no staff roles, no inspection.
     detailSections: ['overview', 'documents'],
   },
   ENDORSEMENT_GOC: {
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 458b638e6..c4d5459b3 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -48,6 +48,7 @@ export const am: Translations = {
     typeVESSEL_OWNERSHIP_TRANSFER: "የመርከብ ባለቤትነት ዝውውር",
     typeCERTIFICATE_OF_COMPETENCY: "የብቃት ማረጋገጫ ምስክር ወረቀት",
     typeCERTIFICATE_OF_PROFICIENCY: "የብቃት ምስክር ወረቀት",
+    typeENDORSEMENT_SEAFARER: "የባህረኛ ማስተያየት (CoC / GOC)",
     typeENDORSEMENT_COC: "የCoC ማረጋገጫ",
     typeENDORSEMENT_GOC: "የGOC ማረጋገጫ",
     primary: "ዋና",
@@ -87,8 +88,7 @@ export const am: Translations = {
     btcQueue: "የBTC ወረፋ",
     cocQueue: "የCoC ወረፋ",
     copQueue: "የCoP ወረፋ",
-    endorsementCocQueue: "የCoC ማረጋገጫ ወረፋ",
-    endorsementGocQueue: "የGOC ማረጋገጫ ወረፋ",
+    endorsementQueue: "የማስተያየት ወረፋ",
     vesselRegistrations: "የመርከብ ምዝገባ",
     // vesselRegistrationReport: 'የምዝገባ ሪፖርት',
     vesselTransfers: "የመርከብ ባለቤትነት ዝውውር",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 73a9d96d7..3e8ff4f59 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -48,6 +48,7 @@ export const en = {
     typeVESSEL_OWNERSHIP_TRANSFER: 'Vessel Ownership Transfer',
     typeCERTIFICATE_OF_COMPETENCY: 'Certificate of Competency',
     typeCERTIFICATE_OF_PROFICIENCY: 'Certificate of Proficiency',
+    typeENDORSEMENT_SEAFARER: 'Seafarer Endorsement (CoC / GOC)',
     typeENDORSEMENT_COC: 'CoC Endorsement',
     typeENDORSEMENT_GOC: 'GOC Endorsement',
     primary: 'Primary',
@@ -87,8 +88,7 @@ export const en = {
     postWaiverQueue: 'Post-Waiver Queue',
     cocQueue: 'CoC Queue',
     copQueue: 'CoP Queue',
-    endorsementCocQueue: 'CoC Endorsement Queue',
-    endorsementGocQueue: 'GOC Endorsement Queue',
+    endorsementQueue: 'Endorsement Queue',
     vesselRegistrations: 'Vessel Registration',
     vesselTransfers: 'Vessel Ownership Transfer',
     seafarerRegistry: 'Seafarer Registry',
diff --git a/apps/backoffice/src/app/layouts/nav-config.ts b/apps/backoffice/src/app/layouts/nav-config.ts
index 3878efa3f..ef8690640 100644
--- a/apps/backoffice/src/app/layouts/nav-config.ts
+++ b/apps/backoffice/src/app/layouts/nav-config.ts
@@ -101,8 +101,7 @@ export const NAV_SECTIONS: NavSection[] = [
       { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
       { to: '/seaman-book-queue', label: 'nav.seamanBookQueue', icon: IconBook2, permissions: APPLICATION_QUEUE },
       { to: '/btc-queue', label: 'nav.btcQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/ENDORSEMENT_COC', label: 'nav.endorsementCocQueue', icon: IconRubberStamp, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/ENDORSEMENT_GOC', label: 'nav.endorsementGocQueue', icon: IconRubberStamp, permissions: APPLICATION_QUEUE },
+      { to: '/licence-review/type/ENDORSEMENT_SEAFARER', label: 'nav.endorsementQueue', icon: IconRubberStamp, permissions: APPLICATION_QUEUE },
       { to: '/sea-service-verification', label: 'nav.seaServiceVerification', icon: IconAnchor, permissions: [P.VERIFY_SEAFARER_RECORDS] },
       { to: '/medical-verification', label: 'nav.medicalVerification', icon: IconHeart, permissions: [P.VERIFY_SEAFARER_RECORDS] },
     ],
diff --git a/apps/backoffice/src/app/router/index.tsx b/apps/backoffice/src/app/router/index.tsx
index 46135bab4..dde6d1e2e 100644
--- a/apps/backoffice/src/app/router/index.tsx
+++ b/apps/backoffice/src/app/router/index.tsx
@@ -90,7 +90,11 @@ const router = createBrowserRouter([
           { path: 'coc-queue', element: <Navigate to="/licence-review/type/CERTIFICATE_OF_COMPETENCY" replace /> },
           { path: 'coc-queue/:id', element: <Navigate to="/licence-review" replace /> },
           // Endorsement review happens in the config-driven licence queue.
-          { path: 'endorsement-queue', element: <Navigate to="/licence-review/type/ENDORSEMENT_COC" replace /> },
+          // CoC and GOC endorsement now share one combined type; the two old
+          // type queues (ENDORSEMENT_COC / ENDORSEMENT_GOC) are left routing
+          // through the generic `:typeCode` queue below rather than redirected,
+          // so an application filed before the switch stays reachable there.
+          { path: 'endorsement-queue', element: <Navigate to="/licence-review/type/ENDORSEMENT_SEAFARER" replace /> },
           { path: 'endorsement-queue/:id', element: <Navigate to="/licence-review" replace /> },
           { path: 'medical-verification', element: guard([P.VERIFY_SEAFARER_RECORDS], <MedicalVerificationPage />) },
           { path: 'sea-service-verification', element: guard([P.VERIFY_SEAFARER_RECORDS], <SeaServiceVerificationPage />) },
diff --git a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
index dda909899..a74a54be7 100644
--- a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
+++ b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
@@ -33,7 +33,14 @@ import { AdvancedTable, PageLoader, notify, useServerTable } from '@ema-platform
 import { useDateDisplayer } from '@ema-platform/shared';
 import { endorsementColumns } from './columns';
 
-const ENDORSEMENT_TYPE_KEYS = ['ENDORSEMENT_COC', 'ENDORSEMENT_GOC'];
+// ENDORSEMENT_SEAFARER covers CoC and GOC together and is the only type new
+// applications file against; the other two stay listed so an application or
+// licence filed before the switch keeps showing up here.
+const ENDORSEMENT_TYPE_KEYS = [
+  'ENDORSEMENT_SEAFARER',
+  'ENDORSEMENT_COC',
+  'ENDORSEMENT_GOC',
+];
 
 function EligibilityItem({ ok, label }: { ok: boolean; label: string }) {
   return (
@@ -132,21 +139,13 @@ export function EndorsementPage() {
               />
             </List>
           </div>
-          <Stack gap="xs">
-            <Button
-              rightSection={<IconArrowRight size={16} />}
-              onClick={() => navigate('/licensing/ENDORSEMENT_COC/apply')}
-            >
-              {t('endorsement.endorseCoc', 'Endorse a CoC')}
-            </Button>
-            <Button
-              variant="light"
-              rightSection={<IconArrowRight size={16} />}
-              onClick={() => navigate('/licensing/ENDORSEMENT_GOC/apply')}
-            >
-              {t('endorsement.endorseGoc', 'Endorse a GOC')}
-            </Button>
-          </Stack>
+          <Button
+            disabled={!registered}
+            rightSection={<IconArrowRight size={16} />}
+            onClick={() => navigate('/licensing/ENDORSEMENT_SEAFARER/apply')}
+          >
+            {t('endorsement.apply', 'Apply for an endorsement')}
+          </Button>
         </Group>
         {!registered && (
           <Alert color="orange" mt="md" icon={<IconInfoCircle size={16} />}>
diff --git a/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx b/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
index c50ef617d..750826a8d 100644
--- a/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
+++ b/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
@@ -55,6 +55,10 @@ const MODE_FREE_TYPE_KEYS = [
   'VESSEL_OWNERSHIP_TRANSFER',
   'CERTIFICATE_OF_COMPETENCY',
   'CERTIFICATE_OF_PROFICIENCY',
+  'ENDORSEMENT_SEAFARER',
+  // Retired by ENDORSEMENT_SEAFARER but kept mode-free: an in-flight
+  // application filed against one of these before the switch must still be
+  // reachable to view, correct or resubmit.
   'ENDORSEMENT_COC',
   'ENDORSEMENT_GOC',
   'PRE_WAIVER',
diff --git a/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx b/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
index 8499b8e4f..644d9b505 100644
--- a/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
+++ b/apps/portal/src/app/features/onboarding/pages/OperationsOnboardingPage.tsx
@@ -16,10 +16,16 @@ import { OperationsFormContent } from "../../profile/components/OperationsFormCo
  * Seafarer goes to its own registration page, whose Identity Details step
  * collects the profile answers itself — no detour via `/profile`. Seafarer
  * wins when both are ticked; the other form is one nav click away.
+ *
+ * SEAFARER_REGISTRATION is listed before ENDORSEMENT_SEAFARER deliberately:
+ * `nextStepFor` takes the first key that matches, and an applicant who ticked
+ * both belongs in registration first — the endorsement application refuses
+ * submission until that registration is accepted.
  */
 const NEXT_STEP: Record<string, string> = {
   SEAFARER_REGISTRATION: "/seafarer-registration",
   VESSEL_REGISTRATION: "/vessel-registration",
+  ENDORSEMENT_SEAFARER: "/endorsements",
 };
 
 function nextStepFor(selectedKeys: string[]): string {
diff --git a/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx b/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
index 4d1babe08..34a3aae65 100644
--- a/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
+++ b/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
@@ -25,15 +25,21 @@ import { notify, ModalFooter } from '@ema-platform/ui';
 import { useDateDisplayer } from '@ema-platform/shared';
 
 /**
- * Registrations an applicant makes for themselves rather than for a company.
+ * Registrations and seafarer-only services an applicant declares for
+ * themselves rather than for a company.
  *
  * Named explicitly rather than inferred from `requiresOperatorMode: false`,
  * because that flag is also false for things nobody declares up front — a
  * waiver is requested per shipment, not adopted as an identity.
+ * ENDORSEMENT_SEAFARER belongs here for the same reason as the two
+ * registrations: a seafarer requesting one is not declaring a logistics mode
+ * of operation, and without this key `accountTypeFor` below would fall the
+ * account through to the company-representative type instead of `SEAFARER`.
  */
 const PERSONAL_REGISTRATION_KEYS = [
   'SEAFARER_REGISTRATION',
   'VESSEL_REGISTRATION',
+  'ENDORSEMENT_SEAFARER',
 ];
 
 /**
@@ -56,6 +62,7 @@ function accountTypeFor(keys: string[]): string | null {
   }
   if (keys.includes('VESSEL_REGISTRATION')) return 'VESSEL_OWNER';
   if (keys.includes('SEAFARER_REGISTRATION')) return 'SEAFARER';
+  if (keys.includes('ENDORSEMENT_SEAFARER')) return 'SEAFARER';
   return null;
 }
 
@@ -212,7 +219,7 @@ export function OperationsFormContent({
             {personalOptions.length > 0 && (
               <>
                 <Text size="xs" fw={600} c="dimmed" mt="sm" tt="uppercase">
-                  Registering as an individual or vessel owner
+                  Registering or applying as an individual or vessel owner
                 </Text>
                 {personalOptions.map((type) => (
                   <Checkbox
diff --git a/apps/portal/src/app/i18n/locales/am.ts b/apps/portal/src/app/i18n/locales/am.ts
index 0ecee5cda..8b1efe359 100644
--- a/apps/portal/src/app/i18n/locales/am.ts
+++ b/apps/portal/src/app/i18n/locales/am.ts
@@ -63,7 +63,7 @@ export const am: Translations = {
     certificates: 'የምስክር ወረቀቶች',
     seamanBook: 'የመርከበኛ መጽሐፍ እና BTC',
     btc: 'መሠረታዊ ሥልጠና ምስክር ወረቀት',
-    endorsements: 'ማረጋገጫዎች',
+    endorsements: 'የባህረኛ ማስተያየት',
     vesselRegistrations: 'የመርከብ ምዝገባ',
     vesselTransfers: 'የመርከብ ባለቤትነት ዝውውር',
     documents: 'ሰነዶቼ',
@@ -1008,8 +1008,7 @@ export const am: Translations = {
       registered: "የተመዘገበ መርከበኛ ({{number}})",
       registrationRequired: "ንቁ የመርከበኛ ምዝገባ ያስፈልጋል",
     },
-    endorseCoc: "CoC ያረጋግጡ",
-    endorseGoc: "GOC ያረጋግጡ",
+    apply: "ለማስተያየት ያመልክቱ",
     registrationNotice: {
       prefix: "መጀመሪያ የ",
       link: "መርከበኛ ምዝገባዎን",
diff --git a/apps/portal/src/app/i18n/locales/en.ts b/apps/portal/src/app/i18n/locales/en.ts
index 57fe394f3..cc50ad5c1 100644
--- a/apps/portal/src/app/i18n/locales/en.ts
+++ b/apps/portal/src/app/i18n/locales/en.ts
@@ -63,7 +63,7 @@ export const en = {
     certificates: 'Certificates',
     seamanBook: 'SeamanBook and BTC',
     btc: 'Basic Training Certificate',
-    endorsements: 'Endorsements',
+    endorsements: 'Endorsement Seafarer',
     vesselRegistrations: 'Vessel Registration',
     vesselTransfers: 'Vessel Transfers',
     documents: 'My Documents',
@@ -1010,8 +1010,7 @@ export const en = {
       registered: 'Registered seafarer ({{number}})',
       registrationRequired: 'Active seafarer registration required',
     },
-    endorseCoc: 'Endorse a CoC',
-    endorseGoc: 'Endorse a GOC',
+    apply: 'Apply for an endorsement',
     registrationNotice: {
       prefix: 'Complete your',
       link: 'seafarer registration',
diff --git a/apps/portal/src/app/layouts/PortalLayout.tsx b/apps/portal/src/app/layouts/PortalLayout.tsx
index 544fe01a9..c6ffb7fb4 100644
--- a/apps/portal/src/app/layouts/PortalLayout.tsx
+++ b/apps/portal/src/app/layouts/PortalLayout.tsx
@@ -140,7 +140,7 @@ const NAV_SECTIONS: { label?: string; items: PortalNavItem[] }[] = [
       },
       {
         to: "/endorsements",
-        label: "Endorsements",
+        label: "Endorsement Seafarer",
         i18nKey: "nav.endorsements",
         icon: IconRubberStamp,
         permissions: [P.VIEW_OWN_CERTIFICATES],
diff --git a/libs/api/src/lib/features/licensing/licensing.helpers.ts b/libs/api/src/lib/features/licensing/licensing.helpers.ts
index ecb0218d4..8f3cff394 100644
--- a/libs/api/src/lib/features/licensing/licensing.helpers.ts
+++ b/libs/api/src/lib/features/licensing/licensing.helpers.ts
@@ -3,6 +3,7 @@ import { resolveTokenFromStorage } from '../../session';
 import type {
   Bilingual,
   FamilyKind,
+  FieldCondition,
   FormFieldConfig,
   FormSectionConfig,
   LicenseApplication,
@@ -179,6 +180,7 @@ export const APPLICANT_NAME_TYPE_KEYS = [
   'CERTIFICATE_OF_PROFICIENCY',
   'VESSEL_REGISTRATION',
   'VESSEL_OWNERSHIP_TRANSFER',
+  'ENDORSEMENT_SEAFARER',
   'ENDORSEMENT_COC',
   'ENDORSEMENT_GOC',
 ];
@@ -190,6 +192,7 @@ const FAMILY_KIND_BY_KEY: Partial<Record<string, FamilyKind>> = {
   BTC_BASIC_TRAINING: 'CERTIFICATE',
   CERTIFICATE_OF_COMPETENCY: 'CERTIFICATE',
   CERTIFICATE_OF_PROFICIENCY: 'CERTIFICATE',
+  ENDORSEMENT_SEAFARER: 'CERTIFICATE',
   ENDORSEMENT_COC: 'CERTIFICATE',
   ENDORSEMENT_GOC: 'CERTIFICATE',
   FREIGHT_FORWARDER: 'LOGISTICS_LICENSE',
@@ -557,7 +560,14 @@ export function validateSections(
   return errors;
 }
 
-/** Evaluates a config condition against the current form answers. */
+/**
+ * Evaluates a config condition against the current form answers.
+ *
+ * Mirrors the server's `ApplicationValidationService.conditionHolds` —
+ * `anyOf` holds when any listed sub-condition holds, needed for an answer
+ * that can live on one of several mutually-exclusive fields (e.g. a CoP rank
+ * split by department).
+ */
 interface ConditionLike {
   field?: string;
   equals?: unknown;
@@ -569,7 +579,7 @@ interface ConditionLike {
 }
 
 export function conditionHolds(
-  condition: ConditionLike | undefined | null,
+  condition: FieldCondition | undefined | null,
   formData: Record<string, Record<string, unknown>>,
 ): boolean {
   if (!condition) return true;
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index 57a0919c2..a89fc0e06 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -67,6 +67,8 @@ export type FormFieldType =
   | "TIN";
 
 export interface FieldCondition {
+  /** Omitted when `anyOf` is used instead — see below. */
+  field?: string;
   /** Omitted when `anyOf` is used instead — see below. */
   field?: string;
   equals?: string | number | boolean;
@@ -74,9 +76,9 @@ export interface FieldCondition {
   in?: (string | number)[];
   isSet?: boolean;
   /**
-   * Holds when ANY listed condition holds — for a value that can live on one
-   * of several mutually-exclusive fields (e.g. a rank split by department).
-   * `field`/`equals`/etc are ignored when this is present.
+   * Alternative to a single-field check: holds when ANY listed condition
+   * holds. `field`/`equals`/etc are ignored when this is present. Mirrors
+   * the server's `FieldCondition` (form-schema.type.ts).
    */
   anyOf?: FieldCondition[];
 }

From 3cab22b58da431bb2d5773b9150f06d17d24745e Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 09:41:08 +0000
Subject: [PATCH 15/27] fix: update conditional requirement validation to allow
 expressions using anyOf without a field

---
 .../components/DocumentRequirementEditorDrawer.tsx        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/backoffice/src/app/features/certificate-requirements/components/DocumentRequirementEditorDrawer.tsx b/apps/backoffice/src/app/features/certificate-requirements/components/DocumentRequirementEditorDrawer.tsx
index 5baba8e99..1efa584e7 100644
--- a/apps/backoffice/src/app/features/certificate-requirements/components/DocumentRequirementEditorDrawer.tsx
+++ b/apps/backoffice/src/app/features/certificate-requirements/components/DocumentRequirementEditorDrawer.tsx
@@ -94,10 +94,16 @@ export function DocumentRequirementEditorDrawer({
       return;
     }
     if (!draft.name.en?.trim()) return;
+    // A condition is either a single-field check or an anyOf list — the CoP
+    // watch_rating_certificate requirement is seeded with anyOf and no field.
     const hasCondition =
       Boolean(draft.conditionExpression?.field) ||
       Boolean(draft.conditionExpression?.anyOf?.length);
-    if (draft.mode === 'CONDITIONAL' && !hasCondition) {
+    if (
+      draft.mode === 'CONDITIONAL' &&
+      !hasCondition &&
+      !draft.conditionExpression?.anyOf?.length
+    ) {
       setKeyError(t('certReq.doc.conditionRequired', 'A conditional requirement needs a condition'));
       return;
     }

From b0998703702dd924d1a785972b759fe9db1e3c9a Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 09:52:31 +0000
Subject: [PATCH 16/27] fix: prevent out-of-bounds wizard steps and remove
 duplicate FieldCondition property definition

---
 .../features/licensing/pages/LicenseApplicationPage.tsx   | 8 ++++++++
 libs/api/src/lib/features/licensing/licensing.types.ts    | 2 --
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
index 73728c62e..a7b4f92ac 100644
--- a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
+++ b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
@@ -356,6 +356,14 @@ export function LicenseApplicationPage() {
     [steps],
   );
 
+  // A section-level showWhen can remove a step while the wizard is open
+  // (ENDORSEMENT_SEAFARER's certificate sections follow the chosen scope).
+  // Clamp so `steps[active]` can never go out of bounds if a seed ever lets
+  // a later answer hide an earlier step.
+  useEffect(() => {
+    if (active > steps.length - 1) setActive(Math.max(0, steps.length - 1));
+  }, [active, steps.length]);
+
   if (loadingConfig || !config || !appId || !application) {
     return <PageLoader label={t('licenseApplication.loading', 'Loading Application…')} height={400} />;
   }
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index a89fc0e06..0be26f0ab 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -67,8 +67,6 @@ export type FormFieldType =
   | "TIN";
 
 export interface FieldCondition {
-  /** Omitted when `anyOf` is used instead — see below. */
-  field?: string;
   /** Omitted when `anyOf` is used instead — see below. */
   field?: string;
   equals?: string | number | boolean;

From 32ac18adc29639abf05c269cb409c493380bc734 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 11:50:49 +0000
Subject: [PATCH 17/27] endorcement

---
 .../seafarer-registration/pages/SeafarerRegistrationPage.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
index 838bc1e77..ad229976d 100644
--- a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
@@ -373,7 +373,7 @@ export function SeafarerRegistrationPage() {
       {registration.status === 'APPROVED' && (
         <Alert color="teal" icon={<IconCheck size={16} />} title="Registered" mb="md">
           You are a registered seafarer. Your seafarer number is <b>{registration.seafarerNumber}</b>.
-          Your Seaman Book and Basic Training Certificate applications have been opened for you.
+          You can now apply for a certificate endorsement from the Endorsement Seafarer page.
         </Alert>
       )}
       {registration.status === 'REJECTED' && (

From f20ed670de13932e3a4580856a378c81ecf97b37 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 12:12:30 +0000
Subject: [PATCH 18/27] fixes on backoffice for endorcement

---
 .../app/features/license-review/config/actions.ts    | 12 ++++++++++++
 .../src/app/features/license-review/queue-views.ts   |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 2ce63ea65..6a5bf7118 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -358,6 +358,18 @@ export function resolveActions(ctx: ResolveContext): ResolvedAction[] {
       if (action.id === 'schedule-inspection' && ctx.hasPendingInspection) return [];
       if (action.id === 'record-inspection' && !ctx.hasPendingInspection) return [];
 
+      // The transition table doesn't know which types need an inspection, so
+      // `availableEvents` lists approve-documents at UNDER_EVALUATION even for
+      // types without one — where the server refuses it
+      // (`inspection_not_required_use_final_approve`). Final Approve is the
+      // real action there; don't render its dead twin.
+      if (
+        action.id === 'approve-documents' &&
+        !app.licenseType?.inspectionRequired
+      ) {
+        return [];
+      }
+
       const disabled = (reason: string): ResolvedAction => ({
         ...action,
         enabled: false,
diff --git a/apps/backoffice/src/app/features/license-review/queue-views.ts b/apps/backoffice/src/app/features/license-review/queue-views.ts
index 6b167779b..42e9d0eb3 100644
--- a/apps/backoffice/src/app/features/license-review/queue-views.ts
+++ b/apps/backoffice/src/app/features/license-review/queue-views.ts
@@ -85,7 +85,13 @@ export const DEFAULT_VIEW: SavedViewId = 'unassigned';
  * even though the family kind is DOCUMENT because the certificate they produce
  * is a document rather than a licence.
  */
-const CLAIMABLE_NON_LOGISTICS = new Set(['VESSEL_REGISTRATION']);
+const CLAIMABLE_NON_LOGISTICS = new Set([
+  'VESSEL_REGISTRATION',
+  // Endorsements run the standard claim-first workflow: applications arrive
+  // unassigned and an officer claims them, even though the family kind is
+  // CERTIFICATE.
+  'ENDORSEMENT_SEAFARER',
+]);
 
 /**
  * Does this queue have an unclaimed pool to triage?

From 3955dab014f31a2218c8061890553b9d66e3290b Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Wed, 26 Aug 2026 12:17:46 +0000
Subject: [PATCH 19/27] adding bypass payment

---
 .../endorsement/pages/EndorsementPage.tsx     | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
index a74a54be7..c6ce7252d 100644
--- a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
+++ b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
@@ -24,6 +24,7 @@ import {
   TERMINAL_STATUSES,
   extractErrorMessage,
   useLocalized,
+  useBypassPaymentMutation,
   useGetCertificateUrlMutation,
   useGetMyApplicationsQuery,
   useGetMyLicensesQuery,
@@ -31,6 +32,7 @@ import {
 import { useCurrentProfile } from '@ema-platform/auth';
 import { AdvancedTable, PageLoader, notify, useServerTable } from '@ema-platform/ui';
 import { useDateDisplayer } from '@ema-platform/shared';
+import { useApplicationPayment } from '../../payments/hooks/useApplicationPayment';
 import { endorsementColumns } from './columns';
 
 // ENDORSEMENT_SEAFARER covers CoC and GOC together and is the only type new
@@ -81,6 +83,8 @@ export function EndorsementPage() {
   const showDate = useDateDisplayer();
   const localized = useLocalized();
   const [getCertificateUrl] = useGetCertificateUrlMutation();
+  const { pay, isPaying } = useApplicationPayment();
+  const [bypassPayment, { isLoading: bypassing }] = useBypassPaymentMutation();
   const issuedTable = useServerTable();
 
   const registered =
@@ -97,6 +101,22 @@ export function EndorsementPage() {
   );
   const issuedPage = issuedTable.paginate(issued);
 
+  async function handleBypass(applicationId: string) {
+    try {
+      const result = await bypassPayment(applicationId).unwrap();
+      notify.success(
+        result.certificateIssued
+          ? t('endorsement.bypassIssued', 'Payment bypassed — the endorsement has been issued.')
+          : t('endorsement.bypassOk', {
+              defaultValue: 'Payment bypassed — application is now {{status}}.',
+              status: result.status.replace(/_/g, ' ').toLowerCase(),
+            }),
+      );
+    } catch (err) {
+      notify.error(extractErrorMessage(err, t('endorsement.bypassFailed', 'Bypass failed')));
+    }
+  }
+
   async function download(licenseId: string) {
     try {
       const result = await getCertificateUrl(licenseId).unwrap();
@@ -182,6 +202,36 @@ export function EndorsementPage() {
                   <Badge color={STATUS_COLORS[app.status]}>
                     {t(`applications.status.${app.status}`, STATUS_LABELS[app.status])}
                   </Badge>
+                  {app.status === 'PAYMENT_PENDING' && (
+                    <>
+                      <Button
+                        size="compact-sm"
+                        color="yellow"
+                        loading={isPaying}
+                        onClick={() => pay(app.id)}
+                      >
+                        {t('endorsement.pay', {
+                          defaultValue: 'Pay {{amount}} {{currency}}',
+                          amount: Number(app.feeAmount ?? 0).toLocaleString(),
+                          currency: app.feeCurrency,
+                        })}
+                      </Button>
+                      {/* ponytail: shown unconditionally for the testing
+                          phase — the server still refuses it unless
+                          ALLOW_PAYMENT_BYPASS is set and NODE_ENV is not
+                          production. Re-gate on useGetPaymentCapabilitiesQuery
+                          (like MyApplicationsPage) before prod. */}
+                      <Button
+                        size="compact-sm"
+                        variant="default"
+                        loading={bypassing}
+                        onClick={() => handleBypass(app.id)}
+                        title="Testing only — marks the fee paid"
+                      >
+                        {t('endorsement.bypass', 'Bypass payment')}
+                      </Button>
+                    </>
+                  )}
                   <Button
                     size="compact-sm"
                     variant="light"

From b5f1ffa6b8a9937879601969cb454fdcf0b7b8a2 Mon Sep 17 00:00:00 2001
From: Nati <natinigussie7@gmail.com>
Date: Wed, 26 Aug 2026 13:34:06 +0000
Subject: [PATCH 20/27] Add 'assign-reviewer' action and related functionality
 for license review process

---
 .../components/DecisionConfirmModal.tsx       |  5 ++++-
 .../features/license-review/config/actions.ts | 22 +++++++++++++++++--
 .../pages/LicenseReviewPage/index.tsx         | 14 ++++++++++++
 apps/backoffice/src/app/i18n/locales/am.ts    |  3 +++
 apps/backoffice/src/app/i18n/locales/en.ts    |  4 ++++
 .../lib/features/licensing/licensing-api.ts   | 18 +++++++++++++++
 6 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
index 2c34fc9cd..47265f5c9 100644
--- a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
@@ -134,7 +134,10 @@ export function DecisionConfirmModal({
 
   if (!action) return null;
 
-  const needsOfficer = action.id === 'assign' || action.id === 'escalate';
+  const needsOfficer =
+    action.id === 'assign' ||
+    action.id === 'assign-reviewer' ||
+    action.id === 'escalate';
   const reasonMissing = action.requiresReason && !reason.trim() && !reasonCode;
   const blocked =
     reasonMissing ||
diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 2ce63ea65..d641a7689 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -18,6 +18,7 @@ export type ActionTier =
 export type ActionId =
   | 'claim'
   | 'assign'
+  | 'assign-reviewer'
   | 'escalate'
   | 'hold'
   | 'resume'
@@ -68,6 +69,18 @@ export const ACTIONS: ActionDefinition[] = [
   // Claim is deliberately absent here: an officer claims from the queue
   // (LicenseQueuePage), not from this detail page. That implementation is
   // separate — see LicenseQueuePage/actions.tsx — and is unaffected by this.
+  {
+    // Starts the review under the push model: the team leader hands a freshly
+    // submitted (or eligibility-paid) file to an employee. Without it a CoC/CoP
+    // sitting in ELIGIBILITY_PAID had no action at all — the server offers only
+    // `claim` (a permission no seeded role holds) and this.
+    id: 'assign-reviewer',
+    tier: 'primary',
+    labelKey: 'review.actions.assignReviewer',
+    from: ['SUBMITTED', 'ELIGIBILITY_PAID'],
+    permissions: ['can:assign:license-application'],
+    emphasis: 'filled',
+  },
   {
     id: 'assign',
     tier: 'workflow',
@@ -302,6 +315,7 @@ export interface ResolveContext {
 const WORKFLOW_EVENT_IDS = new Set<ActionId>([
   'claim',
   'assign',
+  'assign-reviewer',
   'escalate',
   'hold',
   'resume',
@@ -364,9 +378,13 @@ export function resolveActions(ctx: ResolveContext): ResolvedAction[] {
         disabledReason: reason,
       });
 
-      // Decisions belong to whoever holds the application.
+      // Decisions belong to whoever holds the application. Assigning a
+      // reviewer is the team leader handing work out, so it is exempt — the
+      // leader is by definition not the officer who will hold it.
       const needsOwnership =
-        action.tier === 'primary' && action.id !== 'confirm-payment';
+        action.tier === 'primary' &&
+        action.id !== 'confirm-payment' &&
+        action.id !== 'assign-reviewer';
       if (
         needsOwnership &&
         app.assignedOfficerId &&
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index c26ec2cc8..c6bc05dd5 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -39,6 +39,7 @@ import {
   useLocalized,
   useApproveDocumentsMutation,
   useAssignApplicationMutation,
+  useAssignReviewerMutation,
   useClaimApplicationMutation,
   useCompleteReviewMutation,
   useConfirmPaymentMutation,
@@ -217,6 +218,7 @@ export function LicenseReviewPage() {
   const [resumeApplication] = useResumeApplicationMutation();
   const [escalateApplication] = useEscalateApplicationMutation();
   const [assignApplication] = useAssignApplicationMutation();
+  const [assignReviewer] = useAssignReviewerMutation();
   // Real officer list, so Assign and Escalate name a person instead of
   // silently reassigning to whoever already held the application.
   const { data: officers = [] } = useGetAssignableOfficersQuery();
@@ -670,6 +672,18 @@ export function LicenseReviewPage() {
             t("review.done.escalate", "Escalated"),
           );
           break;
+        case "assign-reviewer":
+          if (!submission.officerId) return;
+          await run(
+            () =>
+              assignReviewer({
+                id,
+                officerId: submission.officerId as string,
+                remark: submission.reason,
+              }).unwrap(),
+            t("review.done.assignReviewer", "Review assigned"),
+          );
+          break;
         case "assign":
           if (!submission.officerId) return;
           await run(
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 458b638e6..ae6c4d533 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -998,6 +998,7 @@ export const am: Translations = {
     actions: {
       claim: "ውሰድ",
       assign: "መድብ",
+      assignReviewer: "ገምጋሚ መድብ",
       escalate: "ወደ ላይ አሳድግ",
       hold: "አግድ",
       resume: "ቀጥል",
@@ -1056,6 +1057,7 @@ export const am: Translations = {
       hold: "ለ{{applicant}} ማመልከቻ {{number}} ያግዳል። ለእርስዎ ተመድቦ ይቆያል።",
       resume: "ማመልከቻ {{number}} ወደ ታገደበት ደረጃ ይመልሳል።",
       escalate: "ማመልከቻ {{number}} ለውሳኔ ወደ የበላይ ኃላፊ ያሳድጋል።",
+      "assign-reviewer": "ማመልከቻ {{number}} ለተመረጠው ሹም ሰጥቶ ግምገማውን ያስጀምራል።",
       "confirm-payment": "ለማመልከቻ {{number}} ክፍያ ያረጋግጣል።",
       "schedule-exam": "ለማመልከቻ {{number}} {{applicant}}ን ለፈተና ክፍለ ጊዜ ይመድባል።",
     },
@@ -1150,6 +1152,7 @@ export const am: Translations = {
       resume: "ማመልከቻው ቀጥሏል",
       escalate: "ወደ ላይ አድጓል",
       assign: "እንደገና ተመድቧል",
+      assignReviewer: "ግምገማ ተመድቧል",
       scheduled: "ምርመራ ተይዟል",
       inspectionPassed: "ምርመራ አልፏል",
       inspectionFailed: "ምርመራ ወድቋል",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 73a9d96d7..b217be98c 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -1007,6 +1007,7 @@ export const en = {
     actions: {
       claim: 'Claim',
       assign: 'Assign',
+      assignReviewer: 'Assign reviewer',
       escalate: 'Escalate',
       hold: 'Put on hold',
       resume: 'Resume',
@@ -1064,6 +1065,8 @@ export const en = {
       hold: 'Parks application {{number}} for {{applicant}}. It stays assigned to you.',
       resume: 'Returns application {{number}} to the stage it was held from.',
       escalate: 'Raises application {{number}} to a supervisor for a decision.',
+      'assign-reviewer':
+        'Hands application {{number}} to the chosen officer and starts the review.',
       'confirm-payment': 'Confirms settlement for application {{number}}.',
       'schedule-exam': 'Assigns {{applicant}} to an exam session for application {{number}}.',
     },
@@ -1155,6 +1158,7 @@ export const en = {
       resume: 'Application resumed',
       escalate: 'Escalated',
       assign: 'Reassigned',
+      assignReviewer: 'Review assigned',
       scheduled: 'Inspection scheduled',
       inspectionPassed: 'Inspection passed',
       inspectionFailed: 'Inspection failed',
diff --git a/libs/api/src/lib/features/licensing/licensing-api.ts b/libs/api/src/lib/features/licensing/licensing-api.ts
index 3e17464ff..665aaf8ab 100644
--- a/libs/api/src/lib/features/licensing/licensing-api.ts
+++ b/libs/api/src/lib/features/licensing/licensing-api.ts
@@ -856,6 +856,23 @@ export const licensingApi = baseApi
           error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
       }),
 
+      /**
+       * Starts the review: the team leader hands the file to an employee.
+       * `assign` above only re-points an application already in flight.
+       */
+      assignReviewer: builder.mutation<
+        LicenseApplication,
+        { id: string; officerId: string; remark?: string }
+      >({
+        query: ({ id, ...body }) => ({
+          url: `/license-application-review/${id}/assign-reviewer`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_r, error, { id }) =>
+          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
+      }),
+
       holdApplication: builder.mutation<
         LicenseApplication,
         { id: string; reason: string }
@@ -1050,6 +1067,7 @@ export const {
   useRevokeLicenseMutation,
   useReinstateLicenseMutation,
   useAssignApplicationMutation,
+  useAssignReviewerMutation,
   useHoldApplicationMutation,
   useResumeApplicationMutation,
   useEscalateApplicationMutation,

From 580ceaa139f412d23754c393ec17636055f1cc4f Mon Sep 17 00:00:00 2001
From: Nati <natinigussie7@gmail.com>
Date: Wed, 26 Aug 2026 14:08:09 +0000
Subject: [PATCH 21/27] Remove 'assign-reviewer' action and related
 functionality from license review process

---
 .../components/DecisionConfirmModal.tsx       |  5 +---
 .../features/license-review/config/actions.ts | 29 +++++--------------
 .../pages/LicenseReviewPage/index.tsx         | 14 ---------
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
index 47265f5c9..2c34fc9cd 100644
--- a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
@@ -134,10 +134,7 @@ export function DecisionConfirmModal({
 
   if (!action) return null;
 
-  const needsOfficer =
-    action.id === 'assign' ||
-    action.id === 'assign-reviewer' ||
-    action.id === 'escalate';
+  const needsOfficer = action.id === 'assign' || action.id === 'escalate';
   const reasonMissing = action.requiresReason && !reason.trim() && !reasonCode;
   const blocked =
     reasonMissing ||
diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 6ed6d30c7..4bd1d9446 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -18,7 +18,6 @@ export type ActionTier =
 export type ActionId =
   | 'claim'
   | 'assign'
-  | 'assign-reviewer'
   | 'escalate'
   | 'hold'
   | 'resume'
@@ -69,18 +68,6 @@ export const ACTIONS: ActionDefinition[] = [
   // Claim is deliberately absent here: an officer claims from the queue
   // (LicenseQueuePage), not from this detail page. That implementation is
   // separate — see LicenseQueuePage/actions.tsx — and is unaffected by this.
-  {
-    // Starts the review under the push model: the team leader hands a freshly
-    // submitted (or eligibility-paid) file to an employee. Without it a CoC/CoP
-    // sitting in ELIGIBILITY_PAID had no action at all — the server offers only
-    // `claim` (a permission no seeded role holds) and this.
-    id: 'assign-reviewer',
-    tier: 'primary',
-    labelKey: 'review.actions.assignReviewer',
-    from: ['SUBMITTED', 'ELIGIBILITY_PAID'],
-    permissions: ['can:assign:license-application'],
-    emphasis: 'filled',
-  },
   {
     id: 'assign',
     tier: 'workflow',
@@ -168,7 +155,9 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'final-approve',
     tier: 'primary',
     labelKey: 'review.actions.finalApprove',
-    from: ['INSPECTION_COMPLETED', 'UNDER_EVALUATION'],
+    // ELIGIBILITY_PAID: an examined certificate (CoC/CoP) is decided straight
+    // off the eligibility queue — no assignment step.
+    from: ['INSPECTION_COMPLETED', 'UNDER_EVALUATION', 'ELIGIBILITY_PAID'],
     permissions: ['can:approve:license-application'],
     emphasis: 'filled',
     color: 'teal',
@@ -178,7 +167,7 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'request-adjustment',
     tier: 'primary',
     labelKey: 'review.actions.requestAdjustment',
-    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED'],
+    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED', 'ELIGIBILITY_PAID'],
     permissions: ['can:request-adjustment:license-application'],
     emphasis: 'light',
     color: 'orange',
@@ -193,6 +182,7 @@ export const ACTIONS: ActionDefinition[] = [
       'UNDER_EVALUATION',
       'INSPECTION_PENDING',
       'INSPECTION_COMPLETED',
+      'ELIGIBILITY_PAID',
     ],
     permissions: ['can:reject:license-application'],
     emphasis: 'light',
@@ -315,7 +305,6 @@ export interface ResolveContext {
 const WORKFLOW_EVENT_IDS = new Set<ActionId>([
   'claim',
   'assign',
-  'assign-reviewer',
   'escalate',
   'hold',
   'resume',
@@ -390,13 +379,9 @@ export function resolveActions(ctx: ResolveContext): ResolvedAction[] {
         disabledReason: reason,
       });
 
-      // Decisions belong to whoever holds the application. Assigning a
-      // reviewer is the team leader handing work out, so it is exempt — the
-      // leader is by definition not the officer who will hold it.
+      // Decisions belong to whoever holds the application.
       const needsOwnership =
-        action.tier === 'primary' &&
-        action.id !== 'confirm-payment' &&
-        action.id !== 'assign-reviewer';
+        action.tier === 'primary' && action.id !== 'confirm-payment';
       if (
         needsOwnership &&
         app.assignedOfficerId &&
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index 60658db63..166b512eb 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -39,7 +39,6 @@ import {
   useLocalized,
   useApproveDocumentsMutation,
   useAssignApplicationMutation,
-  useAssignReviewerMutation,
   useClaimApplicationMutation,
   useCompleteReviewMutation,
   useConfirmPaymentMutation,
@@ -218,7 +217,6 @@ export function LicenseReviewPage() {
   const [resumeApplication] = useResumeApplicationMutation();
   const [escalateApplication] = useEscalateApplicationMutation();
   const [assignApplication] = useAssignApplicationMutation();
-  const [assignReviewer] = useAssignReviewerMutation();
   // Real officer list, so Assign and Escalate name a person instead of
   // silently reassigning to whoever already held the application.
   const { data: officers = [] } = useGetAssignableOfficersQuery();
@@ -672,18 +670,6 @@ export function LicenseReviewPage() {
             t("review.done.escalate", "Escalated"),
           );
           break;
-        case "assign-reviewer":
-          if (!submission.officerId) return;
-          await run(
-            () =>
-              assignReviewer({
-                id,
-                officerId: submission.officerId as string,
-                remark: submission.reason,
-              }).unwrap(),
-            t("review.done.assignReviewer", "Review assigned"),
-          );
-          break;
         case "assign":
           if (!submission.officerId) return;
           await run(

From 4ec585f4075581b60505243fc6411eb4304b2fed Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Thu, 27 Aug 2026 06:47:44 +0000
Subject: [PATCH 22/27] feat: include location and physical attributes in
 seafarer registration default answers

---
 .../pages/SeafarerRegistrationPage.tsx                      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
index ad229976d..abfd257cc 100644
--- a/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
+++ b/apps/portal/src/app/features/seafarer-registration/pages/SeafarerRegistrationPage.tsx
@@ -117,6 +117,12 @@ function withProfileDefaults(
     emergencyContactPhone: a?.emergencyContactPhone || null,
     emergencyContactRelationship: a?.emergencyContactRelation || null,
     department: profile.seafarerDepartment || null,
+    // Deepest saved level the picker's maxDepth of 3 can show.
+    locationId: a?.subCityId || a?.cityId || a?.regionId || null,
+    hairColor: (profile.hairColor as SaveSeafarerRegistration['hairColor']) || null,
+    eyeColor: (profile.eyeColor as SaveSeafarerRegistration['eyeColor']) || null,
+    bloodType: (profile.bloodType as SaveSeafarerRegistration['bloodType']) || null,
+    heightCm: profile.heightCm ?? null,
   };
   const next = { ...answers };
   for (const [key, value] of Object.entries(defaults) as [AnswerKey, unknown][]) {

From f01c0ec31e33470bc67c9eda6373e82f45a7fcb0 Mon Sep 17 00:00:00 2001
From: estifanos <estifanos.tria@gmail.com>
Date: Thu, 27 Aug 2026 07:36:07 +0000
Subject: [PATCH 23/27] feat: add INSPECTION_FAILED state, enforce inspection
 scheduling locks, and improve adjustment round UI for section locking and
 remark labeling

---
 .../features/license-review/config/actions.ts | 29 ++++++++-
 .../pages/LicenseReviewPage/index.tsx         | 43 +++++++++++++-
 apps/backoffice/src/app/i18n/locales/am.ts    |  4 ++
 apps/backoffice/src/app/i18n/locales/en.ts    |  4 ++
 .../pages/LicenseApplicationPage.tsx          | 59 ++++++++++++++++---
 apps/portal/src/app/i18n/locales/am.ts        |  1 +
 apps/portal/src/app/i18n/locales/en.ts        |  1 +
 .../features/licensing/licensing.helpers.ts   |  9 +++
 .../lib/features/licensing/licensing.types.ts |  4 ++
 9 files changed, 139 insertions(+), 15 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 4bd1d9446..d1547d43f 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -78,6 +78,7 @@ export const ACTIONS: ActionDefinition[] = [
       'UNDER_EVALUATION',
       'INSPECTION_PENDING',
       'INSPECTION_COMPLETED',
+      'INSPECTION_FAILED',
       'ON_HOLD',
     ],
     permissions: ['can:assign:license-application'],
@@ -101,6 +102,7 @@ export const ACTIONS: ActionDefinition[] = [
       'UNDER_EVALUATION',
       'INSPECTION_PENDING',
       'INSPECTION_COMPLETED',
+      'INSPECTION_FAILED',
     ],
     permissions: ['can:hold:license-application'],
     emphasis: 'subtle',
@@ -139,7 +141,8 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'schedule-inspection',
     tier: 'primary',
     labelKey: 'review.actions.scheduleInspection',
-    from: ['INSPECTION_PENDING'],
+    // INSPECTION_FAILED: booking the re-inspection after a failed visit.
+    from: ['INSPECTION_PENDING', 'INSPECTION_FAILED'],
     permissions: ['can:create:inspection'],
     emphasis: 'filled',
   },
@@ -147,7 +150,7 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'record-inspection',
     tier: 'primary',
     labelKey: 'review.actions.recordInspection',
-    from: ['INSPECTION_PENDING'],
+    from: ['INSPECTION_PENDING', 'INSPECTION_FAILED'],
     permissions: ['can:update:inspection'],
     emphasis: 'filled',
   },
@@ -167,7 +170,13 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'request-adjustment',
     tier: 'primary',
     labelKey: 'review.actions.requestAdjustment',
-    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED', 'ELIGIBILITY_PAID'],
+    from: [
+      'UNDER_REVIEW',
+      'UNDER_EVALUATION',
+      'INSPECTION_COMPLETED',
+      'INSPECTION_FAILED',
+      'ELIGIBILITY_PAID',
+    ],
     permissions: ['can:request-adjustment:license-application'],
     emphasis: 'light',
     color: 'orange',
@@ -182,6 +191,7 @@ export const ACTIONS: ActionDefinition[] = [
       'UNDER_EVALUATION',
       'INSPECTION_PENDING',
       'INSPECTION_COMPLETED',
+      'INSPECTION_FAILED',
       'ELIGIBILITY_PAID',
     ],
     permissions: ['can:reject:license-application'],
@@ -282,11 +292,18 @@ export interface ResolveContext {
     needsCapital: string;
     needsInspection: string;
     needsDocumentReviews: string;
+    inspectionNotYetDue: string;
   };
   /** Number of sections/documents the officer has flagged for correction. */
   flaggedCount: number;
   /** True when an inspection is scheduled and awaiting a result. */
   hasPendingInspection: boolean;
+  /**
+   * True while the booked inspection's scheduled instant is still in the
+   * future — a visit cannot have an outcome before it happens, so the record
+   * button waits (the server refuses early results the same way).
+   */
+  inspectionNotYetDue: boolean;
   /**
    * False while any uploaded document is still unjudged or rejected. Approving
    * is a statement that every document was checked, so the button stays dead
@@ -379,6 +396,12 @@ export function resolveActions(ctx: ResolveContext): ResolvedAction[] {
         disabledReason: reason,
       });
 
+      // Booked but not yet due: keep the button visible so the officer sees
+      // the next step, disabled with the scheduled time as the reason.
+      if (action.id === 'record-inspection' && ctx.inspectionNotYetDue) {
+        return disabled(reasons.inspectionNotYetDue);
+      }
+
       // Decisions belong to whoever holds the application.
       const needsOwnership =
         action.tier === 'primary' && action.id !== 'confirm-payment';
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index 166b512eb..71a13403a 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -279,6 +279,12 @@ export function LicenseReviewPage() {
   }, [flags]);
 
   const pendingInspection = inspections.find((i) => i.status === 'SCHEDULED');
+  // A visit cannot have an outcome before it happens — mirror of the server's
+  // inspection_not_yet_due guard, compared instant-to-instant.
+  const inspectionNotYetDue = Boolean(
+    pendingInspection?.scheduledDate &&
+      new Date(pendingInspection.scheduledDate) > new Date(),
+  );
 
   // Approving means every uploaded document was accepted — one unjudged or
   // rejected file is enough to keep the decision buttons dead. The counts feed
@@ -335,6 +341,7 @@ export function LicenseReviewPage() {
       can,
       flaggedCount: flagged.length,
       hasPendingInspection: Boolean(pendingInspection),
+      inspectionNotYetDue,
       allDocumentsAccepted,
       reasons: {
         wrongStatus: t('review.disabled.wrongStatus', 'Not available at this stage'),
@@ -343,6 +350,13 @@ export function LicenseReviewPage() {
         needsFlags: t('review.disabled.needsFlags', 'Flag at least one item to request a correction'),
         needsCapital: t('review.disabled.needsCapital', 'Record the verified capital first'),
         needsInspection: t('review.disabled.needsInspection', 'Requires an inspection result'),
+        inspectionNotYetDue: t('review.disabled.inspectionNotYetDue', {
+          date: pendingInspection?.scheduledDate
+            ? showDate(pendingInspection.scheduledDate)
+            : '',
+          defaultValue:
+            'Inspection scheduled for {{date}}. Results can be recorded after the scheduled time.',
+        }),
         needsDocumentReviews:
           documentProgress.total === 0
             ? t(
@@ -357,7 +371,7 @@ export function LicenseReviewPage() {
               }),
       },
     });
-  }, [data, currentUserId, can, flagged.length, pendingInspection, t]);
+  }, [data, currentUserId, can, flagged.length, pendingInspection, inspectionNotYetDue, showDate, t]);
 
   // Location answers are tree ids. The picker the applicant used resolves them
   // client-side from the same list, so the reviewer reads the place rather than
@@ -1063,6 +1077,18 @@ export function LicenseReviewPage() {
             </Tabs.Panel>
 
             <Tabs.Panel value="inspection">
+              {status === "INSPECTION_FAILED" && (
+                <Alert
+                  mb="md"
+                  color="red"
+                  icon={<IconAlertTriangle size={16} />}
+                >
+                  {t(
+                    "review.inspectionFailedBlocked",
+                    "Approval is unavailable because the inspection failed. Schedule a re-inspection, request corrections, or reject the application.",
+                  )}
+                </Alert>
+              )}
               <Paper withBorder p="md">
                 {inspections.length === 0 ? (
                   <Text size="sm" c="dimmed">
@@ -1386,12 +1412,23 @@ export function LicenseReviewPage() {
             autosize
             minRows={3}
           />
+          {inspectionNotYetDue && (
+            <Alert color="yellow" icon={<IconAlertTriangle size={16} />}>
+              {t("review.disabled.inspectionNotYetDue", {
+                date: pendingInspection?.scheduledDate
+                  ? showDate(pendingInspection.scheduledDate)
+                  : "",
+                defaultValue:
+                  "Inspection scheduled for {{date}}. Results can be recorded after the scheduled time.",
+              })}
+            </Alert>
+          )}
           <ModalFooter grow>
             <ActionIcon
               variant="light"
               color="teal"
               size="lg"
-              disabled={!findings.trim() || !pendingInspection}
+              disabled={!findings.trim() || !pendingInspection || inspectionNotYetDue}
               aria-label={t("review.passed", "Passed")}
               onClick={() =>
                 run(
@@ -1418,7 +1455,7 @@ export function LicenseReviewPage() {
               variant="light"
               color="red"
               size="lg"
-              disabled={!findings.trim() || !pendingInspection}
+              disabled={!findings.trim() || !pendingInspection || inspectionNotYetDue}
               aria-label={t("review.failed", "Failed")}
               onClick={() =>
                 run(
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 40aab6f6e..1c3b813b4 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -1027,10 +1027,14 @@ export const am: Translations = {
       needsFlags: "ማስተካከያ ለመጠየቅ ቢያንስ አንድ ነገር ምልክት ያድርጉ",
       needsCapital: "መጀመሪያ የተረጋገጠውን ካፒታል ይመዝግቡ",
       needsInspection: "የምርመራ ውጤት ያስፈልጋል",
+      inspectionNotYetDue:
+        "ምርመራ ለ{{date}} ተይዟል። ውጤቶች ከተያዘው ሰዓት በኋላ መመዝገብ ይችላሉ።",
       needsDocumentReviews:
         "መጀመሪያ ሁሉንም ሰነዶች ይቀበሉ — ከ{{total}} {{accepted}} ተቀብለዋል። የሰነዶች ትር ከፍተው ቀሪዎቹን ይቀበሉ።",
       needsDocumentsUploaded: "እስካሁን የሚገመገም ሰነድ አልተጫነም",
     },
+    inspectionFailedBlocked:
+      "ምርመራው ስላልተሳካ ማጽደቅ አይቻልም። ድጋሚ ምርመራ ያስይዙ፣ ማስተካከያ ይጠይቁ ወይም ማመልከቻውን ውድቅ ያድርጉ።",
     reasons: {
       incompleteDocuments: "ያልተሟሉ ሰነዶች",
       belowCapital: "ካፒታል ከሚያስፈልገው በታች",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index ac4ae177d..209d12138 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -1036,10 +1036,14 @@ export const en = {
       needsFlags: 'Flag at least one item to request a correction',
       needsCapital: 'Record the verified capital first',
       needsInspection: 'Requires an inspection result',
+      inspectionNotYetDue:
+        'Inspection scheduled for {{date}}. Results can be recorded after the scheduled time.',
       needsDocumentReviews:
         'Accept all documents first — {{accepted}} of {{total}} accepted. Open the Documents tab and accept the rest.',
       needsDocumentsUploaded: 'No documents uploaded to review yet',
     },
+    inspectionFailedBlocked:
+      'Approval is unavailable because the inspection failed. Schedule a re-inspection, request corrections, or reject the application.',
     reasons: {
       incompleteDocuments: 'Incomplete documents',
       belowCapital: 'Capital below the required minimum',
diff --git a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
index a7b4f92ac..30b801ab3 100644
--- a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
+++ b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
@@ -322,24 +322,44 @@ export function LicenseApplicationPage() {
   const isAdjusting = application?.status === "RESUBMIT_REQUIRED";
   const openRemarks = detail?.openRemarks ?? [];
 
+  // The whole round's remarks, resolved or not — the server's section lock
+  // (`assertSectionUnlocked`) ignores `isResolved`, and this page bulk-resolves
+  // remarks right before resubmitting, so `openRemarks` would re-freeze a
+  // section the moment the applicant ticked it off.
+  const roundRemarks = useMemo(
+    () =>
+      (detail?.remarks ?? []).filter(
+        (r) => r.roundNumber === detail?.application?.adjustmentRound,
+      ),
+    [detail?.remarks, detail?.application?.adjustmentRound],
+  );
+
   const flaggedSections = useMemo(
     () =>
       Object.fromEntries(
-        openRemarks
+        roundRemarks
           .filter((r) => r.targetType === "FORM_SECTION")
           .map((r) => [r.targetKey, r.remark]),
       ),
-    [openRemarks],
+    [roundRemarks],
   );
   const flaggedDocuments = useMemo(
     () =>
       Object.fromEntries(
-        openRemarks
+        roundRemarks
           .filter((r) => r.targetType === "DOCUMENT")
           .map((r) => [r.targetKey, r.remark]),
       ),
-    [openRemarks],
+    [roundRemarks],
   );
+  const hasSectionRemarks = Object.keys(flaggedSections).length > 0;
+  const hasDocRemarks = Object.keys(flaggedDocuments).length > 0;
+
+  // A round that flagged no form sections carries no section locks — mirror of
+  // the server's fallback, without which a documents-only correction round
+  // froze every field and the applicant could not edit anything at all.
+  const isSectionLocked = (sectionKey: string) =>
+    isAdjusting && hasSectionRemarks && !flaggedSections[sectionKey];
 
   // Sections that share a group collapse onto one step, so the stepper stays
   // short instead of showing a page per section.
@@ -383,6 +403,24 @@ export function LicenseApplicationPage() {
   // to the summary first.
   const showSummary = application.status !== "DRAFT" && viewingSummary;
 
+  // The applicant reads "Vessel Particulars", not "vesselParticulars" — and a
+  // staff remark is keyed by a uuid, which reads as nothing at all.
+  function remarkLabel(remark: (typeof openRemarks)[number]): string {
+    if (remark.targetType === "FORM_SECTION") {
+      const section = config?.licenseType.formSchema.sections.find(
+        (s) => s.key === remark.targetKey,
+      );
+      return section ? localized(section.title) : remark.targetKey;
+    }
+    if (remark.targetType === "DOCUMENT") {
+      const requirement = config?.documentRequirements.find(
+        (r) => r.key === remark.targetKey,
+      );
+      return requirement ? localized(requirement.name) : remark.targetKey;
+    }
+    return t("licenseApplication.staffMember", "Staff member");
+  }
+
   // Vessel Information and Current Ownership are separate form sections, so
   // ConfigDrivenSection (one instance per section) can't fill both itself —
   // it reports the pick up here and this fans it out across every section.
@@ -400,7 +438,7 @@ export function LicenseApplicationPage() {
   async function saveSection(sectionKey: string) {
     // During an adjustment round only flagged sections are editable, so don't
     // even attempt a write the server would reject.
-    if (isAdjusting && !flaggedSections[sectionKey]) return;
+    if (isSectionLocked(sectionKey)) return;
     const values = { ...(draft[sectionKey] ?? {}) };
     // The picker works in alpha-2 codes (CountrySelect); the backend, like
     // the profile Address endpoint, stores the full country name.
@@ -679,7 +717,7 @@ export function LicenseApplicationPage() {
           <Stack gap={4}>
             {openRemarks.map((remark) => (
               <Text size="sm" key={remark.id}>
-                <b>{remark.targetKey}</b>: {remark.remark}
+                <b>{remarkLabel(remark)}</b>: {remark.remark}
               </Text>
             ))}
             <Text size="xs" c="dimmed" mt={4}>
@@ -741,7 +779,7 @@ export function LicenseApplicationPage() {
           {currentStep?.kind === "sections" && (
             <Stack gap="lg">
               {currentStep.sections.map((section, index) => {
-                const locked = isAdjusting && !flaggedSections[section.key];
+                const locked = isSectionLocked(section.key);
                 return (
                   <div key={section.key}>
                     {index > 0 && <Divider mb="lg" />}
@@ -899,7 +937,7 @@ export function LicenseApplicationPage() {
               ownerType="APPLICATION"
               ownerId={appId}
               flagged={flaggedDocuments}
-              restrictToFlagged={isAdjusting}
+              restrictToFlagged={isAdjusting && hasDocRemarks}
               readOnly={readOnly}
               onUploaded={() => {
                 refetchAttachments();
@@ -922,7 +960,10 @@ export function LicenseApplicationPage() {
                     formData={draft}
                     errors={fieldErrors}
                     vessels={vessels}
-                    disabled={readOnly}
+                    // Same lock as the earlier steps — without it this step
+                    // looked editable during an adjustment round while
+                    // saveSection silently dropped the changes.
+                    disabled={readOnly || isSectionLocked(section.key)}
                     onChange={(key, value) => {
                       setDraft((prev) => ({
                         ...prev,
diff --git a/apps/portal/src/app/i18n/locales/am.ts b/apps/portal/src/app/i18n/locales/am.ts
index 8b1efe359..5f921d909 100644
--- a/apps/portal/src/app/i18n/locales/am.ts
+++ b/apps/portal/src/app/i18n/locales/am.ts
@@ -242,6 +242,7 @@ export const am: Translations = {
       RESUBMIT_REQUIRED: 'እንደገና ማስገባት ያስፈልጋል',
       INSPECTION_PENDING: 'ቁጥጥር በመጠባበቅ ላይ',
       INSPECTION_COMPLETED: 'ቁጥጥር ተጠናቋል',
+      INSPECTION_FAILED: 'ቁጥጥር አልተሳካም',
       APPROVED: 'ጸድቋል',
       REJECTED: 'ውድቅ ተደርጓል',
       ON_HOLD: 'ላይ ቆሟል',
diff --git a/apps/portal/src/app/i18n/locales/en.ts b/apps/portal/src/app/i18n/locales/en.ts
index cc50ad5c1..f3e0d4d83 100644
--- a/apps/portal/src/app/i18n/locales/en.ts
+++ b/apps/portal/src/app/i18n/locales/en.ts
@@ -242,6 +242,7 @@ export const en = {
       RESUBMIT_REQUIRED: 'Resubmit Required',
       INSPECTION_PENDING: 'Inspection Pending',
       INSPECTION_COMPLETED: 'Inspection Completed',
+      INSPECTION_FAILED: 'Inspection Failed',
       APPROVED: 'Approved',
       REJECTED: 'Rejected',
       ON_HOLD: 'On Hold',
diff --git a/libs/api/src/lib/features/licensing/licensing.helpers.ts b/libs/api/src/lib/features/licensing/licensing.helpers.ts
index 8f3cff394..83f0e8098 100644
--- a/libs/api/src/lib/features/licensing/licensing.helpers.ts
+++ b/libs/api/src/lib/features/licensing/licensing.helpers.ts
@@ -67,6 +67,7 @@ export const STATUS_LABELS: Record<LicenseStatus, string> = {
   RESUBMIT_REQUIRED: 'Resubmit Required',
   INSPECTION_PENDING: 'Inspection Pending',
   INSPECTION_COMPLETED: 'Inspection Completed',
+  INSPECTION_FAILED: 'Inspection Failed',
   APPROVED: 'Approved',
   REJECTED: 'Rejected',
   ON_HOLD: 'On Hold',
@@ -94,6 +95,8 @@ export const STATUS_COLORS: Record<LicenseStatus, string> = {
   RESUBMIT_REQUIRED: 'orange',
   INSPECTION_PENDING: 'cyan',
   INSPECTION_COMPLETED: 'cyan',
+  // Orange, not red: recoverable — a re-inspection can still pass.
+  INSPECTION_FAILED: 'orange',
   APPROVED: 'teal',
   REJECTED: 'red',
   ON_HOLD: 'gray',
@@ -127,6 +130,8 @@ export const STATUS_PROGRESS: Record<LicenseStatus, number> = {
   RESUBMIT_REQUIRED: 30,
   INSPECTION_PENDING: 55,
   INSPECTION_COMPLETED: 65,
+  // A re-inspection returns to the pending step, so no further along than it.
+  INSPECTION_FAILED: 55,
   APPROVED: 75,
   // Parked, so it keeps the progress of wherever it was held from.
   ON_HOLD: 45,
@@ -376,6 +381,10 @@ const ERROR_MESSAGES: Record<string, string> = {
   application_not_awaiting_inspection:
     'This application is not waiting for an inspection.',
   inspection_already_completed: 'This inspection has already been recorded.',
+  inspection_not_yet_due:
+    'Inspection results can be recorded after the scheduled inspection date and time.',
+  inspection_not_passed:
+    'Approval requires a passed inspection. Schedule a re-inspection or request corrections.',
   license_type_inactive: 'This licence type is not currently accepting applications.',
 };
 
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index 0be26f0ab..22731177b 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -29,6 +29,10 @@ export type LicenseStatus =
   | "RESUBMIT_REQUIRED"
   | "INSPECTION_PENDING"
   | "INSPECTION_COMPLETED"
+  // The inspection was conducted and failed. Approval and issuance are
+  // unreachable until a re-inspection passes; the officer chooses between a
+  // repeat visit, an adjustment round, and rejection.
+  | "INSPECTION_FAILED"
   | "APPROVED"
   | "REJECTED"
   | "ON_HOLD"

From 12e7927d018c33d90c4b1eccc217f1becb2e8966 Mon Sep 17 00:00:00 2001
From: fitse-yotor <fitseyotor@gmail.com>
Date: Thu, 27 Aug 2026 10:53:11 +0300
Subject: [PATCH 24/27] feat(certificate-designer): add custom page size
 options and update related components

---
 .../components/TemplateBackgroundPanel.tsx    |  45 ++++-
 .../components/TemplateCanvas.tsx             |  28 ++-
 .../certificate-designer/config/designer.ts   |  12 +-
 .../hooks/useTemplateDraft.ts                 |  13 ++
 .../hooks/useTemplatePreview.ts               |   9 +-
 .../pages/CertificateDesignerPage.tsx         |  15 +-
 .../pages/LicenseReviewPage/index.tsx         | 178 +++++++++++++++++-
 apps/backoffice/src/app/i18n/locales/am.ts    |  11 +-
 apps/backoffice/src/app/i18n/locales/en.ts    |  11 +-
 apps/backoffice/src/app/layouts/nav-config.ts |  18 +-
 .../portal/src/app/providers/AppProviders.tsx |   4 +-
 .../lib/features/licensing/licensing-api.ts   |  18 +-
 .../lib/features/licensing/licensing.types.ts |   9 +
 13 files changed, 342 insertions(+), 29 deletions(-)

diff --git a/apps/backoffice/src/app/features/certificate-designer/components/TemplateBackgroundPanel.tsx b/apps/backoffice/src/app/features/certificate-designer/components/TemplateBackgroundPanel.tsx
index 70e603189..3c5bbea86 100644
--- a/apps/backoffice/src/app/features/certificate-designer/components/TemplateBackgroundPanel.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/components/TemplateBackgroundPanel.tsx
@@ -23,6 +23,10 @@ interface Props {
   onLogoPlacementChange: (placement: TemplateLogoPlacement) => void;
   landscape: boolean;
   onLandscapeChange: (landscape: boolean) => void;
+  pageWidth: string;
+  onPageWidthChange: (width: string) => void;
+  pageHeight: string;
+  onPageHeightChange: (height: string) => void;
   disabled: boolean;
 }
 
@@ -51,6 +55,10 @@ export function TemplateBackgroundPanel({
   onLogoPlacementChange,
   landscape,
   onLandscapeChange,
+  pageWidth,
+  onPageWidthChange,
+  pageHeight,
+  onPageHeightChange,
   disabled,
 }: Props) {
   const { t } = useTranslation();
@@ -91,9 +99,40 @@ export function TemplateBackgroundPanel({
               ]}
             />
             <Text size="xs" c="dimmed" mt={4}>
-              {landscape
-                ? t('designer.a4Landscape', 'A4 — 297 × 210 mm')
-                : t('designer.a4Portrait', 'A4 — 210 × 297 mm')}
+              {pageWidth && pageHeight
+                ? t('designer.customSize', 'Custom size — see below')
+                : landscape
+                  ? t('designer.a4Landscape', 'A4 — 297 × 210 mm')
+                  : t('designer.a4Portrait', 'A4 — 210 × 297 mm')}
+            </Text>
+          </div>
+
+          <div>
+            <Text size="sm" fw={500} mb={4}>
+              {t('designer.customPageSize', 'Custom page size')}
+            </Text>
+            <Group gap="xs">
+              <TextInput
+                placeholder={t('designer.pageWidth', 'Width')}
+                value={pageWidth}
+                onChange={(e) => onPageWidthChange(e.currentTarget.value)}
+                disabled={disabled}
+                w={100}
+              />
+              <Text size="sm" c="dimmed">×</Text>
+              <TextInput
+                placeholder={t('designer.pageHeight', 'Height')}
+                value={pageHeight}
+                onChange={(e) => onPageHeightChange(e.currentTarget.value)}
+                disabled={disabled}
+                w={100}
+              />
+            </Group>
+            <Text size="xs" c="dimmed" mt={4}>
+              {t(
+                'designer.customSizeHint',
+                'e.g. 4.92in × 3.46in. Leave both blank to use A4. Overrides orientation\'s A4 size when set.',
+              )}
             </Text>
           </div>
         </Group>
diff --git a/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx b/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
index db0530f2f..a4018d460 100644
--- a/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/components/TemplateCanvas.tsx
@@ -8,6 +8,8 @@ interface Props {
   logoUrl: string;
   logoPlacement: TemplateLogoPlacement;
   landscape: boolean;
+  pageWidth?: string;
+  pageHeight?: string;
   placements: TemplateFieldPlacement[];
   selectedId: string | null;
   onSelect: (id: string | null) => void;
@@ -15,9 +17,17 @@ interface Props {
   disabled: boolean;
 }
 
-/** A4 aspect ratio, the only page size the renderer is configured for. */
+/** A4 aspect ratio, the fallback for a version with no custom page size. */
 const A4_RATIO = 297 / 210;
 
+/** Parses a CSS length like "4.92in" or "125mm" into a unitless number, unit-agnostic — only the ratio between width and height matters here. */
+function parseLength(value: string): number | null {
+  const match = value.trim().match(/^([\d.]+)/);
+  if (!match) return null;
+  const n = Number(match[1]);
+  return Number.isFinite(n) && n > 0 ? n : null;
+}
+
 const LOGO_CORNER_STYLE: Record<string, (offset: number) => React.CSSProperties> = {
   TOP_LEFT: (o) => ({ top: `${o}%`, left: `${o}%` }),
   TOP_CENTER: (o) => ({ top: `${o}%`, left: '50%', transform: 'translateX(-50%)' }),
@@ -53,6 +63,8 @@ export function TemplateCanvas({
   logoUrl,
   logoPlacement,
   landscape,
+  pageWidth,
+  pageHeight,
   placements,
   selectedId,
   onSelect,
@@ -180,6 +192,18 @@ export function TemplateCanvas({
     logoPlacement.offsetPct ?? 5,
   );
 
+  // A custom size already states its own orientation (4.92in × 3.46in is
+  // landscape on its own), so it is used as-is rather than flipped again by
+  // `landscape` — that flag only disambiguates the A4 fallback below.
+  const customWidth = pageWidth ? parseLength(pageWidth) : null;
+  const customHeight = pageHeight ? parseLength(pageHeight) : null;
+  const aspectRatio =
+    customWidth && customHeight
+      ? customWidth / customHeight
+      : landscape
+        ? A4_RATIO
+        : 1 / A4_RATIO;
+
   return (
     <Paper withBorder p="sm" radius="md">
       <Text size="xs" c="dimmed" mb="xs">
@@ -195,7 +219,7 @@ export function TemplateCanvas({
         style={{
           position: 'relative',
           width: '100%',
-          aspectRatio: landscape ? String(A4_RATIO) : String(1 / A4_RATIO),
+          aspectRatio: String(aspectRatio),
           background: '#ffffff',
           border: '1px solid var(--mantine-color-gray-4)',
           overflow: 'hidden',
diff --git a/apps/backoffice/src/app/features/certificate-designer/config/designer.ts b/apps/backoffice/src/app/features/certificate-designer/config/designer.ts
index f6fd5abae..e9f4d2892 100644
--- a/apps/backoffice/src/app/features/certificate-designer/config/designer.ts
+++ b/apps/backoffice/src/app/features/certificate-designer/config/designer.ts
@@ -11,8 +11,16 @@ export const STATUS_COLOR: Record<LicenseTemplate['status'], string> = {
   ARCHIVED: 'dark',
 };
 
-/** Page options sent with every save and preview — A4, background printed. */
-export function pageOptionsFor(landscape: boolean) {
+/**
+ * Page options sent with every save and preview.
+ *
+ * A4 unless the version carries an explicit page size — set for documents
+ * like the Seaman Book, whose ICAO 9303 passport-booklet dimensions have no
+ * named `format` preset. `width`/`height` win over `format` in Puppeteer, so
+ * a custom size is sent alone rather than alongside `format: 'A4'`.
+ */
+export function pageOptionsFor(landscape: boolean, size?: { width: string; height: string }) {
+  if (size) return { width: size.width, height: size.height, landscape, printBackground: true };
   return { format: 'A4' as const, landscape, printBackground: true };
 }
 
diff --git a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
index 19a28fe34..1d8cdc6a3 100644
--- a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
+++ b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplateDraft.ts
@@ -22,6 +22,11 @@ export function useTemplateDraft(templates: LicenseTemplate[]) {
   const [source, setSource] = useState('');
   const [name, setName] = useState('');
   const [landscape, setLandscape] = useState(true);
+  // Empty string means "use the A4 default" — only a version whose
+  // pageOptions already carries a custom size (e.g. the Seaman Book) starts
+  // with these populated.
+  const [pageWidth, setPageWidth] = useState('');
+  const [pageHeight, setPageHeight] = useState('');
   const [backgroundUrl, setBackgroundUrl] = useState('');
   const [logoUrl, setLogoUrl] = useState('');
   const [logoPlacement, setLogoPlacement] = useState<TemplateLogoPlacement>({});
@@ -49,6 +54,8 @@ export function useTemplateDraft(templates: LicenseTemplate[]) {
     setSource(selected.hbsSource);
     setName(selected.name);
     setLandscape(selected.pageOptions?.landscape ?? true);
+    setPageWidth(selected.pageOptions?.width ?? '');
+    setPageHeight(selected.pageOptions?.height ?? '');
     setBackgroundUrl(selected.backgroundUrl ?? '');
     setLogoUrl(selected.logoUrl ?? '');
     setLogoPlacement(selected.logoPlacement ?? {});
@@ -70,6 +77,8 @@ export function useTemplateDraft(templates: LicenseTemplate[]) {
     (source !== selected?.hbsSource ||
       name !== selected?.name ||
       landscape !== (selected?.pageOptions?.landscape ?? true) ||
+      pageWidth !== (selected?.pageOptions?.width ?? '') ||
+      pageHeight !== (selected?.pageOptions?.height ?? '') ||
       backgroundUrl !== (selected?.backgroundUrl ?? '') ||
       logoUrl !== (selected?.logoUrl ?? '') ||
       logoPlacementChanged ||
@@ -137,6 +146,10 @@ export function useTemplateDraft(templates: LicenseTemplate[]) {
     setName,
     landscape,
     setLandscape,
+    pageWidth,
+    setPageWidth,
+    pageHeight,
+    setPageHeight,
     backgroundUrl,
     setBackgroundUrl,
     logoUrl,
diff --git a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplatePreview.ts b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplatePreview.ts
index c2714f856..975e03459 100644
--- a/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplatePreview.ts
+++ b/apps/backoffice/src/app/features/certificate-designer/hooks/useTemplatePreview.ts
@@ -9,6 +9,8 @@ interface PreviewArgs {
   hbsSource: string;
   licenseTypeId: string | null;
   landscape: boolean;
+  pageWidth?: string;
+  pageHeight?: string;
 }
 
 /**
@@ -21,7 +23,7 @@ export function useTemplatePreview() {
   const [previewUrl, setPreviewUrl] = useState<string | null>(null);
 
   const open = useCallback(
-    async ({ hbsSource, licenseTypeId, landscape }: PreviewArgs) => {
+    async ({ hbsSource, licenseTypeId, landscape, pageWidth, pageHeight }: PreviewArgs) => {
       try {
         // The preview returns a PDF stream, not JSON, so it bypasses RTK Query
         // and calls the API directly — which means spelling out the base URL and
@@ -36,7 +38,10 @@ export function useTemplatePreview() {
           body: JSON.stringify({
             hbsSource,
             licenseTypeId,
-            pageOptions: pageOptionsFor(landscape),
+            pageOptions: pageOptionsFor(
+              landscape,
+              pageWidth && pageHeight ? { width: pageWidth, height: pageHeight } : undefined,
+            ),
           }),
         });
         if (!response.ok) throw new Error(await response.text());
diff --git a/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx b/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
index d30aa5d2f..e2903f2d8 100644
--- a/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
@@ -182,6 +182,10 @@ export function CertificateDesignerPage() {
               onLogoPlacementChange={draft.setLogoPlacement}
               landscape={draft.landscape}
               onLandscapeChange={draft.setLandscape}
+              pageWidth={draft.pageWidth}
+              onPageWidthChange={draft.setPageWidth}
+              pageHeight={draft.pageHeight}
+              onPageHeightChange={draft.setPageHeight}
               disabled={editingLocked}
             />
 
@@ -239,6 +243,8 @@ export function CertificateDesignerPage() {
                     logoUrl={draft.logoUrl}
                     logoPlacement={draft.logoPlacement}
                     landscape={draft.landscape}
+                    pageWidth={draft.pageWidth}
+                    pageHeight={draft.pageHeight}
                     placements={draft.placements}
                     selectedId={draft.selectedBlockId}
                     onSelect={draft.setSelectedBlockId}
@@ -306,6 +312,8 @@ export function CertificateDesignerPage() {
                     : draft.source,
                   licenseTypeId: typeId,
                   landscape: draft.landscape,
+                  pageWidth: draft.pageWidth || undefined,
+                  pageHeight: draft.pageHeight || undefined,
                 })
               }
               onSave={() =>
@@ -318,7 +326,12 @@ export function CertificateDesignerPage() {
                       // canvas layout is present, so sending the stale source
                       // alongside it would only fight that.
                       hbsSource: draft.usesCanvas ? undefined : draft.source,
-                      pageOptions: pageOptionsFor(draft.landscape),
+                      pageOptions: pageOptionsFor(
+                        draft.landscape,
+                        draft.pageWidth && draft.pageHeight
+                          ? { width: draft.pageWidth, height: draft.pageHeight }
+                          : undefined,
+                      ),
                       backgroundUrl: draft.backgroundUrl || undefined,
                       logoUrl: draft.logoUrl || undefined,
                       logoPlacement: draft.logoPlacement,
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
index fdd4ab464..e92dd964e 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage/index.tsx
@@ -4,9 +4,12 @@ import {
   ActionIcon,
   Alert,
   Badge,
+  Button,
   Container,
+  FileButton,
   Grid,
   Group,
+  Loader,
   Modal,
   NumberInput,
   Paper,
@@ -24,8 +27,11 @@ import {
 import {
   IconAlertTriangle,
   IconCheck,
+  IconEye,
+  IconFileDownload,
   IconLayoutSidebarRightCollapse,
   IconLayoutSidebarRightExpand,
+  IconPaperclip,
   IconQuestionMark,
   IconX,
 } from "@tabler/icons-react";
@@ -63,6 +69,8 @@ import {
   useRequestAdjustmentMutation,
   useResumeApplicationMutation,
   useScheduleInspectionMutation,
+  useGetCertificateUrlForOfficerMutation,
+  uploadDocument,
   type RemarkTargetType,
   type StaffEvidenceRequirement,
 } from "@ema-platform/api";
@@ -212,6 +220,11 @@ export function LicenseReviewPage() {
   const [confirmPayment] = useConfirmPaymentMutation();
   const [scheduleIssuance] = useScheduleIssuanceMutation();
   const [issueCertificate] = useIssueCertificateMutation();
+  const [getCertificateUrlForOfficer] = useGetCertificateUrlForOfficerMutation();
+  const [certificateBusy, setCertificateBusy] = useState<"view" | "download" | null>(
+    null,
+  );
+  const [certificatePreview, setCertificatePreview] = useState<string | null>(null);
   const [scheduleExam, { isLoading: schedulingExam }] =
     useScheduleExamMutation();
   const [recordExamOutcome] = useRecordExamOutcomeMutation();
@@ -243,6 +256,9 @@ export function LicenseReviewPage() {
   const [railOpen, setRailOpen] = useState(true);
   const [inspectionOpen, setInspectionOpen] = useState(false);
   const [inspectionDate, setInspectionDate] = useState("");
+  const [inspectionTimeSlot, setInspectionTimeSlot] = useState<"MORNING" | "AFTERNOON">(
+    "MORNING",
+  );
   const [issuanceOpen, setIssuanceOpen] = useState(false);
   const [issuanceDate, setIssuanceDate] = useState("");
   const [resultOpen, setResultOpen] = useState(false);
@@ -250,6 +266,10 @@ export function LicenseReviewPage() {
   const [examOutcomeOpen, setExamOutcomeOpen] = useState(false);
   const [examScore, setExamScore] = useState<number | undefined>();
   const [findings, setFindings] = useState("");
+  const [findingsUploadBusy, setFindingsUploadBusy] = useState(false);
+  const [findingsPreview, setFindingsPreview] = useState<
+    { url: string; title: string } | null
+  >(null);
   const [checklist, setChecklist] = useState<
     Record<string, "PASS" | "FAIL" | "NEEDS_CORRECTION">
   >({});
@@ -289,6 +309,12 @@ export function LicenseReviewPage() {
 
   const pendingInspection = inspections.find((i) => i.status === 'SCHEDULED');
 
+  const { data: findingsEvidence = [], refetch: refetchFindingsEvidence } =
+    useGetAttachmentsQuery(
+      { ownerType: 'INSPECTION', ownerId: pendingInspection?.id ?? '' },
+      { skip: !pendingInspection },
+    );
+
   // Approving means every uploaded document was accepted — one unjudged or
   // rejected file is enough to keep the decision buttons dead. The counts feed
   // the hover explanation, so the officer sees how much is left rather than
@@ -488,6 +514,34 @@ export function LicenseReviewPage() {
     }
   }
 
+  /**
+   * Fetches a fresh presigned link and either opens the in-app PDF preview
+   * or a new tab, depending which button was pressed — the link itself is
+   * short-lived, so each click gets its own rather than caching one.
+   */
+  async function openCertificate(mode: "view" | "download") {
+    if (!app.issuedLicenseId) return;
+    setCertificateBusy(mode);
+    try {
+      const { url } = await getCertificateUrlForOfficer(
+        app.issuedLicenseId,
+      ).unwrap();
+      if (mode === "view") {
+        setCertificatePreview(url);
+      } else {
+        window.open(url, "_blank", "noopener");
+      }
+    } catch (err) {
+      notifications.show({
+        color: "red",
+        title: t("review.certificateError", "Could not open the certificate"),
+        message: extractErrorMessage(err),
+      });
+    } finally {
+      setCertificateBusy(null);
+    }
+  }
+
   /** Actions with their own dedicated form open that; the rest confirm. */
   function handleAction(action: ResolvedAction) {
     switch (action.id) {
@@ -875,6 +929,38 @@ export function LicenseReviewPage() {
               </Stack>
             </Paper>
 
+            {/* Only once the certificate actually exists — before that there
+                is nothing to view or download yet. */}
+            {app.issuedLicenseId && (
+              <Paper withBorder p="md">
+                <Text fw={600} size="sm" mb="sm">
+                  {t("review.certificate", "Certificate")}
+                </Text>
+                <Group gap="xs">
+                  <Button
+                    size="xs"
+                    variant="light"
+                    leftSection={<IconEye size={14} />}
+                    loading={certificateBusy === "view"}
+                    disabled={Boolean(certificateBusy)}
+                    onClick={() => openCertificate("view")}
+                  >
+                    {t("review.view", "View")}
+                  </Button>
+                  <Button
+                    size="xs"
+                    variant="light"
+                    leftSection={<IconFileDownload size={14} />}
+                    loading={certificateBusy === "download"}
+                    disabled={Boolean(certificateBusy)}
+                    onClick={() => openCertificate("download")}
+                  >
+                    {t("review.download", "Download")}
+                  </Button>
+                </Group>
+              </Paper>
+            )}
+
             {/* Eligibility, checked and shown — not applied invisibly. */}
             {eligibility.length > 0 && (
               <Paper withBorder p="md">
@@ -1123,7 +1209,15 @@ export function LicenseReviewPage() {
                         <div>
                           <Text size="sm">
                             {inspection.scheduledDate
-                              ? showDate(inspection.scheduledDate)
+                              ? `${showDate(inspection.scheduledDate)}${
+                                  inspection.timeSlot
+                                    ? ` — ${
+                                        inspection.timeSlot === "MORNING"
+                                          ? t("review.morning", "Morning")
+                                          : t("review.afternoon", "Afternoon")
+                                      }`
+                                    : ""
+                                }`
                               : t("review.unscheduled", "Not scheduled")}
                           </Text>
                           {inspection.findings && (
@@ -1307,14 +1401,21 @@ export function LicenseReviewPage() {
       >
         <Stack>
           <AmharicDatePicker
-            label={t("review.dateTime", "Date and time")}
+            label={t("review.date", "Date")}
             value={inspectionDate}
             onChange={setInspectionDate}
-            withTime
+          />
+          <SegmentedControl
+            value={inspectionTimeSlot}
+            onChange={(value) => setInspectionTimeSlot(value as "MORNING" | "AFTERNOON")}
+            data={[
+              { value: "MORNING", label: t("review.morning", "Morning") },
+              { value: "AFTERNOON", label: t("review.afternoon", "Afternoon") },
+            ]}
           />
           <ModalFooter>
             <Tooltip
-              label={t("review.pickDate", "Pick a date and time first")}
+              label={t("review.pickDate", "Pick a date first")}
               disabled={Boolean(inspectionDate)}
             >
               <span>
@@ -1332,6 +1433,7 @@ export function LicenseReviewPage() {
                     await scheduleInspection({
                       applicationId: id,
                       scheduledDate: inspectionDate,
+                      timeSlot: inspectionTimeSlot,
                     }).unwrap();
                     setInspectionOpen(false);
                   },
@@ -1430,6 +1532,60 @@ export function LicenseReviewPage() {
             autosize
             minRows={3}
           />
+          <Stack gap={4}>
+            <Text size="sm" fw={500}>
+              {t("review.findingsEvidence", "Supporting documents")}
+            </Text>
+            <Group gap="xs">
+              {findingsEvidence.flatMap((attachment) =>
+                (attachment.files ?? []).map((file) => (
+                  <ActionIcon
+                    key={file.id}
+                    variant="light"
+                    size="lg"
+                    aria-label={file.originalName}
+                    onClick={() =>
+                      file.url &&
+                      setFindingsPreview({ url: file.url, title: file.originalName })
+                    }
+                  >
+                    <IconEye size={16} />
+                  </ActionIcon>
+                )),
+              )}
+              <FileButton
+                accept="application/pdf,image/jpeg,image/png"
+                onChange={async (file) => {
+                  if (!file || !pendingInspection) return;
+                  setFindingsUploadBusy(true);
+                  await uploadDocument({
+                    ownerType: "INSPECTION",
+                    ownerId: pendingInspection.id,
+                    documentKey: `evidence-${Date.now()}`,
+                    file,
+                  });
+                  setFindingsUploadBusy(false);
+                  refetchFindingsEvidence();
+                }}
+              >
+                {(props) => (
+                  <ActionIcon
+                    {...props}
+                    variant="outline"
+                    size="lg"
+                    disabled={!pendingInspection || findingsUploadBusy}
+                    aria-label={t("review.uploadEvidence", "Upload document")}
+                  >
+                    {findingsUploadBusy ? (
+                      <Loader size={14} type="oval" />
+                    ) : (
+                      <IconPaperclip size={16} />
+                    )}
+                  </ActionIcon>
+                )}
+              </FileButton>
+            </Group>
+          </Stack>
           <ModalFooter grow>
             <ActionIcon
               variant="light"
@@ -1488,6 +1644,20 @@ export function LicenseReviewPage() {
           </ModalFooter>
         </Stack>
       </Modal>
+
+      <PdfPreviewModal
+        opened={Boolean(findingsPreview)}
+        onClose={() => setFindingsPreview(null)}
+        url={findingsPreview?.url ?? ""}
+        title={findingsPreview?.title}
+      />
+
+      <PdfPreviewModal
+        opened={Boolean(certificatePreview)}
+        onClose={() => setCertificatePreview(null)}
+        url={certificatePreview ?? ""}
+        title={t("review.certificate", "Certificate")}
+      />
     </Container>
   );
 }
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index d2ec65d3c..ad4db16a9 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -947,9 +947,14 @@ export const am: Translations = {
     unscheduled: "አልተያዘም",
     inspectionResult: "የምርመራ ውጤት",
     findings: "ግኝቶች",
+    findingsEvidence: "አጋዥ ሰነዶች",
+    uploadEvidence: "ሰነድ መጫን",
     dateTime: "ቀን እና ሰዓት",
+    date: "ቀን",
+    morning: "ጠዋት",
+    afternoon: "ከሰዓት በኋላ",
     schedule: "ያዝ",
-    pickDate: "መጀመሪያ ቀን እና ሰዓት ይምረጡ",
+    pickDate: "መጀመሪያ ቀን ይምረጡ",
     passed: "አልፏል",
     failed: "ወድቋል",
     round_one: "ዙር {{count}}",
@@ -958,6 +963,10 @@ export const am: Translations = {
     linkCopied: "አገናኝ ተቀድቷል",
     actionFailed: "ተግባሩ አልተሳካም",
     errorTitle: "ይህን ማመልከቻ መጫን አልተቻለም",
+    certificate: "ምስክር ወረቀት",
+    view: "ይመልከቱ",
+    download: "አውርድ",
+    certificateError: "ምስክር ወረቀቱን መክፈት አልተቻለም",
     hideActivity: "እንቅስቃሴ ደብቅ",
     showActivity: "እንቅስቃሴ አሳይ",
     awaitingPayment: "አመልካቹ {{amount}} {{currency}} እንዲከፍል በመጠባበቅ ላይ።",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 8697095ce..42b10a8d3 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -955,9 +955,14 @@ export const en = {
     unscheduled: 'Not scheduled',
     inspectionResult: 'Inspection result',
     findings: 'Findings',
+    findingsEvidence: 'Supporting documents',
+    uploadEvidence: 'Upload document',
     dateTime: 'Date and time',
+    date: 'Date',
+    morning: 'Morning',
+    afternoon: 'Afternoon',
     schedule: 'Schedule',
-    pickDate: 'Pick a date and time first',
+    pickDate: 'Pick a date first',
     passed: 'Passed',
     failed: 'Failed',
     round_one: 'round {{count}}',
@@ -966,6 +971,10 @@ export const en = {
     linkCopied: 'Link copied',
     actionFailed: 'Action failed',
     errorTitle: 'Could not load this application',
+    certificate: 'Certificate',
+    view: 'View',
+    download: 'Download',
+    certificateError: 'Could not open the certificate',
     hideActivity: 'Hide activity',
     showActivity: 'Show activity',
     awaitingPayment: 'Waiting for the applicant to pay {{amount}} {{currency}}.',
diff --git a/apps/backoffice/src/app/layouts/nav-config.ts b/apps/backoffice/src/app/layouts/nav-config.ts
index 3878efa3f..845605988 100644
--- a/apps/backoffice/src/app/layouts/nav-config.ts
+++ b/apps/backoffice/src/app/layouts/nav-config.ts
@@ -96,13 +96,13 @@ export const NAV_SECTIONS: NavSection[] = [
     label: 'nav.groupSeafarer',
     items: [
       { to: '/seafarer-registry', label: 'nav.seafarerRegistry', icon: IconUsers, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/seafarer-registrations', label: 'nav.seafarerRegistrationQueue', icon: IconId, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/CERTIFICATE_OF_COMPETENCY', label: 'nav.cocQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
-      { to: '/seaman-book-queue', label: 'nav.seamanBookQueue', icon: IconBook2, permissions: APPLICATION_QUEUE },
-      { to: '/btc-queue', label: 'nav.btcQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/ENDORSEMENT_COC', label: 'nav.endorsementCocQueue', icon: IconRubberStamp, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/ENDORSEMENT_GOC', label: 'nav.endorsementGocQueue', icon: IconRubberStamp, permissions: APPLICATION_QUEUE },
+      { to: '/seafarer-registrations', label: 'nav.seafarerRegistrationQueue', icon: IconId, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/licence-review/type/CERTIFICATE_OF_COMPETENCY', label: 'nav.cocQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/seaman-book-queue', label: 'nav.seamanBookQueue', icon: IconBook2, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/btc-queue', label: 'nav.btcQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/licence-review/type/ENDORSEMENT_COC', label: 'nav.endorsementCocQueue', icon: IconRubberStamp, permissions: [P.VIEW_SEAFARER_REGISTRY] },
+      { to: '/licence-review/type/ENDORSEMENT_GOC', label: 'nav.endorsementGocQueue', icon: IconRubberStamp, permissions: [P.VIEW_SEAFARER_REGISTRY] },
       { to: '/sea-service-verification', label: 'nav.seaServiceVerification', icon: IconAnchor, permissions: [P.VERIFY_SEAFARER_RECORDS] },
       { to: '/medical-verification', label: 'nav.medicalVerification', icon: IconHeart, permissions: [P.VERIFY_SEAFARER_RECORDS] },
     ],
@@ -112,8 +112,8 @@ export const NAV_SECTIONS: NavSection[] = [
     items: [
       { to: '/vessel-registration-report', label: 'nav.vesselRegistrationReport', icon: IconChartBar, permissions: [P.VIEW_VESSEL_REGISTRY] },
       { to: '/vessel-registration-queue', label: 'nav.vesselRegistrationQueue', icon: IconAnchor, permissions: [P.VIEW_VESSEL_REGISTRY] },
-      { to: '/licence-review/type/VESSEL_REGISTRATION', label: 'nav.vesselRegistrationApplicationQueue', icon: IconAnchor, permissions: APPLICATION_QUEUE },
-      { to: '/licence-review/type/VESSEL_OWNERSHIP_TRANSFER', label: 'nav.ownershipTransferQueue', icon: IconArrowsExchange, permissions: APPLICATION_QUEUE },
+      { to: '/licence-review/type/VESSEL_REGISTRATION', label: 'nav.vesselRegistrationApplicationQueue', icon: IconAnchor, permissions: [P.VIEW_VESSEL_REGISTRY] },
+      { to: '/licence-review/type/VESSEL_OWNERSHIP_TRANSFER', label: 'nav.ownershipTransferQueue', icon: IconArrowsExchange, permissions: [P.VIEW_VESSEL_REGISTRY] },
       { to: '/vessel-registration-queue/new', label: 'nav.vesselFormBuilder', icon: IconFilePlus, soon: true, permissions: [P.VIEW_VESSEL_REGISTRY] },
     ],
   },
diff --git a/apps/portal/src/app/providers/AppProviders.tsx b/apps/portal/src/app/providers/AppProviders.tsx
index 886fd7138..ac1b13894 100644
--- a/apps/portal/src/app/providers/AppProviders.tsx
+++ b/apps/portal/src/app/providers/AppProviders.tsx
@@ -21,9 +21,7 @@ export function AppProviders({ children }: { children: ReactNode }) {
             value={{
               appName: 'Portal',
               storagePrefix: 'ema-portal',
-              // Applicants land on the licence list rather than the seafarer
-              // dashboard: signing up here is the first step of applying.
-              loginRedirectPath: '/licensing/applications',
+              loginRedirectPath: '/dashboard',
               enableSignup: true,
               enableForgotPassword: true,
             }}
diff --git a/libs/api/src/lib/features/licensing/licensing-api.ts b/libs/api/src/lib/features/licensing/licensing-api.ts
index 7768628f0..dfccf2a60 100644
--- a/libs/api/src/lib/features/licensing/licensing-api.ts
+++ b/libs/api/src/lib/features/licensing/licensing-api.ts
@@ -436,6 +436,16 @@ export const licensingApi = baseApi
         query: (id) => ({ url: `/licenses/${id}/certificate` }),
       }),
 
+      /**
+       * Same download link, backoffice side. Separate endpoint from
+       * `getCertificateUrl`: the applicant route only ever hands the
+       * certificate to its holder, and an officer reviewing what they just
+       * issued is never the holder.
+       */
+      getCertificateUrlForOfficer: builder.mutation<{ url: string }, string>({
+        query: (id) => ({ url: `/licenses/${id}/certificate-backoffice` }),
+      }),
+
       // ------------------------------------------------------------- review
       getQueue: builder.query<Paginated<LicenseApplication>, QueueFilter | void>({
         query: (params) => ({
@@ -902,7 +912,12 @@ export const licensingApi = baseApi
       // --------------------------------------------------------- inspection
       scheduleInspection: builder.mutation<
         Inspection,
-        { applicationId: string; scheduledDate: string; location?: string }
+        {
+          applicationId: string;
+          scheduledDate: string;
+          timeSlot: 'MORNING' | 'AFTERNOON';
+          location?: string;
+        }
       >({
         query: (body) => ({ url: '/inspections', method: 'POST', body }),
         invalidatesTags: (_r, error, { applicationId }) =>
@@ -980,6 +995,7 @@ export const {
   useGetMyLicensesQuery,
   useGetLicensesQuery,
   useGetCertificateUrlMutation,
+  useGetCertificateUrlForOfficerMutation,
   useGetApplicationPaymentQuery,
   usePatchSectionMutation,
   useAddStaffMutation,
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index a3a47d19b..dc02170b2 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -443,6 +443,8 @@ export interface Inspection {
   inspectorId: string | null;
   inspectorName: string | null;
   scheduledDate: string | null;
+  /** Half-day slot the site visit is booked into. */
+  timeSlot: "MORNING" | "AFTERNOON" | null;
   conductedDate: string | null;
   location: string | null;
   status: "SCHEDULED" | "COMPLETED" | "CANCELLED";
@@ -540,6 +542,13 @@ export type TemplateStatus = "DRAFT" | "PUBLISHED" | "ARCHIVED";
 
 export interface TemplatePageOptions {
   format?: "A4" | "A5" | "Letter" | "Legal";
+  /**
+   * Explicit page dimensions (e.g. "4.92in"), for a size `format` has no
+   * named preset for — an ID-3 passport-booklet page, for one. Takes
+   * precedence over `format` when both are present.
+   */
+  width?: string;
+  height?: string;
   landscape?: boolean;
   printBackground?: boolean;
 }

From 04c68e74c7474189fc3fa82d097680d0deaa282d Mon Sep 17 00:00:00 2001
From: nati14575 <natinigussie7@gmail.com>
Date: Thu, 27 Aug 2026 11:19:09 +0300
Subject: [PATCH 25/27] Update API URL fallback in UserManagementPage to ensure
 local development compatibility

---
 .../src/app/features/user-management/UserManagementPage.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx b/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
index 6a96bba84..a3e3d8f90 100644
--- a/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
+++ b/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
@@ -99,7 +99,11 @@ const UM_CONFIG: DesignConfig = {
 
 const UM_RUNTIME = {
   basename: '/um',
-  apiUrl: import.meta.env.VITE_BASE_API_URL,
+  // Keep the embedded IAM module on the same API as the backoffice client.
+  // When VITE_BASE_API_URL is absent locally, passing undefined makes iamui
+  // fall back to its remote development server, where the local JWT is
+  // rejected and the module redirects to its login page.
+  apiUrl: import.meta.env.VITE_BASE_API_URL ?? 'http://localhost:3000/api',
 };
 
 const buttonStyle: React.CSSProperties = {

From 14508635c58f8e67ea2c5c4875906330e2b0a226 Mon Sep 17 00:00:00 2001
From: nati14575 <natinigussie7@gmail.com>
Date: Thu, 27 Aug 2026 12:07:08 +0300
Subject: [PATCH 26/27] refactor(actions): update action eligibility conditions
 and remove unused actions refactor(i18n): remove 'assignReviewer' translation
 key from Amharic and English locales refactor(nav-config): clean up
 navigation configuration by removing redundant items refactor(licensing-api):
 remove assignReviewer mutation from licensing API feat(package): add build
 script for parallel building of portal and backoffice

---
 .../features/license-review/config/actions.ts    | 16 +++++++++-------
 apps/backoffice/src/app/i18n/locales/am.ts       |  1 -
 apps/backoffice/src/app/i18n/locales/en.ts       |  1 -
 apps/backoffice/src/app/layouts/nav-config.ts    |  7 -------
 .../src/lib/features/licensing/licensing-api.ts  | 13 -------------
 package.json                                     |  1 +
 6 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/config/actions.ts b/apps/backoffice/src/app/features/license-review/config/actions.ts
index 475c7fb9b..8511b7b29 100644
--- a/apps/backoffice/src/app/features/license-review/config/actions.ts
+++ b/apps/backoffice/src/app/features/license-review/config/actions.ts
@@ -212,12 +212,15 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'final-approve',
     tier: 'primary',
     labelKey: 'review.actions.finalApprove',
-    from: ['INSPECTION_COMPLETED',
-      'REVIEW_REPORTED',
-      'INSPECTION_REPORTED', 'UNDER_EVALUATION'],
     // ELIGIBILITY_PAID: an examined certificate (CoC/CoP) is decided straight
     // off the eligibility queue — no assignment step.
-    from: ['INSPECTION_COMPLETED', 'UNDER_EVALUATION', 'ELIGIBILITY_PAID'],
+    from: [
+      'INSPECTION_COMPLETED',
+      'REVIEW_REPORTED',
+      'INSPECTION_REPORTED',
+      'UNDER_EVALUATION',
+      'ELIGIBILITY_PAID',
+    ],
     permissions: ['can:approve:license-application'],
     emphasis: 'filled',
     color: 'teal',
@@ -227,13 +230,12 @@ export const ACTIONS: ActionDefinition[] = [
     id: 'request-adjustment',
     tier: 'primary',
     labelKey: 'review.actions.requestAdjustment',
-    from: ['UNDER_REVIEW', 'UNDER_EVALUATION', 'INSPECTION_COMPLETED',
-      'REVIEW_REPORTED',
-      'INSPECTION_REPORTED'],
     from: [
       'UNDER_REVIEW',
       'UNDER_EVALUATION',
       'INSPECTION_COMPLETED',
+      'REVIEW_REPORTED',
+      'INSPECTION_REPORTED',
       'INSPECTION_FAILED',
       'ELIGIBILITY_PAID',
     ],
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index 94622fa47..feb26b9e8 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -1012,7 +1012,6 @@ export const am: Translations = {
     actions: {
       claim: "ውሰድ",
       assign: "መድብ",
-      assignReviewer: "ግምገማ መድብ",
       reportReview: "ለቡድን መሪ አሳውቅ",
       assignInspector: "ምርመራ መድብ",
       reportInspection: "የምርመራ ውጤት አሳውቅ",
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index e98459f58..79edd53d7 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -1021,7 +1021,6 @@ export const en = {
     actions: {
       claim: 'Claim',
       assign: 'Assign',
-      assignReviewer: 'Assign review',
       reportReview: 'Report to team leader',
       assignInspector: 'Assign inspection',
       reportInspection: 'Report inspection result',
diff --git a/apps/backoffice/src/app/layouts/nav-config.ts b/apps/backoffice/src/app/layouts/nav-config.ts
index 969e7d0f9..d9ba3abee 100644
--- a/apps/backoffice/src/app/layouts/nav-config.ts
+++ b/apps/backoffice/src/app/layouts/nav-config.ts
@@ -96,13 +96,6 @@ export const NAV_SECTIONS: NavSection[] = [
     label: 'nav.groupSeafarer',
     items: [
       { to: '/seafarer-registry', label: 'nav.seafarerRegistry', icon: IconUsers, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/seafarer-registrations', label: 'nav.seafarerRegistrationQueue', icon: IconId, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/licence-review/type/CERTIFICATE_OF_COMPETENCY', label: 'nav.cocQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/seaman-book-queue', label: 'nav.seamanBookQueue', icon: IconBook2, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/btc-queue', label: 'nav.btcQueue', icon: IconShieldCheck, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/licence-review/type/ENDORSEMENT_COC', label: 'nav.endorsementCocQueue', icon: IconRubberStamp, permissions: [P.VIEW_SEAFARER_REGISTRY] },
-      { to: '/licence-review/type/ENDORSEMENT_GOC', label: 'nav.endorsementGocQueue', icon: IconRubberStamp, permissions: [P.VIEW_SEAFARER_REGISTRY] },
       { to: '/seafarer-registrations', label: 'nav.seafarerRegistrationQueue', icon: IconId, permissions: APPLICATION_QUEUE },
       { to: '/licence-review/type/CERTIFICATE_OF_COMPETENCY', label: 'nav.cocQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
       { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck, permissions: APPLICATION_QUEUE },
diff --git a/libs/api/src/lib/features/licensing/licensing-api.ts b/libs/api/src/lib/features/licensing/licensing-api.ts
index 2467979fa..d6c518fd2 100644
--- a/libs/api/src/lib/features/licensing/licensing-api.ts
+++ b/libs/api/src/lib/features/licensing/licensing-api.ts
@@ -860,19 +860,6 @@ export const licensingApi = baseApi
        * flight; these two *start* a stage, because under the push model
        * assignment is how work begins — nothing is claimed from a queue.
        */
-      assignReviewer: builder.mutation<
-        LicenseApplication,
-        { id: string; officerId: string; remark?: string }
-      >({
-        query: ({ id, ...body }) => ({
-          url: `/license-application-review/${id}/assign-reviewer`,
-          method: 'POST',
-          body,
-        }),
-        invalidatesTags: (_r, error, { id }) =>
-          error ? [] : [itemTag('LicenseApplication', id), listTag('ApplicationQueue')],
-      }),
-
       assignInspector: builder.mutation<
         LicenseApplication,
         { id: string; inspectorId: string; remark?: string }
diff --git a/package.json b/package.json
index de6d7a558..b8cf8ec94 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "backoffice": "nx serve @ema-platform/backoffice",
     "portal": "nx serve @ema-platform/portal",
     "dev:all": "nx run-many -t serve -p @ema-platform/portal @ema-platform/backoffice --parallel=2",
+    "build": "nx run-many -t build -p @ema-platform/portal @ema-platform/backoffice",
     "build:backoffice": "nx build @ema-platform/backoffice",
     "build:portal": "nx build @ema-platform/portal",
     "lint": "nx run-many -t lint",

From 12ffa72cb254d437e114abe3d0fae88002cd8ea4 Mon Sep 17 00:00:00 2001
From: mihretue <mihretuendeshaw84@gmail.com>
Date: Thu, 27 Aug 2026 13:10:46 +0000
Subject: [PATCH 27/27] fix(exam): gate Take Exam on confirmed attendance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The registrations table mirrored the server's old attendance deny-list —
ABSENT/WITHDRAWN/DISQUALIFIED — so the default REGISTERED fell through and
"Take exam" appeared before any invigilator had confirmed the candidate was
there. It is an allow-list now, PRESENT and LATE only, matching
ExamAttemptService.MAY_SIT.

A blocked candidate gets a reason rather than an empty cell: "Awaiting
attendance" with a tooltip while nobody has called the register, "Not sitting"
once attendance was taken and they are not. useExamAttempt does the same for
the direct-link path, and translates attendance_not_confirmed /
candidate_not_present instead of showing a raw error key on a Start button
that cannot work. The server refuses either way — this only makes the refusal
legible.

ScheduleExamModal no longer promises an admission number: scheduling makes a
sitting available, and the candidate registers for it themselves.
---
 .../components/ScheduleExamModal.tsx          |  7 ++--
 .../exam-attempt/hooks/useExamAttempt.ts      | 25 +++++++++++++-
 .../exams/pages/ExamsPage/columns.tsx         | 34 ++++++++++++++++---
 apps/portal/src/app/i18n/locales/am.ts        |  4 +++
 apps/portal/src/app/i18n/locales/en.ts        |  4 +++
 5 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/apps/backoffice/src/app/features/license-review/components/ScheduleExamModal.tsx b/apps/backoffice/src/app/features/license-review/components/ScheduleExamModal.tsx
index 641ffc864..320f5a6e2 100644
--- a/apps/backoffice/src/app/features/license-review/components/ScheduleExamModal.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/ScheduleExamModal.tsx
@@ -22,6 +22,9 @@ interface Props {
  * of a per-candidate appointment. Scoped to sittings whose certification
  * matches this application's rank, so a Chief Mate candidate cannot be seated
  * into an OOW Deck sitting by accident.
+ *
+ * Scheduling makes the sitting available; it does not register the candidate.
+ * That is their own act, from the portal's Register button.
  */
 export function ScheduleExamModal({
   opened,
@@ -61,7 +64,7 @@ export function ScheduleExamModal({
         <Text size="sm" c="dimmed">
           {t('review.scheduleExam.intro', {
             defaultValue:
-              'Assign {{applicant}} to a scheduled sitting. They will be notified with the date and their admission number.',
+              'Make a sitting available to {{applicant}}. They register for it themselves from the portal.',
             applicant: applicantName,
           })}
         </Text>
@@ -89,7 +92,7 @@ export function ScheduleExamModal({
         <Text size="xs" c="dimmed">
           {t(
             'review.scheduleExam.admissionHint',
-            'An admission number is issued automatically when the candidate is seated.',
+            'Scheduling does not seat the candidate. They must register for the sitting from the portal, and the admission number is issued then.',
           )}
         </Text>
 
diff --git a/apps/portal/src/app/features/exam-attempt/hooks/useExamAttempt.ts b/apps/portal/src/app/features/exam-attempt/hooks/useExamAttempt.ts
index e671dba76..baa445600 100644
--- a/apps/portal/src/app/features/exam-attempt/hooks/useExamAttempt.ts
+++ b/apps/portal/src/app/features/exam-attempt/hooks/useExamAttempt.ts
@@ -9,6 +9,9 @@ import type {
   SaveState,
 } from '../types/exam-attempt';
 
+/** Mirrors the server's allow-list (ExamAttemptService.MAY_SIT). */
+const MAY_SIT = ['PRESENT', 'LATE'];
+
 const ESSAY_DEBOUNCE_MS = 1500;
 
 type ViewState = 'loading' | 'not-started' | 'taking' | 'completed' | 'error';
@@ -83,6 +86,19 @@ export function useExamAttempt(examId: string | undefined) {
       setErrorMessage('You are not registered for this examination.');
       return;
     }
+    // Attendance gates the sitting, and the exam list already hides "Take
+    // exam" for these — this is the direct-link path. The server refuses
+    // either way (ExamAttemptService.MAY_SIT); this only makes the refusal
+    // legible instead of a raw error key on a Start button that never works.
+    if (!MAY_SIT.includes(registration.attendanceStatus)) {
+      setViewState('error');
+      setErrorMessage(
+        registration.attendanceStatus === 'REGISTERED'
+          ? 'An invigilator must confirm you are present before this exam opens.'
+          : 'Your attendance record does not permit sitting this examination.',
+      );
+      return;
+    }
     if (mineData) {
       seedFrom(mineData);
       return;
@@ -200,7 +216,14 @@ export function useExamAttempt(examId: string | undefined) {
       }).unwrap();
       seedFrom(result);
     } catch (error) {
-      notify.error(extractErrorMessage(error, 'Could not start the exam.'));
+      const key = extractErrorMessage(error, 'Could not start the exam.');
+      notify.error(
+        key === 'attendance_not_confirmed'
+          ? 'An invigilator must confirm you are present before this exam opens.'
+          : key === 'candidate_not_present'
+            ? 'Your attendance record does not permit sitting this examination.'
+            : key,
+      );
     }
   }, [examId, startTrigger, seedFrom]);
 
diff --git a/apps/portal/src/app/features/exams/pages/ExamsPage/columns.tsx b/apps/portal/src/app/features/exams/pages/ExamsPage/columns.tsx
index 06cf8a4f6..652e72fc3 100644
--- a/apps/portal/src/app/features/exams/pages/ExamsPage/columns.tsx
+++ b/apps/portal/src/app/features/exams/pages/ExamsPage/columns.tsx
@@ -1,4 +1,4 @@
-import { Badge, Button, Text } from '@mantine/core';
+import { Badge, Button, Text, Tooltip } from '@mantine/core';
 import { IconFileText, IconGavel, IconPlayerPlay } from '@tabler/icons-react';
 import type { TFunction } from 'i18next';
 import type { AdvancedColumn } from '@ema-platform/ui';
@@ -20,7 +20,14 @@ const ATTENDANCE_COLOR: Record<AttendanceStatus, string> = {
   DISQUALIFIED: 'red',
 };
 
-const NOT_SITTING: AttendanceStatus[] = ['ABSENT', 'WITHDRAWN', 'DISQUALIFIED'];
+/**
+ * Attendance rulings that permit sitting the paper — an allow-list mirroring
+ * the server's (ExamAttemptService.MAY_SIT). The deny-list this replaced named
+ * only ABSENT/WITHDRAWN/DISQUALIFIED, so the default REGISTERED fell through
+ * and "Take exam" appeared before any invigilator had confirmed the candidate
+ * was there. LATE counts: a late arrival is present, just not on time.
+ */
+const MAY_SIT: AttendanceStatus[] = ['PRESENT', 'LATE'];
 
 export function registrationColumns(
   t: TFunction,
@@ -115,9 +122,26 @@ export function registrationColumns(
             </Badge>
           );
         }
-        const eligible =
-          exam?.status === 'ACTIVE' && !NOT_SITTING.includes(row.original.attendanceStatus);
-        if (!eligible || !deps.can([PORTAL_PERMISSIONS.APPLY_EXAM])) return null;
+        if (!deps.can([PORTAL_PERMISSIONS.APPLY_EXAM])) return null;
+        // Say why the exam is shut rather than rendering an empty cell: the
+        // candidate is waiting on an invigilator, and silence reads as a bug.
+        if (row.original.attendanceStatus === 'REGISTERED') {
+          return (
+            <Tooltip label={t('exams.columns.awaitingAttendanceHint')} multiline w={240}>
+              <Badge size="sm" variant="light" color="gray">
+                {t('exams.columns.awaitingAttendance')}
+              </Badge>
+            </Tooltip>
+          );
+        }
+        if (!MAY_SIT.includes(row.original.attendanceStatus)) {
+          return (
+            <Badge size="sm" variant="light" color="orange">
+              {t('exams.columns.notSitting')}
+            </Badge>
+          );
+        }
+        if (exam?.status !== 'ACTIVE') return null;
         return (
           <Button
             size="compact-xs"
diff --git a/apps/portal/src/app/i18n/locales/am.ts b/apps/portal/src/app/i18n/locales/am.ts
index 0ecee5cda..fabde4809 100644
--- a/apps/portal/src/app/i18n/locales/am.ts
+++ b/apps/portal/src/app/i18n/locales/am.ts
@@ -978,6 +978,10 @@ export const am: Translations = {
       timeExpired: 'ጊዜው አልቋል',
       resumeExam: 'ፈተና ይቀጥሉ',
       takeExam: 'ፈተና ይውሰዱ',
+      awaitingAttendance: 'መገኘት በመጠባበቅ ላይ',
+      awaitingAttendanceHint:
+        'ፈተናው ከመከፈቱ በፊት ተቆጣጣሪ መገኘትዎን ማረጋገጥ አለበት።',
+      notSitting: 'አይፈተኑም',
       attendanceStatus: {
         REGISTERED: 'አልተጠራም',
         PRESENT: 'ተገኝቷል',
diff --git a/apps/portal/src/app/i18n/locales/en.ts b/apps/portal/src/app/i18n/locales/en.ts
index 57fe394f3..77c72eb88 100644
--- a/apps/portal/src/app/i18n/locales/en.ts
+++ b/apps/portal/src/app/i18n/locales/en.ts
@@ -980,6 +980,10 @@ export const en = {
       timeExpired: 'Time expired',
       resumeExam: 'Resume exam',
       takeExam: 'Take exam',
+      awaitingAttendance: 'Awaiting attendance',
+      awaitingAttendanceHint:
+        'An invigilator must confirm you are present before the exam opens.',
+      notSitting: 'Not sitting',
       attendanceStatus: {
         REGISTERED: 'Not called',
         PRESENT: 'Present',