diff --git a/README.md b/README.md
index b3f5e9696..361b9afd8 100644
--- a/README.md
+++ b/README.md
@@ -37,8 +37,8 @@ emaui/
 ```
 
 ### libs/api
-- `base-api/` — RTK Query `createApi` instance with `prepareHeaders` that injects the Bearer token from Redux state or localStorage.
-- `session/` — `resolveTokenFromStorage()` reads from `localStorage` keys or `auth-token` cookie. `resolveSessionContext()` merges Redux state token with storage fallback.
+- `base-api/` — RTK Query `createApi` instance with `prepareHeaders` that injects the Bearer token from Redux state or storage.
+- `session/` — `resolveTokenFromStorage()` reads the `auth-token` cookie first, falling back to `localStorage` for legacy pre-migration sessions. `resolveSessionContext()` merges Redux state token with storage fallback.
 - `query-and-mutation/` — Generic `useApiQuery` / `useApiMutation` wrappers for one-off API calls without defining a dedicated endpoint file.
 
 ### libs/ui
@@ -55,10 +55,10 @@ emaui/
 
 1. User submits the login form (LoginForm / LoginPage).
 2. The form calls the `login` RTK Query mutation (backoffice) or a plain `fetch` (portal).
-3. On success, `loginSuccess` action is dispatched → Redux `auth` slice stores `token` and `user`; `authStorage.setToken()` persists the token to `localStorage`.
+3. On success, `loginSuccess` action is dispatched → Redux `auth` slice stores `token` and `user`; `authStorage.setToken()` persists the token to a cookie (both apps call `configureAuthStorage(prefix, true)`).
 4. `baseApi`'s `prepareHeaders` reads the token via `resolveSessionContext(getState())` and attaches `Authorization: Bearer <token>` to every RTK Query request.
-5. `ProtectedRoute` checks `localStorage` for the token key on every navigation — if absent, redirects to `/login`.
-6. `logout` action clears Redux state and calls `authStorage.clear()` to remove all localStorage keys.
+5. `ProtectedRoute` checks `authStorage`/the token cookie on every navigation — if absent, redirects to `/login`.
+6. `logout` action clears Redux state and calls `authStorage.clear()` to remove all auth cookies.
 
 ---
 
@@ -90,6 +90,8 @@ npm run dev:all
 |---|---|---|---|
 | `VITE_BASE_API_URL` | Yes | `http://localhost:3000` | Base URL for all API requests |
 | `VITE_ENABLE_DEVELOPER_TOOLS` | No | `true` | Toggle Redux DevTools |
+| `VITE_PAYMENT_API_URL` | Yes (portal) | — | Base URL for the payment service (portal `payment` feature). Can be a same-origin path if a backend proxy is later placed in front of it |
+| `VITE_PAYMENT_SERVICE_TOKEN` | Yes (portal) | — | Sent as `x-service-token` on every payment request. Note: bundled `VITE_*` values are public in the built app, not secret |
 | `PORTAL_PORT` | No | `4200` | Docker host port for portal |
 | `BACKOFFICE_PORT` | No | `4201` | Docker host port for backoffice |
 
diff --git a/apps/backoffice/src/app/features/analytics/pages/api/analytics-api.ts b/apps/backoffice/src/app/features/analytics/pages/api/analytics-api.ts
new file mode 100644
index 000000000..67f2a62fe
--- /dev/null
+++ b/apps/backoffice/src/app/features/analytics/pages/api/analytics-api.ts
@@ -0,0 +1,2 @@
+// Analytics API - Coming soon
+// test from claude
diff --git a/apps/backoffice/src/app/features/analytics/pages/types/analytics.ts b/apps/backoffice/src/app/features/analytics/pages/types/analytics.ts
new file mode 100644
index 000000000..ee0d73141
--- /dev/null
+++ b/apps/backoffice/src/app/features/analytics/pages/types/analytics.ts
@@ -0,0 +1 @@
+// Analytics types - Coming soon
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 46b801648..9f47684df 100644
--- a/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
+++ b/apps/backoffice/src/app/features/certificate-designer/pages/CertificateDesignerPage.tsx
@@ -39,12 +39,13 @@ import {
   useGetLicenseTemplatesQuery,
   useGetLicenseTypesQuery,
   useGetTemplateVariablesQuery,
+  useLocalized,
   usePublishLicenseTemplateMutation,
   useUpdateLicenseValidityMutation,
   useUpdateLicenseTemplateMutation,
   type LicenseTemplate,
 } from '@ema-platform/api';
-import { EmptyState, ErrorState, PageHeader } from '@ema-platform/ui';
+import { EmptyState, ErrorState, ModalFooter, PageHeader } from '@ema-platform/ui';
 import { authStorage, usePermissions } from '@ema-platform/auth';
 import { PERMISSIONS } from '../../../layouts/nav-config';
 
@@ -70,6 +71,7 @@ const STATUS_COLOR: Record<LicenseTemplate['status'], string> = {
  */
 export function CertificateDesignerPage() {
   const { t } = useTranslation();
+  const localized = useLocalized();
   const { can } = usePermissions();
 
   const canEdit = can([PERMISSIONS.UPDATE_TEMPLATE]);
@@ -226,7 +228,7 @@ export function CertificateDesignerPage() {
           label={t('designer.licenceType', 'Licence type')}
           data={(licenseTypes?.items ?? []).map((type) => ({
             value: type.id,
-            label: type.name?.en ?? type.key,
+            label: localized(type.name) || type.key,
           }))}
           value={typeId}
           onChange={(value) => {
@@ -529,7 +531,7 @@ export function CertificateDesignerPage() {
               'Starts from the live design, or the built-in layout if this type has none.',
             )}
           </Text>
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={() => setNewOpen(false)}>
               {t('common.cancel', 'Cancel')}
             </Button>
@@ -550,7 +552,7 @@ export function CertificateDesignerPage() {
             >
               {t('designer.create', 'Create')}
             </Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
     </Container>
diff --git a/apps/backoffice/src/app/features/certification/pages/CertificationPage.tsx b/apps/backoffice/src/app/features/certification/pages/CertificationPage.tsx
index d59296ad9..88fdbe449 100644
--- a/apps/backoffice/src/app/features/certification/pages/CertificationPage.tsx
+++ b/apps/backoffice/src/app/features/certification/pages/CertificationPage.tsx
@@ -4,22 +4,19 @@ import {
   Title,
   Group,
   Button,
-  Table,
   Badge,
   ActionIcon,
   Modal,
   Text,
   TextInput,
   Textarea,
-  Paper,
-  Loader,
-  Center,
+  Card,
   Alert,
 } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { useTranslation } from 'react-i18next';
 import { IconEdit, IconTrash, IconPlus, IconInfoCircle, IconCertificate } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler, AdvancedTable, useServerTable, ModalFooter, type AdvancedColumn } from '@ema-platform/ui';
 import {
   useGetCertificationsQuery,
   useCreateCertificationMutation,
@@ -55,27 +52,29 @@ function CertificationForm({
   };
 
   return (
-    <Paper p="md" withBorder mb="md" radius="md">
+    <Modal opened onClose={onCancel} title={editing ? t('certification.update') : t('certification.add')} size="md">
       <form onSubmit={handleSubmit}>
         <Stack gap="sm">
           <TextInput label={t('certification.form.nameEn')} placeholder={t('certification.form.nameEnPlaceholder')} value={nameEn} onChange={(e) => setNameEn(e.currentTarget.value)} size="sm" required />
           <TextInput label={t('certification.form.nameAm')} placeholder={t('certification.form.nameAmPlaceholder')} value={nameAm} onChange={(e) => setNameAm(e.currentTarget.value)} size="sm" required />
           <Textarea label={t('certification.form.descEn')} placeholder={t('certification.form.descEnPlaceholder')} value={descEn} onChange={(e) => setDescEn(e.currentTarget.value)} size="sm" autosize minRows={2} />
           <Textarea label={t('certification.form.descAm')} placeholder={t('certification.form.descAmPlaceholder')} value={descAm} onChange={(e) => setDescAm(e.currentTarget.value)} size="sm" autosize minRows={2} />
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={onCancel} size="sm">{t('certification.cancel')}</Button>
             <Button type="submit" size="sm" loading={isSubmitting}>{editing ? t('certification.update') : t('certification.create')}</Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </form>
-    </Paper>
+    </Modal>
   );
 }
 
 export function CertificationPage() {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
-  const { data, isLoading, isError } = useGetCertificationsQuery();
+  const { handleError } = useErrorHandler();
+  const { data, isFetching, isError, refetch } = useGetCertificationsQuery();
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [createCert, { isLoading: isCreating }] = useCreateCertificationMutation();
   const [updateCert, { isLoading: isUpdating }] = useUpdateCertificationMutation();
   const [deleteCert] = useDeleteCertificationMutation();
@@ -104,8 +103,8 @@ export function CertificationPage() {
         notify.success(t('certification.created'));
       }
       resetForm();
-    } catch {
-      notify.error(t('certification.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
@@ -116,14 +115,49 @@ export function CertificationPage() {
       notify.success(t('certification.deleted'));
       closeDelete();
       setDeleteTarget(null);
-    } catch {
-      notify.error(t('certification.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
-  if (isLoading) return <Center py="xl"><Loader /></Center>;
   if (isError) return <Alert icon={<IconInfoCircle size={16} />} color="red" title={t('certification.loadError')} />;
 
+  const columns: AdvancedColumn<Certification>[] = [
+    {
+      header: t('certification.columns.name'),
+      cell: ({ row }) => <Text fz="sm" fw={500}>{row.original.name[locale]}</Text>,
+    },
+    {
+      header: t('certification.columns.description'),
+      cell: ({ row }) => <Text fz="sm" lineClamp={2} maw={250}>{row.original.description[locale]}</Text>,
+    },
+    {
+      header: t('certification.columns.status'),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={row.original.isActive ? 'teal' : 'gray'}>
+          {row.original.isActive ? t('certification.status.active') : t('certification.status.inactive')}
+        </Badge>
+      ),
+    },
+    {
+      header: '',
+      label: t('certification.columns.actions', 'Actions'),
+      size: 90,
+      cell: ({ row }) => (
+        <Group gap="xs">
+          <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => { setEditing(row.original); setShowForm(true); }}>
+            <IconEdit size={14} />
+          </ActionIcon>
+          <ActionIcon variant="subtle" color="red" size="sm" onClick={() => { setDeleteTarget(row.original); openDelete(); }}>
+            <IconTrash size={14} />
+          </ActionIcon>
+        </Group>
+      ),
+    },
+  ];
+
+  const page = paginate(certifications);
+
   return (
     <Stack gap="lg">
       <Group justify="space-between" align="flex-end">
@@ -147,57 +181,28 @@ export function CertificationPage() {
         />
       )}
 
-      <Paper withBorder radius="md">
-        <Table striped highlightOnHover>
-          <Table.Thead bg="var(--mantine-color-default-hover)">
-            <Table.Tr>
-              <Table.Th>{t('certification.columns.name')}</Table.Th>
-              <Table.Th>{t('certification.columns.description')}</Table.Th>
-              <Table.Th>{t('certification.columns.status')}</Table.Th>
-              <Table.Th />
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>
-            {certifications.map((cert) => (
-              <Table.Tr key={cert.id}>
-                <Table.Td><Text fz="sm" fw={500}>{cert.name[locale]}</Text></Table.Td>
-                <Table.Td>
-                  <Text fz="sm" lineClamp={2} maw={250}>{cert.description[locale]}</Text>
-                </Table.Td>
-                <Table.Td>
-                  <Badge size="sm" variant="light" color={cert.isActive ? 'teal' : 'gray'}>
-                    {cert.isActive ? t('certification.status.active') : t('certification.status.inactive')}
-                  </Badge>
-                </Table.Td>
-                <Table.Td>
-                  <Group gap="xs">
-                    <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => { setEditing(cert); setShowForm(true); }}>
-                      <IconEdit size={14} />
-                    </ActionIcon>
-                    <ActionIcon variant="subtle" color="red" size="sm" onClick={() => { setDeleteTarget(cert); openDelete(); }}>
-                      <IconTrash size={14} />
-                    </ActionIcon>
-                  </Group>
-                </Table.Td>
-              </Table.Tr>
-            ))}
-            {certifications.length === 0 && (
-              <Table.Tr>
-                <Table.Td colSpan={4}>
-                  <Text c="dimmed" ta="center" py="xl">{t('certification.noItems')}</Text>
-                </Table.Td>
-              </Table.Tr>
-            )}
-          </Table.Tbody>
-        </Table>
-      </Paper>
+      <Card withBorder padding={0}>
+        <AdvancedTable
+          columns={columns}
+          data={page.rows}
+          tableName={t('certification.title')}
+          itemCount={page.itemCount}
+          pageIndex={page.pageIndex}
+          onPageChange={setPageIndex}
+          pageSize={pageSize}
+          onPageSizeChange={setPageSize}
+          refresh={refetch}
+          isLoading={isFetching}
+          emptyText={t('certification.noItems')}
+        />
+      </Card>
 
       <Modal opened={deleteOpened} onClose={closeDelete} title={t('certification.confirmDelete')} size="sm">
         <Text mb="md">{t('certification.deleteConfirmText', { name: deleteTarget?.name?.[locale] })}</Text>
-        <Group justify="flex-end">
+        <ModalFooter>
           <Button variant="default" onClick={closeDelete} size="sm">{t('certification.cancel')}</Button>
           <Button color="red" onClick={handleDelete} size="sm">{t('certification.delete')}</Button>
-        </Group>
+        </ModalFooter>
       </Modal>
     </Stack>
   );
diff --git a/apps/backoffice/src/app/features/configuration/api/configuration-api.ts b/apps/backoffice/src/app/features/configuration/api/configuration-api.ts
index 678e78cfb..93a728f1e 100644
--- a/apps/backoffice/src/app/features/configuration/api/configuration-api.ts
+++ b/apps/backoffice/src/app/features/configuration/api/configuration-api.ts
@@ -1,38 +1,40 @@
-import { baseApi } from '@ema-platform/api';
+import { baseApi } from "@ema-platform/api";
 import type {
   Organization,
   Profession,
   ListResponse,
   CreateProfessionPayload,
   UpdateProfessionPayload,
-} from '../types/configuration';
+} from "../types/configuration";
 
 const configurationApi = baseApi.injectEndpoints({
   endpoints: (builder) => ({
     getOrganizations: builder.query<ListResponse<Organization>, void>({
-      query: () => '/organizations',
-      providesTags: ['Api'],
+      query: () => "/organizations",
+      providesTags: ["Api"],
     }),
 
-    getProfessions: builder.query<ListResponse<Profession>, void>({
-      query: () => '/professions',
-      providesTags: ['Api'],
+    getProfessions: builder.query<ListResponse<Profession>, string>({
+      query: (params) => ({
+        url: `/professions?q=${encodeURIComponent(params)}`,
+      }),
+      providesTags: ["Api", "backOfficeApi", "ProfessionApi"],
     }),
     createProfession: builder.mutation<Profession, CreateProfessionPayload>({
-      query: (body) => ({ url: '/professions', method: 'POST', body }),
-      invalidatesTags: ['Api'],
+      query: (body) => ({ url: "/professions", method: "POST", body }),
+      invalidatesTags: ["Api"],
     }),
     updateProfession: builder.mutation<Profession, UpdateProfessionPayload>({
       query: ({ id, ...body }) => ({
         url: `/professions/${id}`,
-        method: 'PUT',
+        method: "PUT",
         body,
       }),
-      invalidatesTags: ['Api'],
+      invalidatesTags: ["Api"],
     }),
     deleteProfession: builder.mutation<void, string>({
-      query: (id) => ({ url: `/professions/${id}`, method: 'DELETE' }),
-      invalidatesTags: ['Api'],
+      query: (id) => ({ url: `/professions/${id}`, method: "DELETE" }),
+      invalidatesTags: ["Api"],
     }),
   }),
   overrideExisting: true,
diff --git a/apps/backoffice/src/app/features/configuration/pages/ConfigurationPage.tsx b/apps/backoffice/src/app/features/configuration/pages/ConfigurationPage.tsx
index 17902ca67..c270c3cf3 100644
--- a/apps/backoffice/src/app/features/configuration/pages/ConfigurationPage.tsx
+++ b/apps/backoffice/src/app/features/configuration/pages/ConfigurationPage.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback } from "react";
 import {
   Stack,
   Title,
@@ -7,31 +7,44 @@ import {
   Button,
   TextInput,
   Textarea,
-  Table,
   ActionIcon,
   Modal,
   Text,
   Select,
-  Paper,
   Loader,
   Center,
   Alert,
-} from '@mantine/core';
-import { useForm } from '@mantine/form';
-import { useDisclosure } from '@mantine/hooks';
-import { IconEdit, IconTrash, IconPlus, IconBriefcase, IconMap, IconCertificate, IconInfoCircle } from '@tabler/icons-react';
-import { useTranslation } from 'react-i18next';
-import { notify } from '@ema-platform/ui';
-import { LocationPage } from '../../location/pages/LocationPage';
-import { CertificationPage } from '../../certification/pages/CertificationPage';
+} from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { useDisclosure } from "@mantine/hooks";
+import {
+  IconEdit,
+  IconTrash,
+  IconPlus,
+  IconBriefcase,
+  IconMap,
+  IconCertificate,
+  IconInfoCircle,
+} from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import {
+  notify,
+  useErrorHandler,
+  AdvancedTable,
+  useServerTable,
+  ModalFooter,
+  type AdvancedColumn,
+} from "@ema-platform/ui";
+import { LocationPage } from "../../location/pages/LocationPage";
+import { CertificationPage } from "../../certification/pages/CertificationPage";
 import {
   useGetOrganizationsQuery,
   useGetProfessionsQuery,
   useCreateProfessionMutation,
   useUpdateProfessionMutation,
   useDeleteProfessionMutation,
-} from '../api/configuration-api';
-import type { Profession } from '../types/configuration';
+} from "../api/configuration-api";
+import type { Profession } from "../types/configuration";
 
 interface ProfFormValues {
   nameEn: string;
@@ -49,14 +62,27 @@ interface ProfFormProps {
   onCancel: () => void;
 }
 
-function ProfessionForm({ editingProf, deptOptions, isSubmitting, onSubmit, onCancel }: ProfFormProps) {
+function ProfessionForm({
+  editingProf,
+  deptOptions,
+  isSubmitting,
+  onSubmit,
+  onCancel,
+}: ProfFormProps) {
   const { t } = useTranslation();
   const form = useForm<ProfFormValues>({
-    initialValues: { nameEn: '', nameAm: '', descEn: '', descAm: '', departmentId: '' },
+    initialValues: {
+      nameEn: "",
+      nameAm: "",
+      descEn: "",
+      descAm: "",
+      departmentId: "",
+    },
     validate: {
-      nameEn: (v) => (!v ? t('configuration.validation.nameEnRequired') : null),
-      nameAm: (v) => (!v ? t('configuration.validation.nameAmRequired') : null),
-      departmentId: (v) => (!v ? t('configuration.validation.departmentRequired') : null),
+      nameEn: (v) => (!v ? t("configuration.validation.nameEnRequired") : null),
+      nameAm: (v) => (!v ? t("configuration.validation.nameAmRequired") : null),
+      departmentId: (v) =>
+        !v ? t("configuration.validation.departmentRequired") : null,
     },
   });
 
@@ -65,90 +91,125 @@ function ProfessionForm({ editingProf, deptOptions, isSubmitting, onSubmit, onCa
       form.setValues({
         nameEn: editingProf.name.en,
         nameAm: editingProf.name.am,
-        descEn: editingProf.description.en ?? '',
-        descAm: editingProf.description.am ?? '',
+        descEn: editingProf.description.en ?? "",
+        descAm: editingProf.description.am ?? "",
         departmentId: editingProf.departmentId,
       });
     }
   }, [editingProf]);
 
-  const handleSubmit = form.onSubmit((values) => onSubmit(values, !!editingProf));
+  const handleSubmit = form.onSubmit((values) =>
+    onSubmit(values, !!editingProf),
+  );
 
   return (
-    <Paper p="md" withBorder mb="md" radius="md">
+    <Modal
+      opened
+      onClose={onCancel}
+      title={
+        editingProf
+          ? t("configuration.update")
+          : t("configuration.addProfession")
+      }
+      size="md"
+    >
       <form onSubmit={handleSubmit}>
         <Stack gap="sm">
           <TextInput
-            label={t('configuration.nameEn')}
+            label={t("configuration.nameEn")}
             placeholder="English name"
-            {...form.getInputProps('nameEn')}
+            {...form.getInputProps("nameEn")}
             size="sm"
           />
           <TextInput
-            label={t('configuration.nameAm')}
+            label={t("configuration.nameAm")}
             placeholder="የአማርኛ ስም"
-            {...form.getInputProps('nameAm')}
+            {...form.getInputProps("nameAm")}
             size="sm"
           />
           <Textarea
-            label={t('configuration.descEn')}
+            label={t("configuration.descEn")}
             placeholder="English description"
-            {...form.getInputProps('descEn')}
+            {...form.getInputProps("descEn")}
             size="sm"
             autosize
             minRows={2}
           />
           <Textarea
-            label={t('configuration.descAm')}
+            label={t("configuration.descAm")}
             placeholder="የአማርኛ መግለጫ"
-            {...form.getInputProps('descAm')}
+            {...form.getInputProps("descAm")}
             size="sm"
             autosize
             minRows={2}
           />
           <Select
-            label={t('configuration.department')}
-            placeholder={t('configuration.selectDepartment')}
+            label={t("configuration.department")}
+            placeholder={t("configuration.selectDepartment")}
             data={deptOptions}
-            {...form.getInputProps('departmentId')}
+            {...form.getInputProps("departmentId")}
             size="sm"
             searchable
           />
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={onCancel} size="sm">
-              {t('configuration.cancel')}
+              {t("configuration.cancel")}
             </Button>
             <Button type="submit" size="sm" loading={isSubmitting}>
-              {editingProf ? t('configuration.update') : t('configuration.create')}
+              {editingProf
+                ? t("configuration.update")
+                : t("configuration.create")}
             </Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </form>
-    </Paper>
+    </Modal>
   );
 }
 
 function ProfessionTab() {
   const { t, i18n } = useTranslation();
-  const locale = i18n.language as 'en' | 'am';
+  const locale = i18n.language as "en" | "am";
+  const { handleError } = useErrorHandler();
   const { data: deptRes } = useGetOrganizationsQuery();
-  const { data: profRes, isLoading, isError } = useGetProfessionsQuery();
-  const [createProfession, { isLoading: isCreating }] = useCreateProfessionMutation();
-  const [updateProfession, { isLoading: isUpdating }] = useUpdateProfessionMutation();
+  const { pageIndex, setPageIndex, setQ, pageSize, setPageSize, skip, take } =
+    useServerTable({
+      pageSize: 10,
+    });
+  const {
+    data: profRes,
+    isLoading,
+    isFetching,
+    isError,
+    refetch,
+  } = useGetProfessionsQuery(
+    `skip:${skip},take:${take},orderBy:createdAt:DESC`,
+  );
+  const [createProfession, { isLoading: isCreating }] =
+    useCreateProfessionMutation();
+  const [updateProfession, { isLoading: isUpdating }] =
+    useUpdateProfessionMutation();
   const [deleteProfession] = useDeleteProfessionMutation();
 
   const departments = Array.isArray(deptRes) ? deptRes : (deptRes?.items ?? []);
+  // Server now paginates, so the previous client-side `isActive` filter is
+  // dropped (it would hide rows outside just this page). Restore it via a
+  // server-side `q` filter once the backend field name is confirmed.
   const professions = profRes?.items ?? [];
+  const totalCount = profRes?.total ?? profRes?.count ?? professions.length;
 
   const [editingProf, setEditingProf] = useState<Profession | null>(null);
   const [showProfForm, setShowProfForm] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState<Profession | null>(null);
-  const [deleteOpened, { open: openDelete, close: closeDelete }] = useDisclosure(false);
+  const [deleteOpened, { open: openDelete, close: closeDelete }] =
+    useDisclosure(false);
 
-  const deptOptions = departments.filter((d) => d?.status?.toLowerCase() === 'active').map((d) => ({
-    value: d.id,
-    label: d.name?.[locale] ?? d.name ?? '',
-  }));
+  const deptOptions = departments
+    .filter((d) => d?.status?.toLowerCase() === "active")
+    .map((d) => ({
+      value: d.id,
+      label: d.name?.[locale] ?? d.name ?? "",
+    }));
 
   const resetProfForm = useCallback(() => {
     setEditingProf(null);
@@ -160,67 +221,136 @@ function ProfessionTab() {
     setShowProfForm(true);
   }, []);
 
-  const handleDeleteProf = useCallback((prof: Profession) => {
-    setDeleteTarget(prof);
-    openDelete();
-  }, [openDelete]);
+  const handleDeleteProf = useCallback(
+    (prof: Profession) => {
+      setDeleteTarget(prof);
+      openDelete();
+    },
+    [openDelete],
+  );
 
   const confirmDeleteProf = useCallback(async () => {
     if (!deleteTarget) return;
     try {
       await deleteProfession(deleteTarget.id).unwrap();
-      notify.success(t('configuration.deleted'));
+      notify.success(t("configuration.deleted"));
       closeDelete();
       setDeleteTarget(null);
-    } catch {
-      notify.error(t('configuration.error'));
+    } catch (e) {
+      handleError(e);
     }
-  }, [deleteTarget, deleteProfession, closeDelete, t]);
+  }, [deleteTarget, deleteProfession, closeDelete, handleError]);
 
-  const handleProfSubmit = useCallback(async (values: ProfFormValues) => {
-    const name = { en: values.nameEn, am: values.nameAm };
-    const description = { en: values.descEn, am: values.descAm };
+  const handleProfSubmit = useCallback(
+    async (values: ProfFormValues) => {
+      const name = { en: values.nameEn, am: values.nameAm };
+      const description = { en: values.descEn, am: values.descAm };
 
-    try {
-      if (editingProf) {
-        await updateProfession({
-          id: editingProf.id,
-          name,
-          description,
-          departmentId: values.departmentId,
-        }).unwrap();
-        notify.success(t('configuration.updated'));
-      } else {
-        await createProfession({
-          departmentId: values.departmentId,
-          name,
-          description,
-        }).unwrap();
-        notify.success(t('configuration.created'));
+      try {
+        if (editingProf) {
+          await updateProfession({
+            id: editingProf.id,
+            name,
+            description,
+            departmentId: values.departmentId,
+          }).unwrap();
+          notify.success(t("configuration.updated"));
+        } else {
+          await createProfession({
+            departmentId: values.departmentId,
+            name,
+            description,
+          }).unwrap();
+          notify.success(t("configuration.created"));
+        }
+        resetProfForm();
+      } catch (e) {
+        handleError(e);
       }
-      resetProfForm();
-    } catch {
-      notify.error(t('configuration.error'));
-    }
-  }, [editingProf, createProfession, updateProfession, resetProfForm, t]);
+    },
+    [
+      editingProf,
+      createProfession,
+      updateProfession,
+      resetProfForm,
+      handleError,
+    ],
+  );
 
-  const getDeptName = useCallback((deptId: string) => {
-    const dept = departments.find((d) => d.id === deptId);
-    return dept ? (dept.name?.[locale] ?? dept.name?.en ?? '-') : '-';
-  }, [departments, locale]);
+  const getDeptName = useCallback(
+    (deptId: string) => {
+      const dept = departments.find((d) => d.id === deptId);
+      return dept ? (dept.name?.[locale] ?? dept.name?.en ?? "-") : "-";
+    },
+    [departments, locale],
+  );
+
+  const professionColumns: AdvancedColumn<Profession>[] = [
+    {
+      header: t("configuration.name"),
+      cell: ({ row }) => row.original.name[locale],
+      enabled: true,
+    },
+    {
+      header: t("configuration.description"),
+      cell: ({ row }) => (
+        <Text size="sm" lineClamp={2} maw={200}>
+          {row.original.description[locale]}
+        </Text>
+      ),
+    },
+    {
+      header: t("configuration.department"),
+      cell: ({ row }) => getDeptName(row.original.departmentId),
+    },
+    {
+      header: "actions",
+      size: 90,
+      cell: ({ row }) => (
+        <Group gap="xs">
+          <ActionIcon
+            variant="subtle"
+            color="blue"
+            size="sm"
+            onClick={() => handleEditProf(row.original)}
+          >
+            <IconEdit size={14} />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            color="red"
+            size="sm"
+            onClick={() => handleDeleteProf(row.original)}
+          >
+            <IconTrash size={14} />
+          </ActionIcon>
+        </Group>
+      ),
+    },
+  ];
 
   if (isLoading) {
-    return <Center py="xl"><Loader /></Center>;
+    return (
+      <Center py="xl">
+        <Loader />
+      </Center>
+    );
   }
 
   if (isError) {
-    return <Alert icon={<IconInfoCircle size={16} />} color="red" title={t('configuration.error')} />;
+    return (
+      <Alert
+        icon={<IconInfoCircle size={16} />}
+        color="red"
+        title={t("configuration.error")}
+      />
+    );
   }
 
   return (
     <>
       <Group justify="space-between" align="flex-end" mb="md">
-        <Title order={2}>{t('configuration.professionsList')}</Title>
+        <Title order={2}>{t("configuration.professionsList")}</Title>
         {!showProfForm && (
           <Button
             variant="light"
@@ -228,7 +358,7 @@ function ProfessionTab() {
             onClick={() => setShowProfForm(true)}
             size="sm"
           >
-            {t('configuration.addProfession')}
+            {t("configuration.addProfession")}
           </Button>
         )}
       </Group>
@@ -243,55 +373,40 @@ function ProfessionTab() {
         />
       )}
 
-      <Table striped highlightOnHover>
-        <Table.Thead>
-          <Table.Tr>
-            <Table.Th>{t('configuration.name')}</Table.Th>
-            <Table.Th>{t('configuration.description')}</Table.Th>
-            <Table.Th>{t('configuration.department')}</Table.Th>
-            <Table.Th />
-          </Table.Tr>
-        </Table.Thead>
-        <Table.Tbody>
-          {professions.filter((p) => p.isActive).map((prof) => (
-            <Table.Tr key={prof.id}>
-              <Table.Td>{prof.name[locale]}</Table.Td>
-              <Table.Td>
-                <Text size="sm" lineClamp={2} maw={200}>{prof.description[locale]}</Text>
-              </Table.Td>
-              <Table.Td>{getDeptName(prof.departmentId)}</Table.Td>
-              <Table.Td>
-                <Group gap="xs">
-                  <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => handleEditProf(prof)}>
-                    <IconEdit size={14} />
-                  </ActionIcon>
-                  <ActionIcon variant="subtle" color="red" size="sm" onClick={() => handleDeleteProf(prof)}>
-                    <IconTrash size={14} />
-                  </ActionIcon>
-                </Group>
-              </Table.Td>
-            </Table.Tr>
-          ))}
-          {professions.length === 0 && (
-            <Table.Tr>
-              <Table.Td colSpan={4}>
-                <Text c="dimmed" ta="center" py="xl">
-                  {t('configuration.noProfessions')}
-                </Text>
-              </Table.Td>
-            </Table.Tr>
-          )}
-        </Table.Tbody>
-      </Table>
+      <AdvancedTable
+        columns={professionColumns}
+        data={professions}
+        tableName={t("configuration.professionsList")}
+        itemCount={totalCount}
+        pageIndex={pageIndex}
+        onPageChange={setPageIndex}
+        pageSize={pageSize}
+        onPageSizeChange={setPageSize}
+        refresh={refetch}
+        onSearchChange={setQ}
+        isLoading={isFetching}
+        emptyText={t("configuration.noProfessions")}
+      />
 
-      <Modal opened={deleteOpened} onClose={closeDelete} title={t('configuration.confirmDelete')} size="sm">
+      <Modal
+        opened={deleteOpened}
+        onClose={closeDelete}
+        title={t("configuration.confirmDelete")}
+        size="sm"
+      >
         <Text mb="md">
-          {t('configuration.deleteConfirmText', { name: deleteTarget?.name?.[locale] ?? '' })}
+          {t("configuration.deleteConfirmText", {
+            name: deleteTarget?.name?.[locale] ?? "",
+          })}
         </Text>
-        <Group justify="flex-end">
-          <Button variant="default" onClick={closeDelete} size="sm">{t('configuration.cancel')}</Button>
-          <Button color="red" onClick={confirmDeleteProf} size="sm">{t('configuration.delete')}</Button>
-        </Group>
+        <ModalFooter>
+          <Button variant="default" onClick={closeDelete} size="sm">
+            {t("configuration.cancel")}
+          </Button>
+          <Button color="red" onClick={confirmDeleteProf} size="sm">
+            {t("configuration.delete")}
+          </Button>
+        </ModalFooter>
       </Modal>
     </>
   );
@@ -302,18 +417,24 @@ export function ConfigurationPage() {
 
   return (
     <Stack gap="lg">
-      <Title order={2}>{t('configuration.title')}</Title>
+      <Title order={2}>{t("configuration.title")}</Title>
 
       <Tabs defaultValue="professions">
         <Tabs.List>
-          <Tabs.Tab value="professions" leftSection={<IconBriefcase size={16} />}>
-            {t('configuration.professions')}
+          <Tabs.Tab
+            value="professions"
+            leftSection={<IconBriefcase size={16} />}
+          >
+            {t("configuration.professions")}
           </Tabs.Tab>
           <Tabs.Tab value="locations" leftSection={<IconMap size={16} />}>
-            {t('location.title')}
+            {t("location.title")}
           </Tabs.Tab>
-          <Tabs.Tab value="certifications" leftSection={<IconCertificate size={16} />}>
-            {t('certification.title')}
+          <Tabs.Tab
+            value="certifications"
+            leftSection={<IconCertificate size={16} />}
+          >
+            {t("certification.title")}
           </Tabs.Tab>
         </Tabs.List>
 
diff --git a/apps/backoffice/src/app/features/configuration/types/configuration.ts b/apps/backoffice/src/app/features/configuration/types/configuration.ts
index 3e1c4af94..ddde32ae3 100644
--- a/apps/backoffice/src/app/features/configuration/types/configuration.ts
+++ b/apps/backoffice/src/app/features/configuration/types/configuration.ts
@@ -28,7 +28,8 @@ export interface Profession {
 }
 
 export interface ListResponse<T> {
-  count: number;
+  count?: number;
+  total?: number;
   items: T[];
 }
 
diff --git a/apps/backoffice/src/app/features/endorsement/pages/EndorsementQueuePage.tsx b/apps/backoffice/src/app/features/endorsement/pages/EndorsementQueuePage.tsx
deleted file mode 100644
index 4ef48ada3..000000000
--- a/apps/backoffice/src/app/features/endorsement/pages/EndorsementQueuePage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
-
-/**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
- */
-export function EndorsementQueuePage() {
-  return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Endorsement queue"
-        description="Endorsement processing is not connected to the backend yet."
-      />
-    </Container>
-  );
-}
-
-export default EndorsementQueuePage;
diff --git a/apps/backoffice/src/app/features/endorsement/pages/EndorsementReviewPage.tsx b/apps/backoffice/src/app/features/endorsement/pages/EndorsementReviewPage.tsx
deleted file mode 100644
index 7bd998cbc..000000000
--- a/apps/backoffice/src/app/features/endorsement/pages/EndorsementReviewPage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
-
-/**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
- */
-export function EndorsementReviewPage() {
-  return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Endorsement review"
-        description="Endorsement processing is not connected to the backend yet."
-      />
-    </Container>
-  );
-}
-
-export default EndorsementReviewPage;
diff --git a/apps/backoffice/src/app/features/exam/components/ExamIncidentsPanel.tsx b/apps/backoffice/src/app/features/exam/components/ExamIncidentsPanel.tsx
index aa93be2e1..ecbd5dac9 100644
--- a/apps/backoffice/src/app/features/exam/components/ExamIncidentsPanel.tsx
+++ b/apps/backoffice/src/app/features/exam/components/ExamIncidentsPanel.tsx
@@ -16,6 +16,7 @@ import {
 } from '@mantine/core';
 import { IconAlertTriangle, IconInfoCircle, IconPlus } from '@tabler/icons-react';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import { extractErrorMessage } from '@ema-platform/api';
 import {
   useGetExamIncidentsQuery,
@@ -51,6 +52,7 @@ const STATUS_COLOR: Record<ExamIncidentStatus, string> = {
  */
 export function ExamIncidentsPanel({ examId }: { examId: string }) {
   const { t } = useTranslation();
+  const showDate = useDateDisplayer();
   const { data: incidents, isError } = useGetExamIncidentsQuery(examId);
   const { data: registrations } = useGetExamRegistrationsQuery(examId);
   const [recordIncident, { isLoading: isFiling }] = useRecordIncidentMutation();
@@ -175,7 +177,7 @@ export function ExamIncidentsPanel({ examId }: { examId: string }) {
                   )}
                 </Table.Td>
                 <Table.Td>
-                  <Text fz="xs">{incident.occurredAt?.slice(0, 10)}</Text>
+                  <Text fz="xs">{showDate(incident.occurredAt)}</Text>
                 </Table.Td>
                 <Table.Td>
                   <Badge
diff --git a/apps/backoffice/src/app/features/exam/components/QuestionAssigner.tsx b/apps/backoffice/src/app/features/exam/components/QuestionAssigner.tsx
index 8859a0f33..136d7ba21 100644
--- a/apps/backoffice/src/app/features/exam/components/QuestionAssigner.tsx
+++ b/apps/backoffice/src/app/features/exam/components/QuestionAssigner.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { Dispatch, SetStateAction, useState } from "react";
 import {
   Paper,
   Group,
@@ -10,16 +10,17 @@ import {
   Checkbox,
   Box,
   Button,
-} from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { IconSearch } from '@tabler/icons-react';
-import type { QuestionBrief } from '../types/exam';
+} from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import { IconSearch } from "@tabler/icons-react";
+import type { QuestionBrief, actionTypes } from "../types/exam";
 
 interface QuestionAssignerProps {
   available: QuestionBrief[];
   assigned: QuestionBrief[];
   onChange: (assigned: QuestionBrief[]) => void;
-  mode?: 'manual' | 'random';
+  mode?: "manual" | "random";
+  actions: Dispatch<SetStateAction<actionTypes | undefined>>;
 }
 
 function QuestionList({
@@ -38,11 +39,13 @@ function QuestionList({
   label: string;
 }) {
   const { t, i18n } = useTranslation();
-  const locale = i18n.language as 'en' | 'am';
-  const placeholder = t('exam.assigner.search');
+  const locale = i18n.language as "en" | "am";
+  const placeholder = t("exam.assigner.search");
   return (
     <Box style={{ flex: 1, minWidth: 0 }}>
-      <Text fz="xs" fw={600} c="dimmed" mb={4}>{label} ({items.length})</Text>
+      <Text fz="xs" fw={600} c="dimmed" mb={4}>
+        {label} ({items.length})
+      </Text>
       <Paper withBorder radius="md">
         <Group p="sm" pb={0}>
           <TextInput
@@ -57,7 +60,9 @@ function QuestionList({
         <ScrollArea h={280} p="sm" pt="xs">
           <Stack gap={4}>
             {items.length === 0 && (
-              <Text fz="xs" c="dimmed" ta="center" py="xl">{t('exam.assigner.noQuestions')}</Text>
+              <Text fz="xs" c="dimmed" ta="center" py="xl">
+                {t("exam.assigner.noQuestions")}
+              </Text>
             )}
             {items.map((q) => (
               <Paper
@@ -66,19 +71,37 @@ function QuestionList({
                 p="xs"
                 radius="sm"
                 style={{
-                  cursor: 'pointer',
-                  borderColor: selected.has(q.id) ? 'var(--mantine-color-blue-5)' : undefined,
-                  background: selected.has(q.id) ? 'var(--mantine-color-blue-0)' : undefined,
+                  cursor: "pointer",
+                  borderColor: selected.has(q.id)
+                    ? "var(--mantine-color-blue-5)"
+                    : undefined,
+                  background: selected.has(q.id)
+                    ? "var(--mantine-color-blue-0)"
+                    : undefined,
                 }}
                 onClick={() => onToggle(q.id)}
               >
                 <Group gap="sm" wrap="nowrap">
-                  <Checkbox checked={selected.has(q.id)} onChange={() => onToggle(q.id)} size="xs" />
+                  <Checkbox
+                    checked={selected.has(q.id)}
+                    onChange={() => onToggle(q.id)}
+                    size="xs"
+                  />
                   <div style={{ flex: 1, minWidth: 0 }}>
-                    <Text fz="xs" lineClamp={2}>{q.title[locale]}</Text>
+                    <Text fz="xs" lineClamp={2}>
+                      {q.title[locale]}
+                    </Text>
                     <Group gap={4} mt={2}>
-                      <Badge size="xs" variant="light" color={q.form === 'ESSAY' ? 'blue' : 'violet'}>{q.form}</Badge>
-                      <Badge size="xs" variant="light" color="gray">{q.points} pts</Badge>
+                      <Badge
+                        size="xs"
+                        variant="light"
+                        color={q.form === "ESSAY" ? "blue" : "violet"}
+                      >
+                        {q.form}
+                      </Badge>
+                      <Badge size="xs" variant="light" color="gray">
+                        {q.points} pts
+                      </Badge>
                     </Group>
                   </div>
                 </Group>
@@ -91,49 +114,71 @@ function QuestionList({
   );
 }
 
-export function QuestionAssigner({ available, assigned, onChange, mode = 'manual' }: QuestionAssignerProps) {
+export function QuestionAssigner({
+  available,
+  assigned,
+  onChange,
+  mode = "manual",
+  actions,
+}: QuestionAssignerProps) {
   const { t } = useTranslation();
-  const [searchLeft, setSearchLeft] = useState('');
-  const [searchRight, setSearchRight] = useState('');
+  const [searchLeft, setSearchLeft] = useState("");
+  const [searchRight, setSearchRight] = useState("");
   const [selectedLeft, setSelectedLeft] = useState<Set<string>>(new Set());
   const [selectedRight, setSelectedRight] = useState<Set<string>>(new Set());
   const assignedIds = new Set(assigned.map((q) => q.id));
 
   const filteredAvailable = available.filter(
-    (q) => !assignedIds.has(q.id) && (q.title.en.toLowerCase().includes(searchLeft.toLowerCase()) || q.title.am.includes(searchLeft))
+    (q) =>
+      !assignedIds.has(q.id) &&
+      (q.title.en.toLowerCase().includes(searchLeft.toLowerCase()) ||
+        q.title.am.includes(searchLeft)),
   );
   const filteredAssigned = assigned.filter(
-    (q) => q.title.en.toLowerCase().includes(searchRight.toLowerCase()) || q.title.am.includes(searchRight)
+    (q) =>
+      q.title.en.toLowerCase().includes(searchRight.toLowerCase()) ||
+      q.title.am.includes(searchRight),
   );
 
   const assignSelected = () => {
     const toAssign = available.filter((q) => selectedLeft.has(q.id));
     onChange([...assigned, ...toAssign]);
+    actions("add");
     setSelectedLeft(new Set());
   };
 
   const removeSelected = () => {
     onChange(assigned.filter((q) => !selectedRight.has(q.id)));
+    actions("remove");
     setSelectedRight(new Set());
   };
 
   return (
     <Stack gap="sm">
-      {mode === 'manual' && <Text fz="sm" fw={500}>{t('exam.assigner.title')}</Text>}
-      {mode === 'random' && <Text fz="sm" fw={500}>{t('exam.assigner.assignedTitle')}</Text>}
+      {mode === "manual" && (
+        <Text fz="sm" fw={500}>
+          {t("exam.assigner.title")}
+        </Text>
+      )}
+      {mode === "random" && (
+        <Text fz="sm" fw={500}>
+          {t("exam.assigner.assignedTitle")}
+        </Text>
+      )}
       <Group gap="sm" align="stretch" wrap="nowrap">
-        {mode === 'manual' && (
+        {mode === "manual" && (
           <QuestionList
             items={filteredAvailable}
             selected={selectedLeft}
             onToggle={(id) => {
               const next = new Set(selectedLeft);
-              if (next.has(id)) next.delete(id); else next.add(id);
+              if (next.has(id)) next.delete(id);
+              else next.add(id);
               setSelectedLeft(next);
             }}
             search={searchLeft}
             onSearchChange={setSearchLeft}
-            label={t('exam.assigner.available')}
+            label={t("exam.assigner.available")}
           />
         )}
         <QuestionList
@@ -141,32 +186,43 @@ export function QuestionAssigner({ available, assigned, onChange, mode = 'manual
           selected={selectedRight}
           onToggle={(id) => {
             const next = new Set(selectedRight);
-            if (next.has(id)) next.delete(id); else next.add(id);
+            if (next.has(id)) next.delete(id);
+            else next.add(id);
             setSelectedRight(next);
           }}
           search={searchRight}
           onSearchChange={setSearchRight}
-          label={t('exam.assigner.assigned')}
+          label={t("exam.assigner.assigned")}
         />
       </Group>
-      {mode === 'manual' && (
+      {mode === "manual" && (
         <Group gap="sm" justify="center">
           {selectedLeft.size > 0 && (
             <Button size="xs" variant="light" onClick={assignSelected}>
-              {t('exam.assigner.assignSelected', { count: selectedLeft.size })}
+              {t("exam.assigner.assignSelected", { count: selectedLeft.size })}
             </Button>
           )}
           {selectedRight.size > 0 && (
-            <Button size="xs" variant="light" color="red" onClick={removeSelected}>
-              {t('exam.assigner.removeSelected', { count: selectedRight.size })}
+            <Button
+              size="xs"
+              variant="light"
+              color="red"
+              onClick={removeSelected}
+            >
+              {t("exam.assigner.removeSelected", { count: selectedRight.size })}
             </Button>
           )}
         </Group>
       )}
-      {mode === 'random' && selectedRight.size > 0 && (
+      {mode === "random" && selectedRight.size > 0 && (
         <Group gap="sm" justify="center">
-          <Button size="xs" variant="light" color="red" onClick={removeSelected}>
-            {t('exam.assigner.removeSelected', { count: selectedRight.size })}
+          <Button
+            size="xs"
+            variant="light"
+            color="red"
+            onClick={removeSelected}
+          >
+            {t("exam.assigner.removeSelected", { count: selectedRight.size })}
           </Button>
         </Group>
       )}
diff --git a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
index f630e0a65..022c41807 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamDetailPage.tsx
@@ -1,5 +1,5 @@
-import { useState, useEffect, useRef, useMemo } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useState, useEffect, useRef, useMemo } from "react";
+import { useNavigate, useParams } from "react-router-dom";
 import {
   Stack,
   Title,
@@ -22,9 +22,9 @@ import {
   ThemeIcon,
   Box,
   rem,
-} from '@mantine/core';
-import { useDisclosure } from '@mantine/hooks';
-import { useTranslation } from 'react-i18next';
+} from "@mantine/core";
+import { useDisclosure } from "@mantine/hooks";
+import { useTranslation } from "react-i18next";
 import {
   IconArrowLeft,
   IconPrinter,
@@ -56,32 +56,50 @@ import { ExamIncidentsPanel } from '../components/ExamIncidentsPanel';
 import type { ExamStatus, QuestionBrief } from '../types/exam';
 
 const STATUS_COLOR: Record<string, string> = {
-  PENDING: 'gray', ACTIVE: 'blue', COMPLETED: 'teal',
-  CANCELLED: 'red', POSTPONED: 'orange', PUBLISHED: 'green',
+  PENDING: "gray",
+  ACTIVE: "blue",
+  COMPLETED: "teal",
+  CANCELLED: "red",
+  POSTPONED: "orange",
+  PUBLISHED: "green",
 };
 
-const FORM_LABEL: Record<string, string> = { ESSAY: 'Essay', CHOICE: 'Choice' };
-const TYPE_LABEL: Record<string, string> = { WRITTEN: 'Written', ORAL: 'Oral' };
-const ADMIN_LABEL: Record<string, string> = { OFFLINE: 'Offline', ONLINE: 'Online' };
-const EVAL_LABEL: Record<string, string> = { SUM: 'Sum', AVERAGE: 'Average', PERCENTAGE: 'Percentage' };
+const FORM_LABEL: Record<string, string> = { ESSAY: "Essay", CHOICE: "Choice" };
+const TYPE_LABEL: Record<string, string> = { WRITTEN: "Written", ORAL: "Oral" };
+const ADMIN_LABEL: Record<string, string> = {
+  OFFLINE: "Offline",
+  ONLINE: "Online",
+};
+const EVAL_LABEL: Record<string, string> = {
+  SUM: "Sum",
+  AVERAGE: "Average",
+  PERCENTAGE: "Percentage",
+};
 
 function InfoRow({ label, value }: { label: string; value: string }) {
   return (
     <div>
-      <Text fz="xs" c="dimmed" tt="uppercase" fw={600}>{label}</Text>
-      <Text fz="sm" fw={500}>{value || '—'}</Text>
+      <Text fz="xs" c="dimmed" tt="uppercase" fw={600}>
+        {label}
+      </Text>
+      <Text fz="sm" fw={500}>
+        {value || "—"}
+      </Text>
     </div>
   );
 }
 
 export function ExamDetailPage() {
   const { t, i18n } = useTranslation();
-  const locale = i18n.language as 'en' | 'am';
+  const locale = i18n.language as "en" | "am";
+  const { handleError } = useErrorHandler();
   const { id } = useParams<{ id: string }>();
   const navigate = useNavigate();
   const printRef = useRef<HTMLDivElement>(null);
-  const [recordOpened, { open: openRecord, close: closeRecord }] = useDisclosure(false);
-  const [assignOpened, { open: openAssign, close: closeAssign }] = useDisclosure(false);
+  const [recordOpened, { open: openRecord, close: closeRecord }] =
+    useDisclosure(false);
+  const [assignOpened, { open: openAssign, close: closeAssign }] =
+    useDisclosure(false);
   const [draftQuestions, setDraftQuestions] = useState<QuestionBrief[]>([]);
   const [randomCount, setRandomCount] = useState(5);
   const [updateExam] = useUpdateExamMutation();
@@ -109,12 +127,26 @@ export function ExamDetailPage() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [allQuestions, exam?.certificationId, exam?.form]);
 
-  if (isLoading) return <Center py="xl"><Loader /></Center>;
+  if (isLoading)
+    return (
+      <Center py="xl">
+        <Loader />
+      </Center>
+    );
   if (isError || !exam) {
     return (
       <Stack gap="md">
-        <Button variant="subtle" leftSection={<IconArrowLeft size={15} />} w="fit-content" onClick={() => navigate('/exams')}>{t('exam.backToExams')}</Button>
-        <Alert color="red" icon={<IconInfoCircle size={17} />}>{t('exam.notFound')}</Alert>
+        <Button
+          variant="subtle"
+          leftSection={<IconArrowLeft size={15} />}
+          w="fit-content"
+          onClick={() => navigate("/exams")}
+        >
+          {t("exam.backToExams")}
+        </Button>
+        <Alert color="red" icon={<IconInfoCircle size={17} />}>
+          {t("exam.notFound")}
+        </Alert>
       </Stack>
     );
   }
@@ -161,42 +193,51 @@ export function ExamDetailPage() {
       );
     }
   };
-
   const handlePrint = async () => {
-    const total = (exam.questions ?? []).reduce((s, q) => s + Number(q.points), 0);
+    const total = (exam.questions ?? []).reduce(
+      (s, q) => s + Number(q.points),
+      0,
+    );
     if (total < Number(exam.cuttingPoint)) {
-      notify.error(`Total question marks (${total}) is less than the passing mark (${exam.cuttingPoint}). Add more questions or adjust the cutting point before printing.`);
+      notify.error(
+        `Total question marks (${total}) is less than the passing mark (${exam.cuttingPoint}). Add more questions or adjust the cutting point before printing.`,
+      );
       return;
     }
 
-    const printWindow = window.open('', '_blank');
+    const printWindow = window.open("", "_blank");
     if (!printWindow) return;
 
-    let logoBase64 = '';
+    let logoBase64 = "";
     try {
-      const resp = await fetch('/ema-logo.png');
+      const resp = await fetch("/ema-logo.png");
       const blob = await resp.blob();
       logoBase64 = await new Promise<string>((resolve) => {
         const reader = new FileReader();
         reader.onloadend = () => resolve(reader.result as string);
         reader.readAsDataURL(blob);
       });
-    } catch { /* logo not available */ }
+    } catch {
+      /* logo not available */
+    }
 
     const qMap = new Map(allQuestions.map((qq) => [qq.id, qq]));
-    const qHtml = (exam.questions ?? []).map((q, i) => {
-      const full = qMap.get(q.id);
-      const titleStr = q.title[locale] || q.title.en;
-      const descStr = full?.description?.[locale] || full?.description?.en || '';
-      return `
+    const qHtml = (exam.questions ?? [])
+      .map((q, i) => {
+        const full = qMap.get(q.id);
+        const titleStr = q.title[locale] || q.title.en;
+        const descStr =
+          full?.description?.[locale] || full?.description?.en || "";
+        return `
       <div style="margin-bottom: 24px; page-break-inside: avoid;">
         <p style="font-weight: 700; margin-bottom: 4px; font-size: 13px;">Question ${i + 1} (${q.points} pts — ${FORM_LABEL[q.form] ?? q.form})</p>
         <p style="margin: 0 0 4px 0; font-size: 14px; line-height: 1.5;">${titleStr}</p>
-        ${descStr ? `<p style="margin: 0 0 8px 0; font-size: 12px; color: #555; line-height: 1.4;">${descStr}</p>` : ''}
-        ${q.form === 'ESSAY' ? '<div style="border-bottom: 1px dashed #ccc; height: 80px; margin-bottom: 12px;"></div>'.repeat(3) : ''}
-        ${q.form === 'CHOICE' ? ['A. ______', 'B. ______', 'C. ______', 'D. ______'].map(l => `<p style="margin: 4px 0; font-size: 13px;">${l}</p>`).join('') : ''}
+        ${descStr ? `<p style="margin: 0 0 8px 0; font-size: 12px; color: #555; line-height: 1.4;">${descStr}</p>` : ""}
+        ${q.form === "ESSAY" ? '<div style="border-bottom: 1px dashed #ccc; height: 80px; margin-bottom: 12px;"></div>'.repeat(3) : ""}
+        ${q.form === "CHOICE" ? ["A. ______", "B. ______", "C. ______", "D. ______"].map((l) => `<p style="margin: 4px 0; font-size: 13px;">${l}</p>`).join("") : ""}
       </div>`;
-    }).join('');
+      })
+      .join("");
 
     printWindow.document.write(`
       <html><head><title>${exam.title[locale] || exam.title.en}</title>
@@ -211,13 +252,13 @@ export function ExamDetailPage() {
         @media print { @page { margin: 20mm; } body { -webkit-print-color-adjust: exact; } }
       </style></head><body>
       <div class="header">
-        ${logoBase64 ? `<img src="${logoBase64}" alt="Logo" class="header-logo" />` : ''}
+        ${logoBase64 ? `<img src="${logoBase64}" alt="Logo" class="header-logo" />` : ""}
         <h1>${exam.title[locale] || exam.title.en}</h1>
         <p>Date: ${exam.date} | Venue: ${exam.venue}</p>
-        <p>Form: ${FORM_LABEL[exam.form]} | Type: ${TYPE_LABEL[exam.type]} | Time Allowed: ${exam.givenTime ? `${exam.givenTime.days}d ${exam.givenTime.hours}h ${exam.givenTime.minutes}m` : 'N/A'}</p>
+        <p>Form: ${FORM_LABEL[exam.form]} | Type: ${TYPE_LABEL[exam.type]} | Time Allowed: ${exam.givenTime ? `${exam.givenTime.days}d ${exam.givenTime.hours}h ${exam.givenTime.minutes}m` : "N/A"}</p>
         <p>Pass Mark: ${exam.cuttingPoint} | Total Questions: ${(exam.questions ?? []).length}</p>
       </div>
-      ${exam.direction?.[locale] ? `<div class="directions"><strong>Directions:</strong> ${exam.direction[locale]}</div>` : ''}
+      ${exam.direction?.[locale] ? `<div class="directions"><strong>Directions:</strong> ${exam.direction[locale]}</div>` : ""}
       ${qHtml}
       <div style="margin-top: 40px; border-top: 1px solid #ccc; padding-top: 12px; font-size: 12px; color: #888; text-align: center;">
         Generated by EMA — Ethiopian Maritime Authority
@@ -229,15 +270,25 @@ export function ExamDetailPage() {
     setTimeout(() => printWindow.print(), 500);
   };
 
-  const totalPoints = (exam.questions ?? []).reduce((s, q) => s + Number(q.points), 0);
-  const certName = exam.certification?.name?.[locale] ?? certifications.find((c) => c.id === exam.certificationId)?.name?.[locale] ?? '—';
+  const totalPoints = (exam.questions ?? []).reduce(
+    (s, q) => s + Number(q.points),
+    0,
+  );
+  const certName =
+    exam.certification?.name?.[locale] ??
+    certifications.find((c) => c.id === exam.certificationId)?.name?.[locale] ??
+    "—";
 
   return (
     <Stack gap="md" ref={printRef}>
       {/* Header */}
       <Group justify="space-between">
         <Group gap="sm">
-          <ActionIcon variant="subtle" size="lg" onClick={() => navigate('/exams')}>
+          <ActionIcon
+            variant="subtle"
+            size="lg"
+            onClick={() => navigate("/exams")}
+          >
             <IconArrowLeft size={18} />
           </ActionIcon>
           <div>
@@ -245,41 +296,93 @@ export function ExamDetailPage() {
           </div>
         </Group>
         <Group gap="sm">
-          <Button variant="light" leftSection={<IconPrinter size={15} />} onClick={handlePrint} size="sm">
-            {t('exam.print')}
+          <Button
+            variant="light"
+            leftSection={<IconPrinter size={15} />}
+            onClick={handlePrint}
+            size="sm"
+          >
+            {t("exam.print")}
           </Button>
-          <Button leftSection={<IconPlus size={15} />} onClick={openRecord} size="sm">
-            {t('exam.recordResult')}
+          <Button
+            leftSection={<IconPlus size={15} />}
+            onClick={openRecord}
+            size="sm"
+          >
+            {t("exam.recordResult")}
           </Button>
         </Group>
       </Group>
 
       {/* Status badge */}
-      <Badge size="lg" variant="light" color={STATUS_COLOR[exam.status]} style={{ width: 'fit-content' }}>
+      <Badge
+        size="lg"
+        variant="light"
+        color={STATUS_COLOR[exam.status]}
+        style={{ width: "fit-content" }}
+      >
         {t(`exam.status.${exam.status}`)}
       </Badge>
 
       {/* Exam Info */}
       <Paper withBorder radius="lg" p="lg">
-        <Title order={5} mb="md">{t('exam.detail.title')}</Title>
+        <Title order={5} mb="md">
+          {t("exam.detail.title")}
+        </Title>
         <SimpleGrid cols={{ base: 2, sm: 4 }} spacing="md">
-          <InfoRow label={t('exam.detail.certification')} value={certName} />
-          <InfoRow label={t('exam.detail.type')} value={t(`exam.type.${exam.type}`)} />
-          <InfoRow label={t('exam.detail.form')} value={t(`exam.formType.${exam.form}`)} />
-          <InfoRow label={t('exam.detail.venue')} value={exam.venue} />
-          <InfoRow label={t('exam.detail.date')} value={exam.date} />
-          <InfoRow label={t('exam.detail.administration')} value={t(`exam.admin.${exam.administrationMethod}`)} />
-          <InfoRow label={t('exam.detail.evaluation')} value={t(`exam.eval.${exam.evaluationMethod}`)} />
-          <InfoRow label={t('exam.detail.selection')} value={t(`exam.selection.${exam.selectionMethod}`)} />
-          <InfoRow label={t('exam.detail.timeAllowed')} value={exam.givenTime ? `${exam.givenTime.days}d ${exam.givenTime.hours}h ${exam.givenTime.minutes}m` : '—'} />
-          <InfoRow label={t('exam.detail.passMark')} value={String(exam.cuttingPoint)} />
-          <InfoRow label={t('exam.detail.totalPoints')} value={String(totalPoints)} />
-          <InfoRow label={t('exam.detail.questions')} value={String((exam.questions ?? []).length)} />
+          <InfoRow label={t("exam.detail.certification")} value={certName} />
+          <InfoRow
+            label={t("exam.detail.type")}
+            value={t(`exam.type.${exam.type}`)}
+          />
+          <InfoRow
+            label={t("exam.detail.form")}
+            value={t(`exam.formType.${exam.form}`)}
+          />
+          <InfoRow label={t("exam.detail.venue")} value={exam.venue} />
+          <InfoRow label={t("exam.detail.date")} value={exam.date} />
+          <InfoRow
+            label={t("exam.detail.administration")}
+            value={t(`exam.admin.${exam.administrationMethod}`)}
+          />
+          <InfoRow
+            label={t("exam.detail.evaluation")}
+            value={t(`exam.eval.${exam.evaluationMethod}`)}
+          />
+          <InfoRow
+            label={t("exam.detail.selection")}
+            value={t(`exam.selection.${exam.selectionMethod}`)}
+          />
+          <InfoRow
+            label={t("exam.detail.timeAllowed")}
+            value={
+              exam.givenTime
+                ? `${exam.givenTime.days}d ${exam.givenTime.hours}h ${exam.givenTime.minutes}m`
+                : "—"
+            }
+          />
+          <InfoRow
+            label={t("exam.detail.passMark")}
+            value={String(exam.cuttingPoint)}
+          />
+          <InfoRow
+            label={t("exam.detail.totalPoints")}
+            value={String(totalPoints)}
+          />
+          <InfoRow
+            label={t("exam.detail.questions")}
+            value={String((exam.questions ?? []).length)}
+          />
         </SimpleGrid>
         {(exam.direction?.en || exam.direction?.am) && (
           <>
             <Divider my="md" />
-            <InfoRow label={t('exam.detail.directions')} value={[exam.direction?.en, exam.direction?.am].filter(Boolean).join(' / ')} />
+            <InfoRow
+              label={t("exam.detail.directions")}
+              value={[exam.direction?.en, exam.direction?.am]
+                .filter(Boolean)
+                .join(" / ")}
+            />
           </>
         )}
       </Paper>
@@ -287,24 +390,41 @@ export function ExamDetailPage() {
       {/* Questions */}
       <Paper withBorder radius="lg" p="lg">
         <Group justify="space-between" mb="md">
-          <Title order={5}>{t('exam.detail.questionsSection', { pts: totalPoints })}</Title>
-          <Button variant="light" size="xs" leftSection={<IconPlus size={14} />} onClick={openAssignModal}>
-            {t('exam.manageQuestions')}
+          <Title order={5}>
+            {t("exam.detail.questionsSection", { pts: totalPoints })}
+          </Title>
+          <Button
+            variant="light"
+            size="xs"
+            leftSection={<IconPlus size={14} />}
+            onClick={openAssignModal}
+          >
+            {t("exam.manageQuestions")}
           </Button>
         </Group>
         {(exam.questions ?? []).length === 0 ? (
           <Alert color="gray" icon={<IconInfoCircle size={16} />}>
-            {t('exam.noQuestionsAssigned')}
+            {t("exam.noQuestionsAssigned")}
           </Alert>
         ) : (
           <Stack gap="md">
             {(exam.questions ?? []).map((q, i) => (
               <Paper key={q.id} withBorder p="md" radius="md">
                 <Group justify="space-between" mb="xs">
-                  <Text fz="sm" fw={700}>{t('exam.detail.questionLabel')} {i + 1}</Text>
+                  <Text fz="sm" fw={700}>
+                    {t("exam.detail.questionLabel")} {i + 1}
+                  </Text>
                   <Group gap={4}>
-                    <Badge size="xs" variant="light" color={q.form === 'ESSAY' ? 'blue' : 'violet'}>{t(`exam.formType.${q.form}`)}</Badge>
-                    <Badge size="xs" variant="light" color="gray">{q.points} pts</Badge>
+                    <Badge
+                      size="xs"
+                      variant="light"
+                      color={q.form === "ESSAY" ? "blue" : "violet"}
+                    >
+                      {t(`exam.formType.${q.form}`)}
+                    </Badge>
+                    <Badge size="xs" variant="light" color="gray">
+                      {q.points} pts
+                    </Badge>
                   </Group>
                 </Group>
                 <Text fz="sm">{q.title[locale]}</Text>
@@ -321,27 +441,38 @@ export function ExamDetailPage() {
       <RecordResultModal exam={exam} opened={recordOpened} onClose={closeRecord} />
 
       {/* Question assignment modal */}
-      <Modal opened={assignOpened} onClose={closeAssign} title={`${t('exam.manageQuestions')} — ${exam.title[locale]}`} size="xl" radius="lg">
+      <Modal
+        opened={assignOpened}
+        onClose={closeAssign}
+        title={`${t("exam.manageQuestions")} — ${exam.title[locale]}`}
+        size="xl"
+        radius="lg"
+      >
         <Stack gap="md">
-          {exam.selectionMethod === 'MANUAL' ? (
+          {exam.selectionMethod === "MANUAL" ? (
             <>
               <QuestionAssigner
                 available={eligibleQuestions}
                 assigned={draftQuestions}
                 onChange={setDraftQuestions}
                 mode="manual"
+                actions={setWhatAction}
               />
-              <Group justify="flex-end">
-                <Button variant="default" onClick={closeAssign} size="sm">{t('exam.cancel')}</Button>
-                <Button onClick={handleAssign} size="sm" loading={isAssigning}>{t('exam.saveAssignments')}</Button>
-              </Group>
+              <ModalFooter>
+                <Button variant="default" onClick={closeAssign} size="sm">
+                  {t("exam.cancel")}
+                </Button>
+                <Button onClick={handleAssign} size="sm" loading={isAssigning}>
+                  {t("exam.saveAssignments")}
+                </Button>
+              </ModalFooter>
             </>
           ) : (
             <>
               <Text fz="sm" c="dimmed">{t('exam.randomHintServer')}</Text>
               <Group gap="sm">
                 <NumberInput
-                  placeholder={t('exam.assigner.selectCount')}
+                  placeholder={t("exam.assigner.selectCount")}
                   value={randomCount}
                   onChange={(v) => setRandomCount(Number(v))}
                   min={1}
@@ -358,10 +489,14 @@ export function ExamDetailPage() {
                 onChange={setDraftQuestions}
                 mode="random"
               />
-              <Group justify="flex-end">
-                <Button variant="default" onClick={closeAssign} size="sm">{t('exam.cancel')}</Button>
-                <Button onClick={handleAssign} size="sm" loading={isAssigning}>{t('exam.saveAssignments')}</Button>
-              </Group>
+              <ModalFooter>
+                <Button variant="default" onClick={closeAssign} size="sm">
+                  {t("exam.cancel")}
+                </Button>
+                <Button onClick={handleAssign} size="sm" loading={isAssigning}>
+                  {t("exam.saveAssignments")}
+                </Button>
+              </ModalFooter>
             </>
           )}
         </Stack>
diff --git a/apps/backoffice/src/app/features/exam/pages/ExamPage.tsx b/apps/backoffice/src/app/features/exam/pages/ExamPage.tsx
index ab9404fe4..a3a5436e4 100644
--- a/apps/backoffice/src/app/features/exam/pages/ExamPage.tsx
+++ b/apps/backoffice/src/app/features/exam/pages/ExamPage.tsx
@@ -1,47 +1,51 @@
-import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useState } from "react";
+import { useNavigate } from "react-router-dom";
 import {
   Stack,
   Title,
   Group,
   Button,
-  Table,
   Badge,
   ActionIcon,
   Modal,
   Text,
   TextInput,
   Textarea,
-  Paper,
-  Loader,
-  Center,
+  Card,
   Alert,
   Select,
   NumberInput,
   Tabs,
   SimpleGrid,
   Divider,
-} from '@mantine/core';
-import { useDisclosure } from '@mantine/hooks';
-import { useTranslation } from 'react-i18next';
-import { IconEdit, IconTrash, IconPlus, IconInfoCircle, IconCalendar, IconClipboardList } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
-import { useGetCertificationsQuery } from '../../certification/api/certification-api';
+} from "@mantine/core";
+import { useDisclosure } from "@mantine/hooks";
+import { useTranslation } from "react-i18next";
+import {
+  IconEdit,
+  IconTrash,
+  IconPlus,
+  IconInfoCircle,
+  IconClipboardList,
+  IconDetails,
+} from "@tabler/icons-react";
+import { notify, useErrorHandler, AdvancedTable, useServerTable, ModalFooter, AmharicDatePicker, type AdvancedColumn } from "@ema-platform/ui";
+import { useGetCertificationsQuery } from "../../certification/api/certification-api";
 import {
   useGetExamsQuery,
   useCreateExamMutation,
   useUpdateExamMutation,
   useDeleteExamMutation,
-} from '../api/exam-api';
-import type { Exam } from '../types/exam';
+} from "../api/exam-api";
+import type { Exam } from "../types/exam";
 
 const STATUS_COLOR: Record<string, string> = {
-  PENDING: 'gray',
-  ACTIVE: 'blue',
-  COMPLETED: 'teal',
-  CANCELLED: 'red',
-  POSTPONED: 'orange',
-  PUBLISHED: 'green',
+  PENDING: "gray",
+  ACTIVE: "blue",
+  COMPLETED: "teal",
+  CANCELLED: "red",
+  POSTPONED: "orange",
+  PUBLISHED: "green",
 };
 
 function ExamForm({
@@ -58,100 +62,297 @@ function ExamForm({
   onCancel: () => void;
 }) {
   const { t } = useTranslation();
-  const [certificationId, setCertificationId] = useState<string | null>(editing?.certificationId ?? null);
-  const [titleEn, setTitleEn] = useState(editing?.title?.en ?? '');
-  const [titleAm, setTitleAm] = useState(editing?.title?.am ?? '');
-  const [directionEn, setDirectionEn] = useState(editing?.direction?.en ?? '');
-  const [directionAm, setDirectionAm] = useState(editing?.direction?.am ?? '');
-  const [date, setDate] = useState(editing?.date ?? '');
+  const [certificationId, setCertificationId] = useState<string | null>(
+    editing?.certificationId ?? null,
+  );
+  const [titleEn, setTitleEn] = useState(editing?.title?.en ?? "");
+  const [titleAm, setTitleAm] = useState(editing?.title?.am ?? "");
+  const [directionEn, setDirectionEn] = useState(editing?.direction?.en ?? "");
+  const [directionAm, setDirectionAm] = useState(editing?.direction?.am ?? "");
+  const [date, setDate] = useState(editing?.date ?? "");
   const [days, setDays] = useState(editing?.givenTime?.days ?? 0);
   const [hours, setHours] = useState(editing?.givenTime?.hours ?? 0);
   const [minutes, setMinutes] = useState(editing?.givenTime?.minutes ?? 0);
   const [type, setType] = useState<string | null>(editing?.type ?? null);
   const [form, setForm] = useState<string | null>(editing?.form ?? null);
-  const [venue, setVenue] = useState(editing?.venue ?? '');
-  const [adminMethod, setAdminMethod] = useState<string | null>(editing?.administrationMethod ?? null);
-  const [evalMethod, setEvalMethod] = useState<string | null>(editing?.evaluationMethod ?? null);
-  const [selMethod, setSelMethod] = useState<string | null>(editing?.selectionMethod ?? null);
-  const [cuttingPoint, setCuttingPoint] = useState<number>(editing?.cuttingPoint ?? 0);
+  const [venue, setVenue] = useState(editing?.venue ?? "");
+  const [adminMethod, setAdminMethod] = useState<string | null>(
+    editing?.administrationMethod ?? null,
+  );
+  const [evalMethod, setEvalMethod] = useState<string | null>(
+    editing?.evaluationMethod ?? null,
+  );
+  const [selMethod, setSelMethod] = useState<string | null>(
+    editing?.selectionMethod ?? null,
+  );
+  const [cuttingPoint, setCuttingPoint] = useState<number>(
+    editing?.cuttingPoint ?? 0,
+  );
   const [status, setStatus] = useState<string | null>(editing?.status ?? null);
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
-    if (!certificationId || !titleEn || !titleAm || !date || !type || !form || !venue || !adminMethod || !evalMethod) {
-      notify.error('Please fill all required fields');
+    if (
+      !certificationId ||
+      !titleEn ||
+      !titleAm ||
+      !date ||
+      !type ||
+      !form ||
+      !venue ||
+      !adminMethod ||
+      !evalMethod
+    ) {
+      notify.error("Please fill all required fields");
       return;
     }
-    onSubmit({
-      certificationId, titleEn, titleAm, directionEn, directionAm,
-      date, days, hours, minutes, type, form, venue, adminMethod, evalMethod, selMethod, cuttingPoint, status,
-    }, !!editing);
+    onSubmit(
+      {
+        certificationId,
+        titleEn,
+        titleAm,
+        directionEn,
+        directionAm,
+        date,
+        days,
+        hours,
+        minutes,
+        type,
+        form,
+        venue,
+        adminMethod,
+        evalMethod,
+        selMethod,
+        cuttingPoint,
+        status,
+      },
+      !!editing,
+    );
   };
 
   return (
-    <Paper p="md" withBorder mb="md" radius="md">
+    <Modal opened onClose={onCancel} title={editing ? t("exam.update") : t("exam.add")} size="xl">
       <form onSubmit={handleSubmit}>
-          <Tabs defaultValue="basic" variant="outline" radius="md">
-            <Tabs.List mb="md">
-              <Tabs.Tab value="basic" leftSection={<IconInfoCircle size={15} />}>{t('exam.form.basicInfo')}</Tabs.Tab>
-              <Tabs.Tab value="settings" leftSection={<IconClipboardList size={15} />}>{t('exam.form.settings')}</Tabs.Tab>
-            </Tabs.List>
+        <Tabs defaultValue="basic" variant="outline" radius="md">
+          <Tabs.List mb="md">
+            <Tabs.Tab value="basic" leftSection={<IconInfoCircle size={15} />}>
+              {t("exam.form.basicInfo")}
+            </Tabs.Tab>
+            <Tabs.Tab
+              value="settings"
+              leftSection={<IconClipboardList size={15} />}
+            >
+              {t("exam.form.settings")}
+            </Tabs.Tab>
+          </Tabs.List>
 
-            <Tabs.Panel value="basic">
-              <Stack gap="sm">
-                <Select label={t('exam.form.certification')} placeholder={t('exam.form.selectCertification')} data={certOptions} value={certificationId} onChange={setCertificationId} size="sm" searchable required />
-                <TextInput label={t('exam.form.titleEn')} placeholder={t('exam.form.titleEnPlaceholder')} value={titleEn} onChange={(e) => setTitleEn(e.currentTarget.value)} size="sm" required />
-                <TextInput label={t('exam.form.titleAm')} placeholder={t('exam.form.titleAmPlaceholder')} value={titleAm} onChange={(e) => setTitleAm(e.currentTarget.value)} size="sm" required />
-                <Textarea label={t('exam.form.directionEn')} placeholder={t('exam.form.directionEnPlaceholder')} value={directionEn} onChange={(e) => setDirectionEn(e.currentTarget.value)} size="sm" autosize minRows={2} />
-                <Textarea label={t('exam.form.directionAm')} placeholder={t('exam.form.directionAmPlaceholder')} value={directionAm} onChange={(e) => setDirectionAm(e.currentTarget.value)} size="sm" autosize minRows={2} />
-                <TextInput label={t('exam.form.examDate')} type="date" value={date} onChange={(e) => setDate(e.currentTarget.value)} size="sm" leftSection={<IconCalendar size={14} />} required />
-                <TextInput label={t('exam.form.venue')} placeholder={t('exam.form.venuePlaceholder')} value={venue} onChange={(e) => setVenue(e.currentTarget.value)} size="sm" required />
+          <Tabs.Panel value="basic">
+            <Stack gap="sm">
+              <Select
+                label={t("exam.form.certification")}
+                placeholder={t("exam.form.selectCertification")}
+                data={certOptions}
+                value={certificationId}
+                onChange={setCertificationId}
+                size="sm"
+                searchable
+                required
+              />
+              <TextInput
+                label={t("exam.form.titleEn")}
+                placeholder={t("exam.form.titleEnPlaceholder")}
+                value={titleEn}
+                onChange={(e) => setTitleEn(e.currentTarget.value)}
+                size="sm"
+                required
+              />
+              <TextInput
+                label={t("exam.form.titleAm")}
+                placeholder={t("exam.form.titleAmPlaceholder")}
+                value={titleAm}
+                onChange={(e) => setTitleAm(e.currentTarget.value)}
+                size="sm"
+                required
+              />
+              <Textarea
+                label={t("exam.form.directionEn")}
+                placeholder={t("exam.form.directionEnPlaceholder")}
+                value={directionEn}
+                onChange={(e) => setDirectionEn(e.currentTarget.value)}
+                size="sm"
+                autosize
+                minRows={2}
+              />
+              <Textarea
+                label={t("exam.form.directionAm")}
+                placeholder={t("exam.form.directionAmPlaceholder")}
+                value={directionAm}
+                onChange={(e) => setDirectionAm(e.currentTarget.value)}
+                size="sm"
+                autosize
+                minRows={2}
+              />
+              <AmharicDatePicker
+                label={t("exam.form.examDate")}
+                value={date}
+                onChange={setDate}
+                dateFormat="date"
+                size="sm"
+                required
+              />
+              <TextInput
+                label={t("exam.form.venue")}
+                placeholder={t("exam.form.venuePlaceholder")}
+                value={venue}
+                onChange={(e) => setVenue(e.currentTarget.value)}
+                size="sm"
+                required
+              />
 
-                <Text fz="sm" fw={500}>{t('exam.form.timeAllowed')}</Text>
-                <Group gap="sm" grow>
-                  <NumberInput label={t('exam.form.days')} value={days} onChange={(v) => setDays(Number(v))} min={0} size="sm" />
-                  <NumberInput label={t('exam.form.hours')} value={hours} onChange={(v) => setHours(Number(v))} min={0} size="sm" />
-                  <NumberInput label={t('exam.form.minutes')} value={minutes} onChange={(v) => setMinutes(Number(v))} min={0} size="sm" />
-                </Group>
-              </Stack>
-            </Tabs.Panel>
+              <Text fz="sm" fw={500}>
+                {t("exam.form.timeAllowed")}
+              </Text>
+              <Group gap="sm" grow>
+                <NumberInput
+                  label={t("exam.form.days")}
+                  value={days}
+                  onChange={(v) => setDays(Number(v))}
+                  min={0}
+                  size="sm"
+                />
+                <NumberInput
+                  label={t("exam.form.hours")}
+                  value={hours}
+                  onChange={(v) => setHours(Number(v))}
+                  min={0}
+                  size="sm"
+                />
+                <NumberInput
+                  label={t("exam.form.minutes")}
+                  value={minutes}
+                  onChange={(v) => setMinutes(Number(v))}
+                  min={0}
+                  size="sm"
+                />
+              </Group>
+            </Stack>
+          </Tabs.Panel>
 
-            <Tabs.Panel value="settings">
-              <Stack gap="sm">
-                <SimpleGrid cols={2} spacing="sm">
-                  <Select label={t('exam.columns.type')} placeholder="Written or Oral" data={[{ value: 'WRITTEN', label: t('exam.form.written') }, { value: 'ORAL', label: t('exam.form.oral') }]} value={type} onChange={setType} size="sm" required />
-                  <Select label={t('exam.columns.form')} placeholder="Essay or Choice" data={[{ value: 'ESSAY', label: t('exam.form.essay') }, { value: 'CHOICE', label: t('exam.form.choice') }]} value={form} onChange={setForm} size="sm" required />
-                  <Select label={t('exam.detail.administration')} placeholder="Offline or Online" data={[{ value: 'OFFLINE', label: t('exam.form.offline') }, { value: 'ONLINE', label: t('exam.form.online') }]} value={adminMethod} onChange={setAdminMethod} size="sm" required />
-                  <Select label={t('exam.detail.evaluation')} placeholder="How to compute score" data={[{ value: 'SUM', label: t('exam.form.sum') }, { value: 'AVERAGE', label: t('exam.form.average') }, { value: 'PERCENTAGE', label: t('exam.form.percentage') }]} value={evalMethod} onChange={setEvalMethod} size="sm" required />
-                  <Select label={t('exam.detail.selection')} placeholder="Manual or Random" data={[{ value: 'MANUAL', label: t('exam.form.manual') }, { value: 'RANDOM', label: t('exam.form.random') }]} value={selMethod} onChange={setSelMethod} size="sm" />
-                  <NumberInput label={t('exam.form.cuttingPoint')} placeholder={t('exam.form.cuttingPointPlaceholder')} value={cuttingPoint} onChange={(v) => setCuttingPoint(Number(v))} min={0} size="sm" required />
-                </SimpleGrid>
-                {editing && (
-                  <Select label={t('exam.form.status')} placeholder={t('exam.form.statusPlaceholder')} data={[
-                    { value: 'PENDING', label: t('exam.form.pending') }, { value: 'ACTIVE', label: t('exam.form.active') },
-                    { value: 'COMPLETED', label: t('exam.form.completed') }, { value: 'CANCELLED', label: t('exam.form.cancelled') },
-                    { value: 'POSTPONED', label: t('exam.form.postponed') }, { value: 'PUBLISHED', label: t('exam.form.published') },
-                  ]} value={status} onChange={setStatus} size="sm" />
-                )}
-              </Stack>
-            </Tabs.Panel>
-          </Tabs>
+          <Tabs.Panel value="settings">
+            <Stack gap="sm">
+              <SimpleGrid cols={2} spacing="sm">
+                <Select
+                  label={t("exam.columns.type")}
+                  placeholder="Written or Oral"
+                  data={[
+                    { value: "WRITTEN", label: t("exam.form.written") },
+                    { value: "ORAL", label: t("exam.form.oral") },
+                  ]}
+                  value={type}
+                  onChange={setType}
+                  size="sm"
+                  required
+                />
+                <Select
+                  label={t("exam.columns.form")}
+                  placeholder="Essay or Choice"
+                  data={[
+                    { value: "ESSAY", label: t("exam.form.essay") },
+                    { value: "CHOICE", label: t("exam.form.choice") },
+                  ]}
+                  value={form}
+                  onChange={setForm}
+                  size="sm"
+                  required
+                />
+                <Select
+                  label={t("exam.detail.administration")}
+                  placeholder="Offline or Online"
+                  data={[
+                    { value: "OFFLINE", label: t("exam.form.offline") },
+                    { value: "ONLINE", label: t("exam.form.online") },
+                  ]}
+                  value={adminMethod}
+                  onChange={setAdminMethod}
+                  size="sm"
+                  required
+                />
+                <Select
+                  label={t("exam.detail.evaluation")}
+                  placeholder="How to compute score"
+                  data={[
+                    { value: "SUM", label: t("exam.form.sum") },
+                    { value: "AVERAGE", label: t("exam.form.average") },
+                    { value: "PERCENTAGE", label: t("exam.form.percentage") },
+                  ]}
+                  value={evalMethod}
+                  onChange={setEvalMethod}
+                  size="sm"
+                  required
+                />
+                <Select
+                  label={t("exam.detail.selection")}
+                  placeholder="Manual or Random"
+                  data={[
+                    { value: "MANUAL", label: t("exam.form.manual") },
+                    { value: "RANDOM", label: t("exam.form.random") },
+                  ]}
+                  value={selMethod}
+                  onChange={setSelMethod}
+                  size="sm"
+                />
+                <NumberInput
+                  label={t("exam.form.cuttingPoint")}
+                  placeholder={t("exam.form.cuttingPointPlaceholder")}
+                  value={cuttingPoint}
+                  onChange={(v) => setCuttingPoint(Number(v))}
+                  min={0}
+                  size="sm"
+                  required
+                />
+              </SimpleGrid>
+              {editing && (
+                <Select
+                  label={t("exam.form.status")}
+                  placeholder={t("exam.form.statusPlaceholder")}
+                  data={[
+                    { value: "PENDING", label: t("exam.form.pending") },
+                    { value: "ACTIVE", label: t("exam.form.active") },
+                    { value: "COMPLETED", label: t("exam.form.completed") },
+                    { value: "CANCELLED", label: t("exam.form.cancelled") },
+                    { value: "POSTPONED", label: t("exam.form.postponed") },
+                    { value: "PUBLISHED", label: t("exam.form.published") },
+                  ]}
+                  value={status}
+                  onChange={setStatus}
+                  size="sm"
+                />
+              )}
+            </Stack>
+          </Tabs.Panel>
+        </Tabs>
 
-          <Group justify="flex-end" mt="md">
-            <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>
-          </Group>
+        <ModalFooter mt="md">
+          <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>
+        </ModalFooter>
       </form>
-    </Paper>
+    </Modal>
   );
 }
 
 export function ExamPage() {
   const navigate = useNavigate();
   const { t, i18n } = useTranslation();
-  const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
+  const locale = i18n.language as "en" | "am";
   const { data: certRes } = useGetCertificationsQuery();
-  const { data, isLoading, isError } = useGetExamsQuery();
+  const { data, isFetching, isError, refetch } = useGetExamsQuery();
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [createExam, { isLoading: isCreating }] = useCreateExamMutation();
   const [updateExam, { isLoading: isUpdating }] = useUpdateExamMutation();
   const [deleteExam] = useDeleteExamMutation();
@@ -162,26 +363,40 @@ export function ExamPage() {
   const [editing, setEditing] = useState<Exam | null>(null);
   const [showForm, setShowForm] = useState(false);
   const [deleteTarget, setDeleteTarget] = useState<Exam | null>(null);
-  const [deleteOpened, { open: openDelete, close: closeDelete }] = useDisclosure(false);
+  const [deleteOpened, { open: openDelete, close: closeDelete }] =
+    useDisclosure(false);
 
-  const certOptions = certifications.filter((c) => c.isActive).map((c) => ({ value: c.id, label: c.name[locale] }));
-  const getCertName = (id: string) => certifications.find((c) => c.id === id)?.name?.[locale] ?? '-';
+  const certOptions = certifications
+    .filter((c) => c.isActive)
+    .map((c) => ({ value: c.id, label: c.name[locale] }));
+  const getCertName = (id: string) =>
+    certifications.find((c) => c.id === id)?.name?.[locale] ?? "-";
 
-  const resetForm = () => { setEditing(null); setShowForm(false); };
+  const resetForm = () => {
+    setEditing(null);
+    setShowForm(false);
+  };
 
   const handleSubmit = async (values: any, isEdit: boolean) => {
     const payload: any = {
       certificationId: values.certificationId,
       title: { en: values.titleEn, am: values.titleAm },
-      direction: values.directionEn || values.directionAm ? { en: values.directionEn, am: values.directionAm } : undefined,
+      direction:
+        values.directionEn || values.directionAm
+          ? { en: values.directionEn, am: values.directionAm }
+          : undefined,
       date: values.date,
-      givenTime: { days: values.days, hours: values.hours, minutes: values.minutes },
+      givenTime: {
+        days: values.days,
+        hours: values.hours,
+        minutes: values.minutes,
+      },
       type: values.type,
       form: values.form,
       venue: values.venue,
       administrationMethod: values.adminMethod,
       evaluationMethod: values.evalMethod,
-      selectionMethod: values.selMethod || 'MANUAL',
+      selectionMethod: values.selMethod || "MANUAL",
       cuttingPoint: values.cuttingPoint,
     };
     if (isEdit) payload.status = values.status;
@@ -189,14 +404,14 @@ export function ExamPage() {
     try {
       if (isEdit && editing) {
         await updateExam({ id: editing.id, ...payload }).unwrap();
-        notify.success(t('exam.updated'));
+        notify.success(t("exam.updated"));
       } else {
         await createExam(payload).unwrap();
-        notify.success(t('exam.created'));
+        notify.success(t("exam.created"));
       }
       resetForm();
-    } catch {
-      notify.error(t('exam.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
@@ -204,27 +419,143 @@ export function ExamPage() {
     if (!deleteTarget) return;
     try {
       await deleteExam(deleteTarget.id).unwrap();
-      notify.success(t('exam.deleted'));
+      notify.success(t("exam.deleted"));
       closeDelete();
       setDeleteTarget(null);
-    } catch {
-      notify.error(t('exam.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
-  if (isLoading) return <Center py="xl"><Loader /></Center>;
-  if (isError) return <Alert icon={<IconInfoCircle size={16} />} color="red" title={t('exam.loadError')} />;
+  if (isError)
+    return (
+      <Alert
+        icon={<IconInfoCircle size={16} />}
+        color="red"
+        title={t("exam.loadError")}
+      />
+    );
+
+  const columns: AdvancedColumn<Exam>[] = [
+    {
+      header: t("exam.columns.title"),
+      cell: ({ row }) => (
+        <Text
+          fz="sm"
+          fw={500}
+          c="blue"
+          style={{ cursor: "pointer" }}
+          onClick={() => navigate(`/exams/${row.original.id}`)}
+        >
+          {row.original.title[locale]}
+        </Text>
+      ),
+    },
+    {
+      header: t("exam.columns.certification"),
+      cell: ({ row }) => <Text fz="sm">{getCertName(row.original.certificationId)}</Text>,
+    },
+    {
+      header: t("exam.columns.date"),
+      cell: ({ row }) => <Text fz="sm">{row.original.date}</Text>,
+    },
+    {
+      header: t("exam.columns.type"),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={row.original.type === "WRITTEN" ? "blue" : "orange"}>
+          {t(`exam.type.${row.original.type}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t("exam.columns.form"),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={row.original.form === "ESSAY" ? "blue" : "violet"}>
+          {t(`exam.formType.${row.original.form}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t("exam.columns.venue"),
+      cell: ({ row }) => <Text fz="sm">{row.original.venue}</Text>,
+    },
+    {
+      header: t("exam.columns.questions"),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color="gray">
+          {row.original.questions?.length ?? 0}
+        </Badge>
+      ),
+    },
+    {
+      header: t("exam.columns.status"),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={STATUS_COLOR[row.original.status]}>
+          {t(`exam.status.${row.original.status}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t("exam.columns.actions"),
+      align: "right",
+      cell: ({ row }) => (
+        <Group gap="xs">
+          <ActionIcon
+            variant="subtle"
+            color="blue"
+            size="sm"
+            onClick={() => {
+              setEditing(row.original);
+              setShowForm(true);
+            }}
+          >
+            <IconEdit size={14} />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            color="red"
+            size="sm"
+            onClick={() => {
+              setDeleteTarget(row.original);
+              openDelete();
+            }}
+          >
+            <IconTrash size={14} />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            color="red"
+            size="sm"
+            onClick={() => {
+              navigate(`/exams/${row.original.id}`);
+            }}
+          >
+            <IconDetails size={14} />
+          </ActionIcon>
+        </Group>
+      ),
+    },
+  ];
+
+  const page = paginate(exams);
 
   return (
     <Stack gap="lg">
       <Group justify="space-between" align="flex-end">
         <div>
-          <Title order={2}>{t('exam.title')}</Title>
-          <Text fz="sm" c="dimmed">{t('exam.subtitle')}</Text>
+          <Title order={2}>{t("exam.title")}</Title>
+          <Text fz="sm" c="dimmed">
+            {t("exam.subtitle")}
+          </Text>
         </div>
         {!showForm && (
-          <Button variant="light" leftSection={<IconPlus size={16} />} onClick={() => setShowForm(true)} size="sm">
-            {t('exam.add')}
+          <Button
+            variant="light"
+            leftSection={<IconPlus size={16} />}
+            onClick={() => setShowForm(true)}
+            size="sm"
+          >
+            {t("exam.add")}
           </Button>
         )}
       </Group>
@@ -239,70 +570,42 @@ export function ExamPage() {
         />
       )}
 
-      <Paper withBorder radius="md">
-        <Table striped highlightOnHover>
-          <Table.Thead bg="var(--mantine-color-default-hover)">
-            <Table.Tr>
-              <Table.Th>{t('exam.columns.title')}</Table.Th>
-              <Table.Th>{t('exam.columns.certification')}</Table.Th>
-              <Table.Th>{t('exam.columns.date')}</Table.Th>
-              <Table.Th>{t('exam.columns.type')}</Table.Th>
-              <Table.Th>{t('exam.columns.form')}</Table.Th>
-              <Table.Th>{t('exam.columns.venue')}</Table.Th>
-              <Table.Th>{t('exam.columns.questions')}</Table.Th>
-              <Table.Th>{t('exam.columns.status')}</Table.Th>
-              <Table.Th />
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>
-            {exams.map((exam) => (
-              <Table.Tr key={exam.id}>
-                <Table.Td>
-                  <Text fz="sm" fw={500} c="blue" style={{ cursor: 'pointer' }} onClick={() => navigate(`/exams/${exam.id}`)}>
-                    {exam.title[locale]}
-                  </Text>
-                </Table.Td>
-                <Table.Td><Text fz="sm">{getCertName(exam.certificationId)}</Text></Table.Td>
-                <Table.Td><Text fz="sm">{exam.date}</Text></Table.Td>
-                <Table.Td><Badge size="sm" variant="light" color={exam.type === 'WRITTEN' ? 'blue' : 'orange'}>{t(`exam.type.${exam.type}`)}</Badge></Table.Td>
-                <Table.Td><Badge size="sm" variant="light" color={exam.form === 'ESSAY' ? 'blue' : 'violet'}>{t(`exam.formType.${exam.form}`)}</Badge></Table.Td>
-                <Table.Td><Text fz="sm">{exam.venue}</Text></Table.Td>
-                <Table.Td>
-                  <Badge size="sm" variant="light" color="gray">{exam.questions?.length ?? 0}</Badge>
-                </Table.Td>
-                <Table.Td>
-                  <Badge size="sm" variant="light" color={STATUS_COLOR[exam.status]}>{t(`exam.status.${exam.status}`)}</Badge>
-                </Table.Td>
-                <Table.Td>
-                  <Group gap="xs">
-                    <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => { setEditing(exam); setShowForm(true); }}>
-                      <IconEdit size={14} />
-                    </ActionIcon>
-                    <ActionIcon variant="subtle" color="red" size="sm" onClick={() => { setDeleteTarget(exam); openDelete(); }}>
-                      <IconTrash size={14} />
-                    </ActionIcon>
-                  </Group>
-                </Table.Td>
-              </Table.Tr>
-            ))}
-            {exams.length === 0 && (
-              <Table.Tr>
-                <Table.Td colSpan={9}>
-                  <Text c="dimmed" ta="center" py="xl">{t('exam.noItems')}</Text>
-                </Table.Td>
-              </Table.Tr>
-            )}
-          </Table.Tbody>
-        </Table>
-      </Paper>
+      <Card withBorder padding={0}>
+        <AdvancedTable
+          columns={columns}
+          data={page.rows}
+          tableName={t("exam.title")}
+          itemCount={page.itemCount}
+          pageIndex={page.pageIndex}
+          onPageChange={setPageIndex}
+          pageSize={pageSize}
+          onPageSizeChange={setPageSize}
+          refresh={refetch}
+          isLoading={isFetching}
+          emptyText={t("exam.noItems")}
+        />
+      </Card>
 
       {/* Delete confirmation */}
-      <Modal opened={deleteOpened} onClose={closeDelete} title={t('exam.confirmDelete')} size="sm">
-        <Text mb="md">{t('exam.deleteConfirmText', { name: deleteTarget?.title?.[locale] ?? '' })}</Text>
-        <Group justify="flex-end">
-          <Button variant="default" onClick={closeDelete} size="sm">{t('exam.cancel')}</Button>
-          <Button color="red" onClick={handleDelete} size="sm">{t('exam.delete')}</Button>
-        </Group>
+      <Modal
+        opened={deleteOpened}
+        onClose={closeDelete}
+        title={t("exam.confirmDelete")}
+        size="sm"
+      >
+        <Text mb="md">
+          {t("exam.deleteConfirmText", {
+            name: deleteTarget?.title?.[locale] ?? "",
+          })}
+        </Text>
+        <ModalFooter>
+          <Button variant="default" onClick={closeDelete} size="sm">
+            {t("exam.cancel")}
+          </Button>
+          <Button color="red" onClick={handleDelete} size="sm">
+            {t("exam.delete")}
+          </Button>
+        </ModalFooter>
       </Modal>
     </Stack>
   );
diff --git a/apps/backoffice/src/app/features/exam/types/exam.ts b/apps/backoffice/src/app/features/exam/types/exam.ts
index 3d56d0a21..d1a3d3587 100644
--- a/apps/backoffice/src/app/features/exam/types/exam.ts
+++ b/apps/backoffice/src/app/features/exam/types/exam.ts
@@ -1,13 +1,19 @@
-import type { LocalePair } from '../../certification/types/certification';
-import type { EstimatedTime } from '../../question/types/question';
-import type { QuestionForm } from '../../question/types/question';
+import type { LocalePair } from "../../certification/types/certification";
+import type { EstimatedTime } from "../../question/types/question";
+import type { QuestionForm } from "../../question/types/question";
 export type { QuestionForm };
 
-export type ExamType = 'WRITTEN' | 'ORAL';
-export type ExamAdministrationMethod = 'OFFLINE' | 'ONLINE';
-export type ExamEvaluationMethod = 'SUM' | 'AVERAGE' | 'PERCENTAGE';
-export type ExamSelectionMethod = 'MANUAL' | 'RANDOM';
-export type ExamStatus = 'PENDING' | 'ACTIVE' | 'COMPLETED' | 'CANCELLED' | 'POSTPONED' | 'PUBLISHED';
+export type ExamType = "WRITTEN" | "ORAL";
+export type ExamAdministrationMethod = "OFFLINE" | "ONLINE";
+export type ExamEvaluationMethod = "SUM" | "AVERAGE" | "PERCENTAGE";
+export type ExamSelectionMethod = "MANUAL" | "RANDOM";
+export type ExamStatus =
+  | "PENDING"
+  | "ACTIVE"
+  | "COMPLETED"
+  | "CANCELLED"
+  | "POSTPONED"
+  | "PUBLISHED";
 
 export interface QuestionBrief {
   id: string;
diff --git a/apps/backoffice/src/app/features/item/components/ItemTable.tsx b/apps/backoffice/src/app/features/item/components/ItemTable.tsx
index ca7fde9b2..8bf6f83fc 100644
--- a/apps/backoffice/src/app/features/item/components/ItemTable.tsx
+++ b/apps/backoffice/src/app/features/item/components/ItemTable.tsx
@@ -1,7 +1,8 @@
 import { Table, Badge, ActionIcon, Text } from '@mantine/core';
 import { IconTrash } from '@tabler/icons-react';
 import { useGetItemsQuery, useDeleteItemMutation, type Item } from '../api/item-api';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 const STATUS_COLORS: Record<Item['status'], string> = {
   DRAFT: 'gray',
@@ -12,13 +13,15 @@ const STATUS_COLORS: Record<Item['status'], string> = {
 export function ItemTable() {
   const { data, isLoading } = useGetItemsQuery({});
   const [deleteItem] = useDeleteItemMutation();
+  const { handleError } = useErrorHandler();
+  const showDate = useDateDisplayer();
 
   const handleDelete = async (id: string) => {
     try {
       await deleteItem(id).unwrap();
       notify.success('Item deleted');
-    } catch {
-      notify.error('Failed to delete item');
+    } catch (e) {
+      handleError(e);
     }
   };
 
@@ -42,7 +45,7 @@ export function ItemTable() {
             <Table.Td>
               <Badge color={STATUS_COLORS[item.status]}>{item.status}</Badge>
             </Table.Td>
-            <Table.Td>{new Date(item.createdAt).toLocaleDateString()}</Table.Td>
+            <Table.Td>{showDate(item.createdAt)}</Table.Td>
             <Table.Td>
               <ActionIcon
                 color="red"
diff --git a/apps/backoffice/src/app/features/license-register/pages/LicenseRegisterPage.tsx b/apps/backoffice/src/app/features/license-register/pages/LicenseRegisterPage.tsx
index 57965d1db..5dc41726b 100644
--- a/apps/backoffice/src/app/features/license-register/pages/LicenseRegisterPage.tsx
+++ b/apps/backoffice/src/app/features/license-register/pages/LicenseRegisterPage.tsx
@@ -19,9 +19,10 @@ import {
 } from '@mantine/core';
 import { IconSearch, IconShieldCog } from '@tabler/icons-react';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   extractErrorMessage,
-  localized,
+  useLocalized,
   useGetLicensesQuery,
   useReinstateLicenseMutation,
   useRevokeLicenseMutation,
@@ -166,6 +167,8 @@ export function LicenseRegisterPage() {
   const [target, setTarget] = useState<IssuedLicense | null>(null);
 
   const items = data?.items ?? [];
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
 
   return (
     <Container size="xl" py="md">
@@ -227,12 +230,12 @@ export function LicenseRegisterPage() {
                   </Table.Td>
                   <Table.Td>
                     <Text size="sm" c="dimmed">
-                      {license.issueDate?.slice(0, 10)}
+                      {showDate(license.issueDate)}
                     </Text>
                   </Table.Td>
                   <Table.Td>
                     <Text size="sm" c="dimmed">
-                      {license.expiryDate?.slice(0, 10)}
+                      {showDate(license.expiryDate)}
                     </Text>
                   </Table.Td>
                   <Table.Td>
diff --git a/apps/backoffice/src/app/features/license-review/components/ActivityRail.tsx b/apps/backoffice/src/app/features/license-review/components/ActivityRail.tsx
index c0913ceb2..4d96ca2d9 100644
--- a/apps/backoffice/src/app/features/license-review/components/ActivityRail.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/ActivityRail.tsx
@@ -20,6 +20,7 @@ import {
   STATUS_LABELS,
   type ApplicationDetail,
 } from '@ema-platform/api';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 type EntryKind = 'status' | 'remark' | 'upload' | 'assignment';
 
@@ -50,7 +51,8 @@ const ICONS: Record<EntryKind, typeof IconArrowRight> = {
  * notifications sent to the applicant are not among them.
  */
 export function ActivityRail({ detail }: { detail: ApplicationDetail }) {
-  const { t, i18n } = useTranslation();
+  const { t } = useTranslation();
+  const showDate = useDateDisplayer();
 
   const entries = useMemo<ActivityEntry[]>(() => {
     const merged: ActivityEntry[] = [];
@@ -69,9 +71,11 @@ export function ActivityRail({ detail }: { detail: ApplicationDetail }) {
           ? t(`review.events.${history.event}`, {
               defaultValue: history.event,
             })
-          : `${history.fromStatus ? STATUS_LABELS[history.fromStatus] : '—'} → ${
-              STATUS_LABELS[history.toStatus]
-            }`,
+          : `${
+              history.fromStatus
+                ? t(`queue.statusValues.${history.fromStatus}`, STATUS_LABELS[history.fromStatus])
+                : '—'
+            } → ${t(`queue.statusValues.${history.toStatus}`, STATUS_LABELS[history.toStatus])}`,
         detail: history.remark ?? undefined,
         color: STATUS_COLORS[history.toStatus],
       });
@@ -159,12 +163,9 @@ export function ActivityRail({ detail }: { detail: ApplicationDetail }) {
                   <Text size="xs" c="dimmed">
                     ·
                   </Text>
-                  <Tooltip
-                    label={new Date(entry.at).toLocaleString(i18n.language)}
-                    withArrow
-                  >
+                  <Tooltip label={showDate(entry.at)} withArrow>
                     <Text size="xs" c="dimmed">
-                      {new Date(entry.at).toLocaleDateString(i18n.language)}
+                      {showDate(entry.at.slice(0, 10))}
                     </Text>
                   </Tooltip>
                 </Group>
diff --git a/apps/backoffice/src/app/features/license-review/components/DecisionBar.tsx b/apps/backoffice/src/app/features/license-review/components/DecisionBar.tsx
index 3c4deefc2..0403cfaad 100644
--- a/apps/backoffice/src/app/features/license-review/components/DecisionBar.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DecisionBar.tsx
@@ -80,7 +80,7 @@ export function DecisionBar({
         {/* Left: where the application stands, and who has it. */}
         <Group gap="sm" wrap="nowrap" style={{ minWidth: 0 }}>
           <Badge color={STATUS_COLORS[status]} variant="light" size="lg">
-            {STATUS_LABELS[status]}
+            {t(`queue.statusValues.${status}`, STATUS_LABELS[status])}
           </Badge>
 
           {assigneeName && (
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 d9df085d5..2c34fc9cd 100644
--- a/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DecisionConfirmModal.tsx
@@ -3,7 +3,6 @@ import {
   Alert,
   Button,
   Checkbox,
-  Group,
   Modal,
   Select,
   Stack,
@@ -13,6 +12,7 @@ import {
 } from '@mantine/core';
 import { IconAlertTriangle } from '@tabler/icons-react';
 import { useTranslation } from 'react-i18next';
+import { ModalFooter } from '@ema-platform/ui';
 import type { ResolvedAction } from '../config/actions';
 
 /** Reason codes offered per action. Free text is always available too. */
@@ -290,7 +290,7 @@ export function DecisionConfirmModal({
           />
         )}
 
-        <Group justify="flex-end">
+        <ModalFooter>
           <Button variant="default" onClick={onClose}>
             {t('common.cancel', 'Cancel')}
           </Button>
@@ -310,7 +310,7 @@ export function DecisionConfirmModal({
           >
             {t(action.labelKey)}
           </Button>
-        </Group>
+        </ModalFooter>
       </Stack>
     </Modal>
   );
diff --git a/apps/backoffice/src/app/features/license-review/components/DocumentsTab.tsx b/apps/backoffice/src/app/features/license-review/components/DocumentsTab.tsx
index 3de93748c..f2f757abd 100644
--- a/apps/backoffice/src/app/features/license-review/components/DocumentsTab.tsx
+++ b/apps/backoffice/src/app/features/license-review/components/DocumentsTab.tsx
@@ -27,6 +27,7 @@ import { useTranslation } from 'react-i18next';
 import {
   useClearDocumentReviewMutation,
   useGetDocumentReviewsQuery,
+  useLocalized,
   useReviewDocumentMutation,
   type Attachment,
   type DocumentRequirement,
@@ -62,6 +63,7 @@ export function DocumentsTab({
   onFlagRemark,
 }: DocumentsTabProps) {
   const { t } = useTranslation();
+  const localized = useLocalized();
   const [preview, setPreview] = useState<Attachment | null>(null);
   const [rejecting, setRejecting] = useState<Record<string, string>>({});
 
@@ -114,6 +116,7 @@ export function DocumentsTab({
   }
 
   const uploadedKeys = new Set(attachments.map((a) => a.documentKey));
+  const requirementByKey = new Map(requirements.map((r) => [r.key, r]));
   const mandatory = requirements.filter((r) => r.mode !== 'OPTIONAL');
   const missing = mandatory.filter((r) => !uploadedKeys.has(r.key));
   const completeness = mandatory.length
@@ -148,7 +151,7 @@ export function DocumentsTab({
           <Alert mt="sm" color="orange" icon={<IconAlertCircle size={16} />} variant="light">
             <Text size="sm">
               {t('review.documents.missing', 'Not yet uploaded')}:{' '}
-              {missing.map((r) => r.name.en ?? r.key).join(', ')}
+              {missing.map((r) => localized(r.name) || r.key).join(', ')}
             </Text>
           </Alert>
         )}
@@ -162,49 +165,56 @@ export function DocumentsTab({
         return (
           <Paper withBorder p="md" key={attachment.id}>
             <Group justify="space-between" wrap="nowrap" align="flex-start">
-              <Group gap="sm" wrap="nowrap" style={{ minWidth: 0 }}>
+              <Group gap="sm" wrap="nowrap" style={{ minWidth: 0, flex: 1 }}>
                 <IconFileText size={20} stroke={1.6} />
-                <div style={{ minWidth: 0 }}>
-                  <Text size="sm" fw={500}>
-                    {attachment.documentKey}
-                  </Text>
+                <div style={{ minWidth: 0, flex: 1 }}>
+                  {/* Badges sit beside the name, not in the outer nowrap row —
+                      that row also has to fit six action buttons, so a long
+                      name plus badges there overflowed its box and the
+                      opaque badge painted over the bleeding text. Nested here
+                      with its own wrap, the name truncates cleanly instead. */}
+                  <Group gap={6} wrap="wrap" align="center">
+                    <Text size="sm" fw={500} truncate style={{ maxWidth: '100%' }}>
+                      {localized(requirementByKey.get(attachment.documentKey)?.name) || attachment.documentKey}
+                    </Text>
+                    {verdict && (
+                      <Tooltip
+                        label={
+                          verdict.reason ??
+                          t('review.documents.reviewedBy', {
+                            name: verdict.reviewedByName ?? '—',
+                            defaultValue: 'Reviewed by {{name}}',
+                          })
+                        }
+                      >
+                        <Badge
+                          color={verdict.decision === 'ACCEPTED' ? 'teal' : 'red'}
+                          variant="light"
+                          size="sm"
+                          leftSection={
+                            verdict.decision === 'ACCEPTED' ? (
+                              <IconCheck size={11} />
+                            ) : (
+                              <IconX size={11} />
+                            )
+                          }
+                        >
+                          {verdict.decision === 'ACCEPTED'
+                            ? t('review.documents.accepted', 'Accepted')
+                            : t('review.documents.rejected', 'Rejected')}
+                        </Badge>
+                      </Tooltip>
+                    )}
+                    {flagged && (
+                      <Badge color="orange" variant="light" size="sm">
+                        {t('review.documents.flagged', 'Correction requested')}
+                      </Badge>
+                    )}
+                  </Group>
                   <Text size="xs" c="dimmed" truncate>
                     {file?.originalName ?? t('review.documents.noFile', 'No file')}
                   </Text>
                 </div>
-                {verdict && (
-                  <Tooltip
-                    label={
-                      verdict.reason ??
-                      t('review.documents.reviewedBy', {
-                        name: verdict.reviewedByName ?? '—',
-                        defaultValue: 'Reviewed by {{name}}',
-                      })
-                    }
-                  >
-                    <Badge
-                      color={verdict.decision === 'ACCEPTED' ? 'teal' : 'red'}
-                      variant="light"
-                      size="sm"
-                      leftSection={
-                        verdict.decision === 'ACCEPTED' ? (
-                          <IconCheck size={11} />
-                        ) : (
-                          <IconX size={11} />
-                        )
-                      }
-                    >
-                      {verdict.decision === 'ACCEPTED'
-                        ? t('review.documents.accepted', 'Accepted')
-                        : t('review.documents.rejected', 'Rejected')}
-                    </Badge>
-                  </Tooltip>
-                )}
-                {flagged && (
-                  <Badge color="orange" variant="light" size="sm">
-                    {t('review.documents.flagged', 'Correction requested')}
-                  </Badge>
-                )}
               </Group>
 
               <Group gap="xs" wrap="nowrap">
@@ -387,7 +397,11 @@ export function DocumentsTab({
         onClose={() => setPreview(null)}
         position="right"
         size="xl"
-        title={preview?.documentKey}
+        title={
+          preview
+            ? localized(requirementByKey.get(preview.documentKey)?.name) || preview.documentKey
+            : ''
+        }
         // Focus is trapped and returned so keyboard users are not dropped at
         // the top of the page when the drawer closes.
         trapFocus
@@ -397,13 +411,13 @@ export function DocumentsTab({
           isPdf ? (
             <iframe
               src={previewFile.url}
-              title={preview?.documentKey ?? 'document'}
+              title={preview?.documentKey ?? t('review.documents.previewFallback', 'document')}
               style={{ width: '100%', height: '80vh', border: 'none' }}
             />
           ) : isImage ? (
             <img
               src={previewFile.url}
-              alt={preview?.documentKey ?? 'document'}
+              alt={preview?.documentKey ?? t('review.documents.previewFallback', 'document')}
               style={{ maxWidth: '100%' }}
             />
           ) : (
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 98ced4ea4..66caa6f6f 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
@@ -1,6 +1,9 @@
 import {
   IconAnchor,
+  IconArrowsExchange,
   IconFileDescription,
+  IconId,
+  IconRubberStamp,
   IconShip,
   IconTruck,
   IconUsers,
@@ -77,6 +80,36 @@ const PRESENTATION: Record<string, LicenseTypePresentation> = {
     icon: IconAnchor,
     detailSections: DEFAULT_SECTIONS,
   },
+  SEAFARER_REGISTRATION: {
+    key: 'SEAFARER_REGISTRATION',
+    icon: IconId,
+    // Person-centric: no company entity, no capital threshold, no staff roles.
+    detailSections: ['overview', 'documents'],
+  },
+  VESSEL_REGISTRATION: {
+    key: 'VESSEL_REGISTRATION',
+    icon: IconAnchor,
+    detailSections: DEFAULT_SECTIONS,
+  },
+  VESSEL_OWNERSHIP_TRANSFER: {
+    key: 'VESSEL_OWNERSHIP_TRANSFER',
+    icon: IconArrowsExchange,
+    // Transfers an existing registration between owners: no company entity,
+    // no capital threshold, no staff roles.
+    detailSections: ['overview', 'documents'],
+  },
+  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: {
+    key: 'ENDORSEMENT_GOC',
+    icon: IconRubberStamp,
+    detailSections: ['overview', 'documents'],
+  },
 };
 
 /** Falls back to a generic presentation so an unseeded type still renders. */
@@ -111,10 +144,15 @@ export interface EligibilityRule {
  * pass/fail line means the rule, the figure it was checked against, and the
  * outcome are all on screen.
  */
+/** Loose enough to accept i18next's real `t` structurally — see sla.ts for
+ *  why this can't just be typed as `TFunction`. */
+type Translate = (key: string, options?: unknown) => string;
+
 export function evaluateEligibility(
   application: LicenseApplication,
   licenseType: LicenseType | undefined,
   locale: string,
+  t: Translate,
 ): EligibilityRule[] {
   const rules: EligibilityRule[] = [];
 
@@ -139,11 +177,18 @@ export function evaluateEligibility(
 
     rules.push({
       id: 'capital-threshold',
-      label: `Paid-up capital ≥ ${format(threshold)}`,
+      label: t('review.eligibilityRule.capitalThreshold', {
+        amount: format(threshold),
+        defaultValue: 'Paid-up capital ≥ {{amount}}',
+      }),
       actual:
         effective === undefined
-          ? 'Not recorded'
-          : `${format(effective)}${verified === undefined ? ' (declared)' : ' (verified)'}`,
+          ? t('review.eligibilityRule.notRecorded', 'Not recorded')
+          : `${format(effective)}${
+              verified === undefined
+                ? t('review.eligibilityRule.declaredSuffix', ' (declared)')
+                : t('review.eligibilityRule.verifiedSuffix', ' (verified)')
+            }`,
       // An unverified declaration is not evidence, so it reads as unknown
       // rather than as a pass the officer never actually made.
       status:
@@ -167,8 +212,10 @@ export function evaluateEligibility(
     ].includes(application.status);
     rules.push({
       id: 'inspection',
-      label: 'Physical inspection completed',
-      actual: inspected ? 'Recorded' : 'Not yet recorded',
+      label: t('review.eligibilityRule.inspectionCompleted', 'Physical inspection completed'),
+      actual: inspected
+        ? t('review.eligibilityRule.recorded', 'Recorded')
+        : t('review.eligibilityRule.notYetRecorded', 'Not yet recorded'),
       status: inspected ? 'pass' : 'unknown',
     });
   }
diff --git a/apps/backoffice/src/app/features/license-review/export.ts b/apps/backoffice/src/app/features/license-review/export.ts
index 92c1dc0e2..6bdc0f0c9 100644
--- a/apps/backoffice/src/app/features/license-review/export.ts
+++ b/apps/backoffice/src/app/features/license-review/export.ts
@@ -1,4 +1,5 @@
-import { STATUS_LABELS, type LicenseApplication } from '@ema-platform/api';
+import { STATUS_LABELS, localized, type LicenseApplication } from '@ema-platform/api';
+import { dateDisplayer } from '@ema-platform/shared';
 import { computeSla } from './sla';
 
 /**
@@ -21,21 +22,19 @@ const COLUMNS: Array<{
   { header: 'Company', value: (a) => a.companyName },
   { header: 'Trade name', value: (a) => a.tradeName },
   { header: 'TIN', value: (a) => a.tinNumber },
-  { header: 'Licence type', value: (a) => a.licenseType?.name?.en ?? a.licenseTypeId },
+  { header: 'Licence type', value: (a, locale) => localized(a.licenseType?.name, locale) || a.licenseTypeId },
   { header: 'Status', value: (a) => STATUS_LABELS[a.status] },
   { header: 'Kind', value: (a) => a.kind },
   { header: 'Assigned officer', value: (a) => a.assignedOfficerId },
   {
     header: 'Submitted',
-    value: (a, locale) =>
-      a.submittedAt ? new Date(a.submittedAt).toLocaleString(locale) : '',
+    value: (a, locale) => (a.submittedAt ? dateDisplayer(a.submittedAt, locale) : ''),
   },
   {
     header: 'Decided',
-    value: (a, locale) =>
-      a.decidedAt ? new Date(a.decidedAt).toLocaleString(locale) : '',
+    value: (a, locale) => (a.decidedAt ? dateDisplayer(a.decidedAt, locale) : ''),
   },
-  { header: 'SLA', value: (a) => computeSla(a).label },
+  { header: 'SLA', value: (a, locale) => computeSla(a, undefined, locale).label },
   { header: 'Adjustment rounds', value: (a) => a.adjustmentRound },
   { header: 'Declared capital', value: (a) => a.capitalAmountDeclared },
   { header: 'Verified capital', value: (a) => a.capitalAmountVerified },
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage.tsx
index 818af2802..be7861ce5 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseQueuePage.tsx
@@ -1,7 +1,6 @@
-import { useCallback, useMemo, useState } from 'react';
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { useCallback, useMemo, useState } from "react";
+import { useNavigate, useParams, useSearchParams } from "react-router-dom";
 import {
-  ActionIcon,
   Badge,
   Button,
   Card,
@@ -9,7 +8,6 @@ import {
   Container,
   Group,
   MultiSelect,
-  Pagination,
   Paper,
   SegmentedControl,
   Select,
@@ -17,29 +15,30 @@ import {
   Stack,
   Kbd,
   Modal,
-  Table,
   Tabs,
   Text,
   TextInput,
   Title,
   Tooltip,
-} from '@mantine/core';
-import { useDebouncedValue } from '@mantine/hooks';
+} from "@mantine/core";
+import { useDebouncedValue } from "@mantine/hooks";
 import {
   IconAlertCircle,
   IconDownload,
-  IconRefresh,
   IconSearch,
   IconSortAscending,
   IconSortDescending,
   IconX,
-} from '@tabler/icons-react';
-import { notifications } from '@mantine/notifications';
-import { useTranslation } from 'react-i18next';
+} from "@tabler/icons-react";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
 import {
+  APPLICANT_NAME_TYPE_KEYS,
   STATUS_COLORS,
   STATUS_LABELS,
+  applicantOrCompanyName,
   extractErrorMessage,
+  localized,
   useClaimApplicationMutation,
   useGetAllApplicationsQuery,
   useGetAssignedToMeQuery,
@@ -50,9 +49,16 @@ import {
   type LicenseApplication,
   type LicenseStatus,
   type QueueFilter,
-} from '@ema-platform/api';
-import { EmptyState, ErrorState } from '@ema-platform/ui';
-import { computeSla } from '../sla';
+} from "@ema-platform/api";
+import {
+  AdvancedTable,
+  EmptyState,
+  ErrorState,
+  AmharicDatePicker,
+  type AdvancedColumn,
+} from "@ema-platform/ui";
+import { dateDisplayer } from "@ema-platform/shared";
+import { computeSla } from "../sla";
 import {
   DEFAULT_VIEW,
   SAVED_VIEWS,
@@ -61,30 +67,30 @@ import {
   searchParamsFromFilter,
   writeLastView,
   type SavedViewId,
-} from '../queue-views';
-import { exportApplicationsCsv } from '../export';
-import { setDensity } from '../../../store/preferences.slice';
-import { useAppDispatch, useAppSelector } from '../../../store/hooks';
-import { KEYBOARD_SHORTCUTS, useQueueKeyboard } from '../useQueueKeyboard';
+} from "../queue-views";
+import { exportApplicationsCsv } from "../export";
+import { setDensity } from "../../../store/preferences.slice";
+import { useAppDispatch, useAppSelector } from "../../../store/hooks";
+import { KEYBOARD_SHORTCUTS, useQueueKeyboard } from "../useQueueKeyboard";
 
-const PAGE_SIZE = 25;
+const PAGE_SIZE = 10;
 const SEARCH_DEBOUNCE_MS = 300;
 
 const ALL_STATUSES: LicenseStatus[] = [
-  'SUBMITTED',
-  'UNDER_REVIEW',
-  'UNDER_EVALUATION',
-  'RESUBMIT_REQUIRED',
-  'INSPECTION_PENDING',
-  'INSPECTION_COMPLETED',
-  'ON_HOLD',
-  'APPROVED',
-  'PAYMENT_PENDING',
-  'PAID',
-  'PAYMENT_CONFIRMED',
-  'CERTIFICATE_ISSUED',
-  'COMPLETED',
-  'REJECTED',
+  "SUBMITTED",
+  "UNDER_REVIEW",
+  "UNDER_EVALUATION",
+  "RESUBMIT_REQUIRED",
+  "INSPECTION_PENDING",
+  "INSPECTION_COMPLETED",
+  "ON_HOLD",
+  "APPROVED",
+  "PAYMENT_PENDING",
+  "PAID",
+  "PAYMENT_CONFIRMED",
+  "CERTIFICATE_ISSUED",
+  "COMPLETED",
+  "REJECTED",
 ];
 
 /**
@@ -104,11 +110,12 @@ export function LicenseQueuePage() {
   const density = useAppSelector((state) => state.preferences.density);
 
   const [view, setView] = useState<SavedViewId>(
-    () => (searchParams.get('view') as SavedViewId) || readLastView(),
+    () => (searchParams.get("view") as SavedViewId) || readLastView(),
   );
-  const [page, setPage] = useState(() => Number(searchParams.get('page')) || 1);
+  const [page, setPage] = useState(() => Number(searchParams.get("page")) || 1);
+  const [pageSize, setPageSize] = useState(PAGE_SIZE);
   const [selected, setSelected] = useState<string[]>([]);
-  const [searchInput, setSearchInput] = useState(searchParams.get('q') ?? '');
+  const [searchInput, setSearchInput] = useState(searchParams.get("q") ?? "");
   const [cursor, setCursor] = useState(0);
   const [helpOpen, setHelpOpen] = useState(false);
   const [debouncedSearch] = useDebouncedValue(searchInput, SEARCH_DEBOUNCE_MS);
@@ -134,22 +141,42 @@ export function LicenseQueuePage() {
       ...urlFilter,
       search: debouncedSearch || undefined,
       licenseTypeId: pinnedTypeId ?? urlFilter.licenseTypeId,
-      take: PAGE_SIZE,
-      skip: (page - 1) * PAGE_SIZE,
+      // No explicit sort in the URL or view → newest submissions first, so
+      // the queue opens showing what most needs attention rather than
+      // whatever order the backend happens to return. "Mine" sorts by
+      // claimedAt instead — officers care when they picked it up, not when
+      // it was originally submitted.
+      sortBy:
+        urlFilter.sortBy ??
+        (activeView.id === "mine" ? "submittedAt" : "submittedAt"),
+      sortDir: urlFilter.sortDir ?? "DESC",
+      take: pageSize,
+      skip: (page - 1) * pageSize,
     }),
-    [activeView, urlFilter, debouncedSearch, pinnedTypeId, page],
+    [activeView, urlFilter, debouncedSearch, pinnedTypeId, page, pageSize],
   );
 
   // One query per source; the two inactive ones are skipped, so switching
   // views costs a single request rather than keeping three in flight.
-  const queueQuery = useGetQueueQuery(filter, { skip: activeView.source !== 'queue' });
-  const mineQuery = useGetAssignedToMeQuery(filter, { skip: activeView.source !== 'mine' });
-  const allQuery = useGetAllApplicationsQuery(filter, { skip: activeView.source !== 'all' });
+  const queueQuery = useGetQueueQuery(filter, {
+    skip: activeView.source !== "queue",
+  });
+  const mineQuery = useGetAssignedToMeQuery(filter, {
+    skip: activeView.source !== "mine",
+  });
+  const allQuery = useGetAllApplicationsQuery(filter, {
+    skip: activeView.source !== "all",
+  });
   const active =
-    activeView.source === 'queue' ? queueQuery : activeView.source === 'mine' ? mineQuery : allQuery;
+    activeView.source === "queue"
+      ? queueQuery
+      : activeView.source === "mine"
+        ? mineQuery
+        : allQuery;
 
   const [claim, { isLoading: claiming }] = useClaimApplicationMutation();
-  const [runExport, { isFetching: exporting }] = useLazyExportApplicationsQuery();
+  const [runExport, { isFetching: exporting }] =
+    useLazyExportApplicationsQuery();
 
   /**
    * Exports every row the filter matches, not just the page on screen.
@@ -158,24 +185,28 @@ export function LicenseQueuePage() {
    */
   async function handleExport() {
     try {
-      const result = await runExport({ ...filter, take: undefined, skip: undefined }).unwrap();
+      const result = await runExport({
+        ...filter,
+        take: undefined,
+        skip: undefined,
+      }).unwrap();
       exportApplicationsCsv(result.items, i18n.language);
       if (result.truncated) {
         notifications.show({
-          color: 'yellow',
-          title: t('queue.exportTruncated', 'Export truncated'),
-          message: t('queue.exportTruncatedBody', {
+          color: "yellow",
+          title: t("queue.exportTruncated", "Export truncated"),
+          message: t("queue.exportTruncatedBody", {
             exported: result.items.length,
             total: result.total,
             defaultValue:
-              'Exported the first {{exported}} of {{total}} rows. Narrow the filter for the rest.',
+              "Exported the first {{exported}} of {{total}} rows. Narrow the filter for the rest.",
           }),
         });
       }
     } catch (err) {
       notifications.show({
-        color: 'red',
-        title: t('queue.exportFailed', 'Export failed'),
+        color: "red",
+        title: t("queue.exportFailed", "Export failed"),
         message: extractErrorMessage(err),
       });
     }
@@ -183,7 +214,6 @@ export function LicenseQueuePage() {
 
   const items = active.data?.items ?? [];
   const total = active.data?.total ?? 0;
-  const pageCount = Math.max(1, Math.ceil(total / PAGE_SIZE));
 
   const updateUrl = useCallback(
     (next: Partial<QueueFilter>, nextView: SavedViewId, nextPage: number) => {
@@ -208,9 +238,11 @@ export function LicenseQueuePage() {
     updateUrl(next, view, 1);
   };
 
-  const toggleSort = (field: NonNullable<QueueFilter['sortBy']>) => {
+  const toggleSort = (field: NonNullable<QueueFilter["sortBy"]>) => {
     const dir =
-      urlFilter.sortBy === field && urlFilter.sortDir !== 'DESC' ? 'DESC' : 'ASC';
+      urlFilter.sortBy === field && urlFilter.sortDir !== "DESC"
+        ? "DESC"
+        : "ASC";
     setFacet({ sortBy: field, sortDir: dir });
   };
 
@@ -218,20 +250,23 @@ export function LicenseQueuePage() {
     try {
       await claim(id).unwrap();
       notifications.show({
-        color: 'teal',
-        title: t('queue.claimed', 'Claimed'),
-        message: t('queue.claimedBody', 'The application is now assigned to you.'),
+        color: "teal",
+        title: t("queue.claimed", "Claimed"),
+        message: t(
+          "queue.claimedBody",
+          "The application is now assigned to you.",
+        ),
       });
-      changeView('mine');
+      changeView("mine");
     } 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'),
+        color: "red",
+        title: t("queue.claimFailed", "Could not claim"),
         message: extractErrorMessage(
           err,
-          t('queue.claimRace', 'Another officer already claimed it.'),
+          t("queue.claimRace", "Another officer already claimed it."),
         ),
       });
       active.refetch();
@@ -242,19 +277,22 @@ export function LicenseQueuePage() {
     const results = await Promise.allSettled(
       selected.map((id) => claim(id).unwrap()),
     );
-    const claimed = results.filter((r) => r.status === 'fulfilled').length;
+    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' }),
+      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', {
+        ? t("queue.bulkClaimPartial", {
             count: lost,
-            defaultValue: '{{count}} were already taken by another officer.',
+            defaultValue: "{{count}} were already taken by another officer.",
           })
-        : '',
+        : "",
     });
     setSelected([]);
     active.refetch();
@@ -263,13 +301,15 @@ export function LicenseQueuePage() {
   const cursorRow = items[cursor];
   useQueueKeyboard({
     enabled: !helpOpen,
-    onNext: () => setCursor((c) => Math.min(c + 1, Math.max(items.length - 1, 0))),
+    onNext: () =>
+      setCursor((c) => Math.min(c + 1, Math.max(items.length - 1, 0))),
     onPrevious: () => setCursor((c) => Math.max(c - 1, 0)),
     onOpen: () => cursorRow && navigate(`/licence-review/${cursorRow.id}`),
     onClaim: () => {
       // Only unclaimed rows can be claimed; pressing c elsewhere is a no-op
       // rather than an error the officer has to read.
-      if (cursorRow && cursorRow.assignedOfficerId === null) handleClaim(cursorRow.id);
+      if (cursorRow && cursorRow.assignedOfficerId === null)
+        handleClaim(cursorRow.id);
     },
     onEscape: () => setSelected([]),
     onHelp: () => setHelpOpen(true),
@@ -277,21 +317,187 @@ export function LicenseQueuePage() {
 
   const allSelected = items.length > 0 && selected.length === items.length;
   const sortIcon =
-    urlFilter.sortDir === 'DESC' ? <IconSortDescending size={13} /> : <IconSortAscending size={13} />;
+    urlFilter.sortDir === "DESC" ? (
+      <IconSortDescending size={13} />
+    ) : (
+      <IconSortAscending size={13} />
+    );
 
   const hasFacets = Boolean(
     urlFilter.status?.length ||
-      urlFilter.licenseTypeId ||
-      urlFilter.assignee ||
-      urlFilter.submittedFrom ||
-      debouncedSearch,
+    urlFilter.licenseTypeId ||
+    urlFilter.assignee ||
+    urlFilter.submittedFrom ||
+    debouncedSearch,
+  );
+
+  const sortableHeader = (
+    label: string,
+    field: NonNullable<QueueFilter["sortBy"]>,
+  ) => (
+    <Group
+      gap={4}
+      wrap="nowrap"
+      style={{ cursor: "pointer" }}
+      onClick={() => toggleSort(field)}
+    >
+      <span>{label}</span>
+      {urlFilter.sortBy === field && sortIcon}
+    </Group>
+  );
+
+  const columns: AdvancedColumn<LicenseApplication>[] = useMemo(
+    () => [
+      {
+        header: (
+          <Checkbox
+            aria-label={t("queue.selectAll", "Select all")}
+            checked={allSelected}
+            indeterminate={selected.length > 0 && !allSelected}
+            onChange={() =>
+              setSelected(allSelected ? [] : items.map((a) => a.id))
+            }
+          />
+        ),
+        size: 40,
+        cell: ({ row }) => (
+          <Checkbox
+            aria-label={t("queue.selectRow", {
+              number: row.original.applicationNumber,
+              defaultValue: "Select {{number}}",
+            })}
+            checked={selected.includes(row.original.id)}
+            onChange={(e) => {
+              const checked = e.currentTarget.checked;
+              setSelected((prev) =>
+                checked
+                  ? [...prev, row.original.id]
+                  : prev.filter((id) => id !== row.original.id),
+              );
+            }}
+          />
+        ),
+      },
+      {
+        header: sortableHeader(t("queue.number", "App #"), "applicationNumber"),
+        label: t("queue.number", "App #"),
+        cell: ({ row }) => (
+          <Text size="sm" fw={500}>
+            {row.original.applicationNumber}
+          </Text>
+        ),
+      },
+      {
+        header: sortableHeader(
+          typeCode && APPLICANT_NAME_TYPE_KEYS.includes(typeCode)
+            ? t("queue.applicant", "Applicant")
+            : t("queue.company", "Company"),
+          "companyName",
+        ),
+        label: t("queue.company", "Company"),
+        cell: ({ row }) => (
+          <Text size="sm">{applicantOrCompanyName(row.original) ?? "—"}</Text>
+        ),
+      },
+      {
+        header: t("queue.tin", "TIN"),
+        cell: ({ row }) => (
+          <Text size="sm" c="dimmed">
+            {row.original.tinNumber ?? "—"}
+          </Text>
+        ),
+      },
+      {
+        header: t("queue.typeCol", "Type"),
+        cell: ({ row }) => (
+          <Text size="sm">
+            {localized(row.original.licenseType?.name, i18n.language) || "—"}
+          </Text>
+        ),
+      },
+      {
+        header: sortableHeader(t("queue.statusCol", "Status"), "status"),
+        label: t("queue.statusCol", "Status"),
+        cell: ({ row }) => (
+          <Badge color={STATUS_COLORS[row.original.status]} variant="light">
+            {t(
+              `queue.statusValues.${row.original.status}`,
+              STATUS_LABELS[row.original.status],
+            )}
+          </Badge>
+        ),
+      },
+      {
+        header: sortableHeader(
+          t("queue.submitted", "Submitted"),
+          "submittedAt",
+        ),
+        label: t("queue.submitted", "Submitted"),
+        cell: ({ row }) => (
+          <Text size="sm" c="dimmed">
+            {dateDisplayer(row.original.submittedAt, i18n.language)}
+          </Text>
+        ),
+      },
+      {
+        header: t("queue.sla", "Age / SLA"),
+        cell: ({ row }) => {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any -- i18next's overloaded TFunction type doesn't structurally match a plain callback signature
+          const sla = computeSla(row.original, undefined, i18n.language, (key, options) => t(key, options as any) as string);
+          return (
+            // Colour is never the only signal — the label says the same thing.
+            <Tooltip label={sla.tooltip} withArrow>
+              <Badge color={sla.color} variant="light" size="sm">
+                {sla.label}
+              </Badge>
+            </Tooltip>
+          );
+        },
+      },
+      {
+        header: "",
+        label: t("queue.actionsColumn", "Actions"),
+        align: "right",
+        size: 140,
+        cell: ({ row }) =>
+          row.original.assignedOfficerId === null &&
+          row.original.status === "SUBMITTED" ? (
+            <Button
+              size="xs"
+              loading={claiming}
+              onClick={() => handleClaim(row.original.id)}
+            >
+              {t("queue.claim", "Claim")}
+            </Button>
+          ) : (
+            <Button
+              size="xs"
+              variant="light"
+              onClick={() => navigate(`/licence-review/${row.original.id}`)}
+            >
+              {t("queue.review", "Review")}
+            </Button>
+          ),
+      },
+    ],
+    [
+      t,
+      i18n.language,
+      urlFilter.sortBy,
+      sortIcon,
+      selected,
+      allSelected,
+      items,
+      claiming,
+      typeCode,
+    ],
   );
 
   return (
-    <Container size="xl" py="md" pb={selected.length ? 80 : 'md'}>
+    <Container size="xl" py="md" pb={selected.length ? 80 : "md"}>
       <Group justify="space-between" mb="md">
         <div>
-          <Title order={3}>{t('queue.title', 'Licence applications')}</Title>
+          <Title order={3}>{t("queue.title", "Licence applications")}</Title>
           {typeCode && (
             <Text size="sm" c="dimmed">
               {t(`nav.type${typeCode}`, { defaultValue: typeCode })}
@@ -299,18 +505,18 @@ export function LicenseQueuePage() {
           )}
         </div>
         <Group gap="xs">
-          <Tooltip label={t('queue.refresh', 'Refresh')}>
-            <ActionIcon variant="default" size="lg" onClick={() => active.refetch()}>
-              <IconRefresh size={18} />
-            </ActionIcon>
-          </Tooltip>
           <SegmentedControl
             size="xs"
             value={density}
-            onChange={(v) => dispatch(setDensity(v as 'comfortable' | 'compact'))}
+            onChange={(v) =>
+              dispatch(setDensity(v as "comfortable" | "compact"))
+            }
             data={[
-              { label: t('queue.comfortable', 'Comfortable'), value: 'comfortable' },
-              { label: t('queue.compact', 'Compact'), value: 'compact' },
+              {
+                label: t("queue.comfortable", "Comfortable"),
+                value: "comfortable",
+              },
+              { label: t("queue.compact", "Compact"), value: "compact" },
             ]}
           />
           <Button
@@ -320,13 +526,17 @@ export function LicenseQueuePage() {
             loading={exporting}
             disabled={total === 0}
           >
-            {t('queue.export', 'Export CSV')}
+            {t("queue.export", "Export CSV")}
           </Button>
         </Group>
       </Group>
 
       {/* Saved views, counted. */}
-      <Tabs value={view} onChange={(v) => changeView((v as SavedViewId) ?? DEFAULT_VIEW)} mb="sm">
+      <Tabs
+        value={view}
+        onChange={(v) => changeView((v as SavedViewId) ?? DEFAULT_VIEW)}
+        mb="sm"
+      >
         <Tabs.List>
           {SAVED_VIEWS.map((savedView) => (
             <Tabs.Tab
@@ -334,7 +544,7 @@ export function LicenseQueuePage() {
               value={savedView.id}
               rightSection={
                 counts?.[savedView.countKey] ? (
-                  <Badge size="xs" variant="light" circle>
+                  <Badge size="xs" variant="light">
                     {counts[savedView.countKey]}
                   </Badge>
                 ) : undefined
@@ -350,17 +560,20 @@ export function LicenseQueuePage() {
       <Paper withBorder p="sm" mb="sm">
         <Group gap="sm" align="flex-end" wrap="wrap">
           <TextInput
-            label={t('queue.search', 'Search')}
-            placeholder={t('queue.searchPlaceholder', 'Company, TIN or number')}
+            label={t("queue.search", "Search")}
+            placeholder={t("queue.searchPlaceholder", "Company, TIN or number")}
             leftSection={<IconSearch size={14} />}
             value={searchInput}
             onChange={(e) => setSearchInput(e.currentTarget.value)}
             w={240}
           />
           <MultiSelect
-            label={t('queue.status', 'Status')}
-            placeholder={t('queue.anyStatus', 'Any')}
-            data={ALL_STATUSES.map((s) => ({ value: s, label: STATUS_LABELS[s] }))}
+            label={t("queue.status", "Status")}
+            placeholder={t("queue.anyStatus", "Any")}
+            data={ALL_STATUSES.map((s) => ({
+              value: s,
+              label: t(`queue.statusValues.${s}`, STATUS_LABELS[s]),
+            }))}
             value={urlFilter.status ?? []}
             onChange={(v) => setFacet({ status: v as LicenseStatus[] })}
             clearable
@@ -368,11 +581,11 @@ export function LicenseQueuePage() {
           />
           {!typeCode && (
             <Select
-              label={t('queue.type', 'Licence type')}
-              placeholder={t('queue.anyType', 'Any')}
+              label={t("queue.type", "Licence type")}
+              placeholder={t("queue.anyType", "Any")}
               data={(licenseTypes?.items ?? []).map((type) => ({
                 value: type.id,
-                label: type.name.en ?? type.key,
+                label: localized(type.name, i18n.language) || type.key,
               }))}
               value={urlFilter.licenseTypeId ?? null}
               onChange={(v) => setFacet({ licenseTypeId: v ?? undefined })}
@@ -380,28 +593,30 @@ export function LicenseQueuePage() {
               w={220}
             />
           )}
-          <TextInput
-            type="date"
-            label={t('queue.submittedFrom', 'Submitted from')}
-            value={urlFilter.submittedFrom ?? ''}
-            onChange={(e) => setFacet({ submittedFrom: e.currentTarget.value || undefined })}
+          <AmharicDatePicker
+            label={t("queue.submittedFrom", "Submitted from")}
+            value={urlFilter.submittedFrom ?? ""}
+            onChange={(v) => setFacet({ submittedFrom: v || undefined })}
+            dateFormat="date"
+            w={170}
           />
-          <TextInput
-            type="date"
-            label={t('queue.submittedTo', 'Submitted to')}
-            value={urlFilter.submittedTo ?? ''}
-            onChange={(e) => setFacet({ submittedTo: e.currentTarget.value || undefined })}
+          <AmharicDatePicker
+            label={t("queue.submittedTo", "Submitted to")}
+            value={urlFilter.submittedTo ?? ""}
+            onChange={(v) => setFacet({ submittedTo: v || undefined })}
+            dateFormat="date"
+            w={170}
           />
           {hasFacets && (
             <Button
               variant="subtle"
               leftSection={<IconX size={14} />}
               onClick={() => {
-                setSearchInput('');
+                setSearchInput("");
                 setSearchParams(new URLSearchParams(), { replace: true });
               }}
             >
-              {t('queue.clearFilters', 'Clear')}
+              {t("queue.clearFilters", "Clear")}
             </Button>
           )}
         </Group>
@@ -418,7 +633,7 @@ export function LicenseQueuePage() {
           </Stack>
         ) : active.isError ? (
           <ErrorState
-            title={t('queue.errorTitle', 'Could not load the queue')}
+            title={t("queue.errorTitle", "Could not load the queue")}
             description={extractErrorMessage(active.error)}
             onRetry={() => active.refetch()}
             icon={IconAlertCircle}
@@ -427,114 +642,73 @@ export function LicenseQueuePage() {
           <EmptyState
             title={
               hasFacets
-                ? t('queue.emptyFiltered', 'No applications match these filters')
-                : t('queue.empty', 'Nothing waiting here')
+                ? t(
+                    "queue.emptyFiltered",
+                    "No applications match these filters",
+                  )
+                : t("queue.empty", "Nothing waiting here")
             }
             description={
               hasFacets
-                ? t('queue.emptyFilteredBody', 'Try widening or clearing the filters.')
-                : t('queue.emptyBody', 'New applications will appear here as they are submitted.')
+                ? t(
+                    "queue.emptyFilteredBody",
+                    "Try widening or clearing the filters.",
+                  )
+                : t(
+                    "queue.emptyBody",
+                    "New applications will appear here as they are submitted.",
+                  )
             }
             action={
               hasFacets
                 ? {
-                    label: t('queue.clearFilters', 'Clear'),
-                    onClick: () => setSearchParams(new URLSearchParams(), { replace: true }),
+                    label: t("queue.clearFilters", "Clear"),
+                    onClick: () =>
+                      setSearchParams(new URLSearchParams(), { replace: true }),
                   }
                 : undefined
             }
           />
         ) : (
           <>
-            <Table.ScrollContainer minWidth={1100}>
-              <Table highlightOnHover verticalSpacing={density === "compact" ? 4 : "sm"}>
-                <Table.Thead>
-                  <Table.Tr>
-                    <Table.Th w={40}>
-                      <Checkbox
-                        aria-label={t('queue.selectAll', 'Select all')}
-                        checked={allSelected}
-                        indeterminate={selected.length > 0 && !allSelected}
-                        onChange={() =>
-                          setSelected(allSelected ? [] : items.map((a) => a.id))
-                        }
-                      />
-                    </Table.Th>
-                    <SortableTh
-                      label={t('queue.number', 'App #')}
-                      field="applicationNumber"
-                      current={urlFilter.sortBy}
-                      icon={sortIcon}
-                      onSort={toggleSort}
-                    />
-                    <SortableTh
-                      label={t('queue.company', 'Company')}
-                      field="companyName"
-                      current={urlFilter.sortBy}
-                      icon={sortIcon}
-                      onSort={toggleSort}
-                    />
-                    <Table.Th>{t('queue.tin', 'TIN')}</Table.Th>
-                    <Table.Th>{t('queue.typeCol', 'Type')}</Table.Th>
-                    <SortableTh
-                      label={t('queue.statusCol', 'Status')}
-                      field="status"
-                      current={urlFilter.sortBy}
-                      icon={sortIcon}
-                      onSort={toggleSort}
-                    />
-                    <SortableTh
-                      label={t('queue.submitted', 'Submitted')}
-                      field="submittedAt"
-                      current={urlFilter.sortBy}
-                      icon={sortIcon}
-                      onSort={toggleSort}
-                    />
-                    <Table.Th>{t('queue.sla', 'Age / SLA')}</Table.Th>
-                    <Table.Th />
-                  </Table.Tr>
-                </Table.Thead>
-                <Table.Tbody>
-                  {items.map((app, index) => (
-                    <QueueRow
-                      key={app.id}
-                      app={app}
-                      focused={index === cursor}
-                      selected={selected.includes(app.id)}
-                      claiming={claiming}
-                      locale={i18n.language}
-                      onSelect={(checked) =>
-                        setSelected((prev) =>
-                          checked ? [...prev, app.id] : prev.filter((id) => id !== app.id),
-                        )
-                      }
-                      onClaim={() => handleClaim(app.id)}
-                      onOpen={() => navigate(`/licence-review/${app.id}`)}
-                    />
-                  ))}
-                </Table.Tbody>
-              </Table>
-            </Table.ScrollContainer>
-
-            <Group justify="space-between" p="sm">
+            <Group justify="flex-end" p="sm" pb={0}>
               <Text size="sm" c="dimmed">
-                {t('queue.showing', {
-                  from: (page - 1) * PAGE_SIZE + 1,
-                  to: Math.min(page * PAGE_SIZE, total),
+                {t("queue.showing", {
+                  from: (page - 1) * pageSize + 1,
+                  to: Math.min(page * pageSize, total),
                   total,
-                  defaultValue: 'Showing {{from}}–{{to}} of {{total}}',
+                  defaultValue: "Showing {{from}}–{{to}} of {{total}}",
                 })}
               </Text>
-              <Pagination
-                value={page}
-                onChange={(next) => {
-                  setPage(next);
-                  updateUrl({}, view, next);
-                }}
-                total={pageCount}
-                size="sm"
-              />
             </Group>
+            <AdvancedTable
+              columns={columns}
+              data={items}
+              tableName={t("queue.title", "Licence applications")}
+              itemCount={total}
+              pageIndex={page - 1}
+              onPageChange={(pageIndex) => {
+                const next = pageIndex + 1;
+                setPage(next);
+                updateUrl({}, view, next);
+              }}
+              pageSize={pageSize}
+              onPageSizeChange={(next) => {
+                setPageSize(next);
+                setPage(1);
+                updateUrl({}, view, 1);
+              }}
+              refresh={() => active.refetch()}
+              isLoading={active.isFetching}
+              verticalSpacing={density === "compact" ? 4 : "sm"}
+              rowStyle={(_row, index) =>
+                // Keyboard cursor. A left border rather than a background keeps
+                // it distinguishable from row selection and from hover.
+                index === cursor
+                  ? { boxShadow: "inset 3px 0 0 var(--mantine-color-blue-6)" }
+                  : undefined
+              }
+            />
           </>
         )}
       </Card>
@@ -542,7 +716,7 @@ export function LicenseQueuePage() {
       <Modal
         opened={helpOpen}
         onClose={() => setHelpOpen(false)}
-        title={t('shortcuts.title', 'Keyboard shortcuts')}
+        title={t("shortcuts.title", "Keyboard shortcuts")}
         size="sm"
       >
         <Stack gap="xs">
@@ -562,18 +736,18 @@ export function LicenseQueuePage() {
           withBorder
           shadow="md"
           p="sm"
-          style={{ position: 'sticky', bottom: 16, zIndex: 50 }}
+          style={{ position: "sticky", bottom: 16, zIndex: 50 }}
         >
           <Group justify="space-between">
             <Text size="sm" fw={500}>
-              {t('queue.selectedCount', {
+              {t("queue.selectedCount", {
                 count: selected.length,
-                defaultValue: '{{count}} selected',
+                defaultValue: "{{count}} selected",
               })}
             </Text>
             <Group gap="xs">
               <Button variant="subtle" onClick={() => setSelected([])}>
-                {t('common.cancel', 'Cancel')}
+                {t("common.cancel", "Cancel")}
               </Button>
               <Button
                 variant="default"
@@ -585,12 +759,12 @@ export function LicenseQueuePage() {
                   )
                 }
               >
-                {t('queue.export', 'Export CSV')}
+                {t("queue.export", "Export CSV")}
               </Button>
               <Button loading={claiming} onClick={handleBulkClaim}>
-                {t('queue.bulkClaim', {
+                {t("queue.bulkClaim", {
                   count: selected.length,
-                  defaultValue: 'Claim {{count}}',
+                  defaultValue: "Claim {{count}}",
                 })}
               </Button>
             </Group>
@@ -601,122 +775,4 @@ export function LicenseQueuePage() {
   );
 }
 
-function SortableTh({
-  label,
-  field,
-  current,
-  icon,
-  onSort,
-}: {
-  label: string;
-  field: NonNullable<QueueFilter['sortBy']>;
-  current?: QueueFilter['sortBy'];
-  icon: React.ReactNode;
-  onSort: (field: NonNullable<QueueFilter['sortBy']>) => void;
-}) {
-  return (
-    <Table.Th>
-      <Group
-        gap={4}
-        wrap="nowrap"
-        style={{ cursor: 'pointer' }}
-        onClick={() => onSort(field)}
-      >
-        <span>{label}</span>
-        {current === field && icon}
-      </Group>
-    </Table.Th>
-  );
-}
-
-function QueueRow({
-  app,
-  selected,
-  focused,
-  claiming,
-  locale,
-  onSelect,
-  onClaim,
-  onOpen,
-}: {
-  app: LicenseApplication;
-  selected: boolean;
-  focused: boolean;
-  claiming: boolean;
-  locale: string;
-  onSelect: (checked: boolean) => void;
-  onClaim: () => void;
-  onOpen: () => void;
-}) {
-  const { t } = useTranslation();
-  const sla = computeSla(app);
-
-  return (
-    <Table.Tr
-      // Keyboard cursor. Marked with a left border rather than a background so
-      // it stays distinguishable from row selection and from hover.
-      style={
-        focused
-          ? { boxShadow: 'inset 3px 0 0 var(--mantine-color-blue-6)' }
-          : undefined
-      }
-    >
-      <Table.Td>
-        <Checkbox
-          aria-label={t('queue.selectRow', { number: app.applicationNumber, defaultValue: 'Select {{number}}' })}
-          checked={selected}
-          onChange={(e) => onSelect(e.currentTarget.checked)}
-        />
-      </Table.Td>
-      <Table.Td>
-        <Text size="sm" fw={500}>
-          {app.applicationNumber}
-        </Text>
-      </Table.Td>
-      <Table.Td>
-        <Text size="sm">{app.companyName ?? '—'}</Text>
-      </Table.Td>
-      <Table.Td>
-        <Text size="sm" c="dimmed">
-          {app.tinNumber ?? '—'}
-        </Text>
-      </Table.Td>
-      <Table.Td>
-        <Text size="sm">{app.licenseType?.name?.en ?? '—'}</Text>
-      </Table.Td>
-      <Table.Td>
-        <Badge color={STATUS_COLORS[app.status]} variant="light">
-          {STATUS_LABELS[app.status]}
-        </Badge>
-      </Table.Td>
-      <Table.Td>
-        <Text size="sm" c="dimmed">
-          {app.submittedAt ? new Date(app.submittedAt).toLocaleDateString(locale) : '—'}
-        </Text>
-      </Table.Td>
-      <Table.Td>
-        {/* Colour is never the only signal — the label says the same thing. */}
-        <Tooltip label={sla.tooltip} withArrow>
-          <Badge color={sla.color} variant="light" size="sm">
-            {sla.label}
-          </Badge>
-        </Tooltip>
-      </Table.Td>
-      <Table.Td align="right">
-        <Group gap="xs" justify="flex-end" wrap="nowrap">
-          {app.assignedOfficerId === null && app.status === 'SUBMITTED' ? (
-            <Button size="xs" loading={claiming} onClick={onClaim}>
-              {t('queue.claim', 'Claim')}
-            </Button>
-          ) : (
-            <Button size="xs" variant="light" onClick={onOpen}>
-              {t('queue.review', 'Review')}
-            </Button>
-          )}
-        </Group>
-      </Table.Td>
-    </Table.Tr>
-  );
-}
-
 export default LicenseQueuePage;
diff --git a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage.tsx b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage.tsx
index 426b76e7f..b9e7c41ef 100644
--- a/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage.tsx
+++ b/apps/backoffice/src/app/features/license-review/pages/LicenseReviewPage.tsx
@@ -39,6 +39,7 @@ import {
   STATUS_COLORS,
   STATUS_LABELS,
   extractErrorMessage,
+  useLocalized,
   useApproveDocumentsMutation,
   useAssignApplicationMutation,
   useCompleteReviewMutation,
@@ -46,6 +47,7 @@ import {
   useEscalateApplicationMutation,
   useFinalApproveMutation,
   useGetApplicationForReviewQuery,
+  useGetAttachmentsQuery,
   useGetInspectionsQuery,
   useGetAssignableOfficersQuery,
   useGetLicenseTypeRequirementsQuery,
@@ -57,7 +59,8 @@ import {
   useScheduleInspectionMutation,
   type RemarkTargetType,
 } from '@ema-platform/api';
-import { ErrorState } from '@ema-platform/ui';
+import { ErrorState, ModalFooter, AmharicDatePicker } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import { usePermissions } from '@ema-platform/auth';
 import { useAppSelector } from '../../../store/hooks';
 import { DecisionBar } from '../components/DecisionBar';
@@ -79,10 +82,10 @@ type FlagMap = Record<string, { targetType: RemarkTargetType; remark: string }>;
  * that fills it in.
  */
 const INSPECTION_CHECKLIST_ITEMS = [
-  { key: 'office_premises', label: 'Office premises' },
-  { key: 'storage_facilities', label: 'Warehouse / storage facilities' },
-  { key: 'vehicles_equipment', label: 'Vehicles / equipment' },
-  { key: 'safety_compliance', label: 'Safety & regulatory compliance' },
+  { key: 'office_premises', labelKey: 'review.checklist.officePremises', fallback: 'Office premises' },
+  { key: 'storage_facilities', labelKey: 'review.checklist.storageFacilities', fallback: 'Warehouse / storage facilities' },
+  { key: 'vehicles_equipment', labelKey: 'review.checklist.vehiclesEquipment', fallback: 'Vehicles / equipment' },
+  { key: 'safety_compliance', labelKey: 'review.checklist.safetyCompliance', fallback: 'Safety & regulatory compliance' },
 ] as const;
 
 function buildChecklist(
@@ -90,7 +93,9 @@ function buildChecklist(
 ) {
   return INSPECTION_CHECKLIST_ITEMS.map((item) => ({
     key: item.key,
-    label: item.label,
+    // Persisted as-is (stable English), not the officer's display language —
+    // this is an audit record, not UI text.
+    label: item.fallback,
     // Untouched rows default to PASS — the segmented control shows exactly
     // that, so what the officer saw is what gets recorded.
     outcome: outcomes[item.key] ?? 'PASS',
@@ -108,6 +113,8 @@ function buildChecklist(
  */
 export function LicenseReviewPage() {
   const { t, i18n } = useTranslation();
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
   const { id = '' } = useParams();
   const { can } = usePermissions();
   const currentUserId = useAppSelector((state) => state.auth.user?.id) ?? '';
@@ -122,6 +129,13 @@ export function LicenseReviewPage() {
     { idOrKey: data?.application.licenseTypeId ?? '', kind: data?.application.kind ?? 'NEW' },
     { skip: !data?.application.licenseTypeId },
   );
+  // Staff role names are already bilingual on the config — the wire data only
+  // carries the role key (e.g. 'CAPTAIN'), so this is what turns it back into
+  // the label an officer reads.
+  const roleNameByKey = useMemo(
+    () => new Map(requirements?.staffRoleRequirements.map((r) => [r.roleKey, r.name]) ?? []),
+    [requirements],
+  );
 
   const [completeReview] = useCompleteReviewMutation();
   const [requestAdjustment] = useRequestAdjustmentMutation();
@@ -200,7 +214,7 @@ export function LicenseReviewPage() {
           return {
             key,
             label: member
-              ? `${member.roleKey} — ${member.fullName}`
+              ? `${localized(roleNameByKey.get(member.roleKey)) || member.roleKey} — ${member.fullName}`
               : t('review.staffMember', 'Staff member'),
           };
         }
@@ -210,7 +224,7 @@ export function LicenseReviewPage() {
         return { key, label: key };
       }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [flags, data?.staff, t],
+    [flags, data?.staff, t, localized, roleNameByKey],
   );
 
   const actions = useMemo(() => {
@@ -267,8 +281,10 @@ export function LicenseReviewPage() {
   const app = data.application;
   const status = app.status;
   const presentation = presentationFor(app.licenseType?.key);
-  const sla = computeSla(app);
-  const eligibility = evaluateEligibility(app, app.licenseType, i18n.language);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- i18next's overloaded TFunction type doesn't structurally match a plain callback signature
+  const sla = computeSla(app, undefined, i18n.language, (key, options) => t(key, options as any) as string);
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- i18next's overloaded TFunction type doesn't structurally match a plain callback signature
+  const eligibility = evaluateEligibility(app, app.licenseType, i18n.language, (key, options) => t(key, options as any) as string);
 
   const rawThreshold = app.licenseType?.capitalThreshold;
   const threshold =
@@ -482,6 +498,12 @@ export function LicenseReviewPage() {
 
   const sections = presentation.detailSections;
   const formSections = Object.entries(app.formData ?? {});
+  // The bilingual section/field labels the applicant's wizard renders — this
+  // page already fetches them (`requirements` above) but used to fall back to
+  // the raw formData keys, so an officer saw `vesselId` instead of a label in
+  // either language.
+  const configSections = requirements?.licenseType.formSchema.sections ?? [];
+  const sectionsByKey = new Map(configSections.map((s) => [s.key, s]));
 
   return (
     <Container size="xl" py="md">
@@ -493,7 +515,7 @@ export function LicenseReviewPage() {
               {app.applicationNumber}
             </Text>
             <Badge color={STATUS_COLORS[status]} variant="light">
-              {STATUS_LABELS[status]}
+              {t(`queue.statusValues.${status}`, STATUS_LABELS[status])}
             </Badge>
             {app.adjustmentRound > 0 && (
               <Badge color="orange" variant="light" size="sm">
@@ -530,16 +552,12 @@ export function LicenseReviewPage() {
                 {t('review.summary', 'Summary')}
               </Text>
               <Stack gap={6}>
-                <SummaryRow label={t('review.type', 'Type')} value={app.licenseType?.name?.en} />
+                <SummaryRow label={t('review.type', 'Type')} value={localized(app.licenseType?.name)} />
                 <SummaryRow label={t('review.tin', 'TIN')} value={app.tinNumber} />
-                <SummaryRow label={t('review.kind', 'Kind')} value={app.kind} />
+                <SummaryRow label={t('review.kind', 'Kind')} value={t(`review.kindValues.${app.kind}`, app.kind)} />
                 <SummaryRow
                   label={t('review.submitted', 'Submitted')}
-                  value={
-                    app.submittedAt
-                      ? new Date(app.submittedAt).toLocaleDateString(i18n.language)
-                      : undefined
-                  }
+                  value={showDate(app.submittedAt)}
                 />
                 <SummaryRow label={t('review.slaLabel', 'SLA')} value={sla.label} />
               </Stack>
@@ -598,12 +616,12 @@ export function LicenseReviewPage() {
                     key={entry.id}
                     title={
                       <Text size="xs" fw={600}>
-                        {STATUS_LABELS[entry.toStatus] ?? entry.toStatus}
+                        {t(`queue.statusValues.${entry.toStatus}`, STATUS_LABELS[entry.toStatus] ?? entry.toStatus)}
                       </Text>
                     }
                   >
                     <Text size="xs" c="dimmed">
-                      {new Date(entry.createdAt).toLocaleDateString(i18n.language)}
+                      {showDate(entry.createdAt)}
                     </Text>
                   </Timeline.Item>
                 ))}
@@ -640,11 +658,18 @@ export function LicenseReviewPage() {
 
             <Tabs.Panel value="overview">
               <Stack>
-                {formSections.map(([sectionKey, values]) => (
+                {formSections.map(([sectionKey, values]) => {
+                  const sectionConfig = sectionsByKey.get(sectionKey);
+                  const fieldsByKey = new Map(
+                    (sectionConfig?.fields ?? []).map((f) => [f.key, f]),
+                  );
+                  return (
                   <Card withBorder key={sectionKey} padding="md">
                     <Group justify="space-between" mb="xs">
                       <Text fw={600} size="sm" tt="capitalize">
-                        {sectionKey.replace(/([A-Z])/g, ' $1')}
+                        {sectionConfig
+                          ? localized(sectionConfig.title)
+                          : sectionKey.replace(/([A-Z])/g, ' $1')}
                       </Text>
                       <Checkbox
                         size="xs"
@@ -655,18 +680,21 @@ export function LicenseReviewPage() {
                     </Group>
                     <Table withTableBorder>
                       <Table.Tbody>
-                        {Object.entries(values ?? {}).map(([k, v]) => (
+                        {Object.entries(values ?? {}).map(([k, v]) => {
+                          const fieldConfig = fieldsByKey.get(k);
+                          return (
                           <Table.Tr key={k}>
                             <Table.Td w="40%">
                               <Text size="xs" c="dimmed">
-                                {k}
+                                {fieldConfig ? localized(fieldConfig.label) : k}
                               </Text>
                             </Table.Td>
                             <Table.Td>
                               <Text size="sm">{v === null ? '—' : String(v)}</Text>
                             </Table.Td>
                           </Table.Tr>
-                        ))}
+                          );
+                        })}
                       </Table.Tbody>
                     </Table>
                     {flags[sectionKey] && (
@@ -703,7 +731,8 @@ export function LicenseReviewPage() {
                       />
                     )}
                   </Card>
-                ))}
+                  );
+                })}
               </Stack>
             </Tabs.Panel>
 
@@ -779,19 +808,13 @@ export function LicenseReviewPage() {
                     {data.staff.map((member) => (
                       <Table.Tr key={member.id}>
                         <Table.Td>
-                          <Text size="xs">{member.roleKey}</Text>
+                          <Text size="xs">{localized(roleNameByKey.get(member.roleKey)) || member.roleKey}</Text>
                         </Table.Td>
                         <Table.Td>
                           <Text size="sm">{member.fullName}</Text>
                         </Table.Td>
                         <Table.Td>
-                          <Group gap={4}>
-                            {(member.documents ?? []).map((doc) => (
-                              <Badge key={doc.id} size="xs" variant="light">
-                                {doc.documentKey}
-                              </Badge>
-                            ))}
-                          </Group>
+                          <StaffEvidenceCell staffId={member.id} fallback={member.documents} />
                         </Table.Td>
                         {/* A person's papers are as returnable as a document
                             or a form section: an ERB certificate for the wrong
@@ -853,7 +876,7 @@ export function LicenseReviewPage() {
                         <div>
                           <Text size="sm">
                             {inspection.scheduledDate
-                              ? new Date(inspection.scheduledDate).toLocaleString(i18n.language)
+                              ? showDate(inspection.scheduledDate)
                               : t('review.unscheduled', 'Not scheduled')}
                           </Text>
                           {inspection.findings && (
@@ -866,7 +889,11 @@ export function LicenseReviewPage() {
                           variant="light"
                           color={inspection.result === 'FAILED' ? 'red' : 'teal'}
                         >
-                          {inspection.result ?? inspection.status}
+                          {inspection.result === 'PASSED'
+                            ? t('review.passed', 'Passed')
+                            : inspection.result === 'FAILED'
+                              ? t('review.failed', 'Failed')
+                              : t(`review.inspectionStatus.${inspection.status}`, inspection.status)}
                         </Badge>
                       </Group>
                     ))}
@@ -921,13 +948,13 @@ export function LicenseReviewPage() {
         title={t('review.actions.scheduleInspection', 'Schedule inspection')}
       >
         <Stack>
-          <TextInput
-            type="datetime-local"
+          <AmharicDatePicker
             label={t('review.dateTime', 'Date and time')}
             value={inspectionDate}
-            onChange={(e) => setInspectionDate(e.currentTarget.value)}
+            onChange={setInspectionDate}
+            withTime
           />
-          <Group justify="flex-end">
+          <ModalFooter>
             <Tooltip
               label={t('review.pickDate', 'Pick a date and time first')}
               disabled={Boolean(inspectionDate)}
@@ -949,7 +976,7 @@ export function LicenseReviewPage() {
                 run(async () => {
                   await scheduleInspection({
                     applicationId: id,
-                    scheduledDate: new Date(inspectionDate).toISOString(),
+                    scheduledDate: inspectionDate,
                   }).unwrap();
                   setInspectionOpen(false);
                 }, t('review.done.scheduled', 'Inspection scheduled'))
@@ -957,7 +984,7 @@ export function LicenseReviewPage() {
             >
               <IconCheck size={18} />
             </ActionIcon>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
 
@@ -972,7 +999,7 @@ export function LicenseReviewPage() {
           <Stack gap={6}>
             {INSPECTION_CHECKLIST_ITEMS.map((item) => (
               <Group key={item.key} justify="space-between" wrap="nowrap">
-                <Text size="sm">{item.label}</Text>
+                <Text size="sm">{t(item.labelKey, item.fallback)}</Text>
                 <SegmentedControl
                   size="xs"
                   value={checklist[item.key] ?? 'PASS'}
@@ -1005,7 +1032,7 @@ export function LicenseReviewPage() {
             autosize
             minRows={3}
           />
-          <Group grow>
+          <ModalFooter grow>
             <ActionIcon
               variant="light"
               color="teal"
@@ -1054,13 +1081,58 @@ export function LicenseReviewPage() {
             >
               <IconX size={18} />
             </ActionIcon>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
     </Container>
   );
 }
 
+/**
+ * Evidence badges for one staff member.
+ *
+ * `application-for-review` nests a `documents` array per staff member, but it
+ * doesn't always carry the uploaded file (the portal's own upload widget
+ * hits the attachments endpoint directly for the same reason). Query
+ * attachments by owner here too, so the officer gets a working link instead
+ * of a badge with nowhere to go.
+ */
+function StaffEvidenceCell({
+  staffId,
+  fallback,
+}: {
+  staffId: string;
+  fallback?: { id: string; documentKey: string; files: { url?: string }[] }[];
+}) {
+  const { data: attachments } = useGetAttachmentsQuery({
+    ownerType: 'APPLICATION_STAFF',
+    ownerId: staffId,
+  });
+  const docs = attachments?.length ? attachments : (fallback ?? []);
+
+  return (
+    <Group gap={4}>
+      {docs.map((doc) => {
+        const url = doc.files?.[0]?.url;
+        return (
+          <Badge
+            key={doc.id}
+            size="xs"
+            variant="light"
+            component={url ? 'a' : undefined}
+            href={url}
+            target={url ? '_blank' : undefined}
+            rel={url ? 'noreferrer' : undefined}
+            style={url ? { cursor: 'pointer' } : undefined}
+          >
+            {doc.documentKey}
+          </Badge>
+        );
+      })}
+    </Group>
+  );
+}
+
 function SummaryRow({ label, value }: { label: string; value?: string | null }) {
   return (
     <Group justify="space-between" gap="xs" wrap="nowrap">
diff --git a/apps/backoffice/src/app/features/license-review/sla.ts b/apps/backoffice/src/app/features/license-review/sla.ts
index eba525cb6..e56d03ea9 100644
--- a/apps/backoffice/src/app/features/license-review/sla.ts
+++ b/apps/backoffice/src/app/features/license-review/sla.ts
@@ -1,4 +1,5 @@
 import type { LicenseApplication } from '@ema-platform/api';
+import { dateDisplayer } from '@ema-platform/shared';
 
 /** Amber once this much of the window has been consumed. */
 const WARNING_RATIO = 0.7;
@@ -17,6 +18,19 @@ export interface SlaState {
   ratio: number;
 }
 
+/** Loose enough to accept i18next's real `t` structurally; callers pass that
+ *  one, and a plain function falls back to English by resolving
+ *  `defaultValue` itself, so `computeSla` still works with no i18n context
+ *  (the CSV export). */
+export type SlaTranslate = (key: string, options?: unknown) => string;
+
+function tr(t: SlaTranslate | undefined, key: string, options: Record<string, unknown> | string): string {
+  if (t) return t(key, options);
+  if (typeof options === 'string') return options;
+  const template = String(options['defaultValue'] ?? '');
+  return template.replace(/\{\{(\w+)\}\}/g, (_, name) => String(options[name] ?? ''));
+}
+
 function formatDuration(ms: number): string {
   const hours = Math.floor(Math.abs(ms) / HOUR_MS);
   if (hours < 1) return '<1h';
@@ -35,6 +49,8 @@ function formatDuration(ms: number): string {
 export function computeSla(
   application: LicenseApplication,
   now: number = Date.now(),
+  language = 'en',
+  t?: SlaTranslate,
 ): SlaState {
   const slaHours = application.licenseType?.slaHours;
   const submittedAt = application.submittedAt;
@@ -44,7 +60,7 @@ export function computeSla(
       state: 'untracked',
       color: 'gray',
       label: '—',
-      tooltip: 'No turnaround target is set for this licence type.',
+      tooltip: tr(t, 'review.sla.untracked', 'No turnaround target is set for this licence type.'),
       ratio: 0,
     };
   }
@@ -54,15 +70,23 @@ export function computeSla(
   const elapsed = (application.decidedAt ? new Date(application.decidedAt).getTime() : now) - submitted;
   const window = slaHours * HOUR_MS;
   const ratio = Math.min(Math.max(elapsed / window, 0), 1);
-  const targetText = `Target ${slaHours}h from submission (${new Date(target).toLocaleString()})`;
+  const targetText = tr(t, 'review.sla.target', {
+    hours: slaHours,
+    date: dateDisplayer(target, language),
+    defaultValue: 'Target {{hours}}h from submission ({{date}})',
+  });
 
   if (application.decidedAt) {
     const met = elapsed <= window;
     return {
       state: 'decided',
       color: met ? 'teal' : 'gray',
-      label: met ? 'Met' : 'Missed',
-      tooltip: `Decided in ${formatDuration(elapsed)}. ${targetText}`,
+      label: tr(t, met ? 'review.sla.met' : 'review.sla.missed', met ? 'Met' : 'Missed'),
+      tooltip: tr(t, 'review.sla.decidedIn', {
+        duration: formatDuration(elapsed),
+        target: targetText,
+        defaultValue: 'Decided in {{duration}}. {{target}}',
+      }),
       ratio,
     };
   }
@@ -72,8 +96,15 @@ export function computeSla(
     return {
       state: 'breached',
       color: 'red',
-      label: `Overdue ${formatDuration(remaining)}`,
-      tooltip: `Overdue by ${formatDuration(remaining)}. ${targetText}`,
+      label: tr(t, 'review.sla.overdue', {
+        duration: formatDuration(remaining),
+        defaultValue: 'Overdue {{duration}}',
+      }),
+      tooltip: tr(t, 'review.sla.overdueBy', {
+        duration: formatDuration(remaining),
+        target: targetText,
+        defaultValue: 'Overdue by {{duration}}. {{target}}',
+      }),
       ratio: 1,
     };
   }
@@ -82,8 +113,15 @@ export function computeSla(
   return {
     state: used >= WARNING_RATIO ? 'warning' : 'ok',
     color: used >= WARNING_RATIO ? 'yellow' : 'teal',
-    label: `${formatDuration(remaining)} left`,
-    tooltip: `${formatDuration(remaining)} remaining. ${targetText}`,
+    label: tr(t, 'review.sla.left', {
+      duration: formatDuration(remaining),
+      defaultValue: '{{duration}} left',
+    }),
+    tooltip: tr(t, 'review.sla.remaining', {
+      duration: formatDuration(remaining),
+      target: targetText,
+      defaultValue: '{{duration}} remaining. {{target}}',
+    }),
     ratio,
   };
 }
diff --git a/apps/backoffice/src/app/features/location/components/LocationTree.tsx b/apps/backoffice/src/app/features/location/components/LocationTree.tsx
index b8f443721..311c7622e 100644
--- a/apps/backoffice/src/app/features/location/components/LocationTree.tsx
+++ b/apps/backoffice/src/app/features/location/components/LocationTree.tsx
@@ -11,6 +11,7 @@ import {
   Box,
   rem,
   Center,
+  useMantineColorScheme,
 } from '@mantine/core';
 import {
   IconChevronRight,
@@ -21,6 +22,7 @@ import {
 import { useGetLocationsQuery } from '../api/location-api';
 import type { Location } from '../types/location';
 import { useTranslation } from 'react-i18next';
+import { useLocalized } from '@ema-platform/api';
 
 interface LocationTreeProps {
   selectedId: string | null;
@@ -50,10 +52,15 @@ function TreeNode({
   onSelect: (location: Location) => void;
   depth: number;
 }) {
+  const localized = useLocalized();
   const [opened, setOpened] = useState(depth < 1);
   const isSelected = selectedId === location.id;
   const hasChildren =
     Array.isArray(location.children) && location.children.length > 0;
+  const { colorScheme } = useMantineColorScheme();
+  const hoverBg = colorScheme === 'dark'
+    ? 'var(--mantine-color-dark-6)'
+    : 'var(--mantine-color-gray-0)';
 
   const toggle = useCallback(() => {
     setOpened((prev) => !prev);
@@ -88,8 +95,7 @@ function TreeNode({
         }}
         onMouseEnter={(e) => {
           if (!isSelected)
-            e.currentTarget.style.backgroundColor =
-              'var(--mantine-color-gray-0)';
+            e.currentTarget.style.backgroundColor = hoverBg;
         }}
         onMouseLeave={(e) => {
           if (!isSelected)
@@ -130,7 +136,7 @@ function TreeNode({
           style={{ flexShrink: 0, opacity: 0.6 }}
         />
         <Text size="sm" truncate style={{ flex: 1 }}>
-          {location.names.en}
+          {localized(location.names)}
         </Text>
       </UnstyledButton>
       {hasChildren && (
diff --git a/apps/backoffice/src/app/features/location/components/LocationTypeModal.tsx b/apps/backoffice/src/app/features/location/components/LocationTypeModal.tsx
index 8db7faa67..84f05ab29 100644
--- a/apps/backoffice/src/app/features/location/components/LocationTypeModal.tsx
+++ b/apps/backoffice/src/app/features/location/components/LocationTypeModal.tsx
@@ -22,7 +22,7 @@ import {
   useUpdateLocationTypeMutation,
   useDeleteLocationTypeMutation,
 } from '../api/location-api';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler } from '@ema-platform/ui';
 
 interface LocationTypeFormValues {
   code: string;
@@ -34,6 +34,7 @@ interface LocationTypeFormValues {
 export function LocationTypeModal({ opened, onClose }: { opened: boolean; onClose: () => void }) {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
   const { data: locationTypes, isLoading } = useGetLocationTypesQuery();
   const [createType] = useCreateLocationTypeMutation();
   const [updateType] = useUpdateLocationTypeMutation();
@@ -84,8 +85,8 @@ export function LocationTypeModal({ opened, onClose }: { opened: boolean; onClos
     try {
       await deleteType(id).unwrap();
       notify.success(t('location.typeDeleted'));
-    } catch {
-      notify.error(t('location.deleteError'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
@@ -99,8 +100,8 @@ export function LocationTypeModal({ opened, onClose }: { opened: boolean; onClos
         notify.success(t('location.typeCreated'));
       }
       resetForm();
-    } catch {
-      notify.error(t('location.typeError'));
+    } catch (e) {
+      handleError(e);
     }
   });
 
diff --git a/apps/backoffice/src/app/features/location/pages/LocationPage.tsx b/apps/backoffice/src/app/features/location/pages/LocationPage.tsx
index e8b4f333b..0e2954a82 100644
--- a/apps/backoffice/src/app/features/location/pages/LocationPage.tsx
+++ b/apps/backoffice/src/app/features/location/pages/LocationPage.tsx
@@ -17,7 +17,7 @@ import {
 import { useDisclosure } from '@mantine/hooks';
 import { IconSettings, IconMap, IconInfoCircle, IconPlus } from '@tabler/icons-react';
 import { useTranslation } from 'react-i18next';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler, ModalFooter } from '@ema-platform/ui';
 import { LocationTree } from '../components/LocationTree';
 import { LocationDetail } from '../components/LocationDetail';
 import { LocationForm } from '../components/LocationForm';
@@ -33,6 +33,7 @@ import type { Location } from '../types/location';
 export function LocationPage() {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
   const { data: locationTypesRes, isLoading: typesLoading } = useGetLocationTypesQuery();
   const [createLocation, { isLoading: isCreating }] = useCreateLocationMutation();
   const [updateLocation, { isLoading: isUpdating }] = useUpdateLocationMutation();
@@ -82,11 +83,11 @@ export function LocationPage() {
         closeFormModal();
         setEditingLocation(null);
         setParentLocation(null);
-      } catch {
-        notify.error(t('location.error'));
+      } catch (e) {
+        handleError(e);
       }
     },
-    [editingLocation, createLocation, updateLocation, closeFormModal, t],
+    [editingLocation, createLocation, updateLocation, closeFormModal, handleError],
   );
 
   const handleDeleteConfirm = useCallback(async () => {
@@ -96,10 +97,10 @@ export function LocationPage() {
       notify.success(t('location.deleted'));
       setSelectedLocation(null);
       closeDeleteModal();
-    } catch {
-      notify.error(t('location.deleteError'));
+    } catch (e) {
+      handleError(e);
     }
-  }, [selectedLocation, deleteLocation, closeDeleteModal, t]);
+  }, [selectedLocation, deleteLocation, closeDeleteModal, handleError]);
 
   if (typesLoading) {
     return (
@@ -225,14 +226,14 @@ export function LocationPage() {
             name: selectedLocation?.names[locale] ?? '',
           })}
         </Text>
-        <Group justify="flex-end">
+        <ModalFooter>
           <Button variant="default" onClick={closeDeleteModal} size="sm">
             {t('location.cancel')}
           </Button>
           <Button color="red" onClick={handleDeleteConfirm} size="sm">
             {t('location.delete')}
           </Button>
-        </Group>
+        </ModalFooter>
       </Modal>
 
       <LocationTypeModal opened={typeModalOpened} onClose={closeTypeModal} />
diff --git a/apps/backoffice/src/app/features/medical-verification/pages/MedicalVerificationPage.tsx b/apps/backoffice/src/app/features/medical-verification/pages/MedicalVerificationPage.tsx
index ee874f416..c99ee9d38 100644
--- a/apps/backoffice/src/app/features/medical-verification/pages/MedicalVerificationPage.tsx
+++ b/apps/backoffice/src/app/features/medical-verification/pages/MedicalVerificationPage.tsx
@@ -1,15 +1,15 @@
-import { useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   Badge,
   Button,
-  Card,
   Center,
   Container,
   Group,
   Loader,
   Modal,
+  Paper,
   Stack,
-  Table,
   Tabs,
   Text,
   Textarea,
@@ -18,12 +18,17 @@ import {
 import {
   IconAnchor,
   IconCheck,
+  IconEye,
+  IconInbox,
+  IconPaperclip,
   IconStethoscope,
   IconX,
 } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import { AdvancedTable, notify, type AdvancedColumn } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   extractErrorMessage,
+  useGetAttachmentsQuery,
   useGetPendingMedicalQuery,
   useGetPendingSeaServiceQuery,
   useVerifyMedicalCertificateMutation,
@@ -35,6 +40,8 @@ import type {
   SeafarerProfileSummary,
 } from '@ema-platform/api';
 
+const PAGE_SIZE = 10;
+
 function ownerName(profile?: SeafarerProfileSummary): string {
   if (!profile) return '—';
   return (
@@ -58,12 +65,13 @@ function RejectModal({
   onConfirm: (remark: string) => void;
   loading: boolean;
 }) {
+  const { t } = useTranslation();
   const [remark, setRemark] = useState('');
   return (
     <Modal opened={opened} onClose={onClose} title={title} centered>
       <Stack>
         <Textarea
-          label="What must the seafarer fix?"
+          label={t('recordVerification.rejectReasonLabel', 'What must the seafarer fix?')}
           required
           minRows={2}
           value={remark}
@@ -71,7 +79,7 @@ function RejectModal({
         />
         <Group justify="flex-end">
           <Button variant="default" onClick={onClose}>
-            Cancel
+            {t('recordVerification.cancel', 'Cancel')}
           </Button>
           <Button
             color="red"
@@ -82,7 +90,7 @@ function RejectModal({
               setRemark('');
             }}
           >
-            Reject
+            {t('recordVerification.reject', 'Reject')}
           </Button>
         </Group>
       </Stack>
@@ -90,6 +98,93 @@ function RejectModal({
   );
 }
 
+/** Attachments / Evidence Modal for viewing uploaded files for a record */
+function AttachmentsModal({
+  opened,
+  ownerType,
+  ownerId,
+  title,
+  onClose,
+}: {
+  opened: boolean;
+  ownerType: 'MEDICAL_CERTIFICATE' | 'SEA_SERVICE_RECORD';
+  ownerId: string | null;
+  title: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation();
+  const { data: attachments, isLoading } = useGetAttachmentsQuery(
+    { ownerType, ownerId: ownerId ?? '' },
+    { skip: !ownerId },
+  );
+
+  const files = useMemo(
+    () => (attachments ?? []).flatMap((a) => a.files ?? []),
+    [attachments],
+  );
+
+  return (
+    <Modal opened={opened} onClose={onClose} title={title} size="md" centered>
+      <Stack gap="sm">
+        {isLoading ? (
+          <Center py="xl">
+            <Loader size="sm" />
+          </Center>
+        ) : files.length === 0 ? (
+          <Center py="xl">
+            <Group gap="xs" c="dimmed">
+              <IconInbox size={18} />
+              <Text size="sm" c="dimmed">
+                {t(
+                  'recordVerification.noAttachments',
+                  'No evidence attachments uploaded for this record.',
+                )}
+              </Text>
+            </Group>
+          </Center>
+        ) : (
+          files.map((file) => (
+            <Paper key={file.id} withBorder p="xs" radius="sm">
+              <Group justify="space-between" wrap="nowrap">
+                <Group gap="xs" wrap="nowrap" style={{ minWidth: 0 }}>
+                  <IconPaperclip size={18} />
+                  <div style={{ minWidth: 0 }}>
+                    <Text size="sm" fw={500} truncate>
+                      {file.originalName}
+                    </Text>
+                    {file.sizeBytes && (
+                      <Text size="xs" c="dimmed">
+                        {(file.sizeBytes / 1024).toFixed(1)} KB
+                      </Text>
+                    )}
+                  </div>
+                </Group>
+                {file.url ? (
+                  <Button
+                    size="compact-xs"
+                    variant="light"
+                    leftSection={<IconEye size={14} />}
+                    component="a"
+                    href={file.url}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {t('recordVerification.view', 'View')}
+                  </Button>
+                ) : (
+                  <Badge size="sm" variant="light" color="gray">
+                    {t('recordVerification.noUrl', 'No URL')}
+                  </Badge>
+                )}
+              </Group>
+            </Paper>
+          ))
+        )}
+      </Stack>
+    </Modal>
+  );
+}
+
 /**
  * The record-verification workspace (US-SSM-003/007): everything seafarers
  * have submitted and no officer has ruled on yet, oldest first. VERIFIED
@@ -97,234 +192,383 @@ function RejectModal({
  * certificate starts satisfying the submission gate.
  */
 export function MedicalVerificationPage() {
-  const { data: pendingMedical, isLoading: loadingMedical } =
-    useGetPendingMedicalQuery();
-  const { data: pendingSeaService, isLoading: loadingSeaService } =
-    useGetPendingSeaServiceQuery();
+  const { t } = useTranslation();
+  const {
+    data: pendingMedical,
+    isLoading: loadingMedical,
+    isFetching: fetchingMedical,
+    refetch: refetchMedical,
+  } = useGetPendingMedicalQuery();
+
+  const {
+    data: pendingSeaService,
+    isLoading: loadingSeaService,
+    isFetching: fetchingSeaService,
+    refetch: refetchSeaService,
+  } = useGetPendingSeaServiceQuery();
+
   const [verifyMedical, { isLoading: rulingMedical }] =
     useVerifyMedicalCertificateMutation();
   const [verifySeaService, { isLoading: rulingSeaService }] =
     useVerifySeaServiceRecordMutation();
+
   const [rejectMedical, setRejectMedical] = useState<MedicalCertificate | null>(
     null,
   );
   const [rejectSeaService, setRejectSeaService] =
     useState<SeaServiceRecord | null>(null);
 
-  const rule = async (
-    run: () => Promise<unknown>,
-    done: string,
-  ): Promise<void> => {
-    try {
-      await run();
-      notify.success(done);
-    } catch (error) {
-      notify.error(extractErrorMessage(error, 'Could not record the ruling'));
-    }
-  };
+  const [attachmentModal, setAttachmentModal] = useState<{
+    ownerType: 'MEDICAL_CERTIFICATE' | 'SEA_SERVICE_RECORD';
+    ownerId: string;
+    title: string;
+  } | null>(null);
+
+  const showDate = useDateDisplayer();
+
+  const [medicalPage, setMedicalPage] = useState(0);
+  const [seaServicePage, setSeaServicePage] = useState(0);
+  const [medicalPageSize, setMedicalPageSize] = useState(PAGE_SIZE);
+  const [seaServicePageSize, setSeaServicePageSize] = useState(PAGE_SIZE);
+
+  const rule = useCallback(
+    async (run: () => Promise<unknown>, done: string): Promise<void> => {
+      try {
+        await run();
+        notify.success(done);
+      } catch (error) {
+        notify.error(
+          extractErrorMessage(error, t('recordVerification.rulingFailed', 'Could not record the ruling')),
+        );
+      }
+    },
+    [t],
+  );
+
+  const pendingMedicalList = useMemo(
+    () => pendingMedical ?? [],
+    [pendingMedical],
+  );
+  const pendingSeaServiceList = useMemo(
+    () => pendingSeaService ?? [],
+    [pendingSeaService],
+  );
+
+  const pagedMedical = useMemo(() => {
+    const start = medicalPage * medicalPageSize;
+    return pendingMedicalList.slice(start, start + medicalPageSize);
+  }, [pendingMedicalList, medicalPage, medicalPageSize]);
+
+  const pagedSeaService = useMemo(() => {
+    const start = seaServicePage * seaServicePageSize;
+    return pendingSeaServiceList.slice(start, start + seaServicePageSize);
+  }, [pendingSeaServiceList, seaServicePage, seaServicePageSize]);
+
+  const handleMedicalPageSizeChange = useCallback((size: number) => {
+    setMedicalPageSize(size);
+    setMedicalPage(0);
+  }, []);
+
+  const handleSeaServicePageSizeChange = useCallback((size: number) => {
+    setSeaServicePageSize(size);
+    setSeaServicePage(0);
+  }, []);
+
+  const medicalColumns: AdvancedColumn<MedicalCertificate>[] = useMemo(
+    () => [
+      {
+        header: t('recordVerification.columns.seafarer', 'Seafarer'),
+        label: t('recordVerification.columns.seafarer', 'Seafarer'),
+        accessorKey: 'profile.firstName',
+        cell: ({ row }) => (
+          <div>
+            <Text size="sm" fw={500}>
+              {ownerName(row.original.profile)}
+            </Text>
+            {row.original.profile?.seafarerNumber && (
+              <Text size="xs" c="dimmed" ff="monospace">
+                {row.original.profile.seafarerNumber}
+              </Text>
+            )}
+          </div>
+        ),
+      },
+      {
+        header: t('recordVerification.columns.issuer', 'Issuer'),
+        label: t('recordVerification.columns.issuer', 'Issuer'),
+        accessorKey: 'issuerName',
+        cell: ({ row }) => (
+          <div>
+            <Text size="sm">{row.original.issuerName}</Text>
+            {row.original.certificateNumber && (
+              <Text size="xs" c="dimmed">
+                № {row.original.certificateNumber}
+              </Text>
+            )}
+          </div>
+        ),
+      },
+      {
+        header: t('recordVerification.columns.validity', 'Validity'),
+        label: t('recordVerification.columns.validity', 'Validity'),
+        cell: ({ row }) => (
+          <Text size="sm">
+            {showDate(row.original.issueDate)} → {showDate(row.original.expiryDate)}
+          </Text>
+        ),
+      },
+      {
+        header: t('recordVerification.columns.fitness', 'Fitness'),
+        label: t('recordVerification.columns.fitness', 'Fitness'),
+        accessorKey: 'fitnessStatus',
+        cell: ({ row }) => (
+          <Badge size="sm" variant="light">
+            {t(`recordVerification.fitness.${row.original.fitnessStatus}`, row.original.fitnessStatus)}
+          </Badge>
+        ),
+      },
+      {
+        header: '',
+        label: t('recordVerification.columns.actions', 'Actions'),
+        align: 'right',
+        cell: ({ row }) => (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            <Button
+              size="compact-xs"
+              color="blue"
+              variant="light"
+              leftSection={<IconPaperclip size={14} />}
+              onClick={() =>
+                setAttachmentModal({
+                  ownerType: 'MEDICAL_CERTIFICATE',
+                  ownerId: row.original.id,
+                  title: t('recordVerification.evidenceTitleMedical', {
+                    name: ownerName(row.original.profile),
+                    defaultValue: 'Evidence for {{name}} Medical Certificate',
+                  }),
+                })
+              }
+            >
+              {t('recordVerification.evidence', 'Evidence')}
+            </Button>
+            <Button
+              size="compact-xs"
+              color="teal"
+              leftSection={<IconCheck size={14} />}
+              loading={rulingMedical}
+              onClick={() =>
+                rule(
+                  () =>
+                    verifyMedical({
+                      id: row.original.id,
+                      outcome: 'VERIFIED',
+                    }).unwrap(),
+                  t('recordVerification.certificateVerified', 'Certificate verified'),
+                )
+              }
+            >
+              {t('recordVerification.verify', 'Verify')}
+            </Button>
+            <Button
+              size="compact-xs"
+              color="red"
+              variant="light"
+              leftSection={<IconX size={14} />}
+              onClick={() => setRejectMedical(row.original)}
+            >
+              {t('recordVerification.reject', 'Reject')}
+            </Button>
+          </Group>
+        ),
+      },
+    ],
+    [rulingMedical, rule, verifyMedical, showDate, t],
+  );
+
+  const seaServiceColumns: AdvancedColumn<SeaServiceRecord>[] = useMemo(
+    () => [
+      {
+        header: t('recordVerification.columns.seafarer', 'Seafarer'),
+        label: t('recordVerification.columns.seafarer', 'Seafarer'),
+        accessorKey: 'profile.firstName',
+        cell: ({ row }) => (
+          <div>
+            <Text size="sm" fw={500}>
+              {ownerName(row.original.profile)}
+            </Text>
+            {row.original.profile?.seafarerNumber && (
+              <Text size="xs" c="dimmed" ff="monospace">
+                {row.original.profile.seafarerNumber}
+              </Text>
+            )}
+          </div>
+        ),
+      },
+      {
+        header: t('recordVerification.columns.vessel', 'Vessel'),
+        label: t('recordVerification.columns.vessel', 'Vessel'),
+        accessorKey: 'vesselName',
+        cell: ({ row }) => (
+          <div>
+            <Text size="sm">{row.original.vesselName}</Text>
+            {row.original.imoNumber && (
+              <Text size="xs" c="dimmed">
+                IMO {row.original.imoNumber}
+              </Text>
+            )}
+          </div>
+        ),
+      },
+      {
+        header: t('recordVerification.columns.rank', 'Rank'),
+        label: t('recordVerification.columns.rank', 'Rank'),
+        accessorKey: 'rank',
+        cell: ({ row }) => <Text size="sm">{row.original.rank}</Text>,
+      },
+      {
+        header: t('recordVerification.columns.period', 'Period'),
+        label: t('recordVerification.columns.period', 'Period'),
+        cell: ({ row }) => (
+          <Text size="sm">
+            {showDate(row.original.engagementDate)} → {showDate(row.original.dischargeDate)}
+          </Text>
+        ),
+      },
+      {
+        header: '',
+        label: t('recordVerification.columns.actions', 'Actions'),
+        align: 'right',
+        cell: ({ row }) => (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            <Button
+              size="compact-xs"
+              color="blue"
+              variant="light"
+              leftSection={<IconPaperclip size={14} />}
+              onClick={() =>
+                setAttachmentModal({
+                  ownerType: 'SEA_SERVICE_RECORD',
+                  ownerId: row.original.id,
+                  title: t('recordVerification.evidenceTitleSeaService', {
+                    name: ownerName(row.original.profile),
+                    defaultValue: 'Evidence for {{name}} Sea Service Record',
+                  }),
+                })
+              }
+            >
+              {t('recordVerification.evidence', 'Evidence')}
+            </Button>
+            <Button
+              size="compact-xs"
+              color="teal"
+              leftSection={<IconCheck size={14} />}
+              loading={rulingSeaService}
+              onClick={() =>
+                rule(
+                  () =>
+                    verifySeaService({
+                      id: row.original.id,
+                      outcome: 'VERIFIED',
+                    }).unwrap(),
+                  t('recordVerification.seaServiceVerified', 'Sea-service record verified'),
+                )
+              }
+            >
+              {t('recordVerification.verify', 'Verify')}
+            </Button>
+            <Button
+              size="compact-xs"
+              color="red"
+              variant="light"
+              leftSection={<IconX size={14} />}
+              onClick={() => setRejectSeaService(row.original)}
+            >
+              {t('recordVerification.reject', 'Reject')}
+            </Button>
+          </Group>
+        ),
+      },
+    ],
+    [rulingSeaService, rule, verifySeaService, showDate, t],
+  );
 
   return (
     <Container size="xl" py="md">
       <Title order={3} mb={4}>
-        Record verification
+        {t('recordVerification.title', 'Record verification')}
       </Title>
       <Text size="sm" c="dimmed" mb="md">
-        Submitted sea-service records and medical certificates awaiting a
-        ruling. Verified records are frozen; rejections return to the seafarer
-        with your remark.
+        {t(
+          'recordVerification.subtitle',
+          'Submitted sea-service records and medical certificates awaiting a ruling. Verified records are frozen; rejections return to the seafarer with your remark.',
+        )}
       </Text>
 
       <Tabs defaultValue="medical" keepMounted={false}>
         <Tabs.List>
           <Tabs.Tab value="medical" leftSection={<IconStethoscope size={16} />}>
-            Medical ({pendingMedical?.length ?? 0})
+            {t('recordVerification.tabs.medical', {
+              count: pendingMedicalList.length,
+              defaultValue: 'Medical ({{count}})',
+            })}
           </Tabs.Tab>
           <Tabs.Tab value="sea-service" leftSection={<IconAnchor size={16} />}>
-            Sea Service ({pendingSeaService?.length ?? 0})
+            {t('recordVerification.tabs.seaService', {
+              count: pendingSeaServiceList.length,
+              defaultValue: 'Sea Service ({{count}})',
+            })}
           </Tabs.Tab>
         </Tabs.List>
 
         <Tabs.Panel value="medical" pt="md">
-          <Card withBorder padding={0}>
-            {loadingMedical ? (
-              <Center h={160}>
-                <Loader />
-              </Center>
-            ) : (pendingMedical ?? []).length === 0 ? (
-              <Center h={120}>
-                <Text size="sm" c="dimmed">
-                  Nothing awaiting verification.
-                </Text>
-              </Center>
-            ) : (
-              <Table highlightOnHover>
-                <Table.Thead>
-                  <Table.Tr>
-                    <Table.Th>Seafarer</Table.Th>
-                    <Table.Th>Issuer</Table.Th>
-                    <Table.Th>Validity</Table.Th>
-                    <Table.Th>Fitness</Table.Th>
-                    <Table.Th />
-                  </Table.Tr>
-                </Table.Thead>
-                <Table.Tbody>
-                  {(pendingMedical ?? []).map((certificate) => (
-                    <Table.Tr key={certificate.id}>
-                      <Table.Td>
-                        <Text size="sm" fw={500}>
-                          {ownerName(certificate.profile)}
-                        </Text>
-                        {certificate.profile?.seafarerNumber && (
-                          <Text size="xs" c="dimmed" ff="monospace">
-                            {certificate.profile.seafarerNumber}
-                          </Text>
-                        )}
-                      </Table.Td>
-                      <Table.Td>
-                        {certificate.issuerName}
-                        {certificate.certificateNumber && (
-                          <Text size="xs" c="dimmed">
-                            № {certificate.certificateNumber}
-                          </Text>
-                        )}
-                      </Table.Td>
-                      <Table.Td>
-                        {certificate.issueDate} → {certificate.expiryDate}
-                      </Table.Td>
-                      <Table.Td>
-                        <Badge size="sm" variant="light">
-                          {certificate.fitnessStatus}
-                        </Badge>
-                      </Table.Td>
-                      <Table.Td>
-                        <Group gap="xs" justify="flex-end" wrap="nowrap">
-                          <Button
-                            size="compact-xs"
-                            color="teal"
-                            leftSection={<IconCheck size={14} />}
-                            loading={rulingMedical}
-                            onClick={() =>
-                              rule(
-                                () =>
-                                  verifyMedical({
-                                    id: certificate.id,
-                                    outcome: 'VERIFIED',
-                                  }).unwrap(),
-                                'Certificate verified',
-                              )
-                            }
-                          >
-                            Verify
-                          </Button>
-                          <Button
-                            size="compact-xs"
-                            color="red"
-                            variant="light"
-                            leftSection={<IconX size={14} />}
-                            onClick={() => setRejectMedical(certificate)}
-                          >
-                            Reject
-                          </Button>
-                        </Group>
-                      </Table.Td>
-                    </Table.Tr>
-                  ))}
-                </Table.Tbody>
-              </Table>
-            )}
-          </Card>
+          <AdvancedTable
+            columns={medicalColumns}
+            data={pagedMedical}
+            tableName={t('recordVerification.tabs.medical', {
+              count: pendingMedicalList.length,
+              defaultValue: 'Medical ({{count}})',
+            })}
+            itemCount={pendingMedicalList.length}
+            pageIndex={medicalPage}
+            onPageChange={setMedicalPage}
+            pageSize={medicalPageSize}
+            onPageSizeChange={handleMedicalPageSizeChange}
+            refresh={refetchMedical}
+            isLoading={loadingMedical || fetchingMedical}
+            emptyText={t('recordVerification.emptyText', 'Nothing awaiting verification.')}
+          />
         </Tabs.Panel>
 
         <Tabs.Panel value="sea-service" pt="md">
-          <Card withBorder padding={0}>
-            {loadingSeaService ? (
-              <Center h={160}>
-                <Loader />
-              </Center>
-            ) : (pendingSeaService ?? []).length === 0 ? (
-              <Center h={120}>
-                <Text size="sm" c="dimmed">
-                  Nothing awaiting verification.
-                </Text>
-              </Center>
-            ) : (
-              <Table highlightOnHover>
-                <Table.Thead>
-                  <Table.Tr>
-                    <Table.Th>Seafarer</Table.Th>
-                    <Table.Th>Vessel</Table.Th>
-                    <Table.Th>Rank</Table.Th>
-                    <Table.Th>Period</Table.Th>
-                    <Table.Th />
-                  </Table.Tr>
-                </Table.Thead>
-                <Table.Tbody>
-                  {(pendingSeaService ?? []).map((record) => (
-                    <Table.Tr key={record.id}>
-                      <Table.Td>
-                        <Text size="sm" fw={500}>
-                          {ownerName(record.profile)}
-                        </Text>
-                        {record.profile?.seafarerNumber && (
-                          <Text size="xs" c="dimmed" ff="monospace">
-                            {record.profile.seafarerNumber}
-                          </Text>
-                        )}
-                      </Table.Td>
-                      <Table.Td>
-                        {record.vesselName}
-                        {record.imoNumber && (
-                          <Text size="xs" c="dimmed">
-                            IMO {record.imoNumber}
-                          </Text>
-                        )}
-                      </Table.Td>
-                      <Table.Td>{record.rank}</Table.Td>
-                      <Table.Td>
-                        {record.engagementDate} → {record.dischargeDate}
-                      </Table.Td>
-                      <Table.Td>
-                        <Group gap="xs" justify="flex-end" wrap="nowrap">
-                          <Button
-                            size="compact-xs"
-                            color="teal"
-                            leftSection={<IconCheck size={14} />}
-                            loading={rulingSeaService}
-                            onClick={() =>
-                              rule(
-                                () =>
-                                  verifySeaService({
-                                    id: record.id,
-                                    outcome: 'VERIFIED',
-                                  }).unwrap(),
-                                'Sea-service record verified',
-                              )
-                            }
-                          >
-                            Verify
-                          </Button>
-                          <Button
-                            size="compact-xs"
-                            color="red"
-                            variant="light"
-                            leftSection={<IconX size={14} />}
-                            onClick={() => setRejectSeaService(record)}
-                          >
-                            Reject
-                          </Button>
-                        </Group>
-                      </Table.Td>
-                    </Table.Tr>
-                  ))}
-                </Table.Tbody>
-              </Table>
-            )}
-          </Card>
+          <AdvancedTable
+            columns={seaServiceColumns}
+            data={pagedSeaService}
+            tableName={t('recordVerification.tabs.seaService', {
+              count: pendingSeaServiceList.length,
+              defaultValue: 'Sea Service ({{count}})',
+            })}
+            itemCount={pendingSeaServiceList.length}
+            pageIndex={seaServicePage}
+            onPageChange={setSeaServicePage}
+            pageSize={seaServicePageSize}
+            onPageSizeChange={handleSeaServicePageSizeChange}
+            refresh={refetchSeaService}
+            isLoading={loadingSeaService || fetchingSeaService}
+            emptyText={t('recordVerification.emptyText', 'Nothing awaiting verification.')}
+          />
         </Tabs.Panel>
       </Tabs>
 
+      <AttachmentsModal
+        opened={Boolean(attachmentModal)}
+        ownerType={attachmentModal?.ownerType ?? 'MEDICAL_CERTIFICATE'}
+        ownerId={attachmentModal?.ownerId ?? null}
+        title={attachmentModal?.title ?? t('recordVerification.evidenceModalTitle', 'Evidence Attachments')}
+        onClose={() => setAttachmentModal(null)}
+      />
+
       <RejectModal
-        title="Reject medical certificate"
+        title={t('recordVerification.rejectMedicalTitle', 'Reject medical certificate')}
         opened={Boolean(rejectMedical)}
         onClose={() => setRejectMedical(null)}
         loading={rulingMedical}
@@ -337,13 +581,13 @@ export function MedicalVerificationPage() {
                 outcome: 'REJECTED',
                 remark,
               }).unwrap(),
-            'Certificate rejected',
+            t('recordVerification.certificateRejected', 'Certificate rejected'),
           );
           setRejectMedical(null);
         }}
       />
       <RejectModal
-        title="Reject sea-service record"
+        title={t('recordVerification.rejectSeaServiceTitle', 'Reject sea-service record')}
         opened={Boolean(rejectSeaService)}
         onClose={() => setRejectSeaService(null)}
         loading={rulingSeaService}
@@ -356,7 +600,7 @@ export function MedicalVerificationPage() {
                 outcome: 'REJECTED',
                 remark,
               }).unwrap(),
-            'Sea-service record rejected',
+            t('recordVerification.seaServiceRejected', 'Sea-service record rejected'),
           );
           setRejectSeaService(null);
         }}
diff --git a/apps/backoffice/src/app/features/payment-config/pages/PaymentConfigPage.tsx b/apps/backoffice/src/app/features/payment-config/pages/PaymentConfigPage.tsx
index 0f48fef41..7c10da105 100644
--- a/apps/backoffice/src/app/features/payment-config/pages/PaymentConfigPage.tsx
+++ b/apps/backoffice/src/app/features/payment-config/pages/PaymentConfigPage.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   Alert,
   Badge,
   Button,
-  Card,
   Center,
   Group,
   Loader,
@@ -12,7 +12,6 @@ import {
   Paper,
   Stack,
   Switch,
-  Table,
   Text,
   TextInput,
   ThemeIcon,
@@ -26,10 +25,16 @@ import {
   IconInfoCircle,
   IconLock,
 } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import {
+  notify,
+  ModalFooter,
+  AdvancedTable,
+  useServerTable,
+  type AdvancedColumn,
+} from '@ema-platform/ui';
 import {
   extractErrorMessage,
-  localized,
+  useLocalized,
   useGetLicenseTypesQuery,
   useGetPaymentCapabilitiesQuery,
   useUpdateLicenseFeesMutation,
@@ -55,9 +60,13 @@ function feeText(amount: string | number | null, currency: string): string {
 }
 
 export function PaymentConfigPage() {
-  const { data, isLoading, error } = useGetLicenseTypesQuery();
+  const { t } = useTranslation();
+  const localized = useLocalized();
+  const { data, isLoading, isFetching, error, refetch } =
+    useGetLicenseTypesQuery();
   const { data: capabilities } = useGetPaymentCapabilitiesQuery();
   const [editing, setEditing] = useState<LicenseType | null>(null);
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
 
   if (isLoading) {
     return (
@@ -72,7 +81,7 @@ export function PaymentConfigPage() {
       <Alert
         color="red"
         icon={<IconAlertTriangle size={18} />}
-        title="Could not load licence types"
+        title={t('paymentConfig.loadError', 'Could not load licence types')}
       >
         <Text size="sm">{extractErrorMessage(error)}</Text>
       </Alert>
@@ -82,15 +91,113 @@ export function PaymentConfigPage() {
   const types = [...(data?.items ?? [])].sort(
     (a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0),
   );
+  const page = paginate(types);
+
+  const columns: AdvancedColumn<LicenseType>[] = [
+    {
+      header: t('paymentConfig.columns.type', 'Licence type'),
+      cell: ({ row }) => (
+        <>
+          <Text size="sm" fw={600}>
+            {localized(row.original.name)}
+          </Text>
+          <Text size="xs" c="dimmed" ff="monospace">
+            {row.original.key}
+          </Text>
+        </>
+      ),
+    },
+    {
+      header: t('paymentConfig.columns.newApplication', 'New application'),
+      cell: ({ row }) => (
+        <Text size="sm" fw={500}>
+          {feeText(row.original.feeNewApplication, row.original.feeCurrency)}
+        </Text>
+      ),
+    },
+    {
+      header: t('paymentConfig.columns.renewal', 'Renewal'),
+      cell: ({ row }) => {
+        const type = row.original;
+        if (type.feeNewApplication === null) {
+          // No charge at all, so "same as new" would be noise.
+          return (
+            <Text size="sm" c="dimmed">
+              —
+            </Text>
+          );
+        }
+        if (type.feeRenewal === null) {
+          return (
+            <Tooltip
+              label={t(
+                'paymentConfig.renewalSameTooltip',
+                'No separate renewal fee — renewal is charged at the new-application rate',
+              )}
+            >
+              <Text size="sm" c="dimmed">
+                {feeText(type.feeNewApplication, type.feeCurrency)}{' '}
+                <Text span size="xs" c="dimmed">
+                  {t('paymentConfig.renewalSameAsNew', '(same as new)')}
+                </Text>
+              </Text>
+            </Tooltip>
+          );
+        }
+        return (
+          <Text size="sm" fw={500}>
+            {feeText(type.feeRenewal, type.feeCurrency)}
+          </Text>
+        );
+      },
+    },
+    {
+      header: t('paymentConfig.columns.charged', 'Charged?'),
+      cell: ({ row }) =>
+        row.original.issuesCertificate ? (
+          <Badge variant="light" color="teal" size="sm">
+            {t('paymentConfig.chargedOnApproval', 'On approval')}
+          </Badge>
+        ) : (
+          <Tooltip
+            label={t(
+              'paymentConfig.chargedNotChargedTooltip',
+              'This licence type ends with an EMA decision and never reaches a payment stage',
+            )}
+          >
+            <Badge variant="light" color="gray" size="sm">
+              {t('paymentConfig.chargedNotCharged', 'Not charged')}
+            </Badge>
+          </Tooltip>
+        ),
+    },
+    {
+      header: '',
+      size: 90,
+      align: 'right',
+      cell: ({ row }) => (
+        <Button
+          size="xs"
+          variant="light"
+          leftSection={<IconEdit size={14} />}
+          onClick={() => setEditing(row.original)}
+        >
+          {t('paymentConfig.edit', 'Edit')}
+        </Button>
+      ),
+    },
+  ];
 
   return (
     <Stack gap="lg">
       <Group justify="space-between" align="flex-start">
         <div>
-          <Title order={3}>Payment configuration</Title>
+          <Title order={3}>{t('paymentConfig.title', 'Payment configuration')}</Title>
           <Text size="sm" c="dimmed" mt={4}>
-            What each licence costs. Applicants are charged after approval, and
-            the amount is fixed onto the application at that moment.
+            {t(
+              'paymentConfig.subtitle',
+              'What each licence costs. Applicants are charged after approval, and the amount is fixed onto the application at that moment.',
+            )}
           </Text>
         </div>
         <ThemeIcon size="xl" radius="md" variant="light">
@@ -105,90 +212,25 @@ export function PaymentConfigPage() {
         icon={<IconInfoCircle size={18} />}
       >
         <Text size="sm">
-          A change applies to applications approved from now on. Anything
-          already approved keeps the amount it was quoted, so an edit here can
-          never alter what an applicant has already been asked to pay.
+          {t(
+            'paymentConfig.changeNotice',
+            'A change applies to applications approved from now on. Anything already approved keeps the amount it was quoted, so an edit here can never alter what an applicant has already been asked to pay.',
+          )}
         </Text>
       </Alert>
 
-      <Card withBorder radius="md" padding={0}>
-        <Table.ScrollContainer minWidth={820}>
-          <Table highlightOnHover verticalSpacing="sm">
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>Licence type</Table.Th>
-                <Table.Th>New application</Table.Th>
-                <Table.Th>Renewal</Table.Th>
-                <Table.Th>Charged?</Table.Th>
-                <Table.Th w={90} />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>
-              {types.map((type) => (
-                <Table.Tr key={type.id}>
-                  <Table.Td>
-                    <Text size="sm" fw={600}>
-                      {localized(type.name)}
-                    </Text>
-                    <Text size="xs" c="dimmed" ff="monospace">
-                      {type.key}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm" fw={500}>
-                      {feeText(type.feeNewApplication, type.feeCurrency)}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    {type.feeNewApplication === null ? (
-                      // No charge at all, so "same as new" would be noise.
-                      <Text size="sm" c="dimmed">
-                        —
-                      </Text>
-                    ) : type.feeRenewal === null ? (
-                      <Tooltip label="No separate renewal fee — renewal is charged at the new-application rate">
-                        <Text size="sm" c="dimmed">
-                          {feeText(type.feeNewApplication, type.feeCurrency)}{' '}
-                          <Text span size="xs" c="dimmed">
-                            (same as new)
-                          </Text>
-                        </Text>
-                      </Tooltip>
-                    ) : (
-                      <Text size="sm" fw={500}>
-                        {feeText(type.feeRenewal, type.feeCurrency)}
-                      </Text>
-                    )}
-                  </Table.Td>
-                  <Table.Td>
-                    {type.issuesCertificate ? (
-                      <Badge variant="light" color="teal" size="sm">
-                        On approval
-                      </Badge>
-                    ) : (
-                      <Tooltip label="This licence type ends with an EMA decision and never reaches a payment stage">
-                        <Badge variant="light" color="gray" size="sm">
-                          Not charged
-                        </Badge>
-                      </Tooltip>
-                    )}
-                  </Table.Td>
-                  <Table.Td align="right">
-                    <Button
-                      size="xs"
-                      variant="light"
-                      leftSection={<IconEdit size={14} />}
-                      onClick={() => setEditing(type)}
-                    >
-                      Edit
-                    </Button>
-                  </Table.Td>
-                </Table.Tr>
-              ))}
-            </Table.Tbody>
-          </Table>
-        </Table.ScrollContainer>
-      </Card>
+      <AdvancedTable
+        tableName="payment-config-license-types"
+        columns={columns}
+        data={page.rows}
+        itemCount={page.itemCount}
+        pageIndex={page.pageIndex}
+        onPageChange={setPageIndex}
+        pageSize={pageSize}
+        onPageSizeChange={setPageSize}
+        refresh={refetch}
+        isLoading={isFetching}
+      />
 
       <GatewayPanel bypassEnabled={capabilities?.bypassEnabled} />
 
@@ -203,6 +245,7 @@ export function PaymentConfigPage() {
  * them as editable fields would be a lie.
  */
 function GatewayPanel({ bypassEnabled }: { bypassEnabled?: boolean }) {
+  const { t } = useTranslation();
   return (
     <Paper withBorder radius="md" p="md">
       <Group gap="xs" mb="xs">
@@ -210,23 +253,31 @@ function GatewayPanel({ bypassEnabled }: { bypassEnabled?: boolean }) {
           <IconLock size={13} />
         </ThemeIcon>
         <Text fw={600} size="sm">
-          Payment gateway
+          {t('paymentConfig.gateway.title', 'Payment gateway')}
         </Text>
         <Text size="xs" c="dimmed">
-          Set by the payment service environment — not editable here.
+          {t(
+            'paymentConfig.gateway.subtitle',
+            'Set by the payment service environment — not editable here.',
+          )}
         </Text>
       </Group>
       <Group gap="sm">
-        <Badge variant="light">Telebirr</Badge>
+        <Badge variant="light">{t('paymentConfig.gateway.provider', 'Telebirr')}</Badge>
         {bypassEnabled ? (
-          <Tooltip label="ALLOW_PAYMENT_BYPASS is on, so an applicant can settle a fee without paying. It is refused in production.">
+          <Tooltip
+            label={t(
+              'paymentConfig.gateway.bypassTooltip',
+              'ALLOW_PAYMENT_BYPASS is on, so an applicant can settle a fee without paying. It is refused in production.',
+            )}
+          >
             <Badge variant="light" color="orange">
-              Test bypass enabled
+              {t('paymentConfig.gateway.bypassEnabled', 'Test bypass enabled')}
             </Badge>
           </Tooltip>
         ) : (
           <Badge variant="light" color="gray">
-            Test bypass off
+            {t('paymentConfig.gateway.bypassOff', 'Test bypass off')}
           </Badge>
         )}
       </Group>
@@ -241,6 +292,8 @@ function FeeEditModal({
   licenseType: LicenseType | null;
   onClose: () => void;
 }) {
+  const { t } = useTranslation();
+  const localized = useLocalized();
   const [updateFees, { isLoading }] = useUpdateLicenseFeesMutation();
   const [newFee, setNewFee] = useState<number | ''>('');
   const [renewalFee, setRenewalFee] = useState<number | ''>('');
@@ -268,11 +321,21 @@ function FeeEditModal({
   async function save() {
     if (!licenseType) return;
     if (chargeable && newFee === '') {
-      notify.error('Enter a new-application fee, or turn off "carries a fee".');
+      notify.error(
+        t(
+          'paymentConfig.modal.missingNewFee',
+          'Enter a new-application fee, or turn off "carries a fee".',
+        ),
+      );
       return;
     }
     if (chargeable && !sameAsNew && renewalFee === '') {
-      notify.error('Enter a renewal fee, or charge renewal at the same rate.');
+      notify.error(
+        t(
+          'paymentConfig.modal.missingRenewalFee',
+          'Enter a renewal fee, or charge renewal at the same rate.',
+        ),
+      );
       return;
     }
     try {
@@ -282,10 +345,17 @@ function FeeEditModal({
         feeRenewal: chargeable && !sameAsNew ? Number(renewalFee) : null,
         feeCurrency: currency.trim() || 'ETB',
       }).unwrap();
-      notify.success(`${localized(licenseType.name)} fees updated.`);
+      notify.success(
+        t('paymentConfig.modal.updated', {
+          type: localized(licenseType.name),
+          defaultValue: '{{type}} fees updated.',
+        }),
+      );
       onClose();
     } catch (err) {
-      notify.error(extractErrorMessage(err, 'Could not save the fees'));
+      notify.error(
+        extractErrorMessage(err, t('paymentConfig.modal.saveFailed', 'Could not save the fees')),
+      );
     }
   }
 
@@ -293,7 +363,14 @@ function FeeEditModal({
     <Modal
       opened={!!licenseType}
       onClose={onClose}
-      title={licenseType ? `Fees — ${localized(licenseType.name)}` : ''}
+      title={
+        licenseType
+          ? t('paymentConfig.modal.title', {
+              type: localized(licenseType.name),
+              defaultValue: 'Fees — {{type}}',
+            })
+          : ''
+      }
       centered
       radius="lg"
     >
@@ -306,9 +383,10 @@ function FeeEditModal({
               icon={<IconInfoCircle size={16} />}
             >
               <Text size="sm">
-                This licence type concludes with an EMA decision and never
-                reaches a payment stage, so a fee set here stays unused until
-                that changes.
+                {t(
+                  'paymentConfig.modal.noPaymentStage',
+                  'This licence type concludes with an EMA decision and never reaches a payment stage, so a fee set here stays unused until that changes.',
+                )}
               </Text>
             </Alert>
           )}
@@ -316,14 +394,17 @@ function FeeEditModal({
           <Switch
             checked={chargeable}
             onChange={(e) => setChargeable(e.currentTarget.checked)}
-            label="This licence carries a fee"
-            description="Turn off for licence types applicants are never charged for."
+            label={t('paymentConfig.modal.chargeableLabel', 'This licence carries a fee')}
+            description={t(
+              'paymentConfig.modal.chargeableDescription',
+              'Turn off for licence types applicants are never charged for.',
+            )}
           />
 
           {chargeable && (
             <>
               <NumberInput
-                label="New application fee"
+                label={t('paymentConfig.modal.newFeeLabel', 'New application fee')}
                 value={newFee}
                 onChange={(v) => setNewFee(v === '' ? '' : Number(v))}
                 min={0}
@@ -336,13 +417,16 @@ function FeeEditModal({
               <Switch
                 checked={sameAsNew}
                 onChange={(e) => setSameAsNew(e.currentTarget.checked)}
-                label="Charge renewal at the same rate"
-                description="Turn off to set a separate renewal fee."
+                label={t('paymentConfig.modal.sameRateLabel', 'Charge renewal at the same rate')}
+                description={t(
+                  'paymentConfig.modal.sameRateDescription',
+                  'Turn off to set a separate renewal fee.',
+                )}
               />
 
               {!sameAsNew && (
                 <NumberInput
-                  label="Renewal fee"
+                  label={t('paymentConfig.modal.renewalFeeLabel', 'Renewal fee')}
                   value={renewalFee}
                   onChange={(v) => setRenewalFee(v === '' ? '' : Number(v))}
                   min={0}
@@ -354,7 +438,7 @@ function FeeEditModal({
               )}
 
               <TextInput
-                label="Currency"
+                label={t('paymentConfig.modal.currencyLabel', 'Currency')}
                 value={currency}
                 onChange={(e) =>
                   setCurrency(e.currentTarget.value.toUpperCase())
@@ -364,14 +448,14 @@ function FeeEditModal({
             </>
           )}
 
-          <Group justify="flex-end" mt="xs">
+          <ModalFooter mt="xs">
             <Button variant="default" onClick={onClose} disabled={isLoading}>
-              Cancel
+              {t('paymentConfig.modal.cancel', 'Cancel')}
             </Button>
             <Button onClick={save} loading={isLoading}>
-              Save fees
+              {t('paymentConfig.modal.save', 'Save fees')}
             </Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       )}
     </Modal>
diff --git a/apps/backoffice/src/app/features/profile/pages/ProfilePage.tsx b/apps/backoffice/src/app/features/profile/pages/ProfilePage.tsx
index e3f4ef131..b40a053da 100644
--- a/apps/backoffice/src/app/features/profile/pages/ProfilePage.tsx
+++ b/apps/backoffice/src/app/features/profile/pages/ProfilePage.tsx
@@ -42,7 +42,7 @@ import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useTranslation } from 'react-i18next';
-import { notify, PageHeader } from '@ema-platform/ui';
+import { notify, PageHeader, useErrorHandler, passwordSchema as strongPasswordSchema, PasswordRequirements } from '@ema-platform/ui';
 import { useApiMutation } from '@ema-platform/api';
 import { setUser } from '@ema-platform/auth';
 import type { AuthUser } from '@ema-platform/auth';
@@ -77,6 +77,7 @@ export function ProfilePage() {
   const user = useAppSelector((state) => state.auth.user);
   const { colorScheme, setColorScheme } = useMantineColorScheme();
   const layoutMode = useAppSelector((state) => state.preferences.layoutMode);
+  const { handleError } = useErrorHandler();
 
   const [updateTrigger] = useApiMutation<AuthUser>();
   const [meTrigger] = useApiMutation<AuthUser>();
@@ -156,8 +157,8 @@ export function ProfilePage() {
       dispatch(setUser(me));
 
       notify.success(t('profile.profileUpdated'));
-    } catch {
-      notify.error(t('profile.updateFailed'));
+    } catch (e) {
+      handleError(e);
     } finally {
       setIsSavingProfile(false);
     }
@@ -169,12 +170,10 @@ export function ProfilePage() {
       oldPassword: z
         .string()
         .min(1, { message: t('profile.validation.passwordMin') }),
-      newPassword: z
-        .string()
-        .min(8, { message: t('profile.validation.passwordMin') }),
+      newPassword: strongPasswordSchema(12),
       confirmPassword: z
         .string()
-        .min(8, { message: t('profile.validation.passwordMin') }),
+        .min(1, { message: t('profile.validation.passwordMin') }),
     })
     .refine((data) => data.newPassword === data.confirmPassword, {
       message: t('profile.validation.passwordMismatch'),
@@ -208,8 +207,8 @@ export function ProfilePage() {
 
       notify.success(t('profile.passwordChanged'));
       resetPassword();
-    } catch {
-      notify.error(t('profile.passwordFailed'));
+    } catch (e) {
+      handleError(e);
     } finally {
       setIsSavingPassword(false);
     }
@@ -413,12 +412,15 @@ export function ProfilePage() {
                       {...registerPassword('oldPassword')}
                     />
                     <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
-                      <PasswordInput
-                        label={t('profile.fields.newPassword')}
-                        leftSection={<IconLock size={18} />}
-                        error={passwordErrors.newPassword?.message}
-                        {...registerPassword('newPassword')}
-                      />
+                      <div>
+                        <PasswordInput
+                          label={t('profile.fields.newPassword')}
+                          leftSection={<IconLock size={18} />}
+                          error={passwordErrors.newPassword?.message}
+                          {...registerPassword('newPassword')}
+                        />
+                        <PasswordRequirements password={watchPassword('newPassword')} minLength={12} />
+                      </div>
                       <PasswordInput
                         label={t('profile.fields.confirmPassword')}
                         leftSection={<IconLock size={18} />}
diff --git a/apps/backoffice/src/app/features/question/pages/QuestionPage.tsx b/apps/backoffice/src/app/features/question/pages/QuestionPage.tsx
index 901e00c91..dfdf184a8 100644
--- a/apps/backoffice/src/app/features/question/pages/QuestionPage.tsx
+++ b/apps/backoffice/src/app/features/question/pages/QuestionPage.tsx
@@ -4,15 +4,12 @@ import {
   Title,
   Group,
   Button,
-  Table,
   Badge,
   ActionIcon,
   Modal,
   Text,
   TextInput,
-  Paper,
-  Loader,
-  Center,
+  Card,
   Alert,
   Select,
   NumberInput,
@@ -28,7 +25,7 @@ import {
   IconSend,
   IconGavel,
 } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import { AdvancedColumn, AdvancedTable, ModalFooter, notify, useErrorHandler, useServerTable } from '@ema-platform/ui';
 import { extractErrorMessage } from '@ema-platform/api';
 import { useGetCertificationsQuery } from '../../certification/api/certification-api';
 import {
@@ -95,7 +92,7 @@ function QuestionForm({
   };
 
   return (
-    <Paper p="md" withBorder mb="md" radius="md">
+    <Modal opened onClose={onCancel} title={editing ? t('question.update') : t('question.addQuestion')} size="lg">
       <form onSubmit={handleSubmit}>
         <Stack gap="sm">
           <Select label={t('question.form.certification')} placeholder={t('question.form.selectCertification')} data={certOptions} value={certificationId} onChange={setCertificationId} size="sm" searchable required />
@@ -109,21 +106,23 @@ function QuestionForm({
             <NumberInput label={t('question.form.hours')} value={hours} onChange={(v) => setHours(Number(v))} min={0} size="sm" />
             <NumberInput label={t('question.form.minutes')} value={minutes} onChange={(v) => setMinutes(Number(v))} min={0} size="sm" />
           </Group>
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={onCancel} size="sm">{t('question.cancel')}</Button>
             <Button type="submit" size="sm" loading={isSubmitting}>{editing ? t('question.update') : t('question.create')}</Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </form>
-    </Paper>
+    </Modal>
   );
 }
 
 export function QuestionPage() {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
   const { data: certRes } = useGetCertificationsQuery();
-  const { data, isLoading, isError } = useGetQuestionsQuery();
+  const { data, isFetching, isError, refetch } = useGetQuestionsQuery();
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [createQ, { isLoading: isCreating }] = useCreateQuestionMutation();
   const [updateQ, { isLoading: isUpdating }] = useUpdateQuestionMutation();
   const [deleteQ] = useDeleteQuestionMutation();
@@ -145,6 +144,7 @@ export function QuestionPage() {
   const certOptions = certifications.filter((c) => c.isActive).map((c) => ({ value: c.id, label: c.name[locale] }));
 
   const filtered = questions.filter((q) => !certFilter || q.certificationId === certFilter);
+  const page = paginate(filtered);
 
   const getCertName = (id: string) => certifications.find((c) => c.id === id)?.name?.[locale] ?? '-';
 
@@ -211,14 +211,93 @@ export function QuestionPage() {
       notify.success(t('question.deleted'));
       closeDelete();
       setDeleteTarget(null);
-    } catch {
-      notify.error(t('question.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
-  if (isLoading) return <Center py="xl"><Loader /></Center>;
   if (isError) return <Alert icon={<IconInfoCircle size={16} />} color="red" title={t('question.loadError')} />;
 
+  const columns: AdvancedColumn<Question>[] = [
+    {
+      header: t('question.columns.title'),
+      cell: ({ row }) => <Text fz="sm" maw={300} lineClamp={2}>{row.original.title[locale]}</Text>,
+    },
+    {
+      header: t('question.columns.certification'),
+      cell: ({ row }) => <Text fz="sm">{getCertName(row.original.certificationId)}</Text>,
+    },
+    {
+      header: t('question.columns.form'),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={row.original.form === 'ESSAY' ? 'blue' : 'violet'}>
+          {t(`question.form.${row.original.form === 'ESSAY' ? 'essay' : 'choice'}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t('question.columns.points'),
+      cell: ({ row }) => <Text fz="sm" fw={600}>{row.original.points}</Text>,
+    },
+    {
+      header: t('question.qc.column'),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={QC_COLOR[row.original.status] ?? 'gray'} title={row.original.reviewRemark ?? undefined}>
+          {t(`question.qc.${row.original.status}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: '',
+      label: t('question.columns.actions', 'Actions'),
+      cell: ({ row }) => {
+        const q = row.original;
+        return (
+          <Group gap="xs">
+            {(q.status === 'DRAFT' || q.status === 'REJECTED') && (
+              <Button
+                size="compact-xs"
+                variant="light"
+                leftSection={<IconSend size={12} />}
+                loading={isSubmittingReview}
+                onClick={() => handleSubmitForApproval(q)}
+              >
+                {t('question.qc.submit')}
+              </Button>
+            )}
+            {q.status === 'PENDING_APPROVAL' && (
+              <>
+                <Button size="compact-xs" variant="light" color="teal" onClick={() => openReview(q, 'APPROVED')}>
+                  {t('question.qc.approve')}
+                </Button>
+                <Button size="compact-xs" variant="light" color="red" onClick={() => openReview(q, 'REJECTED')}>
+                  {t('question.qc.reject')}
+                </Button>
+              </>
+            )}
+            {q.status === 'APPROVED' && (
+              <Button
+                size="compact-xs"
+                variant="subtle"
+                color="dark"
+                leftSection={<IconGavel size={12} />}
+                onClick={() => openReview(q, 'RETIRED')}
+              >
+                {t('question.qc.retire')}
+              </Button>
+            )}
+            <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => { setEditing(q); setShowForm(true); }}>
+              <IconEdit size={14} />
+            </ActionIcon>
+            <ActionIcon variant="subtle" color="red" size="sm" onClick={() => { setDeleteTarget(q); openDelete(); }}>
+              <IconTrash size={14} />
+            </ActionIcon>
+          </Group>
+        );
+      },
+    },
+  ];
+
   return (
     <Stack gap="lg">
       <Group justify="space-between" align="flex-end">
@@ -240,98 +319,33 @@ export function QuestionPage() {
         />
       )}
 
-      <Paper withBorder radius="md">
+      <Card withBorder padding={0}>
         <Group p="md" justify="space-between" wrap="wrap" gap="sm">
           <Text fw={600}>{t('question.pool')}</Text>
-          <Select placeholder={t('question.filterByCertification')} data={[{ value: '', label: 'All' }, ...certOptions]} value={certFilter} onChange={(v) => setCertFilter(v ?? null)} size="sm" style={{ width: 280 }} clearable />
+          <Select
+            placeholder={t('question.filterByCertification')}
+            data={[{ value: '', label: 'All' }, ...certOptions]}
+            value={certFilter}
+            onChange={(v) => { setCertFilter(v ?? null); setPageIndex(0); }}
+            size="sm"
+            style={{ width: 280 }}
+            clearable
+          />
         </Group>
-        <Table striped highlightOnHover>
-          <Table.Thead bg="var(--mantine-color-default-hover)">
-            <Table.Tr>
-              <Table.Th>{t('question.columns.title')}</Table.Th>
-              <Table.Th>{t('question.columns.certification')}</Table.Th>
-              <Table.Th>{t('question.columns.form')}</Table.Th>
-              <Table.Th>{t('question.columns.points')}</Table.Th>
-              <Table.Th>{t('question.qc.column')}</Table.Th>
-              <Table.Th />
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>
-            {filtered.map((q) => (
-              <Table.Tr key={q.id}>
-                <Table.Td><Text fz="sm" maw={300} lineClamp={2}>{q.title[locale]}</Text></Table.Td>
-                <Table.Td><Text fz="sm">{getCertName(q.certificationId)}</Text></Table.Td>
-                <Table.Td><Badge size="sm" variant="light" color={q.form === 'ESSAY' ? 'blue' : 'violet'}>{t(`question.form.${q.form === 'ESSAY' ? 'essay' : 'choice'}`)}</Badge></Table.Td>
-                <Table.Td><Text fz="sm" fw={600}>{q.points}</Text></Table.Td>
-                <Table.Td>
-                  <Badge size="sm" variant="light" color={QC_COLOR[q.status] ?? 'gray'} title={q.reviewRemark ?? undefined}>
-                    {t(`question.qc.${q.status}`)}
-                  </Badge>
-                </Table.Td>
-                <Table.Td>
-                  <Group gap="xs">
-                    {(q.status === 'DRAFT' || q.status === 'REJECTED') && (
-                      <Button
-                        size="compact-xs"
-                        variant="light"
-                        leftSection={<IconSend size={12} />}
-                        loading={isSubmittingReview}
-                        onClick={() => handleSubmitForApproval(q)}
-                      >
-                        {t('question.qc.submit')}
-                      </Button>
-                    )}
-                    {q.status === 'PENDING_APPROVAL' && (
-                      <>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="teal"
-                          onClick={() => openReview(q, 'APPROVED')}
-                        >
-                          {t('question.qc.approve')}
-                        </Button>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="red"
-                          onClick={() => openReview(q, 'REJECTED')}
-                        >
-                          {t('question.qc.reject')}
-                        </Button>
-                      </>
-                    )}
-                    {q.status === 'APPROVED' && (
-                      <Button
-                        size="compact-xs"
-                        variant="subtle"
-                        color="dark"
-                        leftSection={<IconGavel size={12} />}
-                        onClick={() => openReview(q, 'RETIRED')}
-                      >
-                        {t('question.qc.retire')}
-                      </Button>
-                    )}
-                    <ActionIcon variant="subtle" color="blue" size="sm" onClick={() => { setEditing(q); setShowForm(true); }}>
-                      <IconEdit size={14} />
-                    </ActionIcon>
-                    <ActionIcon variant="subtle" color="red" size="sm" onClick={() => { setDeleteTarget(q); openDelete(); }}>
-                      <IconTrash size={14} />
-                    </ActionIcon>
-                  </Group>
-                </Table.Td>
-              </Table.Tr>
-            ))}
-            {filtered.length === 0 && (
-              <Table.Tr>
-                <Table.Td colSpan={6}>
-                  <Text c="dimmed" ta="center" py="xl">{t('question.noQuestions')}</Text>
-                </Table.Td>
-              </Table.Tr>
-            )}
-          </Table.Tbody>
-        </Table>
-      </Paper>
+        <AdvancedTable
+          columns={columns}
+          data={page.rows}
+          tableName={t('question.title')}
+          itemCount={page.itemCount}
+          pageIndex={page.pageIndex}
+          onPageChange={setPageIndex}
+          pageSize={pageSize}
+          onPageSizeChange={setPageSize}
+          refresh={refetch}
+          isLoading={isFetching}
+          emptyText={t('question.noQuestions')}
+        />
+      </Card>
 
       <Modal
         opened={Boolean(reviewTarget)}
@@ -367,10 +381,10 @@ export function QuestionPage() {
 
       <Modal opened={deleteOpened} onClose={closeDelete} title={t('question.confirmDelete')} size="sm">
         <Text mb="md">{t('question.deleteConfirmText')}</Text>
-        <Group justify="flex-end">
+        <ModalFooter>
           <Button variant="default" onClick={closeDelete} size="sm">{t('question.cancel')}</Button>
           <Button color="red" onClick={handleDelete} size="sm">{t('question.delete')}</Button>
-        </Group>
+        </ModalFooter>
       </Modal>
     </Stack>
   );
diff --git a/apps/backoffice/src/app/features/result/components/RecordResultModal.tsx b/apps/backoffice/src/app/features/result/components/RecordResultModal.tsx
index 1a8499dc7..cf64029c4 100644
--- a/apps/backoffice/src/app/features/result/components/RecordResultModal.tsx
+++ b/apps/backoffice/src/app/features/result/components/RecordResultModal.tsx
@@ -43,6 +43,7 @@ export function RecordResultModal({
 }) {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
   const [seafarerSearch, setSeafarerSearch] = useState('');
   const [selectedSeafarerId, setSelectedSeafarerId] = useState<string | null>(null);
   const [scores, setScores] = useState<Record<string, number>>({});
@@ -227,12 +228,12 @@ export function RecordResultModal({
               size="sm"
             />
 
-            <Group justify="flex-end">
+            <ModalFooter>
               <Button variant="default" onClick={onClose} size="sm">{t('result.cancel')}</Button>
               <Button onClick={handleSave} size="sm" loading={isSaving}>
                 {t('result.saveResult')}
               </Button>
-            </Group>
+            </ModalFooter>
           </>
         )}
 
diff --git a/apps/backoffice/src/app/features/result/pages/ExamAppealsPage.tsx b/apps/backoffice/src/app/features/result/pages/ExamAppealsPage.tsx
index 2608547c3..444aedfad 100644
--- a/apps/backoffice/src/app/features/result/pages/ExamAppealsPage.tsx
+++ b/apps/backoffice/src/app/features/result/pages/ExamAppealsPage.tsx
@@ -18,6 +18,7 @@ import {
 } from '@mantine/core';
 import { IconGavel, IconInfoCircle } from '@tabler/icons-react';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import { extractErrorMessage } from '@ema-platform/api';
 import {
   useGetPendingAppealsQuery,
@@ -35,6 +36,7 @@ import type { ExamAppeal } from '../types/result';
 export function ExamAppealsPage() {
   const { t, i18n } = useTranslation();
   const locale = i18n.language as 'en' | 'am';
+  const showDate = useDateDisplayer();
   const { data: appeals, isLoading, isError } = useGetPendingAppealsQuery();
   const [decideAppeal, { isLoading: isDeciding }] = useDecideAppealMutation();
 
@@ -128,7 +130,7 @@ export function ExamAppealsPage() {
                     </Text>
                   </Table.Td>
                   <Table.Td>
-                    <Text fz="xs">{appeal.createdAt?.slice(0, 10)}</Text>
+                    <Text fz="xs">{showDate(appeal.createdAt)}</Text>
                   </Table.Td>
                   <Table.Td>
                     <Button
diff --git a/apps/backoffice/src/app/features/result/pages/ResultPage.tsx b/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
index b8519c923..ffd8b6b94 100644
--- a/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
+++ b/apps/backoffice/src/app/features/result/pages/ResultPage.tsx
@@ -9,6 +9,7 @@ import {
   Modal,
   Text,
   Paper,
+  Card,
   Loader,
   Center,
   Alert,
@@ -36,9 +37,10 @@ import {
   IconSearch,
   IconSend,
 } from '@tabler/icons-react';
-import { notify, BilingualInput } from '@ema-platform/ui';
+import { notify, BilingualInput, useErrorHandler, AdvancedTable, useServerTable, ModalFooter, type AdvancedColumn } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import type { BilingualValue } from '@ema-platform/ui';
-import { extractErrorMessage } from '@ema-platform/api';
+import { extractErrorMessage, useLocalized } from '@ema-platform/api';
 import {
   useGetResultsQuery,
   useLazyGetResultQuery,
@@ -115,9 +117,13 @@ function InfoRow({ label, value }: { label: string; value: string }) {
 
 export function ResultPage() {
   const { t, i18n } = useTranslation();
+  const localized = useLocalized();
+  const showDate = useDateDisplayer();
   const locale = i18n.language as 'en' | 'am';
+  const { handleError } = useErrorHandler();
   const { data: examRes } = useGetExamsQuery();
-  const { data, isLoading, isError } = useGetResultsQuery();
+  const { data, isFetching, isError, refetch } = useGetResultsQuery();
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
   const [fetchDetail, { data: detailResult, isFetching: isDetailLoading }] = useLazyGetResultQuery();
 
   const exams = examRes?.items ?? [];
@@ -147,7 +153,7 @@ export function ResultPage() {
   const [qcRemark, setQcRemark] = useState('');
   const [qcAdjustment, setQcAdjustment] = useState(0);
 
-  const examOptions = exams.map((e) => ({ value: e.id, label: `${e.title.en} (${e.date})` }));
+  const examOptions = exams.map((e) => ({ value: e.id, label: `${localized(e.title)} (${e.date})` }));
 
   const startRecord = () => {
     const ex = exams.find((e) => e.id === pickerExamId);
@@ -284,14 +290,107 @@ export function ResultPage() {
       notify.success(t('result.deleted'));
       closeDelete();
       setDeleteTarget(null);
-    } catch {
-      notify.error(t('result.error'));
+    } catch (e) {
+      handleError(e);
     }
   };
 
-  if (isLoading) return <Center py="xl"><Loader /></Center>;
   if (isError) return <Alert icon={<IconInfoCircle size={16} />} color="red" title={t('result.loadError')} />;
 
+  const columns: AdvancedColumn<Result>[] = [
+    {
+      header: t('result.columns.seafarer'),
+      cell: ({ row }) => (
+        <Text fz="sm" fw={500}>
+          {row.original.seafarer
+            ? `${row.original.seafarer.firstName} ${row.original.seafarer.lastName}`
+            : row.original.seafarerId.slice(0, 8)}
+        </Text>
+      ),
+    },
+    {
+      header: t('result.columns.exam'),
+      cell: ({ row }) => (
+        <Text fz="sm">{row.original.exam ? row.original.exam.title[locale] : getExamTitle(row.original.examId)}</Text>
+      ),
+    },
+    {
+      header: t('result.columns.totalScore'),
+      cell: ({ row }) => <Text fz="sm" fw={600}>{row.original.totalScore}</Text>,
+    },
+    {
+      header: t('result.columns.status'),
+      cell: ({ row }) => (
+        <Badge
+          size="sm"
+          variant="light"
+          color={STATUS_COLOR[row.original.status]}
+          leftSection={
+            <Box
+              w={6}
+              h={6}
+              style={{ borderRadius: 999, background: `var(--mantine-color-${STATUS_COLOR[row.original.status]}-6)` }}
+            />
+          }
+        >
+          {t(`result.status.${row.original.status}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t('result.review.column'),
+      cell: ({ row }) => (
+        <Badge size="sm" variant="light" color={REVIEW_COLOR[row.original.reviewStatus] ?? 'gray'}>
+          {t(`result.review.${row.original.reviewStatus}`)}
+        </Badge>
+      ),
+    },
+    {
+      header: t('result.columns.date'),
+      cell: ({ row }) => <Text fz="sm">{showDate(row.original.createdAt)}</Text>,
+    },
+    {
+      header: '',
+      label: t('result.columns.actions', 'Actions'),
+      cell: ({ row }) => {
+        const r = row.original;
+        return (
+          <Group gap="xs">
+            {(r.reviewStatus === 'MARKED' || r.reviewStatus === 'MODERATED') && (
+              <>
+                <Button size="compact-xs" variant="light" color="yellow" onClick={() => openQc(r, 'moderate')}>
+                  {t('result.review.moderate')}
+                </Button>
+                <Button size="compact-xs" variant="light" color="blue" onClick={() => openQc(r, 'approve')}>
+                  {t('result.review.approve')}
+                </Button>
+              </>
+            )}
+            {(r.reviewStatus === 'APPROVED' || r.reviewStatus === 'MODERATED') && (
+              <Button size="compact-xs" variant="subtle" color="orange" onClick={() => openQc(r, 'return')}>
+                {t('result.review.return')}
+              </Button>
+            )}
+            <Button size="xs" variant="subtle" leftSection={<IconEye size={13} />} onClick={() => viewDetail(r)}>
+              {t('result.action.viewEdit')}
+            </Button>
+            <Button
+              size="xs"
+              variant="subtle"
+              color="red"
+              leftSection={<IconTrash size={13} />}
+              onClick={() => { setDeleteTarget(r); openDelete(); }}
+            >
+              {t('result.action.delete')}
+            </Button>
+          </Group>
+        );
+      },
+    },
+  ];
+
+  const page = paginate(filtered);
+
   return (
     <Stack gap="lg">
       <Group justify="space-between" align="flex-end">
@@ -324,7 +423,7 @@ export function ResultPage() {
         <ResultStat label={t('result.stats.avgScore')} value={avgScore} icon={IconChartBar} color="indigo" />
       </SimpleGrid>
 
-      <Paper withBorder radius="md">
+      <Card withBorder padding={0}>
         <Group p="md" justify="space-between" wrap="wrap" gap="sm">
           <Text fw={600}>{t('result.section')}</Text>
           <Group gap="sm" wrap="wrap">
@@ -332,7 +431,7 @@ export function ResultPage() {
               placeholder={t('result.search.seafarer')}
               leftSection={<IconSearch size={15} />}
               value={searchQuery}
-              onChange={(e) => setSearchQuery(e.currentTarget.value)}
+              onChange={(e) => { setSearchQuery(e.currentTarget.value); setPageIndex(0); }}
               size="sm"
               style={{ width: 240 }}
             />
@@ -340,7 +439,7 @@ export function ResultPage() {
               placeholder={t('result.search.filterByExam')}
               data={[{ value: '', label: t('result.search.allExams') }, ...examOptions]}
               value={examFilter}
-              onChange={(v) => setExamFilter(v ?? null)}
+              onChange={(v) => { setExamFilter(v ?? null); setPageIndex(0); }}
               size="sm"
               style={{ width: 280 }}
               clearable
@@ -348,113 +447,20 @@ export function ResultPage() {
           </Group>
         </Group>
 
-        <Table striped highlightOnHover>
-          <Table.Thead bg="var(--mantine-color-default-hover)">
-            <Table.Tr>
-              <Table.Th>{t('result.columns.seafarer')}</Table.Th>
-              <Table.Th>{t('result.columns.exam')}</Table.Th>
-              <Table.Th>{t('result.columns.totalScore')}</Table.Th>
-              <Table.Th>{t('result.columns.status')}</Table.Th>
-              <Table.Th>{t('result.review.column')}</Table.Th>
-              <Table.Th>{t('result.columns.date')}</Table.Th>
-              <Table.Th />
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>
-            {filtered.map((r) => (
-              <Table.Tr key={r.id}>
-                <Table.Td>
-                  <Text fz="sm" fw={500}>
-                    {r.seafarer ? `${r.seafarer.firstName} ${r.seafarer.lastName}` : r.seafarerId.slice(0, 8)}
-                  </Text>
-                </Table.Td>
-                <Table.Td><Text fz="sm">{r.exam ? r.exam.title[locale] : getExamTitle(r.examId)}</Text></Table.Td>
-                <Table.Td><Text fz="sm" fw={600}>{r.totalScore}</Text></Table.Td>
-                <Table.Td>
-                  <Badge
-                    size="sm"
-                    variant="light"
-                    color={STATUS_COLOR[r.status]}
-                    leftSection={
-                      <Box
-                        w={6}
-                        h={6}
-                        style={{ borderRadius: 999, background: `var(--mantine-color-${STATUS_COLOR[r.status]}-6)` }}
-                      />
-                    }
-                  >
-                    {t(`result.status.${r.status}`)}
-                  </Badge>
-                </Table.Td>
-                <Table.Td>
-                  <Badge size="sm" variant="light" color={REVIEW_COLOR[r.reviewStatus] ?? 'gray'}>
-                    {t(`result.review.${r.reviewStatus}`)}
-                  </Badge>
-                </Table.Td>
-                <Table.Td><Text fz="sm">{new Date(r.createdAt).toLocaleDateString()}</Text></Table.Td>
-                <Table.Td>
-                  <Group gap="xs">
-                    {(r.reviewStatus === 'MARKED' || r.reviewStatus === 'MODERATED') && (
-                      <>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="yellow"
-                          onClick={() => openQc(r, 'moderate')}
-                        >
-                          {t('result.review.moderate')}
-                        </Button>
-                        <Button
-                          size="compact-xs"
-                          variant="light"
-                          color="blue"
-                          onClick={() => openQc(r, 'approve')}
-                        >
-                          {t('result.review.approve')}
-                        </Button>
-                      </>
-                    )}
-                    {(r.reviewStatus === 'APPROVED' || r.reviewStatus === 'MODERATED') && (
-                      <Button
-                        size="compact-xs"
-                        variant="subtle"
-                        color="orange"
-                        onClick={() => openQc(r, 'return')}
-                      >
-                        {t('result.review.return')}
-                      </Button>
-                    )}
-                    <Button
-                      size="xs"
-                      variant="subtle"
-                      leftSection={<IconEye size={13} />}
-                      onClick={() => viewDetail(r)}
-                    >
-                      {t('result.action.viewEdit')}
-                    </Button>
-                    <Button
-                      size="xs"
-                      variant="subtle"
-                      color="red"
-                      leftSection={<IconTrash size={13} />}
-                      onClick={() => { setDeleteTarget(r); openDelete(); }}
-                    >
-                      {t('result.action.delete')}
-                    </Button>
-                  </Group>
-                </Table.Td>
-              </Table.Tr>
-            ))}
-            {filtered.length === 0 && (
-              <Table.Tr>
-                <Table.Td colSpan={7}>
-                  <Text c="dimmed" ta="center" py="xl">{t('result.noItems')}</Text>
-                </Table.Td>
-              </Table.Tr>
-            )}
-          </Table.Tbody>
-        </Table>
-      </Paper>
+        <AdvancedTable
+          columns={columns}
+          data={page.rows}
+          tableName={t('result.title')}
+          itemCount={page.itemCount}
+          pageIndex={page.pageIndex}
+          onPageChange={setPageIndex}
+          pageSize={pageSize}
+          onPageSizeChange={setPageSize}
+          refresh={refetch}
+          isLoading={isFetching}
+          emptyText={t('result.noItems')}
+        />
+      </Card>
 
       <Modal
         opened={detailOpened}
@@ -478,7 +484,7 @@ export function ResultPage() {
               <SimpleGrid cols={{ base: 2, sm: 4 }} spacing="sm">
                 <InfoRow label={t('result.detail.fullName')} value={detailResult.profile ? `${detailResult.profile.firstName} ${detailResult.profile.middleName ?? ''} ${detailResult.profile.lastName}` : detailResult.seafarerId} />
                 <InfoRow label={t('result.detail.gender')} value={detailResult.profile?.gender ?? '—'} />
-                <InfoRow label={t('result.detail.dateOfBirth')} value={detailResult.profile?.dob ? new Date(detailResult.profile.dob).toLocaleDateString() : '—'} />
+                <InfoRow label={t('result.detail.dateOfBirth')} value={showDate(detailResult.profile?.dob)} />
                 <InfoRow label={t('result.detail.maritalStatus')} value={detailResult.profile?.maritalStatus ?? '—'} />
               </SimpleGrid>
             </Paper>
@@ -496,7 +502,7 @@ export function ResultPage() {
                   <InfoRow label={t('result.detail.examTitle')} value={detailResult.exam.title?.[locale] ?? '—'} />
                   <InfoRow label={t('result.detail.type')} value={detailResult.exam.type ?? '—'} />
                   <InfoRow label={t('result.detail.venue')} value={detailResult.exam.venue ?? '—'} />
-                  <InfoRow label={t('result.detail.date')} value={detailResult.exam.date ? new Date(detailResult.exam.date).toLocaleDateString() : '—'} />
+                  <InfoRow label={t('result.detail.date')} value={showDate(detailResult.exam.date)} />
                   <InfoRow label={t('result.detail.passMark')} value={String(detailResult.exam.cuttingPoint ?? 0)} />
                 </SimpleGrid>
               </Paper>
@@ -592,7 +598,7 @@ export function ResultPage() {
               </>
             )}
 
-            <Group justify="flex-end">
+            <ModalFooter>
               <Button variant="default" onClick={handleDetailClose} size="sm">{t('result.close')}</Button>
               <Button
                 onClick={handleDetailSave}
@@ -602,7 +608,7 @@ export function ResultPage() {
               >
                 {t('result.save')}
               </Button>
-            </Group>
+            </ModalFooter>
           </Stack>
         ) : (
           <Text c="dimmed" ta="center" py="xl">{t('result.noData')}</Text>
@@ -658,10 +664,10 @@ export function ResultPage() {
 
       <Modal opened={deleteOpened} onClose={closeDelete} title={t('result.confirmDelete')} size="sm">
         <Text mb="md">{t('result.deleteConfirmText')}</Text>
-        <Group justify="flex-end">
+        <ModalFooter>
           <Button variant="default" onClick={closeDelete} size="sm">{t('result.cancel')}</Button>
           <Button color="red" onClick={handleDelete} size="sm">{t('result.delete')}</Button>
-        </Group>
+        </ModalFooter>
       </Modal>
 
       {/* Choose exam, then record */}
@@ -678,10 +684,10 @@ export function ResultPage() {
             searchable
             required
           />
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={closePicker} size="sm">{t('result.cancel')}</Button>
             <Button onClick={startRecord} size="sm" disabled={!pickerExamId}>{t('result.continue')}</Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
 
diff --git a/apps/backoffice/src/app/features/seafarer-registry/pages/SeafarerRegistryPage.tsx b/apps/backoffice/src/app/features/seafarer-registry/pages/SeafarerRegistryPage.tsx
index fdb2b980d..336953f66 100644
--- a/apps/backoffice/src/app/features/seafarer-registry/pages/SeafarerRegistryPage.tsx
+++ b/apps/backoffice/src/app/features/seafarer-registry/pages/SeafarerRegistryPage.tsx
@@ -1,9 +1,9 @@
 import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
   Badge,
   Button,
   Card,
-  Center,
   Container,
   Drawer,
   Group,
@@ -25,7 +25,8 @@ import {
   IconShieldCog,
   IconStethoscope,
 } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import { AdvancedTable, notify, useServerTable, type AdvancedColumn } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   extractErrorMessage,
   useApiQuery,
@@ -77,11 +78,13 @@ function SeafarerDetailDrawer({
   profile: ProfileRow | null;
   onClose: () => void;
 }) {
+  const { t } = useTranslation();
   const profileId = profile?.id ?? '';
   const { data: seaService, isLoading: loadingSea } =
     useGetSeaServiceForProfileQuery(profileId, { skip: !profileId });
   const { data: medical, isLoading: loadingMedical } =
     useGetMedicalForProfileQuery(profileId, { skip: !profileId });
+  const showDate = useDateDisplayer();
 
   return (
     <Drawer
@@ -102,7 +105,7 @@ function SeafarerDetailDrawer({
           <Group gap="xl">
             <div>
               <Text size="xs" c="dimmed" tt="uppercase">
-                Seafarer number
+                {t('seafarerRegistry.drawer.seafarerNumber', 'Seafarer number')}
               </Text>
               <Text fw={700} ff="monospace">
                 {profile.seafarerNumber ?? '—'}
@@ -110,41 +113,49 @@ function SeafarerDetailDrawer({
             </div>
             <div>
               <Text size="xs" c="dimmed" tt="uppercase">
-                Department
+                {t('seafarerRegistry.drawer.department', 'Department')}
               </Text>
               <Text fw={600}>
                 {profile.seafarerDepartment
-                  ? DEPARTMENT_LABELS[profile.seafarerDepartment] ??
-                    profile.seafarerDepartment
+                  ? t(
+                      `seafarerRegistry.departments.${profile.seafarerDepartment}`,
+                      DEPARTMENT_LABELS[profile.seafarerDepartment] ??
+                        profile.seafarerDepartment,
+                    )
                   : '—'}
               </Text>
             </div>
             <div>
               <Text size="xs" c="dimmed" tt="uppercase">
-                Status
+                {t('seafarerRegistry.drawer.status', 'Status')}
               </Text>
               <Badge
                 color={
                   SEAFARER_STATUS_COLORS[profile.seafarerStatus ?? ''] ?? 'gray'
                 }
               >
-                {profile.seafarerStatus ?? 'NOT REGISTERED'}
+                {profile.seafarerStatus
+                  ? t(`seafarerRegistry.status.${profile.seafarerStatus}`, profile.seafarerStatus)
+                  : t('seafarerRegistry.drawer.notRegistered', 'NOT REGISTERED')}
               </Badge>
             </div>
           </Group>
           {profile.seafarerStatusReason && (
             <Text size="sm" c="dimmed">
-              Status reason: {profile.seafarerStatusReason}
+              {t('seafarerRegistry.drawer.statusReason', {
+                reason: profile.seafarerStatusReason,
+                defaultValue: 'Status reason: {{reason}}',
+              })}
             </Text>
           )}
 
           <Tabs defaultValue="sea-service" keepMounted={false}>
             <Tabs.List>
               <Tabs.Tab value="sea-service" leftSection={<IconAnchor size={14} />}>
-                Sea Service
+                {t('seafarerRegistry.drawer.seaServiceTab', 'Sea Service')}
               </Tabs.Tab>
               <Tabs.Tab value="medical" leftSection={<IconStethoscope size={14} />}>
-                Medical
+                {t('seafarerRegistry.drawer.medicalTab', 'Medical')}
               </Tabs.Tab>
             </Tabs.List>
 
@@ -153,16 +164,16 @@ function SeafarerDetailDrawer({
                 <Loader size="sm" />
               ) : (seaService ?? []).length === 0 ? (
                 <Text size="sm" c="dimmed">
-                  No sea-service records.
+                  {t('seafarerRegistry.drawer.noSeaService', 'No sea-service records.')}
                 </Text>
               ) : (
                 <Table striped>
                   <Table.Thead>
                     <Table.Tr>
-                      <Table.Th>Vessel</Table.Th>
-                      <Table.Th>Rank</Table.Th>
-                      <Table.Th>Period</Table.Th>
-                      <Table.Th>Status</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.vessel', 'Vessel')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.rank', 'Rank')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.period', 'Period')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.status', 'Status')}</Table.Th>
                     </Table.Tr>
                   </Table.Thead>
                   <Table.Tbody>
@@ -172,17 +183,20 @@ function SeafarerDetailDrawer({
                           {record.vesselName}
                           {record.imoNumber && (
                             <Text size="xs" c="dimmed">
-                              IMO {record.imoNumber}
+                              {t('seafarerRegistry.drawer.imoPrefix', {
+                                number: record.imoNumber,
+                                defaultValue: 'IMO {{number}}',
+                              })}
                             </Text>
                           )}
                         </Table.Td>
                         <Table.Td>{record.rank}</Table.Td>
                         <Table.Td>
-                          {record.engagementDate} → {record.dischargeDate}
+                          {showDate(record.engagementDate)} → {showDate(record.dischargeDate)}
                         </Table.Td>
                         <Table.Td>
                           <Badge size="sm" color={RECORD_STATUS_COLORS[record.status]}>
-                            {record.status}
+                            {t(`seafarerRegistry.recordStatus.${record.status}`, record.status)}
                           </Badge>
                         </Table.Td>
                       </Table.Tr>
@@ -197,16 +211,16 @@ function SeafarerDetailDrawer({
                 <Loader size="sm" />
               ) : (medical ?? []).length === 0 ? (
                 <Text size="sm" c="dimmed">
-                  No medical certificates.
+                  {t('seafarerRegistry.drawer.noMedical', 'No medical certificates.')}
                 </Text>
               ) : (
                 <Table striped>
                   <Table.Thead>
                     <Table.Tr>
-                      <Table.Th>Issuer</Table.Th>
-                      <Table.Th>Validity</Table.Th>
-                      <Table.Th>Fitness</Table.Th>
-                      <Table.Th>Status</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.issuer', 'Issuer')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.validity', 'Validity')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.fitness', 'Fitness')}</Table.Th>
+                      <Table.Th>{t('seafarerRegistry.drawer.status', 'Status')}</Table.Th>
                     </Table.Tr>
                   </Table.Thead>
                   <Table.Tbody>
@@ -214,7 +228,7 @@ function SeafarerDetailDrawer({
                       <Table.Tr key={certificate.id}>
                         <Table.Td>{certificate.issuerName}</Table.Td>
                         <Table.Td>
-                          {certificate.issueDate} → {certificate.expiryDate}
+                          {showDate(certificate.issueDate)} → {showDate(certificate.expiryDate)}
                         </Table.Td>
                         <Table.Td>{certificate.fitnessStatus}</Table.Td>
                         <Table.Td>
@@ -222,7 +236,7 @@ function SeafarerDetailDrawer({
                             size="sm"
                             color={RECORD_STATUS_COLORS[certificate.status]}
                           >
-                            {certificate.status}
+                            {t(`seafarerRegistry.recordStatus.${certificate.status}`, certificate.status)}
                           </Badge>
                         </Table.Td>
                       </Table.Tr>
@@ -248,6 +262,7 @@ function StatusModal({
   onClose: () => void;
   onDone: () => void;
 }) {
+  const { t } = useTranslation();
   const [status, setStatus] = useState<string | null>(null);
   const [reason, setReason] = useState('');
   const [updateStatus, { isLoading }] = useUpdateSeafarerStatusMutation();
@@ -260,11 +275,13 @@ function StatusModal({
         status: status as 'ACTIVE' | 'INACTIVE' | 'SUSPENDED' | 'PENDING',
         reason,
       }).unwrap();
-      notify.success('Seafarer status updated');
+      notify.success(t('seafarerRegistry.modal.updated', 'Seafarer status updated'));
       onClose();
       onDone();
     } catch (error) {
-      notify.error(extractErrorMessage(error, 'Could not update the status'));
+      notify.error(
+        extractErrorMessage(error, t('seafarerRegistry.modal.updateFailed', 'Could not update the status')),
+      );
     }
   };
 
@@ -272,27 +289,33 @@ function StatusModal({
     <Modal
       opened={Boolean(profile)}
       onClose={onClose}
-      title="Change seafarer status"
+      title={t('seafarerRegistry.modal.title', 'Change seafarer status')}
       centered
     >
       <Stack>
         <Text size="sm" c="dimmed">
-          {profile?.seafarerNumber} — currently {profile?.seafarerStatus}. The
-          reason is recorded and visible to the seafarer.
+          {t('seafarerRegistry.modal.body', {
+            number: profile?.seafarerNumber,
+            status: profile?.seafarerStatus
+              ? t(`seafarerRegistry.status.${profile.seafarerStatus}`, profile.seafarerStatus)
+              : profile?.seafarerStatus,
+            defaultValue:
+              '{{number}} — currently {{status}}. The reason is recorded and visible to the seafarer.',
+          })}
         </Text>
         <Select
-          label="New status"
+          label={t('seafarerRegistry.modal.newStatus', 'New status')}
           required
           data={[
-            { value: 'SUSPENDED', label: 'Suspend' },
-            { value: 'INACTIVE', label: 'Close' },
-            { value: 'ACTIVE', label: 'Reinstate' },
+            { value: 'SUSPENDED', label: t('seafarerRegistry.modal.suspend', 'Suspend') },
+            { value: 'INACTIVE', label: t('seafarerRegistry.modal.close', 'Close') },
+            { value: 'ACTIVE', label: t('seafarerRegistry.modal.reinstate', 'Reinstate') },
           ].filter((o) => o.value !== profile?.seafarerStatus)}
           value={status}
           onChange={setStatus}
         />
         <Textarea
-          label="Reason"
+          label={t('seafarerRegistry.modal.reason', 'Reason')}
           required
           minRows={2}
           value={reason}
@@ -300,7 +323,7 @@ function StatusModal({
         />
         <Group justify="flex-end">
           <Button variant="default" onClick={onClose}>
-            Cancel
+            {t('seafarerRegistry.modal.cancel', 'Cancel')}
           </Button>
           <Button
             color={status === 'ACTIVE' ? 'green' : 'orange'}
@@ -308,7 +331,7 @@ function StatusModal({
             loading={isLoading}
             onClick={submit}
           >
-            Confirm
+            {t('seafarerRegistry.modal.confirm', 'Confirm')}
           </Button>
         </Group>
       </Stack>
@@ -324,6 +347,7 @@ function StatusModal({
  * register — numbers, departments, statuses, and each seafarer's records.
  */
 export function SeafarerRegistryPage() {
+  const { t } = useTranslation();
   const [search, setSearch] = useState('');
   const [detail, setDetail] = useState<ProfileRow | null>(null);
   const [statusTarget, setStatusTarget] = useState<ProfileRow | null>(null);
@@ -335,6 +359,7 @@ export function SeafarerRegistryPage() {
     method: 'GET',
     params: { q: 'i=profession,address&t=200' },
   });
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable();
 
   const items = (data?.items ?? []).filter((p) => {
     if (!search.trim()) return true;
@@ -349,18 +374,95 @@ export function SeafarerRegistryPage() {
       .filter(Boolean)
       .some((v) => String(v).toLowerCase().includes(term));
   });
+  const page = paginate(items);
+
+  const columns: AdvancedColumn<ProfileRow>[] = [
+    {
+      header: t('seafarerRegistry.columns.name', 'Name'),
+      cell: ({ row }) => (
+        <Text
+          size="sm"
+          fw={500}
+          style={{ cursor: 'pointer' }}
+          onClick={() => setDetail(row.original)}
+        >
+          {[row.original.firstName, row.original.middleName, row.original.lastName].filter(Boolean).join(' ')}
+        </Text>
+      ),
+    },
+    {
+      header: t('seafarerRegistry.columns.number', 'Seafarer №'),
+      cell: ({ row }) => <Text size="sm" ff="monospace">{row.original.seafarerNumber ?? '—'}</Text>,
+    },
+    {
+      header: t('seafarerRegistry.columns.department', 'Department'),
+      cell: ({ row }) => (
+        <Text size="sm">
+          {row.original.seafarerDepartment
+            ? t(
+                `seafarerRegistry.departments.${row.original.seafarerDepartment}`,
+                DEPARTMENT_LABELS[row.original.seafarerDepartment] ?? row.original.seafarerDepartment,
+              )
+            : '—'}
+        </Text>
+      ),
+    },
+    {
+      header: t('seafarerRegistry.columns.idNumber', 'ID number'),
+      cell: ({ row }) => <Text size="sm" c="dimmed">{row.original.address?.idNumber ?? '—'}</Text>,
+    },
+    {
+      header: t('seafarerRegistry.columns.phone', 'Phone'),
+      cell: ({ row }) => <Text size="sm" c="dimmed">{row.original.address?.primaryPhoneNumber ?? '—'}</Text>,
+    },
+    {
+      header: t('seafarerRegistry.columns.status', 'Status'),
+      cell: ({ row }) =>
+        row.original.seafarerNumber ? (
+          <Badge size="sm" variant="light" color={SEAFARER_STATUS_COLORS[row.original.seafarerStatus ?? ''] ?? 'gray'}>
+            {t(`seafarerRegistry.status.${row.original.seafarerStatus}`, row.original.seafarerStatus ?? '')}
+          </Badge>
+        ) : (
+          <Badge size="sm" variant="light" color={row.original.isComplete ? 'teal' : 'gray'}>
+            {row.original.isComplete
+              ? t('seafarerRegistry.notRegistered', 'Not registered')
+              : t('seafarerRegistry.incomplete', 'Incomplete')}
+          </Badge>
+        ),
+    },
+    {
+      header: '',
+      label: t('seafarerRegistry.columns.actions', 'Actions'),
+      cell: ({ row }) =>
+        row.original.seafarerNumber ? (
+          <Tooltip label={t('seafarerRegistry.statusActionTooltip', 'Suspend / reinstate / close')}>
+            <Button
+              size="compact-xs"
+              variant="subtle"
+              leftSection={<IconShieldCog size={14} />}
+              onClick={() => setStatusTarget(row.original)}
+            >
+              {t('seafarerRegistry.statusAction', 'Status')}
+            </Button>
+          </Tooltip>
+        ) : null,
+    },
+  ];
 
   return (
     <Container size="xl" py="md">
       <Group justify="space-between" mb="md">
         <div>
-          <Title order={3}>Seafarer registry</Title>
+          <Title order={3}>{t('seafarerRegistry.title', 'Seafarer registry')}</Title>
           <Text size="sm" c="dimmed">
-            {data?.total ?? 0} profile{(data?.total ?? 0) === 1 ? '' : 's'}
+            {t('seafarerRegistry.profileCount', {
+              count: data?.total ?? 0,
+              defaultValue: '{{count}} profile(s)',
+            })}
           </Text>
         </div>
         <TextInput
-          placeholder="Name, ID or seafarer number"
+          placeholder={t('seafarerRegistry.searchPlaceholder', 'Name, ID or seafarer number')}
           leftSection={<IconSearch size={14} />}
           value={search}
           onChange={(e) => setSearch(e.currentTarget.value)}
@@ -369,97 +471,23 @@ export function SeafarerRegistryPage() {
       </Group>
 
       <Card withBorder padding={0}>
-        {isLoading ? (
-          <Center h={200}>
-            <Loader />
-          </Center>
-        ) : items.length === 0 ? (
-          <Center h={160}>
-            <Text size="sm" c="dimmed">
-              {search ? 'No profiles match that search.' : 'No seafarers registered yet.'}
-            </Text>
-          </Center>
-        ) : (
-          <Table highlightOnHover>
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>Name</Table.Th>
-                <Table.Th>Seafarer №</Table.Th>
-                <Table.Th>Department</Table.Th>
-                <Table.Th>ID number</Table.Th>
-                <Table.Th>Phone</Table.Th>
-                <Table.Th>Status</Table.Th>
-                <Table.Th />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>
-              {items.map((p) => (
-                <Table.Tr
-                  key={p.id}
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => setDetail(p)}
-                >
-                  <Table.Td>
-                    <Text size="sm" fw={500}>
-                      {[p.firstName, p.middleName, p.lastName].filter(Boolean).join(' ')}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm" ff="monospace">
-                      {p.seafarerNumber ?? '—'}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm">
-                      {p.seafarerDepartment
-                        ? DEPARTMENT_LABELS[p.seafarerDepartment] ?? p.seafarerDepartment
-                        : '—'}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm" c="dimmed">
-                      {p.address?.idNumber ?? '—'}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm" c="dimmed">
-                      {p.address?.primaryPhoneNumber ?? '—'}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    {p.seafarerNumber ? (
-                      <Badge
-                        size="sm"
-                        variant="light"
-                        color={SEAFARER_STATUS_COLORS[p.seafarerStatus ?? ''] ?? 'gray'}
-                      >
-                        {p.seafarerStatus}
-                      </Badge>
-                    ) : (
-                      <Badge size="sm" variant="light" color={p.isComplete ? 'teal' : 'gray'}>
-                        {p.isComplete ? 'Not registered' : 'Incomplete'}
-                      </Badge>
-                    )}
-                  </Table.Td>
-                  <Table.Td onClick={(e) => e.stopPropagation()}>
-                    {p.seafarerNumber && (
-                      <Tooltip label="Suspend / reinstate / close">
-                        <Button
-                          size="compact-xs"
-                          variant="subtle"
-                          leftSection={<IconShieldCog size={14} />}
-                          onClick={() => setStatusTarget(p)}
-                        >
-                          Status
-                        </Button>
-                      </Tooltip>
-                    )}
-                  </Table.Td>
-                </Table.Tr>
-              ))}
-            </Table.Tbody>
-          </Table>
-        )}
+        <AdvancedTable
+          columns={columns}
+          data={page.rows}
+          tableName={t('seafarerRegistry.title', 'Seafarer registry')}
+          itemCount={page.itemCount}
+          pageIndex={page.pageIndex}
+          onPageChange={setPageIndex}
+          pageSize={pageSize}
+          onPageSizeChange={setPageSize}
+          refresh={refetch}
+          isLoading={isLoading}
+          emptyText={
+            search
+              ? t('seafarerRegistry.emptySearch', 'No profiles match that search.')
+              : t('seafarerRegistry.emptyNone', 'No seafarers registered yet.')
+          }
+        />
       </Card>
 
       <SeafarerDetailDrawer profile={detail} onClose={() => setDetail(null)} />
diff --git a/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx b/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
index d6d89c47d..6a96bba84 100644
--- a/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
+++ b/apps/backoffice/src/app/features/user-management/UserManagementPage.tsx
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie';
 import { useCallback, useEffect, useRef } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
 import { useNavigate } from 'react-router-dom';
@@ -138,8 +139,8 @@ export default function UserManagementPage() {
     style.textContent = UM_OVERRIDES;
     document.head.appendChild(style);
 
-    const token = localStorage.getItem('ema-backoffice-auth-token') ?? '';
-    const refreshToken = localStorage.getItem('ema-backoffice-refresh-token') ?? undefined;
+    const token = Cookies.get('ema-backoffice-auth-token') ?? '';
+    const refreshToken = Cookies.get('ema-backoffice-refresh-token');
 
     const session: UserManagementSessionOptions = {
       initialSession: token
diff --git a/apps/backoffice/src/app/features/vessel-registration/mock.ts b/apps/backoffice/src/app/features/vessel-registration/mock.ts
new file mode 100644
index 000000000..7897dce21
--- /dev/null
+++ b/apps/backoffice/src/app/features/vessel-registration/mock.ts
@@ -0,0 +1,433 @@
+// ponytail: in-memory mock array, resets on reload — swap for RTK Query endpoint when backend lands.
+
+export type VesselCategory = 'Inland Waterway' | 'Sea-going';
+
+export type RegistrationStatus =
+  | 'Pending'
+  | 'Under Review'
+  | 'Correction Required'
+  | 'Resubmitted'
+  | 'Approved'
+  | 'Rejected';
+
+export const STATUS_COLOR: Record<RegistrationStatus, string> = {
+  Pending: 'gray',
+  'Under Review': 'blue',
+  'Correction Required': 'orange',
+  Resubmitted: 'cyan',
+  Approved: 'teal',
+  Rejected: 'red',
+};
+
+export type RenewalState = 'OK' | 'Due Soon' | 'Overdue';
+
+export const RENEWAL_COLOR: Record<RenewalState, string> = {
+  OK: 'gray',
+  'Due Soon': 'orange',
+  Overdue: 'red',
+};
+
+export interface RegistrationOwner {
+  name: string;
+  idOrTin: string;
+  phone: string;
+  email: string;
+  address: string;
+}
+
+export interface TimelineStep {
+  date: string | null;
+  event: string;
+  done: boolean;
+}
+
+export interface RegistrationCertificate {
+  name: string;
+  number: string;
+  issueDate: string;
+}
+
+export interface RegistrationDocument {
+  key: string;
+  label: string;
+  fileName: string;
+  fileType: 'pdf' | 'image';
+}
+
+export interface VesselRegistration {
+  id: string;
+  category: VesselCategory;
+  status: RegistrationStatus;
+  submitted: string;
+  remarks?: string;
+  correctionFields?: string[];
+  expiryDate?: string;
+  renewal?: RenewalState;
+  timeline: TimelineStep[];
+  documents: RegistrationDocument[];
+  certificates?: RegistrationCertificate[];
+
+  // Vessel details
+  vesselName: string;
+  vesselType: string;
+  registrationArea: string;
+  flagState: string;
+  passengerCapacity?: string;
+  grossTonnage?: string;
+  length: string;
+  breadth: string;
+  depth: string;
+
+  // Technical
+  imoNumber?: string;
+  hullNumber?: string;
+  shipyard: string;
+  yearBuilt: string;
+  engineType: string;
+  engineNumber: string;
+  enginePower: string;
+  hullMaterial: string;
+
+  // Ownership
+  owner: RegistrationOwner;
+}
+
+export const CERTIFICATES: Record<VesselCategory, string[]> = {
+  'Inland Waterway': ['Inland Vessel Registration Certificate'],
+  'Sea-going': [
+    'Certificate of Nationality',
+    'Certificate of Ownership',
+    'Certificate of Registration',
+    'Minimum Safe Manning Certificate',
+  ],
+};
+
+const SUBMITTED_STEP = (date: string): TimelineStep => ({ date, event: 'Application Submitted', done: true });
+const PENDING_STEP = (event: string): TimelineStep => ({ date: null, event, done: false });
+
+export const MOCK_REGISTRATIONS: VesselRegistration[] = [
+  {
+    id: 'VR-2025-0001',
+    category: 'Sea-going',
+    status: 'Under Review',
+    submitted: '2025-06-20',
+    timeline: [
+      SUBMITTED_STEP('2025-06-20'),
+      { date: '2025-06-22', event: 'Document Verification', done: true },
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'nile_star_photos.pdf', fileType: 'pdf' },
+      { key: 'ownership', label: 'Proof of Ownership / Bill of Sale', fileName: 'nile_star_bill_of_sale.pdf', fileType: 'pdf' },
+      { key: 'particulars', label: 'Ship Particulars', fileName: 'nile_star_particulars.pdf', fileType: 'pdf' },
+      { key: 'insurance', label: 'Insurance Certificate', fileName: 'nile_star_insurance.pdf', fileType: 'pdf' },
+    ],
+    vesselName: 'MV Nile Star',
+    vesselType: 'Bulk Carrier',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '18500',
+    length: '190',
+    breadth: '28',
+    depth: '15',
+    imoNumber: 'IMO9876543',
+    shipyard: 'Hyundai Heavy Industries',
+    yearBuilt: '2016',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-44210',
+    enginePower: '12000 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Nile Shipping PLC',
+      idOrTin: 'TIN-0012345678',
+      phone: '+251911223344',
+      email: 'ops@nileshipping.et',
+      address: 'Bole Sub-city, Addis Ababa',
+    },
+  },
+  {
+    id: 'VR-2025-0002',
+    category: 'Inland Waterway',
+    status: 'Correction Required',
+    submitted: '2025-06-10',
+    remarks: 'Vessel photos are blurry — please re-upload at least 2 clear photos showing the hull and registration markings.',
+    correctionFields: ['Vessel Photos'],
+    timeline: [
+      SUBMITTED_STEP('2025-06-10'),
+      { date: '2025-06-12', event: 'Document Verification', done: true },
+      { date: '2025-06-14', event: 'Correction Requested', done: true },
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'tana_ferry3_photos.jpg', fileType: 'image' },
+    ],
+    vesselName: 'Tana Ferry 3',
+    vesselType: 'Ferry',
+    registrationArea: 'Lake Tana',
+    flagState: 'Ethiopia',
+    passengerCapacity: '40',
+    length: '18',
+    breadth: '5',
+    depth: '2',
+    hullNumber: 'HN-2211',
+    shipyard: 'Bahir Dar Boat Works',
+    yearBuilt: '2020',
+    engineType: 'Outboard',
+    engineNumber: 'ENG-9931',
+    enginePower: '150 hp',
+    hullMaterial: 'Fiberglass',
+    owner: {
+      name: 'Getachew Alemu',
+      idOrTin: 'ID-4455667788',
+      phone: '+251922334455',
+      email: 'getachew.alemu@example.com',
+      address: 'Bahir Dar, Amhara',
+    },
+  },
+  {
+    id: 'VR-2025-0003',
+    category: 'Sea-going',
+    status: 'Approved',
+    submitted: '2025-04-05',
+    expiryDate: '2026-08-15',
+    renewal: 'Due Soon',
+    timeline: [
+      SUBMITTED_STEP('2025-04-05'),
+      { date: '2025-04-08', event: 'Document Verification', done: true },
+      { date: '2025-04-20', event: 'Inspection', done: true },
+      { date: '2025-04-28', event: 'Approval', done: true },
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'abay_voyager_photos.pdf', fileType: 'pdf' },
+      { key: 'ownership', label: 'Proof of Ownership / Bill of Sale', fileName: 'abay_voyager_bill_of_sale.pdf', fileType: 'pdf' },
+      { key: 'particulars', label: 'Ship Particulars', fileName: 'abay_voyager_particulars.pdf', fileType: 'pdf' },
+      { key: 'insurance', label: 'Insurance Certificate', fileName: 'abay_voyager_insurance.pdf', fileType: 'pdf' },
+    ],
+    certificates: [
+      { name: 'Certificate of Nationality', number: 'CN-2025-0091', issueDate: '2025-04-28' },
+      { name: 'Certificate of Ownership', number: 'CO-2025-0091', issueDate: '2025-04-28' },
+      { name: 'Certificate of Registration', number: 'CR-2025-0091', issueDate: '2025-04-28' },
+      { name: 'Minimum Safe Manning Certificate', number: 'MSM-2025-0091', issueDate: '2025-04-28' },
+    ],
+    vesselName: 'MV Abay Voyager',
+    vesselType: 'General Cargo',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '9600',
+    length: '140',
+    breadth: '21',
+    depth: '11',
+    imoNumber: 'IMO9123456',
+    shipyard: 'Damen Shipyards',
+    yearBuilt: '2012',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-33012',
+    enginePower: '7200 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Abay Maritime PLC',
+      idOrTin: 'TIN-0098765432',
+      phone: '+251933445566',
+      email: 'contact@abaymaritime.et',
+      address: 'Kirkos Sub-city, Addis Ababa',
+    },
+  },
+  {
+    id: 'VR-2025-0004',
+    category: 'Inland Waterway',
+    status: 'Rejected',
+    submitted: '2025-03-02',
+    remarks: 'Hull number does not match the submitted proof of ownership. Application rejected — please reapply with matching documentation.',
+    timeline: [
+      SUBMITTED_STEP('2025-03-02'),
+      { date: '2025-03-05', event: 'Document Verification', done: true },
+      { date: '2025-03-14', event: 'Inspection', done: true },
+      { date: '2025-03-18', event: 'Rejected', done: true },
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'awash_cargo1_photos.jpg', fileType: 'image' },
+    ],
+    vesselName: 'Awash Cargo 1',
+    vesselType: 'Cargo Barge',
+    registrationArea: 'Awash River Basin',
+    flagState: 'Ethiopia',
+    passengerCapacity: '0',
+    length: '22',
+    breadth: '6',
+    depth: '3',
+    hullNumber: 'HN-1187',
+    shipyard: 'Awash River Works',
+    yearBuilt: '2018',
+    engineType: 'Inboard',
+    engineNumber: 'ENG-5567',
+    enginePower: '210 hp',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Selam Tesfaye',
+      idOrTin: 'ID-2233445566',
+      phone: '+251944556677',
+      email: 'selam.tesfaye@example.com',
+      address: 'Adama, Oromia',
+    },
+  },
+  {
+    id: 'VR-2025-0005',
+    category: 'Sea-going',
+    status: 'Pending',
+    submitted: '2025-07-10',
+    timeline: [
+      SUBMITTED_STEP('2025-07-10'),
+      PENDING_STEP('Document Verification'),
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'genale_pearl_photos.pdf', fileType: 'pdf' },
+      { key: 'ownership', label: 'Proof of Ownership / Bill of Sale', fileName: 'genale_pearl_bill_of_sale.pdf', fileType: 'pdf' },
+      { key: 'particulars', label: 'Ship Particulars', fileName: 'genale_pearl_particulars.pdf', fileType: 'pdf' },
+      { key: 'insurance', label: 'Insurance Certificate', fileName: 'genale_pearl_insurance.pdf', fileType: 'pdf' },
+    ],
+    vesselName: 'MV Genale Pearl',
+    vesselType: 'Container Ship',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '24300',
+    length: '210',
+    breadth: '30',
+    depth: '17',
+    imoNumber: 'IMO9345678',
+    shipyard: 'Samsung Heavy Industries',
+    yearBuilt: '2019',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-51290',
+    enginePower: '15400 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Genale Maritime PLC',
+      idOrTin: 'TIN-0011223344',
+      phone: '+251911998877',
+      email: 'ops@genalemaritime.et',
+      address: 'Kirkos Sub-city, Addis Ababa',
+    },
+  },
+  {
+    id: 'VR-2025-0006',
+    category: 'Inland Waterway',
+    status: 'Resubmitted',
+    submitted: '2025-06-01',
+    remarks: 'Re-uploaded clearer hull and deck photos as requested.',
+    timeline: [
+      SUBMITTED_STEP('2025-06-01'),
+      { date: '2025-06-03', event: 'Document Verification', done: true },
+      { date: '2025-06-05', event: 'Correction Requested', done: true },
+      { date: '2025-06-18', event: 'Resubmitted', done: true },
+      PENDING_STEP('Approval'),
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'zeway_runner_photos_v2.jpg', fileType: 'image' },
+    ],
+    vesselName: 'Zeway Runner',
+    vesselType: 'Passenger Boat',
+    registrationArea: 'Lake Ziway',
+    flagState: 'Ethiopia',
+    passengerCapacity: '25',
+    length: '14',
+    breadth: '4',
+    depth: '1.6',
+    hullNumber: 'HN-3092',
+    shipyard: 'Ziway Boat Works',
+    yearBuilt: '2021',
+    engineType: 'Outboard',
+    engineNumber: 'ENG-7712',
+    enginePower: '90 hp',
+    hullMaterial: 'Fiberglass',
+    owner: {
+      name: 'Mekdes Yohannes',
+      idOrTin: 'ID-5566778899',
+      phone: '+251955667788',
+      email: 'mekdes.y@example.com',
+      address: 'Ziway, Oromia',
+    },
+  },
+  {
+    id: 'VR-2025-0007',
+    category: 'Sea-going',
+    status: 'Approved',
+    submitted: '2024-08-01',
+    expiryDate: '2025-08-01',
+    renewal: 'Overdue',
+    timeline: [
+      SUBMITTED_STEP('2024-08-01'),
+      { date: '2024-08-05', event: 'Document Verification', done: true },
+      { date: '2024-08-18', event: 'Inspection', done: true },
+      { date: '2024-08-25', event: 'Approval', done: true },
+    ],
+    documents: [
+      { key: 'photos', label: 'Vessel Photos', fileName: 'red_sea_trader_photos.pdf', fileType: 'pdf' },
+      { key: 'ownership', label: 'Proof of Ownership / Bill of Sale', fileName: 'red_sea_trader_bill_of_sale.pdf', fileType: 'pdf' },
+      { key: 'particulars', label: 'Ship Particulars', fileName: 'red_sea_trader_particulars.pdf', fileType: 'pdf' },
+      { key: 'insurance', label: 'Insurance Certificate', fileName: 'red_sea_trader_insurance.pdf', fileType: 'pdf' },
+    ],
+    certificates: [
+      { name: 'Certificate of Nationality', number: 'CN-2024-0058', issueDate: '2024-08-25' },
+      { name: 'Certificate of Ownership', number: 'CO-2024-0058', issueDate: '2024-08-25' },
+      { name: 'Certificate of Registration', number: 'CR-2024-0058', issueDate: '2024-08-25' },
+      { name: 'Minimum Safe Manning Certificate', number: 'MSM-2024-0058', issueDate: '2024-08-25' },
+    ],
+    vesselName: 'MV Red Sea Trader',
+    vesselType: 'Tanker',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '31200',
+    length: '228',
+    breadth: '32',
+    depth: '19',
+    imoNumber: 'IMO9456789',
+    shipyard: 'Mitsubishi Heavy Industries',
+    yearBuilt: '2009',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-28871',
+    enginePower: '18900 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Red Sea Tankers PLC',
+      idOrTin: 'TIN-0055443322',
+      phone: '+251911332211',
+      email: 'fleet@redseatankers.et',
+      address: 'Yeka Sub-city, Addis Ababa',
+    },
+  },
+];
+
+// ponytail: mutate mock, no live clock — swap for real API mutation when backend lands.
+export function applyDecision(
+  reg: VesselRegistration,
+  status: RegistrationStatus,
+  remarks?: string,
+  correctionFields?: string[]
+): void {
+  reg.status = status;
+  if (remarks) reg.remarks = remarks;
+  reg.correctionFields = status === 'Correction Required' ? correctionFields : undefined;
+  const eventLabel: Record<RegistrationStatus, string> = {
+    Pending: 'Pending',
+    'Under Review': 'Marked Under Review',
+    'Correction Required': 'Correction Requested',
+    Resubmitted: 'Resubmitted',
+    Approved: 'Approval',
+    Rejected: 'Rejected',
+  };
+  const today = reg.timeline[reg.timeline.length - 1]?.date ?? reg.submitted;
+  reg.timeline.push({ date: today, event: eventLabel[status], done: true });
+}
+
+export function generateCertificates(reg: VesselRegistration): void {
+  const today = reg.timeline[reg.timeline.length - 1]?.date ?? reg.submitted;
+  reg.certificates = CERTIFICATES[reg.category].map((name, i) => ({
+    name,
+    number: `${name.split(' ').map((w) => w[0]).join('').toUpperCase()}-2025-${String(1000 + i)}`,
+    issueDate: today ?? reg.submitted,
+  }));
+}
diff --git a/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferQueuePage.tsx b/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferQueuePage.tsx
deleted file mode 100644
index 3b379157c..000000000
--- a/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferQueuePage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
-
-/**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
- */
-export function VesselOwnershipTransferQueuePage() {
-  return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Ownership transfer queue"
-        description="Vessel ownership transfer is not connected to the backend yet."
-      />
-    </Container>
-  );
-}
-
-export default VesselOwnershipTransferQueuePage;
diff --git a/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferReviewPage.tsx b/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferReviewPage.tsx
deleted file mode 100644
index bdd967e68..000000000
--- a/apps/backoffice/src/app/features/vessel-registration/pages/VesselOwnershipTransferReviewPage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
-
-/**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
- */
-export function VesselOwnershipTransferReviewPage() {
-  return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Ownership transfer review"
-        description="Vessel ownership transfer is not connected to the backend yet."
-      />
-    </Container>
-  );
-}
-
-export default VesselOwnershipTransferReviewPage;
diff --git a/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationFormBuilderPage.tsx b/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationFormBuilderPage.tsx
index cb89cf001..37b9e3f97 100644
--- a/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationFormBuilderPage.tsx
+++ b/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationFormBuilderPage.tsx
@@ -30,7 +30,7 @@ import {
   IconSettings,
   IconTrash,
 } from '@tabler/icons-react';
-import { notify } from '@ema-platform/ui';
+import { notify, ModalFooter } from '@ema-platform/ui';
 
 // ---------------------------------------------------------------------------
 // Types
@@ -495,12 +495,12 @@ export function VesselRegistrationFormBuilderPage() {
             onChange={(e) => setDraftRequired(e.currentTarget.checked)}
           />
           <Divider />
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={() => setDrawerOpen(false)}>Cancel</Button>
             <Button color="teal" onClick={saveField}>
               {isNew ? 'Add Field' : 'Save Changes'}
             </Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Drawer>
 
@@ -516,10 +516,10 @@ export function VesselRegistrationFormBuilderPage() {
             Are you sure you want to remove <strong>{deleteTarget?.label}</strong> from the form?
             This cannot be undone.
           </Text>
-          <Group justify="flex-end">
+          <ModalFooter>
             <Button variant="default" onClick={() => setDeleteTarget(null)}>Cancel</Button>
             <Button color="red" onClick={confirmDelete}>Delete Field</Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
     </Stack>
diff --git a/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationQueuePage.tsx b/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationQueuePage.tsx
index 7ca49166e..b1ade8104 100644
--- a/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationQueuePage.tsx
+++ b/apps/backoffice/src/app/features/vessel-registration/pages/VesselRegistrationQueuePage.tsx
@@ -27,6 +27,7 @@ import {
   IconShieldCog,
 } from '@tabler/icons-react';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   extractErrorMessage,
   useGetVesselIncidentsQuery,
@@ -56,6 +57,7 @@ function VesselDetailDrawer({
 }) {
   const { data: incidents, isLoading: loadingIncidents } =
     useGetVesselIncidentsQuery(vessel?.id ?? '', { skip: !vessel });
+  const showDate = useDateDisplayer();
 
   const particulars: [string, string | number | null][] = vessel
     ? [
@@ -75,7 +77,7 @@ function VesselDetailDrawer({
         ['Engines', vessel.numberOfEngines],
         ['Hull material', vessel.hullMaterial],
         ['Owner', vessel.ownerName],
-        ['Registered', vessel.registeredAt?.slice(0, 10) ?? null],
+        ['Registered', vessel.registeredAt ? showDate(vessel.registeredAt) : null],
       ]
     : [];
 
@@ -127,7 +129,7 @@ function VesselDetailDrawer({
               <Card key={incident.id} withBorder radius="md" p="sm">
                 <Group justify="space-between">
                   <Text size="sm" fw={600}>
-                    {incident.occurredAt}
+                    {showDate(incident.occurredAt)}
                     {incident.location ? ` — ${incident.location}` : ''}
                   </Text>
                   <Badge size="sm" variant="light">
@@ -240,6 +242,7 @@ export function VesselRegistrationQueuePage() {
   const [statusTarget, setStatusTarget] = useState<Vessel | null>(null);
 
   const items = data?.items ?? [];
+  const showDate = useDateDisplayer();
 
   return (
     <Container size="xl" py="md">
@@ -319,7 +322,7 @@ export function VesselRegistrationQueuePage() {
                   </Table.Td>
                   <Table.Td>
                     <Text size="sm" c="dimmed">
-                      {vessel.registeredAt?.slice(0, 10)}
+                      {showDate(vessel.registeredAt)}
                     </Text>
                   </Table.Td>
                   <Table.Td>
diff --git a/apps/backoffice/src/app/i18n/locales/am.ts b/apps/backoffice/src/app/i18n/locales/am.ts
index a45bb2fb4..92400f9ae 100644
--- a/apps/backoffice/src/app/i18n/locales/am.ts
+++ b/apps/backoffice/src/app/i18n/locales/am.ts
@@ -1,1032 +1,1283 @@
-import type { Translations } from './en';
+import type { Translations } from "./en";
 
 export const am: Translations = {
   app: {
-    name: 'ኢማ አስተዳደር',
-    shortName: 'ኢማ',
-    authority: 'የኢትዮጵያ ባሕር ጉዳዮች ባለሥልጣን',
-    tagline: 'የቁጥጥር ማዕከል',
+    name: "ኢማ አስተዳደር",
+    shortName: "ኢማ",
+    authority: "የኢትዮጵያ ባሕር ጉዳዮች ባለሥልጣን",
+    tagline: "የቁጥጥር ማዕከል",
+  },
+
+  msg: {
+    genericError: "የሆነ ስህተት ተፈጥሯል። እባክዎ እንደገና ይሞክሩ።",
+    serverError: "የሰርቨር ስህተት። እባክዎ ቆየት ብለው እንደገና ይሞክሩ።",
+    validationError: "እባክዎ ያስገቡትን መረጃ ያረጋግጡና እንደገና ይሞክሩ።",
+    authError: "ክፍለ ጊዜዎ አልቋል። እባክዎ እንደገና ይግቡ።",
+    permissionError: "ይህን ድርጊት ለመፈጸም ፈቃድ የለዎትም።",
+    notFoundError: "የተጠየቀው ንጥል አልተገኘም።",
+    fileTooLarge: "ፋይሉ ለመስቀል በጣም ትልቅ ነው።",
+    networkError: "የአውታረ መረብ ስህተት። ግንኙነትዎን አረጋግጠው እንደገና ይሞክሩ።",
   },
 
   language: {
-    label: 'ቋንቋ',
-    en: 'English',
-    am: 'አማርኛ',
+    label: "ቋንቋ",
+    en: "English",
+    am: "አማርኛ",
   },
 
   nav: {
-    groupLicensing: 'ፈቃድ አሰጣጥ',
-    allApplications: 'ሁሉም ማመልከቻዎች',
-    licenceRegister: 'የፈቃድ መዝገብ',
-    certificateDesigner: 'የምስክር ወረቀት ንድፍ',
-    byType: 'በዓይነት',
-    typeFreightForwarder: 'የጭነት አስተላላፊ',
-    typeShippingAgent: 'የመርከብ ወኪል',
-    typeCombined: 'ጥምር የመርከብ ወኪል እና ጭነት አስተላላፊ',
-    typeJointInvestment: 'የጋራ ኢንቨስትመንት',
-    typeMto: 'የብዝሃ-ሁነታ ትራንስፖርት አንቀሳቃሽ',
-    primary: 'ዋና',
-    destinations: 'ወደ',
-    noResults: 'ምንም አልተገኘም',
-    commandPlaceholder: 'ማያ ገጾችን፣ ማመልከቻዎችን፣ ኩባንያዎችን፣ ቲን ይፈልጉ…',
-    pending: 'በመጠባበቅ ላይ ያሉ',
-    pendingCount_one: '{{count}} በመጠባበቅ ላይ',
-    pendingCount_other: '{{count}} በመጠባበቅ ላይ',
-    groupSeafarer: 'የመርከበኞች አገልግሎት',
-    groupVessels: 'መርከቦች',
-    groupExaminations: 'ፈተናዎች',
-    groupAdministration: 'አስተዳደር',
-    groupAccount: 'መለያ',
-    soon: 'በቅርቡ',
-    details: 'ዝርዝር',
-    licenceReview: 'የፈቃድ ማመልከቻዎች',
-    vesselRegistrationHeadDashboard: 'የመርከብ ምዝገባ ኃላፊ ዳሽቦርድ',
-    vesselRegistrationQueue: 'የመርከብ መዝገብ',
-    vesselFormBuilder: 'የመርከብ ቅጽ መገንቢያ',
-    vesselRegistrationReport: 'የመርከብ ምዝገባ ሪፖርት',
-    ownershipTransferQueue: 'የባለቤትነት ዝውውር ወረፋ',
-    logisticsHeadDashboard: 'የሎጂስቲክስ ኃላፊ ዳሽቦርድ',
-    freightForwarderLicense: 'የጭነት አስተላላፊ ፈቃድ',
-    shippingAgentLicense: 'የመርከብ ወኪል ፈቃድ',
-    combinedLicense: 'የተቀናጀ ፈቃድ',
-    jointInvestmentLicense: 'የጋራ ኢንቨስትመንት ፈቃድ',
-    mtoLicense: 'የMTO ፈቃድ',
-    waiver: 'ነፃ ፈቃድ',
-    preWaiverQueue: 'የቅድመ ነፃ ፈቃድ ወረፋ',
-    postWaiverQueue: 'የድህረ ነፃ ፈቃድ ወረፋ',
-    menu: 'ምናሌ',
-    dashboard: 'ዳሽቦርድ',
-    userManagement: 'የተጠቃሚ አስተዳደር',
-    seamanBookQueue: 'የመርከበኞች መጽሐፍ ወረፋ',
-    cocQueue: 'የCoC/CoP ወረፋ',
-    endorsementQueue: 'የማረጋገጫ ወረፋ',
-    seafarerRegistry: 'የመርከበኞች መዝገብ',
-    applications: 'ማመልከቻዎች',
-    paymentConfig: 'የክፍያ ውቅረት',
-    analytics: 'ትንታኔ',
-    medicalVerification: 'የህክምና ማረጋገጫ',
-    locations: 'አካባቢዎች',
-    configuration: 'ውቅረት',
-    profile: 'መገለጫ',
-    questions: 'ጥያቄዎች',
-    exams: 'ፈተናዎች',
-    examResults: 'የፈተና ውጤቶች',
-    examAppeals: 'የፈተና ይግባኞች',
-    collapseSidebar: 'ሰብስብ',
-    expandSidebar: 'ዘርጋ',
+    groupLicensing: "ፈቃድ አሰጣጥ",
+    allApplications: "ሁሉም ማመልከቻዎች",
+    licenceRegister: "የፈቃድ መዝገብ",
+    certificateDesigner: "የምስክር ወረቀት ንድፍ",
+    byType: "በዓይነት",
+    typeFreightForwarder: "የጭነት አስተላላፊ",
+    typeShippingAgent: "የመርከብ ወኪል",
+    typeCombined: "ጥምር የመርከብ ወኪል እና ጭነት አስተላላፊ",
+    typeJointInvestment: "የጋራ ኢንቨስትመንት",
+    typeMto: "የብዝሃ-ሁነታ ትራንስፖርት አንቀሳቃሽ",
+    typeSEAFARER_REGISTRATION: "የመርከበኞች ምዝገባ",
+    typeVESSEL_OWNERSHIP_TRANSFER: "የመርከብ ባለቤትነት ዝውውር",
+    typeCERTIFICATE_OF_COMPETENCY: "የብቃት ማረጋገጫ ምስክር ወረቀት",
+    typeCERTIFICATE_OF_PROFICIENCY: "የብቃት ምስክር ወረቀት",
+    typeENDORSEMENT_COC: "የCoC ማረጋገጫ",
+    typeENDORSEMENT_GOC: "የGOC ማረጋገጫ",
+    primary: "ዋና",
+    destinations: "ወደ",
+    noResults: "ምንም አልተገኘም",
+    commandPlaceholder: "ማያ ገጾችን፣ ማመልከቻዎችን፣ ኩባንያዎችን፣ ቲን ይፈልጉ…",
+    pending: "በመጠባበቅ ላይ ያሉ",
+    pendingCount_one: "{{count}} በመጠባበቅ ላይ",
+    pendingCount_other: "{{count}} በመጠባበቅ ላይ",
+    groupSeafarer: "የመርከበኞች አገልግሎት",
+    groupVessels: "መርከቦች",
+    groupExaminations: "ፈተናዎች",
+    groupAdministration: "አስተዳደር",
+    groupAccount: "መለያ",
+    soon: "በቅርቡ",
+    details: "ዝርዝር",
+    licenceReview: "የፈቃድ ማመልከቻዎች",
+    vesselRegistrationHeadDashboard: "የመርከብ ምዝገባ ኃላፊ ዳሽቦርድ",
+    vesselRegistrationApplicationQueue: "የመርከብ ምዝገባ ወረፋ",
+    vesselRegistrationQueue: "የመርከብ መዝገብ",
+    vesselFormBuilder: "የመርከብ ቅጽ መገንቢያ",
+    vesselRegistrationReport: "የመርከብ ምዝገባ ሪፖርት",
+    ownershipTransferQueue: "የባለቤትነት ዝውውር ወረፋ",
+    logisticsHeadDashboard: "የሎጂስቲክስ ኃላፊ ዳሽቦርድ",
+    freightForwarderLicense: "የጭነት አስተላላፊ ፈቃድ",
+    shippingAgentLicense: "የመርከብ ወኪል ፈቃድ",
+    combinedLicense: "የተቀናጀ ፈቃድ",
+    jointInvestmentLicense: "የጋራ ኢንቨስትመንት ፈቃድ",
+    mtoLicense: "የMTO ፈቃድ",
+    waiver: "ነፃ ፈቃድ",
+    preWaiverQueue: "የቅድመ ነፃ ፈቃድ ወረፋ",
+    postWaiverQueue: "የድህረ ነፃ ፈቃድ ወረፋ",
+    menu: "ምናሌ",
+    dashboard: "ዳሽቦርድ",
+    userManagement: "የተጠቃሚ አስተዳደር",
+    seamanBookQueue: "የመርከበኞች መጽሐፍ ወረፋ",
+    cocQueue: "የCoC ወረፋ",
+    copQueue: "የCoP ወረፋ",
+    endorsementCocQueue: "የCoC ማረጋገጫ ወረፋ",
+    endorsementGocQueue: "የGOC ማረጋገጫ ወረፋ",
+    vesselRegistrations: "የመርከብ ምዝገባ",
+    // vesselRegistrationReport: 'የምዝገባ ሪፖርት',
+    vesselTransfers: "የመርከብ ባለቤትነት ዝውውር",
+    seafarerRegistry: "የመርከበኞች መዝገብ",
+    seafarerRegistrationQueue: "የመርከበኞች ምዝገባ ወረፋ",
+    applications: "ማመልከቻዎች",
+    paymentConfig: "የክፍያ ውቅረት",
+    analytics: "ትንታኔ",
+    medicalVerification: "የሕክምና እና የባህር አገልግሎት ማረጋገጫ",
+    locations: "አካባቢዎች",
+    configuration: "ውቅረት",
+    profile: "መገለጫ",
+    questions: "ጥያቄዎች",
+    exams: "ፈተናዎች",
+    examResults: "የፈተና ውጤቶች",
+    examAppeals: "የፈተና ይግባኞች",
+    collapseSidebar: "ሰብስብ",
+    expandSidebar: "ዘርጋ",
   },
 
   common: {
-    logout: 'ውጣ',
-    profile: 'መገለጫ',
-    settings: 'ቅንብሮች',
-    export: 'ላክ',
-    viewAll: 'ሁሉንም ይመልከቱ',
-    home: 'መነሻ',
-    notifications: 'ማሳወቂያዎች',
-    administrator: 'አስተዳዳሪ',
-    collapse: 'ሰብስብ',
-    expand: 'ዘርጋ',
-    toggleTheme: 'የብርሃን / ጨለማ ሁነታን ይቀይሩ',
+    logout: "ውጣ",
+    profile: "መገለጫ",
+    settings: "ቅንብሮች",
+    export: "ላክ",
+    viewAll: "ሁሉንም ይመልከቱ",
+    home: "መነሻ",
+    notifications: "ማሳወቂያዎች",
+    administrator: "አስተዳዳሪ",
+    collapse: "ሰብስብ",
+    expand: "ዘርጋ",
+    toggleTheme: "የብርሃን / ጨለማ ሁነታን ይቀይሩ",
+    refresh: "አድስ",
+    view: "ይመልከቱ",
+    toggleColumns: "አምዶችን ቀያይር",
+    noResult: "ምንም አልተገኘም",
+    switchCalendar: "የቀን መቁጠሪያ ዓይነት ቀይር",
+    time: "ሰዓት",
   },
 
   breadcrumbs: {
-    dashboard: 'ዳሽቦርድ',
-    um: 'የተጠቃሚ አስተዳደር',
-    home: 'መነሻ',
+    dashboard: "ዳሽቦርድ",
+    um: "የተጠቃሚ አስተዳደር",
+    home: "መነሻ",
   },
 
   dashboard: {
-    title: 'አጠቃላይ እይታ',
-    subtitle: 'እንኳን ደህና መጡ — በመድረክዎ ላይ ያለው እንቅስቃሴ አጠቃላይ እይታ።',
+    title: "አጠቃላይ እይታ",
+    subtitle: "እንኳን ደህና መጡ — በመድረክዎ ላይ ያለው እንቅስቃሴ አጠቃላይ እይታ።",
     kpis: {
-      totalUsers: 'ጠቅላላ ተጠቃሚዎች',
-      activeUsers: 'ንቁ ተጠቃሚዎች',
-      newThisMonth: 'በዚህ ወር አዲስ',
-      pendingApprovals: 'በመጠባበቅ ላይ ያሉ',
+      totalUsers: "ጠቅላላ ተጠቃሚዎች",
+      activeUsers: "ንቁ ተጠቃሚዎች",
+      newThisMonth: "በዚህ ወር አዲስ",
+      pendingApprovals: "በመጠባበቅ ላይ ያሉ",
     },
     charts: {
-      userRegistrations: 'የተጠቃሚ ምዝገባ',
-      registrationsSubtitle: 'ባለፉት 8 ወራት አዲስ ምዝገባ',
-      vsPreviousPeriod: 'ካለፈው ጊዜ ጋር ሲነጻጸር',
-      usersByRole: 'ተጠቃሚዎች በሚና',
-      roleDistribution: 'በተደራሽነት ደረጃ ስርጭት',
-      totalUsers: 'ጠቅላላ ተጠቃሚዎች',
+      userRegistrations: "የተጠቃሚ ምዝገባ",
+      registrationsSubtitle: "ባለፉት 8 ወራት አዲስ ምዝገባ",
+      vsPreviousPeriod: "ካለፈው ጊዜ ጋር ሲነጻጸር",
+      usersByRole: "ተጠቃሚዎች በሚና",
+      roleDistribution: "በተደራሽነት ደረጃ ስርጭት",
+      totalUsers: "ጠቅላላ ተጠቃሚዎች",
     },
     quickLinks: {
-      title: 'ፈጣን አገናኞች',
-      subtitle: 'የተለመዱ የአስተዳደር አቋራጮች',
-      addUser: 'ተጠቃሚ ያክሉ',
-      addUserDesc: 'አዲስ መለያ ይፍጠሩ',
-      rolesAndPermissions: 'ሚናዎች እና ፈቃዶች',
-      rolesAndPermissionsDesc: 'የተደራሽነት ደረጃዎችን ያስተዳድሩ',
-      inviteMembers: 'አባላትን ይጋብዙ',
-      inviteMembersDesc: 'በኢሜይል ግብዣ ይላኩ',
-      importUsers: 'ተጠቃሚዎችን ያስመጡ',
-      importUsersDesc: 'የCSV ጅምላ ማስመጣት',
-      exportData: 'ውሂብ ያላኩ',
-      exportDataDesc: 'ሪፖርቶችን ያውርዱ',
-      auditLog: 'የኦዲት መዝገብ',
-      auditLogDesc: 'እንቅስቃሴን ይገምግሙ',
+      title: "ፈጣን አገናኞች",
+      subtitle: "የተለመዱ የአስተዳደር አቋራጮች",
+      addUser: "ተጠቃሚ ያክሉ",
+      addUserDesc: "አዲስ መለያ ይፍጠሩ",
+      rolesAndPermissions: "ሚናዎች እና ፈቃዶች",
+      rolesAndPermissionsDesc: "የተደራሽነት ደረጃዎችን ያስተዳድሩ",
+      inviteMembers: "አባላትን ይጋብዙ",
+      inviteMembersDesc: "በኢሜይል ግብዣ ይላኩ",
+      importUsers: "ተጠቃሚዎችን ያስመጡ",
+      importUsersDesc: "የCSV ጅምላ ማስመጣት",
+      exportData: "ውሂብ ያላኩ",
+      exportDataDesc: "ሪፖርቶችን ያውርዱ",
+      auditLog: "የኦዲት መዝገብ",
+      auditLogDesc: "እንቅስቃሴን ይገምግሙ",
     },
     recentUsers: {
-      title: 'የቅርብ ጊዜ ተጠቃሚዎች',
+      title: "የቅርብ ጊዜ ተጠቃሚዎች",
     },
     timeRange: {
-      today: 'ዛሬ',
-      thisWeek: 'በዚህ ሳምንት',
-      thisMonth: 'በዚህ ወር',
+      today: "ዛሬ",
+      thisWeek: "በዚህ ሳምንት",
+      thisMonth: "በዚህ ወር",
     },
   },
 
   exam: {
-    title: 'ፈተናዎች',
-    subtitle: 'ፈተናዎችን ያስተዳድሩ፣ ጥያቄዎችን ይመድቡ እና ውጤቶችን ይከታተሉ',
-    create: 'ፈተና ይፍጠሩ',
-    update: 'ፈተና ያዘምኑ',
-    add: 'ፈተና ይፍጠሩ',
-    noItems: 'ምንም ፈተናዎች አልተገኙም',
-    created: 'ፈተና ተፈጥሯል',
-    updated: 'ፈተና ዘምኗል',
-    deleted: 'ፈተና ተሰርዟል',
-    error: 'ክዋኔው አልተሳካም',
-    loadError: 'ፈተናዎችን በመጫን ላይ ስህተት',
-    cancel: 'ሰርዝ',
-    delete: 'ሰርዝ',
-    confirmDelete: 'ፈተና ይሰረዝ',
-    deleteConfirmText: 'እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?',
-    print: 'ፈተና ያትሙ',
-    recordResult: 'ውጤት ይመዝግቡ',
-    manageQuestions: 'ጥያቄዎችን ያስተዳድሩ',
-    saveAssignments: 'ምደባዎችን ያስቀምጡ',
-    randomSelect: 'በዘፈቀደ ይምረጡ',
-    backToExams: 'ወደ ፈተናዎች ይመለሱ',
-    notFound: 'ፈተና አልተገኘም።',
-    noQuestionsAssigned: 'ገና ምንም ጥያቄዎች አልተመደቡም።',
+    title: "ፈተናዎች",
+    subtitle: "ፈተናዎችን ያስተዳድሩ፣ ጥያቄዎችን ይመድቡ እና ውጤቶችን ይከታተሉ",
+    create: "ፈተና ይፍጠሩ",
+    update: "ፈተና ያዘምኑ",
+    add: "ፈተና ይፍጠሩ",
+    noItems: "ምንም ፈተናዎች አልተገኙም",
+    created: "ፈተና ተፈጥሯል",
+    updated: "ፈተና ዘምኗል",
+    deleted: "ፈተና ተሰርዟል",
+    error: "ክዋኔው አልተሳካም",
+    loadError: "ፈተናዎችን በመጫን ላይ ስህተት",
+    cancel: "ሰርዝ",
+    delete: "ሰርዝ",
+    confirmDelete: "ፈተና ይሰረዝ",
+    deleteConfirmText: "እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?",
+    print: "ፈተና ያትሙ",
+    recordResult: "ውጤት ይመዝግቡ",
+    manageQuestions: "ጥያቄዎችን ያስተዳድሩ",
+    saveAssignments: "ምደባዎችን ያስቀምጡ",
+    randomSelect: "በዘፈቀደ ይምረጡ",
+    backToExams: "ወደ ፈተናዎች ይመለሱ",
+    notFound: "ፈተና አልተገኘም።",
+    noQuestionsAssigned: "ገና ምንም ጥያቄዎች አልተመደቡም።",
     columns: {
-      title: 'ርዕስ',
-      certification: 'የምስክር ወረቀት',
-      date: 'ቀን',
-      type: 'አይነት',
-      form: 'ቅጽ',
-      venue: 'ቦታ',
-      questions: 'ጥያቄዎች',
-      status: 'ሁኔታ',
+      title: "ርዕስ",
+      certification: "የምስክር ወረቀት",
+      date: "ቀን",
+      type: "አይነት",
+      form: "ቅጽ",
+      venue: "ቦታ",
+      questions: "ጥያቄዎች",
+      status: "ሁኔታ",
     },
     detail: {
-      title: 'የፈተና ዝርዝሮች',
-      certification: 'የምስክር ወረቀት',
-      type: 'አይነት',
-      form: 'ቅጽ',
-      venue: 'ቦታ',
-      date: 'ቀን',
-      administration: 'አስተዳደር',
-      evaluation: 'ግምገማ',
-      selection: 'ምርጫ',
-      timeAllowed: 'የተፈቀደ ጊዜ',
-      passMark: 'የማለፊያ ነጥብ',
-      totalPoints: 'ጠቅላላ ነጥብ',
-      questions: 'ጥያቄዎች',
-      directions: 'መመሪያዎች',
-      questionLabel: 'ጥያቄ',
-      questionsSection: 'ጥያቄዎች (ጠቅላላ {{pts}} ነጥብ)',
+      title: "የፈተና ዝርዝሮች",
+      certification: "የምስክር ወረቀት",
+      type: "አይነት",
+      form: "ቅጽ",
+      venue: "ቦታ",
+      date: "ቀን",
+      administration: "አስተዳደር",
+      evaluation: "ግምገማ",
+      selection: "ምርጫ",
+      timeAllowed: "የተፈቀደ ጊዜ",
+      passMark: "የማለፊያ ነጥብ",
+      totalPoints: "ጠቅላላ ነጥብ",
+      questions: "ጥያቄዎች",
+      directions: "መመሪያዎች",
+      questionLabel: "ጥያቄ",
+      questionsSection: "ጥያቄዎች (ጠቅላላ {{pts}} ነጥብ)",
     },
     form: {
-      basicInfo: 'መሠረታዊ መረጃ',
-      settings: 'ቅንብሮች',
-      certification: 'የምስክር ወረቀት',
-      selectCertification: 'የምስክር ወረቀት ይምረጡ',
-      titleEn: 'ርዕስ (እንግሊዝኛ)',
-      titleEnPlaceholder: 'የፈተና ርዕስ በእንግሊዝኛ',
-      titleAm: 'ርዕስ (አማርኛ)',
-      titleAmPlaceholder: 'የፈተና ርዕስ',
-      directionEn: 'መመሪያ (እንግሊዝኛ)',
-      directionEnPlaceholder: 'መመሪያ በእንግሊዝኛ',
-      directionAm: 'መመሪያ (አማርኛ)',
-      directionAmPlaceholder: 'መመሪያ በአማርኛ',
-      examDate: 'የፈተና ቀን',
-      venue: 'ቦታ',
-      venuePlaceholder: 'የፈተና ቦታ',
-      timeAllowed: 'የተፈቀደ ጊዜ',
-      days: 'ቀናት',
-      hours: 'ሰአታት',
-      minutes: 'ደቂቃዎች',
-      written: 'ጽሑፍ',
-      oral: 'ቃል',
-      essay: 'ኢሴይ',
-      choice: 'ምርጫ',
-      offline: 'ከመስመር ውጪ',
-      online: 'በመስመር',
-      sum: 'ድምር',
-      average: 'አማካይ',
-      percentage: 'መቶኛ',
-      manual: 'በእጅ',
-      random: 'በዘፈቀደ',
-      cuttingPoint: 'የማለፊያ ነጥብ',
-      cuttingPointPlaceholder: 'ለማለፍ ዝቅተኛ ነጥብ',
-      status: 'ሁኔታ',
-      statusPlaceholder: 'የፈተና ሁኔታ',
-      pending: 'በመጠባበቅ ላይ',
-      active: 'ንቁ',
-      completed: 'ተጠናቋል',
-      cancelled: 'ተሰርዟል',
-      postponed: 'ተላልፏል',
-      published: 'ታትሟል',
+      basicInfo: "መሠረታዊ መረጃ",
+      settings: "ቅንብሮች",
+      certification: "የምስክር ወረቀት",
+      selectCertification: "የምስክር ወረቀት ይምረጡ",
+      titleEn: "ርዕስ (እንግሊዝኛ)",
+      titleEnPlaceholder: "የፈተና ርዕስ በእንግሊዝኛ",
+      titleAm: "ርዕስ (አማርኛ)",
+      titleAmPlaceholder: "የፈተና ርዕስ",
+      directionEn: "መመሪያ (እንግሊዝኛ)",
+      directionEnPlaceholder: "መመሪያ በእንግሊዝኛ",
+      directionAm: "መመሪያ (አማርኛ)",
+      directionAmPlaceholder: "መመሪያ በአማርኛ",
+      examDate: "የፈተና ቀን",
+      venue: "ቦታ",
+      venuePlaceholder: "የፈተና ቦታ",
+      timeAllowed: "የተፈቀደ ጊዜ",
+      days: "ቀናት",
+      hours: "ሰአታት",
+      minutes: "ደቂቃዎች",
+      written: "ጽሑፍ",
+      oral: "ቃል",
+      essay: "ኢሴይ",
+      choice: "ምርጫ",
+      offline: "ከመስመር ውጪ",
+      online: "በመስመር",
+      sum: "ድምር",
+      average: "አማካይ",
+      percentage: "መቶኛ",
+      manual: "በእጅ",
+      random: "በዘፈቀደ",
+      cuttingPoint: "የማለፊያ ነጥብ",
+      cuttingPointPlaceholder: "ለማለፍ ዝቅተኛ ነጥብ",
+      status: "ሁኔታ",
+      statusPlaceholder: "የፈተና ሁኔታ",
+      pending: "በመጠባበቅ ላይ",
+      active: "ንቁ",
+      completed: "ተጠናቋል",
+      cancelled: "ተሰርዟል",
+      postponed: "ተላልፏል",
+      published: "ታትሟል",
     },
     assigner: {
-      title: 'ጥያቄዎችን ለፈተና ይመድቡ',
-      assignedTitle: 'የተመደቡ ጥያቄዎች',
-      available: 'የሚገኙ ጥያቄዎች',
-      assigned: 'የተመደቡ ጥያቄዎች',
-      search: 'ፈልግ...',
-      noQuestions: 'ምንም ጥያቄዎች የሉም',
-      assignSelected: 'የተመረጡትን ይመድቡ ({{count}})',
-      removeSelected: 'የተመረጡትን ያስወግዱ ({{count}})',
-      randomHint: 'ከጠቅላላ {{total}} ብቁ ጥያቄዎች ውስጥ በዘፈቀደ ይምረጡ። ምርጫው አጠቃላይ ነጥቦች የማለፊያ ነጥብ ({{pts}}) ላይ እንደሚደርሱ በራስ-ሰር ያረጋግጣል።',
-      selectCount: 'ብዛት',
+      title: "ጥያቄዎችን ለፈተና ይመድቡ",
+      assignedTitle: "የተመደቡ ጥያቄዎች",
+      available: "የሚገኙ ጥያቄዎች",
+      assigned: "የተመደቡ ጥያቄዎች",
+      search: "ፈልግ...",
+      noQuestions: "ምንም ጥያቄዎች የሉም",
+      assignSelected: "የተመረጡትን ይመድቡ ({{count}})",
+      removeSelected: "የተመረጡትን ያስወግዱ ({{count}})",
+      randomHint:
+        "ከጠቅላላ {{total}} ብቁ ጥያቄዎች ውስጥ በዘፈቀደ ይምረጡ። ምርጫው አጠቃላይ ነጥቦች የማለፊያ ነጥብ ({{pts}}) ላይ እንደሚደርሱ በራስ-ሰር ያረጋግጣል።",
+      selectCount: "ብዛት",
     },
     status: {
-      PENDING: 'በመጠባበቅ ላይ',
-      ACTIVE: 'ንቁ',
-      COMPLETED: 'ተጠናቋል',
-      CANCELLED: 'ተሰርዟል',
-      POSTPONED: 'ተላልፏል',
-      PUBLISHED: 'ታትሟል',
+      PENDING: "በመጠባበቅ ላይ",
+      ACTIVE: "ንቁ",
+      COMPLETED: "ተጠናቋል",
+      CANCELLED: "ተሰርዟል",
+      POSTPONED: "ተላልፏል",
+      PUBLISHED: "ታትሟል",
     },
     type: {
-      WRITTEN: 'ጽሑፍ',
-      ORAL: 'ቃል',
+      WRITTEN: "ጽሑፍ",
+      ORAL: "ቃል",
     },
     formType: {
-      ESSAY: 'ኢሴይ',
-      CHOICE: 'ምርጫ',
+      ESSAY: "ኢሴይ",
+      CHOICE: "ምርጫ",
     },
     admin: {
-      OFFLINE: 'ከመስመር ውጪ',
-      ONLINE: 'በመስመር',
+      OFFLINE: "ከመስመር ውጪ",
+      ONLINE: "በመስመር",
     },
     eval: {
-      SUM: 'ድምር',
-      AVERAGE: 'አማካይ',
-      PERCENTAGE: 'መቶኛ',
+      SUM: "ድምር",
+      AVERAGE: "አማካይ",
+      PERCENTAGE: "መቶኛ",
     },
     selection: {
-      MANUAL: 'በእጅ',
-      RANDOM: 'በዘፈቀደ',
+      MANUAL: "በእጅ",
+      RANDOM: "በዘፈቀደ",
     },
     candidates: {
-      section: 'ተፈታኞች',
-      admission: 'የመግቢያ ቁጥር',
-      name: 'ተፈታኝ',
-      attempt: 'ሙከራ',
-      attendance: 'ተገኝነት',
-      remark: 'አስተያየት',
-      record: 'መዝግብ',
-      recorded: 'ተገኝነት ተመዝግቧል',
-      none: 'ለዚህ ፈተና እስካሁን የተመዘገበ ተፈታኝ የለም።',
-      retake: 'ድጋሚ {{n}}',
-      firstSitting: 'የመጀመሪያ ሙከራ',
-      remarkRequired: 'ለመውጣት ወይም ለመታገድ ምክንያት ያስፈልጋል።',
+      section: "ተፈታኞች",
+      admission: "የመግቢያ ቁጥር",
+      name: "ተፈታኝ",
+      attempt: "ሙከራ",
+      attendance: "ተገኝነት",
+      remark: "አስተያየት",
+      record: "መዝግብ",
+      recorded: "ተገኝነት ተመዝግቧል",
+      none: "ለዚህ ፈተና እስካሁን የተመዘገበ ተፈታኝ የለም።",
+      retake: "ድጋሚ {{n}}",
+      firstSitting: "የመጀመሪያ ሙከራ",
+      remarkRequired: "ለመውጣት ወይም ለመታገድ ምክንያት ያስፈልጋል።",
     },
     attendance: {
-      REGISTERED: 'አልተጠራም',
-      PRESENT: 'ተገኝቷል',
-      ABSENT: 'አልተገኘም',
-      LATE: 'ዘግይቷል',
-      WITHDRAWN: 'ወጥቷል',
-      DISQUALIFIED: 'ታግዷል',
+      REGISTERED: "አልተጠራም",
+      PRESENT: "ተገኝቷል",
+      ABSENT: "አልተገኘም",
+      LATE: "ዘግይቷል",
+      WITHDRAWN: "ወጥቷል",
+      DISQUALIFIED: "ታግዷል",
     },
     incidents: {
-      section: 'ክስተቶች',
-      add: 'ክስተት መዝግብ',
-      type: 'ዓይነት',
-      candidate: 'ተፈታኝ',
-      wholeRoom: 'ሙሉ ፈተና',
-      description: 'የተከሰተው ነገር',
-      occurred: 'የተከሰተበት',
-      status: 'ሁኔታ',
-      resolve: 'ፍታ',
-      resolution: 'ውሳኔ',
-      outcome: 'ውጤት',
-      none: 'ለዚህ ፈተና የተመዘገበ ክስተት የለም።',
-      filed: 'ክስተት ተመዝግቧል',
-      resolved: 'ክስተት ተዘግቷል',
-      error: 'ተግባሩ አልተሳካም',
+      section: "ክስተቶች",
+      add: "ክስተት መዝግብ",
+      type: "ዓይነት",
+      candidate: "ተፈታኝ",
+      wholeRoom: "ሙሉ ፈተና",
+      description: "የተከሰተው ነገር",
+      occurred: "የተከሰተበት",
+      status: "ሁኔታ",
+      resolve: "ፍታ",
+      resolution: "ውሳኔ",
+      outcome: "ውጤት",
+      none: "ለዚህ ፈተና የተመዘገበ ክስተት የለም።",
+      filed: "ክስተት ተመዝግቧል",
+      resolved: "ክስተት ተዘግቷል",
+      error: "ተግባሩ አልተሳካም",
     },
     incidentType: {
-      MISCONDUCT: 'ሥነ ምግባር ጥሰት',
-      TECHNICAL_FAILURE: 'ቴክኒካዊ ብልሽት',
-      MEDICAL: 'የጤና',
-      ADMINISTRATIVE: 'አስተዳደራዊ',
-      OTHER: 'ሌላ',
+      MISCONDUCT: "ሥነ ምግባር ጥሰት",
+      TECHNICAL_FAILURE: "ቴክኒካዊ ብልሽት",
+      MEDICAL: "የጤና",
+      ADMINISTRATIVE: "አስተዳደራዊ",
+      OTHER: "ሌላ",
     },
     incidentStatus: {
-      OPEN: 'ክፍት',
-      UNDER_REVIEW: 'በግምገማ ላይ',
-      RESOLVED: 'ተፈትቷል',
-      DISMISSED: 'ውድቅ ተደርጓል',
+      OPEN: "ክፍት",
+      UNDER_REVIEW: "በግምገማ ላይ",
+      RESOLVED: "ተፈትቷል",
+      DISMISSED: "ውድቅ ተደርጓል",
     },
     randomHintServer:
-      'ጥያቄዎች ለዚህ ትምህርት ከጸደቁ ንጥሎች በሰርቨሩ ላይ ይመረጣሉ፤ ስለዚህ ማከማቻው ለአሳሹ አይጋለጥም።',
-    randomSelected: '{{count}} የጸደቁ ጥያቄዎች ተመርጠዋል',
-    randomError: 'ጥያቄዎችን መምረጥ አልተቻለም',
-    notEnoughApproved: 'ለዚህ ትምህርት በቂ የጸደቁ ጥያቄዎች የሉም።',
+      "ጥያቄዎች ለዚህ ትምህርት ከጸደቁ ንጥሎች በሰርቨሩ ላይ ይመረጣሉ፤ ስለዚህ ማከማቻው ለአሳሹ አይጋለጥም።",
+    randomSelected: "{{count}} የጸደቁ ጥያቄዎች ተመርጠዋል",
+    randomError: "ጥያቄዎችን መምረጥ አልተቻለም",
+    notEnoughApproved: "ለዚህ ትምህርት በቂ የጸደቁ ጥያቄዎች የሉም።",
+  },
+
+  country: {
+    select: "አገር ይምረጡ",
+    notFound: "ምንም አገር አልተገኘም",
   },
 
   location: {
-    title: 'አካባቢዎች',
-    hierarchy: 'የአካባቢ ተዋረድ',
-    search: 'አካባቢዎችን ይፈልጉ...',
-    noLocations: 'ምንም አካባቢዎች አልተገኙም። ለመጀመር የስር አካባቢ ያክሉ።',
-    selectHint: 'ዝርዝሮችን ለማየት ከዛፉ ውስጥ አካባቢ ይምረጡ',
-    addRoot: 'የስር አካባቢ ያክሉ',
-    addSubLocation: 'ንዑስ አካባቢ ያክሉ',
-    addTitle: 'አካባቢ ያክሉ',
-    editTitle: 'አካባቢ ያስተካክሉ',
-    code: 'ኮድ',
-    name: 'ስም',
-    nameEn: 'ስም (እንግሊዝኛ)',
-    nameAm: 'ስም (አማርኛ)',
-    type: 'አይነት',
-    level: 'ደረጃ',
-    parent: 'ወላጅ',
-    selectType: 'አይነት ይምረጡ',
-    cancel: 'ሰርዝ',
-    create: 'ፍጠር',
-    update: 'አዘምን',
-    edit: 'አስተካክል',
-    delete: 'ሰርዝ',
-    created: 'አካባቢ በተሳካ ሁኔታ ተፈጥሯል',
-    updated: 'አካባቢ በተሳካ ሁኔታ ዘምኗል',
-    deleted: 'አካባቢ በተሳካ ሁኔታ ተሰርዟል',
-    error: 'አንድ ስህተት ተፈጥሯል',
-    deleteError: 'አካባቢውን መሰረዝ አልተቻለም',
-    confirmDelete: 'መሰረዝን ያረጋግጡ',
-    deleteConfirmText: 'እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?',
-    manageTypes: 'የአካባቢ አይነቶችን ያስተዳድሩ',
-    addType: 'የአካባቢ አይነት ያክሉ',
-    noTypes: 'ገና ምንም የአካባቢ አይነቶች አልተገለጹም',
-    typeCreated: 'የአካባቢ አይነት ተፈጥሯል',
-    typeUpdated: 'የአካባቢ አይነት ዘምኗል',
-    typeDeleted: 'የአካባቢ አይነት ተሰርዟል',
-    typeError: 'የአካባቢ አይነቱን ማስቀመጥ አልተቻለም',
-    setupRequired: 'ማዋቀር ያስፈልጋል',
-    setupHint: 'አካባቢዎችን ከመጨመርዎ በፊት የአካባቢ አይነቶችን ማዋቀር ያስፈልግዎታል።',
-    configureTypes: 'የአካባቢ አይነቶችን ያዋቅሩ',
-    noTypesAvailable: 'ለዚህ ደረጃ ምንም የአካባቢ አይነቶች የሉም',
-    multipleTypesHint: 'በርካታ አይነቶች ተገኝተዋል — አይነቱ ከዝቅተኛው ደረጃ በራስ-ሰር ተመርጧል።',
+    title: "አካባቢዎች",
+    hierarchy: "የአካባቢ ተዋረድ",
+    search: "አካባቢዎችን ይፈልጉ...",
+    noLocations: "ምንም አካባቢዎች አልተገኙም። ለመጀመር የስር አካባቢ ያክሉ።",
+    selectHint: "ዝርዝሮችን ለማየት ከዛፉ ውስጥ አካባቢ ይምረጡ",
+    addRoot: "የስር አካባቢ ያክሉ",
+    addSubLocation: "ንዑስ አካባቢ ያክሉ",
+    addTitle: "አካባቢ ያክሉ",
+    editTitle: "አካባቢ ያስተካክሉ",
+    code: "ኮድ",
+    name: "ስም",
+    nameEn: "ስም (እንግሊዝኛ)",
+    nameAm: "ስም (አማርኛ)",
+    type: "አይነት",
+    level: "ደረጃ",
+    parent: "ወላጅ",
+    selectType: "አይነት ይምረጡ",
+    cancel: "ሰርዝ",
+    create: "ፍጠር",
+    update: "አዘምን",
+    edit: "አስተካክል",
+    delete: "ሰርዝ",
+    created: "አካባቢ በተሳካ ሁኔታ ተፈጥሯል",
+    updated: "አካባቢ በተሳካ ሁኔታ ዘምኗል",
+    deleted: "አካባቢ በተሳካ ሁኔታ ተሰርዟል",
+    error: "አንድ ስህተት ተፈጥሯል",
+    deleteError: "አካባቢውን መሰረዝ አልተቻለም",
+    confirmDelete: "መሰረዝን ያረጋግጡ",
+    deleteConfirmText: "እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?",
+    manageTypes: "የአካባቢ አይነቶችን ያስተዳድሩ",
+    addType: "የአካባቢ አይነት ያክሉ",
+    noTypes: "ገና ምንም የአካባቢ አይነቶች አልተገለጹም",
+    typeCreated: "የአካባቢ አይነት ተፈጥሯል",
+    typeUpdated: "የአካባቢ አይነት ዘምኗል",
+    typeDeleted: "የአካባቢ አይነት ተሰርዟል",
+    typeError: "የአካባቢ አይነቱን ማስቀመጥ አልተቻለም",
+    setupRequired: "ማዋቀር ያስፈልጋል",
+    setupHint: "አካባቢዎችን ከመጨመርዎ በፊት የአካባቢ አይነቶችን ማዋቀር ያስፈልግዎታል።",
+    configureTypes: "የአካባቢ አይነቶችን ያዋቅሩ",
+    noTypesAvailable: "ለዚህ ደረጃ ምንም የአካባቢ አይነቶች የሉም",
+    multipleTypesHint: "በርካታ አይነቶች ተገኝተዋል — አይነቱ ከዝቅተኛው ደረጃ በራስ-ሰር ተመርጧል።",
     validation: {
-      codeRequired: 'ኮድ ያስፈልጋል',
-      nameEnRequired: 'የእንግሊዝኛ ስም ያስፈልጋል',
-      nameAmRequired: 'የአማርኛ ስም ያስፈልጋል',
-      typeRequired: 'የአካባቢ አይነት ያስፈልጋል',
+      codeRequired: "ኮድ ያስፈልጋል",
+      nameEnRequired: "የእንግሊዝኛ ስም ያስፈልጋል",
+      nameAmRequired: "የአማርኛ ስም ያስፈልጋል",
+      typeRequired: "የአካባቢ አይነት ያስፈልጋል",
     },
   },
 
   profile: {
-    title: 'የእኔ መገለጫ',
-    subtitle: 'የመለያ ዝርዝሮችዎን እና ምርጫዎችዎን ያስተዳድሩ።',
-    personal: 'የግል መረጃ',
-    contact: 'መገኛ',
-    preferences: 'ምርጫዎች',
-    security: 'ደህንነት',
-    securityHint: 'በሌላ ቦታ የማይጠቀሙትን ጠንካራ የይለፍ ቃል ይምረጡ።',
-    changePassword: 'የይለፍ ቃል ይቀይሩ',
-    updatePassword: 'የይለፍ ቃል አዘምን',
-    updateProfile: 'ለውጦችን አስቀምጥ',
-    savePreferences: 'ምርጫዎችን አስቀምጥ',
-    cancel: 'ሰርዝ',
-    verified: 'የተረጋገጠ',
-    unverified: 'ያልተረጋገጠ',
+    title: "የእኔ መገለጫ",
+    subtitle: "የመለያ ዝርዝሮችዎን እና ምርጫዎችዎን ያስተዳድሩ።",
+    personal: "የግል መረጃ",
+    contact: "መገኛ",
+    preferences: "ምርጫዎች",
+    security: "ደህንነት",
+    securityHint: "በሌላ ቦታ የማይጠቀሙትን ጠንካራ የይለፍ ቃል ይምረጡ።",
+    changePassword: "የይለፍ ቃል ይቀይሩ",
+    updatePassword: "የይለፍ ቃል አዘምን",
+    updateProfile: "ለውጦችን አስቀምጥ",
+    savePreferences: "ምርጫዎችን አስቀምጥ",
+    cancel: "ሰርዝ",
+    verified: "የተረጋገጠ",
+    unverified: "ያልተረጋገጠ",
     tabs: {
-      profile: 'መገለጫ',
-      security: 'ደህንነት',
-      preferences: 'ምርጫዎች',
+      profile: "መገለጫ",
+      security: "ደህንነት",
+      preferences: "ምርጫዎች",
     },
-    personalHint: 'በኦፊሴላዊ ኢማ ሰነዶች ላይ እንደሚታየው ስምዎ።',
-    languageTitle: 'ቋንቋ',
-    languageHint: 'በአስተዳደር ፓነል ውስጥ የሚጠቀሙትን ቋንቋ ይምረጡ።',
+    personalHint: "በኦፊሴላዊ ኢማ ሰነዶች ላይ እንደሚታየው ስምዎ።",
+    languageTitle: "ቋንቋ",
+    languageHint: "በአስተዳደር ፓነል ውስጥ የሚጠቀሙትን ቋንቋ ይምረጡ።",
     appearance: {
-      title: 'መልክ',
-      subtitle: 'የአስተዳደር ፓነል በመሣሪያዎ ላይ እንዴት እንደሚታይ ይምረጡ።',
-      light: 'የቀን',
-      dark: 'ሌሊት',
-      system: 'ሲስተም',
+      title: "መልክ",
+      subtitle: "የአስተዳደር ፓነል በመሣሪያዎ ላይ እንዴት እንደሚታይ ይምረጡ።",
+      light: "የቀን",
+      dark: "ሌሊት",
+      system: "ሲስተም",
     },
     twoStep: {
-      title: 'ባለሁለት ደረጃ ማረጋገጫ',
-      desc: 'በየጊዜው ሲገቡ ከስልክዎ የአንድ ጊዜ ኮድ ያስፈልጋል።',
+      title: "ባለሁለት ደረጃ ማረጋገጫ",
+      desc: "በየጊዜው ሲገቡ ከስልክዎ የአንድ ጊዜ ኮድ ያስፈልጋል።",
     },
     layout: {
-      title: 'አቀማመጥ',
-      subtitle: 'የማውጫ አቀማመጥ እንዴት እንደሚታይ ይምረጡ።',
-      top: 'የላይኛው ትሮች',
-      sidebar: 'የጎን አሞሌ',
+      title: "አቀማመጥ",
+      subtitle: "የማውጫ አቀማመጥ እንዴት እንደሚታይ ይምረጡ።",
+      top: "የላይኛው ትሮች",
+      sidebar: "የጎን አሞሌ",
     },
     notifications: {
-      title: 'የኢሜይል ማሳወቂያዎች',
-      desc: 'ስለ መለያ እንቅስቃሴዎ በኢሜይል ዝማኔዎችን ይቀበሉ።',
+      title: "የኢሜይል ማሳወቂያዎች",
+      desc: "ስለ መለያ እንቅስቃሴዎ በኢሜይል ዝማኔዎችን ይቀበሉ።",
     },
     strength: {
-      label: 'የይለፍ ቃል ጥንካሬ',
-      weak: 'ደካማ',
-      fair: 'መካከለኛ',
-      good: 'ጥሩ',
-      strong: 'ጠንካራ',
+      label: "የይለፍ ቃል ጥንካሬ",
+      weak: "ደካማ",
+      fair: "መካከለኛ",
+      good: "ጥሩ",
+      strong: "ጠንካራ",
     },
-    profileUpdated: 'መገለጫ በተሳካ ሁኔታ ዘምኗል',
-    passwordChanged: 'የይለፍ ቃል በተሳካ ሁኔታ ተቀይሯል',
-    updateFailed: 'መገለጫውን ማዘመን አልተቻለም። እባክዎ እንደገና ይሞክሩ።',
-    passwordFailed: 'የይለፍ ቃሉን መቀየር አልተቻለም። የአሁኑን የይለፍ ቃል ያረጋግጡ እና እንደገና ይሞክሩ።',
+    profileUpdated: "መገለጫ በተሳካ ሁኔታ ዘምኗል",
+    passwordChanged: "የይለፍ ቃል በተሳካ ሁኔታ ተቀይሯል",
+    updateFailed: "መገለጫውን ማዘመን አልተቻለም። እባክዎ እንደገና ይሞክሩ።",
+    passwordFailed: "የይለፍ ቃሉን መቀየር አልተቻለም። የአሁኑን የይለፍ ቃል ያረጋግጡ እና እንደገና ይሞክሩ።",
     fields: {
-      fullNameEn: 'ሙሉ ስም (እንግሊዝኛ)',
-      fullNameAm: 'ሙሉ ስም (አማርኛ)',
-      username: 'የተጠቃሚ ስም',
-      usernameHint: 'የተጠቃሚ ስም መቀየር አይቻልም',
-      organization: 'ድርጅት',
-      email: 'የኢሜይል አድራሻ',
-      phone: 'ስልክ ቁጥር',
-      address: 'አድራሻ',
-      language: 'የሚመረጥ ቋንቋ',
-      currentPassword: 'የአሁኑ የይለፍ ቃል',
-      newPassword: 'አዲስ የይለፍ ቃል',
-      confirmPassword: 'አዲስ የይለፍ ቃል ያረጋግጡ',
+      fullNameEn: "ሙሉ ስም (እንግሊዝኛ)",
+      fullNameAm: "ሙሉ ስም (አማርኛ)",
+      username: "የተጠቃሚ ስም",
+      usernameHint: "የተጠቃሚ ስም መቀየር አይቻልም",
+      organization: "ድርጅት",
+      email: "የኢሜይል አድራሻ",
+      phone: "ስልክ ቁጥር",
+      address: "አድራሻ",
+      language: "የሚመረጥ ቋንቋ",
+      currentPassword: "የአሁኑ የይለፍ ቃል",
+      newPassword: "አዲስ የይለፍ ቃል",
+      confirmPassword: "አዲስ የይለፍ ቃል ያረጋግጡ",
     },
     validation: {
-      nameRequired: 'ስም ያስፈልጋል',
-      emailInvalid: 'የሚሰራ ኢሜይል ያስገቡ',
-      usernameRequired: 'የተጠቃሚ ስም ያስፈልጋል',
-      phoneRequired: 'ስልክ ቁጥር ያስፈልጋል',
-      passwordMin: 'የይለፍ ቃል ቢያንስ 8 ቁምፊዎች መሆን አለበት',
-      passwordMismatch: 'የይለፍ ቃላት አይዛመዱም',
+      nameRequired: "ስም ያስፈልጋል",
+      emailInvalid: "የሚሰራ ኢሜይል ያስገቡ",
+      usernameRequired: "የተጠቃሚ ስም ያስፈልጋል",
+      phoneRequired: "ስልክ ቁጥር ያስፈልጋል",
+      passwordMin: "የይለፍ ቃል ቢያንስ 8 ቁምፊዎች መሆን አለበት",
+      passwordMismatch: "የይለፍ ቃላት አይዛመዱም",
     },
   },
 
   certification: {
-    title: 'የምስክር ወረቀቶች',
-    subtitle: 'የምስክር ወረቀት አይነቶችን ያስተዳድሩ (ለምሳሌ CoC, CoP)',
-    add: 'የምስክር ወረቀት ያክሉ',
-    noItems: 'ምንም የምስክር ወረቀቶች አልተገኙም',
-    confirmDelete: 'የምስክር ወረቀት ይሰረዝ',
-    deleteConfirmText: 'እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?',
-    created: 'የምስክር ወረቀት ተፈጥሯል',
-    updated: 'የምስክር ወረቀት ዘምኗል',
-    deleted: 'የምስክር ወረቀት ተሰርዟል',
-    error: 'ክዋኔው አልተሳካም',
-    loadError: 'የምስክር ወረቀቶችን በመጫን ላይ ስህተት',
-    cancel: 'ሰርዝ',
-    create: 'ፍጠር',
-    update: 'አዘምን',
-    delete: 'ሰርዝ',
+    title: "የምስክር ወረቀቶች",
+    subtitle: "የምስክር ወረቀት አይነቶችን ያስተዳድሩ (ለምሳሌ CoC, CoP)",
+    add: "የምስክር ወረቀት ያክሉ",
+    noItems: "ምንም የምስክር ወረቀቶች አልተገኙም",
+    confirmDelete: "የምስክር ወረቀት ይሰረዝ",
+    deleteConfirmText: "እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?",
+    created: "የምስክር ወረቀት ተፈጥሯል",
+    updated: "የምስክር ወረቀት ዘምኗል",
+    deleted: "የምስክር ወረቀት ተሰርዟል",
+    error: "ክዋኔው አልተሳካም",
+    loadError: "የምስክር ወረቀቶችን በመጫን ላይ ስህተት",
+    cancel: "ሰርዝ",
+    create: "ፍጠር",
+    update: "አዘምን",
+    delete: "ሰርዝ",
     columns: {
-      name: 'ስም',
-      description: 'መግለጫ',
-      status: 'ሁኔታ',
+      name: "ስም",
+      description: "መግለጫ",
+      status: "ሁኔታ",
     },
     form: {
-      nameEn: 'ስም (እንግሊዝኛ)',
-      nameEnPlaceholder: 'የምስክር ወረቀት ስም በእንግሊዝኛ',
-      nameAm: 'ስም (አማርኛ)',
-      nameAmPlaceholder: 'የምስክር ወረቀት ስም',
-      descEn: 'መግለጫ (እንግሊዝኛ)',
-      descEnPlaceholder: 'የእንግሊዝኛ መግለጫ',
-      descAm: 'መግለጫ (አማርኛ)',
-      descAmPlaceholder: 'የአማርኛ መግለጫ',
+      nameEn: "ስም (እንግሊዝኛ)",
+      nameEnPlaceholder: "የምስክር ወረቀት ስም በእንግሊዝኛ",
+      nameAm: "ስም (አማርኛ)",
+      nameAmPlaceholder: "የምስክር ወረቀት ስም",
+      descEn: "መግለጫ (እንግሊዝኛ)",
+      descEnPlaceholder: "የእንግሊዝኛ መግለጫ",
+      descAm: "መግለጫ (አማርኛ)",
+      descAmPlaceholder: "የአማርኛ መግለጫ",
     },
     status: {
-      active: 'ንቁ',
-      inactive: 'እንቅስቃሴ የሌለ',
+      active: "ንቁ",
+      inactive: "እንቅስቃሴ የሌለ",
     },
   },
 
   result: {
-    title: 'የፈተና ውጤቶች',
-    subtitle: 'የመርከበኞችን የፈተና ውጤቶች እና የውጤት ክፍፍል ይመልከቱ',
-    record: 'ውጤት ያስመዝግቡ',
-    noItems: 'ምንም ውጤት አልተገኘም',
-    noData: 'ምንም መረጃ የለም',
-    created: 'ውጤት በተሳካ ሁኔታ ተመዝግቧል',
-    updated: 'ውጤት በተሳካ ሁኔታ ዘምኗል',
-    deleted: 'ውጤት በተሳካ ሁኔታ ተሰርዟል',
-    error: 'ክዋኔው አልተሳካም',
-    loadError: 'ውጤቶችን በማምጣት ላይ ስህተት',
-    cancel: 'ሰርዝ',
-    delete: 'ሰርዝ',
-    close: 'ዝጋ',
-    save: 'አስቀምጥ',
-    saveResult: 'ውጤት አስቀምጥ',
-    section: 'ውጤቶች',
-    selectExamError: 'እባክዎ ፈተና ይምረጡ',
-    continue: 'ቀጥል',
-    confirmDelete: 'ውጤት ሰርዝ',
-    deleteConfirmText: 'እርግጠኛ ነዎት ይህን ውጤት መሰረዝ ይፈልጋሉ?',
+    title: "የፈተና ውጤቶች",
+    subtitle: "የመርከበኞችን የፈተና ውጤቶች እና የውጤት ክፍፍል ይመልከቱ",
+    record: "ውጤት ያስመዝግቡ",
+    noItems: "ምንም ውጤት አልተገኘም",
+    noData: "ምንም መረጃ የለም",
+    created: "ውጤት በተሳካ ሁኔታ ተመዝግቧል",
+    updated: "ውጤት በተሳካ ሁኔታ ዘምኗል",
+    deleted: "ውጤት በተሳካ ሁኔታ ተሰርዟል",
+    error: "ክዋኔው አልተሳካም",
+    loadError: "ውጤቶችን በማምጣት ላይ ስህተት",
+    cancel: "ሰርዝ",
+    delete: "ሰርዝ",
+    close: "ዝጋ",
+    save: "አስቀምጥ",
+    saveResult: "ውጤት አስቀምጥ",
+    section: "ውጤቶች",
+    selectExamError: "እባክዎ ፈተና ይምረጡ",
+    continue: "ቀጥል",
+    confirmDelete: "ውጤት ሰርዝ",
+    deleteConfirmText: "እርግጠኛ ነዎት ይህን ውጤት መሰረዝ ይፈልጋሉ?",
     stats: {
-      totalResults: 'ጠቅላላ ውጤቶች',
-      passed: 'ያለፉ',
-      failed: 'ያልተሳኩ',
-      avgScore: 'አማካይ ውጤት',
+      totalResults: "ጠቅላላ ውጤቶች",
+      passed: "ያለፉ",
+      failed: "ያልተሳኩ",
+      avgScore: "አማካይ ውጤት",
     },
     columns: {
-      seafarer: 'መርከበኛ',
-      exam: 'ፈተና',
-      totalScore: 'ጠቅላላ ውጤት',
-      status: 'ሁኔታ',
-      date: 'ቀን',
+      seafarer: "መርከበኛ",
+      exam: "ፈተና",
+      totalScore: "ጠቅላላ ውጤት",
+      status: "ሁኔታ",
+      date: "ቀን",
     },
     detail: {
-      title: 'የውጤት ዝርዝር',
-      seafarerProfile: 'የመርከበኛ መገለጫ',
-      examDetails: 'የፈተና ዝርዝሮች',
-      fullName: 'ሙሉ ስም',
-      gender: 'ፆታ',
-      dateOfBirth: 'የትውልድ ቀን',
-      maritalStatus: 'የትዳር ሁኔታ',
-      examTitle: 'የፈተና ርዕስ',
-      titleAm: 'ርዕስ (አማርኛ)',
-      type: 'አይነት',
-      venue: 'ቦታ',
-      date: 'ቀን',
-      passMark: 'ማለፊያ ውጤት',
-      status: 'ሁኔታ',
-      remark: 'ማስታወሻ',
-      scoreBreakdown: 'የውጤት ክፍፍል',
-      question: 'ጥያቄ',
-      max: 'ከፍተኛ',
-      score: 'ውጤት',
-      remarkShort: 'ማስታወሻ',
-      selectExam: 'ውጤት ለመመዝገብ የሚፈልጉትን ፈተና ይምረጡ።',
-      exam: 'ፈተና',
-      selectExamPlaceholder: 'ፈተና ይምረጡ',
+      title: "የውጤት ዝርዝር",
+      seafarerProfile: "የመርከበኛ መገለጫ",
+      examDetails: "የፈተና ዝርዝሮች",
+      fullName: "ሙሉ ስም",
+      gender: "ፆታ",
+      dateOfBirth: "የትውልድ ቀን",
+      maritalStatus: "የትዳር ሁኔታ",
+      examTitle: "የፈተና ርዕስ",
+      titleAm: "ርዕስ (አማርኛ)",
+      type: "አይነት",
+      venue: "ቦታ",
+      date: "ቀን",
+      passMark: "ማለፊያ ውጤት",
+      status: "ሁኔታ",
+      remark: "ማስታወሻ",
+      scoreBreakdown: "የውጤት ክፍፍል",
+      question: "ጥያቄ",
+      max: "ከፍተኛ",
+      score: "ውጤት",
+      remarkShort: "ማስታወሻ",
+      selectExam: "ውጤት ለመመዝገብ የሚፈልጉትን ፈተና ይምረጡ።",
+      exam: "ፈተና",
+      selectExamPlaceholder: "ፈተና ይምረጡ",
     },
     recordModal: {
-      title: 'ውጤት ያስመዝግቡ',
-      seafarer: 'መርከበኛ',
-      seafarerPlaceholder: 'መርከበኛ ይፈልጉ እና ይምረጡ',
-      scorePerQuestion: 'በጥያቄ ውጤት',
-      question: 'ጥያቄ',
-      maxPoints: 'ከፍተኛ ውጤት',
-      score: 'ውጤት',
-      remark: 'ማስታወሻ',
-      remarkOptional: 'ማስታወሻ (አማራጭ)',
-      remarkPlaceholder: 'የኦፊሰር ማስታወሻ',
-      totalScore: 'ጠቅላላ ውጤት',
-      passMark: 'ማለፊያ ውጤት',
-      status: 'ሁኔታ',
-      noQuestions: 'ለዚህ ፈተና ምንም ጥያቄዎች አልተመደቡም። መጀመሪያ ጥያቄዎችን ይመድቡ።',
-      seafarerRequired: 'እባክዎ መርከበኛ ይምረጡ',
-      saveSuccess: 'ውጤት ተመዝግቧል',
-      saveError: 'ውጤቱን ማስቀመጥ አልተሳካም',
-      passed: 'አልፏል',
-      failed: 'አልተሳካም',
+      title: "ውጤት ያስመዝግቡ",
+      seafarer: "መርከበኛ",
+      seafarerPlaceholder: "መርከበኛ ይፈልጉ እና ይምረጡ",
+      scorePerQuestion: "በጥያቄ ውጤት",
+      question: "ጥያቄ",
+      maxPoints: "ከፍተኛ ውጤት",
+      score: "ውጤት",
+      remark: "ማስታወሻ",
+      remarkOptional: "ማስታወሻ (አማራጭ)",
+      remarkPlaceholder: "የኦፊሰር ማስታወሻ",
+      totalScore: "ጠቅላላ ውጤት",
+      passMark: "ማለፊያ ውጤት",
+      status: "ሁኔታ",
+      noQuestions: "ለዚህ ፈተና ምንም ጥያቄዎች አልተመደቡም። መጀመሪያ ጥያቄዎችን ይመድቡ።",
+      seafarerRequired: "እባክዎ መርከበኛ ይምረጡ",
+      saveSuccess: "ውጤት ተመዝግቧል",
+      saveError: "ውጤቱን ማስቀመጥ አልተሳካም",
+      passed: "አልፏል",
+      failed: "አልተሳካም",
     },
     status: {
-      PASSED: 'አልፏል',
-      FAILED: 'አልተሳካም',
+      PASSED: "አልፏል",
+      FAILED: "አልተሳካም",
     },
     action: {
-      viewEdit: 'ተመልከት / አስተካክል',
-      delete: 'ሰርዝ',
+      viewEdit: "ተመልከት / አስተካክል",
+      delete: "ሰርዝ",
     },
     search: {
-      seafarer: 'መርከበኛ ይፈልጉ...',
-      filterByExam: 'በፈተና አጣራ',
-      allExams: 'ሁሉም ፈተናዎች',
+      seafarer: "መርከበኛ ይፈልጉ...",
+      filterByExam: "በፈተና አጣራ",
+      allExams: "ሁሉም ፈተናዎች",
     },
     review: {
-      column: 'ግምገማ',
-      MARKED: 'ተስተካክሏል',
-      MODERATED: 'ተመርምሯል',
-      APPROVED: 'ጸድቋል',
-      PUBLISHED: 'ወጥቷል',
-      moderate: 'አስተካክል',
-      approve: 'አጽድቅ',
-      return: 'ወደ ፈታኙ መልስ',
-      publish: 'የፈተናውን ውጤቶች አውጣ',
-      adjustment: 'በጠቅላላ ውጤት ላይ የሚደረግ ማስተካከያ',
-      adjustmentHint: 'እንደ 3 ወይም -2 ያለ ለውጥ። ዜሮ ውጤቱን እንዳለ ያጸድቃል።',
-      remark: 'ምክንያት',
-      remarkRequired: 'ምክንያት ያስፈልጋል።',
-      moderated: 'ውጤቶች ተስተካክለዋል',
-      approved: 'ውጤት ጸድቋል',
-      returned: 'ውጤት ወደ ፈታኙ ተመልሷል',
-      publishedCount: '{{published}} ውጤቶች ወጥተዋል፤ {{skipped}} ተዘለዋል።',
-      publishNeedsExam: 'ውጤቶችን ለማውጣት መጀመሪያ በፈተና ያጣሩ።',
-      lockedAfterApproval:
-        'ይህ ውጤት ጸድቋል፤ ማስተካከል አይቻልም። መጀመሪያ ወደ ፈታኙ ይመልሱት።',
-      originalScore: 'የፈታኙ ጠቅላላ',
-      derivedStatus: 'ውጤት (ከማለፊያ ነጥብ የተገኘ)',
-      error: 'ተግባሩ አልተሳካም',
+      column: "ግምገማ",
+      MARKED: "ተስተካክሏል",
+      MODERATED: "ተመርምሯል",
+      APPROVED: "ጸድቋል",
+      PUBLISHED: "ወጥቷል",
+      moderate: "አስተካክል",
+      approve: "አጽድቅ",
+      return: "ወደ ፈታኙ መልስ",
+      publish: "የፈተናውን ውጤቶች አውጣ",
+      adjustment: "በጠቅላላ ውጤት ላይ የሚደረግ ማስተካከያ",
+      adjustmentHint: "እንደ 3 ወይም -2 ያለ ለውጥ። ዜሮ ውጤቱን እንዳለ ያጸድቃል።",
+      remark: "ምክንያት",
+      remarkRequired: "ምክንያት ያስፈልጋል።",
+      moderated: "ውጤቶች ተስተካክለዋል",
+      approved: "ውጤት ጸድቋል",
+      returned: "ውጤት ወደ ፈታኙ ተመልሷል",
+      publishedCount: "{{published}} ውጤቶች ወጥተዋል፤ {{skipped}} ተዘለዋል።",
+      publishNeedsExam: "ውጤቶችን ለማውጣት መጀመሪያ በፈተና ያጣሩ።",
+      lockedAfterApproval: "ይህ ውጤት ጸድቋል፤ ማስተካከል አይቻልም። መጀመሪያ ወደ ፈታኙ ይመልሱት።",
+      originalScore: "የፈታኙ ጠቅላላ",
+      derivedStatus: "ውጤት (ከማለፊያ ነጥብ የተገኘ)",
+      error: "ተግባሩ አልተሳካም",
     },
     appeals: {
-      title: 'የፈተና ይግባኞች',
-      subtitle: 'ተፈታኞች በወጡ ውጤቶች ላይ ያቀረቡት ቅሬታ',
-      number: 'የይግባኝ ቁጥር',
-      candidate: 'ተፈታኝ',
-      exam: 'ፈተና',
-      reason: 'ምክንያት',
-      lodged: 'የቀረበበት',
-      decide: 'ወስን',
-      uphold: 'ተቀበል',
-      reject: 'አትቀበል',
-      remark: 'ውሳኔና ምክንያት',
-      decided: 'ይግባኙ ተወስኗል',
-      none: 'ውሳኔ የሚጠብቅ ይግባኝ የለም።',
+      title: "የፈተና ይግባኞች",
+      subtitle: "ተፈታኞች በወጡ ውጤቶች ላይ ያቀረቡት ቅሬታ",
+      number: "የይግባኝ ቁጥር",
+      candidate: "ተፈታኝ",
+      exam: "ፈተና",
+      reason: "ምክንያት",
+      lodged: "የቀረበበት",
+      decide: "ወስን",
+      uphold: "ተቀበል",
+      reject: "አትቀበል",
+      remark: "ውሳኔና ምክንያት",
+      decided: "ይግባኙ ተወስኗል",
+      none: "ውሳኔ የሚጠብቅ ይግባኝ የለም።",
       upheldHint:
-        'ይግባኙን መቀበል ውጤቱን ለድጋሚ እርማት ወደ ፈታኙ ይመልሰዋል፤ እስኪጸድቅና እንደገና እስኪወጣ ተፈታኙ አያየውም።',
-      error: 'ውሳኔውን መመዝገብ አልተቻለም',
+        "ይግባኙን መቀበል ውጤቱን ለድጋሚ እርማት ወደ ፈታኙ ይመልሰዋል፤ እስኪጸድቅና እንደገና እስኪወጣ ተፈታኙ አያየውም።",
+      error: "ውሳኔውን መመዝገብ አልተቻለም",
     },
   },
 
   question: {
-    title: 'ጥያቄዎች',
-    pool: 'የጥያቄ ማከማቻ',
-    filterByCertification: 'በምስክር ወረቀት አጣራ',
-    noQuestions: 'ምንም ጥያቄዎች አልተገኙም',
-    addQuestion: 'ጥያቄ ያክሉ',
-    editQuestion: 'ጥያቄ ያስተካክሉ',
-    confirmDelete: 'መሰረዝን ያረጋግጡ',
-    deleteConfirmText: 'እርግጠኛ ነዎት ይህን ጥያቄ መሰረዝ ይፈልጋሉ?',
-    created: 'ጥያቄ ተፈጥሯል',
-    updated: 'ጥያቄ ዘምኗል',
-    deleted: 'ጥያቄ ተሰርዟል',
-    error: 'ክዋኔው አልተሳካም',
-    loadError: 'ጥያቄዎችን በመጫን ላይ ስህተት',
-    cancel: 'ሰርዝ',
-    create: 'ፍጠር',
-    update: 'አዘምን',
-    delete: 'ሰርዝ',
+    title: "ጥያቄዎች",
+    pool: "የጥያቄ ማከማቻ",
+    filterByCertification: "በምስክር ወረቀት አጣራ",
+    noQuestions: "ምንም ጥያቄዎች አልተገኙም",
+    addQuestion: "ጥያቄ ያክሉ",
+    editQuestion: "ጥያቄ ያስተካክሉ",
+    confirmDelete: "መሰረዝን ያረጋግጡ",
+    deleteConfirmText: "እርግጠኛ ነዎት ይህን ጥያቄ መሰረዝ ይፈልጋሉ?",
+    created: "ጥያቄ ተፈጥሯል",
+    updated: "ጥያቄ ዘምኗል",
+    deleted: "ጥያቄ ተሰርዟል",
+    error: "ክዋኔው አልተሳካም",
+    loadError: "ጥያቄዎችን በመጫን ላይ ስህተት",
+    cancel: "ሰርዝ",
+    create: "ፍጠር",
+    update: "አዘምን",
+    delete: "ሰርዝ",
     columns: {
-      title: 'ርዕስ',
-      certification: 'የምስክር ወረቀት',
-      form: 'ቅጽ',
-      points: 'ነጥብ',
-      status: 'ሁኔታ',
+      title: "ርዕስ",
+      certification: "የምስክር ወረቀት",
+      form: "ቅጽ",
+      points: "ነጥብ",
+      status: "ሁኔታ",
     },
     form: {
-      certification: 'የምስክር ወረቀት',
-      selectCertification: 'የምስክር ወረቀት ይምረጡ',
-      titleEn: 'ርዕስ (እንግሊዝኛ)',
-      titleEnPlaceholder: 'ጥያቄ በእንግሊዝኛ',
-      titleAm: 'ርዕስ (አማርኛ)',
-      titleAmPlaceholder: 'ጥያቄ በአማርኛ',
-      form: 'ቅጽ',
-      selectForm: 'ቅጽ ይምረጡ',
-      essay: 'ኢሴይ',
-      choice: 'ምርጫ',
-      points: 'ነጥብ',
-      pointsPlaceholder: 'ነጥብ',
-      timeAllowed: 'የተፈቀደ ጊዜ',
-      days: 'ቀናት',
-      hours: 'ሰአታት',
-      minutes: 'ደቂቃዎች',
+      certification: "የምስክር ወረቀት",
+      selectCertification: "የምስክር ወረቀት ይምረጡ",
+      titleEn: "ርዕስ (እንግሊዝኛ)",
+      titleEnPlaceholder: "ጥያቄ በእንግሊዝኛ",
+      titleAm: "ርዕስ (አማርኛ)",
+      titleAmPlaceholder: "ጥያቄ በአማርኛ",
+      form: "ቅጽ",
+      selectForm: "ቅጽ ይምረጡ",
+      essay: "ኢሴይ",
+      choice: "ምርጫ",
+      points: "ነጥብ",
+      pointsPlaceholder: "ነጥብ",
+      timeAllowed: "የተፈቀደ ጊዜ",
+      days: "ቀናት",
+      hours: "ሰአታት",
+      minutes: "ደቂቃዎች",
     },
     status: {
-      active: 'ንቁ',
-      inactive: 'እንቅስቃሴ የሌለ',
+      active: "ንቁ",
+      inactive: "እንቅስቃሴ የሌለ",
     },
     qc: {
-      column: 'ማጽደቅ',
-      DRAFT: 'ረቂቅ',
-      PENDING_APPROVAL: 'ማጽደቅ በመጠባበቅ ላይ',
-      APPROVED: 'ጸድቋል',
-      REJECTED: 'ተቀባይነት አላገኘም',
-      RETIRED: 'ከአገልግሎት ወጥቷል',
-      submit: 'ለማጽደቅ ላክ',
-      approve: 'አጽድቅ',
-      reject: 'አትቀበል',
-      retire: 'ከአገልግሎት አውጣ',
-      remark: 'ምክንያት',
-      remarkRequired: 'ላለመቀበል ወይም ከአገልግሎት ለማውጣት ምክንያት ያስፈልጋል።',
-      submitted: 'ለማጽደቅ ተልኳል',
-      reviewed: 'ውሳኔ ተመዝግቧል',
-      reviewTitle: 'የጥያቄ ማከማቻ ንጥል ግምገማ',
-      onlyApprovedUsable: 'የጸደቁ ጥያቄዎች ብቻ በፈተና ወረቀት ላይ ሊቀመጡ ይችላሉ።',
-      error: 'ተግባሩ አልተሳካም',
+      column: "ማጽደቅ",
+      DRAFT: "ረቂቅ",
+      PENDING_APPROVAL: "ማጽደቅ በመጠባበቅ ላይ",
+      APPROVED: "ጸድቋል",
+      REJECTED: "ተቀባይነት አላገኘም",
+      RETIRED: "ከአገልግሎት ወጥቷል",
+      submit: "ለማጽደቅ ላክ",
+      approve: "አጽድቅ",
+      reject: "አትቀበል",
+      retire: "ከአገልግሎት አውጣ",
+      remark: "ምክንያት",
+      remarkRequired: "ላለመቀበል ወይም ከአገልግሎት ለማውጣት ምክንያት ያስፈልጋል።",
+      submitted: "ለማጽደቅ ተልኳል",
+      reviewed: "ውሳኔ ተመዝግቧል",
+      reviewTitle: "የጥያቄ ማከማቻ ንጥል ግምገማ",
+      onlyApprovedUsable: "የጸደቁ ጥያቄዎች ብቻ በፈተና ወረቀት ላይ ሊቀመጡ ይችላሉ።",
+      error: "ተግባሩ አልተሳካም",
     },
   },
 
   configuration: {
-    title: 'ውቅረት',
-    departments: 'ክፍሎች',
-    professions: 'ሙያዎች',
-    departmentsList: 'ክፍሎች',
-    professionsList: 'ሙያዎች',
-    addDepartment: 'ክፍል ያክሉ',
-    addProfession: 'ሙያ ያክሉ',
-    name: 'ስም',
-    nameEn: 'ስም (እንግሊዝኛ)',
-    nameAm: 'ስም (አማርኛ)',
-    description: 'መግለጫ',
-    descEn: 'መግለጫ (እንግሊዝኛ)',
-    descAm: 'መግለጫ (አማርኛ)',
-    department: 'ክፍል',
-    selectDepartment: 'ክፍል ይምረጡ',
-    cancel: 'ሰርዝ',
-    create: 'ፍጠር',
-    update: 'አዘምን',
-    edit: 'አስተካክል',
-    delete: 'ሰርዝ',
-    created: 'በተሳካ ሁኔታ ተፈጥሯል',
-    updated: 'በተሳካ ሁኔታ ዘምኗል',
-    deleted: 'በተሳካ ሁኔታ ተሰርዟል',
-    error: 'አንድ ስህተት ተፈጥሯል',
-    confirmDelete: 'መሰረዝን ያረጋግጡ',
-    deleteConfirmText: 'እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?',
-    noDepartments: 'ገና ምንም ክፍሎች አልተገለጹም',
-    noProfessions: 'ገና ምንም ሙያዎች አልተገለጹም',
+    title: "ውቅረት",
+    departments: "ክፍሎች",
+    professions: "ሙያዎች",
+    departmentsList: "ክፍሎች",
+    professionsList: "ሙያዎች",
+    addDepartment: "ክፍል ያክሉ",
+    addProfession: "ሙያ ያክሉ",
+    name: "ስም",
+    nameEn: "ስም (እንግሊዝኛ)",
+    nameAm: "ስም (አማርኛ)",
+    description: "መግለጫ",
+    descEn: "መግለጫ (እንግሊዝኛ)",
+    descAm: "መግለጫ (አማርኛ)",
+    department: "ክፍል",
+    selectDepartment: "ክፍል ይምረጡ",
+    cancel: "ሰርዝ",
+    create: "ፍጠር",
+    update: "አዘምን",
+    edit: "አስተካክል",
+    delete: "ሰርዝ",
+    created: "በተሳካ ሁኔታ ተፈጥሯል",
+    updated: "በተሳካ ሁኔታ ዘምኗል",
+    deleted: "በተሳካ ሁኔታ ተሰርዟል",
+    error: "አንድ ስህተት ተፈጥሯል",
+    confirmDelete: "መሰረዝን ያረጋግጡ",
+    deleteConfirmText: "እርግጠኛ ነዎት {{name}}ን መሰረዝ ይፈልጋሉ?",
+    noDepartments: "ገና ምንም ክፍሎች አልተገለጹም",
+    noProfessions: "ገና ምንም ሙያዎች አልተገለጹም",
     validation: {
-      nameEnRequired: 'የእንግሊዝኛ ስም ያስፈልጋል',
-      nameAmRequired: 'የአማርኛ ስም ያስፈልጋል',
-      departmentRequired: 'ክፍል ያስፈልጋል',
+      nameEnRequired: "የእንግሊዝኛ ስም ያስፈልጋል",
+      nameAmRequired: "የአማርኛ ስም ያስፈልጋል",
+      departmentRequired: "ክፍል ያስፈልጋል",
     },
   },
 
   queue: {
-    title: 'የፈቃድ ማመልከቻዎች',
-    search: 'ፍለጋ',
-    searchPlaceholder: 'ኩባንያ፣ ቲን ወይም ቁጥር',
-    status: 'ሁኔታ',
-    anyStatus: 'ማንኛውም',
-    type: 'የፈቃድ ዓይነት',
-    anyType: 'ማንኛውም',
-    typeCol: 'ዓይነት',
-    statusCol: 'ሁኔታ',
-    submittedFrom: 'ከቀን ጀምሮ የቀረበ',
-    submittedTo: 'እስከ ቀን የቀረበ',
-    clearFilters: 'አጽዳ',
-    refresh: 'አድስ',
-    export: 'ወደ CSV ላክ',
-    exportTruncated: 'ወደ ውጭ መላክ ተቆርጧል',
-    exportTruncatedBody: 'ከ{{total}} ረድፎች ውስጥ የመጀመሪያዎቹ {{exported}} ተልከዋል። ለቀሪው ማጣሪያውን ያጥቡ።',
-    exportFailed: 'ወደ ውጭ መላክ አልተሳካም',
-    comfortable: 'ሰፊ',
-    compact: 'ጥብቅ',
-    number: 'ማመልከቻ ቁ.',
-    company: 'ኩባንያ',
-    tin: 'ቲን',
-    submitted: 'የቀረበበት',
-    sla: 'ዕድሜ / የጊዜ ገደብ',
-    claim: 'ውሰድ',
-    review: 'ገምግም',
-    claimed: 'ተወስዷል',
-    claimedBody: 'ማመልከቻው አሁን ለእርስዎ ተመድቧል።',
-    claimFailed: 'መውሰድ አልተቻለም',
-    claimRace: 'ሌላ ሹም አስቀድሞ ወስዶታል።',
-    bulkClaim_one: '{{count}} ውሰድ',
-    bulkClaim_other: '{{count}} ውሰድ',
-    bulkClaimed_one: '{{count}} ተወስዷል',
-    bulkClaimed_other: '{{count}} ተወስደዋል',
-    bulkClaimPartial_one: '{{count}} አስቀድሞ በሌላ ሹም ተወስዷል።',
-    bulkClaimPartial_other: '{{count}} አስቀድሞ በሌሎች ሹማምንት ተወስደዋል።',
-    selectAll: 'ሁሉንም ምረጥ',
-    selectRow: '{{number}} ምረጥ',
-    selectedCount_one: '{{count}} ተመርጧል',
-    selectedCount_other: '{{count}} ተመርጠዋል',
-    showing: 'ከ{{total}} ውስጥ {{from}}–{{to}} በማሳየት ላይ',
-    empty: 'እዚህ የሚጠብቅ ነገር የለም',
-    emptyBody: 'አዲስ ማመልከቻዎች ሲቀርቡ እዚህ ይታያሉ።',
-    emptyFiltered: 'በእነዚህ ማጣሪያዎች የሚዛመድ ማመልከቻ የለም',
-    emptyFilteredBody: 'ማጣሪያዎቹን ለማስፋት ወይም ለማጽዳት ይሞክሩ።',
-    errorTitle: 'ወረፋውን መጫን አልተቻለም',
+    title: "የፈቃድ ማመልከቻዎች",
+    search: "ፍለጋ",
+    searchPlaceholder: "ኩባንያ፣ ቲን ወይም ቁጥር",
+    status: "ሁኔታ",
+    anyStatus: "ማንኛውም",
+    type: "የፈቃድ ዓይነት",
+    anyType: "ማንኛውም",
+    typeCol: "ዓይነት",
+    statusCol: "ሁኔታ",
+    statusValues: {
+      DRAFT: "ረቂቅ",
+      SUBMITTED: "ቀርቧል",
+      UNDER_REVIEW: "በግምገማ ላይ",
+      UNDER_EVALUATION: "በምዘና ላይ",
+      RESUBMIT_REQUIRED: "እንደገና ማቅረብ ያስፈልጋል",
+      INSPECTION_PENDING: "ምርመራ በመጠባበቅ ላይ",
+      INSPECTION_COMPLETED: "ምርመራ ተጠናቋል",
+      APPROVED: "ጸድቋል",
+      REJECTED: "ውድቅ ተደርጓል",
+      ON_HOLD: "ለጊዜው ተይዟል",
+      PAYMENT_PENDING: "ክፍያ በመጠባበቅ ላይ",
+      PAID: "ተከፍሏል",
+      PAYMENT_CONFIRMED: "ሰርተፍኬት በዝግጅት ላይ",
+      CERTIFICATE_ISSUED: "ሰርተፍኬት ተሰጥቷል",
+      COMPLETED: "ተጠናቋል",
+    },
+    submittedFrom: "ከቀን ጀምሮ የቀረበ",
+    submittedTo: "እስከ ቀን የቀረበ",
+    clearFilters: "አጽዳ",
+    refresh: "አድስ",
+    export: "ወደ CSV ላክ",
+    exportTruncated: "ወደ ውጭ መላክ ተቆርጧል",
+    exportTruncatedBody:
+      "ከ{{total}} ረድፎች ውስጥ የመጀመሪያዎቹ {{exported}} ተልከዋል። ለቀሪው ማጣሪያውን ያጥቡ።",
+    exportFailed: "ወደ ውጭ መላክ አልተሳካም",
+    comfortable: "ሰፊ",
+    compact: "ጥብቅ",
+    number: "ማመልከቻ ቁ.",
+    company: "ኩባንያ",
+    applicant: "አመልካች",
+    tin: "ቲን",
+    submitted: "የቀረበበት",
+    sla: "ዕድሜ / የጊዜ ገደብ",
+    claim: "ውሰድ",
+    review: "ገምግም",
+    claimed: "ተወስዷል",
+    claimedBody: "ማመልከቻው አሁን ለእርስዎ ተመድቧል።",
+    claimFailed: "መውሰድ አልተቻለም",
+    claimRace: "ሌላ ሹም አስቀድሞ ወስዶታል።",
+    bulkClaim_one: "{{count}} ውሰድ",
+    bulkClaim_other: "{{count}} ውሰድ",
+    bulkClaimed_one: "{{count}} ተወስዷል",
+    bulkClaimed_other: "{{count}} ተወስደዋል",
+    bulkClaimPartial_one: "{{count}} አስቀድሞ በሌላ ሹም ተወስዷል።",
+    bulkClaimPartial_other: "{{count}} አስቀድሞ በሌሎች ሹማምንት ተወስደዋል።",
+    selectAll: "ሁሉንም ምረጥ",
+    selectRow: "{{number}} ምረጥ",
+    selectedCount_one: "{{count}} ተመርጧል",
+    selectedCount_other: "{{count}} ተመርጠዋል",
+    showing: "ከ{{total}} ውስጥ {{from}}–{{to}} በማሳየት ላይ",
+    empty: "እዚህ የሚጠብቅ ነገር የለም",
+    emptyBody: "አዲስ ማመልከቻዎች ሲቀርቡ እዚህ ይታያሉ።",
+    emptyFiltered: "በእነዚህ ማጣሪያዎች የሚዛመድ ማመልከቻ የለም",
+    emptyFilteredBody: "ማጣሪያዎቹን ለማስፋት ወይም ለማጽዳት ይሞክሩ።",
+    errorTitle: "ወረፋውን መጫን አልተቻለም",
     views: {
-      unassigned: 'ያልተመደበ',
-      mine: 'የእኔ ወረፋ',
-      awaitingApplicant: 'አመልካችን በመጠባበቅ',
-      overdue: 'ጊዜው ያለፈበት',
-      readyToIssue: 'ለመስጠት ዝግጁ',
-      all: 'ሁሉም',
+      unassigned: "ያልተመደበ",
+      mine: "የእኔ ወረፋ",
+      awaitingApplicant: "አመልካችን በመጠባበቅ",
+      overdue: "ጊዜው ያለፈበት",
+      readyToIssue: "ለመስጠት ዝግጁ",
+      all: "ሁሉም",
     },
   },
 
   review: {
-    summary: 'ማጠቃለያ',
-    officer: 'ሹም',
-    supervisor: 'የበላይ ኃላፊ',
-    officerPlaceholder: 'ማን እንደሚረከበው ይምረጡ',
-    noOfficers: 'ምንም ሹም አልተገኘም',
-    typeToConfirm: 'ለማረጋገጥ {{number}} ይተይቡ',
-    confirmMismatch: 'አይዛመድም',
-    type: 'ዓይነት',
-    tin: 'ቲን',
-    kind: 'ዓይነት',
-    submitted: 'የቀረበበት',
-    slaLabel: 'የጊዜ ገደብ',
-    eligibility: 'ብቁነት',
-    statusTimeline: 'ሂደት',
-    assigned: 'ተመድቧል',
-    decisionBar: 'የውሳኔ አሞሌ',
-    moreActions: 'ተጨማሪ ተግባራት',
-    irreversible: 'መመለስ አይቻልም',
-    irreversibleWarning: 'ይህ ውሳኔ የመጨረሻ ሲሆን ከጀርባ ቢሮ መመለስ አይቻልም።',
-    irreversibleAck: 'ይህ የመጨረሻ መሆኑን ተረድቻለሁ',
-    reasonCode: 'ምክንያት',
-    reasonCodePlaceholder: 'ምክንያት ይምረጡ',
-    reasonDetail: 'ለአመልካቹ ዝርዝር',
-    reasonDetailHint: 'ይህ ጽሑፍ ለአመልካቹ እንዳለ ይላካል።',
-    deficiencies: 'አመልካቹ ማስተካከል ያለበት ነገሮች',
-    deficienciesHint: 'የተመረጡት ብቻ ለአመልካቹ ሊስተካከሉ ይችላሉ።',
-    notificationPreview: 'ለአመልካቹ የሚላክ መልእክት',
-    notificationPreviewHint: 'በኤስኤምኤስ እና ኢሜይል ይላካል። ከማረጋገጥዎ በፊት ያስተካክሉ።',
-    needsCorrection: 'ማስተካከያ ያስፈልገዋል',
-    correctionPlaceholder: 'አመልካቹ ምን ማስተካከል አለበት?',
-    verifiedCapital: 'የተረጋገጠ ካፒታል (ብር)',
-    capitalHint: 'ዝቅተኛ {{min}} — ከባንክ ደብዳቤ ጋር ያረጋግጡ',
-    capitalHintNoMin: 'ከባንክ ደብዳቤ ጋር ተረጋግጧል',
-    capitalLocked: 'በዚህ ደረጃ ካፒታል ማስተካከል አይቻልም።',
-    belowMinimum: 'ከ{{min}} ዝቅተኛ በታች',
-    declared: 'አመልካቹ ያሳወቀው',
-    role: 'ሚና',
-    name: 'ስም',
-    evidence: 'ማስረጃ',
-    noInspections: 'እስካሁን ምርመራ አልተያዘም።',
-    unscheduled: 'አልተያዘም',
-    inspectionResult: 'የምርመራ ውጤት',
-    findings: 'ግኝቶች',
-    dateTime: 'ቀን እና ሰዓት',
-    schedule: 'ያዝ',
-    pickDate: 'መጀመሪያ ቀን እና ሰዓት ይምረጡ',
-    passed: 'አልፏል',
-    failed: 'ወድቋል',
-    round_one: 'ዙር {{count}}',
-    round_other: 'ዙር {{count}}',
-    theApplicant: 'አመልካቹ',
-    linkCopied: 'አገናኝ ተቀድቷል',
-    actionFailed: 'ተግባሩ አልተሳካም',
-    errorTitle: 'ይህን ማመልከቻ መጫን አልተቻለም',
-    hideActivity: 'እንቅስቃሴ ደብቅ',
-    showActivity: 'እንቅስቃሴ አሳይ',
-    awaitingPayment: 'አመልካቹ {{amount}} {{currency}} እንዲከፍል በመጠባበቅ ላይ።',
+    summary: "ማጠቃለያ",
+    officer: "ሹም",
+    supervisor: "የበላይ ኃላፊ",
+    officerPlaceholder: "ማን እንደሚረከበው ይምረጡ",
+    noOfficers: "ምንም ሹም አልተገኘም",
+    typeToConfirm: "ለማረጋገጥ {{number}} ይተይቡ",
+    confirmMismatch: "አይዛመድም",
+    type: "ዓይነት",
+    tin: "ቲን",
+    kind: "ዓይነት",
+    submitted: "የቀረበበት",
+    slaLabel: "የጊዜ ገደብ",
+    eligibility: "ብቁነት",
+    statusTimeline: "ሂደት",
+    assigned: "ተመድቧል",
+    decisionBar: "የውሳኔ አሞሌ",
+    moreActions: "ተጨማሪ ተግባራት",
+    irreversible: "መመለስ አይቻልም",
+    irreversibleWarning: "ይህ ውሳኔ የመጨረሻ ሲሆን ከጀርባ ቢሮ መመለስ አይቻልም።",
+    irreversibleAck: "ይህ የመጨረሻ መሆኑን ተረድቻለሁ",
+    reasonCode: "ምክንያት",
+    reasonCodePlaceholder: "ምክንያት ይምረጡ",
+    reasonDetail: "ለአመልካቹ ዝርዝር",
+    reasonDetailHint: "ይህ ጽሑፍ ለአመልካቹ እንዳለ ይላካል።",
+    deficiencies: "አመልካቹ ማስተካከል ያለበት ነገሮች",
+    deficienciesHint: "የተመረጡት ብቻ ለአመልካቹ ሊስተካከሉ ይችላሉ።",
+    notificationPreview: "ለአመልካቹ የሚላክ መልእክት",
+    notificationPreviewHint: "በኤስኤምኤስ እና ኢሜይል ይላካል። ከማረጋገጥዎ በፊት ያስተካክሉ።",
+    needsCorrection: "ማስተካከያ ያስፈልገዋል",
+    correctionPlaceholder: "አመልካቹ ምን ማስተካከል አለበት?",
+    verifiedCapital: "የተረጋገጠ ካፒታል (ብር)",
+    capitalHint: "ዝቅተኛ {{min}} — ከባንክ ደብዳቤ ጋር ያረጋግጡ",
+    capitalHintNoMin: "ከባንክ ደብዳቤ ጋር ተረጋግጧል",
+    capitalLocked: "በዚህ ደረጃ ካፒታል ማስተካከል አይቻልም።",
+    belowMinimum: "ከ{{min}} ዝቅተኛ በታች",
+    declared: "አመልካቹ ያሳወቀው",
+    role: "ሚና",
+    name: "ስም",
+    evidence: "ማስረጃ",
+    noInspections: "እስካሁን ምርመራ አልተያዘም።",
+    unscheduled: "አልተያዘም",
+    inspectionResult: "የምርመራ ውጤት",
+    findings: "ግኝቶች",
+    dateTime: "ቀን እና ሰዓት",
+    schedule: "ያዝ",
+    pickDate: "መጀመሪያ ቀን እና ሰዓት ይምረጡ",
+    passed: "አልፏል",
+    failed: "ወድቋል",
+    round_one: "ዙር {{count}}",
+    round_other: "ዙር {{count}}",
+    theApplicant: "አመልካቹ",
+    linkCopied: "አገናኝ ተቀድቷል",
+    actionFailed: "ተግባሩ አልተሳካም",
+    errorTitle: "ይህን ማመልከቻ መጫን አልተቻለም",
+    hideActivity: "እንቅስቃሴ ደብቅ",
+    showActivity: "እንቅስቃሴ አሳይ",
+    awaitingPayment: "አመልካቹ {{amount}} {{currency}} እንዲከፍል በመጠባበቅ ላይ።",
     tabs: {
-      overview: 'አጠቃላይ እይታ',
-      financials: 'የገንዘብ መረጃ',
-      documents: 'ሰነዶች',
-      staff: 'ሠራተኞች',
-      inspection: 'ምርመራ',
+      overview: "አጠቃላይ እይታ",
+      financials: "የገንዘብ መረጃ",
+      documents: "ሰነዶች",
+      staff: "ሠራተኞች",
+      inspection: "ምርመራ",
     },
     actions: {
-      claim: 'ውሰድ',
-      assign: 'መድብ',
-      escalate: 'ወደ ላይ አሳድግ',
-      hold: 'አግድ',
-      resume: 'ቀጥል',
-      completeReview: 'ግምገማ አጠናቅቅ',
-      approveDocuments: 'ሰነዶችን አጽድቅ',
-      scheduleInspection: 'ምርመራ ያዝ',
-      recordInspection: 'የምርመራ ውጤት መዝግብ',
-      finalApprove: 'አጽድቅ እና ስጥ',
-      requestAdjustment: 'ማስተካከያ ጠይቅ',
-      reject: 'አትቀበል',
-      confirmPayment: 'ክፍያ አረጋግጥ',
-      print: 'ሰነድ አትም',
-      copyLink: 'አገናኝ ቅዳ',
-      downloadDocuments: 'ሁሉንም ሰነዶች አውርድ',
-      generateCertificate: 'ሰርተፍኬት አዘጋጅ',
-      auditTrail: 'የኦዲት መዝገብ አሳይ',
+      claim: "ውሰድ",
+      assign: "መድብ",
+      escalate: "ወደ ላይ አሳድግ",
+      hold: "አግድ",
+      resume: "ቀጥል",
+      completeReview: "ግምገማ አጠናቅቅ",
+      approveDocuments: "ሰነዶችን አጽድቅ",
+      scheduleInspection: "ምርመራ ያዝ",
+      recordInspection: "የምርመራ ውጤት መዝግብ",
+      finalApprove: "አጽድቅ እና ስጥ",
+      requestAdjustment: "ማስተካከያ ጠይቅ",
+      reject: "አትቀበል",
+      confirmPayment: "ክፍያ አረጋግጥ",
+      print: "ሰነድ አትም",
+      copyLink: "አገናኝ ቅዳ",
+      downloadDocuments: "ሁሉንም ሰነዶች አውርድ",
+      generateCertificate: "ሰርተፍኬት አዘጋጅ",
+      auditTrail: "የኦዲት መዝገብ አሳይ",
     },
     disabled: {
-      wrongStatus: 'በዚህ ደረጃ አይገኝም',
-      notAssigned: 'ለሌላ ሹም ተመድቧል',
-      noPermission: 'ፈቃድ የለዎትም',
-      needsFlags: 'ማስተካከያ ለመጠየቅ ቢያንስ አንድ ነገር ምልክት ያድርጉ',
-      needsCapital: 'መጀመሪያ የተረጋገጠውን ካፒታል ይመዝግቡ',
-      needsInspection: 'የምርመራ ውጤት ያስፈልጋል',
+      wrongStatus: "በዚህ ደረጃ አይገኝም",
+      notAssigned: "ለሌላ ሹም ተመድቧል",
+      noPermission: "ፈቃድ የለዎትም",
+      needsFlags: "ማስተካከያ ለመጠየቅ ቢያንስ አንድ ነገር ምልክት ያድርጉ",
+      needsCapital: "መጀመሪያ የተረጋገጠውን ካፒታል ይመዝግቡ",
+      needsInspection: "የምርመራ ውጤት ያስፈልጋል",
     },
     reasons: {
-      incompleteDocuments: 'ያልተሟሉ ሰነዶች',
-      belowCapital: 'ካፒታል ከሚያስፈልገው በታች',
-      failedInspection: 'ምርመራ ወድቋል',
-      ineligibleApplicant: 'አመልካቹ ብቁ አይደለም',
-      duplicateApplication: 'ተደጋጋሚ ማመልከቻ',
-      illegibleDocument: 'ሰነዱ አይነበብም',
-      expiredDocument: 'ሰነዱ ጊዜው አልፎበታል',
-      missingDocument: 'ሰነዱ ጠፍቷል',
-      inconsistentDetails: 'ዝርዝሮቹ ከሰነዶቹ ጋር አይዛመዱም',
-      awaitingThirdParty: 'የሶስተኛ ወገን ማረጋገጫ በመጠባበቅ',
-      legalProceedings: 'በሕግ ሂደት ላይ',
-      applicantRequest: 'በአመልካቹ ጥያቄ',
-      aboveAuthority: 'ከእኔ የማጽደቅ ሥልጣን በላይ',
-      policyUnclear: 'የፖሊሲ መመሪያ ያስፈልጋል',
-      conflictOfInterest: 'የጥቅም ግጭት',
+      incompleteDocuments: "ያልተሟሉ ሰነዶች",
+      belowCapital: "ካፒታል ከሚያስፈልገው በታች",
+      failedInspection: "ምርመራ ወድቋል",
+      ineligibleApplicant: "አመልካቹ ብቁ አይደለም",
+      duplicateApplication: "ተደጋጋሚ ማመልከቻ",
+      illegibleDocument: "ሰነዱ አይነበብም",
+      expiredDocument: "ሰነዱ ጊዜው አልፎበታል",
+      missingDocument: "ሰነዱ ጠፍቷል",
+      inconsistentDetails: "ዝርዝሮቹ ከሰነዶቹ ጋር አይዛመዱም",
+      awaitingThirdParty: "የሶስተኛ ወገን ማረጋገጫ በመጠባበቅ",
+      legalProceedings: "በሕግ ሂደት ላይ",
+      applicantRequest: "በአመልካቹ ጥያቄ",
+      aboveAuthority: "ከእኔ የማጽደቅ ሥልጣን በላይ",
+      policyUnclear: "የፖሊሲ መመሪያ ያስፈልጋል",
+      conflictOfInterest: "የጥቅም ግጭት",
     },
     consequences: {
-      fallback: 'ይህ ለ{{applicant}} ማመልከቻ {{number}} ያዘምናል።',
-      'final-approve': 'ለ{{applicant}} ማመልከቻ {{number}} ያጸድቃል እና የሰርተፍኬት አሰጣጥ ይጀምራል።',
-      reject: 'ለ{{applicant}} ማመልከቻ {{number}} አይቀበልም። ይህ ማመልከቻውን ያጠናቅቃል።',
-      'request-adjustment': 'ማመልከቻ {{number}} ለማስተካከያ ወደ {{applicant}} ይመልሳል።',
-      hold: 'ለ{{applicant}} ማመልከቻ {{number}} ያግዳል። ለእርስዎ ተመድቦ ይቆያል።',
-      resume: 'ማመልከቻ {{number}} ወደ ታገደበት ደረጃ ይመልሳል።',
-      escalate: 'ማመልከቻ {{number}} ለውሳኔ ወደ የበላይ ኃላፊ ያሳድጋል።',
-      'confirm-payment': 'ለማመልከቻ {{number}} ክፍያ ያረጋግጣል።',
+      fallback: "ይህ ለ{{applicant}} ማመልከቻ {{number}} ያዘምናል።",
+      "final-approve":
+        "ለ{{applicant}} ማመልከቻ {{number}} ያጸድቃል እና የሰርተፍኬት አሰጣጥ ይጀምራል።",
+      reject: "ለ{{applicant}} ማመልከቻ {{number}} አይቀበልም። ይህ ማመልከቻውን ያጠናቅቃል።",
+      "request-adjustment": "ማመልከቻ {{number}} ለማስተካከያ ወደ {{applicant}} ይመልሳል።",
+      hold: "ለ{{applicant}} ማመልከቻ {{number}} ያግዳል። ለእርስዎ ተመድቦ ይቆያል።",
+      resume: "ማመልከቻ {{number}} ወደ ታገደበት ደረጃ ይመልሳል።",
+      escalate: "ማመልከቻ {{number}} ለውሳኔ ወደ የበላይ ኃላፊ ያሳድጋል።",
+      "confirm-payment": "ለማመልከቻ {{number}} ክፍያ ያረጋግጣል።",
     },
     notifications: {
-      fallback: 'ውድ {{applicant}}፣ በማመልከቻ {{number}} ላይ ዝማኔ አለ፦ {{action}}።',
-      'final-approve': 'ውድ {{applicant}}፣ ማመልከቻ {{number}} ጸድቋል። ሰርተፍኬትዎ በዝግጅት ላይ ነው።',
-      reject: 'ውድ {{applicant}}፣ ማመልከቻ {{number}} አልጸደቀም። እባክዎ ከታች ያለውን ምክንያት ይመልከቱ።',
-      'request-adjustment': 'ውድ {{applicant}}፣ ማመልከቻ {{number}} ከመቀጠሉ በፊት ማስተካከያ ያስፈልገዋል።',
+      fallback: "ውድ {{applicant}}፣ በማመልከቻ {{number}} ላይ ዝማኔ አለ፦ {{action}}።",
+      "final-approve":
+        "ውድ {{applicant}}፣ ማመልከቻ {{number}} ጸድቋል። ሰርተፍኬትዎ በዝግጅት ላይ ነው።",
+      reject:
+        "ውድ {{applicant}}፣ ማመልከቻ {{number}} አልጸደቀም። እባክዎ ከታች ያለውን ምክንያት ይመልከቱ።",
+      "request-adjustment":
+        "ውድ {{applicant}}፣ ማመልከቻ {{number}} ከመቀጠሉ በፊት ማስተካከያ ያስፈልገዋል።",
     },
     activity: {
-      title: 'እንቅስቃሴ እና የኦዲት መዝገብ',
-      empty: 'እስካሁን የተመዘገበ እንቅስቃሴ የለም።',
-      system: 'ሲስተም',
-      officer: 'ሹም',
-      applicant: 'አመልካች',
-      remarkOn: 'በ{{target}} ላይ ማስተካከያ ተጠይቋል',
-      uploaded: '{{document}} ተጭኗል',
+      title: "እንቅስቃሴ እና የኦዲት መዝገብ",
+      empty: "እስካሁን የተመዘገበ እንቅስቃሴ የለም።",
+      system: "ሲስተም",
+      officer: "ሹም",
+      applicant: "አመልካች",
+      remarkOn: "በ{{target}} ላይ ማስተካከያ ተጠይቋል",
+      uploaded: "{{document}} ተጭኗል",
     },
     documents: {
-      completeness: 'የሚያስፈልጉ ሰነዶች',
-      accepted: 'ተቀባይነት አግኝቷል',
-      rejected: 'ተቀባይነት አላገኘም',
-      accept: 'ተቀበል',
-      clear: 'ውሳኔ አጽዳ',
-      confirmReject: 'አትቀበል',
-      includeInAdjustment: 'መልስ',
-      adjustmentNote: 'አመልካቹ ምን ማስተካከል አለበት?',
-      nothingToJudge: 'የሚገመገም ምንም አልተጫነም',
-      reviewedBy: 'በ{{name}} ተገምግሟል',
-      saveFailed: 'ውሳኔውን ማስቀመጥ አልተቻለም',
-      completenessLabel: '{{value}}% የሚያስፈልጉ ሰነዶች ተጭነዋል',
-      missing: 'እስካሁን አልተጫነም',
-      flagged: 'ማስተካከያ ተጠይቋል',
-      view: 'እይ',
-      preview: 'ቅድመ እይታ',
-      download: 'አውርድ',
-      downloadShort: 'አውርድ',
-      reject: 'አትቀበል',
-      rejectReason: 'ይህ ሰነድ ለምን መስተካከል አለበት?',
-      reasonRequired: 'ምክንያት ያስፈልጋል',
-      noFile: 'ፋይል የለም',
-      noFileUploaded: 'እስካሁን ምንም አልተጫነም',
-      noInlinePreview: 'ይህ የፋይል ዓይነት በአሳሹ ውስጥ ቅድመ እይታ አይደረግም።',
+      completeness: "የሚያስፈልጉ ሰነዶች",
+      accepted: "ተቀባይነት አግኝቷል",
+      rejected: "ተቀባይነት አላገኘም",
+      accept: "ተቀበል",
+      clear: "ውሳኔ አጽዳ",
+      confirmReject: "አትቀበል",
+      includeInAdjustment: "መልስ",
+      adjustmentNote: "አመልካቹ ምን ማስተካከል አለበት?",
+      nothingToJudge: "የሚገመገም ምንም አልተጫነም",
+      reviewedBy: "በ{{name}} ተገምግሟል",
+      saveFailed: "ውሳኔውን ማስቀመጥ አልተቻለም",
+      completenessLabel: "{{value}}% የሚያስፈልጉ ሰነዶች ተጭነዋል",
+      missing: "እስካሁን አልተጫነም",
+      flagged: "ማስተካከያ ተጠይቋል",
+      view: "እይ",
+      preview: "ቅድመ እይታ",
+      download: "አውርድ",
+      downloadShort: "አውርድ",
+      reject: "አትቀበል",
+      rejectReason: "ይህ ሰነድ ለምን መስተካከል አለበት?",
+      reasonRequired: "ምክንያት ያስፈልጋል",
+      noFile: "ፋይል የለም",
+      noFileUploaded: "እስካሁን ምንም አልተጫነም",
+      noInlinePreview: "ይህ የፋይል ዓይነት በአሳሹ ውስጥ ቅድመ እይታ አይደረግም።",
+      previewFallback: "ሰነድ",
+    },
+    inspectionStatus: {
+      SCHEDULED: "ተይዟል",
+      COMPLETED: "ተጠናቋል",
+      CANCELLED: "ተሰርዟል",
+    },
+    kindValues: {
+      NEW: "አዲስ",
+      RENEWAL: "እድሳት",
+    },
+    checklist: {
+      officePremises: "የቢሮ ግቢ",
+      storageFacilities: "መጋዘን / የማከማቻ ተቋማት",
+      vehiclesEquipment: "ተሽከርካሪዎች / መሳሪያዎች",
+      safetyCompliance: "ደህንነት እና ደንብ ማክበር",
+    },
+    eligibilityRule: {
+      capitalThreshold: "የተከፈለ ካፒታል ≥ {{amount}}",
+      notRecorded: "አልተመዘገበም",
+      declaredSuffix: " (የተገለጸ)",
+      verifiedSuffix: " (የተረጋገጠ)",
+      inspectionCompleted: "አካላዊ ምርመራ ተጠናቋል",
+      recorded: "ተመዝግቧል",
+      notYetRecorded: "ገና አልተመዘገበም",
+    },
+    sla: {
+      untracked: "ለዚህ የፈቃድ ዓይነት የማጠናቀቂያ ኢላማ አልተቀመጠም።",
+      target: "ኢላማ ከቀረበ በኋላ {{hours}} ሰዓት ({{date}})",
+      met: "ተሟልቷል",
+      missed: "አልተሟላም",
+      decidedIn: "በ{{duration}} ውስጥ ተወስኗል። {{target}}",
+      overdue: "{{duration}} ዘግይቷል",
+      overdueBy: "በ{{duration}} ዘግይቷል። {{target}}",
+      left: "{{duration}} ቀርቷል",
+      remaining: "{{duration}} ቀርቷል። {{target}}",
     },
     done: {
-      completeReview: 'ግምገማ ተጠናቋል',
-      approveDocuments: 'ሰነዶች ጸድቀዋል',
-      finalApprove: 'ጸድቋል',
-      requestAdjustment: 'ማስተካከያ ተጠይቋል',
-      reject: 'ማመልከቻው አልተቀበለም',
-      confirmPayment: 'ክፍያ ተረጋግጧል',
-      hold: 'ማመልከቻው ታግዷል',
-      resume: 'ማመልከቻው ቀጥሏል',
-      escalate: 'ወደ ላይ አድጓል',
-      assign: 'እንደገና ተመድቧል',
-      scheduled: 'ምርመራ ተይዟል',
-      inspectionPassed: 'ምርመራ አልፏል',
-      inspectionFailed: 'ምርመራ ወድቋል',
+      completeReview: "ግምገማ ተጠናቋል",
+      approveDocuments: "ሰነዶች ጸድቀዋል",
+      finalApprove: "ጸድቋል",
+      requestAdjustment: "ማስተካከያ ተጠይቋል",
+      reject: "ማመልከቻው አልተቀበለም",
+      confirmPayment: "ክፍያ ተረጋግጧል",
+      hold: "ማመልከቻው ታግዷል",
+      resume: "ማመልከቻው ቀጥሏል",
+      escalate: "ወደ ላይ አድጓል",
+      assign: "እንደገና ተመድቧል",
+      scheduled: "ምርመራ ተይዟል",
+      inspectionPassed: "ምርመራ አልፏል",
+      inspectionFailed: "ምርመራ ወድቋል",
     },
   },
 
   error: {
-    reference: 'ማጣቀሻ',
-    retry: 'እንደገና ሞክር',
+    reference: "ማጣቀሻ",
+    retry: "እንደገና ሞክር",
   },
 
   shortcuts: {
-    title: 'የቁልፍ ሰሌዳ አቋራጮች',
-    commandPalette: 'ሁሉንም ፈልግ',
-    moveRow: 'በረድፎች መካከል ተንቀሳቀስ',
-    openRow: 'የተመረጠውን ረድፍ ክፈት',
-    claimRow: 'የተመረጠውን ረድፍ ውሰድ',
-    dismiss: 'ምርጫ አጽዳ / ዝጋ',
-    help: 'ይህን ዝርዝር አሳይ',
+    title: "የቁልፍ ሰሌዳ አቋራጮች",
+    commandPalette: "ሁሉንም ፈልግ",
+    moveRow: "በረድፎች መካከል ተንቀሳቀስ",
+    openRow: "የተመረጠውን ረድፍ ክፈት",
+    claimRow: "የተመረጠውን ረድፍ ውሰድ",
+    dismiss: "ምርጫ አጽዳ / ዝጋ",
+    help: "ይህን ዝርዝር አሳይ",
   },
 
   designer: {
-    title: 'የምስክር ወረቀት ንድፍ',
-    subtitle: 'ለፈቃድ ባለቤቶች የሚሰጠውን የምስክር ወረቀት ይንደፉ፣ የሚቆይበትንም ጊዜ ያዘጋጁ።',
-    licenceType: 'የፈቃድ ዓይነት',
-    validityYears: 'የሚቆይበት (ዓመታት)',
-    validityHint: 'ፈቃድ ሲሰጥ ተግባራዊ ይሆናል',
-    saveValidity: 'የሚቆይበትን ጊዜ አስቀምጥ',
-    validitySaved: 'የሚቆይበት ጊዜ ተዘምኗል',
-    newVersion: 'አዲስ ስሪት',
-    versions: 'ስሪቶች',
-    name: 'የስሪት ስም',
-    landscape: 'አግድም',
-    source: 'ቅንብር (Handlebars + HTML)',
-    variables: 'ቦታ ያዢዎች',
-    variablesHint: 'በጠቋሚው ቦታ ለማስገባት ይጫኑ።',
-    preview: 'PDF ቅድመ እይታ',
-    previewFailed: 'ቅድመ እይታውን ማዘጋጀት አልተቻለም',
-    save: 'ረቂቅ አስቀምጥ',
-    saved: 'ረቂቅ ተቀምጧል',
-    saveFirst: 'መጀመሪያ ለውጦችዎን ያስቀምጡ',
-    publish: 'አትም',
-    published: 'ንድፉ ታትሟል',
-    publishHint: 'ይህንን ቀጥታ የምስክር ወረቀት ንድፍ ያደርገዋል',
-    publishedLocked: 'ይህ ስሪት ቀጥታ ላይ ስለሆነ ማስተካከል አይቻልም — ከእሱ የምስክር ወረቀቶች ተሰጥተዋል። ለውጥ ለማድረግ አዲስ ስሪት ይፍጠሩ።',
-    archive: 'አንሳ',
-    archived: 'ንድፉ ተነስቷል',
-    delete: 'ረቂቅ ሰርዝ',
-    deleted: 'ረቂቅ ተሰርዟል',
-    create: 'ፍጠር',
-    created: 'ረቂቅ ተፈጥሯል',
-    newHint: 'ከቀጥታ ንድፉ ወይም ይህ ዓይነት ከሌለው ከውስጠ-ግንብ ቅንብር ይጀምራል።',
-    empty: 'ለዚህ የፈቃድ ዓይነት እስካሁን ንድፍ የለም',
-    emptyBody: 'የምስክር ወረቀቶች አሁን ውስጠ-ግንብ ቅንብር ይጠቀማሉ። ለመቆጣጠር ስሪት ይፍጠሩ።',
-    loadFailed: 'ንድፎቹን መጫን አልተቻለም',
-    actionFailed: 'ተግባሩ አልተሳካም',
-    noPermission: 'ፈቃድ የለዎትም',
-    noPublishPermission: 'ንድፎችን ማተም አይችሉም',
+    title: "የምስክር ወረቀት ንድፍ",
+    subtitle: "ለፈቃድ ባለቤቶች የሚሰጠውን የምስክር ወረቀት ይንደፉ፣ የሚቆይበትንም ጊዜ ያዘጋጁ።",
+    licenceType: "የፈቃድ ዓይነት",
+    validityYears: "የሚቆይበት (ዓመታት)",
+    validityHint: "ፈቃድ ሲሰጥ ተግባራዊ ይሆናል",
+    saveValidity: "የሚቆይበትን ጊዜ አስቀምጥ",
+    validitySaved: "የሚቆይበት ጊዜ ተዘምኗል",
+    newVersion: "አዲስ ስሪት",
+    versions: "ስሪቶች",
+    name: "የስሪት ስም",
+    landscape: "አግድም",
+    source: "ቅንብር (Handlebars + HTML)",
+    variables: "ቦታ ያዢዎች",
+    variablesHint: "በጠቋሚው ቦታ ለማስገባት ይጫኑ።",
+    preview: "PDF ቅድመ እይታ",
+    previewFailed: "ቅድመ እይታውን ማዘጋጀት አልተቻለም",
+    save: "ረቂቅ አስቀምጥ",
+    saved: "ረቂቅ ተቀምጧል",
+    saveFirst: "መጀመሪያ ለውጦችዎን ያስቀምጡ",
+    publish: "አትም",
+    published: "ንድፉ ታትሟል",
+    publishHint: "ይህንን ቀጥታ የምስክር ወረቀት ንድፍ ያደርገዋል",
+    publishedLocked:
+      "ይህ ስሪት ቀጥታ ላይ ስለሆነ ማስተካከል አይቻልም — ከእሱ የምስክር ወረቀቶች ተሰጥተዋል። ለውጥ ለማድረግ አዲስ ስሪት ይፍጠሩ።",
+    archive: "አንሳ",
+    archived: "ንድፉ ተነስቷል",
+    delete: "ረቂቅ ሰርዝ",
+    deleted: "ረቂቅ ተሰርዟል",
+    create: "ፍጠር",
+    created: "ረቂቅ ተፈጥሯል",
+    newHint: "ከቀጥታ ንድፉ ወይም ይህ ዓይነት ከሌለው ከውስጠ-ግንብ ቅንብር ይጀምራል።",
+    empty: "ለዚህ የፈቃድ ዓይነት እስካሁን ንድፍ የለም",
+    emptyBody: "የምስክር ወረቀቶች አሁን ውስጠ-ግንብ ቅንብር ይጠቀማሉ። ለመቆጣጠር ስሪት ይፍጠሩ።",
+    loadFailed: "ንድፎቹን መጫን አልተቻለም",
+    actionFailed: "ተግባሩ አልተሳካም",
+    noPermission: "ፈቃድ የለዎትም",
+    noPublishPermission: "ንድፎችን ማተም አይችሉም",
+  },
+
+  seafarerRegistry: {
+    title: "የመርከበኞች መዝገብ",
+    profileCount_one: "{{count}} መገለጫ",
+    profileCount_other: "{{count}} መገለጫዎች",
+    searchPlaceholder: "ስም፣ መታወቂያ ወይም የመርከበኛ ቁጥር",
+    emptySearch: "ከዚህ ፍለጋ ጋር የሚዛመድ መገለጫ የለም።",
+    emptyNone: "እስካሁን የተመዘገበ መርከበኛ የለም።",
+    columns: {
+      name: "ስም",
+      number: "የመርከበኛ ቁ.",
+      department: "ክፍል",
+      idNumber: "የመታወቂያ ቁጥር",
+      phone: "ስልክ",
+      status: "ሁኔታ",
+      actions: "ተግባራት",
+    },
+    notRegistered: "አልተመዘገበም",
+    incomplete: "ያልተሟላ",
+    statusAction: "ሁኔታ",
+    statusActionTooltip: "አግድ / መልስ / ዝጋ",
+    status: {
+      ACTIVE: "ንቁ",
+      INACTIVE: "ንቁ ያልሆነ",
+      PENDING: "በመጠባበቅ ላይ",
+      SUSPENDED: "ታግዷል",
+    },
+    departments: {
+      DECK: "ደክ",
+      ENGINE: "ኤንጂን",
+      CATERING: "ኬተሪንግ",
+    },
+    recordStatus: {
+      SUBMITTED: "ቀርቧል",
+      VERIFIED: "ተረጋግጧል",
+      REJECTED: "ውድቅ ተደርጓል",
+    },
+    drawer: {
+      seafarerNumber: "የመርከበኛ ቁጥር",
+      department: "ክፍል",
+      status: "ሁኔታ",
+      notRegistered: "አልተመዘገበም",
+      statusReason: "የሁኔታ ምክንያት: {{reason}}",
+      seaServiceTab: "የባህር አገልግሎት",
+      medicalTab: "ህክምና",
+      noSeaService: "ምንም የባህር አገልግሎት መዝገቦች የሉም።",
+      noMedical: "ምንም የህክምና ሰርተፍኬቶች የሉም።",
+      vessel: "መርከብ",
+      rank: "ማዕረግ",
+      period: "ጊዜ",
+      imoPrefix: "IMO {{number}}",
+      issuer: "አውጪ",
+      validity: "የሚያገለግልበት ጊዜ",
+      fitness: "ብቃት",
+    },
+    modal: {
+      title: "የመርከበኛ ሁኔታ ይቀይሩ",
+      body: "{{number}} — በአሁኑ ጊዜ {{status}}። ምክንያቱ ተመዝግቦ ለመርከበኛው ይታያል።",
+      newStatus: "አዲስ ሁኔታ",
+      suspend: "አግድ",
+      close: "ዝጋ",
+      reinstate: "መልስ",
+      reason: "ምክንያት",
+      cancel: "ሰርዝ",
+      confirm: "አረጋግጥ",
+      updated: "የመርከበኛ ሁኔታ ተዘምኗል",
+      updateFailed: "ሁኔታውን ማዘመን አልተቻለም",
+    },
+  },
+
+  paymentConfig: {
+    title: "የክፍያ ውቅረት",
+    subtitle: "እያንዳንዱ ፈቃድ ስንት እንደሚያስከፍል። አመልካቾች ከጸደቀ በኋላ ይከፍላሉ፣ መጠኑም በዚያ ቅጽበት በማመልከቻው ላይ ይወሰናል።",
+    changeNotice: "ለውጥ ከአሁን ጀምሮ በሚጸድቁ ማመልከቻዎች ላይ ተፈጻሚ ይሆናል። ቀደም ሲል የጸደቁ ማመልከቻዎች የተጠየቁበትን መጠን ይይዛሉ፣ ስለዚህ እዚህ የሚደረግ ማስተካከያ አመልካች ቀደም ሲል የተጠየቀውን ክፍያ በፍጹም ሊቀይር አይችልም።",
+    loadError: "የፈቃድ ዓይነቶችን መጫን አልተቻለም",
+    columns: {
+      type: "የፈቃድ ዓይነት",
+      newApplication: "አዲስ ማመልከቻ",
+      renewal: "እድሳት",
+      charged: "ይከፈላል?",
+    },
+    renewalSameTooltip: "የተለየ የእድሳት ክፍያ የለም — እድሳት በአዲስ ማመልከቻ ተመን ይከፈላል",
+    renewalSameAsNew: "(እንደ አዲሱ)",
+    chargedOnApproval: "ሲጸድቅ",
+    chargedNotChargedTooltip: "ይህ የፈቃድ ዓይነት በኢማ ውሳኔ ያበቃል እና ወደ ክፍያ ደረጃ አይደርስም",
+    chargedNotCharged: "አይከፈልም",
+    edit: "አርትዕ",
+    gateway: {
+      title: "የክፍያ በር",
+      subtitle: "በክፍያ አገልግሎቱ አካባቢ የተቀመጠ — እዚህ አይስተካከልም።",
+      provider: "ቴሌብር",
+      bypassTooltip: "ALLOW_PAYMENT_BYPASS በርቷል፣ ስለዚህ አመልካች ሳይከፍል ክፍያን ማጠናቀቅ ይችላል። በምርት አካባቢ ይህ ተከልክሏል።",
+      bypassEnabled: "የሙከራ ማለፊያ በርቷል",
+      bypassOff: "የሙከራ ማለፊያ ጠፍቷል",
+    },
+    modal: {
+      title: "ክፍያዎች — {{type}}",
+      noPaymentStage: "ይህ የፈቃድ ዓይነት በኢማ ውሳኔ ያበቃል እና ወደ ክፍያ ደረጃ አይደርስም፣ ስለዚህ እዚህ የሚቀመጥ ክፍያ ይህ እስኪቀየር ድረስ ጥቅም ላይ አይውልም።",
+      chargeableLabel: "ይህ ፈቃድ ክፍያ አለው",
+      chargeableDescription: "አመልካቾች ፈጽሞ ለማይከፍሉባቸው የፈቃድ ዓይነቶች ያጥፉ።",
+      newFeeLabel: "የአዲስ ማመልከቻ ክፍያ",
+      sameRateLabel: "እድሳትን በተመሳሳይ ተመን ያስከፍሉ",
+      sameRateDescription: "የተለየ የእድሳት ክፍያ ለማዘጋጀት ያጥፉ።",
+      renewalFeeLabel: "የእድሳት ክፍያ",
+      currencyLabel: "ገንዘብ",
+      cancel: "ሰርዝ",
+      save: "ክፍያዎችን አስቀምጥ",
+      missingNewFee: "የአዲስ ማመልከቻ ክፍያ ያስገቡ፣ ወይም «ክፍያ አለው»ን ያጥፉ።",
+      missingRenewalFee: "የእድሳት ክፍያ ያስገቡ፣ ወይም እድሳትን በተመሳሳይ ተመን ያስከፍሉ።",
+      updated: "{{type}} ክፍያዎች ተዘምነዋል።",
+      saveFailed: "ክፍያዎቹን ማስቀመጥ አልተቻለም",
+    },
+  },
+
+  recordVerification: {
+    title: "የመዝገብ ማረጋገጫ",
+    subtitle: "ውሳኔ የሚጠባበቁ የቀረቡ የባህር አገልግሎት መዝገቦች እና የሕክምና የምስክር ወረቀቶች። የተረጋገጡ መዝገቦች ይቀዘቅዛሉ፤ ውድቅ የተደረጉት ከእርስዎ አስተያየት ጋር ለመርከበኛው ይመለሳሉ።",
+    tabs: {
+      medical: "ሕክምና ({{count}})",
+      seaService: "የባህር አገልግሎት ({{count}})",
+    },
+    columns: {
+      seafarer: "መርከበኛ",
+      issuer: "አውጪ",
+      validity: "የሚያገለግልበት ጊዜ",
+      fitness: "ብቃት",
+      vessel: "መርከብ",
+      rank: "ማዕረግ",
+      period: "ጊዜ",
+      actions: "ተግባራት",
+    },
+    fitness: {
+      FIT: "ብቁ",
+      FIT_WITH_RESTRICTIONS: "ከገደብ ጋር ብቁ",
+      UNFIT: "ብቁ ያልሆነ",
+    },
+    evidence: "ማስረጃ",
+    verify: "አረጋግጥ",
+    reject: "ውድቅ አድርግ",
+    evidenceTitleMedical: "ማስረጃ ለ{{name}} የሕክምና የምስክር ወረቀት",
+    evidenceTitleSeaService: "ማስረጃ ለ{{name}} የባህር አገልግሎት መዝገብ",
+    certificateVerified: "የምስክር ወረቀቱ ተረጋግጧል",
+    seaServiceVerified: "የባህር አገልግሎት መዝገብ ተረጋግጧል",
+    certificateRejected: "የምስክር ወረቀቱ ውድቅ ተደርጓል",
+    seaServiceRejected: "የባህር አገልግሎት መዝገብ ውድቅ ተደርጓል",
+    rulingFailed: "ውሳኔውን መመዝገብ አልተቻለም",
+    emptyText: "ማረጋገጫ የሚጠባበቅ ነገር የለም።",
+    rejectMedicalTitle: "የሕክምና የምስክር ወረቀት ውድቅ አድርግ",
+    rejectSeaServiceTitle: "የባህር አገልግሎት መዝገብ ውድቅ አድርግ",
+    rejectReasonLabel: "መርከበኛው ምን ማስተካከል አለበት?",
+    cancel: "ሰርዝ",
+    evidenceModalTitle: "የማስረጃ አባሪዎች",
+    noAttachments: "ለዚህ መዝገብ የተጫነ ማስረጃ አባሪ የለም።",
+    view: "ይመልከቱ",
+    noUrl: "URL የለም",
   },
 };
diff --git a/apps/backoffice/src/app/i18n/locales/en.ts b/apps/backoffice/src/app/i18n/locales/en.ts
index 4b479f05f..338a88e68 100644
--- a/apps/backoffice/src/app/i18n/locales/en.ts
+++ b/apps/backoffice/src/app/i18n/locales/en.ts
@@ -6,6 +6,17 @@ export const en = {
     tagline: 'Control Center',
   },
 
+  msg: {
+    genericError: 'Something went wrong. Please try again.',
+    serverError: 'Server error. Please try again later.',
+    validationError: 'Please check your input and try again.',
+    authError: 'Your session has expired. Please sign in again.',
+    permissionError: "You don't have permission to perform this action.",
+    notFoundError: 'The requested item was not found.',
+    fileTooLarge: 'The file is too large to upload.',
+    networkError: 'Network error. Check your connection and try again.',
+  },
+
   language: {
     label: 'Language',
     en: 'English',
@@ -23,6 +34,12 @@ export const en = {
     typeCombined: 'Combined SA + FF',
     typeJointInvestment: 'Joint Investment',
     typeMto: 'Multimodal Transport Operator',
+    typeSEAFARER_REGISTRATION: 'Seafarer Registration',
+    typeVESSEL_OWNERSHIP_TRANSFER: 'Vessel Ownership Transfer',
+    typeCERTIFICATE_OF_COMPETENCY: 'Certificate of Competency',
+    typeCERTIFICATE_OF_PROFICIENCY: 'Certificate of Proficiency',
+    typeENDORSEMENT_COC: 'CoC Endorsement',
+    typeENDORSEMENT_GOC: 'GOC Endorsement',
     primary: 'Primary',
     destinations: 'Go to',
     noResults: 'Nothing found',
@@ -43,6 +60,7 @@ export const en = {
     userManagement: 'User Management',
     seamanBookQueue: 'Seaman Book Queue',
     vesselRegistrationHeadDashboard: 'Vessel Registration Head Dashboard',
+    vesselRegistrationApplicationQueue: 'Vessel Registration Queue',
     vesselRegistrationQueue: 'Vessel Register',
     vesselFormBuilder: 'Vessel Form Builder',
     vesselRegistrationReport: 'Vessel Registration Report',
@@ -56,13 +74,18 @@ export const en = {
     waiver: 'Waiver',
     preWaiverQueue: 'Pre-Waiver Queue',
     postWaiverQueue: 'Post-Waiver Queue',
-    cocQueue: 'CoC / CoP Queue',
-    endorsementQueue: 'Endorsement Queue',
+    cocQueue: 'CoC Queue',
+    copQueue: 'CoP Queue',
+    endorsementCocQueue: 'CoC Endorsement Queue',
+    endorsementGocQueue: 'GOC Endorsement Queue',
+    vesselRegistrations: 'Vessel Registration',
+    vesselTransfers: 'Vessel Ownership Transfer',
     seafarerRegistry: 'Seafarer Registry',
+    seafarerRegistrationQueue: 'Seafarer Registration Queue',
     applications: 'Applications',
     paymentConfig: 'Payment Config',
     analytics: 'Analytics',
-    medicalVerification: 'Medical Verification',
+    medicalVerification: 'Medical and Sea Service Verification',
     locations: 'Locations',
     configuration: 'Configuration',
     profile: 'Profile',
@@ -86,6 +109,12 @@ export const en = {
     collapse: 'Collapse',
     expand: 'Expand',
     toggleTheme: 'Toggle light / dark mode',
+    refresh: 'Refresh',
+    view: 'View',
+    toggleColumns: 'Toggle columns',
+    noResult: 'No results',
+    switchCalendar: 'Switch calendar type',
+    time: 'Time',
   },
 
   breadcrumbs: {
@@ -332,6 +361,11 @@ export const en = {
       'Not enough approved questions in the bank for this subject.',
   },
 
+  country: {
+    select: 'Select a country',
+    notFound: 'No countries found',
+  },
+
   location: {
     title: 'Locations',
     hierarchy: 'Location Hierarchy',
@@ -753,6 +787,23 @@ export const en = {
     anyType: 'Any',
     typeCol: 'Type',
     statusCol: 'Status',
+    statusValues: {
+      DRAFT: 'Draft',
+      SUBMITTED: 'Submitted',
+      UNDER_REVIEW: 'Under Review',
+      UNDER_EVALUATION: 'Under Evaluation',
+      RESUBMIT_REQUIRED: 'Resubmit Required',
+      INSPECTION_PENDING: 'Inspection Pending',
+      INSPECTION_COMPLETED: 'Inspection Completed',
+      APPROVED: 'Approved',
+      REJECTED: 'Rejected',
+      ON_HOLD: 'On Hold',
+      PAYMENT_PENDING: 'Payment Pending',
+      PAID: 'Paid',
+      PAYMENT_CONFIRMED: 'Preparing Certificate',
+      CERTIFICATE_ISSUED: 'Certificate Issued',
+      COMPLETED: 'Completed',
+    },
     submittedFrom: 'Submitted from',
     submittedTo: 'Submitted to',
     clearFilters: 'Clear',
@@ -765,6 +816,7 @@ export const en = {
     compact: 'Compact',
     number: 'App #',
     company: 'Company',
+    applicant: 'Applicant',
     tin: 'TIN',
     submitted: 'Submitted',
     sla: 'Age / SLA',
@@ -960,6 +1012,42 @@ export const en = {
       noFile: 'No file',
       noFileUploaded: 'Nothing uploaded yet',
       noInlinePreview: 'This file type cannot be previewed in the browser.',
+      previewFallback: 'document',
+    },
+    inspectionStatus: {
+      SCHEDULED: 'Scheduled',
+      COMPLETED: 'Completed',
+      CANCELLED: 'Cancelled',
+    },
+    kindValues: {
+      NEW: 'New',
+      RENEWAL: 'Renewal',
+    },
+    checklist: {
+      officePremises: 'Office premises',
+      storageFacilities: 'Warehouse / storage facilities',
+      vehiclesEquipment: 'Vehicles / equipment',
+      safetyCompliance: 'Safety & regulatory compliance',
+    },
+    eligibilityRule: {
+      capitalThreshold: 'Paid-up capital ≥ {{amount}}',
+      notRecorded: 'Not recorded',
+      declaredSuffix: ' (declared)',
+      verifiedSuffix: ' (verified)',
+      inspectionCompleted: 'Physical inspection completed',
+      recorded: 'Recorded',
+      notYetRecorded: 'Not yet recorded',
+    },
+    sla: {
+      untracked: 'No turnaround target is set for this licence type.',
+      target: 'Target {{hours}}h from submission ({{date}})',
+      met: 'Met',
+      missed: 'Missed',
+      decidedIn: 'Decided in {{duration}}. {{target}}',
+      overdue: 'Overdue {{duration}}',
+      overdueBy: 'Overdue by {{duration}}. {{target}}',
+      left: '{{duration}} left',
+      remaining: '{{duration}} remaining. {{target}}',
     },
     done: {
       completeReview: 'Review completed',
@@ -1031,6 +1119,162 @@ export const en = {
     noPermission: 'You do not have permission',
     noPublishPermission: 'You cannot publish designs',
   },
+
+  seafarerRegistry: {
+    title: 'Seafarer registry',
+    profileCount_one: '{{count}} profile',
+    profileCount_other: '{{count}} profiles',
+    searchPlaceholder: 'Name, ID or seafarer number',
+    emptySearch: 'No profiles match that search.',
+    emptyNone: 'No seafarers registered yet.',
+    columns: {
+      name: 'Name',
+      number: 'Seafarer №',
+      department: 'Department',
+      idNumber: 'ID number',
+      phone: 'Phone',
+      status: 'Status',
+      actions: 'Actions',
+    },
+    notRegistered: 'Not registered',
+    incomplete: 'Incomplete',
+    statusAction: 'Status',
+    statusActionTooltip: 'Suspend / reinstate / close',
+    status: {
+      ACTIVE: 'Active',
+      INACTIVE: 'Inactive',
+      PENDING: 'Pending',
+      SUSPENDED: 'Suspended',
+    },
+    departments: {
+      DECK: 'Deck',
+      ENGINE: 'Engine',
+      CATERING: 'Catering',
+    },
+    recordStatus: {
+      SUBMITTED: 'Submitted',
+      VERIFIED: 'Verified',
+      REJECTED: 'Rejected',
+    },
+    drawer: {
+      seafarerNumber: 'Seafarer number',
+      department: 'Department',
+      status: 'Status',
+      notRegistered: 'NOT REGISTERED',
+      statusReason: 'Status reason: {{reason}}',
+      seaServiceTab: 'Sea Service',
+      medicalTab: 'Medical',
+      noSeaService: 'No sea-service records.',
+      noMedical: 'No medical certificates.',
+      vessel: 'Vessel',
+      rank: 'Rank',
+      period: 'Period',
+      imoPrefix: 'IMO {{number}}',
+      issuer: 'Issuer',
+      validity: 'Validity',
+      fitness: 'Fitness',
+    },
+    modal: {
+      title: 'Change seafarer status',
+      body: '{{number}} — currently {{status}}. The reason is recorded and visible to the seafarer.',
+      newStatus: 'New status',
+      suspend: 'Suspend',
+      close: 'Close',
+      reinstate: 'Reinstate',
+      reason: 'Reason',
+      cancel: 'Cancel',
+      confirm: 'Confirm',
+      updated: 'Seafarer status updated',
+      updateFailed: 'Could not update the status',
+    },
+  },
+
+  paymentConfig: {
+    title: 'Payment configuration',
+    subtitle: 'What each licence costs. Applicants are charged after approval, and the amount is fixed onto the application at that moment.',
+    changeNotice: 'A change applies to applications approved from now on. Anything already approved keeps the amount it was quoted, so an edit here can never alter what an applicant has already been asked to pay.',
+    loadError: 'Could not load licence types',
+    columns: {
+      type: 'Licence type',
+      newApplication: 'New application',
+      renewal: 'Renewal',
+      charged: 'Charged?',
+    },
+    renewalSameTooltip: 'No separate renewal fee — renewal is charged at the new-application rate',
+    renewalSameAsNew: '(same as new)',
+    chargedOnApproval: 'On approval',
+    chargedNotChargedTooltip: 'This licence type ends with an EMA decision and never reaches a payment stage',
+    chargedNotCharged: 'Not charged',
+    edit: 'Edit',
+    gateway: {
+      title: 'Payment gateway',
+      subtitle: 'Set by the payment service environment — not editable here.',
+      provider: 'Telebirr',
+      bypassTooltip: 'ALLOW_PAYMENT_BYPASS is on, so an applicant can settle a fee without paying. It is refused in production.',
+      bypassEnabled: 'Test bypass enabled',
+      bypassOff: 'Test bypass off',
+    },
+    modal: {
+      title: 'Fees — {{type}}',
+      noPaymentStage: 'This licence type concludes with an EMA decision and never reaches a payment stage, so a fee set here stays unused until that changes.',
+      chargeableLabel: 'This licence carries a fee',
+      chargeableDescription: 'Turn off for licence types applicants are never charged for.',
+      newFeeLabel: 'New application fee',
+      sameRateLabel: 'Charge renewal at the same rate',
+      sameRateDescription: 'Turn off to set a separate renewal fee.',
+      renewalFeeLabel: 'Renewal fee',
+      currencyLabel: 'Currency',
+      cancel: 'Cancel',
+      save: 'Save fees',
+      missingNewFee: 'Enter a new-application fee, or turn off "carries a fee".',
+      missingRenewalFee: 'Enter a renewal fee, or charge renewal at the same rate.',
+      updated: '{{type}} fees updated.',
+      saveFailed: 'Could not save the fees',
+    },
+  },
+
+  recordVerification: {
+    title: 'Record verification',
+    subtitle: 'Submitted sea-service records and medical certificates awaiting a ruling. Verified records are frozen; rejections return to the seafarer with your remark.',
+    tabs: {
+      medical: 'Medical ({{count}})',
+      seaService: 'Sea Service ({{count}})',
+    },
+    columns: {
+      seafarer: 'Seafarer',
+      issuer: 'Issuer',
+      validity: 'Validity',
+      fitness: 'Fitness',
+      vessel: 'Vessel',
+      rank: 'Rank',
+      period: 'Period',
+      actions: 'Actions',
+    },
+    fitness: {
+      FIT: 'Fit',
+      FIT_WITH_RESTRICTIONS: 'Fit with restrictions',
+      UNFIT: 'Unfit',
+    },
+    evidence: 'Evidence',
+    verify: 'Verify',
+    reject: 'Reject',
+    evidenceTitleMedical: 'Evidence for {{name}} Medical Certificate',
+    evidenceTitleSeaService: 'Evidence for {{name}} Sea Service Record',
+    certificateVerified: 'Certificate verified',
+    seaServiceVerified: 'Sea-service record verified',
+    certificateRejected: 'Certificate rejected',
+    seaServiceRejected: 'Sea-service record rejected',
+    rulingFailed: 'Could not record the ruling',
+    emptyText: 'Nothing awaiting verification.',
+    rejectMedicalTitle: 'Reject medical certificate',
+    rejectSeaServiceTitle: 'Reject sea-service record',
+    rejectReasonLabel: 'What must the seafarer fix?',
+    cancel: 'Cancel',
+    evidenceModalTitle: 'Evidence Attachments',
+    noAttachments: 'No evidence attachments uploaded for this record.',
+    view: 'View',
+    noUrl: 'No URL',
+  },
 };
 
 export type Translations = typeof en;
diff --git a/apps/backoffice/src/app/layouts/BackofficeLayout.tsx b/apps/backoffice/src/app/layouts/BackofficeLayout.tsx
index d1a3981ff..d1665629a 100644
--- a/apps/backoffice/src/app/layouts/BackofficeLayout.tsx
+++ b/apps/backoffice/src/app/layouts/BackofficeLayout.tsx
@@ -8,7 +8,7 @@ import { AppHeader, AppSidebar } from '@ema-platform/ui';
 import type { NavItem, NavSection } from '@ema-platform/ui';
 import { notify } from '@ema-platform/ui';
 import { AppTopNav, filterByPermissions } from '@ema-platform/ui';
-import { useGetQueueCountsQuery } from '@ema-platform/api';
+import { baseApi, useGetQueueCountsQuery } from '@ema-platform/api';
 import { usePermissions } from '@ema-platform/auth';
 import { SUPPORTED_LANGUAGES } from '../i18n/config';
 import { useAppDispatch, useAppSelector } from '../store/hooks';
@@ -76,12 +76,18 @@ export function BackofficeLayout() {
 
   const displayName = user?.name?.en || user?.username || '';
   const initials = displayName
-    ? displayName.split(/\s+/).map((s) => s[0]).join('').toUpperCase().slice(0, 2)
-    : '?';
+    ? displayName
+        .split(/\s+/)
+        .map((s) => s[0])
+        .join("")
+        .toUpperCase()
+        .slice(0, 2)
+    : "?";
 
   const handleLogout = useCallback(() => {
     dispatch(logout());
-    navigate('/login');
+    dispatch(baseApi.util.resetApiState());
+    navigate("/login");
   }, [dispatch, navigate]);
 
   const segments = location.pathname.split('/').filter(Boolean);
@@ -89,7 +95,7 @@ export function BackofficeLayout() {
   // readable form of the path segment. Every crumb was previously labelled
   // "Dashboard", which made the trail useless.
   const crumbs = [
-    { label: t('nav.dashboard'), path: '/dashboard' },
+    { label: t("nav.dashboard"), path: "/dashboard" },
     ...segments
       .map((_, i) => '/' + segments.slice(0, i + 1).join('/'))
       .filter((path) => path !== '/dashboard')
@@ -123,27 +129,31 @@ export function BackofficeLayout() {
     setCollapsed((prev) => !prev);
   }, []);
 
-  const isSidebar = layoutMode === 'sidebar';
+  const isSidebar = layoutMode === "sidebar";
 
   return (
     <AppShell
       header={{ height: isSidebar ? 74 : HEADER_HEIGHT }}
-      navbar={isSidebar ? {
-        width: collapsed ? 72 : 264,
-        breakpoint: 'sm',
-        collapsed: { mobile: !opened },
-      } : undefined}
+      navbar={
+        isSidebar
+          ? {
+              width: collapsed ? 72 : 264,
+              breakpoint: "sm",
+              collapsed: { mobile: !opened },
+            }
+          : undefined
+      }
       padding="lg"
     >
       <AppShell.Header
         style={{
-          background: 'var(--mantine-color-body)',
-          borderBottom: '1px solid var(--mantine-color-gray-2)',
-          display: 'flex',
-          flexDirection: 'column',
+          background: "var(--mantine-color-body)",
+          borderBottom: "1px solid var(--mantine-color-gray-2)",
+          display: "flex",
+          flexDirection: "column",
         }}
       >
-        <div style={{ height: 74, flexShrink: 0, padding: '0 32px' }}>
+        <div style={{ height: 74, flexShrink: 0, padding: "0 32px" }}>
           <AppHeader
             onToggleNav={toggleNav}
             onToggleSidebar={isSidebar ? handleToggleCollapse : toggleNav}
@@ -151,7 +161,7 @@ export function BackofficeLayout() {
             breadcrumbs={crumbs}
             onNavigate={navigate}
             onLogout={handleLogout}
-            userName={displayName || t('app.name')}
+            userName={displayName || t("app.name")}
             userInitials={initials}
             supportedLanguages={SUPPORTED_LANGUAGES}
           />
@@ -183,10 +193,10 @@ export function BackofficeLayout() {
         <AppShell.Navbar
           p={0}
           style={{
-            overflow: 'hidden',
-            transition: 'width 200ms ease',
-            background: 'var(--mantine-color-body)',
-            borderRight: '1px solid var(--mantine-color-gray-2)',
+            overflow: "hidden",
+            transition: "width 200ms ease",
+            background: "var(--mantine-color-body)",
+            borderRight: "1px solid var(--mantine-color-gray-2)",
           }}
         >
           <AppSidebar
diff --git a/apps/backoffice/src/app/layouts/nav-config.ts b/apps/backoffice/src/app/layouts/nav-config.ts
index 001ba78ad..ba0c25c2e 100644
--- a/apps/backoffice/src/app/layouts/nav-config.ts
+++ b/apps/backoffice/src/app/layouts/nav-config.ts
@@ -1,5 +1,6 @@
 import {
   IconAnchor,
+  IconArrowsExchange,
   IconBook2,
   IconChartBar,
   IconClipboardList,
@@ -9,9 +10,9 @@ import {
   IconGauge,
   IconGavel,
   IconHeart,
+  IconId,
   IconLayoutDashboard,
   IconListCheck,
-  IconMapPin,
   IconQuestionMark,
   IconReport,
   IconRosetteDiscountCheck,
@@ -109,17 +110,21 @@ export const NAV_SECTIONS: NavSection[] = [
     label: 'nav.groupSeafarer',
     items: [
       { to: '/seafarer-registry', label: 'nav.seafarerRegistry', icon: IconUsers },
+      { to: '/licence-review/type/SEAFARER_REGISTRATION', label: 'nav.seafarerRegistrationQueue', icon: IconId },
       { to: '/licence-review/type/CERTIFICATE_OF_COMPETENCY', label: 'nav.cocQueue', icon: IconShieldCheck },
+      { to: '/licence-review/type/CERTIFICATE_OF_PROFICIENCY', label: 'nav.copQueue', icon: IconShieldCheck },
       { to: '/seaman-book-queue', label: 'nav.seamanBookQueue', icon: IconBook2, soon: true },
-      { to: '/endorsement-queue', label: 'nav.endorsementQueue', icon: IconRubberStamp, soon: true },
+      { to: '/licence-review/type/ENDORSEMENT_COC', label: 'nav.endorsementCocQueue', icon: IconRubberStamp },
+      { to: '/licence-review/type/ENDORSEMENT_GOC', label: 'nav.endorsementGocQueue', icon: IconRubberStamp },
       { to: '/medical-verification', label: 'nav.medicalVerification', icon: IconHeart },
     ],
   },
   {
     label: 'nav.groupVessels',
     items: [
+      { to: '/licence-review/type/VESSEL_REGISTRATION', label: 'nav.vesselRegistrationApplicationQueue', icon: IconAnchor },
       { to: '/vessel-registration-queue', label: 'nav.vesselRegistrationQueue', icon: IconAnchor },
-      { to: '/vessel-ownership-transfer', label: 'nav.ownershipTransferQueue', icon: IconFileDescription, soon: true },
+      { to: '/licence-review/type/VESSEL_OWNERSHIP_TRANSFER', label: 'nav.ownershipTransferQueue', icon: IconArrowsExchange },
       { to: '/vessel-registration-queue/new', label: 'nav.vesselFormBuilder', icon: IconFilePlus, soon: true },
       { to: '/vessel-registration-report', label: 'nav.vesselRegistrationReport', icon: IconChartBar, soon: true },
       { to: '/vessel-registration-head-dashboard', label: 'nav.vesselRegistrationHeadDashboard', icon: IconGauge, soon: true },
@@ -138,7 +143,6 @@ export const NAV_SECTIONS: NavSection[] = [
     label: 'nav.groupAdministration',
     items: [
       { to: '/um/user-management/dashboard', label: 'nav.userManagement', icon: IconUserShield },
-      { to: '/locations', label: 'nav.locations', icon: IconMapPin },
       {
         to: '/configuration',
         label: 'nav.configuration',
diff --git a/apps/backoffice/src/app/router/index.tsx b/apps/backoffice/src/app/router/index.tsx
index 07a259279..ae40f7be3 100644
--- a/apps/backoffice/src/app/router/index.tsx
+++ b/apps/backoffice/src/app/router/index.tsx
@@ -16,11 +16,8 @@ import { DashboardPage } from '../features/dashboard/pages/DashboardPage';
 import UserManagementPage from '../features/user-management/UserManagementPage';
 import { ProfilePage } from '../features/profile/pages/ProfilePage';
 import { ConfigurationPage } from '../features/configuration/pages/ConfigurationPage';
-import { LocationPage } from '../features/location/pages/LocationPage';
 import { AnalyticsPage } from '../features/analytics/pages/AnalyticsPage';
 import { ApplicationReviewPage } from '../features/applications/pages/ApplicationReviewPage';
-import { EndorsementQueuePage } from '../features/endorsement/pages/EndorsementQueuePage';
-import { EndorsementReviewPage } from '../features/endorsement/pages/EndorsementReviewPage';
 import { MedicalVerificationPage } from '../features/medical-verification/pages/MedicalVerificationPage';
 import { PaymentConfigPage } from '../features/payment-config/pages/PaymentConfigPage';
 import { SeafarerRegistryPage } from '../features/seafarer-registry/pages/SeafarerRegistryPage';
@@ -34,8 +31,6 @@ import { VesselRegistrationQueuePage } from '../features/vessel-registration/pag
 import { VesselRegistrationReviewPage } from '../features/vessel-registration/pages/VesselRegistrationReviewPage';
 import { VesselRegistrationReportPage } from '../features/vessel-registration/pages/VesselRegistrationReportPage';
 import { VesselRegistrationFormBuilderPage } from '../features/vessel-registration/pages/VesselRegistrationFormBuilderPage';
-import { VesselOwnershipTransferQueuePage } from '../features/vessel-registration/pages/VesselOwnershipTransferQueuePage';
-import { VesselOwnershipTransferReviewPage } from '../features/vessel-registration/pages/VesselOwnershipTransferReviewPage';
 import { VesselRegistrationHeadDashboardPage } from '../features/vessel-registration-head/pages/VesselRegistrationHeadDashboardPage';
 import { LicenseQueuePage } from '../features/license-review/pages/LicenseQueuePage';
 import { LicenseRegisterPage } from '../features/license-register/pages/LicenseRegisterPage';
@@ -69,14 +64,14 @@ const router = createBrowserRouter([
           { path: 'logistics-head-dashboard', element: <LogisticsHeadDashboardPage /> },
           { path: 'profile', element: <ProfilePage /> },
           { path: 'configuration', element: <ConfigurationPage /> },
-          { path: 'locations', element: <LocationPage /> },
           { path: 'analytics', element: <AnalyticsPage /> },
           { path: 'applications/:id', element: <ApplicationReviewPage /> },
           // CoC/CoP review happens in the config-driven licence queue.
           { path: 'coc-queue', element: <Navigate to="/licence-review/type/CERTIFICATE_OF_COMPETENCY" replace /> },
           { path: 'coc-queue/:id', element: <Navigate to="/licence-review" replace /> },
-          { path: 'endorsement-queue', element: <EndorsementQueuePage /> },
-          { path: 'endorsement-queue/:id', element: <EndorsementReviewPage /> },
+          // Endorsement review happens in the config-driven licence queue.
+          { path: 'endorsement-queue', element: <Navigate to="/licence-review/type/ENDORSEMENT_COC" replace /> },
+          { path: 'endorsement-queue/:id', element: <Navigate to="/licence-review" replace /> },
           { path: 'medical-verification', element: <MedicalVerificationPage /> },
           { path: 'payment-config', element: <PaymentConfigPage /> },
           { path: 'seafarer-registry', element: <SeafarerRegistryPage /> },
@@ -88,10 +83,10 @@ const router = createBrowserRouter([
           { path: 'exam-appeals', element: <ExamAppealsPage /> },
           { path: 'vessel-registration-queue', element: <VesselRegistrationQueuePage /> },
           { path: 'vessel-registration-queue/new', element: <VesselRegistrationFormBuilderPage /> },
-          { path: 'vessel-registration-queue/:id', element: <VesselRegistrationReviewPage /> },
-          { path: 'vessel-registration-report', element: <VesselRegistrationReportPage /> },
-          { path: 'vessel-ownership-transfer', element: <VesselOwnershipTransferQueuePage /> },
-          { path: 'vessel-ownership-transfer/:id', element: <VesselOwnershipTransferReviewPage /> },
+         // { path: 'vessel-registration-queue/:id', element: <VesselRegistrationReviewPage /> },
+          //{ path: 'vessel-registration-report', element: <VesselRegistrationReportPage /> },
+          { path: 'vessel-ownership-transfer', element: <Navigate to="/licence-review/type/VESSEL_OWNERSHIP_TRANSFER" replace /> },
+          { path: 'vessel-ownership-transfer/:id', element: <Navigate to="/licence-review" replace /> },
           // Config-driven review workspace, shared by every licence type.
           { path: 'certificate-designer', element: <CertificateDesignerPage /> },
           { path: 'licence-review', element: <LicenseQueuePage /> },
diff --git a/apps/backoffice/src/app/store/index.ts b/apps/backoffice/src/app/store/index.ts
index bb3ca733e..66f11f041 100644
--- a/apps/backoffice/src/app/store/index.ts
+++ b/apps/backoffice/src/app/store/index.ts
@@ -7,11 +7,12 @@ import {
   authStorage,
   refreshAccessToken,
   logout,
+  setToken,
 } from '@ema-platform/auth';
 import type { AuthUser, CurrentProfile } from '@ema-platform/auth';
 import { preferencesReducer } from './preferences.slice';
 
-configureAuthStorage('ema-backoffice');
+configureAuthStorage('ema-backoffice', true);
 
 const preloadedAuth = (() => {
   const token = authStorage.getToken();
@@ -36,7 +37,11 @@ export const store = configureStore({
 });
 
 configureTokenRefresh({
-  onTokenExpired: refreshAccessToken,
+  onTokenExpired: async () => {
+    const token = await refreshAccessToken();
+    store.dispatch(setToken(token));
+    return token;
+  },
   onAuthFailure: () => {
     store.dispatch(logout());
     window.location.href = '/login';
diff --git a/apps/backoffice/src/styles.css b/apps/backoffice/src/styles.css
index c35635881..4b107d549 100644
--- a/apps/backoffice/src/styles.css
+++ b/apps/backoffice/src/styles.css
@@ -5,6 +5,44 @@
 
 *, *::before, *::after { box-sizing: border-box; }
 
+/* ---------------------------------------------------------------------------
+   Scrollbars — themed instead of the raw OS default, so a dark page doesn't
+   carry a stark white scrollbar (or vice versa). Firefox via scrollbar-color,
+   Chrome/Safari/Edge via the ::-webkit-scrollbar-* pseudo-elements. Colors
+   come from Mantine's dark palette so they track the active color scheme
+   instead of a fixed gray.
+   --------------------------------------------------------------------------- */
+* {
+  scrollbar-width: thin;
+  scrollbar-color: var(--mantine-color-gray-5) transparent;
+}
+[data-mantine-color-scheme='dark'] * {
+  scrollbar-color: var(--mantine-color-dark-3) transparent;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+::-webkit-scrollbar-thumb {
+  background-color: var(--mantine-color-gray-5);
+  border-radius: 8px;
+  border: 2px solid transparent;
+  background-clip: content-box;
+}
+::-webkit-scrollbar-thumb:hover {
+  background-color: var(--mantine-color-gray-6);
+}
+[data-mantine-color-scheme='dark'] ::-webkit-scrollbar-thumb {
+  background-color: var(--mantine-color-dark-3);
+}
+[data-mantine-color-scheme='dark'] ::-webkit-scrollbar-thumb:hover {
+  background-color: var(--mantine-color-dark-2);
+}
+
 /* ---------------------------------------------------------------------------
    Print — the review dossier.
 
diff --git a/apps/portal/src/app/components/AmharicDatePicker.tsx b/apps/portal/src/app/components/AmharicDatePicker.tsx
deleted file mode 100644
index 3798fcddc..000000000
--- a/apps/portal/src/app/components/AmharicDatePicker.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import { useState } from 'react';
-import { ActionIcon, Button, Popover, TextInput } from '@mantine/core';
-import { useDisclosure } from '@mantine/hooks';
-import { DayPicker as EthiopicDayPicker } from '@daypicker/ethiopic';
-import { DayPicker as GregorianDayPicker } from '@daypicker/react';
-import { IconCalendarEvent } from '@tabler/icons-react';
-import { EthDateTime } from 'ethiopian-calendar-date-converter';
-import '@daypicker/react/dist/style.css';
-
-const EC_MONTHS_AM = [
-  'መስከረም', 'ጥቅምት', 'ኅዳር', 'ታህሳስ', 'ጥር', 'የካቲት',
-  'መጋቢት', 'ሚያዝያ', 'ግንቦት', 'ሰኔ', 'ሐምሌ', 'ነሐሴ', 'ጳጉሜ',
-];
-
-function toAmharicDisplay(date: Date): string {
-  try {
-    const eth = EthDateTime.fromEuropeanDate(date);
-    return `${EC_MONTHS_AM[eth.month - 1]} ${eth.date}/${eth.year}`;
-  } catch {
-    return date.toLocaleDateString('en-US');
-  }
-}
-
-export function toEthiopicDateLabel(date: Date): string {
-  try {
-    const eth = EthDateTime.fromEuropeanDate(date);
-    return `EC ${eth.year}-${String(eth.month).padStart(2, '0')}-${String(eth.date).padStart(2, '0')}`;
-  } catch {
-    return date.toLocaleDateString('en-US');
-  }
-}
-
-export interface AmharicDatePickerProps {
-  label?: string;
-  value?: Date | null;
-  onChange?: (date: Date | null) => void;
-  required?: boolean;
-  placeholder?: string;
-}
-
-export function AmharicDatePicker({
-  label,
-  value,
-  onChange,
-  required,
-  placeholder,
-}: AmharicDatePickerProps) {
-  const [calendarType, setCalendarType] = useState<'EN' | 'AMH'>('AMH');
-  const [opened, { close, toggle }] = useDisclosure(false);
-
-  const displayValue = value
-    ? calendarType === 'EN'
-      ? value.toLocaleDateString('en-US', {
-          year: 'numeric',
-          month: 'long',
-          day: 'numeric',
-        })
-      : toAmharicDisplay(value)
-    : '';
-
-  return (
-    <Popover
-      opened={opened}
-      onChange={close}
-      position="bottom"
-      width="auto"
-      trapFocus
-      withArrow
-    >
-      <Popover.Target>
-        <TextInput
-          label={label}
-          required={required}
-          value={displayValue}
-          readOnly
-          placeholder={placeholder}
-          onClick={toggle}
-          leftSection={
-            <Button
-              variant="light"
-              size="compact-xs"
-              onClick={(e) => {
-                e.stopPropagation();
-                setCalendarType((prev) => (prev === 'EN' ? 'AMH' : 'EN'));
-              }}
-              aria-label="Switch calendar type"
-            >
-              {calendarType}
-            </Button>
-          }
-          leftSectionWidth="calc(4.375rem * var(--mantine-scale))"
-          rightSection={
-            <ActionIcon size="md" variant="transparent" onClick={toggle}>
-              <IconCalendarEvent size={20} />
-            </ActionIcon>
-          }
-        />
-      </Popover.Target>
-
-      <Popover.Dropdown p="md">
-        {calendarType === 'AMH' ? (
-          <EthiopicDayPicker
-            mode="single"
-            selected={value ?? undefined}
-            numerals="latn"
-            onSelect={(date: Date | undefined) => {
-              onChange?.(date ?? null);
-              close();
-            }}
-          />
-        ) : (
-          <GregorianDayPicker
-            mode="single"
-            selected={value ?? undefined}
-            onSelect={(date: Date | undefined) => {
-              onChange?.(date ?? null);
-              close();
-            }}
-          />
-        )}
-      </Popover.Dropdown>
-    </Popover>
-  );
-}
diff --git a/apps/portal/src/app/features/certificates/pages/CertificatesPage.tsx b/apps/portal/src/app/features/certificates/pages/CertificatesPage.tsx
index 8e71a7ae8..5883717ac 100644
--- a/apps/portal/src/app/features/certificates/pages/CertificatesPage.tsx
+++ b/apps/portal/src/app/features/certificates/pages/CertificatesPage.tsx
@@ -25,6 +25,7 @@ import {
   STATUS_LABELS,
   TERMINAL_STATUSES,
   extractErrorMessage,
+  useLocalized,
   useGetCertificateUrlMutation,
   useGetMyApplicationsQuery,
   useGetMyLicensesQuery,
@@ -33,6 +34,7 @@ import {
 } from '@ema-platform/api';
 import { useCurrentProfile } from '@ema-platform/auth';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 const CERTIFICATE_TYPE_KEYS = [
   'CERTIFICATE_OF_COMPETENCY',
@@ -72,6 +74,8 @@ export function CertificatesPage() {
     useGetMyApplicationsQuery();
   const { data: licenses } = useGetMyLicensesQuery();
   const [getCertificateUrl] = useGetCertificateUrlMutation();
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
 
   const registered =
     Boolean(profile?.seafarerNumber) && profile?.seafarerStatus === 'ACTIVE';
@@ -187,7 +191,7 @@ export function CertificatesPage() {
                 <div>
                   <Text fw={600}>{app.applicationNumber}</Text>
                   <Text size="xs" c="dimmed">
-                    {app.licenseType?.name?.en}
+                    {localized(app.licenseType?.name)}
                   </Text>
                 </div>
                 <Group>
@@ -243,9 +247,9 @@ export function CertificatesPage() {
                         {license.certificateNumber}
                       </Text>
                     </Table.Td>
-                    <Table.Td>{license.licenseType?.name?.en}</Table.Td>
-                    <Table.Td>{license.issueDate?.slice(0, 10)}</Table.Td>
-                    <Table.Td>{license.expiryDate?.slice(0, 10)}</Table.Td>
+                    <Table.Td>{localized(license.licenseType?.name)}</Table.Td>
+                    <Table.Td>{showDate(license.issueDate)}</Table.Td>
+                    <Table.Td>{showDate(license.expiryDate)}</Table.Td>
                     <Table.Td>
                       <Badge
                         size="sm"
diff --git a/apps/portal/src/app/features/dashboard/pages/DashboardPage.tsx b/apps/portal/src/app/features/dashboard/pages/DashboardPage.tsx
index beb7edea4..2ed1fa9c9 100644
--- a/apps/portal/src/app/features/dashboard/pages/DashboardPage.tsx
+++ b/apps/portal/src/app/features/dashboard/pages/DashboardPage.tsx
@@ -2,7 +2,6 @@ import { useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import {
-  ActionIcon,
   Alert,
   Anchor,
   Badge,
@@ -11,7 +10,6 @@ import {
   Card,
   Center,
   Container,
-  Divider,
   Group,
   Loader,
   Paper,
@@ -22,7 +20,6 @@ import {
   Text,
   ThemeIcon,
   Title,
-  Tooltip,
 } from '@mantine/core';
 import {
   IconAlertTriangle,
@@ -30,9 +27,7 @@ import {
   IconClipboardList,
   IconClockHour4,
   IconCreditCard,
-  IconDownload,
   IconFileText,
-  IconRefresh,
   IconShieldCheck,
 } from '@tabler/icons-react';
 import { ProfileCompletionNudge } from '../../profile/components/ProfileCompletionNudge';
@@ -42,16 +37,14 @@ import {
   STATUS_LABELS,
   STATUS_PROGRESS,
   TERMINAL_STATUSES,
-  extractErrorMessage,
-  localized,
-  useCreateApplicationMutation,
+  useLocalized,
   useGetCertificateUrlMutation,
   useGetMyApplicationsQuery,
   useGetMyLicensesQuery,
 } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
 import type { IssuedLicense, LicenseApplication } from '@ema-platform/api';
 import { LicenseCatalogue } from '../../licensing/components/LicenseCatalogue';
+import { LicenseCard, useRenewLicense } from '../../licensing/components/LicenseCard';
 
 /**
  * The applicant's home screen.
@@ -82,14 +75,6 @@ function formatMoney(amount: string | number | null, currency: string): string {
   return `${value.toLocaleString('en-US')} ${currency}`;
 }
 
-function formatDate(value: string): string {
-  return new Date(value).toLocaleDateString('en-GB', {
-    day: 'numeric',
-    month: 'short',
-    year: 'numeric',
-  });
-}
-
 export function DashboardPage() {
   const navigate = useNavigate();
   const displayName = useSelector(
@@ -101,8 +86,7 @@ export function DashboardPage() {
   const { data: licenses } = useGetMyLicensesQuery();
   const [getCertificateUrl, { isLoading: isDownloading }] =
     useGetCertificateUrlMutation();
-  const [createApplication, { isLoading: isRenewing }] =
-    useCreateApplicationMutation();
+  const { renewLicense, isRenewing } = useRenewLicense();
 
   const items = useMemo(() => applications?.items ?? [], [applications]);
   const heldLicenses = useMemo(() => licenses?.items ?? [], [licenses]);
@@ -127,27 +111,6 @@ export function DashboardPage() {
     window.open(result.url, '_blank', 'noopener');
   }
 
-  /**
-   * Renewal reuses the ordinary application wizard — a renewal is an
-   * application of kind RENEWAL, asking for that licence type's renewal
-   * document set. `previousLicenseId` is what ties it to the certificate being
-   * replaced, and what the API requires.
-   */
-  async function renewLicense(license: IssuedLicense) {
-    const typeKey = license.licenseType?.key;
-    if (!typeKey) return;
-    try {
-      const application = await createApplication({
-        licenseType: typeKey,
-        kind: 'RENEWAL',
-        previousLicenseId: license.id,
-      }).unwrap();
-      navigate(`/licensing/${typeKey}/applications/${application.id}`);
-    } catch (err) {
-      notify.error(extractErrorMessage(err), 'Could not start the renewal');
-    }
-  }
-
   if (isLoading) {
     return (
       <Center h={400}>
@@ -321,7 +284,12 @@ function ActionRequired({
   navigate: (path: string) => void;
 }) {
   return (
-    <Card withBorder radius="md" padding="md" bg="orange.0">
+    <Card
+      withBorder
+      radius="md"
+      padding="md"
+      style={{ backgroundColor: 'var(--mantine-color-orange-light)' }}
+    >
       <Group gap="xs" mb="sm">
         <ThemeIcon size="sm" radius="xl" color="orange" variant="filled">
           <IconAlertTriangle size={14} />
@@ -334,7 +302,7 @@ function ActionRequired({
         {applications.map((app) => {
           const detail = detailFor(app);
           return (
-            <Paper key={app.id} radius="sm" p="sm" withBorder bg="white">
+            <Paper key={app.id} radius="sm" p="sm" withBorder>
               <Group justify="space-between" wrap="nowrap">
                 <Group gap="sm" wrap="nowrap">
                   <ThemeIcon
@@ -489,6 +457,7 @@ function ApplicationTable({
   applications: LicenseApplication[];
   navigate: (path: string) => void;
 }) {
+  const localized = useLocalized();
   return (
     <Card withBorder radius="md" padding={0}>
       <Table.ScrollContainer minWidth={640}>
@@ -549,91 +518,6 @@ function ApplicationTable({
   );
 }
 
-function LicenseCard({
-  license,
-  isDownloading,
-  isRenewing,
-  onDownload,
-  onRenew,
-}: {
-  license: IssuedLicense;
-  isDownloading: boolean;
-  isRenewing: boolean;
-  onDownload: () => void;
-  onRenew: () => void;
-}) {
-  // The API computes both in the authority's timezone; the local fallbacks are
-  // only for a cached response from before those fields existed.
-  const days = license.daysUntilExpiry ?? daysUntil(license.expiryDate);
-  const expired = license.status === 'EXPIRED' || days < 0;
-  const renewable = license.renewable ?? false;
-
-  return (
-    <Card withBorder radius="md" padding="md">
-      <Group justify="space-between" align="flex-start" wrap="nowrap">
-        <Box>
-          <Text size="sm" fw={600}>
-            {localized(license.licenseType?.name) || 'Licence'}
-          </Text>
-          <Text size="xs" c="dimmed" mt={2}>
-            {license.certificateNumber}
-          </Text>
-        </Box>
-        <Badge
-          size="sm"
-          variant="light"
-          color={expired ? 'red' : license.status === 'ACTIVE' ? 'teal' : 'gray'}
-        >
-          {expired ? 'Expired' : license.status}
-        </Badge>
-      </Group>
-
-      <Divider my="sm" />
-
-      <Group justify="space-between" align="center">
-        <Box>
-          <Text size="xs" c="dimmed">
-            {expired ? 'Expired on' : 'Valid until'}
-          </Text>
-          <Text size="sm" fw={500}>
-            {formatDate(license.expiryDate)}
-          </Text>
-        </Box>
-        <Tooltip label="Download certificate">
-          <ActionIcon
-            variant="light"
-            radius="md"
-            size="lg"
-            loading={isDownloading}
-            onClick={onDownload}
-          >
-            <IconDownload size={16} />
-          </ActionIcon>
-        </Tooltip>
-      </Group>
-
-      {/* Renewal opens inside the licence type's window and stays open after
-          expiry, so a lapsed licence is renewed rather than applied for afresh. */}
-      {renewable && (
-        <Button
-          fullWidth
-          mt="sm"
-          size="xs"
-          variant={expired ? 'filled' : 'light'}
-          color={expired ? 'orange' : undefined}
-          loading={isRenewing}
-          leftSection={<IconRefresh size={14} />}
-          onClick={onRenew}
-        >
-          {expired
-            ? 'Renew — this licence has expired'
-            : `Renew — expires in ${days} day${days === 1 ? '' : 's'}`}
-        </Button>
-      )}
-    </Card>
-  );
-}
-
 /**
  * The first-visit panel, in place of two empty sections saying the same thing.
  * It carries no call to action of its own — the catalogue is directly beneath
diff --git a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
index 07d777512..ac7ae28d1 100644
--- a/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
+++ b/apps/portal/src/app/features/endorsement/pages/EndorsementPage.tsx
@@ -1,20 +1,254 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
+import {
+  Alert,
+  Badge,
+  Button,
+  Card,
+  Group,
+  List,
+  Loader,
+  Stack,
+  Table,
+  Text,
+  ThemeIcon,
+  Title,
+} from '@mantine/core';
+import {
+  IconArrowRight,
+  IconCertificate,
+  IconCircleCheck,
+  IconCircleX,
+  IconInfoCircle,
+} from '@tabler/icons-react';
+import { useNavigate } from 'react-router-dom';
+import {
+  STATUS_COLORS,
+  STATUS_LABELS,
+  TERMINAL_STATUSES,
+  extractErrorMessage,
+  useLocalized,
+  useGetCertificateUrlMutation,
+  useGetMyApplicationsQuery,
+  useGetMyLicensesQuery,
+} from '@ema-platform/api';
+import { useCurrentProfile } from '@ema-platform/auth';
+import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
+
+const ENDORSEMENT_TYPE_KEYS = ['ENDORSEMENT_COC', 'ENDORSEMENT_GOC'];
+
+function EligibilityItem({ ok, label }: { ok: boolean; label: string }) {
+  return (
+    <List.Item
+      icon={
+        <ThemeIcon
+          color={ok ? 'teal' : 'red'}
+          variant="light"
+          size="sm"
+          radius="xl"
+        >
+          {ok ? <IconCircleCheck size={14} /> : <IconCircleX size={14} />}
+        </ThemeIcon>
+      }
+    >
+      {label}
+    </List.Item>
+  );
+}
 
 /**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
+ * Endorsements home, mirroring CertificatesPage: eligibility at a glance, the
+ * two application entry points (CoC / GOC), and the seafarer's endorsement
+ * applications and issued endorsements. The wizard itself is the
+ * config-driven licensing flow.
  */
 export function EndorsementPage() {
+  const navigate = useNavigate();
+  const { profile, isLoading: loadingProfile } = useCurrentProfile();
+  const { data: applications, isLoading: loadingApplications } =
+    useGetMyApplicationsQuery();
+  const { data: licenses } = useGetMyLicensesQuery();
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
+  const [getCertificateUrl] = useGetCertificateUrlMutation();
+
+  const registered =
+    Boolean(profile?.seafarerNumber) && profile?.seafarerStatus === 'ACTIVE';
+
+  const endorsementApplications = (applications?.items ?? []).filter((app) =>
+    ENDORSEMENT_TYPE_KEYS.includes(app.licenseType?.key ?? ''),
+  );
+  const inFlight = endorsementApplications.filter(
+    (app) => !TERMINAL_STATUSES.includes(app.status),
+  );
+  const issued = (licenses?.items ?? []).filter((license) =>
+    ENDORSEMENT_TYPE_KEYS.includes(license.licenseType?.key ?? ''),
+  );
+
+  async function download(licenseId: string) {
+    try {
+      const result = await getCertificateUrl(licenseId).unwrap();
+      window.open(result.url, '_blank', 'noopener');
+    } catch (error) {
+      notify.error(extractErrorMessage(error, 'Could not fetch endorsement'));
+    }
+  }
+
+  if (loadingProfile || loadingApplications) {
+    return (
+      <Group justify="center" py="xl">
+        <Loader />
+      </Group>
+    );
+  }
+
   return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Endorsements"
-        description="Endorsements are not connected to the backend yet."
-      />
-    </Container>
+    <Stack maw={860} mx="auto">
+      <Title order={2}>My Endorsements</Title>
+
+      <Card withBorder radius="md" p="lg">
+        <Group justify="space-between" align="flex-start">
+          <div>
+            <Text fw={600} mb={6}>
+              Eligibility
+            </Text>
+            <List spacing={4} size="sm">
+              <EligibilityItem
+                ok={registered}
+                label={
+                  registered
+                    ? `Registered seafarer (${profile?.seafarerNumber})`
+                    : 'Active seafarer registration required'
+                }
+              />
+            </List>
+          </div>
+          <Stack gap="xs">
+            <Button
+              rightSection={<IconArrowRight size={16} />}
+              onClick={() => navigate('/licensing/ENDORSEMENT_COC/apply')}
+            >
+              Endorse a CoC
+            </Button>
+            <Button
+              variant="light"
+              rightSection={<IconArrowRight size={16} />}
+              onClick={() => navigate('/licensing/ENDORSEMENT_GOC/apply')}
+            >
+              Endorse a GOC
+            </Button>
+          </Stack>
+        </Group>
+        {!registered && (
+          <Alert color="orange" mt="md" icon={<IconInfoCircle size={16} />}>
+            Complete your{' '}
+            <Text
+              component="span"
+              c="blue"
+              style={{ cursor: 'pointer' }}
+              onClick={() => navigate('/seafarer-registration')}
+            >
+              seafarer registration
+            </Text>{' '}
+            first — endorsement applications are refused without it.
+          </Alert>
+        )}
+      </Card>
+
+      {inFlight.length > 0 && (
+        <Stack gap="xs">
+          <Title order={4}>Applications in progress</Title>
+          {inFlight.map((app) => (
+            <Card key={app.id} withBorder radius="md" p="md">
+              <Group justify="space-between">
+                <div>
+                  <Text fw={600}>{app.applicationNumber}</Text>
+                  <Text size="xs" c="dimmed">
+                    {localized(app.licenseType?.name)}
+                  </Text>
+                </div>
+                <Group>
+                  <Badge color={STATUS_COLORS[app.status]}>
+                    {STATUS_LABELS[app.status]}
+                  </Badge>
+                  <Button
+                    size="compact-sm"
+                    variant="light"
+                    onClick={() =>
+                      navigate(
+                        `/licensing/${app.licenseType?.key}/applications/${app.id}`,
+                      )
+                    }
+                  >
+                    {app.status === 'DRAFT' || app.status === 'RESUBMIT_REQUIRED'
+                      ? 'Continue'
+                      : 'View'}
+                  </Button>
+                </Group>
+              </Group>
+            </Card>
+          ))}
+        </Stack>
+      )}
+
+      <Stack gap="xs">
+        <Title order={4}>Issued endorsements</Title>
+        {issued.length === 0 ? (
+          <Card withBorder radius="md" p="lg">
+            <Text size="sm" c="dimmed" ta="center">
+              No endorsements issued yet.
+            </Text>
+          </Card>
+        ) : (
+          <Table.ScrollContainer minWidth={640}>
+            <Table striped>
+              <Table.Thead>
+                <Table.Tr>
+                  <Table.Th>Certificate №</Table.Th>
+                  <Table.Th>Type</Table.Th>
+                  <Table.Th>Issued</Table.Th>
+                  <Table.Th>Expires</Table.Th>
+                  <Table.Th>Status</Table.Th>
+                  <Table.Th />
+                </Table.Tr>
+              </Table.Thead>
+              <Table.Tbody>
+                {issued.map((license) => (
+                  <Table.Tr key={license.id}>
+                    <Table.Td>
+                      <Text ff="monospace" size="sm" fw={600}>
+                        {license.certificateNumber}
+                      </Text>
+                    </Table.Td>
+                    <Table.Td>{localized(license.licenseType?.name)}</Table.Td>
+                    <Table.Td>{showDate(license.issueDate)}</Table.Td>
+                    <Table.Td>{showDate(license.expiryDate)}</Table.Td>
+                    <Table.Td>
+                      <Badge
+                        size="sm"
+                        variant="light"
+                        color={license.status === 'ACTIVE' ? 'green' : 'red'}
+                      >
+                        {license.status}
+                      </Badge>
+                    </Table.Td>
+                    <Table.Td>
+                      <Button
+                        size="compact-xs"
+                        variant="subtle"
+                        leftSection={<IconCertificate size={14} />}
+                        onClick={() => download(license.id)}
+                      >
+                        Download
+                      </Button>
+                    </Table.Td>
+                  </Table.Tr>
+                ))}
+              </Table.Tbody>
+            </Table>
+          </Table.ScrollContainer>
+        )}
+      </Stack>
+    </Stack>
   );
 }
 
diff --git a/apps/portal/src/app/features/exams/pages/ExamsPage.tsx b/apps/portal/src/app/features/exams/pages/ExamsPage.tsx
index 0b96fe687..f49865d3b 100644
--- a/apps/portal/src/app/features/exams/pages/ExamsPage.tsx
+++ b/apps/portal/src/app/features/exams/pages/ExamsPage.tsx
@@ -14,11 +14,13 @@ import {
 } from '@mantine/core';
 import { IconClipboardList, IconFileText, IconGavel } from '@tabler/icons-react';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   useApiQuery,
   useApiMutation,
   extractErrorMessage,
   openAuthedDocument,
+  useLocalized,
 } from '@ema-platform/api';
 
 interface OpenExam {
@@ -81,6 +83,8 @@ const ATTENDANCE_COLOR: Record<AttendanceStatus, string> = {
  * when a mark looks wrong.
  */
 export function ExamsPage() {
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
   const [appealFor, setAppealFor] = useState<MyResult | null>(null);
   const [appealReason, setAppealReason] = useState('');
 
@@ -195,10 +199,10 @@ export function ExamsPage() {
             <Card key={exam.id} withBorder radius="md" p="md">
               <Group justify="space-between">
                 <div>
-                  <Text fw={600}>{exam.title?.en}</Text>
+                  <Text fw={600}>{localized(exam.title)}</Text>
                   <Text size="xs" c="dimmed">
-                    {exam.certification?.name?.en ?? ''} ·{' '}
-                    {exam.date?.slice(0, 10)}
+                    {localized(exam.certification?.name)} ·{' '}
+                    {showDate(exam.date)}
                     {exam.venue ? ` · ${exam.venue}` : ''}
                   </Text>
                 </div>
@@ -252,8 +256,8 @@ export function ExamsPage() {
                         {registration.admissionNumber}
                       </Text>
                     </Table.Td>
-                    <Table.Td>{registration.exam?.title?.en ?? '—'}</Table.Td>
-                    <Table.Td>{registration.exam?.date?.slice(0, 10)}</Table.Td>
+                    <Table.Td>{localized(registration.exam?.title) || '—'}</Table.Td>
+                    <Table.Td>{showDate(registration.exam?.date)}</Table.Td>
                     <Table.Td>{registration.exam?.venue ?? '—'}</Table.Td>
                     <Table.Td>
                       <Badge
@@ -324,8 +328,8 @@ export function ExamsPage() {
                   );
                   return (
                     <Table.Tr key={result.id}>
-                      <Table.Td>{result.exam?.title?.en ?? '—'}</Table.Td>
-                      <Table.Td>{result.publishedAt?.slice(0, 10) ?? '—'}</Table.Td>
+                      <Table.Td>{localized(result.exam?.title) || '—'}</Table.Td>
+                      <Table.Td>{showDate(result.publishedAt)}</Table.Td>
                       <Table.Td>
                         <Text fw={600} size="sm">
                           {result.totalScore}
@@ -374,7 +378,7 @@ export function ExamsPage() {
         <Stack>
           <Text size="sm" c="dimmed">
             Explain what you believe went wrong with the marking or the
-            administration of {appealFor?.exam?.title?.en ?? 'this examination'}.
+            administration of {localized(appealFor?.exam?.title) || 'this examination'}.
             Appeals must be lodged within 14 days of publication.
           </Text>
           <Textarea
diff --git a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
index 8e8620bbc..8fd15be76 100644
--- a/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
+++ b/apps/portal/src/app/features/licensing/components/ConfigDrivenSection.tsx
@@ -8,9 +8,12 @@ import {
 } from '@mantine/core';
 import {
   conditionHolds,
-  localized,
+  useLocalized,
+  type FormFieldConfig,
   type FormSectionConfig,
+  type Vessel,
 } from '@ema-platform/api';
+import { AmharicDatePicker, CountrySelect } from '@ema-platform/ui';
 
 interface Props {
   section: FormSectionConfig;
@@ -20,6 +23,60 @@ interface Props {
   disabled?: boolean;
   /** Keyed `${sectionKey}.${fieldKey}` — shown under the offending field. */
   errors?: Record<string, string>;
+  /** The applicant's registered vessels, for the vessel-picker field. */
+  vessels?: Vessel[];
+  /**
+   * Fired when the vessel picker's value resolves to a known vessel. Vessel
+   * Information and Current Ownership are separate form sections, so this
+   * component (one instance per section) can only fill its own fields —
+   * the parent uses this to fill the rest via the same `VESSEL_FIELD_FILLERS`.
+   */
+  onVesselSelected?: (vessel: Vessel) => void;
+}
+
+/**
+ * Maps a Vessel's own fields onto whichever fields the backend put in the
+ * license form — same dual key/label matching the nationality prefill in
+ * LicenseApplicationPage uses, so this doesn't depend on exact field-key
+ * naming in the seeded formSchema. Exported so the parent page can apply it
+ * across every section, not just the one the vessel picker lives in.
+ */
+export const VESSEL_FIELD_FILLERS: {
+  matches: (label: string, key: string) => boolean;
+  value: (vessel: Vessel) => unknown;
+}[] = [
+  { matches: (l, k) => k === 'registrationNumber' || l.includes('registration number'), value: (v) => v.registrationNumber },
+  { matches: (l, k) => k === 'vesselName' || l.includes('vessel name'), value: (v) => v.name },
+  { matches: (l, k) => k === 'category' || k === 'vesselCategory' || l.includes('vessel category'), value: (v) => v.category },
+  { matches: (l, k) => k === 'vesselType' || l.includes('vessel type'), value: (v) => v.vesselType },
+  { matches: (l, k) => k === 'imoNumber' || l.includes('imo'), value: (v) => v.imoNumber },
+  { matches: (l, k) => k === 'hullNumber' || l.includes('hull number'), value: (v) => v.hullNumber },
+  { matches: (l, k) => k === 'flagState' || l.includes('flag state') || l.includes('flag'), value: (v) => v.flagState },
+  { matches: (l, k) => k === 'portOfRegistry' || l.includes('port of registry'), value: (v) => v.portOfRegistry },
+  { matches: (l, k) => k === 'grossTonnage' || l.includes('gross tonnage'), value: (v) => v.grossTonnage },
+  { matches: (l, k) => k === 'passengerCapacity' || l.includes('passenger capacity'), value: (v) => v.passengerCapacity },
+  { matches: (l, k) => k === 'lengthMeters' || l.includes('length'), value: (v) => v.lengthMeters },
+  { matches: (l, k) => k === 'yearBuilt' || l.includes('year built'), value: (v) => v.yearBuilt },
+  { matches: (l, k) => k === 'engineType' || l.includes('engine type'), value: (v) => v.engineType },
+  { matches: (l, k) => k === 'enginePowerKw' || l.includes('engine power'), value: (v) => v.enginePowerKw },
+  { matches: (l, k) => k === 'numberOfEngines' || l.includes('number of engines'), value: (v) => v.numberOfEngines },
+  { matches: (l, k) => k === 'hullMaterial' || l.includes('hull material'), value: (v) => v.hullMaterial },
+  // Current Ownership: only the "current" owner, never "new owner" —
+  // that's who the vessel is being transferred to, not on file anywhere.
+  { matches: (l, k) => k === 'currentOwnerName' || k === 'currentOwner' || l.includes('current owner'), value: (v) => v.ownerName },
+];
+
+export function fillFromVessel(
+  vessel: Vessel,
+  fields: FormFieldConfig[],
+  onChange: (key: string, value: unknown) => void,
+) {
+  for (const f of fields) {
+    // English-pinned: matched against the English strings in VESSEL_FIELD_FILLERS.
+    const label = (f.label.en ?? '').toLowerCase();
+    const filler = VESSEL_FIELD_FILLERS.find((m) => m.matches(label, f.key));
+    if (filler) onChange(f.key, filler.value(vessel) ?? '');
+  }
 }
 
 /**
@@ -36,7 +93,10 @@ export function ConfigDrivenSection({
   onChange,
   disabled,
   errors = {},
+  vessels = [],
+  onVesselSelected,
 }: Props) {
+  const localized = useLocalized();
   const fields = [...(section.fields ?? [])].sort(
     (a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0),
   );
@@ -47,6 +107,8 @@ export function ConfigDrivenSection({
         if (!conditionHolds(field.showWhen, formData)) return null;
 
         const label = localized(field.label);
+        // English-pinned: the picker overrides below match English labels.
+        const labelEn = (field.label.en ?? '').toLowerCase();
         const value = values?.[field.key];
         const error = errors[`${section.key}.${field.key}`];
         const common = {
@@ -58,10 +120,41 @@ export function ConfigDrivenSection({
           disabled: disabled || field.readOnly,
         };
         const span = field.type === 'TEXTAREA' ? 12 : 6;
+        // Same field the profile Address tab collects — give it the same
+        // searchable, flag-labeled picker instead of a plain option list.
+        const isNationality = field.key === 'nationality' || labelEn.includes('nationality');
+        // Options here can't be seeded statically — they're the applicant's
+        // own vessel register, so this overrides whatever type the backend
+        // configured, the same way nationality overrides SELECT above.
+        const isVesselPicker = field.key === 'vesselId' || field.key === 'vessel' || /^(select\s+)?vessel$/i.test(labelEn.trim());
 
         return (
           <Grid.Col span={{ base: 12, md: span }} key={field.key}>
-            {field.type === 'SELECT' ? (
+            {isNationality ? (
+              <CountrySelect
+                {...common}
+                demonym
+                value={(value as string) ?? null}
+                onChange={(v) => onChange(field.key, v)}
+              />
+            ) : isVesselPicker ? (
+              <Select
+                {...common}
+                placeholder="Select a registered vessel"
+                data={vessels.map((v) => ({ value: v.id, label: `${v.name} — ${v.registrationNumber}` }))}
+                value={(value as string) ?? null}
+                onChange={(v) => {
+                  onChange(field.key, v);
+                  const vessel = vessels.find((x) => x.id === v);
+                  if (vessel) {
+                    fillFromVessel(vessel, fields, onChange);
+                    onVesselSelected?.(vessel);
+                  }
+                }}
+                searchable
+                clearable={!field.required}
+              />
+            ) : field.type === 'SELECT' ? (
               <Select
                 {...common}
                 data={(field.options ?? []).map((o) => ({
@@ -93,11 +186,16 @@ export function ConfigDrivenSection({
                 thousandSeparator={field.type === 'MONEY' ? ',' : undefined}
               />
             ) : field.type === 'DATE' ? (
-              <TextInput
-                {...common}
-                type="date"
+              // AmharicDatePicker has no `description`/`withAsterisk` props (from
+              // `common`) — pass `required` explicitly so the asterisk still shows.
+              <AmharicDatePicker
+                label={label}
+                error={error}
+                disabled={common.disabled}
+                required={field.required}
+                dateFormat="date"
                 value={(value as string) ?? ''}
-                onChange={(e) => onChange(field.key, e.currentTarget.value)}
+                onChange={(v) => onChange(field.key, v)}
               />
             ) : field.type === 'TEXTAREA' ? (
               <Textarea
diff --git a/apps/portal/src/app/features/licensing/components/DocumentSlots.tsx b/apps/portal/src/app/features/licensing/components/DocumentSlots.tsx
index 0abf6ddcb..2f28c6635 100644
--- a/apps/portal/src/app/features/licensing/components/DocumentSlots.tsx
+++ b/apps/portal/src/app/features/licensing/components/DocumentSlots.tsx
@@ -19,12 +19,14 @@ import {
 } from '@tabler/icons-react';
 import {
   conditionHolds,
-  localized,
+  useLocalized,
   uploadDocument,
   type Attachment,
   type DocumentRequirement,
 } from '@ema-platform/api';
 
+const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024;
+
 interface Props {
   requirements: DocumentRequirement[];
   attachments: Attachment[];
@@ -56,6 +58,7 @@ export function DocumentSlots({
   onUploaded,
   readOnly,
 }: Props) {
+  const localized = useLocalized();
   const [busy, setBusy] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
   const resetRefs = useRef<Record<string, () => void>>({});
@@ -63,11 +66,17 @@ export function DocumentSlots({
   const required = requirements.filter(
     (r) =>
       r.mode === 'ALWAYS' ||
+      r.mode === 'OPTIONAL' ||
       (r.mode === 'CONDITIONAL' && conditionHolds(r.conditionExpression, formData)),
   );
 
   async function handle(documentKey: string, file: File | null) {
     if (!file) return;
+    if (file.size > MAX_FILE_SIZE_BYTES) {
+      setError(`File exceeds 5MB limit (${(file.size / 1024 / 1024).toFixed(1)}MB).`);
+      resetRefs.current[documentKey]?.();
+      return;
+    }
     setBusy(documentKey);
     setError(null);
     const result = await uploadDocument({ ownerType, ownerId, documentKey, file });
@@ -92,7 +101,7 @@ export function DocumentSlots({
 
         return (
           <Card
-            key={requirement.key}
+            key={requirement.id}
             withBorder
             padding="md"
             style={{
@@ -115,6 +124,11 @@ export function DocumentSlots({
                       conditional
                     </Badge>
                   )}
+                  {requirement.mode === 'OPTIONAL' && (
+                    <Badge size="xs" variant="light" color="gray">
+                      optional
+                    </Badge>
+                  )}
                   {uploaded && !flagRemark && (
                     <Badge size="xs" color="teal" leftSection={<IconCheck size={10} />}>
                       uploaded
diff --git a/apps/portal/src/app/features/licensing/components/LicenseCard.tsx b/apps/portal/src/app/features/licensing/components/LicenseCard.tsx
new file mode 100644
index 000000000..f99252488
--- /dev/null
+++ b/apps/portal/src/app/features/licensing/components/LicenseCard.tsx
@@ -0,0 +1,147 @@
+import { useNavigate } from 'react-router-dom';
+import {
+  ActionIcon,
+  Badge,
+  Box,
+  Button,
+  Card,
+  Divider,
+  Group,
+  Text,
+  Tooltip,
+} from '@mantine/core';
+import { IconDownload, IconRefresh } from '@tabler/icons-react';
+import {
+  extractErrorMessage,
+  useLocalized,
+  useCreateApplicationMutation,
+  type IssuedLicense,
+} from '@ema-platform/api';
+import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
+
+/**
+ * Renewal reuses the ordinary application wizard — a renewal is an
+ * application of kind RENEWAL, asking for that licence type's renewal
+ * document set. `previousLicenseId` is what ties it to the certificate being
+ * replaced, and what the API requires.
+ *
+ * Shared by the dashboard and My Applications so both offer the same renew
+ * action instead of drifting.
+ */
+export function useRenewLicense() {
+  const navigate = useNavigate();
+  const [createApplication, { isLoading: isRenewing }] =
+    useCreateApplicationMutation();
+
+  async function renewLicense(license: IssuedLicense) {
+    const typeKey = license.licenseType?.key;
+    if (!typeKey) return;
+    try {
+      const application = await createApplication({
+        licenseType: typeKey,
+        kind: 'RENEWAL',
+        previousLicenseId: license.id,
+      }).unwrap();
+      navigate(`/licensing/${typeKey}/applications/${application.id}`);
+    } catch (err) {
+      notify.error(extractErrorMessage(err), 'Could not start the renewal');
+    }
+  }
+
+  return { renewLicense, isRenewing };
+}
+
+function daysUntil(date: string): number {
+  const ms = new Date(date).getTime() - Date.now();
+  return Math.ceil(ms / 86_400_000);
+}
+
+export function LicenseCard({
+  license,
+  isDownloading,
+  isRenewing,
+  onDownload,
+  onRenew,
+}: {
+  license: IssuedLicense;
+  isDownloading: boolean;
+  isRenewing: boolean;
+  onDownload: () => void;
+  onRenew: () => void;
+}) {
+  // The API computes both in the authority's timezone; the local fallbacks are
+  // only for a cached response from before those fields existed.
+  const days = license.daysUntilExpiry ?? daysUntil(license.expiryDate);
+  const expired = license.status === 'EXPIRED' || days < 0;
+  const renewable = license.renewable ?? false;
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
+
+  return (
+    <Card withBorder radius="md" padding="md" className="ema-hover-lift">
+      <Group justify="space-between" align="flex-start" wrap="nowrap">
+        <Box>
+          <Text size="sm" fw={600}>
+            {localized(license.licenseType?.name) || 'Licence'}
+          </Text>
+          <Text size="xs" c="dimmed" mt={2}>
+            {license.certificateNumber}
+          </Text>
+        </Box>
+        <Badge
+          size="sm"
+          variant="light"
+          color={expired ? 'red' : license.status === 'ACTIVE' ? 'teal' : 'gray'}
+        >
+          {expired ? 'Expired' : license.status}
+        </Badge>
+      </Group>
+
+      <Divider my="sm" />
+
+      <Group justify="space-between" align="center">
+        <Box>
+          <Text size="xs" c="dimmed">
+            {expired ? 'Expired on' : 'Valid until'}
+          </Text>
+          <Text size="sm" fw={500}>
+            {showDate(license.expiryDate)}
+          </Text>
+        </Box>
+        <Tooltip label="Download certificate">
+          <ActionIcon
+            variant="light"
+            radius="md"
+            size="lg"
+            loading={isDownloading}
+            onClick={onDownload}
+          >
+            <IconDownload size={16} />
+          </ActionIcon>
+        </Tooltip>
+      </Group>
+
+      {/* Renewal opens inside the licence type's window and stays open after
+          expiry, so a lapsed licence is renewed rather than applied for afresh. */}
+      {renewable && (
+        <Button
+          fullWidth
+          mt="sm"
+          size="xs"
+          variant={expired ? 'filled' : 'light'}
+          color={expired ? 'orange' : undefined}
+          loading={isRenewing}
+          leftSection={<IconRefresh size={14} />}
+          onClick={onRenew}
+        >
+          {expired
+            ? 'Renew — this licence has expired'
+            : `Renew — expires in ${days} day${days === 1 ? '' : 's'}`}
+        </Button>
+      )}
+    </Card>
+  );
+}
+
+export default LicenseCard;
diff --git a/apps/portal/src/app/features/licensing/components/LicenseCatalogue.tsx b/apps/portal/src/app/features/licensing/components/LicenseCatalogue.tsx
index 19acc6edb..486a9d8d3 100644
--- a/apps/portal/src/app/features/licensing/components/LicenseCatalogue.tsx
+++ b/apps/portal/src/app/features/licensing/components/LicenseCatalogue.tsx
@@ -23,7 +23,7 @@ import {
   IconTrendingUp,
 } from '@tabler/icons-react';
 import {
-  localized,
+  useLocalized,
   useGetLicenseCategoriesQuery,
   useGetLicenseTypesQuery,
   useGetMyOperatorTypesQuery,
@@ -55,6 +55,7 @@ function formatFee(amount: string | number | null, currency: string): string {
 
 export function LicenseCatalogue() {
   const navigate = useNavigate();
+  const localized = useLocalized();
   const { data: types } = useGetLicenseTypesQuery();
   const { data: categories } = useGetLicenseCategoriesQuery();
   const { data: operatorTypes, isLoading: loadingOperatorTypes } =
@@ -253,6 +254,7 @@ function LicenseTypeCard({
   canApply: boolean;
   onSelect: (type: LicenseType) => void;
 }) {
+  const localized = useLocalized();
   const capital = type.capitalThreshold ? Number(type.capitalThreshold) : null;
 
   return (
diff --git a/apps/portal/src/app/features/licensing/components/StaffEvidence.tsx b/apps/portal/src/app/features/licensing/components/StaffEvidence.tsx
index fd3cb6ba2..8ef08a415 100644
--- a/apps/portal/src/app/features/licensing/components/StaffEvidence.tsx
+++ b/apps/portal/src/app/features/licensing/components/StaffEvidence.tsx
@@ -1,13 +1,16 @@
 import { useEffect, useState } from 'react';
 import { Badge, Button, FileButton, Group, Loader } from '@mantine/core';
+import { notifications } from '@mantine/notifications';
 import { IconCheck } from '@tabler/icons-react';
 import {
-  localized,
+  useLocalized,
   uploadDocument,
   useGetAttachmentsQuery,
   type StaffEvidenceRequirement,
 } from '@ema-platform/api';
 
+const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024;
+
 interface Props {
   staffId: string;
   evidence: StaffEvidenceRequirement[];
@@ -27,6 +30,7 @@ export function StaffEvidence({ staffId, evidence, readOnly, onUploaded }: Props
     ownerId: staffId,
   });
   const [busy, setBusy] = useState<string | null>(null);
+  const localized = useLocalized();
 
   if (!evidence?.length) return null;
 
@@ -42,6 +46,13 @@ export function StaffEvidence({ staffId, evidence, readOnly, onUploaded }: Props
             accept="application/pdf,image/jpeg,image/png"
             onChange={async (file) => {
               if (!file) return;
+              if (file.size > MAX_FILE_SIZE_BYTES) {
+                notifications.show({
+                  color: 'red',
+                  message: `File exceeds 5MB limit (${(file.size / 1024 / 1024).toFixed(1)}MB).`,
+                });
+                return;
+              }
               setBusy(item.docKey);
               await uploadDocument({
                 ownerType: 'APPLICATION_STAFF',
diff --git a/apps/portal/src/app/features/licensing/pages/ApplicationRedirectPage.tsx b/apps/portal/src/app/features/licensing/pages/ApplicationRedirectPage.tsx
new file mode 100644
index 000000000..2c7589fcb
--- /dev/null
+++ b/apps/portal/src/app/features/licensing/pages/ApplicationRedirectPage.tsx
@@ -0,0 +1,32 @@
+import { Center, Loader } from '@mantine/core';
+import { Navigate, useParams } from 'react-router-dom';
+import { useGetApplicationQuery } from '@ema-platform/api';
+
+/**
+ * Resolves `/applications/:applicationId` deep links (notification
+ * callbackUrl, emails) to the canonical `/licensing/:typeCode/applications/:id`
+ * route, which needs the licence type key to load its config.
+ */
+export function ApplicationRedirectPage() {
+  const { applicationId } = useParams();
+  const { data, isLoading, isError } = useGetApplicationQuery(applicationId!, {
+    skip: !applicationId,
+  });
+
+  if (!applicationId || isError) {
+    return <Navigate replace to="/licensing/applications" />;
+  }
+
+  if (isLoading) {
+    return (
+      <Center h={300}>
+        <Loader />
+      </Center>
+    );
+  }
+
+  const typeCode = data?.application.licenseType?.key ?? 'FREIGHT_FORWARDER';
+  return <Navigate replace to={`/licensing/${typeCode}/applications/${applicationId}`} />;
+}
+
+export default ApplicationRedirectPage;
diff --git a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
index f38f86d21..86387c114 100644
--- a/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
+++ b/apps/portal/src/app/features/licensing/pages/LicenseApplicationPage.tsx
@@ -29,27 +29,33 @@ import {
   IconTrash,
 } from '@tabler/icons-react';
 import { notifications } from '@mantine/notifications';
+import { useTranslation } from 'react-i18next';
 import {
   buildWizardSteps,
   conditionHolds,
   extractErrorMessage,
   extractValidationIssues,
-  localized,
+  useLocalized,
   validateSections,
   useAddStaffMutation,
   useCreateApplicationMutation,
   useGetApplicationQuery,
   useGetAttachmentsQuery,
   useGetLicenseTypeRequirementsQuery,
+  useGetMyVesselsQuery,
   usePatchSectionMutation,
   useRemoveStaffMutation,
   useResolveRemarkMutation,
   useResubmitApplicationMutation,
   useSubmitApplicationMutation,
   type FieldErrors,
+  type FormFieldConfig,
   type ValidationIssue,
+  type Vessel,
 } from '@ema-platform/api';
-import { ConfigDrivenSection } from '../components/ConfigDrivenSection';
+import { getCountryCode, getCountryName, ModalFooter } from '@ema-platform/ui';
+import { useCurrentProfile } from '@ema-platform/auth';
+import { ConfigDrivenSection, fillFromVessel } from '../components/ConfigDrivenSection';
 import { DocumentSlots } from '../components/DocumentSlots';
 import { StaffEvidence } from '../components/StaffEvidence';
 
@@ -61,9 +67,15 @@ import { StaffEvidence } from '../components/StaffEvidence';
 export function LicenseApplicationPage() {
   const { typeCode = 'FREIGHT_FORWARDER', applicationId } = useParams();
   const navigate = useNavigate();
+  const { i18n } = useTranslation();
+  const localized = useLocalized();
 
   const { data: config, isLoading: loadingConfig } =
     useGetLicenseTypeRequirementsQuery({ idOrKey: typeCode });
+  const { profile } = useCurrentProfile();
+  // Only the vessel-select field (ConfigDrivenSection) reads this — fetched
+  // here rather than deeper down since it's the shared source of draft state.
+  const { data: vessels } = useGetMyVesselsQuery();
   const [createApplication] = useCreateApplicationMutation();
   const [appId, setAppId] = useState<string | undefined>(applicationId);
 
@@ -111,6 +123,55 @@ export function LicenseApplicationPage() {
     if (detail?.application?.formData) setDraft(detail.application.formData);
   }, [detail?.application?.id, detail?.application?.adjustmentRound]);
 
+  // Nationality and National ID (Fayda) number are already on file from the
+  // profile's Address tab — carry them into whichever section the form
+  // config puts those fields in, rather than asking again. Only fills a
+  // blank; a value already on the draft (the applicant's own edit, or one
+  // the server saved) is left alone.
+  useEffect(() => {
+    const address = profile?.address;
+    if (!address || !config) return;
+
+    setDraft((prev) => {
+      let next = prev;
+      const fill = (
+        matchField: (label: string, key: string) => boolean,
+        toFieldValue: (field: FormFieldConfig) => unknown,
+      ) => {
+        for (const section of config.licenseType.formSchema.sections) {
+          // English-pinned: matched against English substrings below ('nationality', 'fayda').
+          const field = section.fields.find((f) => matchField((f.label.en ?? '').toLowerCase(), f.key));
+          if (!field) continue;
+          if (next[section.key]?.[field.key]) return; // already set — leave it
+          next = { ...next, [section.key]: { ...next[section.key], [field.key]: toFieldValue(field) } };
+          return;
+        }
+      };
+
+      if (address.nationality) {
+        // Profile stores the full country name; the field always renders as
+        // a CountrySelect (see ConfigDrivenSection), which takes alpha-2
+        // codes regardless of the backend's configured field type.
+        fill(
+          (label, key) => key === 'nationality' || label.includes('nationality'),
+          () => getCountryCode(address.nationality) ?? address.nationality,
+        );
+      }
+      if (address.idType === 'NID' && address.idNumber) {
+        fill(
+          (label, key) =>
+            key === 'idNumber' || key === 'nationalId' || key === 'faydaNumber' ||
+            label.includes('fayda') || label.includes('national id'),
+          () => address.idNumber,
+        );
+      }
+      return next;
+    });
+    // Also re-run after the server seed effect (above) replaces `draft`
+    // wholesale — that effect can resolve after this one, wiping the
+    // prefill back out since the server's own draft has none of this yet.
+  }, [profile?.address, config, detail?.application?.id, detail?.application?.formData]);
+
   const application = detail?.application;
   const isAdjusting = application?.status === 'RESUBMIT_REQUIRED';
   const openRemarks = detail?.openRemarks ?? [];
@@ -136,8 +197,9 @@ export function LicenseApplicationPage() {
     () =>
       buildWizardSteps(config?.licenseType?.formSchema?.sections ?? [], draft, {
         hasStaff: (config?.staffRoleRequirements?.length ?? 0) > 0,
+        language: i18n.language,
       }),
-    [config, draft],
+    [config, draft, i18n.language],
   );
   const sections = useMemo(
     () => steps.flatMap((step) => step.sections),
@@ -154,15 +216,39 @@ export function LicenseApplicationPage() {
 
   const readOnly = !['DRAFT', 'RESUBMIT_REQUIRED'].includes(application.status);
 
+  // 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.
+  function handleVesselSelected(vessel: Vessel) {
+    for (const section of config?.licenseType.formSchema.sections ?? []) {
+      fillFromVessel(vessel, section.fields, (key, value) => {
+        setDraft((prev) => ({
+          ...prev,
+          [section.key]: { ...(prev[section.key] ?? {}), [key]: value },
+        }));
+      });
+    }
+  }
+
   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;
+    const values = { ...(draft[sectionKey] ?? {}) };
+    // The picker works in alpha-2 codes (CountrySelect); the backend, like
+    // the profile Address endpoint, stores the full country name.
+    const nationalityField = config?.licenseType.formSchema.sections
+      .find((s) => s.key === sectionKey)
+      // English-pinned: same reasoning as the fill() matcher above.
+      ?.fields.find((f) => f.key === 'nationality' || (f.label.en ?? '').toLowerCase().includes('nationality'));
+    if (nationalityField && values[nationalityField.key]) {
+      values[nationalityField.key] = getCountryName(values[nationalityField.key] as string) || values[nationalityField.key];
+    }
     try {
       await patchSection({
         id: appId as string,
         sectionKey,
-        values: draft[sectionKey] ?? {},
+        values,
       }).unwrap();
     } catch (err) {
       notifications.show({
@@ -176,7 +262,7 @@ export function LicenseApplicationPage() {
   async function handleSubmit() {
     setIssues([]);
     if (!readOnly && currentStep?.sections?.length) {
-      const errors = validateSections(currentStep.sections, draft);
+      const errors = validateSections(currentStep.sections, draft, i18n.language);
       setFieldErrors(errors);
       if (Object.keys(errors).length) {
         notifications.show({
@@ -236,7 +322,7 @@ export function LicenseApplicationPage() {
     if (!currentStep || !config) return true;
 
     if (currentStep.kind === 'sections') {
-      const errors = validateSections(currentStep.sections, draft);
+      const errors = validateSections(currentStep.sections, draft, i18n.language);
       setFieldErrors(errors);
       const count = Object.keys(errors).length;
       if (count > 0) {
@@ -394,7 +480,9 @@ export function LicenseApplicationPage() {
                     section={section}
                     values={draft[section.key] ?? {}}
                     formData={draft}
+                    onVesselSelected={handleVesselSelected}
                     errors={fieldErrors}
+                    vessels={vessels}
                     disabled={readOnly || locked}
                     onChange={(key, value) => {
                       setDraft((prev) => ({
@@ -523,9 +611,11 @@ export function LicenseApplicationPage() {
                 </Text>
                 <ConfigDrivenSection
                   section={section}
+                  onVesselSelected={handleVesselSelected}
                   values={draft[section.key] ?? {}}
                   formData={draft}
                   errors={fieldErrors}
+                  vessels={vessels}
                   disabled={readOnly}
                   onChange={(key, value) => {
                     setDraft((prev) => ({
@@ -620,17 +710,19 @@ export function LicenseApplicationPage() {
             onChange={(v) => setNewStaff({ ...newStaff, yearsOfExperience: Number(v) || 0 })}
             min={0}
           />
-          <Button
-            onClick={async () => {
-              if (!newStaff.fullName.trim() || !staffModal) return;
-              await addStaff({ id: appId, roleKey: staffModal, ...newStaff });
-              setNewStaff({ fullName: '', position: '', yearsOfExperience: 0 });
-              setStaffModal(null);
-              refetch();
-            }}
-          >
-            Add
-          </Button>
+          <ModalFooter>
+            <Button
+              onClick={async () => {
+                if (!newStaff.fullName.trim() || !staffModal) return;
+                await addStaff({ id: appId, roleKey: staffModal, ...newStaff });
+                setNewStaff({ fullName: '', position: '', yearsOfExperience: 0 });
+                setStaffModal(null);
+                refetch();
+              }}
+            >
+              Add
+            </Button>
+          </ModalFooter>
         </Stack>
       </Modal>
     </Container>
diff --git a/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.module.css b/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.module.css
new file mode 100644
index 000000000..91b438297
--- /dev/null
+++ b/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.module.css
@@ -0,0 +1,55 @@
+/* Segmented "pill" tab bar — matches ProfilePage's tab styling. */
+.list {
+  display: inline-flex;
+  gap: 6px;
+  padding: 5px;
+  background: var(--mantine-color-gray-light);
+  border-radius: var(--mantine-radius-md);
+  border: none;
+  flex-wrap: wrap;
+}
+
+.tab {
+  border: none;
+  border-radius: 10px;
+  padding: 9px 18px;
+  font-weight: 500;
+  color: var(--mantine-color-dimmed);
+  background: transparent;
+  transition:
+    background-color 120ms ease,
+    color 120ms ease,
+    box-shadow 120ms ease;
+}
+
+.tab:hover {
+  background: transparent;
+  color: var(--mantine-color-text);
+}
+
+.tab[data-active],
+.tab[data-active]:hover {
+  background: var(--mantine-color-body);
+  color: var(--mantine-color-emaPrimary-7);
+  font-weight: 600;
+  box-shadow: var(--mantine-shadow-xs);
+}
+
+/* Clickable stat tile that doubles as a filter toggle. */
+.tile {
+  cursor: pointer;
+  border: 1px solid var(--mantine-color-default-border);
+  transition:
+    border-color 120ms ease,
+    background-color 120ms ease;
+}
+
+.tile:hover {
+  border-color: var(--mantine-color-gray-5);
+}
+
+.tileActive,
+.tileActive:hover {
+  border-color: var(--mantine-color-emaPrimary-6);
+  background: var(--mantine-color-emaPrimary-light);
+}
diff --git a/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.tsx b/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.tsx
index c90f8bc9c..fe69a7168 100644
--- a/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.tsx
+++ b/apps/portal/src/app/features/licensing/pages/MyApplicationsPage.tsx
@@ -1,25 +1,49 @@
+import { useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
 import {
+  Alert,
   Badge,
+  Box,
   Button,
   Card,
-  Center,
   Container,
   Group,
-  Loader,
+  Paper,
+  Progress,
+  Select,
   SimpleGrid,
+  Skeleton,
   Stack,
-  Table,
+  Tabs,
   Text,
+  TextInput,
+  ThemeIcon,
   Title,
 } from '@mantine/core';
-import { IconDownload } from '@tabler/icons-react';
+import {
+  IconAlertTriangle,
+  IconCertificate,
+  IconClipboardList,
+  IconClockHour4,
+  IconDownload,
+  IconFileText,
+  IconPlus,
+  IconSearch,
+  IconX,
+} from '@tabler/icons-react';
+import { AdvancedTable, AmharicDatePicker, EmptyState, useServerTable, type AdvancedColumn } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import { LicenseCatalogue } from '../components/LicenseCatalogue';
+import { LicenseCard, useRenewLicense } from '../components/LicenseCard';
 import { useApplicationPayment } from '../../payments/hooks/useApplicationPayment';
 import { notifications } from '@mantine/notifications';
 import {
+  APPLICANT_ACTION_STATUSES,
   STATUS_COLORS,
-  STATUS_LABELS,
+  STATUS_PROGRESS,
+  TERMINAL_STATUSES,
+  applicantOrCompanyName,
   extractErrorMessage,
   localized,
   useBypassPaymentMutation,
@@ -27,24 +51,64 @@ import {
   useGetMyApplicationsQuery,
   useGetMyLicensesQuery,
   useGetPaymentCapabilitiesQuery,
+  type LicenseApplication,
+  type LicenseStatus,
 } from '@ema-platform/api';
+import classes from './MyApplicationsPage.module.css';
+
+/** Days before expiry at which a licence is worth flagging. */
+const EXPIRY_WARNING_DAYS = 60;
+
+function daysUntil(date: string): number {
+  const ms = new Date(date).getTime() - Date.now();
+  return Math.ceil(ms / 86_400_000);
+}
+
+type Bucket = 'needsYou' | 'inProgress' | 'completed' | null;
+
+function bucketOf(status: LicenseStatus): Exclude<Bucket, null> {
+  if (APPLICANT_ACTION_STATUSES.includes(status)) return 'needsYou';
+  if (TERMINAL_STATUSES.includes(status)) return 'completed';
+  return 'inProgress';
+}
+
+type Tab = 'applications' | 'licences' | 'apply';
+const TABS: Tab[] = ['applications', 'licences', 'apply'];
+
+function tabFromHash(hash: string): Tab {
+  const value = hash.replace('#', '');
+  return (TABS as string[]).includes(value) ? (value as Tab) : 'applications';
+}
 
 /**
  * The applicant's landing page: which licences they can apply for, and the
  * state of anything already filed.
  *
- * The licence types come from the backend, so a newly configured type appears
- * here without a code change — and each one carries its own document
- * requirements into the wizard.
+ * Three tabs instead of one long scroll — applications, licences and the
+ * catalogue each own their own space, so a returning applicant lands on
+ * exactly what they came back to check instead of scrolling past it.
  */
 export function MyApplicationsPage() {
   const navigate = useNavigate();
-  const { data, isLoading } = useGetMyApplicationsQuery();
+  const { t, i18n } = useTranslation();
+  const showDate = useDateDisplayer();
+  const { data, isFetching, refetch } = useGetMyApplicationsQuery();
   const { pay, isPaying } = useApplicationPayment();
   const { data: capabilities } = useGetPaymentCapabilitiesQuery();
-  const { data: licences } = useGetMyLicensesQuery();
+  const { data: licences, isFetching: isFetchingLicences } = useGetMyLicensesQuery();
   const [bypassPayment, { isLoading: bypassing }] = useBypassPaymentMutation();
   const [getCertificateUrl] = useGetCertificateUrlMutation();
+  const { renewLicense, isRenewing } = useRenewLicense();
+  const [isDownloadingCert, setIsDownloadingCert] = useState(false);
+
+  const [tab, setTab] = useState<Tab>(() =>
+    typeof window !== 'undefined' ? tabFromHash(window.location.hash) : 'applications',
+  );
+
+  function changeTab(next: Tab) {
+    setTab(next);
+    window.history.replaceState(null, '', `#${next}`);
+  }
 
   async function handleBypass(applicationId: string) {
     try {
@@ -53,7 +117,7 @@ export function MyApplicationsPage() {
         color: 'teal',
         title: 'Payment bypassed',
         message: result.certificateIssued
-          ? 'The licence has been issued — see My licences above.'
+          ? 'The licence has been issued — see the Licences tab.'
           : `Application is now ${result.status.replace(/_/g, ' ').toLowerCase()}.`,
       });
     } catch (err) {
@@ -73,15 +137,13 @@ export function MyApplicationsPage() {
    * find it in a separate table.
    */
   async function openCertificateForApplication(applicationId: string) {
-    const licence = (licences?.items ?? []).find(
-      (l) => l.applicationId === applicationId,
-    );
+    const licence = (licences?.items ?? []).find((l) => l.applicationId === applicationId);
     if (!licence) {
       notifications.show({
         color: 'yellow',
         title: 'Certificate not ready',
         message:
-          'The licence for this application has not been issued yet. It will appear under My licences.',
+          'The licence for this application has not been issued yet. It will appear under Licences.',
       });
       return;
     }
@@ -89,6 +151,7 @@ export function MyApplicationsPage() {
   }
 
   async function downloadCertificate(licenseId: string) {
+    setIsDownloadingCert(true);
     try {
       const { url } = await getCertificateUrl(licenseId).unwrap();
       window.open(url, '_blank', 'noopener');
@@ -98,225 +161,446 @@ export function MyApplicationsPage() {
         title: 'Could not open the certificate',
         message: extractErrorMessage(err),
       });
+    } finally {
+      setIsDownloadingCert(false);
     }
   }
 
-  if (isLoading) {
-    return (
-      <Center h={300}>
-        <Loader />
-      </Center>
-    );
+  const allItems = data?.items ?? [];
+  const licenceItems = licences?.items ?? [];
+  const activeLicences = licenceItems.filter((l) => l.status === 'ACTIVE');
+  const expiringSoon = activeLicences.filter((l) => {
+    const days = l.daysUntilExpiry ?? daysUntil(l.expiryDate);
+    return days >= 0 && days <= EXPIRY_WARNING_DAYS;
+  });
+
+  const [search, setSearch] = useState('');
+  const [statusFilter, setStatusFilter] = useState<LicenseStatus | null>(null);
+  const [dateFrom, setDateFrom] = useState('');
+  const [dateTo, setDateTo] = useState('');
+  const [bucketFilter, setBucketFilter] = useState<Bucket>(null);
+  const hasFilters = Boolean(search || statusFilter || dateFrom || dateTo || bucketFilter);
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable({ pageSize: 10 });
+
+  const counts = useMemo(() => {
+    const result = { needsYou: 0, inProgress: 0, completed: 0 };
+    for (const app of allItems) result[bucketOf(app.status)]++;
+    return result;
+  }, [allItems]);
+
+  const items = useMemo(() => {
+    const q = search.trim().toLowerCase();
+    const filtered = allItems.filter((app) => {
+      if (bucketFilter && bucketOf(app.status) !== bucketFilter) return false;
+      if (q) {
+        const haystack = `${app.applicationNumber} ${applicantOrCompanyName(app) ?? ''}`.toLowerCase();
+        if (!haystack.includes(q)) return false;
+      }
+      if (statusFilter && app.status !== statusFilter) return false;
+      // Drafts have no submittedAt, so date filtering falls back to createdAt
+      // rather than silently excluding every draft from a date-ranged search.
+      const at = app.submittedAt ?? app.createdAt;
+      if (dateFrom && (!at || at < dateFrom)) return false;
+      if (dateTo && (!at || at > `${dateTo}T23:59:59.999Z`)) return false;
+      return true;
+    });
+    // Whatever needs the applicant's attention floats to the top; within a
+    // group, the most recently touched application comes first.
+    return [...filtered].sort((a, b) => {
+      const aNeeds = APPLICANT_ACTION_STATUSES.includes(a.status) ? 0 : 1;
+      const bNeeds = APPLICANT_ACTION_STATUSES.includes(b.status) ? 0 : 1;
+      if (aNeeds !== bNeeds) return aNeeds - bNeeds;
+      const aAt = a.submittedAt ?? a.createdAt;
+      const bAt = b.submittedAt ?? b.createdAt;
+      return aAt < bAt ? 1 : aAt > bAt ? -1 : 0;
+    });
+  }, [allItems, search, statusFilter, dateFrom, dateTo, bucketFilter]);
+
+  const page = paginate(items);
+
+  function clearFilters() {
+    setSearch('');
+    setStatusFilter(null);
+    setDateFrom('');
+    setDateTo('');
+    setBucketFilter(null);
+    setPageIndex(0);
   }
 
-  const items = data?.items ?? [];
+  function toggleBucket(bucket: Exclude<Bucket, null>) {
+    setBucketFilter((current) => (current === bucket ? null : bucket));
+    setPageIndex(0);
+    setTab('applications');
+  }
+
+  const statusLabel = (status: LicenseStatus) =>
+    t(`applications.status.${status}`, { defaultValue: status });
+
+  const allStatuses = Object.keys(STATUS_COLORS) as LicenseStatus[];
+
+  const applicationColumns: AdvancedColumn<LicenseApplication>[] = [
+    {
+      header: t('applications.table.licence'),
+      cell: ({ row }) => (
+        <Box>
+          <Text size="sm" fw={600}>
+            {localized(row.original.licenseType?.name, i18n.language) || '—'}
+          </Text>
+          <Text size="xs" c="dimmed">
+            {row.original.applicationNumber}
+          </Text>
+        </Box>
+      ),
+    },
+    {
+      header: t('applications.table.applicant'),
+      cell: ({ row }) => <Text size="sm">{applicantOrCompanyName(row.original) ?? '—'}</Text>,
+    },
+    {
+      header: t('common.status'),
+      cell: ({ row }) => (
+        <Badge color={STATUS_COLORS[row.original.status]} variant="light">
+          {statusLabel(row.original.status)}
+        </Badge>
+      ),
+    },
+    {
+      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"
+        />
+      ),
+    },
+    {
+      header: t('common.date'),
+      cell: ({ row }) => (
+        <Text size="sm" c="dimmed">
+          {row.original.submittedAt
+            ? showDate(row.original.submittedAt)
+            : t('applications.card.notFiled')}
+        </Text>
+      ),
+    },
+    {
+      header: '',
+      label: t('common.actions'),
+      align: 'right',
+      cell: ({ row }) => {
+        const app = row.original;
+        return (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            {capabilities?.bypassEnabled && app.status === 'PAYMENT_PENDING' && (
+              <Button
+                size="xs"
+                variant="default"
+                loading={bypassing}
+                onClick={() => handleBypass(app.id)}
+                title="Testing only — marks the fee paid and issues the licence"
+              >
+                {t('applications.actions.bypass')}
+              </Button>
+            )}
+            {/* An issued application's primary action is the certificate. It
+                used to be "View", which opened the application wizard — so
+                the one thing the applicant came back for was the one thing
+                the button did not do. */}
+            {app.status === 'CERTIFICATE_ISSUED' && (
+              <Button
+                size="xs"
+                leftSection={<IconDownload size={14} />}
+                onClick={() => openCertificateForApplication(app.id)}
+              >
+                {t('applications.actions.certificate')}
+              </Button>
+            )}
+            <Button
+              size="xs"
+              loading={isPaying && app.status === 'PAYMENT_PENDING'}
+              variant={
+                app.status === 'RESUBMIT_REQUIRED' || app.status === 'PAYMENT_PENDING' ? 'filled' : 'subtle'
+              }
+              color={
+                app.status === 'RESUBMIT_REQUIRED'
+                  ? 'orange'
+                  : app.status === 'PAYMENT_PENDING'
+                    ? 'yellow'
+                    : undefined
+              }
+              onClick={() =>
+                // Paying leaves the SPA for Telebirr, so this is a provider
+                // hand-off rather than a route change.
+                app.status === 'PAYMENT_PENDING'
+                  ? pay(app.id)
+                  : navigate(`/licensing/${app.licenseType?.key ?? 'FREIGHT_FORWARDER'}/applications/${app.id}`)
+              }
+            >
+              {app.status === 'DRAFT'
+                ? t('applications.actions.continue')
+                : app.status === 'RESUBMIT_REQUIRED'
+                  ? t('applications.actions.fixResubmit')
+                  : app.status === 'PAYMENT_PENDING'
+                    ? t('applications.actions.pay', {
+                        amount: Number(app.feeAmount ?? 0).toLocaleString(),
+                        currency: app.feeCurrency,
+                      })
+                    : app.status === 'CERTIFICATE_ISSUED'
+                      ? t('applications.actions.certificate')
+                      : t('applications.actions.view')}
+            </Button>
+          </Group>
+        );
+      },
+    },
+  ];
 
   return (
-    <Container size="lg" py="md">
-      <Title order={3} mb="xs">
-        Licence applications
-      </Title>
-      <Text size="sm" c="dimmed" mb="md">
-        Your licences and applications, and the catalogue to file a new one.
-      </Text>
-
-      {(licences?.items ?? []).length > 0 && (
-        <>
-          <Title order={4} mb="sm">
-            My licences
-          </Title>
-          <Card withBorder padding={0} mb="xl">
-            <Table highlightOnHover>
-              <Table.Thead>
-                <Table.Tr>
-                  <Table.Th>Certificate</Table.Th>
-                  <Table.Th>Licence</Table.Th>
-                  <Table.Th>Valid until</Table.Th>
-                  <Table.Th>Status</Table.Th>
-                  <Table.Th />
-                </Table.Tr>
-              </Table.Thead>
-              <Table.Tbody>
-                {(licences?.items ?? []).map((licence) => (
-                  <Table.Tr key={licence.id}>
-                    <Table.Td>
-                      <Text size="sm" fw={500} ff="monospace">
-                        {licence.certificateNumber}
-                      </Text>
-                    </Table.Td>
-                    <Table.Td>
-                      <Text size="sm">
-                        {localized(licence.licenseType?.name) || '—'}
-                      </Text>
-                    </Table.Td>
-                    <Table.Td>
-                      <Text size="sm" c="dimmed">
-                        {new Date(licence.expiryDate).toLocaleDateString()}
-                      </Text>
-                    </Table.Td>
-                    <Table.Td>
-                      <Badge
-                        variant="light"
-                        color={licence.status === 'ACTIVE' ? 'green' : 'gray'}
-                      >
-                        {licence.status}
-                      </Badge>
-                    </Table.Td>
-                    <Table.Td align="right">
-                      <Button
-                        size="xs"
-                        variant="light"
-                        leftSection={<IconDownload size={14} />}
-                        onClick={() => downloadCertificate(licence.id)}
-                      >
-                        Certificate
-                      </Button>
-                    </Table.Td>
-                  </Table.Tr>
-                ))}
-              </Table.Tbody>
-            </Table>
-          </Card>
-        </>
-      )}
-
-      <Title order={4} mb="sm">
-        My applications
-      </Title>
-
-      {items.some((a) => a.status === 'PAYMENT_CONFIRMED' || a.status === 'PAID') && (
-        <Card withBorder padding="sm" radius="md" mb="sm"
-          style={{ borderLeft: '3px solid var(--mantine-color-teal-5)' }}>
-          <Text size="sm">
-            Your payment has been received. The certificate is being prepared
-            and will appear under My licences above once it is issued.
-          </Text>
-        </Card>
-      )}
-
-      {items.length === 0 ? (
-        <Card withBorder padding="xl">
-          <Stack align="center" gap="xs">
-            <Text c="dimmed">You have not filed any applications yet.</Text>
-            <Text size="sm" c="dimmed">
-              Pick a licence below to get started.
+    <Container size="lg" py="lg">
+      <Stack gap="lg">
+        <Group justify="space-between" align="flex-end" wrap="wrap">
+          <Box>
+            <Title order={2}>{t('applications.title')}</Title>
+            <Text c="dimmed" size="sm" mt={2}>
+              {t('applications.subtitle')}
             </Text>
-          </Stack>
-        </Card>
-      ) : (
-        <Card withBorder padding={0}>
-          <Table highlightOnHover>
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>Number</Table.Th>
-                <Table.Th>Company</Table.Th>
-                <Table.Th>Status</Table.Th>
-                <Table.Th>Submitted</Table.Th>
-                <Table.Th />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>
-              {items.map((app) => (
-                <Table.Tr key={app.id}>
-                  <Table.Td>
-                    <Text size="sm" fw={500}>
-                      {app.applicationNumber}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm">{app.companyName ?? '—'}</Text>
-                  </Table.Td>
-                  <Table.Td>
-                    <Badge color={STATUS_COLORS[app.status]} variant="light">
-                      {STATUS_LABELS[app.status]}
-                    </Badge>
-                  </Table.Td>
-                  <Table.Td>
-                    <Text size="sm" c="dimmed">
-                      {app.submittedAt
-                        ? new Date(app.submittedAt).toLocaleDateString()
-                        : '—'}
-                    </Text>
-                  </Table.Td>
-                  <Table.Td align="right">
-                    <Group gap="xs" justify="flex-end" wrap="nowrap">
-                    {capabilities?.bypassEnabled && app.status === 'PAYMENT_PENDING' && (
-                      <Button
-                        size="xs"
-                        variant="default"
-                        loading={bypassing}
-                        onClick={() => handleBypass(app.id)}
-                        title="Testing only — marks the fee paid and issues the licence"
-                      >
-                        Bypass payment
-                      </Button>
-                    )}
-                    {/* An issued application's primary action is the
-                        certificate. It used to be "View", which opened the
-                        application wizard — so the one thing the applicant
-                        came back for was the one thing the button did not do. */}
-                    {app.status === 'CERTIFICATE_ISSUED' && (
-                      <Button
-                        size="xs"
-                        leftSection={<IconDownload size={14} />}
-                        onClick={() => openCertificateForApplication(app.id)}
-                      >
-                        Certificate
-                      </Button>
-                    )}
-                    <Button
-                      size="xs"
-                      loading={isPaying && app.status === 'PAYMENT_PENDING'}
-                      variant={
-                        app.status === 'RESUBMIT_REQUIRED' ||
-                        app.status === 'PAYMENT_PENDING'
-                          ? 'filled'
-                          : 'subtle'
-                      }
-                      color={
-                        app.status === 'RESUBMIT_REQUIRED'
-                          ? 'orange'
-                          : app.status === 'PAYMENT_PENDING'
-                            ? 'yellow'
-                            : undefined
-                      }
-                      onClick={() =>
-                        // Paying leaves the SPA for Telebirr, so this is a
-                        // provider hand-off rather than a route change.
-                        app.status === 'PAYMENT_PENDING'
-                          ? pay(app.id)
-                          : navigate(
-                              `/licensing/${app.licenseType?.key ?? 'FREIGHT_FORWARDER'}/applications/${app.id}`,
-                            )
-                      }
-                    >
-                      {app.status === 'DRAFT'
-                        ? 'Continue'
-                        : app.status === 'RESUBMIT_REQUIRED'
-                          ? 'Fix & resubmit'
-                          : app.status === 'PAYMENT_PENDING'
-                            ? `Pay ${Number(app.feeAmount ?? 0).toLocaleString()} ${app.feeCurrency}`
-                            : app.status === 'CERTIFICATE_ISSUED'
-                              ? 'Application'
-                              : 'View'}
-                    </Button>
-                    </Group>
-                  </Table.Td>
-                </Table.Tr>
-              ))}
-            </Table.Tbody>
-          </Table>
-        </Card>
-      )}
+          </Box>
+          <Button leftSection={<IconPlus size={16} />} onClick={() => changeTab('apply')}>
+            {t('applications.newApplication')}
+          </Button>
+        </Group>
 
-      {/* Last, for the same reason as on the dashboard: someone opening this
-          page came to check on what they already filed, not to browse. */}
-      <Title order={4} mt="xl" mb="sm">
-        Apply for a licence
-      </Title>
-      <LicenseCatalogue />
+        <SimpleGrid cols={{ base: 2, md: 4 }} spacing="md">
+          <StatTile
+            label={t('applications.stats.needsYou')}
+            value={counts.needsYou}
+            icon={IconAlertTriangle}
+            color="orange"
+            active={bucketFilter === 'needsYou'}
+            onClick={() => toggleBucket('needsYou')}
+          />
+          <StatTile
+            label={t('applications.stats.inProgress')}
+            value={counts.inProgress}
+            icon={IconClockHour4}
+            color="blue"
+            active={bucketFilter === 'inProgress'}
+            onClick={() => toggleBucket('inProgress')}
+          />
+          <StatTile
+            label={t('applications.stats.completed')}
+            value={counts.completed}
+            icon={IconClipboardList}
+            color="teal"
+            active={bucketFilter === 'completed'}
+            onClick={() => toggleBucket('completed')}
+          />
+          <StatTile
+            label={t('applications.stats.activeLicences')}
+            value={activeLicences.length}
+            icon={IconCertificate}
+            color="grape"
+            active={tab === 'licences'}
+            onClick={() => changeTab('licences')}
+          />
+        </SimpleGrid>
+
+        <Tabs
+          value={tab}
+          onChange={(v) => changeTab((v as Tab) ?? 'applications')}
+          variant="pills"
+          classNames={{ list: classes.list, tab: classes.tab }}
+        >
+          <Tabs.List>
+            <Tabs.Tab value="applications">{t('applications.tabs.applications')}</Tabs.Tab>
+            <Tabs.Tab value="licences">{t('applications.tabs.licences')}</Tabs.Tab>
+            <Tabs.Tab value="apply">{t('applications.tabs.apply')}</Tabs.Tab>
+          </Tabs.List>
+        </Tabs>
+
+        {tab === 'applications' && (
+          <Stack gap="md">
+            {items.some((a) => a.status === 'PAYMENT_CONFIRMED' || a.status === 'PAID') && (
+              <Alert variant="light" color="teal" radius="md">
+                {t('applications.notice.paymentReceived')}
+              </Alert>
+            )}
+
+            {allItems.length > 0 && (
+              <Paper withBorder p="sm">
+                <Group gap="sm" align="flex-end" wrap="wrap">
+                  <TextInput
+                    label={t('applications.filters.search')}
+                    placeholder={t('applications.filters.searchPlaceholder')}
+                    leftSection={<IconSearch size={14} />}
+                    value={search}
+                    onChange={(e) => {
+                      setSearch(e.currentTarget.value);
+                      setPageIndex(0);
+                    }}
+                    w={220}
+                  />
+                  <Select
+                    label={t('applications.filters.status')}
+                    placeholder={t('applications.filters.any')}
+                    data={allStatuses.map((s) => ({ value: s, label: statusLabel(s) }))}
+                    value={statusFilter}
+                    onChange={(v) => {
+                      setStatusFilter(v as LicenseStatus | null);
+                      setPageIndex(0);
+                    }}
+                    clearable
+                    w={200}
+                  />
+                  <AmharicDatePicker
+                    label={t('applications.filters.from')}
+                    value={dateFrom}
+                    onChange={(v) => {
+                      setDateFrom(v);
+                      setPageIndex(0);
+                    }}
+                    dateFormat="date"
+                    w={160}
+                  />
+                  <AmharicDatePicker
+                    label={t('applications.filters.to')}
+                    value={dateTo}
+                    onChange={(v) => {
+                      setDateTo(v);
+                      setPageIndex(0);
+                    }}
+                    dateFormat="date"
+                    w={160}
+                  />
+                  {hasFilters && (
+                    <Button variant="subtle" leftSection={<IconX size={14} />} onClick={clearFilters}>
+                      {t('applications.filters.clear')}
+                    </Button>
+                  )}
+                </Group>
+              </Paper>
+            )}
+
+            {!isFetching && items.length === 0 ? (
+              <EmptyState
+                icon={IconFileText}
+                title={hasFilters ? t('applications.empty.noMatchTitle') : t('applications.empty.noneTitle')}
+                description={hasFilters ? t('applications.empty.noMatchBody') : t('applications.empty.noneBody')}
+                action={
+                  hasFilters
+                    ? { label: t('applications.empty.clearFilters'), onClick: clearFilters }
+                    : { label: t('applications.empty.browse'), onClick: () => changeTab('apply') }
+                }
+              />
+            ) : (
+              <AdvancedTable
+                columns={applicationColumns}
+                data={page.rows}
+                tableName={t('applications.tabs.applications')}
+                itemCount={page.itemCount}
+                pageIndex={page.pageIndex}
+                onPageChange={setPageIndex}
+                pageSize={pageSize}
+                onPageSizeChange={setPageSize}
+                refresh={refetch}
+                isLoading={isFetching}
+              />
+            )}
+          </Stack>
+        )}
+
+        {tab === 'licences' && (
+          <Stack gap="md">
+            {expiringSoon.length > 0 && (
+              <Alert
+                variant="light"
+                color="orange"
+                radius="md"
+                icon={<IconClockHour4 size={18} />}
+                title={t('applications.notice.expiringSoon', { count: expiringSoon.length })}
+              >
+                <Text size="sm">
+                  {expiringSoon
+                    .map((l) => `${l.certificateNumber} — ${l.daysUntilExpiry ?? daysUntil(l.expiryDate)}d`)
+                    .join(' · ')}
+                </Text>
+              </Alert>
+            )}
+            {isFetchingLicences ? (
+              <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="md">
+                <Skeleton height={160} radius="md" />
+                <Skeleton height={160} radius="md" />
+                <Skeleton height={160} radius="md" />
+              </SimpleGrid>
+            ) : licenceItems.length === 0 ? (
+              <EmptyState icon={IconCertificate} title={t('applications.licences.empty')} />
+            ) : (
+              <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="md">
+                {licenceItems.map((license) => (
+                  <LicenseCard
+                    key={license.id}
+                    license={license}
+                    isDownloading={isDownloadingCert}
+                    isRenewing={isRenewing}
+                    onDownload={() => downloadCertificate(license.id)}
+                    onRenew={() => renewLicense(license)}
+                  />
+                ))}
+              </SimpleGrid>
+            )}
+          </Stack>
+        )}
+
+        {tab === 'apply' && <LicenseCatalogue />}
+      </Stack>
     </Container>
   );
 }
 
+// --------------------------------------------------------------- components
+
+function StatTile({
+  label,
+  value,
+  icon: Icon,
+  color,
+  active,
+  onClick,
+}: {
+  label: string;
+  value: number;
+  icon: typeof IconAlertTriangle;
+  color: string;
+  active: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <Card
+      withBorder
+      radius="md"
+      padding="md"
+      className={`${classes.tile} ${active ? classes.tileActive : ''}`}
+      onClick={onClick}
+    >
+      <Group justify="space-between" align="flex-start" wrap="nowrap">
+        <Box>
+          <Text size="xs" c="dimmed" tt="uppercase" fw={600}>
+            {label}
+          </Text>
+          <Text fz={30} fw={700} lh={1.2} mt={4}>
+            {value}
+          </Text>
+        </Box>
+        <ThemeIcon variant="light" color={color} radius="md" size="lg">
+          <Icon size={18} />
+        </ThemeIcon>
+      </Group>
+    </Card>
+  );
+}
+
+
 export default MyApplicationsPage;
diff --git a/apps/portal/src/app/features/location/components/LocationPicker.tsx b/apps/portal/src/app/features/location/components/LocationPicker.tsx
index a68fb839a..5ec9d38d1 100644
--- a/apps/portal/src/app/features/location/components/LocationPicker.tsx
+++ b/apps/portal/src/app/features/location/components/LocationPicker.tsx
@@ -1,5 +1,7 @@
 import { useState, useMemo, useEffect, useCallback } from 'react';
 import { Stack, Select, Group, Text, Loader, Center, Badge } from '@mantine/core';
+import { ErrorState } from '@ema-platform/ui';
+import { useLocalized } from '@ema-platform/api';
 import { useGetLocationTypesQuery, useGetLocationsQuery } from '../api/location-api';
 import type { Location, LocationType } from '../types/location';
 import { useTranslation } from 'react-i18next';
@@ -9,12 +11,15 @@ interface LocationPickerProps {
   onChange?: (locationId: string | null) => void;
   onChainChange?: (chain: Location[]) => void;
   required?: boolean;
+  /** Caps how many cascading levels render (e.g. 3 = City / Sub-city / Woreda only). */
+  maxDepth?: number;
 }
 
-export function LocationPicker({ value, onChange, onChainChange, required }: LocationPickerProps) {
+export function LocationPicker({ value, onChange, onChainChange, required, maxDepth }: LocationPickerProps) {
   const { t } = useTranslation();
-  const { data: typesRes, isLoading: typesLoading } = useGetLocationTypesQuery();
-  const { data: locsRes, isLoading: locsLoading } = useGetLocationsQuery({ take: 10000 });
+  const localized = useLocalized();
+  const { data: typesRes, isLoading: typesLoading, isError: typesError, refetch: refetchTypes } = useGetLocationTypesQuery();
+  const { data: locsRes, isLoading: locsLoading, isError: locsError, refetch: refetchLocs } = useGetLocationsQuery({ take: 10000 });
 
   const locationTypes = typesRes?.items ?? [];
   const allLocations = locsRes?.items ?? [];
@@ -71,10 +76,10 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     if (currentLevelChildren.length === 0) return '';
     const typeIds = [...new Set(currentLevelChildren.map((c) => c.locationTypeId))];
     const names = typeIds
-      .map((id) => typeMap.get(id)?.names.en)
-      .filter(Boolean) as string[];
+      .map((id) => localized(typeMap.get(id)?.names))
+      .filter(Boolean);
     return names.join(' / ');
-  }, [currentLevelChildren, typeMap]);
+  }, [currentLevelChildren, typeMap, localized]);
 
   const depth = selectedChain.length;
 
@@ -113,7 +118,7 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     if (levelIdx === 0) {
       const roots = childrenByParentId.get('__root__') ?? [];
       return roots
-        .map((loc) => ({ value: loc.id, label: loc.names.en }))
+        .map((loc) => ({ value: loc.id, label: localized(loc.names) }))
         .sort((a, b) => a.label.localeCompare(b.label));
     }
 
@@ -121,7 +126,7 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     if (!parent) return [];
     const children = childrenByParentId.get(parent.id) ?? [];
     return children
-      .map((loc) => ({ value: loc.id, label: loc.names.en }))
+      .map((loc) => ({ value: loc.id, label: localized(loc.names) }))
       .sort((a, b) => a.label.localeCompare(b.label));
   };
 
@@ -131,8 +136,8 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
       if (roots.length === 0) return '';
       const typeIds = [...new Set(roots.map((r) => r.locationTypeId))];
       const names = typeIds
-        .map((id) => typeMap.get(id)?.names.en)
-        .filter(Boolean) as string[];
+        .map((id) => localized(typeMap.get(id)?.names))
+        .filter(Boolean);
       return names.join(' / ');
     }
 
@@ -141,16 +146,16 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     const children = childrenByParentId.get(parent.id) ?? [];
     const typeIds = [...new Set(children.map((c) => c.locationTypeId))];
     const names = typeIds
-      .map((id) => typeMap.get(id)?.names.en)
-      .filter(Boolean) as string[];
-    return names.join(' / ') || t('location.subLocation');
+      .map((id) => localized(typeMap.get(id)?.names))
+      .filter(Boolean);
+    return names.join(' / ');
   };
 
   const selectedPath = useMemo(() => {
     return selectedChain
-      .map((loc) => loc.names.en)
+      .map((loc) => localized(loc.names))
       .join(' → ');
-  }, [selectedChain]);
+  }, [selectedChain, localized]);
 
   if (typesLoading || locsLoading) {
     return (
@@ -160,6 +165,18 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     );
   }
 
+  if (typesError || locsError) {
+    return (
+      <ErrorState
+        title={t('location.loadFailed')}
+        onRetry={() => {
+          refetchTypes();
+          refetchLocs();
+        }}
+      />
+    );
+  }
+
   const roots = childrenByParentId.get('__root__') ?? [];
 
   if (roots.length === 0) {
@@ -170,9 +187,13 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
     );
   }
 
-  const totalRenderedLevels = Math.max(
-    1,
-    selectedChain.length + (currentLevelChildren.length > 0 ? 1 : 0),
+  // Only offer a further level when its location type resolves to a known
+  // name — an unnamed/unmapped type (e.g. a stray Kebele row) would otherwise
+  // render as a dead-end "Sub-location" picker whose selection is silently
+  // dropped (AddressFormContent only maps Region/City/SubCity/Woreda).
+  const totalRenderedLevels = Math.min(
+    maxDepth ?? Infinity,
+    Math.max(1, selectedChain.length + (currentLevelChildren.length > 0 && levelLabel ? 1 : 0)),
   );
 
   const levels = Array.from({ length: totalRenderedLevels }, (_, i) => i);
@@ -217,8 +238,8 @@ export function LocationPicker({ value, onChange, onChainChange, required }: Loc
                 color="blue"
                 style={{ textTransform: 'none' }}
               >
-                {typeInfo ? `${typeInfo.names.en}: ` : ''}
-                {loc.names.en}
+                {typeInfo ? `${localized(typeInfo.names)}: ` : ''}
+                {localized(loc.names)}
               </Badge>
             );
           })}
diff --git a/apps/portal/src/app/features/notifications/pages/NotificationsPage.tsx b/apps/portal/src/app/features/notifications/pages/NotificationsPage.tsx
index 175dec7e5..bde8979a3 100644
--- a/apps/portal/src/app/features/notifications/pages/NotificationsPage.tsx
+++ b/apps/portal/src/app/features/notifications/pages/NotificationsPage.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import {
   Badge,
@@ -7,16 +8,27 @@ import {
   Container,
   Group,
   Loader,
+  SegmentedControl,
   Stack,
   Text,
   Title,
 } from '@mantine/core';
 import { IconBellOff, IconCheck } from '@tabler/icons-react';
 import {
-  localized,
+  useLocalized,
   useGetNotificationsQuery,
+  useGetUnseenNotificationsQuery,
   useMarkNotificationReadMutation,
 } from '@ema-platform/api';
+import { useDateDisplayer } from '@ema-platform/shared';
+
+type Tab = 'all' | 'unseen' | 'seen';
+
+const EMPTY_COPY: Record<Tab, string> = {
+  all: 'No notifications yet.',
+  unseen: 'Nothing unread.',
+  seen: 'No read notifications.',
+};
 
 /**
  * The applicant's notification inbox.
@@ -26,19 +38,17 @@ import {
  */
 export function NotificationsPage() {
   const navigate = useNavigate();
-  const { data, isLoading } = useGetNotificationsQuery();
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
+  const [tab, setTab] = useState<Tab>('all');
+  const all = useGetNotificationsQuery(undefined, { skip: tab === 'unseen' });
+  const unseen = useGetUnseenNotificationsQuery(undefined, { skip: tab !== 'unseen' });
   const [markRead] = useMarkNotificationReadMutation();
 
-  if (isLoading) {
-    return (
-      <Center h={300}>
-        <Loader />
-      </Center>
-    );
-  }
-
-  const items = data?.items ?? [];
-  const unread = items.filter((n) => !n.isSeen).length;
+  const { data, isLoading } = tab === 'unseen' ? unseen : all;
+  const items =
+    tab === 'seen' ? (data?.items ?? []).filter((n) => n.isSeen) : (data?.items ?? []);
+  const unread = all.data?.items.filter((n) => !n.isSeen).length ?? 0;
 
   async function open(id: string, seen: boolean, link?: string) {
     if (!seen) await markRead(id);
@@ -52,11 +62,27 @@ export function NotificationsPage() {
         {unread > 0 ? `${unread} unread` : 'You are all caught up'}
       </Text>
 
-      {items.length === 0 ? (
+      <SegmentedControl
+        size="xs"
+        mb="md"
+        value={tab}
+        onChange={(v) => setTab(v as Tab)}
+        data={[
+          { label: 'All', value: 'all' },
+          { label: 'Unseen', value: 'unseen' },
+          { label: 'Seen', value: 'seen' },
+        ]}
+      />
+
+      {isLoading ? (
+        <Center h={300}>
+          <Loader />
+        </Center>
+      ) : items.length === 0 ? (
         <Card withBorder padding="xl">
           <Stack align="center" gap="xs">
             <IconBellOff size={32} stroke={1.4} color="var(--mantine-color-gray-5)" />
-            <Text c="dimmed">No notifications yet.</Text>
+            <Text c="dimmed">{EMPTY_COPY[tab]}</Text>
             <Text size="sm" c="dimmed">
               You will be notified as your applications progress.
             </Text>
@@ -94,7 +120,7 @@ export function NotificationsPage() {
                       {localized(n.content)}
                     </Text>
                     <Text size="xs" c="dimmed" mt={4}>
-                      {new Date(n.createdAt).toLocaleString()}
+                      {showDate(n.createdAt)}
                     </Text>
                   </div>
                   {!n.isSeen && (
diff --git a/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx b/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
index f7b088388..3e0cde509 100644
--- a/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
+++ b/apps/portal/src/app/features/onboarding/components/RequireOperations.tsx
@@ -49,8 +49,11 @@ const ALWAYS_ALLOWED = [
 const MODE_FREE_TYPE_KEYS = [
   'SEAFARER_REGISTRATION',
   'VESSEL_REGISTRATION',
+  'VESSEL_OWNERSHIP_TRANSFER',
   'CERTIFICATE_OF_COMPETENCY',
   'CERTIFICATE_OF_PROFICIENCY',
+  'ENDORSEMENT_COC',
+  'ENDORSEMENT_GOC',
   'PRE_WAIVER',
   'POST_WAIVER',
 ];
diff --git a/apps/portal/src/app/features/payments/pages/PaymentSuccessPage.tsx b/apps/portal/src/app/features/payments/pages/PaymentSuccessPage.tsx
index 340188022..111bc0c73 100644
--- a/apps/portal/src/app/features/payments/pages/PaymentSuccessPage.tsx
+++ b/apps/portal/src/app/features/payments/pages/PaymentSuccessPage.tsx
@@ -12,11 +12,13 @@ import {
 } from '@mantine/core';
 import { IconCircleCheck } from '@tabler/icons-react';
 import { useGetApplicationPaymentQuery } from '@ema-platform/api';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 /** Confirmation that the licence fee has been received. */
 export function PaymentSuccessPage() {
   const [params] = useSearchParams();
   const navigate = useNavigate();
+  const showDate = useDateDisplayer();
   const applicationId = params.get('applicationId') ?? '';
   const { data } = useGetApplicationPaymentQuery(applicationId, {
     skip: !applicationId,
@@ -58,7 +60,7 @@ export function PaymentSuccessPage() {
                 {data.paidAt && (
                   <Group justify="space-between">
                     <Text size="sm" c="dimmed">Paid</Text>
-                    <Text size="sm">{new Date(data.paidAt).toLocaleString()}</Text>
+                    <Text size="sm">{showDate(data.paidAt)}</Text>
                   </Group>
                 )}
               </Stack>
diff --git a/apps/portal/src/app/features/profile/api/address-api.ts b/apps/portal/src/app/features/profile/api/address-api.ts
new file mode 100644
index 000000000..16c26a994
--- /dev/null
+++ b/apps/portal/src/app/features/profile/api/address-api.ts
@@ -0,0 +1,21 @@
+import { baseApi } from '@ema-platform/api';
+import type { AddressPayload } from '../types/address';
+
+const addressApi = baseApi
+  .enhanceEndpoints({ addTagTypes: ['CurrentProfile'] as const })
+  .injectEndpoints({
+    endpoints: (builder) => ({
+      /** The profile-address endpoint creates or updates through POST. */
+      saveMyAddress: builder.mutation<unknown, { profileId: string; body: AddressPayload }>({
+        query: ({ profileId, body }) => ({
+          url: `/addresss/profile/${profileId}`,
+          method: 'POST',
+          body,
+        }),
+        invalidatesTags: (_result, error) => (error ? [] : ['CurrentProfile']),
+      }),
+    }),
+    overrideExisting: false,
+  });
+
+export const { useSaveMyAddressMutation } = addressApi;
diff --git a/apps/portal/src/app/features/profile/components/AddressFormContent.tsx b/apps/portal/src/app/features/profile/components/AddressFormContent.tsx
index ddd198725..9944796af 100644
--- a/apps/portal/src/app/features/profile/components/AddressFormContent.tsx
+++ b/apps/portal/src/app/features/profile/components/AddressFormContent.tsx
@@ -2,41 +2,67 @@ import { useCallback, useMemo } from 'react';
 import { Select, SimpleGrid, Text, TextInput } from '@mantine/core';
 import type { FieldErrors, UseFormRegister, UseFormSetValue, UseFormWatch, UseFormTrigger } from 'react-hook-form';
 import { z } from 'zod';
+import { ethiopianPhone, optionalEthiopianPhone, CountrySelect } from '@ema-platform/ui';
 import { LocationPicker } from '../../location/components/LocationPicker';
 import { useGetLocationTypesQuery } from '../../location/api/location-api';
-import type { Location } from '../../location/types/location';
+import type { Location, LocationType } from '../../location/types/location';
 
 export const addressSchema = z.object({
   idType: z.string().min(1, 'Select ID type'),
-  idNumber: z.string().min(1, 'Enter ID number'),
-  nationality: z.string().min(1, 'Enter nationality'),
-  primaryPhoneNumber: z.string().min(1, 'Enter primary phone number'),
-  secondaryPhoneNumber: z.string().optional(),
-  email: z.string().email('Invalid email').optional().or(z.literal('')),
+  idNumber: z.string().trim().min(1, 'Enter ID number'),
+  // Alpha-2 country code from CountrySelect; converted to a full name at submit.
+  nationality: z.string().min(1, 'Select nationality'),
+  primaryPhoneNumber: ethiopianPhone,
+  secondaryPhoneNumber: optionalEthiopianPhone,
+  email: z.string().trim().email('Invalid email').optional().or(z.literal('')),
   regionId: z.string().optional(),
   cityId: z.string().optional(),
-  subcityId: z.string().optional(),
+  subCityId: z.string().optional(),
   woredaId: z.string().optional(),
   kebeleId: z.string().optional(),
-  streetAddress: z.string().optional(),
-  postalAddress: z.string().optional(),
+  streetAddress: z.string().trim().optional(),
+  postalAddress: z.string().trim().optional(),
   // Emergency contact is collected but never required — leaving it blank must
   // not stop an applicant moving on.
-  emergencyContactName: z.string().optional(),
-  emergencyContactPhone: z.string().optional(),
-  emergencyContactRelation: z.string().optional(),
+  emergencyContactName: z.string().trim().optional(),
+  emergencyContactPhone: optionalEthiopianPhone,
+  emergencyContactRelation: z.string().trim().optional(),
 });
 
 export type AddressValues = z.infer<typeof addressSchema>;
 
-export const ID_TYPES = ['NID', 'VITAL', 'PASSPORT', 'DRIVERS_LICENSE'] as const;
+// Backend rejects anything outside this set:
+// "idType must be one of the following values: NID, VITAL, PASSPORT, DRIVERS_LICENSE"
+export const ID_TYPES = [
+  { value: 'NID', label: 'National Id' },
+  { value: 'VITAL', label: 'Vital ID' },
+  { value: 'PASSPORT', label: 'Passport' },
+  { value: 'DRIVERS_LICENSE', label: "Driver's License" },
+] as const;
 
-const LEVEL_TO_FIELD: Record<number, keyof AddressValues> = {
-  1: 'cityId',
-  2: 'subcityId',
-  3: 'woredaId',
-  4: 'kebeleId',
-};
+/**
+ * Location types are data-driven rows (no fixed depth), so the chain is
+ * mapped to a field by type *code* rather than by numeric level — this
+ * resolves correctly whether or not a COUNTRY type sits above REGION.
+ */
+function fieldsForLocationType(type: LocationType): Array<keyof AddressValues> {
+  // Location types have historically used variants such as SUBCITY,
+  // SUB_CITY, and SUB-CITY. Normalize both the code and display name so a
+  // selected sub-city is never dropped from the address payload.
+  const typeName = `${type.code} ${type.names.en}`
+    .toUpperCase()
+    .replace(/[^A-Z0-9]/g, '');
+
+  if (typeName.includes('SUBCITY')) return ['subCityId'];
+  if (typeName.includes('WOREDA')) return ['woredaId'];
+  if (typeName.includes('REGION')) return ['regionId'];
+  if (typeName.includes('CITY')) {
+    // The profile-completeness API treats the selected City as its region.
+    // Keep its conventional cityId too, as other profile consumers use it.
+    return ['regionId', 'cityId'];
+  }
+  return [];
+}
 
 interface AddressFormContentProps {
   register: UseFormRegister<AddressValues>;
@@ -54,35 +80,33 @@ export function AddressFormContent({
   trigger,
 }: AddressFormContentProps) {
   const { data: typesRes } = useGetLocationTypesQuery();
-  const locationTypes = typesRes?.items ?? [];
+  const locationTypes = typesRes?.items;
 
-  const typeLevelMap = useMemo(() => {
-    const map = new Map<string, number>();
-    locationTypes.forEach((lt) => map.set(lt.id, lt.level));
+  const typeFieldMap = useMemo(() => {
+    const map = new Map<string, Array<keyof AddressValues>>();
+    locationTypes?.forEach((lt) => {
+      const fields = fieldsForLocationType(lt);
+      if (fields.length) map.set(lt.id, fields);
+    });
     return map;
   }, [locationTypes]);
 
-  const leafId = watch('kebeleId') || watch('woredaId') || watch('subcityId') || watch('cityId') || undefined;
+  const leafId = watch('woredaId') || watch('subCityId') || watch('cityId') || watch('regionId') || undefined;
 
   const handleChainChange = useCallback(
     (chain: Location[]) => {
-      if (chain.length > 0 && !typeLevelMap.has(chain[0].locationTypeId)) {
-        return;
-      }
-
+      setValue('regionId', '');
       setValue('cityId', '');
-      setValue('subcityId', '');
+      setValue('subCityId', '');
       setValue('woredaId', '');
-      setValue('kebeleId', '');
 
       chain.forEach((loc) => {
-        const level = typeLevelMap.get(loc.locationTypeId);
-        if (level && LEVEL_TO_FIELD[level]) {
-          setValue(LEVEL_TO_FIELD[level], loc.id);
-        }
+        typeFieldMap.get(loc.locationTypeId)?.forEach((field) => {
+          setValue(field, loc.id);
+        });
       });
     },
-    [setValue, typeLevelMap],
+    [setValue, typeFieldMap],
   );
 
   return (
@@ -92,7 +116,7 @@ export function AddressFormContent({
           label="ID Type"
           placeholder="Select"
           required
-          data={[...ID_TYPES]}
+          data={ID_TYPES}
           error={errors.idType?.message}
           value={watch('idType')}
           onChange={(val) => setValue('idType', val || '', { shouldValidate: true })}
@@ -106,17 +130,19 @@ export function AddressFormContent({
           {...register('idNumber')}
           error={errors.idNumber?.message}
         />
-        <TextInput
+        <CountrySelect
           label="Nationality"
-          placeholder="e.g. Ethiopian"
+          demonym
           required
-          {...register('nationality')}
+          value={watch('nationality') || null}
+          onChange={(val) => setValue('nationality', val || '', { shouldValidate: true })}
           error={errors.nationality?.message}
         />
         <TextInput
           label="Primary Phone"
-          placeholder="+251 9XX XXX XXX"
+          description="From your account, edit it in the Personal tab"
           required
+          readOnly
           {...register('primaryPhoneNumber')}
           error={errors.primaryPhoneNumber?.message}
         />
@@ -129,7 +155,8 @@ export function AddressFormContent({
         <TextInput
           label="Email"
           type="email"
-          placeholder="email@example.com"
+          description="From your account, edit it in the Personal tab"
+          readOnly
           {...register('email')}
           error={errors.email?.message}
         />
@@ -138,10 +165,8 @@ export function AddressFormContent({
       <Text fw={600} fz="sm" tt="uppercase" c="gray.6" mt="lg" mb="sm">
         Address
       </Text>
-      <LocationPicker
-        value={leafId}
-        onChainChange={handleChainChange}
-      />
+      {/* City / Sub-city / Woreda only — no Kebele level, kebeleId mirrors woredaId. */}
+      <LocationPicker value={leafId} onChainChange={handleChainChange} maxDepth={3} />
       <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="md" mt="md">
         <TextInput
           label="Street Address"
@@ -149,6 +174,12 @@ export function AddressFormContent({
           {...register('streetAddress')}
           error={errors.streetAddress?.message}
         />
+        <TextInput
+          label="Postal Address"
+          placeholder="P.O. Box"
+          {...register('postalAddress')}
+          error={errors.postalAddress?.message}
+        />
       </SimpleGrid>
 
       <Text fw={600} fz="sm" tt="uppercase" c="gray.6" mt="lg" mb="sm">
diff --git a/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx b/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
index 956b50793..75699d5fb 100644
--- a/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
+++ b/apps/portal/src/app/features/profile/components/OperationsFormContent.tsx
@@ -14,12 +14,13 @@ import {
 import { IconAlertTriangle, IconBuildingWarehouse } from '@tabler/icons-react';
 import {
   extractErrorMessage,
-  localized,
+  useLocalized,
   useGetLicenseTypesQuery,
   useGetMyOperatorTypesQuery,
   useUpdateMyOperatorTypesMutation,
 } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
+import { notify, ModalFooter } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 /**
  * The applicant's modes of operation — what they do, and therefore which
@@ -40,6 +41,7 @@ export function OperationsFormContent({
   const { data: catalogue, isLoading: loadingTypes } = useGetLicenseTypesQuery();
   const { data: mine, isLoading: loadingMine } = useGetMyOperatorTypesQuery();
   const [save, { isLoading: saving }] = useUpdateMyOperatorTypesMutation();
+  const localized = useLocalized();
 
   const declaredIds = useMemo(
     () => (mine?.items ?? []).map((o) => o.licenseTypeId),
@@ -62,6 +64,7 @@ export function OperationsFormContent({
     [catalogue],
   );
 
+  const showDate = useDateDisplayer();
   const removed = declaredIds.filter((id) => !selected.includes(id));
   const dirty =
     removed.length > 0 || selected.some((id) => !declaredIds.includes(id));
@@ -151,13 +154,7 @@ export function OperationsFormContent({
 
       <Group justify="space-between">
         <Text size="xs" c="dimmed">
-          {lastChanged
-            ? `Last changed ${new Date(lastChanged).toLocaleDateString('en-GB', {
-                day: 'numeric',
-                month: 'short',
-                year: 'numeric',
-              })}`
-            : 'Not set yet'}
+          {lastChanged ? `Last changed ${showDate(lastChanged)}` : 'Not set yet'}
         </Text>
         <Group gap="sm">
           {dirty && (
@@ -204,7 +201,7 @@ export function OperationsFormContent({
             Applications already filed carry on as they are, and licences
             already issued to you stay valid and can still be renewed.
           </Text>
-          <Group justify="flex-end" gap="sm">
+          <ModalFooter gap="sm">
             <Button
               variant="default"
               onClick={() => setConfirmingRemoval(false)}
@@ -214,7 +211,7 @@ export function OperationsFormContent({
             <Button color="orange" loading={saving} onClick={persist}>
               Remove and save
             </Button>
-          </Group>
+          </ModalFooter>
         </Stack>
       </Modal>
     </Stack>
diff --git a/apps/portal/src/app/features/profile/components/ProfileFormContent.tsx b/apps/portal/src/app/features/profile/components/ProfileFormContent.tsx
index 5ed92dd72..41323e747 100644
--- a/apps/portal/src/app/features/profile/components/ProfileFormContent.tsx
+++ b/apps/portal/src/app/features/profile/components/ProfileFormContent.tsx
@@ -1,6 +1,7 @@
 import { Loader, Select, SimpleGrid, TextInput } from '@mantine/core';
 import type { FieldErrors, UseFormRegister, UseFormSetValue, UseFormWatch, UseFormTrigger } from 'react-hook-form';
 import { z } from 'zod';
+import { AmharicDatePicker } from '@ema-platform/ui';
 
 export const profileSchema = z.object({
   professionId: z.string().min(1, 'Select your profession'),
@@ -86,11 +87,13 @@ export function ProfileFormContent({
         onBlur={() => trigger('gender')}
         name="gender"
       />
-      <TextInput
+      <AmharicDatePicker
         label="Date of Birth"
-        type="date"
         required
-        {...register('dob')}
+        value={watch('dob')}
+        onChange={(val) => setValue('dob', val, { shouldValidate: true })}
+        onBlur={() => trigger('dob')}
+        name="dob"
         error={errors.dob?.message}
       />
       <TextInput
diff --git a/apps/portal/src/app/features/profile/components/RequireSeafarerProfile.tsx b/apps/portal/src/app/features/profile/components/RequireSeafarerProfile.tsx
new file mode 100644
index 000000000..350b0b014
--- /dev/null
+++ b/apps/portal/src/app/features/profile/components/RequireSeafarerProfile.tsx
@@ -0,0 +1,105 @@
+import { useEffect } from 'react';
+import { Center, Loader } from '@mantine/core';
+import { Navigate, useLocation, useParams } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+import { notify } from '@ema-platform/ui';
+import {
+  PROFILE_FIELD_SECTION,
+  useCurrentProfile,
+  type ProfileRequirement,
+} from '@ema-platform/auth';
+
+/**
+ * Seafarer registration is filled in from the profile (nationality, ID,
+ * names, contact details) — the server refuses an application missing them,
+ * so they're asked for up front instead of at submit time.
+ *
+ * Only the fields the Personal, Maritime Profile and Address tabs actually
+ * mark required — matches `profileSchema` / `addressSchema`, so the gate is
+ * always satisfiable by finishing those tabs and never blocks on an optional
+ * field (place of birth, region/city/woreda, emergency contact) the forms
+ * don't star.
+ */
+export const SEAFARER_PROFILE_REQUIREMENT: ProfileRequirement = {
+  fields: [
+    'firstName',
+    'middleName',
+    'lastName',
+    'gender',
+    'dob',
+    'maritalStatus',
+    'professionId',
+    'idType',
+    'idNumber',
+    'nationality',
+    'primaryPhoneNumber',
+    'email',
+  ],
+  reason:
+    'Seafarer registration is built from your profile — these details fill it in for you.',
+};
+
+const REGISTRATION_TYPE_KEY = 'SEAFARER_REGISTRATION';
+
+/**
+ * Sends an applicant with an incomplete profile to `/profile` before they can
+ * reach seafarer registration. Wraps `/seafarer-registration` directly and
+ * `/licensing/:typeCode/apply` when `typeCode` is the seafarer type — the
+ * latter is the shared wizard route every licence type renders through, so
+ * without it the gate is a decoration a deep link skips.
+ *
+ * Fires before the wizard starts, not mid-application, so nothing is lost —
+ * unlike the case `ProfileRequirementGate`'s doc comment warns against
+ * (mid-flow redirects on the old, deleted setup wizard).
+ */
+export function RequireSeafarerProfile({ children }: { children: React.ReactNode }) {
+  const { t } = useTranslation();
+  const { typeCode } = useParams();
+  const { pathname } = useLocation();
+  const { isLoading, isFetching, error, gapsFor } = useCurrentProfile();
+
+  // Shared wizard route — only the seafarer type is gated here.
+  const gated = !typeCode || typeCode === REGISTRATION_TYPE_KEY;
+  const gaps = gated ? gapsFor(SEAFARER_PROFILE_REQUIREMENT) : [];
+  const redirecting = gated && !isLoading && !error && !isFetching && gaps.length > 0;
+
+  useEffect(() => {
+    if (!redirecting) return;
+    const fields = gaps.map((field) => t(`profileFields.${field}`, field)).join(', ');
+    notify.info(t('profileGate.seafarerRedirect', { fields }));
+    // Fire once per redirect, not on every render while gaps/gapsFor are
+    // recreated — the toast content is captured at the moment it fires.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [redirecting, pathname]);
+
+  if (!gated) return <>{children}</>;
+
+  if (isLoading) {
+    return (
+      <Center h={200}>
+        <Loader />
+      </Center>
+    );
+  }
+
+  // A failed lookup must not lock anyone out — the server still refuses the
+  // application for a profile it can't fill in from.
+  if (error) return <>{children}</>;
+
+  if (gaps.length === 0) return <>{children}</>;
+
+  // Gaps while a save is still landing are not an answer yet. Saving a
+  // profile tab invalidates this query and the applicant may already be
+  // headed back here in the same tick — deciding on the pre-save cache would
+  // bounce them off the screen they just finished.
+  if (isFetching) {
+    return (
+      <Center h={200}>
+        <Loader />
+      </Center>
+    );
+  }
+
+  const target = PROFILE_FIELD_SECTION[gaps[0]];
+  return <Navigate to={`/profile#${target}`} replace />;
+}
diff --git a/apps/portal/src/app/features/profile/pages/ProfilePage.module.css b/apps/portal/src/app/features/profile/pages/ProfilePage.module.css
index 3c37f92a1..1c24dccd3 100644
--- a/apps/portal/src/app/features/profile/pages/ProfilePage.module.css
+++ b/apps/portal/src/app/features/profile/pages/ProfilePage.module.css
@@ -3,7 +3,7 @@
   display: inline-flex;
   gap: 6px;
   padding: 5px;
-  background: var(--mantine-color-gray-1);
+  background: var(--mantine-color-gray-light);
   border-radius: var(--mantine-radius-md);
   border: none;
   flex-wrap: wrap;
@@ -14,7 +14,7 @@
   border-radius: 10px;
   padding: 9px 18px;
   font-weight: 500;
-  color: var(--mantine-color-gray-7);
+  color: var(--mantine-color-dimmed);
   background: transparent;
   transition:
     background-color 120ms ease,
@@ -24,7 +24,7 @@
 
 .tab:hover {
   background: transparent;
-  color: var(--mantine-color-gray-9);
+  color: var(--mantine-color-text);
 }
 
 .tab[data-active],
@@ -37,7 +37,7 @@
 
 /* Selectable option card (language + appearance). */
 .choice {
-  border: 1px solid var(--mantine-color-gray-3);
+  border: 1px solid var(--mantine-color-default-border);
   border-radius: var(--mantine-radius-md);
   background: var(--mantine-color-body);
   transition:
@@ -46,11 +46,11 @@
 }
 
 .choice:hover {
-  border-color: var(--mantine-color-gray-4);
+  border-color: var(--mantine-color-gray-5);
 }
 
 .choiceActive,
 .choiceActive:hover {
   border-color: var(--mantine-color-emaPrimary-6);
-  background: var(--mantine-color-emaPrimary-0);
+  background: var(--mantine-color-emaPrimary-light);
 }
diff --git a/apps/portal/src/app/features/profile/pages/ProfilePage.tsx b/apps/portal/src/app/features/profile/pages/ProfilePage.tsx
index 5a791ad86..1fd9cdd97 100644
--- a/apps/portal/src/app/features/profile/pages/ProfilePage.tsx
+++ b/apps/portal/src/app/features/profile/pages/ProfilePage.tsx
@@ -47,10 +47,9 @@ import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useTranslation } from 'react-i18next';
-import { notify, PageHeader } from '@ema-platform/ui';
-import { useApiMutation } from '@ema-platform/api';
+import { notify, PageHeader, useErrorHandler, passwordSchema as strongPasswordSchema, PasswordRequirements, getCountryCode } from '@ema-platform/ui';
+import { useApiMutation, useLocalized } from '@ema-platform/api';
 import { setUser, useCurrentProfile } from '@ema-platform/auth';
-import type { CurrentProfile } from '@ema-platform/auth';
 import { SUPPORTED_LANGUAGES, type AppLanguage } from '../../../i18n/config';
 import { useAppDispatch, useAppSelector } from '../../../store/hooks';
 import type { AuthUser } from '@ema-platform/auth';
@@ -64,6 +63,8 @@ import {
   addressSchema,
   type AddressValues,
 } from '../components/AddressFormContent';
+import { useSaveMyAddressMutation } from '../api/address-api';
+import { toAddressPayload } from '../types/address';
 import { OperationsFormContent } from '../components/OperationsFormContent';
 import classes from './ProfilePage.module.css';
 
@@ -85,6 +86,19 @@ function getInitials(name: string, fallback: string) {
   return letters.toUpperCase();
 }
 
+function splitProfileName(fullName: string) {
+  const [firstName = '', middleName = '', ...lastName] = fullName.trim().split(/\s+/);
+  return { firstName, middleName, lastName: lastName.join(' ') };
+}
+
+function formatProfileName({ firstName, middleName, lastName }: Pick<ProfileValues, 'firstName' | 'middleName' | 'lastName'>) {
+  return [firstName, middleName, lastName].filter(Boolean).join(' ');
+}
+
+function normalizeName(name: string) {
+  return name.trim().replace(/\s+/g, ' ');
+}
+
 function passwordScore(pw: string) {
   if (!pw) return 0;
   let score = 0;
@@ -101,22 +115,22 @@ export function ProfilePage() {
   const user = useAppSelector((state) => state.auth.user);
   const storedProfile = useAppSelector((state) => state.auth.currentProfile);
   const { colorScheme, setColorScheme } = useMantineColorScheme();
+  const { handleError } = useErrorHandler();
 
   const [updateTrigger] = useApiMutation<AuthUser>();
-  const [meTrigger] = useApiMutation<AuthUser>();
   const [passwordTrigger] = useApiMutation<unknown>();
-  const [fetchProfessions] = useApiMutation<{ count: number; items: Array<{ id: string; name: { en: string } }> }>();
+  const localized = useLocalized();
+  const [fetchProfessions] = useApiMutation<{ count: number; items: Array<{ id: string; name: { en: string; am?: string } }> }>();
 
   const [isSavingProfile, setIsSavingProfile] = useState(false);
   const [isSavingPassword, setIsSavingPassword] = useState(false);
   const [isSavingMaritime, setIsSavingMaritime] = useState(false);
-  const [isSavingAddress, setIsSavingAddress] = useState(false);
 
   const [twoStepEnabled, setTwoStepEnabled] = useState(false);
   const [emailNotifications, setEmailNotifications] = useState(true);
 
   // ---- Profession list (for Profile tab) ----
-  const [professions, setProfessions] = useState<Array<{ id: string; name: { en: string } }>>([]);
+  const [professions, setProfessions] = useState<Array<{ id: string; name: { en: string; am?: string } }>>([]);
   const [professionsLoading, setProfessionsLoading] = useState(true);
   const professionsFetched = useRef(false);
 
@@ -131,34 +145,28 @@ export function ProfilePage() {
   }, [fetchProfessions]);
 
   const professionOptions = useMemo(
-    () => professions.map((p) => ({ value: p.id, label: p.name.en })),
-    [professions],
+    () => professions.map((p) => ({ value: p.id, label: localized(p.name) })),
+    [professions, localized],
   );
 
-  const professionNameMap = useMemo(() => {
-    const map: Record<string, string> = {};
-    professions.forEach((p) => { map[p.id] = p.name.en; });
-    return map;
-  }, [professions]);
-
   // ---- Profile data ----
   // Resolved through `useCurrentProfile`, which provisions a profile if the
   // user has none. The page used to read an id out of local storage that only
   // the deleted setup wizard ever wrote, so it rendered an empty form forever
   // for anyone who signed up after the wizard was removed.
   const {
+    profileId,
     profile: resolvedProfile,
     isLoading: profileResolving,
     completeness,
     missing,
+    refetch: refetchProfile,
   } = useCurrentProfile();
   const [updateProfile] = useApiMutation<unknown>();
-  const [updateAddress] = useApiMutation<unknown>();
+  const [saveMyAddress, { isLoading: isSavingAddress }] = useSaveMyAddressMutation();
 
   const [loadedProfile, setLoadedProfile] = useState<ProfileValues | null>(null);
   const [loadedAddress, setLoadedAddress] = useState<AddressValues | null>(null);
-  const [profileId, setProfileId] = useState<string | null>(null);
-  const [addressId, setAddressId] = useState<string | null>(null);
   const [dataLoading, setDataLoading] = useState(true);
 
   // Deep links. `useCurrentProfile` reports gaps by section, and the nudge and
@@ -183,68 +191,58 @@ export function ProfilePage() {
     // already holds so the form does not flash empty on a refetch.
     const currentProfile = resolvedProfile ?? storedProfile;
     if (currentProfile) {
-      setProfileId(currentProfile.id);
+      const accountName = user?.name?.en ? splitProfileName(user.name.en) : null;
       setLoadedProfile({
         professionId: currentProfile.professionId || currentProfile.profession?.id || '',
-        firstName: currentProfile.firstName || '',
-        middleName: currentProfile.middleName || '',
-        lastName: currentProfile.lastName || '',
+        firstName: accountName?.firstName || currentProfile.firstName || '',
+        middleName: accountName?.middleName || currentProfile.middleName || '',
+        lastName: accountName?.lastName || currentProfile.lastName || '',
         gender: currentProfile.gender || '',
         dob: currentProfile.dob ? currentProfile.dob.split('T')[0] : '',
         pob: currentProfile.pob || '',
         maritalStatus: currentProfile.maritalStatus || '',
       });
 
-      if (currentProfile.address) {
-        setAddressId(currentProfile.address.id);
-        setLoadedAddress({
-          idType: currentProfile.address.idType || '',
-          idNumber: currentProfile.address.idNumber || '',
-          nationality: currentProfile.address.nationality || '',
-          primaryPhoneNumber: currentProfile.address.primaryPhoneNumber || '',
-          secondaryPhoneNumber: currentProfile.address.secondaryPhoneNumber || '',
-          email: currentProfile.address.email || '',
-          regionId: currentProfile.address.regionId || '',
-          cityId: currentProfile.address.cityId || '',
-          subcityId: currentProfile.address.subCityId || '',
-          woredaId: currentProfile.address.woredaId || '',
-          kebeleId: currentProfile.address.kebeleId || '',
-          streetAddress: currentProfile.address.streetAddress || '',
-          postalAddress: currentProfile.address.postalAddress || '',
-          emergencyContactName: currentProfile.address.emergencyContactName || '',
-          emergencyContactPhone: currentProfile.address.emergencyContactPhone || '',
-          // Previously read `emergencycontactRelation` (lower-case c), so the
-          // saved relationship never appeared when reopening the profile.
-          emergencyContactRelation:
-            currentProfile.address.emergencyContactRelation || '',
-        });
-      }
+      // Primary phone and email are the account's contact details (same
+      // source as the Personal tab), not the address record — always
+      // populated even before an address exists, and locked in the form.
+      setLoadedAddress({
+        idType: currentProfile.address?.idType || '',
+        idNumber: currentProfile.address?.idNumber || '',
+        // Stored as a country name; the select works in alpha-2 codes.
+        nationality: getCountryCode(currentProfile.address?.nationality) || '',
+        primaryPhoneNumber: user?.phoneNumber || '',
+        secondaryPhoneNumber: currentProfile.address?.secondaryPhoneNumber || '',
+        email: user?.email || '',
+        regionId: currentProfile.address?.regionId || '',
+        cityId: currentProfile.address?.cityId || currentProfile.address?.regionId || '',
+        subCityId: currentProfile.address?.subCityId || '',
+        woredaId: currentProfile.address?.woredaId || '',
+        streetAddress: currentProfile.address?.streetAddress || '',
+        postalAddress: currentProfile.address?.postalAddress || '',
+        emergencyContactName: currentProfile.address?.emergencyContactName || '',
+        emergencyContactPhone: currentProfile.address?.emergencyContactPhone || '',
+        // Previously read `emergencycontactRelation` (lower-case c), so the
+        // saved relationship never appeared when reopening the profile.
+        emergencyContactRelation:
+          currentProfile.address?.emergencyContactRelation || '',
+      });
       setDataLoading(false);
     } else if (!profileResolving) {
       // Resolver finished and there is still nothing — render the empty form
       // rather than an indefinite spinner.
       setDataLoading(false);
     }
-  }, [resolvedProfile, storedProfile, profileResolving]);
-
-  // Load the latest user from the server on mount
-  useEffect(() => {
-    let active = true;
-    meTrigger({ url: '/auth/me', method: 'GET' })
-      .unwrap()
-      .then((me) => {
-        if (active) dispatch(setUser(me));
-      })
-      .catch(() => {
-        // Best-effort refresh; the store already holds the user from sign-in.
-      });
-    return () => { active = false; };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [resolvedProfile, storedProfile, profileResolving, user]);
 
   // ---- Personal form (auth user data) ----
   const personalSchema = z.object({
-    nameEn: z.string().min(1, { message: t('profile.validation.nameRequired') }),
+    nameEn: z
+      .string()
+      .refine(
+        (name) => Object.values(splitProfileName(name)).every(Boolean),
+        { message: 'Enter your first, middle, and last name' },
+      ),
     nameAm: z.string().min(1, { message: t('profile.validation.nameRequired') }),
     username: z.string().min(1, { message: t('profile.validation.usernameRequired') }),
     email: z.string().email({ message: t('profile.validation.emailInvalid') }),
@@ -269,25 +267,66 @@ export function ProfilePage() {
   });
 
   const onSavePersonal = async (values: PersonalValues) => {
+    if (!user) return;
+
     setIsSavingProfile(true);
     try {
-      await updateTrigger({
-        url: '/auth/update-profile',
-        method: 'PATCH',
-        body: {
-          email: values.email,
-          username: values.username,
-          phoneNumber: values.phoneNumber,
-          name: { am: values.nameAm, en: values.nameEn },
-        },
-      }).unwrap();
+      const profileName = splitProfileName(values.nameEn);
+      const saves: Promise<unknown>[] = [
+        updateTrigger({
+          url: '/auth/update-profile',
+          method: 'PATCH',
+          body: {
+            email: values.email,
+            username: values.username,
+            phoneNumber: values.phoneNumber,
+            name: { am: values.nameAm, en: values.nameEn },
+          },
+        }).unwrap(),
+      ];
 
-      const me = await meTrigger({ url: '/auth/me', method: 'GET' }).unwrap();
-      dispatch(setUser(me));
+      // The Profile tab stores names separately as first/middle/last.
+      // Save those fields alongside the account's display name so either tab
+      // always describes the same person.
+      if (profileId) {
+        saves.push(
+          updateProfile({
+            url: `/profiles/${profileId}`,
+            method: 'PATCH',
+            body: profileName,
+          }).unwrap(),
+        );
+      }
+      await Promise.all(saves);
 
+      // Update the session from the values that were just accepted. The
+      // endpoint is allowed to return no body (or a response wrapper), so
+      // treating its response as an AuthUser can blank or retain stale UI
+      // state until the next login.
+      const updatedUser: AuthUser = {
+        ...user,
+        email: values.email,
+        username: values.username,
+        phoneNumber: values.phoneNumber,
+        name: { am: values.nameAm, en: values.nameEn },
+      };
+      dispatch(setUser(updatedUser));
+      setLoadedProfile((current) =>
+        current ? { ...current, ...profileName } : current,
+      );
+      resetPersonal({
+        nameEn: updatedUser.name.en,
+        nameAm: updatedUser.name.am,
+        username: updatedUser.username,
+        email: updatedUser.email,
+        phoneNumber: updatedUser.phoneNumber,
+      });
+      // Email/phone feed the profile's completeness check too — without this
+      // `missing` and every requirement gate stay stale until a reload.
+      refetchProfile();
       notify.success(t('profile.profileUpdated'));
-    } catch {
-      notify.error(t('profile.updateFailed'));
+    } catch (e) {
+      handleError(e);
     } finally {
       setIsSavingProfile(false);
     }
@@ -308,6 +347,13 @@ export function ProfilePage() {
 
   const onSaveProfile = async (values: ProfileValues) => {
     if (!profileId) return;
+
+    const fullName = formatProfileName(values);
+    if (user && normalizeName(fullName) !== normalizeName(user.name.en)) {
+      notify.error('Profile name must match the name in the Personal tab.');
+      return;
+    }
+
     setIsSavingMaritime(true);
     try {
       await updateProfile({
@@ -315,10 +361,15 @@ export function ProfilePage() {
         method: 'PUT',
         body: values,
       }).unwrap();
+      setLoadedProfile({ ...values, pob: values.pob ?? '' });
 
+      // This endpoint doesn't invalidate the `CurrentProfile` tag (unlike
+      // the address save below) — without this, `missing` stays stale until
+      // a reload.
+      refetchProfile();
       notify.success('Profile updated');
-    } catch {
-      notify.error('Failed to update profile');
+    } catch (e) {
+      handleError(e);
     } finally {
       setIsSavingMaritime(false);
     }
@@ -338,23 +389,15 @@ export function ProfilePage() {
   });
 
   const onSaveAddress = async (values: AddressValues) => {
-    if (!addressId) return;
-    setIsSavingAddress(true);
+    if (!profileId) return;
     try {
-      await updateAddress({
-        url: `/addresss/${addressId}`,
-        method: 'PUT',
-        body: {
-          ...values,
-          postalAddess: values.postalAddress,
-        },
+      await saveMyAddress({
+        profileId,
+        body: toAddressPayload(values),
       }).unwrap();
-
-      notify.success('Address updated');
-    } catch {
-      notify.error('Failed to update address');
-    } finally {
-      setIsSavingAddress(false);
+      notify.success('Address saved');
+    } catch (e) {
+      handleError(e);
     }
   };
 
@@ -362,8 +405,8 @@ export function ProfilePage() {
   const passwordSchema = z
     .object({
       oldPassword: z.string().min(1, { message: t('profile.validation.passwordMin') }),
-      newPassword: z.string().min(8, { message: t('profile.validation.passwordMin') }),
-      confirmPassword: z.string().min(8, { message: t('profile.validation.passwordMin') }),
+      newPassword: strongPasswordSchema(8),
+      confirmPassword: z.string().min(1, { message: t('profile.validation.passwordMin') }),
     })
     .refine((data) => data.newPassword === data.confirmPassword, {
       message: t('profile.validation.passwordMismatch'),
@@ -397,8 +440,8 @@ export function ProfilePage() {
 
       notify.success(t('profile.passwordChanged'));
       resetPassword();
-    } catch {
-      notify.error(t('profile.passwordFailed'));
+    } catch (e) {
+      handleError(e);
     } finally {
       setIsSavingPassword(false);
     }
@@ -674,10 +717,6 @@ export function ProfilePage() {
           <Paper p="xl" shadow="sm" radius="lg" withBorder>
             {dataLoading ? (
               <Center py="xl"><Loader /></Center>
-            ) : !loadedAddress ? (
-              <Text c="dimmed" ta="center" py="xl">
-                No address found. Complete your profile setup first.
-              </Text>
             ) : (
               <form onSubmit={handleAddressSubmit(onSaveAddress)}>
                 <Stack gap="xl">
@@ -736,12 +775,15 @@ export function ProfilePage() {
                       {...registerPassword('oldPassword')}
                     />
                     <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
-                      <PasswordInput
-                        label={t('profile.fields.newPassword')}
-                        leftSection={<IconLock size={18} />}
-                        error={passwordErrors.newPassword?.message}
-                        {...registerPassword('newPassword')}
-                      />
+                      <div>
+                        <PasswordInput
+                          label={t('profile.fields.newPassword')}
+                          leftSection={<IconLock size={18} />}
+                          error={passwordErrors.newPassword?.message}
+                          {...registerPassword('newPassword')}
+                        />
+                        <PasswordRequirements password={watchPassword('newPassword')} minLength={8} />
+                      </div>
                       <PasswordInput
                         label={t('profile.fields.confirmPassword')}
                         leftSection={<IconLock size={18} />}
@@ -770,7 +812,7 @@ export function ProfilePage() {
                                 backgroundColor:
                                   i <= score
                                     ? `var(--mantine-color-${strengthColors[score]}-6)`
-                                    : 'var(--mantine-color-gray-2)',
+                                    : 'var(--mantine-color-gray-light)',
                               }}
                             />
                           ))}
diff --git a/apps/portal/src/app/features/profile/types/address.ts b/apps/portal/src/app/features/profile/types/address.ts
new file mode 100644
index 000000000..4a65f2d58
--- /dev/null
+++ b/apps/portal/src/app/features/profile/types/address.ts
@@ -0,0 +1,58 @@
+import { getCountryName } from '@ema-platform/ui';
+import type { AddressValues } from '../components/AddressFormContent';
+
+/** Exact request body of `POST /addresss/profile/{profileId}`. */
+export interface AddressPayload {
+  idType: string;
+  idNumber: string;
+  nationality: string;
+  regionId?: string;
+  cityId?: string;
+  subCityId?: string;
+  /** Legacy spelling still accepted by the address upsert endpoint. */
+  subcityId?: string;
+  woredaId?: string;
+  kebeleId?: string;
+  streetAddress?: string;
+  primaryPhoneNumber: string;
+  secondaryPhoneNumber?: string;
+  email?: string;
+  website: null;
+  postalAddress?: string;
+  emergencyContactName?: string;
+  emergencyContactPhone?: string;
+  emergencyContactRelation?: string;
+}
+
+/** Blank optional strings drop out; `kebeleId` always mirrors `woredaId`. */
+export function toAddressPayload(values: AddressValues): AddressPayload {
+  const clean = (v?: string) => (v && v.trim() ? v.trim() : undefined);
+  const regionId = clean(values.regionId);
+  // The location service uses the selected City for the profile's region.
+  // Send that same id as cityId too, because profile completeness requires
+  // both fields even when the location tree has no separate region node.
+  const cityId = clean(values.cityId) ?? regionId;
+  const subCityId = clean(values.subCityId);
+
+  return {
+    idType: values.idType.trim(),
+    idNumber: values.idNumber.trim(),
+    // Form holds the alpha-2 code (CountrySelect); API stores the full name.
+    nationality: getCountryName(values.nationality),
+    regionId,
+    cityId,
+    subCityId,
+    subcityId: subCityId, // legacy spelling, same value
+    woredaId: clean(values.woredaId),
+    kebeleId: clean(values.woredaId), // no separate Kebele field — mirrors woredaId
+    streetAddress: clean(values.streetAddress),
+    primaryPhoneNumber: values.primaryPhoneNumber,
+    secondaryPhoneNumber: clean(values.secondaryPhoneNumber),
+    email: clean(values.email),
+    website: null, // no website field in the form — always sent as null
+    postalAddress: clean(values.postalAddress),
+    emergencyContactName: clean(values.emergencyContactName),
+    emergencyContactPhone: clean(values.emergencyContactPhone),
+    emergencyContactRelation: clean(values.emergencyContactRelation),
+  };
+}
diff --git a/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx b/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
index ee98ca11e..638abe10d 100644
--- a/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
+++ b/apps/portal/src/app/features/seafarer/pages/MySeaRecordsPage.tsx
@@ -4,6 +4,7 @@ import {
   Anchor,
   Badge,
   Button,
+  Card,
   FileButton,
   Group,
   Loader,
@@ -12,7 +13,6 @@ import {
   Paper,
   Select,
   Stack,
-  Table,
   Tabs,
   Text,
   TextInput,
@@ -31,7 +31,8 @@ import {
   IconTrash,
 } from '@tabler/icons-react';
 import { useState } from 'react';
-import { notify } from '@ema-platform/ui';
+import { AdvancedTable, AmharicDatePicker, notify, useServerTable, type AdvancedColumn } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 import {
   extractErrorMessage,
   uploadDocument,
@@ -156,7 +157,8 @@ const EMPTY_SEA_SERVICE = {
 };
 
 function SeaServiceTab() {
-  const { data: records, isLoading } = useGetMySeaServiceRecordsQuery();
+  const showDate = useDateDisplayer();
+  const { data: records, isLoading, refetch } = useGetMySeaServiceRecordsQuery();
   const { data: seaTime } = useGetMySeaTimeQuery();
   const [createRecord, { isLoading: creating }] =
     useCreateSeaServiceRecordMutation();
@@ -237,7 +239,90 @@ function SeaServiceTab() {
     form.dischargeDate &&
     form.engagementDate < form.dischargeDate;
 
-  if (isLoading) return <Loader />;
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable({ pageSize: 10 });
+  const page = paginate(records ?? []);
+
+  const columns: AdvancedColumn<SeaServiceRecord>[] = [
+    {
+      header: 'Vessel',
+      cell: ({ row }) => (
+        <>
+          <Text fw={600} size="sm">
+            {row.original.vesselName}
+          </Text>
+          {row.original.imoNumber && (
+            <Text size="xs" c="dimmed">
+              IMO {row.original.imoNumber}
+            </Text>
+          )}
+        </>
+      ),
+    },
+    { header: 'Rank', accessorKey: 'rank' },
+    {
+      header: 'From',
+      accessorKey: 'engagementDate',
+      cell: ({ row }) => showDate(row.original.engagementDate),
+    },
+    {
+      header: 'To',
+      accessorKey: 'dischargeDate',
+      cell: ({ row }) => showDate(row.original.dischargeDate),
+    },
+    {
+      header: 'Status',
+      cell: ({ row }) => (
+        <Tooltip
+          label={row.original.verificationRemark ?? ''}
+          disabled={!row.original.verificationRemark}
+        >
+          <Badge color={RECORD_STATUS_COLORS[row.original.status]}>
+            {row.original.status}
+          </Badge>
+        </Tooltip>
+      ),
+    },
+    {
+      header: '',
+      label: 'Actions',
+      align: 'right',
+      cell: ({ row }) => {
+        const record = row.original;
+        const locked = record.status !== 'SUBMITTED';
+        return (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            <Tooltip label="Evidence">
+              <ActionIcon
+                variant="subtle"
+                onClick={() => setEvidenceFor(record.id)}
+              >
+                <IconPaperclip size={16} />
+              </ActionIcon>
+            </Tooltip>
+            <Tooltip label={locked ? 'Verified records are frozen' : 'Edit'}>
+              <ActionIcon
+                variant="subtle"
+                disabled={locked}
+                onClick={() => openEdit(record)}
+              >
+                <IconEdit size={16} />
+              </ActionIcon>
+            </Tooltip>
+            <Tooltip label={locked ? 'Verified records are frozen' : 'Delete'}>
+              <ActionIcon
+                variant="subtle"
+                color="red"
+                disabled={locked}
+                onClick={() => remove(record)}
+              >
+                <IconTrash size={16} />
+              </ActionIcon>
+            </Tooltip>
+          </Group>
+        );
+      },
+    },
+  ];
 
   return (
     <Stack>
@@ -264,87 +349,20 @@ function SeaServiceTab() {
           </Text>
         </Paper>
       ) : (
-        <Table.ScrollContainer minWidth={720}>
-          <Table striped highlightOnHover>
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>Vessel</Table.Th>
-                <Table.Th>Rank</Table.Th>
-                <Table.Th>From</Table.Th>
-                <Table.Th>To</Table.Th>
-                <Table.Th>Status</Table.Th>
-                <Table.Th />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>
-              {(records ?? []).map((record) => {
-                const locked = record.status !== 'SUBMITTED';
-                return (
-                  <Table.Tr key={record.id}>
-                    <Table.Td>
-                      <Text fw={600} size="sm">
-                        {record.vesselName}
-                      </Text>
-                      {record.imoNumber && (
-                        <Text size="xs" c="dimmed">
-                          IMO {record.imoNumber}
-                        </Text>
-                      )}
-                    </Table.Td>
-                    <Table.Td>{record.rank}</Table.Td>
-                    <Table.Td>{record.engagementDate}</Table.Td>
-                    <Table.Td>{record.dischargeDate}</Table.Td>
-                    <Table.Td>
-                      <Tooltip
-                        label={record.verificationRemark ?? ''}
-                        disabled={!record.verificationRemark}
-                      >
-                        <Badge color={RECORD_STATUS_COLORS[record.status]}>
-                          {record.status}
-                        </Badge>
-                      </Tooltip>
-                    </Table.Td>
-                    <Table.Td>
-                      <Group gap="xs" justify="flex-end" wrap="nowrap">
-                        <Tooltip label="Evidence">
-                          <ActionIcon
-                            variant="subtle"
-                            onClick={() => setEvidenceFor(record.id)}
-                          >
-                            <IconPaperclip size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                        <Tooltip
-                          label={locked ? 'Verified records are frozen' : 'Edit'}
-                        >
-                          <ActionIcon
-                            variant="subtle"
-                            disabled={locked}
-                            onClick={() => openEdit(record)}
-                          >
-                            <IconEdit size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                        <Tooltip
-                          label={locked ? 'Verified records are frozen' : 'Delete'}
-                        >
-                          <ActionIcon
-                            variant="subtle"
-                            color="red"
-                            disabled={locked}
-                            onClick={() => remove(record)}
-                          >
-                            <IconTrash size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                      </Group>
-                    </Table.Td>
-                  </Table.Tr>
-                );
-              })}
-            </Table.Tbody>
-          </Table>
-        </Table.ScrollContainer>
+        <Card withBorder padding={0}>
+          <AdvancedTable
+            columns={columns}
+            data={page.rows}
+            tableName="Sea service"
+            itemCount={page.itemCount}
+            pageIndex={page.pageIndex}
+            onPageChange={setPageIndex}
+            pageSize={pageSize}
+            onPageSizeChange={setPageSize}
+            isLoading={isLoading}
+            refresh={refetch}
+          />
+        </Card>
       )}
 
       <Modal
@@ -393,23 +411,23 @@ function SeaServiceTab() {
             onChange={(e) => setForm({ ...form, rank: e.target.value })}
           />
           <Group grow>
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Engagement date"
               required
               value={form.engagementDate}
-              onChange={(e) =>
-                setForm({ ...form, engagementDate: e.target.value })
+              onChange={(val) =>
+                setForm({ ...form, engagementDate: val })
               }
+              dateFormat="date"
             />
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Discharge date"
               required
               value={form.dischargeDate}
-              onChange={(e) =>
-                setForm({ ...form, dischargeDate: e.target.value })
+              onChange={(val) =>
+                setForm({ ...form, dischargeDate: val })
               }
+              dateFormat="date"
             />
           </Group>
           <Textarea
@@ -455,7 +473,8 @@ const EMPTY_MEDICAL = {
 };
 
 function MedicalTab() {
-  const { data: certificates, isLoading } = useGetMyMedicalCertificatesQuery();
+  const showDate = useDateDisplayer();
+  const { data: certificates, isLoading, refetch } = useGetMyMedicalCertificatesQuery();
   const [createCertificate, { isLoading: creating }] =
     useCreateMedicalCertificateMutation();
   const [updateCertificate, { isLoading: updating }] =
@@ -530,7 +549,99 @@ function MedicalTab() {
 
   const today = new Date().toISOString().slice(0, 10);
 
-  if (isLoading) return <Loader />;
+  const { setPageIndex, pageSize, setPageSize, paginate } = useServerTable({ pageSize: 10 });
+  const page = paginate(certificates ?? []);
+
+  const columns: AdvancedColumn<MedicalCertificate>[] = [
+    {
+      header: 'Issuer',
+      cell: ({ row }) => (
+        <>
+          <Text fw={600} size="sm">
+            {row.original.issuerName}
+          </Text>
+          {row.original.certificateNumber && (
+            <Text size="xs" c="dimmed">
+              № {row.original.certificateNumber}
+            </Text>
+          )}
+        </>
+      ),
+    },
+    {
+      header: 'Issued',
+      accessorKey: 'issueDate',
+      cell: ({ row }) => showDate(row.original.issueDate),
+    },
+    {
+      header: 'Expires',
+      cell: ({ row }) => (
+        <Group gap={6} wrap="nowrap">
+          {showDate(row.original.expiryDate)}
+          {row.original.expiryDate < today && <Badge color="red">Expired</Badge>}
+        </Group>
+      ),
+    },
+    {
+      header: 'Fitness',
+      cell: ({ row }) =>
+        FITNESS_OPTIONS.find((o) => o.value === row.original.fitnessStatus)
+          ?.label ?? row.original.fitnessStatus,
+    },
+    {
+      header: 'Status',
+      cell: ({ row }) => (
+        <Tooltip
+          label={row.original.verificationRemark ?? ''}
+          disabled={!row.original.verificationRemark}
+        >
+          <Badge color={RECORD_STATUS_COLORS[row.original.status]}>
+            {row.original.status}
+          </Badge>
+        </Tooltip>
+      ),
+    },
+    {
+      header: '',
+      label: 'Actions',
+      align: 'right',
+      cell: ({ row }) => {
+        const certificate = row.original;
+        const locked = certificate.status !== 'SUBMITTED';
+        return (
+          <Group gap="xs" justify="flex-end" wrap="nowrap">
+            <Tooltip label="Scan / evidence">
+              <ActionIcon
+                variant="subtle"
+                onClick={() => setEvidenceFor(certificate.id)}
+              >
+                <IconPaperclip size={16} />
+              </ActionIcon>
+            </Tooltip>
+            <Tooltip label={locked ? 'Verified certificates are frozen' : 'Edit'}>
+              <ActionIcon
+                variant="subtle"
+                disabled={locked}
+                onClick={() => openEdit(certificate)}
+              >
+                <IconEdit size={16} />
+              </ActionIcon>
+            </Tooltip>
+            <Tooltip label={locked ? 'Verified certificates are frozen' : 'Delete'}>
+              <ActionIcon
+                variant="subtle"
+                color="red"
+                disabled={locked}
+                onClick={() => remove(certificate)}
+              >
+                <IconTrash size={16} />
+              </ActionIcon>
+            </Tooltip>
+          </Group>
+        );
+      },
+    },
+  ];
 
   return (
     <Stack>
@@ -550,103 +661,20 @@ function MedicalTab() {
           </Text>
         </Paper>
       ) : (
-        <Table.ScrollContainer minWidth={720}>
-          <Table striped highlightOnHover>
-            <Table.Thead>
-              <Table.Tr>
-                <Table.Th>Issuer</Table.Th>
-                <Table.Th>Issued</Table.Th>
-                <Table.Th>Expires</Table.Th>
-                <Table.Th>Fitness</Table.Th>
-                <Table.Th>Status</Table.Th>
-                <Table.Th />
-              </Table.Tr>
-            </Table.Thead>
-            <Table.Tbody>
-              {(certificates ?? []).map((certificate) => {
-                const locked = certificate.status !== 'SUBMITTED';
-                const expired = certificate.expiryDate < today;
-                return (
-                  <Table.Tr key={certificate.id}>
-                    <Table.Td>
-                      <Text fw={600} size="sm">
-                        {certificate.issuerName}
-                      </Text>
-                      {certificate.certificateNumber && (
-                        <Text size="xs" c="dimmed">
-                          № {certificate.certificateNumber}
-                        </Text>
-                      )}
-                    </Table.Td>
-                    <Table.Td>{certificate.issueDate}</Table.Td>
-                    <Table.Td>
-                      <Group gap={6} wrap="nowrap">
-                        {certificate.expiryDate}
-                        {expired && <Badge color="red">Expired</Badge>}
-                      </Group>
-                    </Table.Td>
-                    <Table.Td>
-                      {FITNESS_OPTIONS.find(
-                        (o) => o.value === certificate.fitnessStatus,
-                      )?.label ?? certificate.fitnessStatus}
-                    </Table.Td>
-                    <Table.Td>
-                      <Tooltip
-                        label={certificate.verificationRemark ?? ''}
-                        disabled={!certificate.verificationRemark}
-                      >
-                        <Badge color={RECORD_STATUS_COLORS[certificate.status]}>
-                          {certificate.status}
-                        </Badge>
-                      </Tooltip>
-                    </Table.Td>
-                    <Table.Td>
-                      <Group gap="xs" justify="flex-end" wrap="nowrap">
-                        <Tooltip label="Scan / evidence">
-                          <ActionIcon
-                            variant="subtle"
-                            onClick={() => setEvidenceFor(certificate.id)}
-                          >
-                            <IconPaperclip size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                        <Tooltip
-                          label={
-                            locked ? 'Verified certificates are frozen' : 'Edit'
-                          }
-                        >
-                          <ActionIcon
-                            variant="subtle"
-                            disabled={locked}
-                            onClick={() => openEdit(certificate)}
-                          >
-                            <IconEdit size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                        <Tooltip
-                          label={
-                            locked
-                              ? 'Verified certificates are frozen'
-                              : 'Delete'
-                          }
-                        >
-                          <ActionIcon
-                            variant="subtle"
-                            color="red"
-                            disabled={locked}
-                            onClick={() => remove(certificate)}
-                          >
-                            <IconTrash size={16} />
-                          </ActionIcon>
-                        </Tooltip>
-                      </Group>
-                    </Table.Td>
-                  </Table.Tr>
-                );
-              })}
-            </Table.Tbody>
-          </Table>
-        </Table.ScrollContainer>
+        <Card withBorder padding={0}>
+          <AdvancedTable
+            columns={columns}
+            data={page.rows}
+            tableName="Medical certificates"
+            itemCount={page.itemCount}
+            pageIndex={page.pageIndex}
+            onPageChange={setPageIndex}
+            pageSize={pageSize}
+            onPageSizeChange={setPageSize}
+            isLoading={isLoading}
+            refresh={refetch}
+          />
+        </Card>
       )}
 
       <Modal
@@ -673,19 +701,19 @@ function MedicalTab() {
             />
           </Group>
           <Group grow>
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Issue date"
               required
               value={form.issueDate}
-              onChange={(e) => setForm({ ...form, issueDate: e.target.value })}
+              onChange={(val) => setForm({ ...form, issueDate: val })}
+              dateFormat="date"
             />
-            <TextInput
-              type="date"
+            <AmharicDatePicker
               label="Expiry date"
               required
               value={form.expiryDate}
-              onChange={(e) => setForm({ ...form, expiryDate: e.target.value })}
+              onChange={(val) => setForm({ ...form, expiryDate: val })}
+              dateFormat="date"
             />
           </Group>
           <Select
diff --git a/apps/portal/src/app/features/vessel-registration/mock.ts b/apps/portal/src/app/features/vessel-registration/mock.ts
new file mode 100644
index 000000000..10cfd3b5b
--- /dev/null
+++ b/apps/portal/src/app/features/vessel-registration/mock.ts
@@ -0,0 +1,286 @@
+// ponytail: in-memory mock array, resets on reload — swap for RTK Query endpoint when backend lands.
+
+export type VesselCategory = 'Inland Waterway' | 'Sea-going';
+
+export const VESSEL_TYPES: Record<VesselCategory, string[]> = {
+  'Inland Waterway': ['Passenger Boat', 'Cargo Barge', 'Ferry', 'Tugboat', 'Fishing Boat'],
+  'Sea-going': ['Bulk Carrier', 'Container Ship', 'Tanker', 'General Cargo', 'Passenger Ship'],
+};
+
+export const ENGINE_TYPES = ['Diesel', 'Inboard', 'Outboard', 'Electric', 'Steam'] as const;
+
+export const HULL_MATERIALS = ['Steel', 'Aluminum', 'Fiberglass', 'Wood', 'Composite'] as const;
+
+export interface RequiredDocSlot {
+  key: string;
+  label: string;
+  minCount?: number;
+}
+
+export const REQUIRED_DOCS: Record<VesselCategory, RequiredDocSlot[]> = {
+  'Inland Waterway': [{ key: 'photos', label: 'Vessel Photos', minCount: 2 }],
+  'Sea-going': [
+    { key: 'photos', label: 'Vessel Photos' },
+    { key: 'ownership', label: 'Proof of Ownership / Bill of Sale' },
+    { key: 'particulars', label: 'Ship Particulars' },
+    { key: 'insurance', label: 'Insurance Certificate' },
+  ],
+};
+
+export const CERTIFICATES: Record<VesselCategory, string[]> = {
+  'Inland Waterway': ['Inland Vessel Registration Certificate'],
+  'Sea-going': [
+    'Certificate of Nationality',
+    'Certificate of Ownership',
+    'Certificate of Registration',
+    'Minimum Safe Manning Certificate',
+  ],
+};
+
+export type RegistrationStatus = 'Pending' | 'Under Review' | 'Correction Required' | 'Approved' | 'Rejected';
+
+export const STATUS_COLOR: Record<RegistrationStatus, string> = {
+  Pending: 'gray',
+  'Under Review': 'blue',
+  'Correction Required': 'orange',
+  Approved: 'teal',
+  Rejected: 'red',
+};
+
+export type RenewalState = 'OK' | 'Due Soon' | 'Overdue';
+
+export interface RegistrationOwner {
+  name: string;
+  idOrTin: string;
+  phone: string;
+  email: string;
+  address: string;
+}
+
+export interface RegistrationCertificate {
+  name: string;
+  number: string;
+  issueDate: string;
+  downloads: number;
+}
+
+export interface TimelineStep {
+  date: string | null;
+  event: string;
+  done: boolean;
+}
+
+export interface VesselRegistration {
+  id: string;
+  category: VesselCategory;
+  status: RegistrationStatus;
+  submitted: string;
+  remarks?: string;
+  expiryDate?: string;
+  renewal?: RenewalState;
+  timeline: TimelineStep[];
+  certificates?: RegistrationCertificate[];
+
+  // Vessel details
+  vesselName: string;
+  vesselType: string;
+  registrationArea: string;
+  flagState: string;
+  passengerCapacity?: string;
+  grossTonnage?: string;
+  length: string;
+  breadth: string;
+  depth: string;
+
+  // Technical
+  imoNumber?: string;
+  hullNumber?: string;
+  shipyard: string;
+  yearBuilt: string;
+  engineType: string;
+  engineNumber: string;
+  enginePower: string;
+  hullMaterial: string;
+
+  // Ownership
+  owner: RegistrationOwner;
+}
+
+const SUBMITTED_STEP = (date: string): TimelineStep => ({ date, event: 'Application Submitted', done: true });
+const PENDING_STEP = (event: string): TimelineStep => ({ date: null, event, done: false });
+
+export const MOCK_REGISTRATIONS: VesselRegistration[] = [
+  {
+    id: 'VR-2025-0001',
+    category: 'Sea-going',
+    status: 'Under Review',
+    submitted: '2025-06-20',
+    timeline: [
+      SUBMITTED_STEP('2025-06-20'),
+      { date: '2025-06-22', event: 'Document Verification', done: true },
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+    vesselName: 'MV Nile Star',
+    vesselType: 'Bulk Carrier',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '18500',
+    length: '190',
+    breadth: '28',
+    depth: '15',
+    imoNumber: 'IMO9876543',
+    shipyard: 'Hyundai Heavy Industries',
+    yearBuilt: '2016',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-44210',
+    enginePower: '12000 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Nile Shipping PLC',
+      idOrTin: 'TIN-0012345678',
+      phone: '+251911223344',
+      email: 'ops@nileshipping.et',
+      address: 'Bole Sub-city, Addis Ababa',
+    },
+  },
+  {
+    id: 'VR-2025-0002',
+    category: 'Inland Waterway',
+    status: 'Correction Required',
+    submitted: '2025-06-10',
+    remarks: 'Vessel photos are blurry — please re-upload at least 2 clear photos showing the hull and registration markings.',
+    timeline: [
+      SUBMITTED_STEP('2025-06-10'),
+      { date: '2025-06-12', event: 'Document Verification', done: true },
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+    vesselName: 'Tana Ferry 3',
+    vesselType: 'Ferry',
+    registrationArea: 'Lake Tana',
+    flagState: 'Ethiopia',
+    passengerCapacity: '40',
+    length: '18',
+    breadth: '5',
+    depth: '2',
+    hullNumber: 'HN-2211',
+    shipyard: 'Bahir Dar Boat Works',
+    yearBuilt: '2020',
+    engineType: 'Outboard',
+    engineNumber: 'ENG-9931',
+    enginePower: '150 hp',
+    hullMaterial: 'Fiberglass',
+    owner: {
+      name: 'Getachew Alemu',
+      idOrTin: 'ID-4455667788',
+      phone: '+251922334455',
+      email: 'getachew.alemu@example.com',
+      address: 'Bahir Dar, Amhara',
+    },
+  },
+  {
+    id: 'VR-2025-0003',
+    category: 'Sea-going',
+    status: 'Approved',
+    submitted: '2025-04-05',
+    expiryDate: '2026-08-15',
+    renewal: 'Due Soon',
+    timeline: [
+      SUBMITTED_STEP('2025-04-05'),
+      { date: '2025-04-08', event: 'Document Verification', done: true },
+      { date: '2025-04-20', event: 'Inspection', done: true },
+      { date: '2025-04-28', event: 'Approval', done: true },
+    ],
+    certificates: [
+      { name: 'Certificate of Nationality', number: 'CN-2025-0091', issueDate: '2025-04-28', downloads: 0 },
+      { name: 'Certificate of Ownership', number: 'CO-2025-0091', issueDate: '2025-04-28', downloads: 0 },
+      { name: 'Certificate of Registration', number: 'CR-2025-0091', issueDate: '2025-04-28', downloads: 0 },
+      { name: 'Minimum Safe Manning Certificate', number: 'MSM-2025-0091', issueDate: '2025-04-28', downloads: 0 },
+    ],
+    vesselName: 'MV Abay Voyager',
+    vesselType: 'General Cargo',
+    registrationArea: 'Djibouti Corridor',
+    flagState: 'Ethiopia',
+    grossTonnage: '9600',
+    length: '140',
+    breadth: '21',
+    depth: '11',
+    imoNumber: 'IMO9123456',
+    shipyard: 'Damen Shipyards',
+    yearBuilt: '2012',
+    engineType: 'Diesel',
+    engineNumber: 'ENG-33012',
+    enginePower: '7200 kW',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Abay Maritime PLC',
+      idOrTin: 'TIN-0098765432',
+      phone: '+251933445566',
+      email: 'contact@abaymaritime.et',
+      address: 'Kirkos Sub-city, Addis Ababa',
+    },
+  },
+  {
+    id: 'VR-2025-0004',
+    category: 'Inland Waterway',
+    status: 'Rejected',
+    submitted: '2025-03-02',
+    remarks: 'Hull number does not match the submitted proof of ownership. Application rejected — please reapply with matching documentation.',
+    timeline: [
+      SUBMITTED_STEP('2025-03-02'),
+      { date: '2025-03-05', event: 'Document Verification', done: true },
+      { date: '2025-03-14', event: 'Inspection', done: true },
+      { date: '2025-03-18', event: 'Approval', done: false },
+    ],
+    vesselName: 'Awash Cargo 1',
+    vesselType: 'Cargo Barge',
+    registrationArea: 'Awash River Basin',
+    flagState: 'Ethiopia',
+    passengerCapacity: '0',
+    length: '22',
+    breadth: '6',
+    depth: '3',
+    hullNumber: 'HN-1187',
+    shipyard: 'Awash River Works',
+    yearBuilt: '2018',
+    engineType: 'Inboard',
+    engineNumber: 'ENG-5567',
+    enginePower: '210 hp',
+    hullMaterial: 'Steel',
+    owner: {
+      name: 'Selam Tesfaye',
+      idOrTin: 'ID-2233445566',
+      phone: '+251944556677',
+      email: 'selam.tesfaye@example.com',
+      address: 'Adama, Oromia',
+    },
+  },
+];
+
+export function addRegistration(
+  reg: Omit<VesselRegistration, 'id' | 'status' | 'submitted' | 'timeline' | 'certificates'>
+): VesselRegistration {
+  const submitted = new Date().toISOString().slice(0, 10);
+  const created: VesselRegistration = {
+    ...reg,
+    id: `VR-2025-${String(MOCK_REGISTRATIONS.length + 1).padStart(4, '0')}`,
+    status: 'Pending',
+    submitted,
+    timeline: [
+      SUBMITTED_STEP(submitted),
+      PENDING_STEP('Document Verification'),
+      PENDING_STEP('Inspection'),
+      PENDING_STEP('Approval'),
+    ],
+  };
+  MOCK_REGISTRATIONS.unshift(created);
+  return created;
+}
+
+// ponytail: in-memory counter, not persisted.
+export function recordDownload(regId: string, certName: string): void {
+  const reg = MOCK_REGISTRATIONS.find((r) => r.id === regId);
+  const cert = reg?.certificates?.find((c) => c.name === certName);
+  if (cert) cert.downloads += 1;
+}
diff --git a/apps/portal/src/app/features/vessel-registration/pages/OwnershipTransferPage.tsx b/apps/portal/src/app/features/vessel-registration/pages/OwnershipTransferPage.tsx
deleted file mode 100644
index 11dcac2f1..000000000
--- a/apps/portal/src/app/features/vessel-registration/pages/OwnershipTransferPage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Container } from '@mantine/core';
-import { FeatureUnavailable } from '@ema-platform/ui';
-
-/**
- * Placeholder until this feature has a backend.
- *
- * This page previously rendered hardcoded sample records, which were
- * indistinguishable from real ones.
- */
-export function OwnershipTransferPage() {
-  return (
-    <Container size="lg" py="xl">
-      <FeatureUnavailable
-        title="Ownership transfer"
-        description="Vessel ownership transfer is not connected to the backend yet."
-      />
-    </Container>
-  );
-}
-
-export default OwnershipTransferPage;
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 78cc6c973..065f83b4e 100644
--- a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
+++ b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationPage.tsx
@@ -414,8 +414,8 @@ export function VesselRegistrationPage() {
         <Group gap="xs">
           <IconAnchor size={18} color="var(--mantine-color-blue-5)" />
           <Text size="sm" c="dimmed">
-            Ownership transfer, amendment and duplicate-certificate services
-            are coming in a later release.
+            Amendment and duplicate-certificate services are coming in a
+            later release.
           </Text>
         </Group>
       </Paper>
diff --git a/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationStatusPage.tsx b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationStatusPage.tsx
new file mode 100644
index 000000000..037457bb1
--- /dev/null
+++ b/apps/portal/src/app/features/vessel-registration/pages/VesselRegistrationStatusPage.tsx
@@ -0,0 +1,158 @@
+import { useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  Alert,
+  Badge,
+  Button,
+  Divider,
+  Group,
+  Paper,
+  SimpleGrid,
+  Stack,
+  Stepper,
+  Text,
+  ThemeIcon,
+  Title,
+} from '@mantine/core';
+import {
+  IconAlertTriangle,
+  IconArrowLeft,
+  IconCircleCheck,
+  IconClock,
+  IconDownload,
+  IconInfoCircle,
+  IconShip,
+} from '@tabler/icons-react';
+import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
+import { MOCK_REGISTRATIONS, recordDownload, STATUS_COLOR } from '../mock';
+
+// ponytail: placeholder PDF blob; wire real cert endpoint when backend lands.
+const BLANK_PDF = 'data:application/pdf;base64,JVBERi0xLjQKJcfsj6IKMSAwIG9iago8PC9UeXBlL0NhdGFsb2cvUGFnZXMgMiAwIFI+PgplbmRvYmoKMiAwIG9iago8PC9UeXBlL1BhZ2VzL0tpZHNbMyAwIFJdL0NvdW50IDE+PgplbmRvYmoKMyAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDIgMCBSL01lZGlhQm94WzAgMCA2MTIgNzkyXT4+CmVuZG9iagp4cmVmCjAgNAowMDAwMDAwMDAwIDY1NTM1IGYgCjAwMDAwMDAwMDkgMDAwMDAgbiAKMDAwMDAwMDA1OCAwMDAwMCBuIAowMDAwMDAwMTE1IDAwMDAwIG4gCnRyYWlsZXIKPDwvU2l6ZSA0L1Jvb3QgMSAwIFI+PgpzdGFydHhyZWYKMjE3CiUlRU9G';
+
+function downloadCertificate(filename: string) {
+  const a = document.createElement('a');
+  a.href = BLANK_PDF;
+  a.download = filename;
+  a.click();
+}
+
+export function VesselRegistrationStatusPage() {
+  const navigate = useNavigate();
+  const showDate = useDateDisplayer();
+  const { id } = useParams();
+  const [reg] = useState(() => MOCK_REGISTRATIONS.find((r) => r.id === id) ?? null);
+  const [, forceUpdate] = useState(0);
+
+  if (!reg) {
+    return (
+      <Stack gap="md">
+        <Button variant="subtle" leftSection={<IconArrowLeft size={14} />} onClick={() => navigate('/vessel-registrations')}>Back</Button>
+        <Alert variant="light" color="red" icon={<IconInfoCircle size={15} />}>Registration not found.</Alert>
+      </Stack>
+    );
+  }
+
+  const activeStep = reg.timeline.filter((t) => t.done).length - 1;
+  const needsCorrection = reg.status === 'Correction Required' || reg.status === 'Rejected';
+
+  const handleDownload = (certName: string, certNumber: string) => {
+    downloadCertificate(`${certName.replace(/\s+/g, '-')}-${certNumber}.pdf`);
+    recordDownload(reg.id, certName);
+    forceUpdate((n) => n + 1);
+    notify.success(`${certName} downloaded.`);
+  };
+
+  return (
+    <Stack gap="md">
+      <Group gap="sm">
+        <Button variant="subtle" leftSection={<IconArrowLeft size={14} />} onClick={() => navigate('/vessel-registrations')}>Back</Button>
+        <div>
+          <Title order={3}>{reg.vesselName}</Title>
+          <Text fz="sm" c="dimmed">{reg.id} — {reg.category}</Text>
+        </div>
+      </Group>
+
+      <Paper withBorder radius="lg" p="xl">
+        <Group justify="space-between" mb="md" wrap="wrap" gap="sm">
+          <Group gap="sm">
+            <ThemeIcon size={36} radius="md" color="blue" variant="light"><IconShip size={18} /></ThemeIcon>
+            <div>
+              <Text fw={700} fz="sm">Registration Status</Text>
+              <Text fz="xs" c="dimmed">Submitted {reg.submitted}</Text>
+            </div>
+          </Group>
+          <Badge color={STATUS_COLOR[reg.status]} variant="light" size="lg">{reg.status}</Badge>
+        </Group>
+
+        {reg.renewal && reg.renewal !== 'OK' && (
+          <Alert
+            variant="light"
+            color={reg.renewal === 'Overdue' ? 'red' : 'orange'}
+            icon={<IconAlertTriangle size={15} />}
+            mb="md"
+            p="sm"
+          >
+            <Text fz="sm">
+              Registration {reg.renewal === 'Overdue' ? 'is overdue for renewal' : 'is due for renewal soon'}
+              {reg.expiryDate ? ` — expires ${showDate(reg.expiryDate)}` : ''}.
+            </Text>
+          </Alert>
+        )}
+
+        {reg.remarks && (
+          <Alert variant="light" color={needsCorrection ? 'orange' : 'blue'} icon={<IconInfoCircle size={15} />} mb="md" p="sm">
+            <Text fz="sm" fw={600} mb={2}>Officer Remarks</Text>
+            <Text fz="sm">{reg.remarks}</Text>
+          </Alert>
+        )}
+
+        <Stepper active={activeStep} size="sm" color="teal">
+          {reg.timeline.map((step, i) => (
+            <Stepper.Step
+              key={i}
+              label={step.event}
+              description={step.date ?? 'Pending'}
+              icon={step.done ? <IconCircleCheck size={16} /> : <IconClock size={16} />}
+            />
+          ))}
+        </Stepper>
+
+        {needsCorrection && (
+          <Group justify="flex-end" mt="md">
+            <Button color="orange" onClick={() => navigate('/vessel-registrations/apply')}>Resubmit Application</Button>
+          </Group>
+        )}
+      </Paper>
+
+      {reg.status === 'Approved' && reg.certificates && (
+        <Paper withBorder radius="lg" p="xl">
+          <Text fw={700} mb="md">Certificates</Text>
+          <Stack gap="sm">
+            {reg.certificates.map((cert) => (
+              <div key={cert.name}>
+                <Group justify="space-between" wrap="wrap" gap="sm">
+                  <div>
+                    <Text fw={600} fz="sm">{cert.name}</Text>
+                    <Text fz="xs" c="dimmed">Certificate No. {cert.number} — Issued {showDate(cert.issueDate)}</Text>
+                    {cert.downloads > 0 && (
+                      <Text fz="xs" c="dimmed">Downloaded {cert.downloads} time{cert.downloads === 1 ? '' : 's'}</Text>
+                    )}
+                  </div>
+                  <Button
+                    size="xs"
+                    leftSection={<IconDownload size={14} />}
+                    onClick={() => handleDownload(cert.name, cert.number)}
+                  >
+                    Download
+                  </Button>
+                </Group>
+                <Divider mt="sm" />
+              </div>
+            ))}
+          </Stack>
+        </Paper>
+      )}
+    </Stack>
+  );
+}
diff --git a/apps/portal/src/app/features/vessel-registration/pages/VesselTransferPage.tsx b/apps/portal/src/app/features/vessel-registration/pages/VesselTransferPage.tsx
new file mode 100644
index 000000000..5f8cbae18
--- /dev/null
+++ b/apps/portal/src/app/features/vessel-registration/pages/VesselTransferPage.tsx
@@ -0,0 +1,233 @@
+import { useNavigate } from 'react-router-dom';
+import {
+  Badge,
+  Button,
+  Card,
+  Group,
+  Loader,
+  Paper,
+  Progress,
+  Stack,
+  Table,
+  Text,
+  Title,
+  Tooltip,
+} from '@mantine/core';
+import {
+  IconArrowRight,
+  IconArrowsExchange,
+  IconShip,
+} from '@tabler/icons-react';
+import {
+  STATUS_COLORS,
+  STATUS_LABELS,
+  STATUS_PROGRESS,
+  TERMINAL_STATUSES,
+  useGetMyApplicationsQuery,
+  useGetMyVesselsQuery,
+} from '@ema-platform/api';
+
+const TRANSFER_TYPE_KEY = 'VESSEL_OWNERSHIP_TRANSFER';
+
+const CATEGORY_LABELS: Record<string, string> = {
+  INLAND_WATERWAY: 'Inland Waterway',
+  SEA_GOING: 'Sea-going',
+};
+
+const VESSEL_STATUS_COLORS: Record<string, string> = {
+  REGISTERED: 'green',
+  SUSPENDED: 'orange',
+  DEREGISTERED: 'gray',
+};
+
+/**
+ * The vessel owner's ownership-transfer home: transfers in flight, and the
+ * registered vessels eligible to start one. Same config-driven wizard as
+ * registration underneath (VESSEL_OWNERSHIP_TRANSFER) — this page mirrors
+ * VesselRegistrationPage, just a different entry point and no
+ * certificate/renewal/incident actions, which don't apply here.
+ */
+export function VesselTransferPage() {
+  const navigate = useNavigate();
+  const { data: vessels, isLoading: loadingVessels } = useGetMyVesselsQuery();
+  const { data: applications, isLoading: loadingApplications } =
+    useGetMyApplicationsQuery();
+
+  const inFlight = (applications?.items ?? []).filter(
+    (app) =>
+      app.licenseType?.key === TRANSFER_TYPE_KEY &&
+      !TERMINAL_STATUSES.includes(app.status),
+  );
+
+  // A transfer moves ownership of a vessel already on the register — nothing
+  // to transfer without at least one REGISTERED vessel.
+  const hasTransferableVessel = (vessels ?? []).some(
+    (v) => v.status === 'REGISTERED',
+  );
+
+  if (loadingVessels || loadingApplications) {
+    return (
+      <Group justify="center" py="xl">
+        <Loader />
+      </Group>
+    );
+  }
+
+  return (
+    <Stack>
+      <Group justify="space-between">
+        <Title order={2}>Ownership Transfer</Title>
+        <Tooltip
+          label="Register a vessel first — there's nothing to transfer yet"
+          disabled={hasTransferableVessel}
+        >
+          <Button
+            leftSection={<IconArrowsExchange size={16} />}
+            disabled={!hasTransferableVessel}
+            onClick={() => navigate(`/licensing/${TRANSFER_TYPE_KEY}/apply`)}
+          >
+            Start transfer
+          </Button>
+        </Tooltip>
+      </Group>
+
+      {/* ----------------------------------------------------- in-flight */}
+      {inFlight.length > 0 && (
+        <Stack gap="sm">
+          <Title order={4}>Transfers in progress</Title>
+          {inFlight.map((app) => {
+            const isDraft = app.status === 'DRAFT';
+            const needsAction = app.status === 'RESUBMIT_REQUIRED';
+            return (
+              <Card key={app.id} withBorder radius="md" p="md">
+                <Group justify="space-between" wrap="nowrap">
+                  <div>
+                    <Text fw={600}>{app.applicationNumber}</Text>
+                    <Progress
+                      value={STATUS_PROGRESS[app.status]}
+                      mt="xs"
+                      w={260}
+                    />
+                  </div>
+                  <Group wrap="nowrap">
+                    <Badge color={STATUS_COLORS[app.status]}>
+                      {STATUS_LABELS[app.status]}
+                    </Badge>
+                    <Button
+                      size="compact-sm"
+                      variant={needsAction ? 'filled' : 'light'}
+                      color={needsAction ? 'orange' : undefined}
+                      rightSection={<IconArrowRight size={14} />}
+                      onClick={() =>
+                        navigate(
+                          `/licensing/${TRANSFER_TYPE_KEY}/applications/${app.id}`,
+                        )
+                      }
+                    >
+                      {isDraft ? 'Continue' : needsAction ? 'Fix' : 'View'}
+                    </Button>
+                  </Group>
+                </Group>
+              </Card>
+            );
+          })}
+        </Stack>
+      )}
+
+      {/* ------------------------------------------------------- vessels */}
+      <Stack gap="sm">
+        <Title order={4}>My vessels</Title>
+        {(vessels ?? []).length === 0 ? (
+          <Paper withBorder radius="md" p="xl">
+            <Stack align="center" gap="sm">
+              <IconShip size={40} color="var(--mantine-color-blue-5)" />
+              <Text fw={600}>No registered vessels yet</Text>
+              <Text size="sm" c="dimmed" ta="center" maw={420}>
+                Ownership can only be transferred for a vessel already on the
+                register.
+              </Text>
+              <Button
+                mt="xs"
+                variant="light"
+                onClick={() => navigate('/vessel-registration')}
+              >
+                Go to Vessel Registration
+              </Button>
+            </Stack>
+          </Paper>
+        ) : (
+          <Table.ScrollContainer minWidth={640}>
+            <Table striped highlightOnHover>
+              <Table.Thead>
+                <Table.Tr>
+                  <Table.Th>Registration №</Table.Th>
+                  <Table.Th>Vessel</Table.Th>
+                  <Table.Th>Category</Table.Th>
+                  <Table.Th>Status</Table.Th>
+                  <Table.Th />
+                </Table.Tr>
+              </Table.Thead>
+              <Table.Tbody>
+                {(vessels ?? []).map((vessel) => {
+                  const canTransfer = vessel.status === 'REGISTERED';
+                  return (
+                  <Table.Tr key={vessel.id}>
+                    <Table.Td>
+                      <Text ff="monospace" size="sm" fw={600}>
+                        {vessel.registrationNumber}
+                      </Text>
+                    </Table.Td>
+                    <Table.Td>
+                      <Text size="sm" fw={500}>
+                        {vessel.name}
+                      </Text>
+                      <Text size="xs" c="dimmed">
+                        {vessel.vesselType ?? '—'}
+                      </Text>
+                    </Table.Td>
+                    <Table.Td>
+                      {CATEGORY_LABELS[vessel.category] ?? vessel.category}
+                    </Table.Td>
+                    <Table.Td>
+                      <Badge
+                        size="sm"
+                        color={VESSEL_STATUS_COLORS[vessel.status]}
+                      >
+                        {vessel.status}
+                      </Badge>
+                    </Table.Td>
+                    <Table.Td>
+                      <Group justify="flex-end">
+                        {canTransfer ? (
+                          <Tooltip label="Start an ownership transfer for this vessel">
+                            <Button
+                              size="compact-xs"
+                              variant="light"
+                              leftSection={<IconArrowsExchange size={14} />}
+                              onClick={() =>
+                                navigate(`/licensing/${TRANSFER_TYPE_KEY}/apply`)
+                              }
+                            >
+                              Transfer
+                            </Button>
+                          </Tooltip>
+                        ) : (
+                          <Text size="xs" c="dimmed">
+                            Not transferable
+                          </Text>
+                        )}
+                      </Group>
+                    </Table.Td>
+                  </Table.Tr>
+                  );
+                })}
+              </Table.Tbody>
+            </Table>
+          </Table.ScrollContainer>
+        )}
+      </Stack>
+    </Stack>
+  );
+}
+
+export default VesselTransferPage;
diff --git a/apps/portal/src/app/features/waiver/pages/WaiverPage.tsx b/apps/portal/src/app/features/waiver/pages/WaiverPage.tsx
index a0afbb97b..c6ae97e36 100644
--- a/apps/portal/src/app/features/waiver/pages/WaiverPage.tsx
+++ b/apps/portal/src/app/features/waiver/pages/WaiverPage.tsx
@@ -17,16 +17,19 @@ import {
   IconInfoCircle,
 } from '@tabler/icons-react';
 import { useNavigate } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
 import {
   STATUS_COLORS,
   STATUS_LABELS,
   TERMINAL_STATUSES,
   extractErrorMessage,
+  useLocalized,
   useGetCertificateUrlMutation,
   useGetMyApplicationsQuery,
   useGetMyLicensesQuery,
 } from '@ema-platform/api';
 import { notify } from '@ema-platform/ui';
+import { useDateDisplayer } from '@ema-platform/shared';
 
 const WAIVER_TYPE_KEYS = ['PRE_WAIVER', 'POST_WAIVER'];
 
@@ -39,10 +42,13 @@ const WAIVER_TYPE_KEYS = ['PRE_WAIVER', 'POST_WAIVER'];
  * verifiable references (US-WAV-010).
  */
 export function WaiverPage() {
+  const { t } = useTranslation();
   const navigate = useNavigate();
   const { data: applications, isLoading } = useGetMyApplicationsQuery();
   const { data: licenses } = useGetMyLicensesQuery();
   const [getCertificateUrl] = useGetCertificateUrlMutation();
+  const showDate = useDateDisplayer();
+  const localized = useLocalized();
 
   const waiverApplications = (applications?.items ?? []).filter((app) =>
     WAIVER_TYPE_KEYS.includes(app.licenseType?.key ?? ''),
@@ -59,7 +65,7 @@ export function WaiverPage() {
       const result = await getCertificateUrl(licenseId).unwrap();
       window.open(result.url, '_blank', 'noopener');
     } catch (error) {
-      notify.error(extractErrorMessage(error, 'Could not fetch the letter'));
+      notify.error(extractErrorMessage(error, t('waiver.fetchFailed', 'Could not fetch the letter')));
     }
   }
 
@@ -74,65 +80,72 @@ export function WaiverPage() {
   return (
     <Stack maw={900} mx="auto">
       <div>
-        <Title order={2}>Maritime Waiver</Title>
+        <Title order={2}>{t('waiver.title', 'Maritime Waiver')}</Title>
         <Text size="sm" c="dimmed">
-          Apply for a waiver when Ethiopian Shipping &amp; Logistics cannot
-          carry your shipment. Approval issues the bank waiver letter.
+          {t(
+            'waiver.subtitle',
+            'Apply for a waiver when Ethiopian Shipping & Logistics cannot carry your shipment. Approval issues the bank waiver letter.',
+          )}
         </Text>
       </div>
 
       <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="md">
         <Card withBorder radius="md" p="lg">
-          <Text fw={600}>Pre-waiver</Text>
+          <Text fw={600}>{t('waiver.preWaiver.title', 'Pre-waiver')}</Text>
           <Text size="sm" c="dimmed" mt={4} mb="md">
-            The cargo has not yet arrived. Applying before arrival avoids the
-            post-waiver penalty.
+            {t(
+              'waiver.preWaiver.body',
+              'The cargo has not yet arrived. Applying before arrival avoids the post-waiver penalty.',
+            )}
           </Text>
           <Button
             rightSection={<IconArrowRight size={16} />}
             onClick={() => navigate('/licensing/PRE_WAIVER/apply')}
           >
-            Apply for a pre-waiver
+            {t('waiver.preWaiver.apply', 'Apply for a pre-waiver')}
           </Button>
         </Card>
 
         <Card withBorder radius="md" p="lg">
-          <Text fw={600}>Post-waiver</Text>
+          <Text fw={600}>{t('waiver.postWaiver.title', 'Post-waiver')}</Text>
           <Text size="sm" c="dimmed" mt={4} mb="md">
-            The cargo has already arrived. Granted once per shipment, and only
-            against a settled penalty with the receipt attached.
+            {t(
+              'waiver.postWaiver.body',
+              'The cargo has already arrived. Granted once per shipment, and only against a settled penalty with the receipt attached.',
+            )}
           </Text>
           <Button
             variant="light"
             rightSection={<IconArrowRight size={16} />}
             onClick={() => navigate('/licensing/POST_WAIVER/apply')}
           >
-            Apply for a post-waiver
+            {t('waiver.postWaiver.apply', 'Apply for a post-waiver')}
           </Button>
         </Card>
       </SimpleGrid>
 
       <Alert color="blue" icon={<IconInfoCircle size={16} />}>
-        Each waiver covers one shipment, identified by its bill of lading. A
-        second application quoting the same bill of lading is refused while the
-        first is live.
+        {t(
+          'waiver.oneShipmentNotice',
+          'Each waiver covers one shipment, identified by its bill of lading. A second application quoting the same bill of lading is refused while the first is live.',
+        )}
       </Alert>
 
       {inFlight.length > 0 && (
         <Stack gap="xs">
-          <Title order={4}>Applications in progress</Title>
+          <Title order={4}>{t('waiver.inProgress', 'Applications in progress')}</Title>
           {inFlight.map((app) => (
             <Card key={app.id} withBorder radius="md" p="md">
               <Group justify="space-between">
                 <div>
                   <Text fw={600}>{app.applicationNumber}</Text>
                   <Text size="xs" c="dimmed">
-                    {app.licenseType?.name?.en}
+                    {localized(app.licenseType?.name)}
                   </Text>
                 </div>
                 <Group>
                   <Badge color={STATUS_COLORS[app.status]}>
-                    {STATUS_LABELS[app.status]}
+                    {t(`applications.status.${app.status}`, STATUS_LABELS[app.status])}
                   </Badge>
                   <Button
                     size="compact-sm"
@@ -144,8 +157,8 @@ export function WaiverPage() {
                     }
                   >
                     {app.status === 'DRAFT' || app.status === 'RESUBMIT_REQUIRED'
-                      ? 'Continue'
-                      : 'View'}
+                      ? t('applications.actions.continue', 'Continue')
+                      : t('applications.actions.view', 'View')}
                   </Button>
                 </Group>
               </Group>
@@ -155,11 +168,11 @@ export function WaiverPage() {
       )}
 
       <Stack gap="xs">
-        <Title order={4}>Issued waiver letters</Title>
+        <Title order={4}>{t('waiver.issuedLetters', 'Issued waiver letters')}</Title>
         {letters.length === 0 ? (
           <Card withBorder radius="md" p="lg">
             <Text size="sm" c="dimmed" ta="center">
-              No waiver letters issued yet.
+              {t('waiver.emptyLetters', 'No waiver letters issued yet.')}
             </Text>
           </Card>
         ) : (
@@ -167,10 +180,10 @@ export function WaiverPage() {
             <Table striped>
               <Table.Thead>
                 <Table.Tr>
-                  <Table.Th>Reference</Table.Th>
-                  <Table.Th>Kind</Table.Th>
-                  <Table.Th>Issued</Table.Th>
-                  <Table.Th>Status</Table.Th>
+                  <Table.Th>{t('waiver.columns.reference', 'Reference')}</Table.Th>
+                  <Table.Th>{t('waiver.columns.kind', 'Kind')}</Table.Th>
+                  <Table.Th>{t('waiver.columns.issued', 'Issued')}</Table.Th>
+                  <Table.Th>{t('waiver.columns.status', 'Status')}</Table.Th>
                   <Table.Th />
                 </Table.Tr>
               </Table.Thead>
@@ -182,15 +195,15 @@ export function WaiverPage() {
                         {license.certificateNumber}
                       </Text>
                     </Table.Td>
-                    <Table.Td>{license.licenseType?.name?.en ?? '—'}</Table.Td>
-                    <Table.Td>{license.issueDate?.slice(0, 10)}</Table.Td>
+                    <Table.Td>{localized(license.licenseType?.name) || '—'}</Table.Td>
+                    <Table.Td>{showDate(license.issueDate)}</Table.Td>
                     <Table.Td>
                       <Badge
                         size="sm"
                         variant="light"
                         color={license.status === 'ACTIVE' ? 'green' : 'red'}
                       >
-                        {license.status}
+                        {t(`waiver.licenseStatus.${license.status}`, license.status)}
                       </Badge>
                     </Table.Td>
                     <Table.Td>
@@ -200,7 +213,7 @@ export function WaiverPage() {
                         leftSection={<IconFileText size={13} />}
                         onClick={() => download(license.id)}
                       >
-                        Letter
+                        {t('waiver.letter', 'Letter')}
                       </Button>
                     </Table.Td>
                   </Table.Tr>
diff --git a/apps/portal/src/app/i18n/locales/am.ts b/apps/portal/src/app/i18n/locales/am.ts
index 19541b2f8..5de71b937 100644
--- a/apps/portal/src/app/i18n/locales/am.ts
+++ b/apps/portal/src/app/i18n/locales/am.ts
@@ -7,6 +7,17 @@ export const am: Translations = {
     tagline: 'የባሕር ፍቃድና የምስክር ወረቀት አገልግሎቶች',
   },
 
+  msg: {
+    genericError: 'የሆነ ስህተት ተፈጥሯል። እባክዎ እንደገና ይሞክሩ።',
+    serverError: 'የሰርቨር ስህተት። እባክዎ ቆየት ብለው እንደገና ይሞክሩ።',
+    validationError: 'እባክዎ ያስገቡትን መረጃ ያረጋግጡና እንደገና ይሞክሩ።',
+    authError: 'ክፍለ ጊዜዎ አልቋል። እባክዎ እንደገና ይግቡ።',
+    permissionError: 'ይህን ድርጊት ለመፈጸም ፈቃድ የለዎትም።',
+    notFoundError: 'የተጠየቀው ንጥል አልተገኘም።',
+    fileTooLarge: 'ፋይሉ ለመስቀል በጣም ትልቅ ነው።',
+    networkError: 'የአውታረ መረብ ስህተት። ግንኙነትዎን አረጋግጠው እንደገና ይሞክሩ።',
+  },
+
   language: {
     label: 'ቋንቋ',
     en: 'English',
@@ -42,12 +53,18 @@ export const am: Translations = {
     myApplication: 'ማመልከቻዬ',
     certificates: 'የምስክር ወረቀቶች',
     endorsements: 'ማረጋገጫዎች',
+    vesselRegistrations: 'የመርከብ ምዝገባ',
+    vesselTransfers: 'የመርከብ ባለቤትነት ዝውውር',
     documents: 'ሰነዶቼ',
     notifications: 'ማሳወቂያዎች',
     profile: 'መገለጫ',
     support: 'እገዛና ድጋፍ',
     collapseSidebar: 'ሰብስብ',
     expandSidebar: 'ዘርጋ',
+    sectionSeafarerServices: 'የመርከበኞች አገልግሎቶች',
+    sectionVesselServices: 'የመርከብ አገልግሎቶች',
+    sectionLogisticsLicensing: 'ሎጂስቲክስና ፈቃድ',
+    sectionAccountManagement: 'የመለያ አስተዳደር',
   },
 
   common: {
@@ -77,6 +94,8 @@ export const am: Translations = {
     learnMore: 'ተጨማሪ ይወቁ',
     toggleTheme: 'ብርሃን / ጨለማ ገጽታ ቀይር',
     welcome: 'እንኳን ደህና መጡ',
+    switchCalendar: 'የቀን መቁጠሪያ ዓይነት ቀይር',
+    time: 'ሰዓት',
   },
 
   auth: {
@@ -92,6 +111,85 @@ export const am: Translations = {
     quickActions: 'ፈጣን ድርጊቶች',
   },
 
+  applications: {
+    title: 'የፍቃድ ማመልከቻዎች',
+    subtitle: 'ለ EMA ያስገቡትን ሁሉ ይከታተሉ።',
+    newApplication: 'አዲስ ማመልከቻ',
+    tabs: {
+      applications: 'ማመልከቻዎች',
+      licences: 'ፍቃዶች',
+      apply: 'አመልክት',
+    },
+    stats: {
+      needsYou: 'እርምጃ ይፈልጋል',
+      inProgress: 'በሂደት ላይ',
+      completed: 'የተጠናቀቀ',
+      activeLicences: 'ንቁ ፍቃዶች',
+    },
+    filters: {
+      search: 'ፈልግ',
+      searchPlaceholder: 'ቁጥር ወይም አመልካች',
+      status: 'ሁኔታ',
+      any: 'ማንኛውም',
+      from: 'ከ',
+      to: 'እስከ',
+      clear: 'አጽዳ',
+    },
+    empty: {
+      noneTitle: 'እስካሁን ምንም ማመልከቻ አላስገቡም',
+      noneBody: 'ለመጀመር ከ"አመልክት" ትር ፍቃድ ይምረጡ።',
+      noMatchTitle: 'ከዚህ ማጣሪያ ጋር የሚዛመድ ማመልከቻ የለም',
+      noMatchBody: 'ማጣሪያውን ያስፉ ወይም ያጽዱ።',
+      clearFilters: 'ማጣሪያ አጽዳ',
+      browse: 'ፍቃዶችን ይመልከቱ',
+    },
+    card: {
+      submitted: 'የገባው {{date}}',
+      notFiled: 'ገና አልገባም',
+      feeDue: 'የሚከፈል ክፍያ',
+    },
+    table: {
+      licence: 'ፍቃድ',
+      applicant: 'አመልካች',
+      progress: 'ደረጃ',
+    },
+    actions: {
+      continue: 'ቀጥል',
+      fixResubmit: 'አስተካክለህ እንደገና አስገባ',
+      pay: '{{amount}} {{currency}} ክፈል',
+      certificate: 'የምስክር ወረቀት',
+      view: 'ይመልከቱ',
+      bypass: 'ክፍያ ዝለል',
+      renew: 'አድስ',
+    },
+    notice: {
+      paymentReceived:
+        'ክፍያዎ ደርሷል። የምስክር ወረቀቱ በመዘጋጀት ላይ ሲሆን ከተሰጠ በኋላ ከ"ፍቃዶች" ስር ይታያል።',
+      expiringSoon_one: 'አንድ ፍቃድ በቅርቡ ያበቃል',
+      expiringSoon_other: '{{count}} ፍቃዶች በቅርቡ ያበቃሉ',
+    },
+    licences: {
+      empty: 'እስካሁን ምንም ፍቃድ አልተሰጥዎትም። ማመልከቻ ከተፈቀደና ከተከፈለ በኋላ እዚህ ይታያል።',
+    },
+    status: {
+      DRAFT: 'ረቂቅ',
+      SUBMITTED: 'ገብቷል',
+      UNDER_REVIEW: 'በግምገማ ላይ',
+      UNDER_EVALUATION: 'በምዘና ላይ',
+      RESUBMIT_REQUIRED: 'እንደገና ማስገባት ያስፈልጋል',
+      INSPECTION_PENDING: 'ቁጥጥር በመጠባበቅ ላይ',
+      INSPECTION_COMPLETED: 'ቁጥጥር ተጠናቋል',
+      APPROVED: 'ጸድቋል',
+      REJECTED: 'ውድቅ ተደርጓል',
+      ON_HOLD: 'ላይ ቆሟል',
+      PAYMENT_PENDING: 'ክፍያ በመጠባበቅ ላይ',
+      PAID: 'ተከፍሏል',
+      PAYMENT_CONFIRMED: 'ምስክር ወረቀት በዝግጅት ላይ',
+      CERTIFICATE_ISSUED: 'ምስክር ወረቀት ተሰጥቷል',
+      COMPLETED: 'ተጠናቋል',
+    },
+  },
+
   /** Field labels shared by the completeness nudge and the requirement gates. */
   profileFields: {
     firstName: 'የመጀመሪያ ስም',
@@ -130,6 +228,8 @@ export const am: Translations = {
     title_other: 'ከመቀጠልዎ በፊት {{count}} ተጨማሪ መረጃዎች እንፈልጋለን',
     addDetails: 'እነዚህን መረጃዎች ጨምር',
     viewProfile: 'ሙሉ መገለጫ ይመልከቱ',
+    seafarerReason: 'የባህረኞች ምዝገባ የሚዘጋጀው ከመገለጫዎ ነው — እነዚህ መረጃዎች ራሱ ይሞላሉ።',
+    seafarerRedirect: 'የባህረኛ ምዝገባ ለማድረግ መገለጫዎን ያጠናቅቁ። የሚያስፈልጉ፡ {{fields}}',
   },
 
   profileSections: {
@@ -216,13 +316,18 @@ export const am: Translations = {
     },
   },
 
+  country: {
+    select: 'አገር ይምረጡ',
+    notFound: 'ምንም አገር አልተገኘም',
+  },
+
   location: {
     select: 'ይምረጡ...',
     noOptions: 'ምንም አማራጮች አልተገኙም',
     noLocationsAvailable: 'ምንም አካባቢዎች የሉም',
     chooseFirst: 'መጀመሪያ አካባቢ ይምረጡ',
-    subLocation: 'ንዑስ አካባቢ',
     loading: 'አካባቢዎች በመጫን ላይ...',
+    loadFailed: 'አካባቢዎችን መጫን አልተቻለም',
   },
 
   support: {
@@ -247,4 +352,38 @@ export const am: Translations = {
       a4: 'በማመልከቻው ላይ "እርምጃ ያስፈልጋል" የሚል ማስታወሻ ያያሉ። ግምገማውን ለመቀጠል የተጠየቀውን ሰነድ ወይም ዝርዝር ያቅርቡ።',
     },
   },
+
+  waiver: {
+    title: "የባህር ትራንስፖርት ነፃ ፈቃድ",
+    subtitle: "የኢትዮጵያ መርከብ እና ሎጂስቲክስ ጭነትዎን ማጓጓዝ በማይችልበት ጊዜ ነፃ ፈቃድ ያመልክቱ። መጽደቁ የባንክ ነፃ ፈቃድ ደብዳቤ ያወጣል።",
+    preWaiver: {
+      title: "ቅድመ ነፃ ፈቃድ",
+      body: "ጭነቱ ገና አልደረሰም። ከመድረሱ በፊት ማመልከት ድህረ-ነፃ ፈቃድ ቅጣትን ያስቀራል።",
+      apply: "ለቅድመ ነፃ ፈቃድ ያመልክቱ",
+    },
+    postWaiver: {
+      title: "ድህረ ነፃ ፈቃድ",
+      body: "ጭነቱ አስቀድሞ ደርሷል። በአንድ ጭነት አንድ ጊዜ ብቻ ይሰጣል፣ እና ደረሰኙ ተያይዞ የተከፈለ ቅጣት ካለ ብቻ።",
+      apply: "ለድህረ ነፃ ፈቃድ ያመልክቱ",
+    },
+    oneShipmentNotice: "እያንዳንዱ ነፃ ፈቃድ በማጫኛ ሰነዱ የሚለይ አንድ ጭነት ይሸፍናል። ተመሳሳይ የማጫኛ ሰነድ ጠቅሶ የሚቀርብ ሁለተኛ ማመልከቻ የመጀመሪያው ገና ንቁ ሆኖ ሳለ ውድቅ ይደረጋል።",
+    inProgress: "በሂደት ላይ ያሉ ማመልከቻዎች",
+    issuedLetters: "የወጡ ነፃ ፈቃድ ደብዳቤዎች",
+    emptyLetters: "እስካሁን የወጣ ነፃ ፈቃድ ደብዳቤ የለም።",
+    columns: {
+      reference: "ማጣቀሻ",
+      kind: "ዓይነት",
+      issued: "የወጣበት ቀን",
+      status: "ሁኔታ",
+    },
+    letter: "ደብዳቤ",
+    fetchFailed: "ደብዳቤውን ማግኘት አልተቻለም",
+    licenseStatus: {
+      ACTIVE: "ንቁ",
+      EXPIRED: "ጊዜው ያለፈበት",
+      SUSPENDED: "ታግዷል",
+      CANCELLED: "ተሰርዟል",
+      SUPERSEDED: "ተተክቷል",
+    },
+  },
 };
diff --git a/apps/portal/src/app/i18n/locales/en.ts b/apps/portal/src/app/i18n/locales/en.ts
index cd298ce08..f05f83645 100644
--- a/apps/portal/src/app/i18n/locales/en.ts
+++ b/apps/portal/src/app/i18n/locales/en.ts
@@ -5,6 +5,17 @@ export const en = {
     tagline: 'Maritime licensing & certification services',
   },
 
+  msg: {
+    genericError: 'Something went wrong. Please try again.',
+    serverError: 'Server error. Please try again later.',
+    validationError: 'Please check your input and try again.',
+    authError: 'Your session has expired. Please sign in again.',
+    permissionError: "You don't have permission to perform this action.",
+    notFoundError: 'The requested item was not found.',
+    fileTooLarge: 'The file is too large to upload.',
+    networkError: 'Network error. Check your connection and try again.',
+  },
+
   language: {
     label: 'Language',
     en: 'English',
@@ -40,12 +51,18 @@ export const en = {
     waiver: 'Waiver',
     certificates: 'Certificates',
     endorsements: 'Endorsements',
+    vesselRegistrations: 'Vessel Registration',
+    vesselTransfers: 'Vessel Transfers',
     documents: 'My Documents',
     notifications: 'Notifications',
     profile: 'Profile',
     support: 'Help & Support',
     collapseSidebar: 'Collapse',
     expandSidebar: 'Expand sidebar',
+    sectionSeafarerServices: 'Seafarer Services',
+    sectionVesselServices: 'Vessel Services',
+    sectionLogisticsLicensing: 'Logistics and Licensing',
+    sectionAccountManagement: 'Account Management',
   },
 
   common: {
@@ -75,6 +92,8 @@ export const en = {
     learnMore: 'Learn more',
     toggleTheme: 'Toggle light / dark mode',
     welcome: 'Welcome',
+    switchCalendar: 'Switch calendar type',
+    time: 'Time',
   },
 
   auth: {
@@ -90,6 +109,85 @@ export const en = {
     quickActions: 'Quick actions',
   },
 
+  applications: {
+    title: 'Licence applications',
+    subtitle: 'Track everything you have filed with EMA.',
+    newApplication: 'New application',
+    tabs: {
+      applications: 'Applications',
+      licences: 'Licences',
+      apply: 'Apply',
+    },
+    stats: {
+      needsYou: 'Needs your action',
+      inProgress: 'In progress',
+      completed: 'Completed',
+      activeLicences: 'Active licences',
+    },
+    filters: {
+      search: 'Search',
+      searchPlaceholder: 'Number or applicant',
+      status: 'Status',
+      any: 'Any',
+      from: 'From',
+      to: 'To',
+      clear: 'Clear',
+    },
+    empty: {
+      noneTitle: 'You have not filed any applications yet',
+      noneBody: 'Pick a licence from the Apply tab to get started.',
+      noMatchTitle: 'No applications match these filters',
+      noMatchBody: 'Try widening or clearing the filters.',
+      clearFilters: 'Clear filters',
+      browse: 'Browse licences',
+    },
+    card: {
+      submitted: 'Submitted {{date}}',
+      notFiled: 'Not filed yet',
+      feeDue: 'Fee due',
+    },
+    table: {
+      licence: 'Licence',
+      applicant: 'Applicant',
+      progress: 'Progress',
+    },
+    actions: {
+      continue: 'Continue',
+      fixResubmit: 'Fix & resubmit',
+      pay: 'Pay {{amount}} {{currency}}',
+      certificate: 'Certificate',
+      view: 'View',
+      bypass: 'Bypass payment',
+      renew: 'Renew',
+    },
+    notice: {
+      paymentReceived:
+        'Your payment has been received. The certificate is being prepared and will appear under Licences once it is issued.',
+      expiringSoon_one: 'A licence is expiring soon',
+      expiringSoon_other: '{{count}} licences are expiring soon',
+    },
+    licences: {
+      empty: 'No licence has been issued to you yet. One appears here once an application is approved and paid.',
+    },
+    status: {
+      DRAFT: 'Draft',
+      SUBMITTED: 'Submitted',
+      UNDER_REVIEW: 'Under Review',
+      UNDER_EVALUATION: 'Under Evaluation',
+      RESUBMIT_REQUIRED: 'Resubmit Required',
+      INSPECTION_PENDING: 'Inspection Pending',
+      INSPECTION_COMPLETED: 'Inspection Completed',
+      APPROVED: 'Approved',
+      REJECTED: 'Rejected',
+      ON_HOLD: 'On Hold',
+      PAYMENT_PENDING: 'Payment Pending',
+      PAID: 'Paid',
+      PAYMENT_CONFIRMED: 'Preparing Certificate',
+      CERTIFICATE_ISSUED: 'Certificate Issued',
+      COMPLETED: 'Completed',
+    },
+  },
+
   /** Field labels shared by the completeness nudge and the requirement gates. */
   profileFields: {
     firstName: 'First name',
@@ -128,6 +226,9 @@ export const en = {
     title_other: 'We need {{count}} more details before you continue',
     addDetails: 'Add these details',
     viewProfile: 'View full profile',
+    seafarerReason:
+      'Seafarer registration is built from your profile — these details fill it in for you.',
+    seafarerRedirect: 'Finish your profile to register as a seafarer. Still needed: {{fields}}',
   },
 
   profileSections: {
@@ -214,13 +315,18 @@ export const en = {
     },
   },
 
+  country: {
+    select: 'Select a country',
+    notFound: 'No countries found',
+  },
+
   location: {
     select: 'Select...',
     noOptions: 'No options found',
     noLocationsAvailable: 'No locations available',
     chooseFirst: 'Choose a location first',
-    subLocation: 'Sub-location',
     loading: 'Loading locations...',
+    loadFailed: 'Could not load locations',
   },
 
   support: {
@@ -245,6 +351,40 @@ export const en = {
       a4: 'You will see an "Action required" notice on the application. Provide the requested document or detail to resume the review.',
     },
   },
+
+  waiver: {
+    title: 'Maritime Waiver',
+    subtitle: 'Apply for a waiver when Ethiopian Shipping & Logistics cannot carry your shipment. Approval issues the bank waiver letter.',
+    preWaiver: {
+      title: 'Pre-waiver',
+      body: 'The cargo has not yet arrived. Applying before arrival avoids the post-waiver penalty.',
+      apply: 'Apply for a pre-waiver',
+    },
+    postWaiver: {
+      title: 'Post-waiver',
+      body: 'The cargo has already arrived. Granted once per shipment, and only against a settled penalty with the receipt attached.',
+      apply: 'Apply for a post-waiver',
+    },
+    oneShipmentNotice: 'Each waiver covers one shipment, identified by its bill of lading. A second application quoting the same bill of lading is refused while the first is live.',
+    inProgress: 'Applications in progress',
+    issuedLetters: 'Issued waiver letters',
+    emptyLetters: 'No waiver letters issued yet.',
+    columns: {
+      reference: 'Reference',
+      kind: 'Kind',
+      issued: 'Issued',
+      status: 'Status',
+    },
+    letter: 'Letter',
+    fetchFailed: 'Could not fetch the letter',
+    licenseStatus: {
+      ACTIVE: 'Active',
+      EXPIRED: 'Expired',
+      SUSPENDED: 'Suspended',
+      CANCELLED: 'Cancelled',
+      SUPERSEDED: 'Superseded',
+    },
+  },
 };
 
 export type Translations = typeof en;
diff --git a/apps/portal/src/app/layouts/PortalLayout.tsx b/apps/portal/src/app/layouts/PortalLayout.tsx
index 648c5e5d0..dcf5e0ce7 100644
--- a/apps/portal/src/app/layouts/PortalLayout.tsx
+++ b/apps/portal/src/app/layouts/PortalLayout.tsx
@@ -1,5 +1,5 @@
-import { AppShell } from '@mantine/core';
-import { useDisclosure } from '@mantine/hooks';
+import { AppShell } from "@mantine/core";
+import { useDisclosure } from "@mantine/hooks";
 import {
   IconArrowsExchange,
   IconBell,
@@ -14,15 +14,19 @@ import {
   IconShip,
   IconTruck,
   IconUserCircle,
-} from '@tabler/icons-react';
-import { Outlet, useLocation, useNavigate } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
-import { notify, AppHeader, AppSidebar } from '@ema-platform/ui';
-import type { NavItem } from '@ema-platform/ui';
-import { BrandMark, logout } from '@ema-platform/auth';
-import { SUPPORTED_LANGUAGES } from '../i18n/config';
-import { useAppSelector } from '../store/hooks';
+} from "@tabler/icons-react";
+import { Outlet, useLocation, useNavigate } from "react-router-dom";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
+import { notify, AppHeader, AppSidebar } from "@ema-platform/ui";
+import type { NavItem } from "@ema-platform/ui";
+import { BrandMark, logout } from "@ema-platform/auth";
+import { baseApi, useGetUnseenNotificationsQuery } from "@ema-platform/api";
+import { SUPPORTED_LANGUAGES } from "../i18n/config";
+import { useAppSelector } from "../store/hooks";
+
+const BADGE_POLL_MS = 60_000;
 
 type PortalNavItem = NavItem & { i18nKey: string };
 
@@ -35,51 +39,75 @@ type PortalNavItem = NavItem & { i18nKey: string };
 const NAV_SECTIONS: { label?: string; items: PortalNavItem[] }[] = [
   {
     items: [
-      { to: '/dashboard', label: 'Dashboard', i18nKey: 'nav.dashboard', icon: IconHome2 },
-      { to: '/notifications', label: 'Notifications', i18nKey: 'nav.notifications', icon: IconBell },
+      {
+        to: "/dashboard",
+        label: "Dashboard",
+        i18nKey: "nav.dashboard",
+        icon: IconHome2,
+      },
+      {
+        to: "/notifications",
+        label: "Notifications",
+        i18nKey: "nav.notifications",
+        icon: IconBell,
+      },
     ],
   },
   {
-    label: 'nav.groupLicensing',
+    label: "nav.groupLicensing",
     items: [
       { to: '/licensing/applications', label: 'My Applications', i18nKey: 'nav.myApplications', icon: IconTruck },
       { to: '/waiver', label: 'Waiver', i18nKey: 'nav.waiver', icon: IconShieldOff },
     ],
   },
   {
-    label: 'nav.groupSeafarer',
+    label: "nav.groupSeafarer",
     items: [
       { to: '/seafarer-registration', label: 'Seafarer Registration', i18nKey: 'nav.seafarerRegistration', icon: IconList },
       { to: '/seafarer/records', label: 'My Sea Records', i18nKey: 'nav.seaRecords', icon: IconList },
       { to: '/seaman-book', label: 'Seaman Book', i18nKey: 'nav.myApplication', icon: IconSend, soon: true },
       { to: '/certificates', label: 'Certificates', i18nKey: 'nav.certificates', icon: IconShieldCheck },
       { to: '/exams', label: 'Examinations', i18nKey: 'nav.exams', icon: IconList },
-      { to: '/endorsements', label: 'Endorsements', i18nKey: 'nav.endorsements', icon: IconRubberStamp, soon: true },
+      { to: '/endorsements', label: 'Endorsements', i18nKey: 'nav.endorsements', icon: IconRubberStamp },
     ],
   },
   {
-    label: 'nav.groupVessels',
+    label: "nav.groupVessels",
     items: [
       { to: '/vessel-registration', label: 'Vessel Registration', i18nKey: 'nav.vesselRegistration', icon: IconShip },
-      { to: '/vessel-registration/transfer', label: 'Ownership Transfer', i18nKey: 'nav.ownershipTransfer', icon: IconArrowsExchange, soon: true },
+      { to: '/vessel-ownership-transfer', label: 'Ownership Transfer', i18nKey: 'nav.ownershipTransfer', icon: IconArrowsExchange },
     ],
   },
   {
-    label: 'nav.groupAccount',
+    label: "nav.groupAccount",
     items: [
-      { to: '/documents', label: 'My Documents', i18nKey: 'nav.documents', icon: IconFolderOpen },
-      { to: '/profile', label: 'Profile', i18nKey: 'nav.profile', icon: IconUserCircle },
-      { to: '/support', label: 'Help & Support', i18nKey: 'nav.support', icon: IconHeadset },
+      {
+        to: "/documents",
+        label: "My Documents",
+        i18nKey: "nav.documents",
+        icon: IconFolderOpen,
+      },
+      {
+        to: "/profile",
+        label: "Profile",
+        i18nKey: "nav.profile",
+        icon: IconUserCircle,
+      },
+      {
+        to: "/support",
+        label: "Help & Support",
+        i18nKey: "nav.support",
+        icon: IconHeadset,
+      },
     ],
   },
 ];
 
-
 const PAGE_META: Record<string, { i18nKey: string }> = {
   '/dashboard':    { i18nKey: 'nav.dashboard' },
   '/vessel-registration-dashboard': { i18nKey: 'nav.vesselRegistrationDashboard' },
   '/vessel-registration': { i18nKey: 'nav.vesselRegistration' },
-  '/vessel-registration/transfer': { i18nKey: 'nav.ownershipTransfer' },
+  '/vessel-ownership-transfer': { i18nKey: 'nav.ownershipTransfer' },
   '/licensing/applications': { i18nKey: 'nav.myApplications' },
   '/waiver': { i18nKey: 'nav.waiver' },
   '/seafarer-registration': { i18nKey: 'nav.seafarerRegistration' },
@@ -102,14 +130,32 @@ export function PortalLayout() {
   const user = useAppSelector((state) => state.auth.user);
   const [navOpened, { toggle: toggleNav, close: closeNav }] = useDisclosure();
   const [sidebarCollapsed, { toggle: toggleSidebar }] = useDisclosure(false);
+  const { data: unseen } = useGetUnseenNotificationsQuery(undefined, {
+    pollingInterval: BADGE_POLL_MS,
+    refetchOnMountOrArgChange: false,
+  });
+
+  const sections = useMemo(
+    () =>
+      NAV_SECTIONS.map((section) => ({
+        label: section.label,
+        items: section.items.map(({ i18nKey, ...rest }) => ({
+          ...rest,
+          label: t(i18nKey),
+          badge:
+            rest.to === "/notifications" && unseen?.count ? unseen.count : undefined,
+        })),
+      })),
+    [t, unseen?.count],
+  );
 
   // Breadcrumb trail
-  const segments = location.pathname.split('/').filter(Boolean);
+  const segments = location.pathname.split("/").filter(Boolean);
   const crumbs = [
-    { label: t('nav.dashboard'), path: '/dashboard' },
+    { label: t("nav.dashboard"), path: "/dashboard" },
     ...segments
-      .map((_, i) => '/' + segments.slice(0, i + 1).join('/'))
-      .filter((path) => PAGE_META[path] && path !== '/dashboard')
+      .map((_, i) => "/" + segments.slice(0, i + 1).join("/"))
+      .filter((path) => PAGE_META[path] && path !== "/dashboard")
       .map((path) => ({ label: t(PAGE_META[path].i18nKey), path })),
   ];
 
@@ -126,28 +172,34 @@ export function PortalLayout() {
 
   const handleLogout = () => {
     dispatch(logout());
-    navigate('/login');
+    dispatch(baseApi.util.resetApiState());
+    navigate("/login");
   };
 
-  const displayName = user?.name?.en || user?.username || '';
+  const displayName = user?.name?.en || user?.username || "";
   const initials = displayName
-    ? displayName.split(/\s+/).map((s) => s[0]).join('').toUpperCase().slice(0, 2)
-    : '?';
+    ? displayName
+        .split(/\s+/)
+        .map((s) => s[0])
+        .join("")
+        .toUpperCase()
+        .slice(0, 2)
+    : "?";
 
   return (
     <AppShell
       header={{ height: 74 }}
       navbar={{
         width: sidebarCollapsed ? 72 : 264,
-        breakpoint: 'sm',
+        breakpoint: "sm",
         collapsed: { mobile: !navOpened },
       }}
       padding="lg"
     >
       <AppShell.Header
         style={{
-          background: 'var(--mantine-color-body)',
-          borderBottom: '1px solid var(--mantine-color-gray-2)',
+          background: "var(--mantine-color-body)",
+          borderBottom: "1px solid var(--mantine-color-gray-2)",
         }}
       >
         <AppHeader
@@ -157,32 +209,31 @@ export function PortalLayout() {
           breadcrumbs={crumbs}
           onNavigate={navigate}
           onLogout={handleLogout}
-          userName={displayName || t('app.name')}
+          userName={displayName || t("app.name")}
           userInitials={initials}
           supportedLanguages={SUPPORTED_LANGUAGES}
+          onNotificationsClick={() => navigate("/notifications")}
+          notificationCount={unseen?.count}
         />
       </AppShell.Header>
 
       <AppShell.Navbar
         p={0}
         style={{
-          overflow: 'hidden',
-          transition: 'width 200ms ease',
-          background: 'var(--mantine-color-body)',
-          borderRight: '1px solid var(--mantine-color-gray-2)',
+          overflow: "hidden",
+          transition: "width 200ms ease",
+          background: "var(--mantine-color-body)",
+          borderRight: "1px solid var(--mantine-color-gray-2)",
         }}
       >
         <AppSidebar
-          navItems={NAV_SECTIONS.map((section) => ({
-            label: section.label,
-            items: section.items.map(({ i18nKey, ...rest }) => ({ ...rest, label: t(i18nKey) })),
-          }))}
+          navItems={sections}
           collapsed={sidebarCollapsed}
           activePath={location.pathname}
           onToggleCollapse={toggleSidebar}
           onNavigate={go}
-          brandName={t('app.name')}
-          brandSubtitle={t('app.authority')}
+          brandName={t("app.name")}
+          brandSubtitle={t("app.authority")}
           brandLogo={<BrandMark size={32} />}
         />
       </AppShell.Navbar>
diff --git a/apps/portal/src/app/router.tsx b/apps/portal/src/app/router.tsx
index 5163a8b3d..ea161b1cc 100644
--- a/apps/portal/src/app/router.tsx
+++ b/apps/portal/src/app/router.tsx
@@ -1,74 +1,92 @@
-import { createBrowserRouter, Navigate } from 'react-router-dom';
-import { I18nextProvider } from 'react-i18next';
-import { i18n } from './i18n/config';
-import { PortalLayout } from './layouts/PortalLayout';
-import { ProtectedRoute } from './components/ProtectedRoute';
+import { createBrowserRouter, Navigate } from "react-router-dom";
+import { I18nextProvider } from "react-i18next";
+import { i18n } from "./i18n/config";
+import { PortalLayout } from "./layouts/PortalLayout";
+import { ProtectedRoute } from "./components/ProtectedRoute";
 
 // Auth (standalone pages, no portal chrome)
-import { LoginPage, SignupPage, OTPVerificationPage, ForgotPasswordPage, SetPasswordPage } from '@ema-platform/auth';
+import {
+  LoginPage,
+  SignupPage,
+  OTPVerificationPage,
+  ForgotPasswordPage,
+  SetPasswordPage,
+} from "@ema-platform/auth";
 
 // Portal feature pages
-import { DashboardPage } from './features/dashboard/pages/DashboardPage';
-import { RequireOperations } from './features/onboarding/components/RequireOperations';
-import { OperationsOnboardingPage } from './features/onboarding/pages/OperationsOnboardingPage';
-import { ProfilePage } from './features/profile/pages/ProfilePage';
-import { SupportPage } from './features/support/pages/SupportPage';
-import { SeafarerRegistrationPage } from './features/seafarer/pages/SeafarerRegistrationPage';
-import { MySeaRecordsPage } from './features/seafarer/pages/MySeaRecordsPage';
-import { VerifyCertificatePage } from './features/verify/pages/VerifyCertificatePage';
-import { ExamsPage } from './features/exams/pages/ExamsPage';
+import { DashboardPage } from "./features/dashboard/pages/DashboardPage";
+import { RequireOperations } from "./features/onboarding/components/RequireOperations";
+import { RequireSeafarerProfile } from "./features/profile/components/RequireSeafarerProfile";
+import { OperationsOnboardingPage } from "./features/onboarding/pages/OperationsOnboardingPage";
+import { ProfilePage } from "./features/profile/pages/ProfilePage";
+import { SupportPage } from "./features/support/pages/SupportPage";
+import { SeafarerRegistrationPage } from "./features/seafarer/pages/SeafarerRegistrationPage";
+import { MySeaRecordsPage } from "./features/seafarer/pages/MySeaRecordsPage";
+import { VerifyCertificatePage } from "./features/verify/pages/VerifyCertificatePage";
+import { ExamsPage } from "./features/exams/pages/ExamsPage";
 
 // Phase 1 pages
-import { DocumentVaultPage } from './features/documents/pages/DocumentVaultPage';
-import { SeamanBookPage } from './features/seaman-book/pages/SeamanBookPage';
-import { SeamanBookApplicationPage } from './features/seaman-book/pages/SeamanBookApplicationPage';
-import { NotificationsPage } from './features/notifications/pages/NotificationsPage';
+import { DocumentVaultPage } from "./features/documents/pages/DocumentVaultPage";
+import { SeamanBookPage } from "./features/seaman-book/pages/SeamanBookPage";
+import { SeamanBookApplicationPage } from "./features/seaman-book/pages/SeamanBookApplicationPage";
+import { NotificationsPage } from "./features/notifications/pages/NotificationsPage";
 
 // Phase 2 — CoC / CoP
-import { CertificatesPage } from './features/certificates/pages/CertificatesPage';
-import { CoCApplicationPage } from './features/certificates/pages/CoCApplicationPage';
+import { CertificatesPage } from "./features/certificates/pages/CertificatesPage";
+import { CoCApplicationPage } from "./features/certificates/pages/CoCApplicationPage";
 
 // Phase 3 — Endorsement
-import { EndorsementPage } from './features/endorsement/pages/EndorsementPage';
-import { VesselRegistrationPage } from './features/vessel-registration/pages/VesselRegistrationPage';
-import { OwnershipTransferPage } from './features/vessel-registration/pages/OwnershipTransferPage';
-import { MyApplicationsPage } from './features/licensing/pages/MyApplicationsPage';
-import { PaymentCheckPage } from './features/payments/pages/PaymentCheckPage';
-import { PaymentSuccessPage } from './features/payments/pages/PaymentSuccessPage';
-import { PaymentFailurePage } from './features/payments/pages/PaymentFailurePage';
-import { LicenseApplicationPage } from './features/licensing/pages/LicenseApplicationPage';
-import { WaiverPage } from './features/waiver/pages/WaiverPage';
+import { EndorsementPage } from "./features/endorsement/pages/EndorsementPage";
+import { VesselRegistrationPage } from "./features/vessel-registration/pages/VesselRegistrationPage";
+import { VesselTransferPage } from "./features/vessel-registration/pages/VesselTransferPage";
+import { MyApplicationsPage } from "./features/licensing/pages/MyApplicationsPage";
+import { PaymentCheckPage } from "./features/payments/pages/PaymentCheckPage";
+import { PaymentSuccessPage } from "./features/payments/pages/PaymentSuccessPage";
+import { PaymentFailurePage } from "./features/payments/pages/PaymentFailurePage";
+import { LicenseApplicationPage } from "./features/licensing/pages/LicenseApplicationPage";
+import { ApplicationRedirectPage } from "./features/licensing/pages/ApplicationRedirectPage";
+import { WaiverPage } from "./features/waiver/pages/WaiverPage";
+
+import { VesselRegistrationStatusPage } from "./features/vessel-registration/pages/VesselRegistrationStatusPage";
 
 export const router = createBrowserRouter([
   // Public auth pages
-  { path: '/login', element: <LoginPage /> },
-  { path: '/signup', element: <SignupPage /> },
+  { path: "/login", element: <LoginPage /> },
+  { path: "/signup", element: <SignupPage /> },
 
   // Public certificate verification — the target of every printed QR code.
   // No auth: a verifier scanning a certificate has no portal account.
-  { path: '/verify', element: <VerifyCertificatePage /> },
-  { path: '/verify/:code', element: <VerifyCertificatePage /> },
+  { path: "/verify", element: <VerifyCertificatePage /> },
+  { path: "/verify/:code", element: <VerifyCertificatePage /> },
 
   // Completes the forgot-password flow; the reset message links here. The
   // IAM package generates `/reset-password` links, `/set-password` is the
   // first-time-credential variant — one page serves both.
-  { path: '/set-password', element: <SetPasswordPage /> },
-  { path: '/reset-password', element: <SetPasswordPage /> },
+  { path: "/set-password", element: <SetPasswordPage /> },
+  { path: "/reset-password", element: <SetPasswordPage /> },
 
   // Protected auth pages
   {
-    element: <ProtectedRoute><OTPVerificationPage /></ProtectedRoute>,
-    path: '/otp-verify',
+    element: (
+      <ProtectedRoute>
+        <OTPVerificationPage />
+      </ProtectedRoute>
+    ),
+    path: "/otp-verify",
   },
   {
-    element: <ProtectedRoute><ForgotPasswordPage /></ProtectedRoute>,
-    path: '/forgot-password',
+    element: (
+      <ProtectedRoute>
+        <ForgotPasswordPage />
+      </ProtectedRoute>
+    ),
+    path: "/forgot-password",
   },
   // The two-step setup wizard is gone. Signing up lands on the dashboard, and
   // profile details are collected where they are actually needed: on /profile,
   // via the dashboard nudge, or inline in an application flow. The path stays
   // as a redirect so existing bookmarks and emailed links do not 404.
-  { path: '/profile-setup', element: <Navigate to="/profile" replace /> },
+  { path: "/profile-setup", element: <Navigate to="/profile" replace /> },
 
   // Portal — protected.
   {
@@ -84,89 +102,204 @@ export const router = createBrowserRouter([
       </ProtectedRoute>
     ),
     children: [
-      { path: '/', element: <Navigate to="/dashboard" replace /> },
-      { path: '/dashboard', element: <DashboardPage /> },
-      { path: '/onboarding/operations', element: <OperationsOnboardingPage /> },
+      { path: "/", element: <Navigate to="/dashboard" replace /> },
+      { path: "/dashboard", element: <DashboardPage /> },
+      { path: "/onboarding/operations", element: <OperationsOnboardingPage /> },
 
       // Config-driven licensing: one set of pages serves every licence type.
-      { path: '/licensing/applications', element: <MyApplicationsPage /> },
+      { path: "/licensing/applications", element: <MyApplicationsPage /> },
 
       // Telebirr returns the applicant to these.
-      { path: '/payments/check', element: <PaymentCheckPage /> },
-      { path: '/payments/success', element: <PaymentSuccessPage /> },
-      { path: '/payments/failure', element: <PaymentFailurePage /> },
-      { path: '/licensing/:typeCode/apply', element: <LicenseApplicationPage /> },
+      { path: "/payments/check", element: <PaymentCheckPage /> },
+      { path: "/payments/success", element: <PaymentSuccessPage /> },
+      { path: "/payments/failure", element: <PaymentFailurePage /> },
       {
-        path: '/licensing/:typeCode/applications/:applicationId',
+        path: "/licensing/:typeCode/apply",
+        element: (
+          <RequireSeafarerProfile>
+            <LicenseApplicationPage />
+          </RequireSeafarerProfile>
+        ),
+      },
+      {
+        path: "/licensing/:typeCode/applications/:applicationId",
         element: <LicenseApplicationPage />,
       },
+      // Notification / email deep links arrive as /applications/<id>; resolve the
+      // licence type and forward to the canonical route.
+      {
+        path: "/applications/:applicationId",
+        element: <ApplicationRedirectPage />,
+      },
 
       // Seafarer
-      { path: '/seafarer-registration', element: <SeafarerRegistrationPage /> },
-      { path: '/seafarer/records', element: <MySeaRecordsPage /> },
-      { path: '/exams', element: <ExamsPage /> },
+      {
+        path: "/seafarer-registration",
+        element: (
+          <RequireSeafarerProfile>
+            <SeafarerRegistrationPage />
+          </RequireSeafarerProfile>
+        ),
+      },
+      { path: "/seafarer/records", element: <MySeaRecordsPage /> },
+      { path: "/exams", element: <ExamsPage /> },
       // The public-facing registry was a hardcoded mock and does not belong in
       // the applicant portal; officers browse seafarers in the backoffice.
-      { path: '/seafarer-registry', element: <Navigate to="/seafarer-registration" replace /> },
-      { path: '/seafarer-registry/:id', element: <Navigate to="/seafarer-registration" replace /> },
+      {
+        path: "/seafarer-registry",
+        element: <Navigate to="/seafarer-registration" replace />,
+      },
+      {
+        path: "/seafarer-registry/:id",
+        element: <Navigate to="/seafarer-registration" replace />,
+      },
 
       // Phase 1
-      { path: '/documents', element: <DocumentVaultPage /> },
-      { path: '/seaman-book', element: <SeamanBookPage /> },
-      { path: '/seaman-book/apply', element: <SeamanBookApplicationPage /> },
-      { path: '/notifications', element: <NotificationsPage /> },
+      { path: "/documents", element: <DocumentVaultPage /> },
+      { path: "/seaman-book", element: <SeamanBookPage /> },
+      { path: "/seaman-book/apply", element: <SeamanBookApplicationPage /> },
+      { path: "/notifications", element: <NotificationsPage /> },
 
       // Phase 2 — CoC / CoP
-      { path: '/certificates', element: <CertificatesPage /> },
-      { path: '/certificates/apply', element: <CoCApplicationPage /> },
+      { path: "/certificates", element: <CertificatesPage /> },
+      { path: "/certificates/apply", element: <CoCApplicationPage /> },
 
       // Phase 3 — Endorsement
-      { path: '/endorsements', element: <EndorsementPage /> },
-      { path: '/vessel-registration', element: <VesselRegistrationPage /> },
+      { path: "/endorsements", element: <EndorsementPage /> },
+      { path: "/vessel-registration", element: <VesselRegistrationPage /> },
       // The registration wizard is the config-driven licensing flow; the old
       // standalone wizard posted to endpoints that never existed.
-      { path: '/vessel-registration/apply', element: <Navigate to="/licensing/VESSEL_REGISTRATION/apply" replace /> },
-      { path: '/vessel-registration-dashboard', element: <Navigate to="/vessel-registration" replace /> },
-      { path: '/vessel-registration/transfer', element: <OwnershipTransferPage /> },
+      {
+        path: "/vessel-registration/apply",
+        element: <Navigate to="/licensing/VESSEL_REGISTRATION/apply" replace />,
+      },
+      {
+        path: "/vessel-registration-dashboard",
+        element: <Navigate to="/vessel-registration" replace />,
+      },
+      { path: "/vessel-ownership-transfer", element: <VesselTransferPage /> },
+      // The nav item used to nest this under /vessel-registration, which made
+      // the sidebar's prefix-match (nav-utils.ts isItemActive) light up both
+      // items at once. Kept as a redirect for old bookmarks/links.
+      {
+        path: "/vessel-registration/transfer",
+        element: <Navigate to="/vessel-ownership-transfer" replace />,
+      },
       // Legacy per-licence-type URLs. Each once had its own hand-written page
       // that posted to a `/logistics-licenses/*` endpoint the API never had,
       // and dropped every uploaded document on the floor. They are kept as
       // redirects so old bookmarks land somewhere real; the config-driven
       // wizard below serves every licence type from one place.
-      { path: '/logistics-dashboard', element: <Navigate to="/dashboard" replace /> },
-      { path: '/freight-forwarder-license', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/freight-forwarder-license/apply', element: <Navigate to="/licensing/FREIGHT_FORWARDER/apply" replace /> },
-      { path: '/freight-forwarder-license/:id/renew', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/shipping-agent-license', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/shipping-agent-license/apply', element: <Navigate to="/licensing/SHIPPING_AGENT/apply" replace /> },
-      { path: '/shipping-agent-license/:id/renew', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/combined-license', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/combined-license/apply', element: <Navigate to="/licensing/COMBINED_SA_FF/apply" replace /> },
-      { path: '/combined-license/:id/renew', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/joint-investment-license', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/joint-investment-license/apply', element: <Navigate to="/licensing/JOINT_INVESTOR/apply" replace /> },
-      { path: '/joint-investment-license/:id/renew', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/mto-license', element: <Navigate to="/licensing/applications" replace /> },
-      { path: '/mto-license/apply', element: <Navigate to="/licensing/MULTIMODAL_TRANSPORT_OPERATOR/apply" replace /> },
-      { path: '/mto-license/:id/renew', element: <Navigate to="/licensing/applications" replace /> },
+      {
+        path: "/logistics-dashboard",
+        element: <Navigate to="/dashboard" replace />,
+      },
+      {
+        path: "/freight-forwarder-license",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/freight-forwarder-license/apply",
+        element: <Navigate to="/licensing/FREIGHT_FORWARDER/apply" replace />,
+      },
+      {
+        path: "/freight-forwarder-license/:id/renew",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/shipping-agent-license",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/shipping-agent-license/apply",
+        element: <Navigate to="/licensing/SHIPPING_AGENT/apply" replace />,
+      },
+      {
+        path: "/shipping-agent-license/:id/renew",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/combined-license",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/combined-license/apply",
+        element: <Navigate to="/licensing/COMBINED_SA_FF/apply" replace />,
+      },
+      {
+        path: "/combined-license/:id/renew",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/joint-investment-license",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/joint-investment-license/apply",
+        element: <Navigate to="/licensing/JOINT_INVESTOR/apply" replace />,
+      },
+      {
+        path: "/joint-investment-license/:id/renew",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/mto-license",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
+      {
+        path: "/mto-license/apply",
+        element: (
+          <Navigate
+            to="/licensing/MULTIMODAL_TRANSPORT_OPERATOR/apply"
+            replace
+          />
+        ),
+      },
+      {
+        path: "/mto-license/:id/renew",
+        element: <Navigate to="/licensing/applications" replace />,
+      },
       // Waiver has no backend yet, so it says so rather than pretending.
-      { path: '/waiver', element: <WaiverPage /> },
-      { path: '/waiver/apply', element: <Navigate to="/waiver" replace /> },
+      { path: "/waiver", element: <WaiverPage /> },
+      { path: "/waiver/apply", element: <Navigate to="/waiver" replace /> },
+
+      // Vessel Registration
+      { path: "/vessel-registrations", element: <VesselRegistrationPage /> },
+      // { path: '/vessel-registrations/apply', element: <VesselRegistrationPage /> },
+      {
+        path: "/vessel-registrations/:id",
+        element: <VesselRegistrationStatusPage />,
+      },
 
       // General
-      { path: '/profile', element: <ProfilePage /> },
-      { path: '/support', element: <SupportPage /> },
+      { path: "/profile", element: <ProfilePage /> },
+      { path: "/support", element: <SupportPage /> },
     ],
   },
 
   // The separate vessel-owner login/portal was mock-only and called auth
   // endpoints that never existed; vessel owners are ordinary portal users.
-  { path: '/vessel-owner/login', element: <Navigate to="/login" replace /> },
-  { path: '/vessel-owner/register', element: <Navigate to="/signup" replace /> },
-  { path: '/vessel-owner/dashboard', element: <Navigate to="/vessel-registration" replace /> },
-  { path: '/vessel-owner/registration', element: <Navigate to="/vessel-registration" replace /> },
-  { path: '/vessel-owner/registration/apply', element: <Navigate to="/licensing/VESSEL_REGISTRATION/apply" replace /> },
-  { path: '/vessel-owner/registration/transfer', element: <Navigate to="/vessel-registration/transfer" replace /> },
+  { path: "/vessel-owner/login", element: <Navigate to="/login" replace /> },
+  {
+    path: "/vessel-owner/register",
+    element: <Navigate to="/signup" replace />,
+  },
+  {
+    path: "/vessel-owner/dashboard",
+    element: <Navigate to="/vessel-registration" replace />,
+  },
+  {
+    path: "/vessel-owner/registration",
+    element: <Navigate to="/vessel-registration" replace />,
+  },
+  {
+    path: "/vessel-owner/registration/apply",
+    element: <Navigate to="/licensing/VESSEL_REGISTRATION/apply" replace />,
+  },
+  {
+    path: "/vessel-owner/registration/transfer",
+    element: <Navigate to="/vessel-ownership-transfer" replace />,
+  },
 
-  { path: '*', element: <Navigate to="/" replace /> },
+  { path: "*", element: <Navigate to="/" replace /> },
 ]);
diff --git a/apps/portal/src/app/store/index.ts b/apps/portal/src/app/store/index.ts
index a48e46406..f68e7bfaa 100644
--- a/apps/portal/src/app/store/index.ts
+++ b/apps/portal/src/app/store/index.ts
@@ -1,5 +1,5 @@
-import { configureStore } from '@reduxjs/toolkit';
-import { baseApi, configureTokenRefresh } from '@ema-platform/api';
+import { configureStore } from "@reduxjs/toolkit";
+import { baseApi, configureTokenRefresh } from "@ema-platform/api";
 import {
   authReducer,
   signupReducer,
@@ -7,17 +7,23 @@ import {
   authStorage,
   refreshAccessToken,
   logout,
-} from '@ema-platform/auth';
-import type { AuthUser, CurrentProfile } from '@ema-platform/auth';
+  setToken,
+} from "@ema-platform/auth";
+import type { AuthUser, CurrentProfile } from "@ema-platform/auth";
 
-configureAuthStorage('ema-portal');
+configureAuthStorage("ema-portal", true);
 
 const preloadedAuth = (() => {
   const token = authStorage.getToken();
   const user = authStorage.getUser<AuthUser>();
   const profile = authStorage.getProfile<CurrentProfile>();
   if (token && user) {
-    return { token, user, isAuthenticated: true, currentProfile: profile ?? null };
+    return {
+      token,
+      user,
+      isAuthenticated: true,
+      currentProfile: profile ?? null,
+    };
   }
   return undefined;
 })();
@@ -34,10 +40,17 @@ export const store = configureStore({
 });
 
 configureTokenRefresh({
-  onTokenExpired: refreshAccessToken,
+  onTokenExpired: async () => {
+    const token = await refreshAccessToken();
+
+    store.dispatch(setToken(token));
+
+    return token;
+  },
+
   onAuthFailure: () => {
     store.dispatch(logout());
-    window.location.href = '/login';
+    window.location.href = "/login";
   },
 });
 
diff --git a/apps/portal/src/app/theme/portalTheme.ts b/apps/portal/src/app/theme/portalTheme.ts
index f8badb5e2..01bba6e3c 100644
--- a/apps/portal/src/app/theme/portalTheme.ts
+++ b/apps/portal/src/app/theme/portalTheme.ts
@@ -93,6 +93,22 @@ export const portalTheme = createTheme({
     Textarea: { defaultProps: { radius: 'md' } },
     Select: { defaultProps: { radius: 'md' } },
     PasswordInput: { defaultProps: { radius: 'md' } },
+    // Mantine's stock scroll wrapper (NativeScrollArea) discards the
+    // max-height it's handed unless scrollAreaComponent is set, so a modal
+    // taller than the viewport just gets clipped with no way to scroll it.
+    // Making the body the scrollport here fixes every Modal/Drawer at once.
+    Modal: {
+      styles: {
+        content: { display: 'flex', flexDirection: 'column', maxHeight: '90dvh' },
+        body: { flex: '1 1 auto', minHeight: 0, overflowY: 'auto' },
+      },
+    },
+    Drawer: {
+      styles: {
+        content: { display: 'flex', flexDirection: 'column' },
+        body: { flex: '1 1 auto', minHeight: 0, overflowY: 'auto' },
+      },
+    },
   },
   other: {
     heroGradient: 'linear-gradient(135deg, #3160b7 0%, #1fc29d 100%)',
diff --git a/apps/portal/src/main.tsx b/apps/portal/src/main.tsx
index f7c029fd1..1297bc950 100644
--- a/apps/portal/src/main.tsx
+++ b/apps/portal/src/main.tsx
@@ -1,6 +1,7 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import '@mantine/core/styles.css';
+import '@mantine/dates/styles.css';
 import '@mantine/notifications/styles.css';
 import './app/theme/portal.css';
 
diff --git a/apps/portal/src/styles.css b/apps/portal/src/styles.css
index 451e3b27d..a5b3a8408 100644
--- a/apps/portal/src/styles.css
+++ b/apps/portal/src/styles.css
@@ -2,3 +2,41 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+/* ---------------------------------------------------------------------------
+   Scrollbars — themed instead of the raw OS default, so a dark page doesn't
+   carry a stark white scrollbar (or vice versa). Firefox via scrollbar-color,
+   Chrome/Safari/Edge via the ::-webkit-scrollbar-* pseudo-elements. Colors
+   come from Mantine's dark palette so they track the active color scheme
+   instead of a fixed gray.
+   --------------------------------------------------------------------------- */
+* {
+  scrollbar-width: thin;
+  scrollbar-color: var(--mantine-color-gray-5) transparent;
+}
+[data-mantine-color-scheme='dark'] * {
+  scrollbar-color: var(--mantine-color-dark-3) transparent;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+::-webkit-scrollbar-thumb {
+  background-color: var(--mantine-color-gray-5);
+  border-radius: 8px;
+  border: 2px solid transparent;
+  background-clip: content-box;
+}
+::-webkit-scrollbar-thumb:hover {
+  background-color: var(--mantine-color-gray-6);
+}
+[data-mantine-color-scheme='dark'] ::-webkit-scrollbar-thumb {
+  background-color: var(--mantine-color-dark-3);
+}
+[data-mantine-color-scheme='dark'] ::-webkit-scrollbar-thumb:hover {
+  background-color: var(--mantine-color-dark-2);
+}
diff --git a/docs/vessel-ownership-transfer.md b/docs/vessel-ownership-transfer.md
new file mode 100644
index 000000000..c684ec3a5
--- /dev/null
+++ b/docs/vessel-ownership-transfer.md
@@ -0,0 +1,39 @@
+# Vessel Ownership Transfer — mock implementation notes (for API integration)
+
+Portal (owner-facing) + Backoffice (officer-facing) built as **mock UI only**, matching each app's existing mock-driven review-workflow convention. No backend calls anywhere. This doc exists to make wiring the real API fast — it says exactly what to replace and where.
+
+## What exists
+
+### Portal (`apps/portal/src/app/features/vessel-transfer/`)
+- `mock.ts` — types + `MOCK_VESSELS`, `MOCK_REQUESTS`, `addTransferRequest()`
+- `pages/VesselTransferPage.tsx` — list/status view (`/vessel-transfers`)
+- `pages/VesselTransferApplicationPage.tsx` — 4-step submit wizard (`/vessel-transfers/apply`)
+
+### Backoffice (`apps/backoffice/src/app/features/vessel-transfer/`)
+- `pages/VesselTransferQueuePage.tsx` — types + `MOCK_REQUESTS`, queue table, stats, quick-view drawer (`/vessel-transfers`)
+- `pages/VesselTransferReviewPage.tsx` — full review, approve/reject, doc view/download (`/vessel-transfers/:id`)
+
+Each app defines its **own separate mock array** (codebase convention: no shared domain types in `libs/`). They are not the same objects and don't sync — submitting in portal does not appear in the backoffice queue, and vice versa. That's the main thing a real API fixes.
+
+## Data shape mismatch to resolve
+
+Portal's `TransferRequest.currentOwner` / `newOwnerName` are plain strings. Backoffice's `TransferRequest.currentOwner` / `newOwner` are full objects (`{ name, idOrTin, phone, email, address }`). The real API should standardize on the **backoffice shape** — it's the superset the officer review page needs.
+
+**Known gap:** `VesselTransferApplicationPage.tsx`'s wizard collects `newOwnerIdOrTin`, `newOwnerPhone`, `newOwnerEmail`, `newOwnerAddress` and shows them in the review step, but `addTransferRequest()` only persists `newOwnerName` — the rest are captured in UI state and silently dropped on submit. When wiring the real POST, send all of them (the fields already exist in component state, just not in the payload today).
+
+## Suggested API surface
+
+- `GET /vessels?ownerId=:id&status=approved` — portal wizard's vessel `<Select>` (replaces `MOCK_VESSELS.filter(v => v.approved)` in `VesselTransferApplicationPage.tsx`).
+- `POST /vessel-transfers` — submit. Body: `vesselId, newOwner: {name, idOrTin, phone, email, address}, reason, document (file upload)`. Replaces `addTransferRequest()` in portal's `mock.ts`.
+- `GET /vessel-transfers?ownerId=:id` — portal's "My Transfer Requests" list (`VesselTransferPage.tsx`).
+- `GET /vessel-transfers` (officer, all + filters) — backoffice queue (`VesselTransferQueuePage.tsx`); search/status-filter can move server-side or stay client-side over the fetched page.
+- `GET /vessel-transfers/:id` — backoffice review page and portal status detail both key off this.
+- `PATCH /vessel-transfers/:id` — officer action. Body: `{ status: 'Under Review' | 'Approved' | 'Rejected', remarks? }`. Replaces the in-place `record.status = ...` mutation in `VesselTransferReviewPage.tsx`. Backend should enforce remarks-required-on-Rejected (UI already gates this, but don't trust client-only validation).
+- Document storage: real upload + signed URL for View, and a real download endpoint — today `getDocUrl()` in both `CoCReviewPage`-style `DocViewer`s and this feature's `VesselTransferReviewPage.tsx` fake it with a hardcoded base64 PDF / placehold.co image.
+- SMS/email: triggered server-side on submit and on every status change — UI currently just shows a toast claiming this happened (`notify.success('... SMS and email ...')`); no actual send anywhere.
+
+## Where to swap mock for real calls
+
+- Portal: `apps/portal/src/app/features/vessel-transfer/mock.ts` (whole file), plus the `useState`/local reads of `MOCK_VESSELS`/`MOCK_REQUESTS` in both page files.
+- Backoffice: the exported `MOCK_REQUESTS`/types block at the top of `VesselTransferQueuePage.tsx`, plus the direct `record.status = ...` mutation in `VesselTransferReviewPage.tsx` (swap for a mutation call + refetch/cache-invalidate).
+- Both apps already have an RTK Query base (`@ema-platform/api` → `baseApi.injectEndpoints`, see `apps/portal/.../payment/api/payment-api.ts` or `apps/backoffice/.../certification/api/certification-api.ts`) — follow that pattern rather than the ad-hoc `useApiQuery`/`useApiMutation` escape hatch.
diff --git a/docs/vessel-registration.md b/docs/vessel-registration.md
new file mode 100644
index 000000000..556226a39
--- /dev/null
+++ b/docs/vessel-registration.md
@@ -0,0 +1,73 @@
+# Vessel Registration — mock implementation notes (for API integration)
+
+Portal (owner-facing) + Backoffice (officer/manager-facing) built as **mock UI only**, matching each app's existing mock-driven review-workflow convention (same pattern as `docs/vessel-ownership-transfer.md`). No backend calls anywhere. This doc exists to make wiring the real API fast — it says exactly what to replace and where.
+
+## Workflow
+
+```mermaid
+flowchart TD
+    A["1. Vessel owner opens Vessel Registration"] --> B{"2. Select vessel category"}
+    B -->|Inland Waterway Vessel| C["3. Enter vessel details"]
+    B -->|Sea-going Vessel International| C
+    C --> D["4. Enter technical & ownership details"]
+    D --> E["5. Upload required documents"]
+    E --> F["6. Review application"]
+    F --> G["7. Submit application"]
+    G --> H["8. System sends confirmation notification\n(SMS + email)"]
+    H --> I["9. Officer reviews application\nin registration queue"]
+    I --> J{"10. Officer takes action"}
+    J -->|Under Review| I
+    J -->|Correction Required| K["11. Owner updates & resubmits"]
+    K --> I
+    J -->|Rejected| Z1["Terminal: Rejected\n(remarks visible to owner)"]
+    J -->|Approved| L["12. System generates certificates\n(1 for Inland, 4 for Sea-going)"]
+    L --> M["13. Owner downloads certificates"]
+    M --> N["14. System tracks renewal status\n(OK / Due Soon / Overdue)"]
+    N --> O["15. Manager views registration reports"]
+```
+
+Status lifecycle: `Pending → Under Review → (Correction Required → Resubmitted →)* → Approved | Rejected`. `Approved`/`Rejected` are terminal — no further officer action possible once reached.
+
+## What exists
+
+### Portal (`apps/portal/src/app/features/vessel-registration/`)
+- `mock.ts` — types (`VesselCategory`, `RegistrationStatus`, `VesselRegistration`, …), reference data (`VESSEL_TYPES`, `ENGINE_TYPES`, `HULL_MATERIALS`, `REQUIRED_DOCS`, `CERTIFICATES` per category), `MOCK_REGISTRATIONS`, `addRegistration()`, `recordDownload()`
+- `pages/VesselRegistrationPage.tsx` — list of the owner's registrations (`/vessel-registrations`)
+- `pages/VesselRegistrationApplicationPage.tsx` — 5-step submit wizard: Category → Vessel Details → Technical & Ownership → Documents → Review (`/vessel-registrations/apply`)
+- `pages/VesselRegistrationStatusPage.tsx` — status detail: timeline, renewal alert, officer remarks + resubmit, certificate downloads (`/vessel-registrations/:id`)
+
+### Backoffice (`apps/backoffice/src/app/features/vessel-registration/`)
+- `mock.ts` — separate types + `MOCK_REGISTRATIONS` (officer-side shape, includes `documents[]` and `correctionFields?`), `applyDecision()`, `generateCertificates()`
+- `pages/VesselRegistrationQueuePage.tsx` — queue table, stats, search + 3 filters (status/category/renewal) (`/vessel-registrations`)
+- `pages/VesselRegistrationReviewPage.tsx` — two-column review: vessel/technical/ownership info + documents/timeline/remarks/certificates; decision bar (Mark Under Review / Request Correction / Reject / Approve) (`/vessel-registrations/:id`)
+- `pages/VesselRegistrationReportPage.tsx` — manager report: KPI cards, status distribution, vessel-type breakdown, recent-10 table, renewal-tracking table (`/vessel-registration-report`)
+
+Each app defines its **own separate mock array** (codebase convention: no shared domain types in `libs/`), and they don't sync — submitting in portal does not appear in the backoffice queue. That's the main thing a real API fixes. The two `VesselRegistration` shapes are already close (both modeled on the same field set) but not identical — see below.
+
+## Data shape mismatch to resolve
+
+- **Portal `VesselRegistration`** has no `documents[]` array — uploaded files live only as transient `File[]` in the wizard's component state (`docs: Record<string, File[] | null>` in `VesselRegistrationApplicationPage.tsx`) and are **never persisted** to the mock record; only file names are shown in the review step. **Known gap**: when wiring the real POST, the upload payload needs to be sent and stored — today it's dropped after submit.
+- **Backoffice `VesselRegistration`** has `documents: RegistrationDocument[]` (`{key, label, fileName, fileType}`) so the officer review page has something to show — this is invented/seeded mock data, not real uploads. The real API should standardize on the **backoffice shape** (documents as first-class persisted records) since it's the superset the officer review page needs.
+- **Certificates**: portal's `RegistrationCertificate` has a `downloads` counter (incremented client-side via `recordDownload()`); backoffice's does not track downloads. Real API should own download-count as a server-side audit log, not a client counter.
+- **Correction targeting**: only the backoffice shape has `correctionFields?: string[]` (officer picks which fields/docs need fixing via a `MultiSelect`). Portal has no corresponding "these are the fields you need to fix" UI on the status page beyond the free-text `remarks` — worth adding when the real API returns `correctionFields`, so the owner can be pointed at the exact fields.
+- **Status enum**: portal has 5 statuses (`Pending | Under Review | Correction Required | Approved | Rejected`); backoffice has 6 (adds `Resubmitted`, distinct from `Correction Required`, for after the owner has acted). The real API should use the backoffice's 6-value enum — portal's status page should render `Resubmitted` (currently unhandled — it'll fall through to no special UI).
+
+## Suggested API surface
+
+- `POST /vessel-registrations` — submit. Multipart body: all wizard fields (see `VesselRegistration` in either `mock.ts` for the full field list) + document files keyed by the `REQUIRED_DOCS[category]` slot key. Replaces `addRegistration()` in portal's `mock.ts`.
+- `GET /vessel-registrations?ownerId=:id` — portal's "My Registrations" list (`VesselRegistrationPage.tsx`).
+- `GET /vessel-registrations/:id` — used by portal's status page and backoffice's review page alike (both key off the same id).
+- `GET /vessel-registrations` (officer, all + filters: `status`, `category`, `renewal`, `q`) — backoffice queue (`VesselRegistrationQueuePage.tsx`); filtering can move server-side or stay client-side over the fetched page as today.
+- `PATCH /vessel-registrations/:id` — officer decision. Body: `{ status: 'Under Review' | 'Correction Required' | 'Rejected' | 'Approved', remarks?: string, correctionFields?: string[] }`. Replaces `applyDecision()` in backoffice's `mock.ts`. Backend should enforce remarks-required for `Correction Required`/`Rejected` (UI already gates this client-side, but don't trust it alone).
+- `POST /vessel-registrations/:id/resubmit` — owner resubmit after correction (portal's "Resubmit Application" button on `VesselRegistrationStatusPage.tsx`, currently just routes back to the wizard with no state carried over — real flow should prefill the wizard from the existing record and only require the flagged fields/docs).
+- On `PATCH .../:id` with `status: 'Approved'`: backend generates certificate records per `CERTIFICATES[category]` (1 for Inland, 4 for Sea-going) — replaces `generateCertificates()` in backoffice's `mock.ts`.
+- `GET /vessel-registrations/:id/certificates/:certId/download` — real file download + audit log entry, replacing the shared `DEMO_PDF` base64 placeholder used by both apps' download buttons.
+- `GET /vessel-registration-reports/summary` — KPIs + status distribution + type breakdown for `VesselRegistrationReportPage.tsx` (or compute client-side from a full `GET /vessel-registrations` if volume stays low — current mock computes everything client-side from the in-memory array).
+- Document storage: real upload + signed URL for View, and a real download endpoint — today `getDocUrl()` in `VesselRegistrationReviewPage.tsx` (backoffice) fakes it with a hardcoded base64 PDF / placehold.co image, same pattern as the vessel-transfer feature.
+- SMS/email: triggered server-side on submit and on every status change — UI currently just shows a toast claiming this happened (`notify.success('... SMS and email ...')`); no actual send anywhere in either app.
+
+## Where to swap mock for real calls
+
+- Portal: `apps/portal/src/app/features/vessel-registration/mock.ts` (whole file), plus the `useState`/local reads of `MOCK_REGISTRATIONS` in all three page files, and the transient `File[]` state in `VesselRegistrationApplicationPage.tsx` (needs to become a real multipart upload on submit).
+- Backoffice: `apps/backoffice/src/app/features/vessel-registration/mock.ts` (whole file), plus the direct `applyDecision(record, ...)` / `generateCertificates(record)` mutations in `VesselRegistrationReviewPage.tsx` (swap for a mutation call + refetch/cache-invalidate), and the client-side aggregation in `VesselRegistrationReportPage.tsx` (swap for the summary endpoint above, or keep as a derived selector over cached query data).
+- Both apps already have an RTK Query base (`@ema-platform/api` → `baseApi.injectEndpoints`, see `apps/portal/src/app/features/payment/api/payment-api.ts` or `apps/backoffice/src/app/features/certification/api/certification-api.ts`) — follow that pattern rather than the ad-hoc `useApiQuery`/`useApiMutation` escape hatch.
diff --git a/libs/api/src/lib/base-api/index.ts b/libs/api/src/lib/base-api/index.ts
index 0570a2d88..2536b6989 100644
--- a/libs/api/src/lib/base-api/index.ts
+++ b/libs/api/src/lib/base-api/index.ts
@@ -1,9 +1,9 @@
-import { createApi } from '@reduxjs/toolkit/query/react';
-import { baseQueryWithReauth } from './base-query-with-reauth';
-
+import { createApi } from "@reduxjs/toolkit/query/react";
+import { baseQueryWithReauth } from "./base-query-with-reauth";
+import { tagTypes } from "./tagTypes";
 export const baseApi = createApi({
-  reducerPath: 'baseApi',
+  reducerPath: "baseApi",
   baseQuery: baseQueryWithReauth,
-  tagTypes: ['Api'],
+  tagTypes: ["Api", "backOfficeApi", "portalApi", ...tagTypes],
   endpoints: () => ({}),
 });
diff --git a/libs/api/src/lib/base-api/tagTypes.ts b/libs/api/src/lib/base-api/tagTypes.ts
new file mode 100644
index 000000000..a654fdec3
--- /dev/null
+++ b/libs/api/src/lib/base-api/tagTypes.ts
@@ -0,0 +1 @@
+export const tagTypes = ["ProfessionApi"];
diff --git a/libs/api/src/lib/features/licensing/index.ts b/libs/api/src/lib/features/licensing/index.ts
index 04d526ca7..56ca8c995 100644
--- a/libs/api/src/lib/features/licensing/index.ts
+++ b/libs/api/src/lib/features/licensing/index.ts
@@ -1,3 +1,4 @@
 export * from './licensing.types';
 export * from './licensing-api';
 export * from './licensing.helpers';
+export * from './use-localized';
diff --git a/libs/api/src/lib/features/licensing/licensing.helpers.ts b/libs/api/src/lib/features/licensing/licensing.helpers.ts
index bd32482c7..50aa8f5a8 100644
--- a/libs/api/src/lib/features/licensing/licensing.helpers.ts
+++ b/libs/api/src/lib/features/licensing/licensing.helpers.ts
@@ -2,6 +2,7 @@ import { resolveTokenFromStorage } from '../../session';
 import type {
   Bilingual,
   FormSectionConfig,
+  LicenseApplication,
   LicenseStatus,
   ValidationIssue,
 } from './licensing.types';
@@ -129,10 +130,34 @@ export const TERMINAL_STATUSES: LicenseStatus[] = [
   'REJECTED',
 ];
 
+/** Licence types with no `companyName` — these are filed by a person, not a
+ * business, so display falls back to the applicant name captured in the form. */
+export const APPLICANT_NAME_TYPE_KEYS = [
+  'SEAFARER_REGISTRATION',
+  'CERTIFICATE_OF_COMPETENCY',
+  'CERTIFICATE_OF_PROFICIENCY',
+  'VESSEL_REGISTRATION',
+  'VESSEL_OWNERSHIP_TRANSFER',
+  'ENDORSEMENT_COC',
+  'ENDORSEMENT_GOC',
+];
+
+/** Company name, or applicant name for licence types that have no company. */
+export function applicantOrCompanyName(app: LicenseApplication): string | undefined {
+  if (!app.licenseType?.key || !APPLICANT_NAME_TYPE_KEYS.includes(app.licenseType.key)) {
+    return app.companyName ?? undefined;
+  }
+  const applicantName = (app.formData?.account as Record<string, unknown> | undefined)
+    ?.applicantName;
+  return typeof applicantName === 'string' && applicantName ? applicantName : undefined;
+}
+
 /** Reads a bilingual value for the active language, falling back to English. */
 export function localized(value: Bilingual | undefined, language = 'en'): string {
   if (!value) return '';
-  return (language === 'am' ? value.am : value.en) ?? value.en ?? value.am ?? '';
+  // `||` not `??`: an empty Amharic string is "not translated", not a value —
+  // editors save `am: ''` freely (ExamPage, CertificationPage, LocationForm).
+  return (language === 'am' ? value.am : value.en) || value.en || value.am || '';
 }
 
 /**
@@ -223,6 +248,9 @@ export function buildWizardSteps(
      * instead of showing an empty page.
      */
     hasStaff?: boolean;
+    /** Active UI language. Components get this from `useLocalized`; this is a
+     *  pure function, so the caller passes `i18n.language` through. */
+    language?: string;
   },
 ): WizardStep[] {
   const visible = [...sections]
@@ -237,7 +265,7 @@ export function buildWizardSteps(
     if (!group) {
       steps.push({
         key: `section:${section.key}`,
-        label: localized(section.title),
+        label: localized(section.title, options?.language),
         kind: 'sections',
         sections: [section],
       });
@@ -292,6 +320,7 @@ export type FieldErrors = Record<string, string>;
 export function validateSections(
   sections: FormSectionConfig[],
   formData: Record<string, Record<string, unknown>>,
+  language = 'en',
 ): FieldErrors {
   const errors: FieldErrors = {};
 
@@ -315,8 +344,8 @@ export function validateSections(
       if (field.required && empty) {
         errors[`${section.key}.${field.key}`] =
           field.type === 'BOOLEAN'
-            ? `${localized(field.label)} must be accepted`
-            : `${localized(field.label)} is required`;
+            ? `${localized(field.label, language)} must be accepted`
+            : `${localized(field.label, language)} is required`;
         continue;
       }
       if (empty) continue;
diff --git a/libs/api/src/lib/features/licensing/licensing.types.ts b/libs/api/src/lib/features/licensing/licensing.types.ts
index b69e99419..432cc9252 100644
--- a/libs/api/src/lib/features/licensing/licensing.types.ts
+++ b/libs/api/src/lib/features/licensing/licensing.types.ts
@@ -7,35 +7,35 @@ export type Bilingual = { en?: string; am?: string };
  * previously this lived in a backoffice mock page.
  */
 export type LicenseStatus =
-  | 'DRAFT'
-  | 'SUBMITTED'
-  | 'UNDER_REVIEW'
-  | 'UNDER_EVALUATION'
-  | 'RESUBMIT_REQUIRED'
-  | 'INSPECTION_PENDING'
-  | 'INSPECTION_COMPLETED'
-  | 'APPROVED'
-  | 'REJECTED'
-  | 'ON_HOLD'
-  | 'PAYMENT_PENDING'
-  | 'PAID'
-  | 'PAYMENT_CONFIRMED'
-  | 'CERTIFICATE_ISSUED'
-  | 'COMPLETED';
+  | "DRAFT"
+  | "SUBMITTED"
+  | "UNDER_REVIEW"
+  | "UNDER_EVALUATION"
+  | "RESUBMIT_REQUIRED"
+  | "INSPECTION_PENDING"
+  | "INSPECTION_COMPLETED"
+  | "APPROVED"
+  | "REJECTED"
+  | "ON_HOLD"
+  | "PAYMENT_PENDING"
+  | "PAID"
+  | "PAYMENT_CONFIRMED"
+  | "CERTIFICATE_ISSUED"
+  | "COMPLETED";
 
-export type ApplicationKind = 'NEW' | 'RENEWAL';
+export type ApplicationKind = "NEW" | "RENEWAL";
 
 export type FormFieldType =
-  | 'TEXT'
-  | 'TEXTAREA'
-  | 'NUMBER'
-  | 'MONEY'
-  | 'DATE'
-  | 'SELECT'
-  | 'BOOLEAN'
-  | 'EMAIL'
-  | 'PHONE'
-  | 'TIN';
+  | "TEXT"
+  | "TEXTAREA"
+  | "NUMBER"
+  | "MONEY"
+  | "DATE"
+  | "SELECT"
+  | "BOOLEAN"
+  | "EMAIL"
+  | "PHONE"
+  | "TIN";
 
 export interface FieldCondition {
   field: string;
@@ -138,7 +138,7 @@ export interface DocumentRequirement {
   name: Bilingual;
   description?: Bilingual;
   applicationKind: ApplicationKind;
-  mode: 'ALWAYS' | 'CONDITIONAL' | 'OPTIONAL';
+  mode: "ALWAYS" | "CONDITIONAL" | "OPTIONAL";
   conditionExpression?: FieldCondition & { previousDocExpired?: string };
   allowedMimeTypes: string[];
   maxSizeMb: number;
@@ -245,7 +245,7 @@ export interface StatusHistoryEntry {
   createdAt: string;
 }
 
-export type RemarkTargetType = 'FORM_SECTION' | 'DOCUMENT' | 'STAFF';
+export type RemarkTargetType = "FORM_SECTION" | "DOCUMENT" | "STAFF";
 
 export interface ApplicationRemark {
   id: string;
@@ -276,8 +276,8 @@ export interface Inspection {
   scheduledDate: string | null;
   conductedDate: string | null;
   location: string | null;
-  status: 'SCHEDULED' | 'COMPLETED' | 'CANCELLED';
-  result: 'PASSED' | 'FAILED' | null;
+  status: "SCHEDULED" | "COMPLETED" | "CANCELLED";
+  result: "PASSED" | "FAILED" | null;
   findings: string | null;
 }
 
@@ -303,17 +303,18 @@ export interface QueueFilter {
   submittedTo?: string;
   overdue?: boolean;
   sortBy?: QueueSortField;
-  sortDir?: 'ASC' | 'DESC';
+  sortDir?: "ASC" | "DESC";
   take?: number;
   skip?: number;
 }
 
 export type QueueSortField =
-  | 'submittedAt'
-  | 'applicationNumber'
-  | 'companyName'
-  | 'status'
-  | 'dueAt';
+  | "submittedAt"
+  | "applicationNumber"
+  | "companyName"
+  | "status"
+  | "dueAt"
+  | "claimedAt";
 
 /** Row counts behind the queue's saved-view tabs. */
 export interface QueueCounts {
@@ -325,7 +326,7 @@ export interface QueueCounts {
   all: number;
 }
 
-export type DocumentDecision = 'ACCEPTED' | 'REJECTED';
+export type DocumentDecision = "ACCEPTED" | "REJECTED";
 
 /** An officer's verdict on one uploaded document. */
 export interface DocumentReview {
@@ -363,10 +364,10 @@ export interface ExportResult {
   truncated: boolean;
 }
 
-export type TemplateStatus = 'DRAFT' | 'PUBLISHED' | 'ARCHIVED';
+export type TemplateStatus = "DRAFT" | "PUBLISHED" | "ARCHIVED";
 
 export interface TemplatePageOptions {
-  format?: 'A4' | 'A5' | 'Letter' | 'Legal';
+  format?: "A4" | "A5" | "Letter" | "Legal";
   landscape?: boolean;
   printBackground?: boolean;
 }
@@ -398,7 +399,7 @@ export interface Paginated<T> {
 
 /** Per-field problems returned by the server when a submission is incomplete. */
 export interface ValidationIssue {
-  kind: 'field' | 'document' | 'staff';
+  kind: "field" | "document" | "staff";
   target: string;
   field?: string;
   message: string;
@@ -406,7 +407,7 @@ export interface ValidationIssue {
 
 /** What the browser must do to complete a payment. */
 export interface ClientAction {
-  type: 'REDIRECT' | 'LAUNCH_APP' | 'NONE';
+  type: "REDIRECT" | "LAUNCH_APP" | "NONE";
   url?: string;
   appId?: string;
   receiveCode?: string;
@@ -414,12 +415,7 @@ export interface ClientAction {
 }
 
 export type PaymentStatus =
-  | 'PENDING'
-  | 'PROCESSING'
-  | 'PAID'
-  | 'FAILED'
-  | 'EXPIRED'
-  | 'CANCELLED';
+  "PENDING" | "PROCESSING" | "PAID" | "FAILED" | "EXPIRED" | "CANCELLED";
 
 export interface InitiatePaymentResult {
   paymentId: string;
@@ -461,7 +457,7 @@ export interface IssuedLicense {
   tinNumber: string | null;
   issueDate: string;
   expiryDate: string;
-  status: 'ACTIVE' | 'EXPIRED' | 'SUSPENDED' | 'CANCELLED' | 'SUPERSEDED';
+  status: "ACTIVE" | "EXPIRED" | "SUSPENDED" | "CANCELLED" | "SUPERSEDED";
   /**
    * Days until the expiry date; negative once it has passed. Computed by the
    * API in the authority's timezone — the client must not re-derive it, since
diff --git a/libs/api/src/lib/features/licensing/use-localized.ts b/libs/api/src/lib/features/licensing/use-localized.ts
new file mode 100644
index 000000000..ae246096d
--- /dev/null
+++ b/libs/api/src/lib/features/licensing/use-localized.ts
@@ -0,0 +1,27 @@
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { localized } from './licensing.helpers';
+import type { Bilingual } from './licensing.types';
+
+/**
+ * The component-facing bilingual reader — the twin of `useDateDisplayer()`.
+ *
+ * A hook rather than a bare `localized` import so the calling component is
+ * subscribed to i18next: switching language re-renders it and every
+ * backend-configured label flips with the rest of the UI. `useTranslation()`
+ * with no instance argument resolves to the app's own <I18nextProvider>
+ * (portal router.tsx, backoffice AppProviders.tsx), which is what makes this
+ * work across two separate i18n instances.
+ *
+ * DISPLAY ONLY. Code that *matches* on a label — `.includes('nationality')`,
+ * the vessel-picker regex in ConfigDrivenSection, the SUBCITY/WOREDA test in
+ * AddressFormContent — must keep reading `value.en`, or the match breaks the
+ * moment the user switches language.
+ *
+ * The returned function is stable per language, so it is safe — and required —
+ * as a useMemo/useCallback dependency.
+ */
+export function useLocalized(): (value: Bilingual | undefined) => string {
+  const { i18n } = useTranslation();
+  return useCallback((value) => localized(value, i18n.language), [i18n.language]);
+}
diff --git a/libs/api/src/lib/file-upload/index.ts b/libs/api/src/lib/file-upload/index.ts
new file mode 100644
index 000000000..d0aa3f60e
--- /dev/null
+++ b/libs/api/src/lib/file-upload/index.ts
@@ -0,0 +1,105 @@
+import { useCallback, useState } from "react";
+import { baseApi } from "../base-api";
+import { resolveTokenFromStorage } from "../session";
+
+export interface UploadFileInfo {
+  bucket: string;
+  fileName: string;
+  contentType: string;
+  originalname: string;
+  size: number;
+}
+
+export interface UploadKeyResponse {
+  fileInfo: UploadFileInfo;
+  presigned: string;
+}
+
+const fileUploadApi = baseApi.injectEndpoints({
+  endpoints: (builder) => ({
+    getFileUploadKey: builder.mutation<
+      UploadKeyResponse,
+      { endpoint: string; file: File }
+    >({
+      query: ({ endpoint, file }) => ({
+        url: endpoint,
+        method: "POST",
+        body: {
+          fileName: file.name,
+          contentType: file.type || "application/octet-stream",
+          size: file.size,
+          originalname: file.name,
+        },
+      }),
+    }),
+  }),
+  overrideExisting: false,
+});
+
+export const { useGetFileUploadKeyMutation } = fileUploadApi;
+
+export const STORAGE_UPLOAD_ERROR = "STORAGE_UPLOAD_ERROR";
+export const STORAGE_UPLOAD_TOO_LARGE = "STORAGE_UPLOAD_TOO_LARGE";
+
+export function isStorageUploadError(error: unknown): error is Error & {
+  message: typeof STORAGE_UPLOAD_ERROR | typeof STORAGE_UPLOAD_TOO_LARGE;
+} {
+  return (
+    error instanceof Error &&
+    (error.message === STORAGE_UPLOAD_ERROR ||
+      error.message === STORAGE_UPLOAD_TOO_LARGE)
+  );
+}
+
+// Bare fetch on purpose: this PUT targets the presigned storage URL directly, not
+// VITE_BASE_API_URL, so it must not go through baseApi/fetchBaseQuery.
+async function uploadToPresigned(
+  file: File,
+  presignedUrl: string,
+): Promise<void> {
+  if (!presignedUrl) throw new Error(STORAGE_UPLOAD_ERROR);
+
+  const token = resolveTokenFromStorage();
+  const res = await fetch(presignedUrl, {
+    method: "PUT",
+    body: file,
+    headers: {
+      "Content-Type": file.type || "application/octet-stream",
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+    },
+  });
+
+  if (res.status === 413) throw new Error(STORAGE_UPLOAD_TOO_LARGE);
+  if (!res.ok) throw new Error(STORAGE_UPLOAD_ERROR);
+}
+
+export function useDocumentUpload() {
+  const [getFileUploadKey, mutationState] = useGetFileUploadKeyMutation();
+  // Spans both steps (key request + presigned PUT) — mutationState.isLoading alone
+  // would drop to false once the key request resolves, before the file PUT finishes.
+  const [isUploading, setIsUploading] = useState(false);
+
+  const upload = useCallback(
+    async (file: File, endpoint = "/documents/get-file-upload-key"): Promise<UploadKeyResponse> => {
+      setIsUploading(true);
+      try {
+        const { presigned, fileInfo } = await getFileUploadKey({
+          endpoint,
+          file,
+        }).unwrap();
+        await uploadToPresigned(file, presigned);
+        return { presigned, fileInfo };
+      } finally {
+        setIsUploading(false);
+      }
+    },
+    [getFileUploadKey],
+  );
+
+  return {
+    upload,
+    isUploading,
+    error: mutationState.error,
+    reset: mutationState.reset,
+  };
+}
diff --git a/libs/api/src/lib/session/index.ts b/libs/api/src/lib/session/index.ts
index 7f7a25284..b9a118857 100644
--- a/libs/api/src/lib/session/index.ts
+++ b/libs/api/src/lib/session/index.ts
@@ -1,3 +1,5 @@
+import Cookies from 'js-cookie';
+
 export const SESSION_HEADER_KEYS = {
   tenantId: 'x-tenant-id',
   organizationUnitId: 'x-organization-unit-id',
@@ -12,12 +14,14 @@ const TOKEN_STORAGE_KEYS = [
 ] as const;
 
 export function resolveTokenFromStorage(): string | undefined {
+  // cookie first, then localStorage (legacy pre-migration sessions)
   for (const key of TOKEN_STORAGE_KEYS) {
+    const cookie = Cookies.get(key);
+    if (cookie) return cookie;
     const stored = localStorage.getItem(key);
     if (stored) return stored;
   }
-  const match = document.cookie.match(/(?:^|;\s*)auth-token=([^;]*)/);
-  return match ? decodeURIComponent(match[1]) : undefined;
+  return undefined;
 }
 
 export function resolveSessionContext(state?: { auth?: { token?: string } }): {
diff --git a/libs/auth/src/index.ts b/libs/auth/src/index.ts
index 2446d0e68..b8ecc7986 100644
--- a/libs/auth/src/index.ts
+++ b/libs/auth/src/index.ts
@@ -1,17 +1,31 @@
-export { AuthConfigProvider, useAuthConfig } from './lib/AuthConfig';
-export type { AuthConfigValue } from './lib/AuthConfig';
-export { AuthShell, BrandMark } from './lib/components/AuthShell';
-export { ProtectedRoute } from './lib/components/ProtectedRoute';
-export { AuthBootstrap } from './lib/components/AuthBootstrap';
-export { LoginPage } from './lib/pages/LoginPage';
-export { SignupPage } from './lib/pages/SignupPage';
-export { ForgotPasswordPage } from './lib/pages/ForgotPasswordPage';
-export { SetPasswordPage } from './lib/pages/SetPasswordPage';
-export { OTPVerificationPage } from './lib/pages/OTPVerificationPage';
-export { authReducer, loginSuccess, setUser, setCurrentProfile, clearCurrentProfile, logout, hydrateAuth } from './lib/store/auth.slice';
-export { signupReducer, setSignupData, setSignupStep, resetSignup } from './lib/store/signup.slice';
-export { usePermissions } from './lib/hooks/usePermissions';
-export type { PermissionSet } from './lib/hooks/usePermissions';
+export { AuthConfigProvider, useAuthConfig } from "./lib/AuthConfig";
+export type { AuthConfigValue } from "./lib/AuthConfig";
+export { AuthShell, BrandMark } from "./lib/components/AuthShell";
+export { ProtectedRoute } from "./lib/components/ProtectedRoute";
+export { AuthBootstrap } from "./lib/components/AuthBootstrap";
+export { LoginPage } from "./lib/pages/LoginPage";
+export { SignupPage } from "./lib/pages/SignupPage";
+export { ForgotPasswordPage } from "./lib/pages/ForgotPasswordPage";
+export { SetPasswordPage } from "./lib/pages/SetPasswordPage";
+export { OTPVerificationPage } from "./lib/pages/OTPVerificationPage";
+export {
+  authReducer,
+  loginSuccess,
+  setUser,
+  setCurrentProfile,
+  clearCurrentProfile,
+  logout,
+  hydrateAuth,
+  setToken,
+} from "./lib/store/auth.slice";
+export {
+  signupReducer,
+  setSignupData,
+  setSignupStep,
+  resetSignup,
+} from "./lib/store/signup.slice";
+export { usePermissions } from "./lib/hooks/usePermissions";
+export type { PermissionSet } from "./lib/hooks/usePermissions";
 export {
   useCurrentProfile,
   useGetMyProfileQuery,
@@ -19,8 +33,19 @@ export {
   useUpdateMyAddressMutation,
   PROFILE_FIELDS,
   PROFILE_FIELD_SECTION,
-} from './lib/hooks/useCurrentProfile';
-export type { ProfileField, ProfileRequirement, ProfileMeResponse } from './lib/hooks/useCurrentProfile';
-export { configureAuthStorage, authStorage } from './lib/utils/auth-storage';
-export { refreshAccessToken } from './lib/utils/refresh-token';
-export type { AuthUser, AuthState, LoginPayload, CurrentProfile, CurrentProfileAddress, CurrentProfileProfession } from './lib/types/auth.types';
+} from "./lib/hooks/useCurrentProfile";
+export type {
+  ProfileField,
+  ProfileRequirement,
+  ProfileMeResponse,
+} from "./lib/hooks/useCurrentProfile";
+export { configureAuthStorage, authStorage } from "./lib/utils/auth-storage";
+export { refreshAccessToken } from "./lib/utils/refresh-token";
+export type {
+  AuthUser,
+  AuthState,
+  LoginPayload,
+  CurrentProfile,
+  CurrentProfileAddress,
+  CurrentProfileProfession,
+} from "./lib/types/auth.types";
diff --git a/libs/auth/src/lib/components/AuthBootstrap.tsx b/libs/auth/src/lib/components/AuthBootstrap.tsx
index 03eef5a7a..769864f6f 100644
--- a/libs/auth/src/lib/components/AuthBootstrap.tsx
+++ b/libs/auth/src/lib/components/AuthBootstrap.tsx
@@ -30,6 +30,7 @@ export function AuthBootstrap({ children }: { children: ReactNode }) {
       dispatch(hydrateAuth());
 
       const token = authStorage.getToken();
+      const cachedUser = authStorage.getUser<AuthUser>();
       if (!token) {
         if (!cancelled) setReady(true);
         return;
@@ -42,7 +43,12 @@ export function AuthBootstrap({ children }: { children: ReactNode }) {
 
         if (response.ok) {
           const user = (await response.json()) as AuthUser;
-          if (!cancelled) dispatch(setUser(user));
+          // Keep the persisted session as the source of truth when it is
+          // available. A successful profile update writes it immediately,
+          // while `/auth/me` can briefly return a stale read and otherwise
+          // undo that update on every page refresh. We still make this call
+          // to validate the token and clear invalid sessions below.
+          if (!cancelled && !cachedUser) dispatch(setUser(user));
         } else if (response.status === 401 || response.status === 403) {
           // Expired or revoked — drop it so the user gets a login screen
           // instead of a dead end.
diff --git a/libs/auth/src/lib/components/ProtectedRoute.tsx b/libs/auth/src/lib/components/ProtectedRoute.tsx
index 9eb4d0e8f..9c55d85ee 100644
--- a/libs/auth/src/lib/components/ProtectedRoute.tsx
+++ b/libs/auth/src/lib/components/ProtectedRoute.tsx
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie';
 import { Navigate, Outlet, useLocation } from 'react-router-dom';
 import type { ReactNode } from 'react';
 import { authStorage } from '../utils/auth-storage';
@@ -7,14 +8,9 @@ interface ProtectedRouteProps {
   loginPath?: string;
 }
 
-function getTokenFromCookie(): string | undefined {
-  const match = document.cookie.match(/(?:^|;\s*)auth-token=([^;]*)/);
-  return match ? decodeURIComponent(match[1]) : undefined;
-}
-
 export function ProtectedRoute({ children, loginPath = '/login' }: ProtectedRouteProps) {
   const location = useLocation();
-  const token = authStorage.getToken() ?? getTokenFromCookie();
+  const token = authStorage.getToken() ?? Cookies.get('auth-token');
 
   if (!token) {
     return <Navigate to={loginPath} state={{ from: location }} replace />;
diff --git a/libs/auth/src/lib/hooks/useCurrentProfile.ts b/libs/auth/src/lib/hooks/useCurrentProfile.ts
index 948da185e..b4b9c8e5a 100644
--- a/libs/auth/src/lib/hooks/useCurrentProfile.ts
+++ b/libs/auth/src/lib/hooks/useCurrentProfile.ts
@@ -38,21 +38,32 @@ export const PROFILE_FIELDS = [
 
 export type ProfileField = (typeof PROFILE_FIELDS)[number];
 
-/** Which `/profile` tab collects a field — used to build deep links. */
-export const PROFILE_FIELD_SECTION: Record<ProfileField, 'personal' | 'address' | 'emergency'> = {
-  firstName: 'personal',
-  middleName: 'personal',
-  lastName: 'personal',
-  gender: 'personal',
-  dob: 'personal',
-  pob: 'personal',
-  maritalStatus: 'personal',
-  professionId: 'personal',
+/**
+ * Which `/profile` tab collects a field — used to build deep links.
+ *
+ * `personal` here means the Personal tab (account details: name, username,
+ * email, phone), which is `/profile`'s `'personal'` panel. Name/DOB/gender/
+ * profession live on the *Maritime Profile* panel instead, whose tab key is
+ * `'profile'` — easy to conflate with the field-section name of the same
+ * word, so it's called out here rather than left implicit.
+ */
+export const PROFILE_FIELD_SECTION: Record<
+  ProfileField,
+  'personal' | 'profile' | 'address' | 'emergency'
+> = {
+  firstName: 'profile',
+  middleName: 'profile',
+  lastName: 'profile',
+  gender: 'profile',
+  dob: 'profile',
+  pob: 'profile',
+  maritalStatus: 'profile',
+  professionId: 'profile',
   idType: 'address',
   idNumber: 'address',
   nationality: 'address',
-  primaryPhoneNumber: 'address',
-  email: 'address',
+  primaryPhoneNumber: 'personal',
+  email: 'personal',
   regionId: 'address',
   cityId: 'address',
   subCityId: 'address',
diff --git a/libs/auth/src/lib/pages/ForgotPasswordPage.tsx b/libs/auth/src/lib/pages/ForgotPasswordPage.tsx
index 98552e2b8..e8b1eec06 100644
--- a/libs/auth/src/lib/pages/ForgotPasswordPage.tsx
+++ b/libs/auth/src/lib/pages/ForgotPasswordPage.tsx
@@ -22,7 +22,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { Link } from 'react-router-dom';
 import { useApiMutation } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler } from '@ema-platform/ui';
 import { AuthShell } from '../components/AuthShell';
 import { useAuthConfig } from '../AuthConfig';
 
@@ -37,6 +37,7 @@ export function ForgotPasswordPage() {
   const [forgotTrigger, { isLoading }] = useApiMutation();
   const [sentTo, setSentTo] = useState<string | null>(null);
   const [serverError, setServerError] = useState<string | null>(null);
+  const { handleError } = useErrorHandler();
 
   const {
     register,
@@ -59,11 +60,7 @@ export function ForgotPasswordPage() {
     try {
       await sendResetLink(values.email);
     } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
+      setServerError(handleError(err));
     }
   };
 
@@ -73,11 +70,7 @@ export function ForgotPasswordPage() {
       await sendResetLink(sentTo);
       notify.success('Reset link sent again');
     } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
+      setServerError(handleError(err));
     }
   };
 
diff --git a/libs/auth/src/lib/pages/LoginPage.tsx b/libs/auth/src/lib/pages/LoginPage.tsx
index 89dfe1bbc..502a4b18f 100644
--- a/libs/auth/src/lib/pages/LoginPage.tsx
+++ b/libs/auth/src/lib/pages/LoginPage.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState } from "react";
 import {
   Alert,
   Anchor,
@@ -11,29 +11,56 @@ import {
   Text,
   TextInput,
   Title,
-} from '@mantine/core';
+} from "@mantine/core";
 import {
   IconArrowRight,
   IconDeviceMobile,
   IconLock,
   IconMail,
-} from '@tabler/icons-react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import { useNavigate, Link } from 'react-router-dom';
-import { useDispatch } from 'react-redux';
-import { useApiMutation } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
-import { AuthShell } from '../components/AuthShell';
-import { loginSuccess, setUser, setCurrentProfile } from '../store/auth.slice';
-import type { LoginPayload, AuthUser, CurrentProfile } from '../types/auth.types';
-import { useAuthConfig } from '../AuthConfig';
-import { authStorage } from '../utils/auth-storage';
+} from "@tabler/icons-react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import { useNavigate, Link } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { useApiMutation } from "@ema-platform/api";
+import { notify, useErrorHandler } from "@ema-platform/ui";
+import { AuthShell } from "../components/AuthShell";
+import { loginSuccess, setUser, setCurrentProfile } from "../store/auth.slice";
+import type {
+  LoginPayload,
+  AuthUser,
+  CurrentProfile,
+} from "../types/auth.types";
+import { useAuthConfig } from "../AuthConfig";
+import { authStorage } from "../utils/auth-storage";
+const emailOrPhone = z
+  .string()
+  .trim()
+  .transform((value) => {
+    // Convert 09xxxxxxxx -> +2519xxxxxxxx
+    if (/^09\d{8}$/.test(value)) {
+      return `+251${value.substring(1)}`;
+    }
 
+    return value;
+  })
+  .refine(
+    (value) => {
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+      const phoneRegex = /^\+2519\d{8}$/;
+
+      return emailRegex.test(value) || phoneRegex.test(value);
+    },
+    {
+      message: "Enter a valid email or phone number (+2519xxxxxxxx)",
+    },
+  );
 const schema = z.object({
-  email: z.string().email({ message: 'Enter a valid email' }),
-  password: z.string().min(5, { message: 'Password must be at least 6 characters' }),
+  email: emailOrPhone,
+  password: z
+    .string()
+    .min(8, { message: "Password must be at least 8 characters" }),
 });
 
 type FormValues = z.infer<typeof schema>;
@@ -46,9 +73,7 @@ export function LoginPage() {
   const [isLoading, setIsLoading] = useState(false);
   const [rememberMe, setRememberMe] = useState(true);
   const [serverError, setServerError] = useState<string | null>(null);
-  // MFA second step: set once /auth/login answers `mfaRequired` (US-IAM-006).
-  const [mfaEmail, setMfaEmail] = useState<string | null>(null);
-  const [mfaOtp, setMfaOtp] = useState('');
+  const { handleError } = useErrorHandler();
   const [loginTrigger] = useApiMutation<LoginPayload>();
   const [meTrigger] = useApiMutation<AuthUser>();
   const [profileTrigger] = useApiMutation<{ profile: CurrentProfile | null }>();
@@ -65,57 +90,15 @@ export function LoginPage() {
     setIsLoading(true);
     try {
       const data = await loginTrigger({
-        url: '/auth/login',
-        method: 'POST',
+        url: "/auth/login",
+        method: "POST",
         body: values,
       }).unwrap();
-
-      // MFA-enabled accounts get no tokens yet — an OTP has been sent, and
-      // the session only exists once /auth/mfa-verify accepts it (US-IAM-006).
-      if (data.mfaRequired) {
-        setMfaEmail(values.email);
-        notify.success('Enter the verification code we just sent you');
-        return;
-      }
-      await completeSession(data);
-    } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const verifyMfa = async () => {
-    if (!mfaEmail || !mfaOtp.trim()) return;
-    setIsLoading(true);
-    try {
-      const data = await loginTrigger({
-        url: '/auth/mfa-verify',
-        method: 'POST',
-        body: { email: mfaEmail, otp: mfaOtp.trim() },
-      }).unwrap();
-      // The second factor proves possession of the verified phone.
-      await completeSession({ ...data, isPhoneNumberVerified: true });
-    } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        'Verification failed';
-      setServerError(msg === 'unable_to_log_in' ? 'Invalid or expired code' : msg);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const completeSession = async (data: LoginPayload) => {
-    dispatch(loginSuccess(data));
+      dispatch(loginSuccess(data));
 
       const me = await meTrigger({
-        url: '/auth/me',
-        method: 'GET',
+        url: "/auth/me",
+        method: "GET",
       }).unwrap();
       dispatch(setUser(me));
 
@@ -126,8 +109,8 @@ export function LoginPage() {
       // `useCurrentProfile` resolves it again on demand.
       try {
         const { profile } = await profileTrigger({
-          url: '/profiles/me',
-          method: 'GET',
+          url: "/profiles/me",
+          method: "GET",
         }).unwrap();
         if (profile) {
           authStorage.setProfileId(profile.id);
@@ -137,17 +120,23 @@ export function LoginPage() {
         // Offline or a 5xx — the portal still works; the resolver retries.
       }
 
-    if (!me.isPhoneNumberVerified) {
-      navigate('/otp-verify', {
-        state: {
-          email: me.email,
-          phoneNumber: me.phoneNumber,
-        },
-      });
-      return;
-    }
+      if (!me.isPhoneNumberVerified) {
+        navigate("/otp-verify", {
+          state: {
+            email: me.email,
+            phoneNumber: me.phoneNumber,
+          },
+        });
+        return;
+      }
 
-    navigate(loginRedirectPath);
+      navigate(loginRedirectPath);
+    } catch (err: unknown) {
+      setServerError(handleError(err));
+    } finally {
+      localStorage.setItem("rememberMe", String(rememberMe));
+      setIsLoading(false);
+    }
   };
 
   return (
@@ -163,47 +152,16 @@ export function LoginPage() {
         </div>
 
         {serverError && (
-          <Alert variant="light" color="red" withCloseButton onClose={() => setServerError(null)}>
+          <Alert
+            variant="light"
+            color="red"
+            withCloseButton
+            onClose={() => setServerError(null)}
+          >
             {serverError}
           </Alert>
         )}
 
-        {mfaEmail ? (
-          <Stack gap="md">
-            <Alert variant="light" color="blue" icon={<IconDeviceMobile size={18} />}>
-              This account requires a second factor. Enter the code we sent to
-              your registered phone.
-            </Alert>
-            <TextInput
-              label="Verification code"
-              placeholder="6-digit code"
-              size="md"
-              value={mfaOtp}
-              onChange={(e) => setMfaOtp(e.currentTarget.value)}
-              onKeyDown={(e) => e.key === 'Enter' && verifyMfa()}
-            />
-            <Button
-              size="md"
-              loading={isLoading}
-              disabled={!mfaOtp.trim()}
-              onClick={verifyMfa}
-              rightSection={<IconArrowRight size={18} />}
-            >
-              Verify and sign in
-            </Button>
-            <Anchor
-              size="sm"
-              ta="center"
-              onClick={() => {
-                setMfaEmail(null);
-                setMfaOtp('');
-                setServerError(null);
-              }}
-            >
-              Back to sign in
-            </Anchor>
-          </Stack>
-        ) : (
         <form onSubmit={handleSubmit(onSubmit)}>
           <Stack gap="md">
             <TextInput
@@ -212,7 +170,7 @@ export function LoginPage() {
               size="md"
               leftSection={<IconMail size={18} />}
               error={errors.email?.message}
-              {...register('email')}
+              {...register("email")}
             />
             <PasswordInput
               label="Password"
@@ -220,7 +178,7 @@ export function LoginPage() {
               size="md"
               leftSection={<IconLock size={18} />}
               error={errors.password?.message}
-              {...register('password')}
+              {...register("password")}
             />
 
             <Group justify="space-between">
@@ -253,23 +211,9 @@ export function LoginPage() {
             </Button>
           </Stack>
         </form>
-        )}
-
-        <Divider label="or" labelPosition="center" />
-
-        <Button
-          variant="default"
-          fullWidth
-          size="md"
-          leftSection={<IconDeviceMobile size={18} />}
-          onClick={() => notify.info('Phone sign-in is coming soon.')}
-        >
-          Sign in with phone number
-        </Button>
-
         {enableSignup && (
           <Text ta="center" size="sm" c="dimmed">
-            Don&apos;t have an account?{' '}
+            Don&apos;t have an account?{" "}
             <Anchor component={Link} to="/signup" fw={700}>
               Create one
             </Anchor>
diff --git a/libs/auth/src/lib/pages/OTPVerificationPage.tsx b/libs/auth/src/lib/pages/OTPVerificationPage.tsx
index 00e9e2b9b..9d0f94bb3 100644
--- a/libs/auth/src/lib/pages/OTPVerificationPage.tsx
+++ b/libs/auth/src/lib/pages/OTPVerificationPage.tsx
@@ -18,7 +18,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useApiMutation } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
+import { notify, useErrorHandler } from '@ema-platform/ui';
 import { AuthShell } from '../components/AuthShell';
 import { useAuthConfig } from '../AuthConfig';
 
@@ -47,6 +47,7 @@ export function OTPVerificationPage() {
   const [resendTrigger, { isLoading: resending }] = useApiMutation();
   const [secondsLeft, setSecondsLeft] = useState(RESEND_SECONDS);
   const [serverError, setServerError] = useState<string | null>(null);
+  const { handleError } = useErrorHandler();
 
   const {
     control,
@@ -74,11 +75,7 @@ export function OTPVerificationPage() {
       notify.success('Phone number verified successfully');
       navigate(loginRedirectPath);
     } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
+      setServerError(handleError(err));
     }
   };
 
@@ -95,11 +92,7 @@ export function OTPVerificationPage() {
       setSecondsLeft(RESEND_SECONDS);
       setServerError(null);
     } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
+      setServerError(handleError(err));
     }
   };
 
diff --git a/libs/auth/src/lib/pages/SignupPage.tsx b/libs/auth/src/lib/pages/SignupPage.tsx
index fa8ed8c36..4ef7fb9d0 100644
--- a/libs/auth/src/lib/pages/SignupPage.tsx
+++ b/libs/auth/src/lib/pages/SignupPage.tsx
@@ -26,7 +26,7 @@ import { z } from 'zod';
 import { useNavigate, Link } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { useApiMutation } from '@ema-platform/api';
-import { notify } from '@ema-platform/ui';
+import { useErrorHandler, passwordSchema, PasswordRequirements } from '@ema-platform/ui';
 import { AuthShell } from '../components/AuthShell';
 import { loginSuccess, setUser } from '../store/auth.slice';
 import type { AuthUser } from '../types/auth.types';
@@ -40,8 +40,8 @@ const schema = z
     userType: z.literal('individual'),
     nameEn: z.string().min(1, { message: 'Name (English) is required' }),
     nameAm: z.string().optional(),
-    password: z.string().min(8, { message: 'Password must be at least 8 characters' }),
-    confirmPassword: z.string().min(8, { message: 'Confirm your password' }),
+    password: passwordSchema(8),
+    confirmPassword: z.string().min(1, { message: 'Confirm your password' }),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: 'Passwords do not match',
@@ -69,6 +69,7 @@ export function SignupPage() {
   const { appName, loginRedirectPath } = useAuthConfig();
   const [agreed, setAgreed] = useState(false);
   const [serverError, setServerError] = useState<string | null>(null);
+  const { handleError } = useErrorHandler();
   const [signupTrigger, { isLoading: loading }] = useApiMutation<{
     token: string;
     refreshToken: string;
@@ -79,6 +80,7 @@ export function SignupPage() {
   const {
     register,
     handleSubmit,
+    watch,
     formState: { errors },
   } = useForm<FormValues>({
     resolver: zodResolver(schema),
@@ -125,11 +127,7 @@ export function SignupPage() {
         });
       }
     } catch (err: unknown) {
-      const msg =
-        (err as { data?: { message?: string } })?.data?.message ??
-        (err instanceof Error ? err.message : 'Something went wrong');
-      setServerError(msg);
-      notify.error(msg);
+      setServerError(handleError(err));
     }
   };
 
@@ -199,13 +197,16 @@ export function SignupPage() {
             />
 
             <SimpleGrid cols={{ base: 1, xs: 2 }} spacing="md">
-              <PasswordInput
-                label="Password"
-                placeholder="At least 8 characters"
-                leftSection={<IconLock size={18} />}
-                error={errors.password?.message}
-                {...register('password')}
-              />
+              <div>
+                <PasswordInput
+                  label="Password"
+                  placeholder="At least 8 characters"
+                  leftSection={<IconLock size={18} />}
+                  error={errors.password?.message}
+                  {...register('password')}
+                />
+                <PasswordRequirements password={watch('password') ?? ''} minLength={8} />
+              </div>
               <PasswordInput
                 label="Confirm password"
                 placeholder="Re-enter password"
diff --git a/libs/auth/src/lib/store/auth.slice.ts b/libs/auth/src/lib/store/auth.slice.ts
index 0a68218b8..1fb70a533 100644
--- a/libs/auth/src/lib/store/auth.slice.ts
+++ b/libs/auth/src/lib/store/auth.slice.ts
@@ -1,6 +1,11 @@
-import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
-import type { AuthState, AuthUser, CurrentProfile, LoginPayload } from '../types/auth.types';
-import { authStorage } from '../utils/auth-storage';
+import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
+import type {
+  AuthState,
+  AuthUser,
+  CurrentProfile,
+  LoginPayload,
+} from "../types/auth.types";
+import { authStorage } from "../utils/auth-storage";
 
 const initialState: AuthState = {
   user: null,
@@ -10,7 +15,7 @@ const initialState: AuthState = {
 };
 
 const authSlice = createSlice({
-  name: 'auth',
+  name: "auth",
   initialState,
   reducers: {
     loginSuccess(state, action: PayloadAction<LoginPayload>) {
@@ -38,6 +43,10 @@ const authSlice = createSlice({
       state.currentProfile = null;
       authStorage.clear();
     },
+    setToken(state, action: PayloadAction<string>) {
+      state.token = action.payload;
+      authStorage.setToken(action.payload);
+    },
     hydrateAuth(state) {
       const token = authStorage.getToken();
       const user = authStorage.getUser<AuthUser>();
@@ -54,5 +63,13 @@ const authSlice = createSlice({
   },
 });
 
-export const { loginSuccess, setUser, setCurrentProfile, clearCurrentProfile, logout, hydrateAuth } = authSlice.actions;
+export const {
+  loginSuccess,
+  setUser,
+  setCurrentProfile,
+  clearCurrentProfile,
+  logout,
+  hydrateAuth,
+  setToken,
+} = authSlice.actions;
 export const authReducer = authSlice.reducer;
diff --git a/libs/auth/src/lib/types/auth.types.ts b/libs/auth/src/lib/types/auth.types.ts
index 29763426c..b34f59b77 100644
--- a/libs/auth/src/lib/types/auth.types.ts
+++ b/libs/auth/src/lib/types/auth.types.ts
@@ -13,6 +13,7 @@ export interface AuthUser {
   hasFinishedRegistration: boolean;
   hasFinishedDMSOnboarding: boolean;
   isPhoneNumberVerified: boolean;
+  userType: string;
 }
 
 export interface AuthState {
diff --git a/libs/auth/src/lib/utils/auth-storage.ts b/libs/auth/src/lib/utils/auth-storage.ts
index 22fc1757f..1449f8988 100644
--- a/libs/auth/src/lib/utils/auth-storage.ts
+++ b/libs/auth/src/lib/utils/auth-storage.ts
@@ -1,7 +1,119 @@
-let _prefix = 'ema-auth';
+import Cookies from "js-cookie";
 
-export function configureAuthStorage(prefix: string) {
+function getCookieExpiresDays(): number {
+  if (typeof window === "undefined") return 1;
+  try {
+    const rememberMe = localStorage.getItem("rememberMe") === "true";
+    return rememberMe ? 15 : 1;
+  } catch {
+    return 1;
+  }
+}
+
+const isHttps =
+  typeof window !== "undefined" && window.location.protocol === "https:";
+
+function removeCookieCompletely(name: string) {
+  if (typeof document === "undefined") return;
+
+  const paths = ["/", ""];
+  const samesites: Array<"strict" | "lax" | "none" | undefined> = [
+    "strict",
+    "lax",
+    undefined,
+  ];
+  const secures = [true, false];
+
+  for (const path of paths) {
+    for (const secure of secures) {
+      for (const sameSite of samesites) {
+        try {
+          Cookies.remove(name, { path, secure, sameSite });
+        } catch {
+          // ignore
+        }
+      }
+    }
+  }
+
+  const pastDate = "Thu, 01 Jan 1970 00:00:00 GMT";
+  const expireStrings = [
+    `${name}=; path=/; expires=${pastDate}; max-age=0`,
+    `${name}=; path=/; expires=${pastDate}; max-age=0; SameSite=Strict`,
+    `${name}=; path=/; expires=${pastDate}; max-age=0; SameSite=Strict; Secure`,
+    `${name}=; path=/; expires=${pastDate}; max-age=0; SameSite=Lax`,
+    `${name}=; path=/; expires=${pastDate}; max-age=0; SameSite=Lax; Secure`,
+    `${name}=; expires=${pastDate}; max-age=0`,
+  ];
+
+  try {
+    const domain = window.location.hostname;
+    const domainParts = domain.split(".");
+    if (domainParts.length > 1) {
+      expireStrings.push(
+        `${name}=; path=/; domain=${domain}; expires=${pastDate}; max-age=0`
+      );
+      expireStrings.push(
+        `${name}=; path=/; domain=.${domain}; expires=${pastDate}; max-age=0`
+      );
+    }
+  } catch {
+    // ignore
+  }
+
+  expireStrings.forEach((str) => {
+    try {
+      document.cookie = str;
+    } catch {
+      // ignore
+    }
+  });
+}
+
+interface Backend {
+  get(k: string): string | null;
+  set(k: string, v: string): void;
+  remove(k: string): void;
+}
+
+const localStore: Backend = {
+  get: (k) => localStorage.getItem(k),
+  set: (k, v) => localStorage.setItem(k, v),
+  remove: (k) => localStorage.removeItem(k),
+};
+
+const cookieStore: Backend = {
+  get: (k) => Cookies.get(k) ?? null,
+  set: (k, v) =>
+    Cookies.set(k, v, {
+      path: "/",
+      secure: isHttps,
+      sameSite: "strict",
+      expires: getCookieExpiresDays(),
+    }),
+  remove: (k) => removeCookieCompletely(k),
+};
+
+const AUTH_KEY_NAMES = [
+  "auth-token",
+  "refresh-token",
+  "auth-user",
+  "profile-id",
+  "current-profile",
+];
+
+const KNOWN_PREFIXES = ["ema-backoffice", "ema-portal", "ema-auth", ""];
+
+let _prefix = "ema-auth";
+let backend: Backend = localStore;
+
+export function configureAuthStorage(prefix: string, useCookies = false) {
   _prefix = prefix;
+  backend = useCookies ? cookieStore : localStore;
+  if (useCookies) {
+    // drop pre-migration localStorage leftovers so tokens live in cookies only
+    AUTH_KEY_NAMES.forEach((k) => localStorage.removeItem(`${prefix}-${k}`));
+  }
 }
 
 function key(k: string) {
@@ -9,34 +121,63 @@ function key(k: string) {
 }
 
 export const authStorage = {
-  getToken: () => localStorage.getItem(key('auth-token')) ?? undefined,
-  setToken: (token: string) => localStorage.setItem(key('auth-token'), token),
-  getRefreshToken: () => localStorage.getItem(key('refresh-token')) ?? undefined,
-  setRefreshToken: (t: string) => localStorage.setItem(key('refresh-token'), t),
+  getToken: () => backend.get(key("auth-token")) ?? undefined,
+  setToken: (token: string) => backend.set(key("auth-token"), token),
+  getRefreshToken: () => backend.get(key("refresh-token")) ?? undefined,
+  setRefreshToken: (t: string) => backend.set(key("refresh-token"), t),
   getUser: <T = unknown>(): T | null => {
     try {
-      return JSON.parse(localStorage.getItem(key('auth-user')) ?? 'null') as T | null;
+      return JSON.parse(backend.get(key("auth-user")) ?? "null") as T | null;
     } catch {
       return null;
     }
   },
-  setUser: <T>(u: T) => localStorage.setItem(key('auth-user'), JSON.stringify(u)),
-  getProfileId: () => localStorage.getItem(key('profile-id')) ?? undefined,
-  setProfileId: (id: string) => localStorage.setItem(key('profile-id'), id),
+  setUser: <T>(u: T) => backend.set(key("auth-user"), JSON.stringify(u)),
+  getProfileId: () => backend.get(key("profile-id")) ?? undefined,
+  setProfileId: (id: string) => backend.set(key("profile-id"), id),
   getProfile: <T = unknown>(): T | null => {
     try {
-      return JSON.parse(localStorage.getItem(key('current-profile')) ?? 'null') as T | null;
+      return JSON.parse(
+        backend.get(key("current-profile")) ?? "null",
+      ) as T | null;
     } catch {
       return null;
     }
   },
-  setProfile: <T>(p: T) => localStorage.setItem(key('current-profile'), JSON.stringify(p)),
-  removeProfile: () => localStorage.removeItem(key('current-profile')),
+  setProfile: <T>(p: T) =>
+    backend.set(key("current-profile"), JSON.stringify(p)),
+  removeProfile: () => backend.remove(key("current-profile")),
   clear: () => {
-    [key('auth-token'), key('refresh-token'), key('auth-user'), key('profile-id'), key('current-profile')].forEach((k) =>
-      localStorage.removeItem(k),
-    );
-    document.cookie =
-      'auth-token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 UTC; SameSite=Lax';
+    const prefixes = Array.from(new Set([_prefix, ...KNOWN_PREFIXES]));
+    prefixes.forEach((p) => {
+      AUTH_KEY_NAMES.forEach((k) => {
+        const fullKey = p ? `${p}-${k}` : k;
+        removeCookieCompletely(fullKey);
+        try {
+          localStorage.removeItem(fullKey);
+        } catch {
+          // ignore
+        }
+      });
+    });
+
+    try {
+      localStorage.removeItem("rememberMe");
+    } catch {
+      // ignore
+    }
+
+    try {
+      if (typeof Cookies !== "undefined") {
+        const allCookies = Cookies.get();
+        if (allCookies) {
+          Object.keys(allCookies).forEach((name) => {
+            removeCookieCompletely(name);
+          });
+        }
+      }
+    } catch {
+      // ignore
+    }
   },
 };
diff --git a/libs/auth/src/lib/utils/refresh-token.ts b/libs/auth/src/lib/utils/refresh-token.ts
index 3933bd270..6a6690b80 100644
--- a/libs/auth/src/lib/utils/refresh-token.ts
+++ b/libs/auth/src/lib/utils/refresh-token.ts
@@ -1,8 +1,9 @@
-import { authStorage } from './auth-storage';
+import { authStorage } from "./auth-storage";
 
 const BASE_API_URL =
-  (import.meta as { env?: Record<string, string> }).env?.['VITE_BASE_API_URL'] ??
-  'http://localhost:3001/api';
+  (import.meta as { env?: Record<string, string> }).env?.[
+    "VITE_BASE_API_URL"
+  ] ?? "http://localhost:3001/api";
 
 interface RefreshResponse {
   token: string;
@@ -11,7 +12,7 @@ interface RefreshResponse {
 
 export async function refreshAccessToken(): Promise<string> {
   const refreshToken = authStorage.getRefreshToken();
-  if (!refreshToken) throw new Error('No refresh token available');
+  if (!refreshToken) throw new Error("No refresh token available");
 
   // The IAM service exposes this as `refresh-token`; posting to `/auth/refresh`
   // 404s, which the catch below turns into a silent logout.
@@ -23,7 +24,7 @@ export async function refreshAccessToken(): Promise<string> {
 
   if (!response.ok) {
     authStorage.clear();
-    throw new Error('Token refresh failed');
+    throw new Error("Token refresh failed");
   }
 
   const data: RefreshResponse = await response.json();
diff --git a/libs/shared/src/index.ts b/libs/shared/src/index.ts
index 16c383764..4c88f69e7 100644
--- a/libs/shared/src/index.ts
+++ b/libs/shared/src/index.ts
@@ -1 +1,4 @@
 export * from './lib/theme/ema-theme';
+export * from './lib/date/date-displayer';
+export * from './lib/date/use-date-displayer';
+export * from './lib/date/ethiopic';
diff --git a/libs/shared/src/lib/date/date-displayer.ts b/libs/shared/src/lib/date/date-displayer.ts
new file mode 100644
index 000000000..fefd5165d
--- /dev/null
+++ b/libs/shared/src/lib/date/date-displayer.ts
@@ -0,0 +1,57 @@
+import { ethTimeLabel, toAmharicDisplay } from './ethiopic';
+
+/** Wire values carrying no time of day, e.g. a date column serialised as `2026-08-10`. */
+const DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
+
+/** Midnight UTC — how backends commonly serialise a plain date column. */
+const UTC_MIDNIGHT = /T00:00:00(\.0+)?Z$/;
+
+/**
+ * The one way a date is shown to a user.
+ *
+ * Timestamps render in the viewer's local timezone — `2026-08-10T06:57:34.507Z`
+ * reads as `Aug 10, 2026 9:57am` in Addis. Values with no real time of day
+ * render as a bare date: a birth date or a licence expiry stamped `12:00am`
+ * reads as precision the data does not have. Those are also formatted in UTC,
+ * because parsing `2026-08-10` yields UTC midnight, and converting that to a
+ * behind-UTC local timezone would show the previous day.
+ *
+ * `language` is a parameter rather than read from i18next because each app runs
+ * a DEDICATED i18n instance, not the global singleton (see `app/i18n/config.ts`)
+ * — the same reason `localized()` in licensing.helpers.ts takes one. Components
+ * should not call this directly; use `useDateDisplayer()` so the text actually
+ * re-renders when the language changes.
+ */
+export function dateDisplayer(
+  value: string | number | Date | null | undefined,
+  language = 'en',
+): string {
+  if (value === null || value === undefined || value === '') return '—';
+
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return '—';
+
+  const dateOnly =
+    typeof value === 'string' && (DATE_ONLY.test(value) || UTC_MIDNIGHT.test(value));
+
+  if (language.startsWith('am')) {
+    const day = toAmharicDisplay(date); // ሐምሌ 22/2018
+    return dateOnly ? day : `${day} - ${ethTimeLabel(date)}`;
+  }
+
+  const day = date.toLocaleDateString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+    ...(dateOnly ? { timeZone: 'UTC' } : {}),
+  });
+  if (dateOnly) return day;
+
+  // Intl gives "9:57 AM"; the house format is "9:57am".
+  const time = date
+    .toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' })
+    .replace(' ', '')
+    .toLowerCase();
+
+  return `${day} ${time}`;
+}
diff --git a/libs/shared/src/lib/date/ethiopic.ts b/libs/shared/src/lib/date/ethiopic.ts
new file mode 100644
index 000000000..b5ade54d8
--- /dev/null
+++ b/libs/shared/src/lib/date/ethiopic.ts
@@ -0,0 +1,69 @@
+import { EthDateTime } from 'ethiopian-calendar-date-converter';
+
+const EC_MONTHS_AM = [
+  'መስከረም', 'ጥቅምት', 'ኅዳር', 'ታህሳስ', 'ጥር', 'የካቲት',
+  'መጋቢት', 'ሚያዝያ', 'ግንቦት', 'ሰኔ', 'ሐምሌ', 'ነሐሴ', 'ጳጉሜን',
+];
+
+// EthDateTime.fromEuropeanDate() computes the day from a raw UTC-epoch
+// difference. A local-midnight Date in any positive-UTC-offset timezone
+// (e.g. Ethiopia, UTC+3) lands in the previous UTC day and converts to
+// yesterday's Ethiopian date. Re-embedding the same Y/M/D at UTC noon fixes
+// the day regardless of the runtime's timezone.
+export function toEthDateTime(date: Date): EthDateTime {
+  const utcNoon = new Date(
+    Date.UTC(date.getFullYear(), date.getMonth(), date.getDate(), 12),
+  );
+  return EthDateTime.fromEuropeanDate(utcNoon);
+}
+
+export function ethMonthName(date: Date): string {
+  try {
+    return EC_MONTHS_AM[toEthDateTime(date).month - 1] ?? '';
+  } catch {
+    return '';
+  }
+}
+
+export function toAmharicDisplay(date: Date): string {
+  try {
+    const eth = toEthDateTime(date);
+    return `${ethMonthName(date)} ${eth.date}/${eth.year}`;
+  } catch {
+    return date.toLocaleDateString('en-US');
+  }
+}
+
+export type EthPeriod = 'lelit' | 'tewat' | 'ken' | 'mata';
+
+// Ethiopian day starts at 6am. Period is picked from the 24h hour; the
+// displayed hour is the Western hour shifted 6, wrapped onto a 12-hour dial.
+// Each period only spans 6 hours (not 12): ጠዋት/ማታ show 12,1..5, ቀን/ሌሊት show
+// 6..11 — offering all 12 hours in every period would let a user pick e.g.
+// "ጠዋት 7", which has no 06:00–11:59 preimage.
+export const ETH_PERIODS: { value: EthPeriod; label: string; hours: number[] }[] = [
+  { value: 'tewat', label: 'ጠዋት', hours: [12, 1, 2, 3, 4, 5] }, // 06:00–11:59
+  { value: 'ken', label: 'ቀን', hours: [6, 7, 8, 9, 10, 11] }, // 12:00–17:59
+  { value: 'mata', label: 'ማታ', hours: [12, 1, 2, 3, 4, 5] }, // 18:00–23:59
+  { value: 'lelit', label: 'ሌሊት', hours: [6, 7, 8, 9, 10, 11] }, // 00:00–05:59
+];
+
+export function toEthTime(h24: number): { period: EthPeriod; hour: number } {
+  const period: EthPeriod =
+    h24 < 6 ? 'lelit' : h24 < 12 ? 'tewat' : h24 < 18 ? 'ken' : 'mata';
+  return { period, hour: ((h24 + 6) % 12) || 12 };
+}
+
+export function fromEthTime(period: EthPeriod, hour: number): number {
+  // Inverse of the shift, then re-add the 12h that %12 discarded for the
+  // afternoon/night pair of periods.
+  const pm = period === 'ken' || period === 'mata';
+  return ((hour + 6) % 12) + (pm ? 12 : 0);
+}
+
+export function ethTimeLabel(date: Date): string {
+  const { period, hour } = toEthTime(date.getHours());
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const label = ETH_PERIODS.find((p) => p.value === period)?.label ?? '';
+  return `${String(hour).padStart(2, '0')}:${minutes} ${label}`;
+}
diff --git a/libs/shared/src/lib/date/use-date-displayer.ts b/libs/shared/src/lib/date/use-date-displayer.ts
new file mode 100644
index 000000000..f68aabe92
--- /dev/null
+++ b/libs/shared/src/lib/date/use-date-displayer.ts
@@ -0,0 +1,22 @@
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { dateDisplayer } from './date-displayer';
+
+/**
+ * The component-facing date formatter.
+ *
+ * A hook rather than a bare import so the calling component is subscribed to
+ * i18next: switching language re-renders it and the dates flip with everything
+ * else. `useTranslation()` with no instance argument resolves to the app's own
+ * <I18nextProvider> (portal router.tsx, backoffice AppProviders.tsx), which is
+ * what makes this work across two separate i18n instances.
+ *
+ * The returned function is stable per language, so it is safe — and required —
+ * as a useMemo/useCallback dependency.
+ */
+export function useDateDisplayer(): (
+  value: string | number | Date | null | undefined,
+) => string {
+  const { i18n } = useTranslation();
+  return useCallback((value) => dateDisplayer(value, i18n.language), [i18n.language]);
+}
diff --git a/libs/shared/src/lib/theme/ema-theme.ts b/libs/shared/src/lib/theme/ema-theme.ts
index de3b3ca72..6122e2b36 100644
--- a/libs/shared/src/lib/theme/ema-theme.ts
+++ b/libs/shared/src/lib/theme/ema-theme.ts
@@ -31,6 +31,24 @@ export const emaTheme = createTheme({
     md: '0 4px 20px rgba(15,23,42,0.08)',
     lg: '0 8px 30px rgba(15,23,42,0.12)',
   },
+  components: {
+    // Mantine's stock scroll wrapper (NativeScrollArea) discards the
+    // max-height it's handed unless scrollAreaComponent is set, so a modal
+    // taller than the viewport just gets clipped with no way to scroll it.
+    // Making the body the scrollport here fixes every Modal/Drawer at once.
+    Modal: {
+      styles: {
+        content: { display: 'flex', flexDirection: 'column', maxHeight: '90dvh' },
+        body: { flex: '1 1 auto', minHeight: 0, overflowY: 'auto' },
+      },
+    },
+    Drawer: {
+      styles: {
+        content: { display: 'flex', flexDirection: 'column' },
+        body: { flex: '1 1 auto', minHeight: 0, overflowY: 'auto' },
+      },
+    },
+  },
   other: {
     heroGradient: 'linear-gradient(135deg, #3160b7 0%, #1fc29d 100%)',
   },
diff --git a/libs/shared/vitest.config.ts b/libs/shared/vitest.config.ts
new file mode 100644
index 000000000..3a1195e49
--- /dev/null
+++ b/libs/shared/vitest.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from 'vitest/config';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/libs/shared',
+  plugins: [nxViteTsPaths()],
+  test: {
+    watch: false,
+    globals: true,
+    environment: 'node',
+    reporters: ['default'],
+  },
+});
diff --git a/libs/ui/src/index.ts b/libs/ui/src/index.ts
index feb67d421..e713c8ee3 100644
--- a/libs/ui/src/index.ts
+++ b/libs/ui/src/index.ts
@@ -1,15 +1,23 @@
-export * from './lib/input/BilingualInput';
-export * from './lib/feedback/ConfirmModal';
-export * from './lib/feedback/ApiErrorAlert';
-export * from './lib/feedback/notify';
-export * from './lib/feedback/FeatureUnavailable';
-export * from './lib/feedback/EmptyState';
-export * from './lib/feedback/ErrorState';
-export * from './lib/layout/AppHeader';
-export * from './lib/layout/AppSidebar';
-export * from './lib/layout/AppTopNav';
-export * from './lib/layout/nav-utils';
-export * from './lib/layout/BrandAvatar';
-export * from './lib/layout/ColorSchemeToggle';
-export * from './lib/layout/LanguageSwitcher';
-export * from './lib/layout/PageHeader';
+export * from "./lib/input/BilingualInput";
+export * from "./lib/input/AmharicDatePicker";
+export * from "./lib/feedback/ConfirmModal";
+export * from "./lib/feedback/ModalFooter";
+export * from "./lib/feedback/ApiErrorAlert";
+export * from "./lib/feedback/notify";
+export * from "./lib/feedback/FeatureUnavailable";
+export * from "./lib/feedback/EmptyState";
+export * from "./lib/feedback/ErrorState";
+export * from "./lib/layout/AppHeader";
+export * from "./lib/layout/AppSidebar";
+export * from "./lib/layout/AppTopNav";
+export * from "./lib/layout/nav-utils";
+export * from "./lib/layout/BrandAvatar";
+export * from "./lib/layout/ColorSchemeToggle";
+export * from "./lib/layout/LanguageSwitcher";
+export * from "./lib/layout/PageHeader";
+export * from "./lib/input/PasswordRequirements";
+export * from "./lib/input/CountrySelect";
+export * from "./lib/input/phone";
+export * from "./lib/data/AdvancedTable";
+export * from "./lib/feedback/use-error-handler";
+export * from "./lib/data/useServerTable";
diff --git a/libs/ui/src/lib/components/MaritimeLoader.tsx b/libs/ui/src/lib/components/MaritimeLoader.tsx
new file mode 100644
index 000000000..a02ee2730
--- /dev/null
+++ b/libs/ui/src/lib/components/MaritimeLoader.tsx
@@ -0,0 +1,436 @@
+import type { CSSProperties, ComponentPropsWithoutRef } from "react";
+
+export interface MaritimeLoaderProps extends Omit<
+  ComponentPropsWithoutRef<"span">,
+  "children" | "color"
+> {
+  /** Standalone size. Mantine's Loader size is used automatically when omitted. */
+  size?: number | string;
+  /** Standalone CSS color. Mantine's Loader color is used automatically when omitted. */
+  color?: string;
+  /** Accessible status text. */
+  label?: string;
+}
+
+const styles = `
+  .ema-loader {
+    position: relative;
+    display: inline-block;
+    width: calc(var(--ema-size, var(--loader-size, 80px)) * 1.88);
+    color: var(--ema-color, var(--loader-color, #075985));
+    vertical-align: middle;
+  }
+
+  .ema-loader__svg {
+    display: block;
+    width: 100%;
+    height: var(--ema-size, var(--loader-size, 80px));
+    overflow: visible;
+    filter: drop-shadow(
+      0 calc(var(--ema-size, var(--loader-size, 80px)) * 0.035)
+      calc(var(--ema-size, var(--loader-size, 80px)) * 0.04)
+      rgb(7 39 58 / 18%)
+    );
+  }
+
+  .ema-loader__ship {
+    transform-box: fill-box;
+    transform-origin: 50% 82%;
+    animation: ema-ship-float 2.55s cubic-bezier(0.45, 0, 0.55, 1) infinite;
+  }
+
+  .ema-loader__shadow {
+    fill: currentColor;
+    opacity: 0.12;
+    transform-box: fill-box;
+    transform-origin: center;
+    animation: ema-shadow-breathe 2.55s cubic-bezier(0.45, 0, 0.55, 1) infinite;
+  }
+
+  .ema-loader__deck {
+    fill: currentColor;
+    opacity: 0.82;
+  }
+
+  .ema-loader__superstructure > path:first-child,
+  .ema-loader__bridge-top {
+    fill: #f8fbfc;
+    stroke: currentColor;
+    stroke-width: 2.4;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__bridge-top { stroke-width: 2; }
+
+  .ema-loader__window {
+    fill: #bfe9ff;
+    stroke: currentColor;
+    stroke-width: 0.7;
+  }
+
+  .ema-loader__cabin-line {
+    fill: currentColor;
+    opacity: 0.35;
+  }
+
+  .ema-loader__funnel > path:first-child {
+    fill: #eef3f5;
+    stroke: currentColor;
+    stroke-width: 2;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__green { fill: #078930; }
+  .ema-loader__yellow { fill: #fcd116; }
+  .ema-loader__red { fill: #da121a; }
+
+  .ema-loader__mast {
+    fill: currentColor;
+    stroke: currentColor;
+    stroke-width: 1.8;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__flag-pole {
+    fill: none;
+    stroke: currentColor;
+    stroke-width: 1.7;
+    stroke-linecap: round;
+  }
+
+  .ema-loader__flag {
+    transform-box: fill-box;
+    transform-origin: left center;
+    animation: ema-flag-wave 0.95s ease-in-out infinite alternate;
+  }
+
+  .ema-loader__hull {
+    fill: #f8fbfc;
+    stroke: currentColor;
+    stroke-width: 1.4;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__lower-hull {
+    fill: currentColor;
+    opacity: 0.92;
+  }
+
+  .ema-loader__waterline {
+    fill: none;
+    stroke: rgb(255 255 255 / 52%);
+    stroke-width: 2.4;
+    stroke-linecap: round;
+  }
+
+  .ema-loader__bow-highlight {
+    fill: none;
+    stroke: rgb(255 255 255 / 46%);
+    stroke-width: 2.3;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__portholes {
+    fill: #d7f2ff;
+    stroke: currentColor;
+    stroke-width: 0.8;
+  }
+
+  .ema-loader__cargo path {
+    fill: none;
+    stroke: rgb(255 255 255 / 22%);
+    stroke-width: 1;
+  }
+
+  .ema-loader__container-dark rect { fill: #3f4a52; }
+  .ema-loader__container-muted rect { fill: #7d8991; }
+  .ema-loader__container-steel rect { fill: #59656d; }
+  .ema-loader__container-light rect { fill: #aab2b8; }
+  .ema-loader__container-medium rect { fill: #6c7880; }
+
+  .ema-loader__water-back,
+  .ema-loader__water-front,
+  .ema-loader__foam {
+    fill: none;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+  }
+
+  .ema-loader__water-back {
+    stroke: currentColor;
+    stroke-width: 5;
+    opacity: 0.28;
+    stroke-dasharray: 58 12;
+    animation: ema-water-back 2.8s linear infinite;
+  }
+
+  .ema-loader__water-front {
+    stroke: currentColor;
+    stroke-width: 6;
+    opacity: 0.55;
+    stroke-dasharray: 70 10;
+    animation: ema-water-front 1.9s linear infinite;
+  }
+
+  .ema-loader__foam {
+    stroke: rgb(255 255 255 / 78%);
+    stroke-width: 3;
+    stroke-dasharray: 11 7;
+    animation: ema-foam-drift 1.65s linear infinite;
+  }
+
+  @keyframes ema-ship-float {
+    0%, 100% { transform: translateY(1.5px) rotate(-0.65deg); }
+    50% { transform: translateY(-3px) rotate(0.65deg); }
+  }
+
+  @keyframes ema-shadow-breathe {
+    0%, 100% { transform: scaleX(1.02); opacity: 0.14; }
+    50% { transform: scaleX(0.9); opacity: 0.08; }
+  }
+
+  @keyframes ema-flag-wave {
+    from { transform: skewY(-3deg) scaleX(0.94); }
+    to { transform: skewY(3deg) scaleX(1.04); }
+  }
+
+  @keyframes ema-water-back {
+    to { stroke-dashoffset: -140; }
+  }
+
+  @keyframes ema-water-front {
+    to { stroke-dashoffset: 160; }
+  }
+
+  @keyframes ema-foam-drift {
+    to { stroke-dashoffset: -36; }
+  }
+
+  @media (prefers-reduced-motion: reduce) {
+    .ema-loader__ship,
+    .ema-loader__shadow,
+    .ema-loader__flag,
+    .ema-loader__water-back,
+    .ema-loader__water-front,
+    .ema-loader__foam {
+      animation: none;
+    }
+  }
+
+@media (forced-colors: active) {
+     .ema-loader__green,
+     .ema-loader__yellow,
+     .ema-loader__red,
+     .ema-loader__container-dark rect,
+     .ema-loader__container-muted rect,
+     .ema-loader__container-steel rect,
+     .ema-loader__container-light rect,
+     .ema-loader__container-medium rect {
+       fill: currentColor;
+     }
+   }
+
+.ema-loader__label {
+      display: block;
+      text-align: center;
+      font-size: 12px;
+      line-height: 1.2;
+      margin-top: 4px;
+      color: currentColor;
+    }
+ `;
+
+function toCssSize(value: number | string | undefined) {
+  return typeof value === "number" ? `${value}px` : value;
+}
+
+export function MaritimeLoader({
+  size,
+  color,
+  label = "Loading maritime services",
+  className,
+  style,
+  ...props
+}: MaritimeLoaderProps) {
+  const cssVariables = {
+    ...(size ? { "--ema-size": toCssSize(size) } : {}),
+    ...(color ? { "--ema-color": color } : {}),
+    ...style,
+  } as CSSProperties;
+
+  return (
+    <span
+      {...props}
+      className={["ema-loader", className].filter(Boolean).join(" ")}
+      style={cssVariables}
+      role="status"
+      aria-label={label}
+    >
+      <style>{styles}</style>
+
+      <svg
+        className="ema-loader__svg"
+        viewBox="0 0 260 138"
+        aria-hidden="true"
+        focusable="false"
+      >
+        <g className="ema-loader__shadow">
+          <ellipse cx="132" cy="113" rx="78" ry="7" />
+        </g>
+
+        <g className="ema-loader__ship">
+          <g className="ema-loader__cargo">
+            <g className="ema-loader__container-dark">
+              <rect x="60" y="54" width="27" height="17" rx="1.5" />
+              <path d="M66 56v13M73 56v13M80 56v13" />
+            </g>
+            <g className="ema-loader__container-steel">
+              <rect x="89" y="54" width="27" height="17" rx="1.5" />
+              <path d="M95 56v13M102 56v13M109 56v13" />
+            </g>
+            <g className="ema-loader__container-light">
+              <rect x="118" y="54" width="27" height="17" rx="1.5" />
+              <path d="M124 56v13M131 56v13M138 56v13" />
+            </g>
+            <g className="ema-loader__container-medium">
+              <rect x="147" y="54" width="27" height="17" rx="1.5" />
+              <path d="M153 56v13M160 56v13M167 56v13" />
+            </g>
+            <g className="ema-loader__container-dark">
+              <rect x="76" y="35" width="27" height="17" rx="1.5" />
+              <path d="M82 37v13M89 37v13M96 37v13" />
+            </g>
+            <g className="ema-loader__container-muted">
+              <rect x="105" y="35" width="27" height="17" rx="1.5" />
+              <path d="M111 37v13M118 37v13M125 37v13" />
+            </g>
+            <g className="ema-loader__container-dark">
+              <rect x="134" y="35" width="27" height="17" rx="1.5" />
+              <path d="M140 37v13M147 37v13M154 37v13" />
+            </g>
+          </g>
+
+          <path className="ema-loader__deck" d="M42 72H214l-4 6H48z" />
+
+          <g className="ema-loader__superstructure">
+            <path d="M174 41h27l10 31h-42z" />
+            <path className="ema-loader__bridge-top" d="M178 32h20l5 9h-27z" />
+            <rect
+              className="ema-loader__window"
+              x="179"
+              y="45"
+              width="7"
+              height="7"
+              rx="1"
+            />
+            <rect
+              className="ema-loader__window"
+              x="188"
+              y="45"
+              width="7"
+              height="7"
+              rx="1"
+            />
+            <rect
+              className="ema-loader__window"
+              x="197"
+              y="45"
+              width="7"
+              height="7"
+              rx="1"
+            />
+            <rect
+              className="ema-loader__cabin-line"
+              x="180"
+              y="58"
+              width="20"
+              height="2.5"
+              rx="1.25"
+            />
+          </g>
+
+          <g className="ema-loader__funnel">
+            <path d="M166 25h10l3 17h-15z" />
+            <path
+              className="ema-loader__green"
+              d="M166.9 29h9.9l.6 3.5h-11.1z"
+            />
+            <path
+              className="ema-loader__yellow"
+              d="M166.2 32.5h11.2l.6 3.5h-12.4z"
+            />
+            <path
+              className="ema-loader__red"
+              d="M165.6 36h12.4l.6 3.5h-13.6z"
+            />
+          </g>
+
+          <g className="ema-loader__mast">
+            <path d="M194 31V12M188 20h12M194 13l11 8M194 13l-9 8" />
+            <circle cx="194" cy="11" r="2" />
+          </g>
+
+          <g>
+            <path className="ema-loader__flag-pole" d="M184 20V8" />
+            <g className="ema-loader__flag">
+              <path
+                className="ema-loader__green"
+                d="M184 8c7-3 11 3 18 0v4c-7 3-11-3-18 0z"
+              />
+              <path
+                className="ema-loader__yellow"
+                d="M184 12c7-3 11 3 18 0v4c-7 3-11-3-18 0z"
+              />
+              <path
+                className="ema-loader__red"
+                d="M184 16c7-3 11 3 18 0v4c-7 3-11-3-18 0z"
+              />
+            </g>
+          </g>
+
+          <path
+            className="ema-loader__hull"
+            d="M28 76h205l-15 18c-8 10-20 15-33 15H66c-13 0-24-5-31-15L23 80c-2-2 0-4 5-4z"
+          />
+          <path
+            className="ema-loader__lower-hull"
+            d="M34 88h190l-6 6c-8 10-20 15-33 15H66c-13 0-24-5-31-15z"
+          />
+          <path className="ema-loader__waterline" d="M36 87h188" />
+          <path className="ema-loader__bow-highlight" d="M206 81l15 1-8 9" />
+
+          <g className="ema-loader__portholes">
+            <circle cx="66" cy="91" r="2.2" />
+            <circle cx="78" cy="91" r="2.2" />
+            <circle cx="90" cy="91" r="2.2" />
+          </g>
+        </g>
+
+        <g className="ema-loader__water-back">
+          <path d="M3 112c17-8 30-8 47 0s30 8 47 0 30-8 47 0 30 8 47 0 30-8 47 0 30 8 47 0" />
+        </g>
+        <g className="ema-loader__water-front">
+          <path d="M-8 121c19-9 34-9 53 0s34 9 53 0 34-9 53 0 34 9 53 0 34-9 53 0 34 9 53 0" />
+        </g>
+        <g className="ema-loader__foam">
+          <path d="M29 106c13 4 25 5 38 3" />
+          <path d="M200 108c14 1 24-1 35-5" />
+        </g>
+      </svg>
+      {label && <span className="ema-loader__label">{label}</span>}
+    </span>
+  );
+}
+
+export default MaritimeLoader;
+
+// how to use this component.
+// <Center style={{ width: "90vw", height: "90vh" }}>
+//     <MaritimeLoader
+//       size={120}
+//       color="#075985"
+//       label="Loading Maritime Services..."
+//     />
+//   </Center>
diff --git a/libs/ui/src/lib/data/AdvancedTable.md b/libs/ui/src/lib/data/AdvancedTable.md
new file mode 100644
index 000000000..a5792d888
--- /dev/null
+++ b/libs/ui/src/lib/data/AdvancedTable.md
@@ -0,0 +1,158 @@
+# AdvancedTable
+
+Server-paginated data table with a column-visibility ("View") menu. Built on Mantine `Table`. Portable — two files, no app-specific imports.
+
+## Files
+
+- `AdvancedTable.tsx` — the component.
+- `useServerTable.ts` — small hook for page-index + search-query state (optional, but pairs with it).
+
+To use in another project, copy both files as-is into that project and export them from your UI barrel (or import by relative path).
+
+## Dependencies
+
+```
+@mantine/core       (tested on ^8)
+@tabler/icons-react  (IconRefresh, IconEye, IconInbox)
+react-i18next        (useTranslation)
+react                (>=17, uses hooks)
+```
+
+If the target project doesn't use `react-i18next`, replace the `t(key, fallback)` calls with plain strings — the component only reads the fallback text, translation is not load-bearing.
+
+## Install
+
+```bash
+npm install @mantine/core @tabler/icons-react react-i18next
+```
+
+Mantine must already be set up with `MantineProvider` in the app root — this component does not wrap one.
+
+## Copy the source
+
+Copy `AdvancedTable.tsx` and `useServerTable.ts` into the new project (e.g. `src/components/table/`). No modifications needed unless you're renaming the i18n keys.
+
+## API
+
+### `AdvancedColumn<T>`
+
+| Field | Type | Required | Notes |
+|---|---|---|---|
+| `header` | `ReactNode` | yes | Column heading, also used as the label in the View menu. |
+| `accessorKey` | `string` | no | Dot-path into the row (e.g. `"expectation.name"`), used when `cell` is omitted. |
+| `cell` | `(ctx: { row: { original: T }; value: unknown }) => ReactNode` | no | Custom cell renderer. Takes priority over `accessorKey`. |
+| `size` | `number` | no | Column width in px. |
+| `align` | `'left' \| 'center' \| 'right'` | no | Text alignment for header + cells. |
+| `enabled` | `boolean` | no | Whether the column starts **visible**. Default `true`. Toggled at runtime via the View menu. |
+
+### `AdvancedTable<T>` props
+
+| Prop | Type | Required | Notes |
+|---|---|---|---|
+| `columns` | `AdvancedColumn<T>[]` | yes | |
+| `data` | `T[]` | yes | Rows for the **current page** only — not the full dataset. |
+| `tableName` | `string` | yes | Shown as the table title. |
+| `itemCount` | `number` | yes | Total row count on the server. Drives pagination and the count badge — not `data.length`. |
+| `pageIndex` | `number` | yes | 0-based current page. |
+| `onPageChange` | `(pageIndex: number) => void` | yes | |
+| `pageSize` | `number` | no | Default `10`. Pagination only renders when `itemCount > pageSize`. |
+| `onPageSizeChange` | `(pageSize: number) => void` | no | Shows a page-size `<Select>` (10/20/30/40/50 by default) next to the pagination when given. |
+| `pageSizeOptions` | `number[]` | no | Options for the page-size select. Default `[10, 20, 30, 40, 50]`. |
+| `refresh` | `() => void` | no | Shows a Refresh button when provided. |
+| `onSearchChange` | `(q: string) => void` | no | Reserved for a search box; not currently rendered by the component itself (wire your own input and call this, or drive `useServerTable`'s `setQ`). |
+| `isLoading` | `boolean` | no | Shows a loader row; also spins the Refresh button. |
+| `emptyText` | `string` | no | Message when `data` is empty. |
+
+Rows should have an `id: string \| number` field — used as the React key (falls back to row index if absent).
+
+### `useServerTable(opts?)`
+
+```ts
+const { pageIndex, setPageIndex, q, setQ, pageSize, setPageSize, skip, take } = useServerTable({ pageSize: 10 });
+```
+
+Centralizes page-index + search-query state for a server-paginated list. `setQ` and `setPageSize` both reset `pageIndex` back to 0. `skip`/`take` are ready to drop into an offset-based API call. Wire `setPageSize` into `AdvancedTable`'s `onPageSizeChange` to expose the page-size select.
+
+## Behavior notes
+
+- **Column visibility** is local UI state (`useState`), re-initialized from each column's `enabled` on mount — it does not persist across reloads or sync back to the caller.
+- At least one column always stays visible; the View menu disables unchecking the last one.
+- The View menu closes only via outside click (`closeOnItemClick={false}`), so multiple columns can be toggled per open.
+
+## Usage
+
+### Basic
+
+```tsx
+import { AdvancedTable, type AdvancedColumn } from './table/AdvancedTable';
+
+interface User {
+  id: string;
+  name: string;
+  email: string;
+}
+
+const columns: AdvancedColumn<User>[] = [
+  { header: 'Name', accessorKey: 'name' },
+  { header: 'Email', accessorKey: 'email', enabled: true },
+];
+
+<AdvancedTable
+  columns={columns}
+  data={users}
+  tableName="Users"
+  itemCount={users.length}
+  pageIndex={0}
+  onPageChange={() => {}}
+/>
+```
+
+### Server-paginated, with refresh and a custom action column
+
+```tsx
+import { AdvancedTable, useServerTable, type AdvancedColumn } from './table/AdvancedTable';
+
+function UsersTable() {
+  const { pageIndex, setPageIndex, skip, take } = useServerTable({ pageSize: 10 });
+  const { data, isFetching, refetch } = useGetUsersQuery({ skip, take });
+
+  const users = data?.items ?? [];
+  const totalCount = data?.total ?? 0;
+
+  const columns: AdvancedColumn<User>[] = [
+    { header: 'Name', accessorKey: 'name' },
+    { header: 'Email', accessorKey: 'email' },
+    {
+      header: 'Status',
+      align: 'center',
+      cell: ({ row }) => (row.original.active ? 'Active' : 'Inactive'),
+    },
+    {
+      header: '',
+      size: 80,
+      cell: ({ row }) => (
+        <ActionIcon onClick={() => onEdit(row.original)}>
+          <IconEdit size={14} />
+        </ActionIcon>
+      ),
+    },
+  ];
+
+  return (
+    <AdvancedTable
+      columns={columns}
+      data={users}
+      tableName="Users"
+      itemCount={totalCount}
+      pageIndex={pageIndex}
+      onPageChange={setPageIndex}
+      pageSize={10}
+      refresh={refetch}
+      isLoading={isFetching}
+      emptyText="No users found"
+    />
+  );
+}
+```
+
+Real reference implementation: `apps/backoffice/src/app/features/configuration/pages/ConfigurationPage.tsx` (`ProfessionTab`).
diff --git a/libs/ui/src/lib/data/AdvancedTable.tsx b/libs/ui/src/lib/data/AdvancedTable.tsx
new file mode 100644
index 000000000..a50010013
--- /dev/null
+++ b/libs/ui/src/lib/data/AdvancedTable.tsx
@@ -0,0 +1,249 @@
+import { CSSProperties, ReactNode, useState } from "react";
+import {
+  Table,
+  Button,
+  Menu,
+  Checkbox,
+  Group,
+  Text,
+  Pagination,
+  Loader,
+  Center,
+  Paper,
+  Select,
+} from "@mantine/core";
+import { IconRefresh, IconAdjustmentsHorizontal , IconInbox, } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+
+export interface AdvancedColumn<T> {
+  header: ReactNode;
+  /** Dot-path into the row, used when no `cell` is given (e.g. "expectation.name"). */
+  accessorKey?: string;
+  cell?: (ctx: { row: { original: T }; value: unknown }) => ReactNode;
+  size?: number;
+  align?: "left" | "center" | "right";
+  /** Whether column starts visible. Default true. */
+  enabled?: boolean;
+  /** Label for the View menu; falls back to `header` when it is a plain string. */
+  label?: string;
+}
+
+interface AdvancedTableProps<T> {
+  columns: AdvancedColumn<T>[];
+  data: T[];
+  tableName: string;
+  /** Total item count on the server (drives pagination), not data.length. */
+  itemCount: number;
+  /** 0-based current page. */
+  pageIndex: number;
+  onPageChange: (pageIndex: number) => void;
+  pageSize?: number;
+  /** Shows a page-size <Select> when given; called with the chosen size. */
+  onPageSizeChange?: (pageSize: number) => void;
+  /** Options for the page-size select. Default [10, 20, 30, 40, 50]. */
+  pageSizeOptions?: number[];
+  refresh?: () => void;
+  /** Server-side search — debounced internally. Omit to hide the search box. */
+  onSearchChange?: (q: string) => void;
+  isLoading?: boolean;
+  emptyText?: string;
+  verticalSpacing?: string | number;
+  rowStyle?: (row: T, index: number) => CSSProperties | undefined;
+}
+
+function getByPath(obj: unknown, path?: string): unknown {
+  if (!path) return undefined;
+  return path
+    .split(".")
+    .reduce<unknown>(
+      (acc, key) =>
+        acc && typeof acc === "object"
+          ? (acc as Record<string, unknown>)[key]
+          : undefined,
+      obj,
+    );
+}
+
+export function AdvancedTable<T extends { id?: string | number }>({
+  columns,
+  data,
+  tableName,
+  itemCount,
+  pageIndex,
+  onPageChange,
+  pageSize = 10,
+  onPageSizeChange,
+  pageSizeOptions = [10, 20, 30, 40, 50],
+  refresh,
+  isLoading = false,
+  emptyText,
+  verticalSpacing = "sm",
+  rowStyle,
+}: AdvancedTableProps<T>) {
+  const { t } = useTranslation();
+  const [visible, setVisible] = useState<boolean[]>(
+    columns.map((c) => c.enabled ?? true),
+  );
+  const toggleColumn = (i: number) =>
+    setVisible((prev) => {
+      if (prev[i] && prev.filter(Boolean).length === 1) return prev; // keep at least one column visible
+      return prev.map((v, idx) => (idx === i ? !v : v));
+    });
+  const shownColumns = columns.filter((_, i) => visible[i] ?? true);
+
+  return (
+    <Paper withBorder radius="md" p="md">
+      <Group justify="space-between" mb="md">
+        <Group gap="xs">
+          <Text fw={600}>{""}</Text>
+        </Group>
+        <Group gap="xs">
+          {refresh && (
+            <Button
+              variant="default"
+              size="sm"
+              leftSection={<IconRefresh size={16} />}
+              onClick={refresh}
+              loading={isLoading}
+            >
+              {t("common.refresh", "Refresh")}
+            </Button>
+          )}
+          <Menu
+            closeOnItemClick={false}
+            shadow="md"
+            position="bottom-end"
+            width={220}
+          >
+            <Menu.Target>
+              <Button
+                variant="default"
+                size="sm"
+                leftSection={<IconAdjustmentsHorizontal  size={16} />}
+              >
+                {t("common.view", "View")}
+              </Button>
+            </Menu.Target>
+            <Menu.Dropdown>
+              <Menu.Label>
+                {t("common.toggleColumns", "Toggle columns")}
+              </Menu.Label>
+              {columns.map((col, i) => {
+                // A ReactNode header (e.g. a live checkbox or a clickable sort
+                // control) can't be reused as a menu-item label — skip it
+                // rather than nesting interactive markup inside the label.
+                const label = col.label ?? (typeof col.header === "string" ? col.header : null);
+                if (label === null) return null;
+                return (
+                  <Menu.Item key={i} onClick={() => toggleColumn(i)}>
+                    <Checkbox
+                      label={label}
+                      checked={visible[i] ?? true}
+                      disabled={
+                        visible.filter(Boolean).length === 1 &&
+                        (visible[i] ?? true)
+                      }
+                      readOnly
+                      tabIndex={-1}
+                      styles={{
+                        input: { cursor: "pointer" },
+                        label: { cursor: "pointer" },
+                      }}
+                    />
+                  </Menu.Item>
+                );
+              })}
+            </Menu.Dropdown>
+          </Menu>
+        </Group>
+      </Group>
+
+      <Table.ScrollContainer minWidth={480}>
+        <Table
+          striped
+          highlightOnHover
+          withTableBorder
+          withColumnBorders
+          verticalSpacing={verticalSpacing}
+        >
+          <Table.Thead>
+            <Table.Tr>
+              {shownColumns.map((col, i) => (
+                <Table.Th
+                  key={i}
+                  style={{ width: col.size, textAlign: col.align }}
+                >
+                  {col.header}
+                </Table.Th>
+              ))}
+            </Table.Tr>
+          </Table.Thead>
+          <Table.Tbody>
+            {isLoading ? (
+              <Table.Tr>
+                <Table.Td colSpan={shownColumns.length}>
+                  <Center py="xl">
+                    <Loader size="sm" />
+                  </Center>
+                </Table.Td>
+              </Table.Tr>
+            ) : data.length === 0 ? (
+              <Table.Tr>
+                <Table.Td colSpan={shownColumns.length}>
+                  <Center py="xl">
+                    <Group gap="xs" c="dimmed">
+                      <IconInbox size={18} />
+                      <Text c="dimmed">
+                        {emptyText ?? t("common.noResult", "No results")}
+                      </Text>
+                    </Group>
+                  </Center>
+                </Table.Td>
+              </Table.Tr>
+            ) : (
+              data.map((row, rowIndex) => (
+                <Table.Tr key={row.id ?? rowIndex} style={rowStyle?.(row, rowIndex)}>
+                  {shownColumns.map((col, i) => {
+                    const value = getByPath(row, col.accessorKey);
+                    return (
+                      <Table.Td key={i} style={{ textAlign: col.align }}>
+                        {col.cell
+                          ? col.cell({ row: { original: row }, value })
+                          : ((value as ReactNode) ?? "-")}
+                      </Table.Td>
+                    );
+                  })}
+                </Table.Tr>
+              ))
+            )}
+          </Table.Tbody>
+        </Table>
+      </Table.ScrollContainer>
+
+      {(itemCount > pageSize || onPageSizeChange) && (
+        <Group justify="flex-end" mt="md">
+          {onPageSizeChange && (
+            <Select
+              size="sm"
+              w={100}
+              data={pageSizeOptions.map((n) => String(n))}
+              value={String(pageSize)}
+              onChange={(v) => v && onPageSizeChange(Number(v))}
+              allowDeselect={false}
+            />
+          )}
+          {itemCount > pageSize && (
+            <Pagination
+              total={Math.ceil(itemCount / pageSize)}
+              value={pageIndex + 1}
+              onChange={(page) => onPageChange(page - 1)}
+              size="sm"
+              siblings={0}
+              boundaries={1}
+            />
+          )}
+        </Group>
+      )}
+    </Paper>
+  );
+}
diff --git a/libs/ui/src/lib/data/useServerTable.ts b/libs/ui/src/lib/data/useServerTable.ts
new file mode 100644
index 000000000..e9cbf02d5
--- /dev/null
+++ b/libs/ui/src/lib/data/useServerTable.ts
@@ -0,0 +1,53 @@
+import { useState, useCallback } from 'react';
+
+interface UseServerTableOptions {
+  pageSize?: number;
+}
+
+/**
+ * Centralizes the page-index + search-query state a server-paginated table
+ * needs. Changing the search query resets paging back to page 0.
+ */
+export function useServerTable({ pageSize: initialPageSize = 10 }: UseServerTableOptions = {}) {
+  const [pageIndex, setPageIndex] = useState(0);
+  const [pageSize, setPageSizeInternal] = useState(initialPageSize);
+  const [q, setQInternal] = useState('');
+
+  const setQ = useCallback((value: string) => {
+    setQInternal(value);
+    setPageIndex(0);
+  }, []);
+
+  const setPageSize = useCallback((value: number) => {
+    setPageSizeInternal(value);
+    setPageIndex(0);
+  }, []);
+
+  // Slice an already-fetched array for AdvancedTable when the endpoint has no
+  // skip/take of its own. Clamps pageIndex so deleting the last row of the
+  // last page doesn't strand the table on an empty slice.
+  const paginate = useCallback(
+    <T,>(rows: T[]) => {
+      const lastPage = Math.max(0, Math.ceil(rows.length / pageSize) - 1);
+      const clamped = Math.min(pageIndex, lastPage);
+      return {
+        rows: rows.slice(clamped * pageSize, clamped * pageSize + pageSize),
+        pageIndex: clamped,
+        itemCount: rows.length,
+      };
+    },
+    [pageIndex, pageSize],
+  );
+
+  return {
+    pageIndex,
+    setPageIndex,
+    q,
+    setQ,
+    pageSize,
+    setPageSize,
+    skip: pageIndex * pageSize,
+    take: pageSize,
+    paginate,
+  };
+}
diff --git a/libs/ui/src/lib/feedback/ConfirmModal.tsx b/libs/ui/src/lib/feedback/ConfirmModal.tsx
index 2463c73d0..737e38d3e 100644
--- a/libs/ui/src/lib/feedback/ConfirmModal.tsx
+++ b/libs/ui/src/lib/feedback/ConfirmModal.tsx
@@ -1,4 +1,5 @@
-import { Modal, Button, Group, Text } from '@mantine/core';
+import { Modal, Button, Text } from '@mantine/core';
+import { ModalFooter } from './ModalFooter';
 
 interface ConfirmModalProps {
   opened: boolean;
@@ -26,14 +27,14 @@ export function ConfirmModal({
       <Text size="sm" mb="xl">
         {message}
       </Text>
-      <Group justify="flex-end">
+      <ModalFooter>
         <Button variant="subtle" onClick={onClose} disabled={loading}>
           {cancelLabel}
         </Button>
         <Button color="red" onClick={onConfirm} loading={loading}>
           {confirmLabel}
         </Button>
-      </Group>
+      </ModalFooter>
     </Modal>
   );
 }
diff --git a/libs/ui/src/lib/feedback/ModalFooter.tsx b/libs/ui/src/lib/feedback/ModalFooter.tsx
new file mode 100644
index 000000000..82dbc0296
--- /dev/null
+++ b/libs/ui/src/lib/feedback/ModalFooter.tsx
@@ -0,0 +1,38 @@
+import { Group, type GroupProps } from '@mantine/core';
+import type { CSSProperties } from 'react';
+
+/**
+ * Action row pinned to the bottom of a modal.
+ *
+ * Modal bodies scroll (see the Modal styles in the theme), which would carry the
+ * confirm button off-screen on a tall modal. Sticking to the bottom of the
+ * scrollport keeps the decision reachable from any scroll position. Negative
+ * margins bleed the background over the body's padding so nothing shows through
+ * underneath; on a modal short enough not to scroll this renders identically to
+ * a plain Group.
+ */
+export function ModalFooter({
+  children,
+  style,
+  ...props
+}: Omit<GroupProps, 'style'> & { style?: CSSProperties }) {
+  return (
+    <Group
+      justify="flex-end"
+      {...props}
+      style={{
+        position: 'sticky',
+        bottom: 'calc(var(--mb-padding, var(--mantine-spacing-md)) * -1)',
+        marginInline: 'calc(var(--mb-padding, var(--mantine-spacing-md)) * -1)',
+        marginBottom: 'calc(var(--mb-padding, var(--mantine-spacing-md)) * -1)',
+        padding: 'var(--mb-padding, var(--mantine-spacing-md))',
+        background: 'var(--mantine-color-body)',
+        borderTop: '1px solid var(--mantine-color-default-border)',
+        zIndex: 1,
+        ...style,
+      }}
+    >
+      {children}
+    </Group>
+  );
+}
diff --git a/libs/ui/src/lib/feedback/use-error-handler.ts b/libs/ui/src/lib/feedback/use-error-handler.ts
new file mode 100644
index 000000000..c6e7eb733
--- /dev/null
+++ b/libs/ui/src/lib/feedback/use-error-handler.ts
@@ -0,0 +1,72 @@
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { notify } from './notify';
+
+// Recursive: first non-empty string in a string | array | { message | error | detail }. Never throws.
+function extractMessage(value: unknown): string | null {
+  if (value == null) return null;
+  if (typeof value === 'string') return value.trim() || null;
+  if (Array.isArray(value)) {
+    const parts = value.map(extractMessage).filter(Boolean) as string[];
+    return parts.length ? parts.join(', ') : null;
+  }
+  if (typeof value === 'object') {
+    const o = value as Record<string, unknown>;
+    return extractMessage(o.message) ?? extractMessage(o.error) ?? extractMessage(o.detail) ?? null;
+  }
+  return null;
+}
+
+// HTTP status OR RTK string status (FETCH_ERROR/TIMEOUT_ERROR/PARSING_ERROR/CUSTOM_ERROR) → i18n key.
+function statusKeyFor(status: number | string | undefined): string {
+  if (status === 400 || status === 422) return 'msg.validationError';
+  if (status === 401) return 'msg.authError';
+  if (status === 403) return 'msg.permissionError';
+  if (status === 404) return 'msg.notFoundError';
+  if (status === 413) return 'msg.fileTooLarge';
+  if (typeof status === 'number' && status >= 500) return 'msg.serverError';
+  if (typeof status === 'string') return 'msg.networkError';
+  return 'msg.genericError';
+}
+
+function logError(err: unknown): void {
+  if (err && typeof err === 'object' && 'status' in err) {
+    console.error('[API ERROR]', (err as { status?: unknown }).status, (err as { data?: unknown }).data);
+    return;
+  }
+  console.error('Error caught:', err);
+}
+
+export function useErrorHandler() {
+  const { t } = useTranslation();
+
+  // Priority: backend message (FetchBaseQueryError.data) → Error.message → status/network fallback key.
+  const getErrorMessage = useCallback(
+    (err: unknown): string => {
+      let status: number | string | undefined;
+      if (err && typeof err === 'object' && ('status' in err || 'data' in err)) {
+        status = (err as { status?: number | string }).status;
+        const fromData = extractMessage((err as { data?: unknown }).data);
+        if (fromData) return fromData;
+      }
+      if (err instanceof Error) {
+        const fromError = extractMessage(err.message);
+        if (fromError) return fromError;
+      }
+      return t(statusKeyFor(status));
+    },
+    [t],
+  );
+
+  const handleError = useCallback(
+    (err: unknown): string => {
+      logError(err);
+      const message = getErrorMessage(err);
+      notify.error(message);
+      return message;
+    },
+    [getErrorMessage],
+  );
+
+  return { getErrorMessage, handleError };
+}
diff --git a/libs/ui/src/lib/input/AmharicDatePicker.css b/libs/ui/src/lib/input/AmharicDatePicker.css
new file mode 100644
index 000000000..3b675ac83
--- /dev/null
+++ b/libs/ui/src/lib/input/AmharicDatePicker.css
@@ -0,0 +1,224 @@
+/* Restyle the react-day-picker month/year dropdown caption to match Mantine
+   inputs — the library ships it as bare text + an invisible <select>, with
+   no border/box affordance and a hardcoded blue chevron. */
+.amharic-daypicker {
+  --rdp-accent-color: var(--mantine-primary-color-filled);
+  --rdp-day-height: 36px;
+  --rdp-day-width: 36px;
+  --rdp-day_button-height: 34px;
+  --rdp-day_button-width: 34px;
+  --rdp-weekday-padding: 0.25rem 0;
+  --rdp-nav-height: 2.25rem;
+  --rdp-nav_button-width: 2rem;
+  --rdp-nav_button-height: 2rem;
+}
+
+/* Backoffice loads Tailwind's preflight after the package stylesheet. That
+   reset can strip the day-picker table layout, leaving every weekday and day
+   stacked in a single column. Keep the calendar's structural styles local to
+   the component so it renders consistently in every app. */
+.amharic-daypicker .rdp-months {
+  position: relative;
+  display: flex;
+  max-width: fit-content;
+}
+
+.amharic-daypicker .rdp-month {
+  position: relative;
+}
+
+.amharic-daypicker .rdp-month_grid {
+  display: table;
+  border-collapse: collapse;
+}
+
+.amharic-daypicker .rdp-month_grid thead {
+  display: table-header-group;
+}
+
+.amharic-daypicker .rdp-month_grid tbody {
+  display: table-row-group;
+}
+
+.amharic-daypicker .rdp-month_grid tr {
+  display: table-row;
+}
+
+.amharic-daypicker .rdp-weekday,
+.amharic-daypicker .rdp-day {
+  display: table-cell;
+  width: var(--rdp-day-width);
+  height: var(--rdp-day-height);
+  text-align: center;
+}
+
+.amharic-daypicker .rdp-weekday {
+  padding: var(--rdp-weekday-padding);
+}
+
+.amharic-daypicker .rdp-day_button {
+  padding: 0;
+  margin: 0;
+  border: 2px solid transparent;
+  border-radius: 100%;
+  background: none;
+  color: inherit;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: var(--rdp-day_button-width);
+  height: var(--rdp-day_button-height);
+}
+
+.amharic-daypicker .rdp-nav {
+  position: absolute;
+  inset-block-start: 0;
+  inset-inline-end: 0;
+  display: flex;
+  align-items: center;
+  height: var(--rdp-nav-height);
+  z-index: 10;
+  pointer-events: none;
+}
+
+.amharic-daypicker .rdp-button_previous,
+.amharic-daypicker .rdp-button_next {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: var(--rdp-nav_button-width);
+  height: var(--rdp-nav_button-height);
+  padding: 0;
+  margin: 0;
+  position: relative;
+  z-index: 10;
+  pointer-events: auto;
+}
+
+.amharic-daypicker .rdp-dropdowns {
+  gap: 0.375rem;
+}
+
+.amharic-daypicker .rdp-dropdown_root {
+  border: 1px solid var(--mantine-color-default-border);
+  border-radius: var(--mantine-radius-sm);
+  background-color: var(--mantine-color-body);
+  padding: 0.25rem 0.5rem;
+}
+
+.amharic-daypicker .rdp-dropdown_root:hover {
+  background-color: var(--mantine-color-default-hover);
+}
+
+[data-mantine-color-scheme='dark'] .amharic-daypicker .rdp-dropdown {
+  color-scheme: dark;
+  background-color: var(--mantine-color-dark-7);
+  color: var(--mantine-color-gray-1);
+}
+
+[data-mantine-color-scheme='dark'] .amharic-daypicker .rdp-dropdown option {
+  background-color: var(--mantine-color-dark-7);
+  color: var(--mantine-color-gray-1);
+}
+
+.amharic-daypicker .rdp-caption_label {
+  gap: 0.25rem;
+  font-size: var(--mantine-font-size-sm);
+  font-weight: 500;
+  color: var(--mantine-color-text);
+}
+
+.amharic-daypicker .rdp-dropdown_root .rdp-chevron {
+  width: 12px;
+  height: 12px;
+  fill: var(--mantine-color-dimmed);
+}
+
+/* Prev/next month buttons: bigger tap target + visible button box (border,
+   background, accent-colored chevron) instead of the default bare, tiny
+   blue arrow — the dropdown captions replaced them as the primary nav, so
+   they need to stay easy to spot and hit. */
+.amharic-daypicker .rdp-button_previous,
+.amharic-daypicker .rdp-button_next {
+  border: 1px solid var(--mantine-color-default-border);
+  border-radius: var(--mantine-radius-sm);
+  background-color: var(--mantine-color-body);
+}
+
+.amharic-daypicker .rdp-button_previous:not([aria-disabled='true']):hover,
+.amharic-daypicker .rdp-button_next:not([aria-disabled='true']):hover {
+  background-color: var(--mantine-color-default-hover);
+}
+
+.amharic-daypicker .rdp-nav .rdp-chevron {
+  width: 20px;
+  height: 20px;
+  fill: var(--mantine-primary-color-filled);
+}
+
+.amharic-daypicker .rdp-month_caption {
+  font-size: inherit;
+  font-weight: 600;
+  margin-inline-end: calc(var(--rdp-nav_button-width) * 2 + 0.5rem);
+}
+
+/* Day cells are already circular (--rdp-day_button-border-radius: 100%);
+   the library only outlines the selected one by default — fill it instead
+   so the selection reads as a solid, unambiguous mark. */
+.amharic-daypicker .rdp-selected .rdp-day_button {
+  background-color: var(--mantine-primary-color-filled);
+  border-color: var(--mantine-primary-color-filled);
+  color: var(--mantine-color-white);
+}
+
+/* Today indicator — a solid accent-coloured ring that stays clearly visible
+   in both light and dark themes. The border uses the primary filled colour so
+   it stands out against the popup background on either scheme. The text gets
+   the primary colour so the digit is unambiguously "special" even without the
+   ring being thick. */
+.amharic-daypicker .rdp-today .rdp-day_button {
+  border: 2px solid var(--mantine-primary-color-filled) !important;
+  color: var(--mantine-primary-color-filled);
+  font-weight: 700;
+}
+
+/* When today is also the selected day, keep the filled background but add a
+   contrasting inner ring so the "today" mark isn't lost. */
+.amharic-daypicker .rdp-today.rdp-selected .rdp-day_button {
+  background-color: var(--mantine-primary-color-filled);
+  border-color: var(--mantine-primary-color-filled) !important;
+  color: var(--mantine-color-white);
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.5);
+}
+
+/* Dark-mode: bright border ring + bright text, NO filled background.
+   A filled background can end up white on dark surfaces; a ring + coloured
+   digit is always visible regardless of the popup colour scheme. */
+[data-mantine-color-scheme='dark'] .amharic-daypicker .rdp-today .rdp-day_button {
+  background-color: transparent !important;
+  border: 2px solid #74c0fc !important;
+  color: #74c0fc !important;
+  font-weight: 700;
+}
+
+/* When today is also selected in dark mode: keep the primary filled background
+   but use the bright ring so today is still distinguishable from other selected days. */
+[data-mantine-color-scheme='dark'] .amharic-daypicker .rdp-today.rdp-selected .rdp-day_button {
+  background-color: var(--mantine-primary-color-filled) !important;
+  border: 2px solid #74c0fc !important;
+  color: #fff !important;
+  box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.3);
+}
+
+/* Ensure no scrollbar appears on the datepicker popover dropdown */
+.amharic-daypicker-dropdown {
+  overflow: hidden !important;
+  scrollbar-width: none !important;
+  -ms-overflow-style: none !important;
+}
+
+.amharic-daypicker-dropdown::-webkit-scrollbar {
+  display: none !important;
+  width: 0 !important;
+  height: 0 !important;
+}
diff --git a/libs/ui/src/lib/input/AmharicDatePicker.tsx b/libs/ui/src/lib/input/AmharicDatePicker.tsx
new file mode 100644
index 000000000..78919ee2a
--- /dev/null
+++ b/libs/ui/src/lib/input/AmharicDatePicker.tsx
@@ -0,0 +1,403 @@
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  ActionIcon,
+  Button,
+  Group,
+  MantineSize,
+  Popover,
+  SegmentedControl,
+  Select,
+  Stack,
+  Text,
+  TextInput,
+} from '@mantine/core';
+import { TimeInput } from '@mantine/dates';
+import { useDisclosure } from '@mantine/hooks';
+import { DayPicker as EthiopicDayPicker } from '@daypicker/ethiopic';
+import { DayPicker as GregorianDayPicker } from '@daypicker/react';
+import { IconCalendarEvent } from '@tabler/icons-react';
+import '@daypicker/react/dist/style.css';
+import './AmharicDatePicker.css';
+import {
+  type EthPeriod,
+  ETH_PERIODS,
+  ethMonthName,
+  ethTimeLabel,
+  fromEthTime,
+  toAmharicDisplay,
+  toEthDateTime,
+  toEthTime,
+} from '@ema-platform/shared';
+
+export type { EthPeriod };
+
+// react-day-picker calls these with the Gregorian Date it tracks internally;
+// override so the caption/dropdown show Amharic month names instead of the
+// library's Latin transliteration (triggered by numerals="latn" below).
+const ETH_FORMATTERS = {
+  formatCaption: (month: Date) =>
+    `${ethMonthName(month)} ${toEthDateTime(month).year}`,
+  formatMonthDropdown: (month: Date) => ethMonthName(month),
+};
+
+type DateWireFormat = 'iso' | 'date';
+
+// yyyy-MM-dd, parsed/formatted as a LOCAL calendar date — no Date-object/UTC
+// round-trip at all, so it can't suffer the timezone off-by-one class of bug
+// the ISO path below works around. This is the shape filter query params and
+// plain `date: string` DTO fields expect.
+function parsePlainDate(value: string): Date | null {
+  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+  if (!m) return null;
+  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]));
+}
+
+function formatPlainDate(date: Date): string {
+  const y = date.getFullYear();
+  const m = String(date.getMonth() + 1).padStart(2, '0');
+  const d = String(date.getDate()).padStart(2, '0');
+  return `${y}-${m}-${d}`;
+}
+
+// ISO wire format is a full ISO-8601 instant string (e.g.
+// "2026-07-31T00:00:00.000Z"), what most backend date fields expect. When
+// `withTime` is off, the picker only selects a calendar day, so the time is
+// pinned to UTC midnight — reading back with getUTC*() (not local get*())
+// keeps the calendar day stable regardless of the runtime's timezone,
+// avoiding the same off-by-one class of bug the UTC-noon workaround above
+// exists for.
+function parseWireValue(
+  value: string | null | undefined,
+  format: DateWireFormat,
+  withTime: boolean,
+): Date | null {
+  if (!value) return null;
+  if (format === 'date') return parsePlainDate(value);
+  const d = new Date(value);
+  if (isNaN(d.getTime())) return null;
+  return withTime
+    ? d
+    : new Date(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());
+}
+
+function formatWireValue(
+  date: Date,
+  format: DateWireFormat,
+  withTime: boolean,
+): string {
+  if (format === 'date') return formatPlainDate(date);
+  return withTime
+    ? date.toISOString()
+    : new Date(
+        Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()),
+      ).toISOString();
+}
+
+// Combines a calendar day with a time-of-day, keeping whichever half isn't
+// changing. `base` is the currently selected Date (may be null if nothing
+// picked yet); `day`/`time` override only the half that's provided.
+function mergeDateTime(
+  base: Date | null,
+  day?: Date,
+  time?: { hours: number; minutes: number },
+): Date {
+  const result = day ? new Date(day) : new Date(base ?? new Date());
+  if (time) {
+    result.setHours(time.hours, time.minutes, 0, 0);
+  } else if (day && base) {
+    result.setHours(base.getHours(), base.getMinutes(), base.getSeconds(), 0);
+  }
+  return result;
+}
+
+const YEAR_DROPDOWN_START = new Date(new Date().getFullYear() - 100, 0, 1);
+const YEAR_DROPDOWN_END = new Date(new Date().getFullYear() + 50, 11, 31);
+
+export interface AmharicDatePickerProps {
+  label?: React.ReactNode;
+  value?: string | null;
+  onChange?: (value: string) => void;
+  required?: boolean;
+  placeholder?: string;
+  error?: React.ReactNode;
+  disabled?: boolean;
+  size?: MantineSize;
+  name?: string;
+  onBlur?: () => void;
+  /** Width of the input, same as Mantine's `w` on TextInput/Select — needed
+   * to line this field up with siblings in a filter bar. */
+  w?: number | string;
+  /** Show a time-of-day field alongside the calendar. Off by default —
+   * most callers only need a calendar day. */
+  withTime?: boolean;
+  /** Wire format for `value`/`onChange`: a full ISO-8601 instant (default,
+   * what most backend date fields expect) or a bare `yyyy-mm-dd` calendar
+   * date (what filter query params and plain `date: string` DTO fields
+   * expect). */
+  dateFormat?: DateWireFormat;
+}
+
+export function AmharicDatePicker({
+  label,
+  value,
+  onChange,
+  required,
+  placeholder,
+  error,
+  disabled,
+  size,
+  name,
+  onBlur,
+  w,
+  withTime = false,
+  dateFormat = 'iso',
+}: AmharicDatePickerProps) {
+  const { t, i18n } = useTranslation();
+  const [calendarType, setCalendarType] = useState<'EN' | 'AMH'>(() =>
+    i18n.language?.startsWith('am') ? 'AMH' : 'EN',
+  );
+  const [opened, { close, toggle }] = useDisclosure(false);
+
+  const selected = parseWireValue(value, dateFormat, withTime);
+
+  const dateLabel = selected
+    ? calendarType === 'EN'
+      ? selected.toLocaleDateString('en-US', {
+          year: 'numeric',
+          month: 'short',
+          day: 'numeric',
+        })
+      : toAmharicDisplay(selected)
+    : '';
+  const timeLabel =
+    withTime && selected
+      ? calendarType === 'AMH'
+        ? ` ${ethTimeLabel(selected)}`
+        : ` ${selected.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' })}`
+      : '';
+  const displayValue = dateLabel + timeLabel;
+
+  return (
+    <Popover
+      opened={opened}
+      onChange={close}
+      position="bottom-start"
+      width="auto"
+      trapFocus
+      withArrow
+      withinPortal
+      shadow="md"
+      radius="md"
+      // The field lives inside a Modal's scrollable body while the dropdown is
+      // portaled to <body> — a different scroll container than its reference.
+      // The default `absolute` strategy sums offsets across that scroll chain
+      // and can get it wrong (dropdown flipped off-screen, or not following
+      // the field as the modal scrolls). `fixed` positions purely off the
+      // reference's viewport rect, sidestepping that.
+      floatingStrategy="fixed"
+      // Prevents the dropdown from re-flipping position mid-interaction —
+      // switching months resizes the grid (Pagume has far fewer days), which
+      // otherwise nudges the floating box right as a nav click lands, making
+      // the click miss.
+      preventPositionChangeWhenVisible
+    >
+      <Popover.Target>
+        <TextInput
+          label={label}
+          required={required}
+          value={displayValue}
+          readOnly
+          disabled={disabled}
+          size={size}
+          name={name}
+          w={w}
+          error={error}
+          placeholder={placeholder}
+          onClick={() => !disabled && toggle()}
+          onBlur={onBlur}
+          styles={{
+            input: {
+              cursor: disabled ? 'not-allowed' : 'pointer',
+            },
+          }}
+          leftSection={
+            <Button
+              type="button"
+              variant="subtle"
+              size="compact-xs"
+              tabIndex={-1}
+              disabled={disabled}
+              onClick={(e) => {
+                e.stopPropagation();
+                setCalendarType((prev) => (prev === 'EN' ? 'AMH' : 'EN'));
+              }}
+              aria-label={t('common.switchCalendar')}
+              styles={{
+                root: {
+                  paddingLeft: 6,
+                  paddingRight: 6,
+                  fontWeight: 600,
+                  fontSize: '0.75rem',
+                },
+              }}
+            >
+              {calendarType}
+            </Button>
+          }
+          leftSectionWidth="3.25rem"
+          rightSection={
+            <ActionIcon size="sm" variant="transparent" disabled={disabled} onClick={() => toggle()}>
+              <IconCalendarEvent size={18} />
+            </ActionIcon>
+          }
+        />
+      </Popover.Target>
+
+      {/* Inside a Modal the dropdown is portaled out of the modal body so it positions nicely. */}
+      <Popover.Dropdown className="amharic-daypicker-dropdown" p="sm" style={{ overflow: 'hidden' }}>
+        {calendarType === 'AMH' ? (
+          <EthiopicDayPicker
+            className="amharic-daypicker"
+            mode="single"
+            selected={selected ?? undefined}
+            defaultMonth={selected ?? undefined}
+            startMonth={YEAR_DROPDOWN_START}
+            endMonth={YEAR_DROPDOWN_END}
+            numerals="latn"
+            captionLayout="dropdown"
+            formatters={ETH_FORMATTERS}
+            onSelect={(date: Date | undefined) => {
+              onChange?.(date ? formatWireValue(mergeDateTime(selected, date), dateFormat, withTime) : '');
+              if (!withTime) close();
+            }}
+          />
+        ) : (
+          <GregorianDayPicker
+            className="amharic-daypicker"
+            mode="single"
+            selected={selected ?? undefined}
+            defaultMonth={selected ?? undefined}
+            startMonth={YEAR_DROPDOWN_START}
+            endMonth={YEAR_DROPDOWN_END}
+            captionLayout="dropdown"
+            onSelect={(date: Date | undefined) => {
+              onChange?.(date ? formatWireValue(mergeDateTime(selected, date), dateFormat, withTime) : '');
+              if (!withTime) close();
+            }}
+          />
+        )}
+
+        {withTime && calendarType === 'AMH' && (() => {
+          const { period, hour } = selected ? toEthTime(selected.getHours()) : { period: 'tewat' as EthPeriod, hour: 12 };
+          const minute = selected ? selected.getMinutes() : 0;
+          const periodHours = ETH_PERIODS.find((p) => p.value === period)?.hours ?? ETH_PERIODS[0].hours;
+          const setTime = (h24: number, m: number) =>
+            onChange?.(
+              formatWireValue(mergeDateTime(selected, undefined, { hours: h24, minutes: m }), dateFormat, true),
+            );
+          return (
+            <Stack gap={4} mt="sm">
+              <Text size="sm" fw={500}>
+                {t('common.time')}
+              </Text>
+              {/* Full-width 4-way toggle reads better than a dropdown for 4
+                  short Amharic words, and doesn't get squeezed by the
+                  calendar's fixed (auto) popover width the way three
+                  side-by-side Selects did. */}
+              <SegmentedControl
+                fullWidth
+                size="xs"
+                disabled={!selected}
+                value={period}
+                data={ETH_PERIODS.map((p) => ({ value: p.value, label: p.label }))}
+                onChange={(next) => {
+                  // Keep the same slot index within the new period so the
+                  // hour never lands outside its 6-hour range.
+                  const slot = Math.max(periodHours.indexOf(hour), 0);
+                  const nextHours = ETH_PERIODS.find((p) => p.value === next)?.hours ?? periodHours;
+                  setTime(fromEthTime(next as EthPeriod, nextHours[slot]), minute);
+                }}
+              />
+              <Group gap={4} justify="center" wrap="nowrap">
+                <Select
+                  disabled={!selected}
+                  value={String(hour)}
+                  data={periodHours.map((h) => ({ value: String(h), label: String(h) }))}
+                  allowDeselect={false}
+                  w={72}
+                  comboboxProps={{ withinPortal: true }}
+                  onChange={(next) => {
+                    if (!next) return;
+                    setTime(fromEthTime(period, Number(next)), minute);
+                  }}
+                />
+                <Text size="sm" c="dimmed">
+                  :
+                </Text>
+                <Select
+                  disabled={!selected}
+                  value={String(minute).padStart(2, '0')}
+                  data={Array.from({ length: 60 }, (_, m) => ({
+                    value: String(m).padStart(2, '0'),
+                    label: String(m).padStart(2, '0'),
+                  }))}
+                  allowDeselect={false}
+                  w={72}
+                  comboboxProps={{ withinPortal: true }}
+                  onChange={(next) => {
+                    if (next == null) return;
+                    setTime(fromEthTime(period, hour), Number(next));
+                  }}
+                />
+              </Group>
+            </Stack>
+          );
+        })()}
+
+        {withTime && calendarType === 'EN' && (
+          <TimeInput
+            label={t('common.time')}
+            mt="sm"
+            disabled={!selected}
+            value={
+              selected
+                ? `${String(selected.getHours()).padStart(2, '0')}:${String(selected.getMinutes()).padStart(2, '0')}`
+                : ''
+            }
+            onChange={(e) => {
+              const [h, m] = e.currentTarget.value.split(':').map(Number);
+              if (Number.isNaN(h) || Number.isNaN(m)) return;
+              onChange?.(
+                formatWireValue(mergeDateTime(selected, undefined, { hours: h, minutes: m }), dateFormat, true),
+              );
+            }}
+          />
+        )}
+
+        <Group justify="space-between" mt="sm">
+          <Button
+            variant="subtle"
+            size="xs"
+            onClick={() => {
+              onChange?.('');
+              close();
+            }}
+          >
+            {calendarType === 'AMH' ? 'አጽዳ' : 'Clear'}
+          </Button>
+          <Button
+            variant="light"
+            size="xs"
+            onClick={() => {
+              onChange?.(formatWireValue(new Date(), dateFormat, withTime));
+              close();
+            }}
+          >
+            {calendarType === 'AMH' ? 'ዛሬ' : 'Today'}
+          </Button>
+        </Group>
+      </Popover.Dropdown>
+    </Popover>
+  );
+}
diff --git a/libs/ui/src/lib/input/CountrySelect.tsx b/libs/ui/src/lib/input/CountrySelect.tsx
new file mode 100644
index 000000000..9fc0343c3
--- /dev/null
+++ b/libs/ui/src/lib/input/CountrySelect.tsx
@@ -0,0 +1,116 @@
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Group, Select, Text, type ComboboxItem, type SelectProps } from '@mantine/core';
+import { registerLocale, getNames, getName, getAlpha2Code } from 'i18n-iso-countries';
+import {
+  registerLocale as registerNationalityLocale,
+  getName as getNationalityNameRaw,
+} from 'i18n-nationality';
+import * as Flags from 'country-flag-icons/react/3x2';
+import en from 'i18n-iso-countries/langs/en.json';
+import am from 'i18n-iso-countries/langs/am.json';
+import nationalityEn from 'i18n-nationality/langs/en.json';
+
+// Registered once at module load — locale data is static.
+registerLocale(en);
+registerLocale(am);
+registerNationalityLocale(nationalityEn);
+
+type CountryLang = 'en' | 'am';
+
+function resolveLang(lng: string): CountryLang {
+  return lng === 'am' ? 'am' : 'en';
+}
+
+/** Localized country name for an alpha-2 code; '' when unset/unknown. */
+export function getCountryName(code: string | null | undefined, lang: CountryLang = 'en'): string {
+  return code ? (getName(code, lang) ?? '') : '';
+}
+
+/** Alpha-2 code for a stored country name (e.g. "Ethiopian" data); undefined when unmatched. */
+export function getCountryCode(name: string | null | undefined, lang: CountryLang = 'en'): string | undefined {
+  return name ? getAlpha2Code(name, lang) : undefined;
+}
+
+/**
+ * Localized demonym for an alpha-2 code (e.g. "ET" -> "Ethiopian"), for
+ * nationality fields as opposed to plain country fields.
+ * ponytail: i18n-nationality only ships an English locale — Amharic falls
+ * back to the country name until an Amharic demonym dataset shows up.
+ */
+export function getNationalityName(code: string | null | undefined, lang: CountryLang = 'en'): string {
+  if (!code) return '';
+  if (lang === 'en') return getNationalityNameRaw(code, 'en') ?? getCountryName(code, lang);
+  return getCountryName(code, lang);
+}
+
+function CountryFlag({ code }: { code: string }) {
+  const Flag = Flags[code as keyof typeof Flags];
+  return Flag ? <Flag style={{ width: 22, borderRadius: 2, display: 'block' }} /> : null;
+}
+
+// Case-insensitive substring on name, plus ISO code prefix ("et" → Ethiopia).
+const filterCountries: SelectProps['filter'] = ({ options, search }) => {
+  const q = search.trim().toLowerCase();
+  if (!q) return options;
+  return (options as ComboboxItem[]).filter(
+    (o) => o.label.toLowerCase().includes(q) || o.value.toLowerCase().startsWith(q),
+  );
+};
+
+// Module scope → stable reference, no re-render churn.
+const renderCountryOption: SelectProps['renderOption'] = ({ option }) => (
+  <Group gap="xs" wrap="nowrap">
+    <CountryFlag code={option.value} />
+    <Text fz="sm">{option.label}</Text>
+  </Group>
+);
+
+export interface CountrySelectProps {
+  value: string | null;
+  onChange: (value: string | null) => void;
+  label?: string;
+  placeholder?: string;
+  description?: React.ReactNode;
+  error?: React.ReactNode;
+  required?: boolean;
+  disabled?: boolean;
+  /** Show nationality labels ("Ethiopian") instead of country names ("Ethiopia"). */
+  demonym?: boolean;
+}
+
+export function CountrySelect({
+  value,
+  onChange,
+  placeholder,
+  demonym,
+  ...rest
+}: CountrySelectProps) {
+  const { t, i18n } = useTranslation();
+  const lang = resolveLang(i18n.language);
+
+  const countries = useMemo(
+    () =>
+      Object.keys(getNames(lang))
+        .map((code) => ({ value: code, label: demonym ? getNationalityName(code, lang) : getCountryName(code, lang) }))
+        .sort((a, b) => a.label.localeCompare(b.label, lang)),
+    [lang, demonym],
+  );
+
+  return (
+    <Select
+      data={countries}
+      value={value}
+      onChange={onChange}
+      placeholder={placeholder ?? t('country.select')}
+      leftSection={value ? <CountryFlag code={value} /> : undefined}
+      renderOption={renderCountryOption}
+      filter={filterCountries}
+      nothingFoundMessage={t('country.notFound')}
+      searchable
+      clearable
+      maxDropdownHeight={320}
+      {...rest}
+    />
+  );
+}
diff --git a/libs/ui/src/lib/input/PasswordRequirements.tsx b/libs/ui/src/lib/input/PasswordRequirements.tsx
new file mode 100644
index 000000000..ad9b812c7
--- /dev/null
+++ b/libs/ui/src/lib/input/PasswordRequirements.tsx
@@ -0,0 +1,57 @@
+import { Stack, Text, Group } from '@mantine/core';
+import { IconCheck, IconX } from '@tabler/icons-react';
+import { z } from 'zod';
+
+export function passwordRules(minLength: number) {
+  return [
+    { label: `At least ${minLength} characters`, test: (p: string) => p.length >= minLength },
+    { label: 'One lowercase letter', test: (p: string) => /[a-z]/.test(p) },
+    { label: 'One uppercase letter', test: (p: string) => /[A-Z]/.test(p) },
+    { label: 'One number', test: (p: string) => /\d/.test(p) },
+    { label: 'One special character', test: (p: string) => /[^A-Za-z0-9]/.test(p) },
+  ];
+}
+
+/** Zod field schema enforcing every rule; unmet rules surface as separate issues. */
+export const passwordSchema = (minLength: number) =>
+  z.string().superRefine((val, ctx) => {
+    for (const rule of passwordRules(minLength)) {
+      if (!rule.test(val)) {
+        ctx.addIssue({ code: 'custom', message: rule.label });
+      }
+    }
+  });
+
+export const passwordMeetsAll = (password: string, minLength: number) =>
+  passwordRules(minLength).every((rule) => rule.test(password));
+
+interface PasswordRequirementsProps {
+  password: string;
+  minLength: number;
+  labels?: string[];
+}
+
+/** Live checklist of password requirements, ticking off as the user types. Hidden until the user starts typing. */
+export function PasswordRequirements({ password, minLength, labels }: PasswordRequirementsProps) {
+  if (!password) return null;
+  const rules = passwordRules(minLength);
+  return (
+    <Stack gap={6} mt={6}>
+      {rules.map((rule, i) => {
+        const met = rule.test(password);
+        return (
+          <Group key={rule.label} gap={6} wrap="nowrap">
+            {met ? (
+              <IconCheck size={14} color="var(--mantine-color-teal-6)" />
+            ) : (
+              <IconX size={14} color="var(--mantine-color-gray-5)" />
+            )}
+            <Text fz="xs" c={met ? 'teal' : 'dimmed'}>
+              {labels?.[i] ?? rule.label}
+            </Text>
+          </Group>
+        );
+      })}
+    </Stack>
+  );
+}
diff --git a/libs/ui/src/lib/input/phone.ts b/libs/ui/src/lib/input/phone.ts
new file mode 100644
index 000000000..895529bfc
--- /dev/null
+++ b/libs/ui/src/lib/input/phone.ts
@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+/** Accepts `09xxxxxxxx` or `+2519xxxxxxxx`; always yields `+2519xxxxxxxx`. */
+export const ethiopianPhone = z
+  .string()
+  .trim()
+  .transform((v) => (/^09\d{8}$/.test(v) ? `+251${v.slice(1)}` : v))
+  .refine((v) => /^\+2519\d{8}$/.test(v), {
+    message: 'Enter a valid phone number (+2519xxxxxxxx)',
+  });
+
+/** Same rules, but blank is allowed. */
+export const optionalEthiopianPhone = z.union([z.literal(''), ethiopianPhone]).optional();
diff --git a/libs/ui/src/lib/layout/AppHeader.tsx b/libs/ui/src/lib/layout/AppHeader.tsx
index b624b3db3..a7e14a148 100644
--- a/libs/ui/src/lib/layout/AppHeader.tsx
+++ b/libs/ui/src/lib/layout/AppHeader.tsx
@@ -34,6 +34,8 @@ interface AppHeaderProps {
   userName?: string;
   userInitials?: string;
   supportedLanguages: readonly string[];
+  onNotificationsClick?: () => void;
+  notificationCount?: number;
 }
 
 export function AppHeader({
@@ -46,6 +48,8 @@ export function AppHeader({
   userName = 'User',
   userInitials = '?',
   supportedLanguages,
+  onNotificationsClick,
+  notificationCount,
 }: AppHeaderProps) {
   const isMobile = typeof window !== 'undefined' && window.innerWidth < 768;
 
@@ -201,9 +205,17 @@ export function AppHeader({
             e.currentTarget.style.boxShadow =
               '0 1px 3px rgba(0,0,0,0.04), 0 0 0 1px rgba(0,0,0,0.06)';
           }}
+          onClick={onNotificationsClick}
           aria-label="Notifications"
         >
-          <Indicator color="red" size={9} offset={5} withBorder>
+          <Indicator
+            color="red"
+            size={notificationCount ? 16 : 9}
+            offset={notificationCount ? 2 : 5}
+            withBorder
+            disabled={notificationCount === 0}
+            label={notificationCount || undefined}
+          >
             <IconBell size={19} />
           </Indicator>
         </UnstyledButton>
diff --git a/libs/ui/src/lib/layout/AppSidebar.tsx b/libs/ui/src/lib/layout/AppSidebar.tsx
index 5bd033e4a..4ef9cd12a 100644
--- a/libs/ui/src/lib/layout/AppSidebar.tsx
+++ b/libs/ui/src/lib/layout/AppSidebar.tsx
@@ -1,6 +1,8 @@
+import { useEffect, useMemo, useState } from 'react';
 import {
   AppShell,
   Badge,
+  Group,
   NavLink,
   Popover,
   ScrollArea,
@@ -9,8 +11,10 @@ import {
   Tooltip,
   UnstyledButton,
   rem,
+  useMantineColorScheme,
 } from '@mantine/core';
 import {
+  IconChevronDown,
   IconChevronLeft,
   IconChevronRight,
 } from '@tabler/icons-react';
@@ -64,6 +68,10 @@ interface SidebarItemProps {
   collapsed: boolean;
   activePath: string;
   onNavigate: (item: NavItem) => void;
+  /** Whether this item's children are expanded. Ignored when it has none. */
+  opened: boolean;
+  /** Called with the new expanded state when the header is toggled. */
+  onToggle: (opened: boolean) => void;
 }
 
 /**
@@ -75,7 +83,7 @@ interface SidebarItemProps {
  * nest, so a parent becomes a hover flyout instead of silently losing its
  * children.
  */
-function SidebarItem({ item, collapsed, activePath, onNavigate }: SidebarItemProps) {
+function SidebarItem({ item, collapsed, activePath, onNavigate, opened, onToggle }: SidebarItemProps) {
   const { t } = useTranslation();
   const ItemIcon = item.icon;
   const hasChildren = Boolean(item.children?.length);
@@ -101,10 +109,29 @@ function SidebarItem({ item, collapsed, activePath, onNavigate }: SidebarItemPro
     </Badge>
   );
 
-  const rightSection = item.soon ? (
+  // Parent headers always carry a chevron so the expand/collapse state is
+  // never ambiguous, even when a badge is also present.
+  const chevron = hasChildren ? (
+    opened ? (
+      <IconChevronDown size={14} stroke={1.8} color="var(--mantine-color-gray-5)" />
+    ) : (
+      <IconChevronRight size={14} stroke={1.8} color="var(--mantine-color-gray-5)" />
+    )
+  ) : null;
+
+  const soonBadge = (
     <Badge size="xs" variant="light" color="gray" radius="sm">
       {t('nav.soon', 'Soon')}
     </Badge>
+  );
+
+  const rightSection = hasChildren ? (
+    <Group gap={4} wrap="nowrap">
+      {item.soon ? soonBadge : badgeNode}
+      {chevron}
+    </Group>
+  ) : item.soon ? (
+    soonBadge
   ) : (
     badgeNode || undefined
   );
@@ -183,8 +210,11 @@ function SidebarItem({ item, collapsed, activePath, onNavigate }: SidebarItemPro
       label={t(item.label)}
       leftSection={<ItemIcon size={19} stroke={1.6} />}
       rightSection={rightSection}
-      // Auto-expands the group the user is currently inside.
-      defaultOpened={hasChildren ? branchActive : undefined}
+      disableRightSectionRotation
+      // Controlled so the group re-opens if the active route moves inside it
+      // later (see the auto-expand effect in AppSidebar), not just on mount.
+      opened={hasChildren ? opened : undefined}
+      onChange={hasChildren ? onToggle : undefined}
       onClick={() => !hasChildren && onNavigate(item)}
       variant="light"
       styles={{
@@ -249,6 +279,55 @@ export function AppSidebar({
   brandLogo,
 }: AppSidebarProps) {
   const { t } = useTranslation();
+  const { colorScheme } = useMantineColorScheme();
+  const hoverBg = colorScheme === 'dark'
+    ? 'var(--mantine-color-dark-6)'
+    : 'var(--mantine-color-gray-0)';
+  const hoverColor = colorScheme === 'dark'
+    ? 'var(--mantine-color-gray-3)'
+    : 'var(--mantine-color-gray-7)';
+
+  const sections = useMemo(() => toSections(navItems), [navItems]);
+
+  // Expand/collapse state per collapsible header, keyed by section label for
+  // NavSection headings and by item label for a parent item's children.
+  // Sections default open (today every section is always visible); a nested
+  // item's children default to open only when the active route is inside it,
+  // matching the previous `defaultOpened` behaviour.
+  const [openMap, setOpenMap] = useState<Record<string, boolean>>({});
+
+  // If the active route moves into a header the user had collapsed, expand
+  // it back open so the highlighted item stays visible. Never collapses
+  // anything — that stays purely a manual, per-header action.
+  useEffect(() => {
+    setOpenMap((prev) => {
+      let changed = false;
+      const next = { ...prev };
+      sections.forEach((section, sectionIndex) => {
+        const sectionKey = section.label ?? `section-${sectionIndex}`;
+        if (
+          section.label &&
+          next[sectionKey] !== true &&
+          section.items.some((item) => isBranchActive(item, activePath))
+        ) {
+          next[sectionKey] = true;
+          changed = true;
+        }
+        section.items.forEach((item) => {
+          if (item.children?.length && next[item.label] !== true && isBranchActive(item, activePath)) {
+            next[item.label] = true;
+            changed = true;
+          }
+        });
+      });
+      return changed ? next : prev;
+    });
+  }, [activePath, sections]);
+
+  const toggleSection = (key: string) =>
+    setOpenMap((prev) => ({ ...prev, [key]: !(prev[key] ?? true) }));
+  const setItemOpened = (key: string, next: boolean) =>
+    setOpenMap((prev) => ({ ...prev, [key]: next }));
 
   return (
     <>
@@ -299,41 +378,64 @@ export function AppSidebar({
       {/* Navigation items */}
       <AppShell.Section grow component={ScrollArea} p="md">
         <Stack gap={2}>
-          {toSections(navItems).map((section, sectionIndex) => (
-            <Stack gap={2} key={section.label ?? `section-${sectionIndex}`}>
-              {/* Headings are noise when only icons are visible. */}
-              {section.label && !collapsed && (
-                <Text
-                  size="xs"
-                  fw={700}
-                  c="dimmed"
-                  mt={sectionIndex === 0 ? 0 : rem(14)}
-                  pl={rem(12)}
-                  style={{ textTransform: 'uppercase', letterSpacing: '0.06em' }}
-                >
-                  {t(section.label)}
-                </Text>
-              )}
-              {section.label && collapsed && sectionIndex > 0 && (
-                <div
-                  style={{
-                    height: 1,
-                    margin: `${rem(8)} ${rem(6)}`,
-                    backgroundColor: 'var(--mantine-color-gray-2)',
-                  }}
-                />
-              )}
-              {section.items.map((item) => (
-                <SidebarItem
-                  key={item.label}
-                  item={item}
-                  collapsed={collapsed}
-                  activePath={activePath}
-                  onNavigate={onNavigate}
-                />
-              ))}
-            </Stack>
-          ))}
+          {sections.map((section, sectionIndex) => {
+            const sectionKey = section.label ?? `section-${sectionIndex}`;
+            const sectionOpened = openMap[sectionKey] ?? true;
+            return (
+              <Stack gap={2} key={sectionKey}>
+                {/* Headings are noise when only icons are visible. */}
+                {section.label && !collapsed && (
+                  <UnstyledButton
+                    onClick={() => toggleSection(sectionKey)}
+                    aria-expanded={sectionOpened}
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                      justifyContent: 'space-between',
+                      width: '100%',
+                      padding: `0 ${rem(12)}`,
+                      marginTop: sectionIndex === 0 ? 0 : rem(14),
+                    }}
+                  >
+                    <Text
+                      size="xs"
+                      fw={700}
+                      c="dimmed"
+                      style={{ textTransform: 'uppercase', letterSpacing: '0.06em' }}
+                    >
+                      {t(section.label)}
+                    </Text>
+                    {sectionOpened ? (
+                      <IconChevronDown size={14} stroke={1.8} color="var(--mantine-color-gray-5)" />
+                    ) : (
+                      <IconChevronRight size={14} stroke={1.8} color="var(--mantine-color-gray-5)" />
+                    )}
+                  </UnstyledButton>
+                )}
+                {section.label && collapsed && sectionIndex > 0 && (
+                  <div
+                    style={{
+                      height: 1,
+                      margin: `${rem(8)} ${rem(6)}`,
+                      backgroundColor: 'var(--mantine-color-gray-2)',
+                    }}
+                  />
+                )}
+                {(!section.label || sectionOpened || collapsed) &&
+                  section.items.map((item) => (
+                    <SidebarItem
+                      key={item.label}
+                      item={item}
+                      collapsed={collapsed}
+                      activePath={activePath}
+                      onNavigate={onNavigate}
+                      opened={openMap[item.label] ?? isBranchActive(item, activePath)}
+                      onToggle={(next) => setItemOpened(item.label, next)}
+                    />
+                  ))}
+              </Stack>
+            );
+          })}
         </Stack>
       </AppShell.Section>
 
@@ -371,8 +473,8 @@ export function AppSidebar({
               fontWeight: 500,
             }}
             onMouseEnter={(e) => {
-              e.currentTarget.style.background = 'var(--mantine-color-gray-0)';
-              e.currentTarget.style.color = 'var(--mantine-color-gray-7)';
+              e.currentTarget.style.background = hoverBg;
+              e.currentTarget.style.color = hoverColor;
             }}
             onMouseLeave={(e) => {
               e.currentTarget.style.background = 'transparent';
diff --git a/libs/ui/tsconfig.json b/libs/ui/tsconfig.json
index 8c54e1fa5..c707bd830 100644
--- a/libs/ui/tsconfig.json
+++ b/libs/ui/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": { "outDir": "../../dist/out-tsc" },
+  "compilerOptions": { "outDir": "../../dist/out-tsc", "types": ["vite/client"] },
   "include": ["src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/package-lock.json b/package-lock.json
index 04ca777d7..05e109a97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,13 +23,19 @@
         "@tanstack/react-query": "^5.99.0",
         "@tria-plc/iamui": "file:local-packages/tria-plc-iamui-0.1.1.tgz",
         "clsx": "^2.1.1",
+        "country-flag-icons": "^1.6.20",
         "date-fns": "^4.1.0",
         "dayjs": "^1.11.20",
+        "ethiopian-calendar-date-converter": "^2.1.6",
+        "i18n-iso-countries": "^7.14.0",
+        "i18n-nationality": "^1.4.0",
         "i18next": "^25.6.0",
+        "js-cookie": "^3.0.8",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-hook-form": "^7.71.2",
         "react-i18next": "^15.7.4",
+        "react-qr-code": "^2.2.0",
         "react-redux": "^9.2.0",
         "react-router": "^7.12.0",
         "react-router-dom": "^7.13.1",
@@ -44,8 +50,9 @@
         "@nx/vite": "^22.5.4",
         "@nx/vitest": "^22.5.4",
         "@playwright/test": "^1.62.1",
+        "@types/js-cookie": "^3.0.6",
         "@types/node": "^22.0.0",
-        "@types/react": "^19.0.0",
+        "@types/react": "^19.2.17",
         "@types/react-dom": "^19.0.0",
         "@typescript-eslint/eslint-plugin": "^8.60.0",
         "@typescript-eslint/parser": "^8.60.0",
@@ -143,13 +150,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
-      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
+      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7",
+        "@babel/parser": "^7.29.8",
+        "@babel/types": "^7.29.8",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -272,28 +279,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/resolve": {
-      "version": "1.22.12",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
-      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "is-core-module": "^2.16.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/@babel/helper-globals": {
       "version": "7.29.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
@@ -475,12 +460,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
-      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.29.7"
+        "@babel/types": "^7.29.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1139,16 +1124,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.7.tgz",
-      "integrity": "sha512-TM2ZcQLoG2/y4HODiStCo10DibYhWhGWAwVv+EQKmG/7GFl0N+AAmUiXOMKM+aiJ9XBJ9AHVZBvTzMnJ2sM3cQ==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.8.tgz",
+      "integrity": "sha512-6iSnEK0zlkLKU4heofK/AdmRD4e2SHVpJMtrwnTCzhnaM98ria4rTrOXBBi45BTTYnJtO8txnPsX4fChYXkmeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-module-transforms": "^7.29.7",
         "@babel/helper-plugin-utils": "^7.29.7",
         "@babel/helper-validator-identifier": "^7.29.7",
-        "@babel/traverse": "^7.29.7"
+        "@babel/traverse": "^7.29.8"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1494,9 +1479,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.7.tgz",
-      "integrity": "sha512-rNNFV0DBAJp988xW2DOntfDoYn1eR8GGF5AT5vYc+rjyfaQkM242c9tZUHHPe7KYaiJizXPWhQTzzdbXySyhBw==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.8.tgz",
+      "integrity": "sha512-0UpIXPtdDtMXfnV2OJAVMLpj3H/92vmkA6lpSRakmycJvj3VUy6Xs1dM8tXRugupykr5WB+LpiVl0J8LMVg2mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1590,9 +1575,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.7.tgz",
-      "integrity": "sha512-/u5K1QWada7tbYNqTjMh96718g9NTwh9tfPJMsSmVsQwGT447FskV+KcfeXkXq2GWki4EM/MuTdmBec+hOuVTQ==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.29.8.tgz",
+      "integrity": "sha512-4S9ksMGVWUshvgK0mKfvZky7leuG5/uoFVwMpAomJ8bMoDJiNHRVmc1EglwW/CmGVSqqWpEbXm9FmbRit22qoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1931,17 +1916,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
-      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.8.tgz",
+      "integrity": "sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
+        "@babel/generator": "^7.29.8",
         "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.7",
+        "@babel/parser": "^7.29.8",
         "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.7",
+        "@babel/types": "^7.29.8",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1949,9 +1934,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
-      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.29.7",
@@ -2011,59 +1996,33 @@
         }
       }
     },
-    "node_modules/@daypicker/react/node_modules/react-day-picker": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-10.0.1.tgz",
-      "integrity": "sha512-eNh6BlwcYInWaJtRv18mXQ06Ys/H6rdTZAnTaSdOYJuTpwP1JMCHNd1FDRadA+gbeinq+psdULN5Xnowy9mV8w==",
-      "license": "MIT",
-      "dependencies": {
-        "@date-fns/tz": "^1.4.1",
-        "date-fns": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/sponsors/gpbl"
-      },
-      "peerDependencies": {
-        "@types/react": ">=16.8.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@emnapi/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
-      "devOptional": true,
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
+      "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@emnapi/wasi-threads": "1.2.1",
+        "@emnapi/wasi-threads": "1.2.3",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
-      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
-      "devOptional": true,
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
+      "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
-      "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==",
-      "devOptional": true,
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
+      "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
         "tslib": "^2.4.0"
       }
@@ -2221,9 +2180,9 @@
       "license": "MIT"
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
-      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
       ],
@@ -2237,9 +2196,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
-      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
       ],
@@ -2253,9 +2212,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
-      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
       ],
@@ -2269,9 +2228,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
-      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
       ],
@@ -2285,9 +2244,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
-      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
       ],
@@ -2301,9 +2260,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
-      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -2317,9 +2276,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
       ],
@@ -2333,9 +2292,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
-      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
       ],
@@ -2349,9 +2308,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
-      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
       ],
@@ -2365,9 +2324,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
-      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
       ],
@@ -2381,9 +2340,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
-      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
       ],
@@ -2397,9 +2356,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
-      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
       ],
@@ -2413,9 +2372,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
-      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
       ],
@@ -2429,9 +2388,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
-      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
       ],
@@ -2445,9 +2404,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
-      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
       ],
@@ -2461,9 +2420,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
-      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
       ],
@@ -2477,9 +2436,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
-      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
       ],
@@ -2493,9 +2452,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
       ],
@@ -2509,9 +2468,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
       ],
@@ -2525,9 +2484,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
-      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
       ],
@@ -2541,9 +2500,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
-      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
       ],
@@ -2557,9 +2516,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
-      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
       "cpu": [
         "arm64"
       ],
@@ -2573,9 +2532,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
-      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
       ],
@@ -2589,9 +2548,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
-      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
       ],
@@ -2605,9 +2564,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
-      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
       ],
@@ -2621,9 +2580,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
-      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
       ],
@@ -2637,9 +2596,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
-      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz",
+      "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2655,19 +2614,6 @@
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@eslint-community/regexpp": {
       "version": "4.12.2",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
@@ -2701,9 +2647,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2751,9 +2697,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz",
-      "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz",
+      "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2763,7 +2709,7 @@
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.1",
+        "js-yaml": "^4.3.0",
         "minimatch": "^3.1.5",
         "strip-json-comments": "^3.1.1"
       },
@@ -2799,9 +2745,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2809,6 +2755,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -2840,9 +2799,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.39.4",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
-      "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==",
+      "version": "9.39.5",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.5.tgz",
+      "integrity": "sha512-QywQuszQh77pIXCsq998c8hbhSTI/azTty1Z6N53dmAudKHhy573j3yvRLsX2BSp8YpLtoCEG8E9DJe+8zUh4A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2877,32 +2836,32 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
-      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+      "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.11"
+        "@floating-ui/utils": "^0.2.12"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
-      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+      "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.5",
-        "@floating-ui/utils": "^0.2.11"
+        "@floating-ui/core": "^1.8.0",
+        "@floating-ui/utils": "^0.2.12"
       }
     },
     "node_modules/@floating-ui/react": {
-      "version": "0.27.19",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.19.tgz",
-      "integrity": "sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==",
+      "version": "0.27.20",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.20.tgz",
+      "integrity": "sha512-CMqMy7OaXl9W0eq1Uy7L7i2Y/anPvHmFmESd2CEw0t5YvZhcVCeo4MBevAmswRllX7Y2dEidA4ozGPunLSTQpw==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/react-dom": "^2.1.8",
-        "@floating-ui/utils": "^0.2.11",
+        "@floating-ui/react-dom": "^2.1.9",
+        "@floating-ui/utils": "^0.2.12",
         "tabbable": "^6.0.0"
       },
       "peerDependencies": {
@@ -2911,12 +2870,12 @@
       }
     },
     "node_modules/@floating-ui/react-dom": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz",
-      "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+      "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.7.6"
+        "@floating-ui/dom": "^1.8.0"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -2924,21 +2883,119 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
-      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+      "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==",
       "license": "MIT"
     },
     "node_modules/@hookform/resolvers": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.4.0.tgz",
-      "integrity": "sha512-EIsqr/t/qbinPIhGjMdtvutIN1Kk4uwbROE9/UQ93CAVGR7GkA7Y92+fX80OzXi/OB67jVFYwKGO1WzkxmkFZw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.7.1.tgz",
+      "integrity": "sha512-8wS/P4UDr5sQDe4nFaV51TVyfDPrWgNIXweqG0Bs9Z5LSuzKLb+RQNPvkN2oHM5SRrJyWrVH/F+LOUcFjUyvwQ==",
       "license": "MIT",
       "dependencies": {
         "@standard-schema/utils": "^0.3.0"
       },
       "peerDependencies": {
-        "react-hook-form": "^7.55.0"
+        "@sinclair/typebox": ">=0.25.24",
+        "@standard-schema/spec": "^1.0.0",
+        "@typeschema/main": ">=0.13.7",
+        "@vinejs/vine": "^2.0.0 || ^3.0.0 || ^4.0.0",
+        "ajv": "^8.12.0",
+        "ajv-errors": "^3.0.0",
+        "ajv-formats": "^2.1.1",
+        "arktype": "^2.0.0",
+        "ata-validator": "^1.2.0",
+        "class-transformer": ">=0.4.0",
+        "class-validator": ">=0.12.0",
+        "computed-types": "^1.0.0",
+        "effect": "^3.10.3",
+        "fluentvalidation-ts": "^3.0.0",
+        "fp-ts": "^2.7.0",
+        "io-ts": "^2.0.0",
+        "joi": "^17.0.0",
+        "nope-validator": ">=0.12.0",
+        "react-hook-form": "^7.55.0",
+        "superstruct": ">=0.12.0",
+        "typanion": "^3.3.2",
+        "valibot": ">=0.31.0 || ^1.0.0-beta.4 || ^1.0.0-rc",
+        "vest": ">=3.0.0",
+        "yup": "^1.0.0",
+        "zod": "^3.25.0 || ^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@sinclair/typebox": {
+          "optional": true
+        },
+        "@standard-schema/spec": {
+          "optional": true
+        },
+        "@typeschema/main": {
+          "optional": true
+        },
+        "@vinejs/vine": {
+          "optional": true
+        },
+        "ajv": {
+          "optional": true
+        },
+        "ajv-errors": {
+          "optional": true
+        },
+        "ajv-formats": {
+          "optional": true
+        },
+        "arktype": {
+          "optional": true
+        },
+        "ata-validator": {
+          "optional": true
+        },
+        "class-transformer": {
+          "optional": true
+        },
+        "class-validator": {
+          "optional": true
+        },
+        "computed-types": {
+          "optional": true
+        },
+        "effect": {
+          "optional": true
+        },
+        "fluentvalidation-ts": {
+          "optional": true
+        },
+        "fp-ts": {
+          "optional": true
+        },
+        "io-ts": {
+          "optional": true
+        },
+        "joi": {
+          "optional": true
+        },
+        "nope-validator": {
+          "optional": true
+        },
+        "superstruct": {
+          "optional": true
+        },
+        "typanion": {
+          "optional": true
+        },
+        "valibot": {
+          "optional": true
+        },
+        "vest": {
+          "optional": true
+        },
+        "yup": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
       }
     },
     "node_modules/@humanfs/core": {
@@ -3017,29 +3074,6 @@
         "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@jest/get-type": {
-      "version": "30.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
-      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "30.4.1",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.4.1.tgz",
-      "integrity": "sha512-i6b4qw5qnP8c5FEeBJg/uZQ4ddrkN6Ca8qISJh0pr7a5hfn3h3v5x60BEbOC7OYAGZNMs1LfFLwnW2CuK8F57Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@sinclair/typebox": "^0.34.0"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -3228,39 +3262,24 @@
       }
     },
     "node_modules/@module-federation/bridge-react-webpack-plugin": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/bridge-react-webpack-plugin/-/bridge-react-webpack-plugin-2.5.0.tgz",
-      "integrity": "sha512-Ux9XVW//K6K+KHKPdc0Jnc7RtTpZaEXgbVhp5yovtFkCJVt8hEClcTeuI18MvvLiV/q2hUpCU5Wsf9zNaIYStQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/bridge-react-webpack-plugin/-/bridge-react-webpack-plugin-2.8.1.tgz",
+      "integrity": "sha512-w/+d+OjtzT6sa0b3elBcCw6uw+6l8JDOtMIyWzx1lNNuV9IPhq2pgSLXEVEHdIo77r4zgQAktm9kUfCzjO0VrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/sdk": "2.5.0",
-        "@types/semver": "7.5.8",
-        "semver": "7.6.3"
-      }
-    },
-    "node_modules/@module-federation/bridge-react-webpack-plugin/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@module-federation/cli": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/cli/-/cli-2.5.0.tgz",
-      "integrity": "sha512-+czXA6yoiiF9W6+YEOCpQE6zpGZpA89X0oCEz3EaWPTkL4chEbxurjpME8CMnJk9iuFxl167+cBQiQlVBiHGGg==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/cli/-/cli-2.8.1.tgz",
+      "integrity": "sha512-DZo0f3gTN7bKoqw/KM5Kj4qIKeF3bfQwCq7fgf2Gnd+jfZPY4otVy7nbRxFmtdienEhqzcmFFWJUPH/cOkyMqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/dts-plugin": "2.5.0",
-        "@module-federation/sdk": "2.5.0",
+        "@module-federation/dts-plugin": "2.8.1",
+        "@module-federation/sdk": "2.8.1",
         "commander": "11.1.0",
         "jiti": "2.4.2"
       },
@@ -3272,25 +3291,23 @@
       }
     },
     "node_modules/@module-federation/dts-plugin": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/dts-plugin/-/dts-plugin-2.5.0.tgz",
-      "integrity": "sha512-q7KDhJ5tn2HrUV7uMuh/L3TaaztUosE+4LAb90sxx0pPPqWRwlpBpxu1REubv5BWXmU1K/Ozn14u6jRbjLVaGA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/dts-plugin/-/dts-plugin-2.8.1.tgz",
+      "integrity": "sha512-JM8g76KzhhH44kHvM2JPJ5FIlQDwUNzw0vvq5EDSo/znNUmUEuSrfTssukCKg1nqnBGWLohjIV0LOOhLdCknoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/error-codes": "2.5.0",
-        "@module-federation/managers": "2.5.0",
-        "@module-federation/sdk": "2.5.0",
-        "@module-federation/third-party-dts-extractor": "2.5.0",
-        "adm-zip": "0.5.10",
-        "ansi-colors": "4.1.3",
+        "@module-federation/error-codes": "2.8.1",
+        "@module-federation/managers": "2.8.1",
+        "@module-federation/sdk": "2.8.1",
+        "@module-federation/third-party-dts-extractor": "2.8.1",
+        "adm-zip": "0.6.0",
         "isomorphic-ws": "5.0.0",
-        "node-schedule": "2.1.1",
-        "undici": "7.24.7",
-        "ws": "8.18.0"
+        "undici": "7.28.0",
+        "ws": "8.21.0"
       },
       "peerDependencies": {
-        "typescript": "^4.9.0 || ^5.0.0",
+        "typescript": "^4.9.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue-tsc": ">=1.0.24"
       },
       "peerDependenciesMeta": {
@@ -3300,32 +3317,31 @@
       }
     },
     "node_modules/@module-federation/enhanced": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/enhanced/-/enhanced-2.5.0.tgz",
-      "integrity": "sha512-P91tzwyKSCQ6AwirqvAvTqWqmTY79ndpH0uenejFw+bbLpWrjuY0q+iZUXCV/7CSNmqwH2bkA/ssuyZljmcMVQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/enhanced/-/enhanced-2.8.1.tgz",
+      "integrity": "sha512-QHlvm+poXVPkIPK0C8Ras36peZA9CxRp43deSQcArBZ6uEsZTGGm07ohDxRLzVO7kYXR6dE56gIAN9fqa9Fhgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/bridge-react-webpack-plugin": "2.5.0",
-        "@module-federation/cli": "2.5.0",
-        "@module-federation/dts-plugin": "2.5.0",
-        "@module-federation/error-codes": "2.5.0",
-        "@module-federation/inject-external-runtime-core-plugin": "2.5.0",
-        "@module-federation/managers": "2.5.0",
-        "@module-federation/manifest": "2.5.0",
-        "@module-federation/rspack": "2.5.0",
-        "@module-federation/runtime-tools": "2.5.0",
-        "@module-federation/sdk": "2.5.0",
-        "@module-federation/webpack-bundler-runtime": "2.5.0",
+        "@module-federation/bridge-react-webpack-plugin": "2.8.1",
+        "@module-federation/cli": "2.8.1",
+        "@module-federation/dts-plugin": "2.8.1",
+        "@module-federation/error-codes": "2.8.1",
+        "@module-federation/inject-external-runtime-core-plugin": "2.8.1",
+        "@module-federation/managers": "2.8.1",
+        "@module-federation/manifest": "2.8.1",
+        "@module-federation/rspack": "2.8.1",
+        "@module-federation/runtime-tools": "2.8.1",
+        "@module-federation/sdk": "2.8.1",
+        "@module-federation/webpack-bundler-runtime": "2.8.1",
         "schema-utils": "4.3.0",
-        "tapable": "2.3.0",
-        "upath": "2.0.1"
+        "tapable": "2.3.0"
       },
       "bin": {
         "mf": "bin/mf.js"
       },
       "peerDependencies": {
-        "typescript": "^4.9.0 || ^5.0.0",
+        "typescript": "^4.9.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue-tsc": ">=1.0.24",
         "webpack": "^5.0.0"
       },
@@ -3342,56 +3358,54 @@
       }
     },
     "node_modules/@module-federation/error-codes": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/error-codes/-/error-codes-2.5.0.tgz",
-      "integrity": "sha512-sq05/8Gp3csy1nr2/f76K3vLy0/xRqVtP71ibGy8BiLg7h1UxWN7G4EwAKSrPZ4FnsERGeFlIszg5Z+MqlwhFg==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/error-codes/-/error-codes-2.8.1.tgz",
+      "integrity": "sha512-0mQ+bWt1LRCZyURx3g2b8G+aAlvk8iXIgrp3Jit/75blrlVda/eVqnHz1L+YOxwkP3xSrdbUb4423AoWti31ZQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@module-federation/inject-external-runtime-core-plugin": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/inject-external-runtime-core-plugin/-/inject-external-runtime-core-plugin-2.5.0.tgz",
-      "integrity": "sha512-e2KyTHpesBrPXGHMh4d4+s2xBiNoxbiFJkPRYHMCl81a/Gu+byrMkriZcV4VM/TFvBIlrgOJisVc1nnBI5UDRQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/inject-external-runtime-core-plugin/-/inject-external-runtime-core-plugin-2.8.1.tgz",
+      "integrity": "sha512-xpqjWaLw4KbPW4CMRDRiGjH08/ABdPc9z4fRuPiFYA4loNYrjFWALRe2QA6W90SAew/d5RQ6QchO/wuhrzy3dw==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@module-federation/runtime-tools": "2.5.0"
+        "@module-federation/runtime-tools": "2.8.1"
       }
     },
     "node_modules/@module-federation/managers": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/managers/-/managers-2.5.0.tgz",
-      "integrity": "sha512-9b5mU/7OYbKrYUJmhZ1kkfeJCZqR7qX6/FWp+oOfZMzUynN7Rb41dwoUs3TdnOKzbZ3CCwtZ2WsR4pF9ZNvuJA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/managers/-/managers-2.8.1.tgz",
+      "integrity": "sha512-bHRooIgplIFNLH42eM3g21b2apM/a7lMG1EwifUxT4A4AobS42H08KGdYITdKJcrgowx3D7PhYndiwtHFI03zQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/sdk": "2.5.0",
-        "find-pkg": "2.0.0"
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@module-federation/manifest": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/manifest/-/manifest-2.5.0.tgz",
-      "integrity": "sha512-pmwQCGWjM2oKY7CkR7nEDOfMK0bNFJUifuDxuOB5iOWhU+Rp92UyyBI9IbJAtiISTSFGtuKRy40peJGvQq2VcQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/manifest/-/manifest-2.8.1.tgz",
+      "integrity": "sha512-1NOd4J1sJrTpl7M1NYsdUtjSR2Eu3R//r+w51KC9XhAZkxWse0+uPphGdeiUqCOVgAAWjKreckY+xnEmG6Kqig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/dts-plugin": "2.5.0",
-        "@module-federation/managers": "2.5.0",
-        "@module-federation/sdk": "2.5.0",
-        "find-pkg": "2.0.0"
+        "@module-federation/dts-plugin": "2.8.1",
+        "@module-federation/managers": "2.8.1",
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@module-federation/node": {
-      "version": "2.7.43",
-      "resolved": "https://registry.npmjs.org/@module-federation/node/-/node-2.7.43.tgz",
-      "integrity": "sha512-oKoLm7dqb5EvkiNIfsEdLmmBX7XLWHtPSx3M9kEYuXAaNAppoRWC9WtgrrZYXWErB2BG9wxMlx/8Xq3awRUCdQ==",
+      "version": "2.7.48",
+      "resolved": "https://registry.npmjs.org/@module-federation/node/-/node-2.7.48.tgz",
+      "integrity": "sha512-jeRj0ylawSFFt5EqTcNDVMq60kE3/3gY8vg8XiLiFSSpglgezWeR/5OOxBmRn+8UdS5545Nko+HQWe5e08S7NQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/enhanced": "2.5.0",
-        "@module-federation/runtime": "2.5.0",
-        "@module-federation/sdk": "2.5.0",
+        "@module-federation/enhanced": "2.8.1",
+        "@module-federation/runtime": "2.8.1",
+        "@module-federation/sdk": "2.8.1",
         "encoding": "0.1.13",
         "node-fetch": "2.7.0",
         "tapable": "2.3.0"
@@ -3406,23 +3420,23 @@
       }
     },
     "node_modules/@module-federation/rspack": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/rspack/-/rspack-2.5.0.tgz",
-      "integrity": "sha512-OAFMpMXuLEQFmWBuC1I7LNDQ8N3CDANXe0YGPWkIPNxKq5Tj/KNfDidmutoYgvXlZKOM4yKBKBsL6Xt/UvtOIw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/rspack/-/rspack-2.8.1.tgz",
+      "integrity": "sha512-jJYkARn1U1M92CbiLyoaP7+tNKh8YzzOTMSGzbdj6okTtWK0Z9ImyVoKEnAnjnLP1nbQjkPEaojkR2D2IQFhLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/bridge-react-webpack-plugin": "2.5.0",
-        "@module-federation/dts-plugin": "2.5.0",
-        "@module-federation/inject-external-runtime-core-plugin": "2.5.0",
-        "@module-federation/managers": "2.5.0",
-        "@module-federation/manifest": "2.5.0",
-        "@module-federation/runtime-tools": "2.5.0",
-        "@module-federation/sdk": "2.5.0"
+        "@module-federation/bridge-react-webpack-plugin": "2.8.1",
+        "@module-federation/dts-plugin": "2.8.1",
+        "@module-federation/inject-external-runtime-core-plugin": "2.8.1",
+        "@module-federation/managers": "2.8.1",
+        "@module-federation/manifest": "2.8.1",
+        "@module-federation/runtime-tools": "2.8.1",
+        "@module-federation/sdk": "2.8.1"
       },
       "peerDependencies": {
         "@rspack/core": "^0.7.0 || ^1.0.0 || ^2.0.0-0",
-        "typescript": "^4.9.0 || ^5.0.0",
+        "typescript": "^4.9.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue-tsc": ">=1.0.24"
       },
       "peerDependenciesMeta": {
@@ -3435,75 +3449,63 @@
       }
     },
     "node_modules/@module-federation/runtime": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/runtime/-/runtime-2.5.0.tgz",
-      "integrity": "sha512-dOc7pFEf8aruHBk5hoJLnvwkCa5ELT78q3o9dqcdaa/TT74X5z0FT0BsaGaRBPcse/iP6czK3fWd7RLv5ZKP5g==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/runtime/-/runtime-2.8.1.tgz",
+      "integrity": "sha512-+xpq/r6Om4plbGJisZp6/rl7usEUlQszz34E+JUKgl9uW3QIRzVgxwOAzGiF7U+dqOKxMqmiq+nTJwK2wAwteA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/error-codes": "2.5.0",
-        "@module-federation/runtime-core": "2.5.0",
-        "@module-federation/sdk": "2.5.0"
+        "@module-federation/error-codes": "2.8.1",
+        "@module-federation/runtime-core": "2.8.1",
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@module-federation/runtime-core": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/runtime-core/-/runtime-core-2.5.0.tgz",
-      "integrity": "sha512-STmhQ3c6/hunba2FMP6GrHazXU/8GuN7Gk4dOkWNRpnqYIoD8Wx4MNl76j3HdCzBESC7uSMXTniksVaM1+xxyA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/runtime-core/-/runtime-core-2.8.1.tgz",
+      "integrity": "sha512-Dif+3u7fvq6qBATFIv5qB7ay6Rgo2HNzhaNOt1yRfpVXjiJqQ3UPnHZ+TLP9znkXiZvg6Bg5W9EV2ZX4nH2S0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/error-codes": "2.5.0",
-        "@module-federation/sdk": "2.5.0"
+        "@module-federation/error-codes": "2.8.1",
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@module-federation/runtime-tools": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-2.5.0.tgz",
-      "integrity": "sha512-fR3Na6V78ov3/O17Mev+1vydfmqlYWP4ZNxD/bBkmqKhCO7jMdthNTT02yDljlCyhYl6+X90UJlFhwFle6rIsw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-2.8.1.tgz",
+      "integrity": "sha512-CIQ9dPqWOiitXKCYqgHXfr0hehtxsZDfiuFaesJAJnXtqkM5+nVkkBNkY07cDV5wOi00/aiOhEWYoCcz+cRQtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/runtime": "2.5.0",
-        "@module-federation/webpack-bundler-runtime": "2.5.0"
+        "@module-federation/runtime": "2.8.1",
+        "@module-federation/webpack-bundler-runtime": "2.8.1"
       }
     },
     "node_modules/@module-federation/sdk": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/sdk/-/sdk-2.5.0.tgz",
-      "integrity": "sha512-ScU22XDyV77l50njjzewMpMlNN1CYo0tHS1D6iy+vNKWrHGq8DWVB0vwG8dmvx/WZ4uq+sXgUsQet17MoKsfZw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/sdk/-/sdk-2.8.1.tgz",
+      "integrity": "sha512-3EVljiNilY2pFIG2RO4KNCC6gIPnYc9J+p5U6Nn8D5X3PtJeEcPyBvKGttxZnSLlXCi+YXQfgexBOfnkvEuzuQ==",
       "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "node-fetch": "^2.7.0 || ^3.3.2"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
-      }
+      "license": "MIT"
     },
     "node_modules/@module-federation/third-party-dts-extractor": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/third-party-dts-extractor/-/third-party-dts-extractor-2.5.0.tgz",
-      "integrity": "sha512-5di43LGk2ies86Cj8QyzYr540Ijc+nyPqYziyFotL6Pparnu+uf3b3ERfEyQfBmEcyGk1MpitQIO2J3bd9BcNw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/third-party-dts-extractor/-/third-party-dts-extractor-2.8.1.tgz",
+      "integrity": "sha512-6ulu7vqv5wyM5YWwxjUHzZ+8Sg6e+/vn+gskiUBs6EPqe/w3XMdRoUrFjAI3EW62xi0e0xbWLsjbQs9jCAj8ig==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-pkg": "2.0.0",
-        "resolve": "1.22.8"
-      }
+      "license": "MIT"
     },
     "node_modules/@module-federation/webpack-bundler-runtime": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-2.5.0.tgz",
-      "integrity": "sha512-UxVad+tNZYkBnZzqJQsZa0pB5gO5cJoCjMumOo3bhzXBJVqHsFupfeHa8Nk7WrRVbJE6zRT9ZHK0s0NDWBMyJw==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-2.8.1.tgz",
+      "integrity": "sha512-dGFlrTLimhxpHohysx/qPRuIRaAiutqFfX0xFzDchEkY0DXpS2sOhuJ2foNcCIQK/FKFJW1YeaaIUkZ5FWMcOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@module-federation/error-codes": "2.5.0",
-        "@module-federation/runtime": "2.5.0",
-        "@module-federation/sdk": "2.5.0"
+        "@module-federation/error-codes": "2.8.1",
+        "@module-federation/runtime": "2.8.1",
+        "@module-federation/sdk": "2.8.1"
       }
     },
     "node_modules/@mui/core-downloads-tracker": {
@@ -3590,13 +3592,6 @@
         }
       }
     },
-    "node_modules/@mui/material/node_modules/react-is": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.7.tgz",
-      "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/@mui/private-theming": {
       "version": "5.17.1",
       "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.17.1.tgz",
@@ -3746,164 +3741,6 @@
         }
       }
     },
-    "node_modules/@mui/utils/node_modules/react-is": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.7.tgz",
-      "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==",
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/@mui/x-date-pickers": {
-      "version": "6.20.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.20.2.tgz",
-      "integrity": "sha512-x1jLg8R+WhvkmUETRfX2wC+xJreMii78EXKLl6r3G+ggcAZlPyt0myID1Amf6hvJb9CtR7CgUo8BwR+1Vx9Ggw==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.23.2",
-        "@mui/base": "^5.0.0-beta.22",
-        "@mui/utils": "^5.14.16",
-        "@types/react-transition-group": "^4.4.8",
-        "clsx": "^2.0.0",
-        "prop-types": "^15.8.1",
-        "react-transition-group": "^4.4.5"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.9.0",
-        "@emotion/styled": "^11.8.1",
-        "@mui/material": "^5.8.6",
-        "@mui/system": "^5.8.0",
-        "date-fns": "^2.25.0 || ^3.2.0",
-        "date-fns-jalali": "^2.13.0-0",
-        "dayjs": "^1.10.7",
-        "luxon": "^3.0.2",
-        "moment": "^2.29.4",
-        "moment-hijri": "^2.1.2",
-        "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "date-fns": {
-          "optional": true
-        },
-        "date-fns-jalali": {
-          "optional": true
-        },
-        "dayjs": {
-          "optional": true
-        },
-        "luxon": {
-          "optional": true
-        },
-        "moment": {
-          "optional": true
-        },
-        "moment-hijri": {
-          "optional": true
-        },
-        "moment-jalaali": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/x-date-pickers/node_modules/@mui/base": {
-      "version": "5.0.0-dev.20240529-082515-213b5e33ab",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-dev.20240529-082515-213b5e33ab.tgz",
-      "integrity": "sha512-3ic6fc6BHstgM+MGqJEVx3zt9g5THxVXm3VVFUfdeplPqAWWgW2QoKfZDLT10s+pi+MAkpgEBP0kgRidf81Rsw==",
-      "deprecated": "This package has been replaced by @base-ui/react",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.24.6",
-        "@floating-ui/react-dom": "^2.0.8",
-        "@mui/types": "^7.2.14-dev.20240529-082515-213b5e33ab",
-        "@mui/utils": "^6.0.0-dev.20240529-082515-213b5e33ab",
-        "@popperjs/core": "^2.11.8",
-        "clsx": "^2.1.1",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/x-date-pickers/node_modules/@mui/base/node_modules/@mui/utils": {
-      "version": "6.4.9",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.9.tgz",
-      "integrity": "sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==",
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.26.0",
-        "@mui/types": "~7.2.24",
-        "@types/prop-types": "^15.7.14",
-        "clsx": "^2.1.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^19.0.0"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui-org"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/x-date-pickers/node_modules/@types/react": {
-      "version": "18.3.31",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.31.tgz",
-      "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/prop-types": "*",
-        "csstype": "^3.2.2"
-      }
-    },
-    "node_modules/@mui/x-date-pickers/node_modules/react-is": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.7.tgz",
-      "integrity": "sha512-kZFnouyVv7eP/Phmrlo9FK+zcAdriZJvzxXHF1Sl1P377WSGe2G/JxVolhTrB/jeV47lKImhNUsijjHAAbcl/A==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/@napi-rs/canvas": {
       "version": "0.1.100",
       "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.100.tgz",
@@ -4021,6 +3858,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4041,6 +3881,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4061,6 +3904,9 @@
       "cpu": [
         "riscv64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4081,6 +3927,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4101,6 +3950,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4154,6 +4006,25 @@
         "url": "https://github.com/sponsors/Brooooooklyn"
       }
     },
+    "node_modules/@napi-rs/lzma-linux-x64-gnu": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz",
+      "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==",
+      "cpu": [
+        "x64"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^22.20 || ^24.12 || >=25"
+      }
+    },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.0.7.tgz",
@@ -4226,9 +4097,9 @@
       }
     },
     "node_modules/@nx/devkit": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-22.7.5.tgz",
-      "integrity": "sha512-/63ziS7kdHXYTLLhwWBu9hFwoFFT8xf+PkcQjsNdPqc5JmkYkSew0cE/vp5ORgBpGLWWnFPJgmfqjbJoO2C7jA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-22.7.8.tgz",
+      "integrity": "sha512-aQe6wSJY7eIsJXE+DSHEgCMf4UBLeRbW0o1WNoF2TlLxE7N3Navb6aWiebe2wv/eaQ2IDKJXLuNxdJJJK/6zCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4245,20 +4116,20 @@
       }
     },
     "node_modules/@nx/eslint": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-22.7.5.tgz",
-      "integrity": "sha512-D/85AvnF07ng/fLcSvAE8bxFQKvejUc/MP4pX6aFZgRGrpduo7mTwFMlM/UtOtTTPRRRQVLmM9u7jn4JKROBRw==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/eslint/-/eslint-22.7.8.tgz",
+      "integrity": "sha512-b+KETcZnUOCV6Mb9mhI+SsWfkA+kkFSFY4mtIlDF2xpajA9H2yzoeLcoIDfEfjivrhCmPcpd4cmUyPySW3uNig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
         "semver": "^7.6.3",
         "tslib": "^2.3.0",
         "typescript": "~5.9.2"
       },
       "peerDependencies": {
-        "@nx/jest": "22.7.5",
+        "@nx/jest": "22.7.8",
         "@zkochan/js-yaml": "0.0.7",
         "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
       },
@@ -4272,20 +4143,20 @@
       }
     },
     "node_modules/@nx/eslint-plugin": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-22.5.4.tgz",
-      "integrity": "sha512-nbbSnqxR9JQbqsJJUsJcpGtbqLulYOJG1CQdQ0xP3wntK6qu6XDzosopIMHO8MXNQlDp14hAPavE5hKMQwuawA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/eslint-plugin/-/eslint-plugin-22.7.8.tgz",
+      "integrity": "sha512-HpudlvefqMOLWX/UOaXd4Btx0GMLJjf7BEfHz/N3/77scq+X8tArq+auvg4sNkFC6AGdLNQ0exYuY7AaBRuZiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.5.4",
-        "@nx/js": "22.5.4",
-        "@phenomnomnominal/tsquery": "~6.1.4",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
+        "@phenomnomnominal/tsquery": "~6.2.0",
         "@typescript-eslint/type-utils": "^8.0.0",
         "@typescript-eslint/utils": "^8.0.0",
         "chalk": "^4.1.0",
         "confusing-browser-globals": "^1.0.9",
-        "globals": "^15.9.0",
+        "globals": "^17.0.0",
         "jsonc-eslint-parser": "^2.1.0",
         "semver": "^7.6.3",
         "tslib": "^2.3.0"
@@ -4300,462 +4171,10 @@
         }
       }
     },
-    "node_modules/@nx/eslint-plugin/node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz",
-      "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@emnapi/core": "^1.1.0",
-        "@emnapi/runtime": "^1.1.0",
-        "@tybys/wasm-util": "^0.9.0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/devkit": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-22.5.4.tgz",
-      "integrity": "sha512-+QCmpQZQmEGvi8IurC6bOgUTk+Q0dQo7wkp6V04lskXBztSyasBS0BGy5ic90kY05UlQUd++zRA1VY0jc+Yz5Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@zkochan/js-yaml": "0.0.7",
-        "ejs": "^3.1.7",
-        "enquirer": "~2.3.6",
-        "minimatch": "10.2.4",
-        "semver": "^7.6.3",
-        "tslib": "^2.3.0",
-        "yargs-parser": "21.1.1"
-      },
-      "peerDependencies": {
-        "nx": ">= 21 <= 23 || ^22.0.0-0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/js": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/js/-/js-22.5.4.tgz",
-      "integrity": "sha512-RPGDQjPm68ml5vKOk2RhRgNUM51qyMfIkRsKSxTWy0EpMOa7ud0I2bPQyNDMkqP04w8I5GZPD8O8opesDrdmtg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.23.2",
-        "@babel/plugin-proposal-decorators": "^7.22.7",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-runtime": "^7.23.2",
-        "@babel/preset-env": "^7.23.2",
-        "@babel/preset-typescript": "^7.22.5",
-        "@babel/runtime": "^7.22.6",
-        "@nx/devkit": "22.5.4",
-        "@nx/workspace": "22.5.4",
-        "@zkochan/js-yaml": "0.0.7",
-        "babel-plugin-const-enum": "^1.0.1",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-typescript-metadata": "^0.3.1",
-        "chalk": "^4.1.0",
-        "columnify": "^1.6.0",
-        "detect-port": "^1.5.1",
-        "ignore": "^5.0.4",
-        "js-tokens": "^4.0.0",
-        "jsonc-parser": "3.2.0",
-        "npm-run-path": "^4.0.1",
-        "picocolors": "^1.1.0",
-        "picomatch": "4.0.2",
-        "semver": "^7.6.3",
-        "source-map-support": "0.5.19",
-        "tinyglobby": "^0.2.12",
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "verdaccio": "^6.0.5"
-      },
-      "peerDependenciesMeta": {
-        "verdaccio": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-darwin-arm64": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-22.5.4.tgz",
-      "integrity": "sha512-Ib9znwSLQZSZ/9hhg5ODplpNhE/RhGVXzdfRj6YonTuWSj/kH3dLMio+4JEkjRdTQVm06cDW0KdwSgnwovqMGg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-darwin-x64": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-22.5.4.tgz",
-      "integrity": "sha512-DjyXuQMc93MPU2XdRsJYjzbv1tgCzMi+zm7O0gc4x3h+ECFjKkjzQBg67pqGdhE3TV27MAlVRKrgHStyK9iigg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-freebsd-x64": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-22.5.4.tgz",
-      "integrity": "sha512-DhxdP8AhIfN0yCtFhZQcbp32MVN3L7UiTotYqqnOgwW922NRGSd5e+KEAWiJVrIO6TdgnI7prxpg1hfQQK0WDw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-22.5.4.tgz",
-      "integrity": "sha512-pv1x1afTaLAOxPxVhQneLeXgjclp11f9ORxR7jA4E86bSgc9OL92dLSCkXtLQzqPNOej6SZ2fO+PPHVMZwtaPQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-22.5.4.tgz",
-      "integrity": "sha512-mPji9PzleWPvXpmFDKaXpTymRgZkk/hW8JHGhvEZpKHHXMYgTGWC+BqOEM2A4dYC4bu4fi9RrteL7aouRRWJoQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-22.5.4.tgz",
-      "integrity": "sha512-hF/HvEhbCjcFpTgY7RbP1tUTbp0M1adZq4ckyW8mwhDWQ/MDsc8FnOHwCO3Bzy9ZeJM0zQUES6/m0Onz8geaEA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-22.5.4.tgz",
-      "integrity": "sha512-1+vicSYEOtc7CNMoRCjo59no4gFe8w2nGIT127wk1yeW3EJzRVNlOA7Deu10NUUbzLeOvHc8EFOaU7clT+F7XQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-linux-x64-musl": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-22.5.4.tgz",
-      "integrity": "sha512-/KjndxVB14yU0SJOhqADHOWoTy4Y45h5RjW3cxcXlPSJZz7ar1FnlLne1rWMMMUttepc8ku+3T//SGKi2eu+Nw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-22.5.4.tgz",
-      "integrity": "sha512-CrYt9FwhjOI6ZNy/G6YHLJmZuXCFJ24BCxugPXiZ7knDx7eGrr7owGgfht4SSiK3KCX40CvWCBJfqR4ZSgaSUA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-22.5.4.tgz",
-      "integrity": "sha512-g5YByv4XsYwsYZvFe24A9bvfhZA+mwtIQt6qZtEVduZTT1hfhIsq0LXGHhkGoFLYwRMXSracWOqkalY0KT4IQw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@nx/workspace": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-22.5.4.tgz",
-      "integrity": "sha512-TZeuCDy+VN/5zqMYxHw15HKe2Ppcb9WBOebz4bmXE206c8Aop3S9QeLfys00Uobt9ZaYh9QUeN0iFsZm7TNv0w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@nx/devkit": "22.5.4",
-        "@zkochan/js-yaml": "0.0.7",
-        "chalk": "^4.1.0",
-        "enquirer": "~2.3.6",
-        "nx": "22.5.4",
-        "picomatch": "4.0.2",
-        "semver": "^7.6.3",
-        "tslib": "^2.3.0",
-        "yargs-parser": "21.1.1"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@phenomnomnominal/tsquery": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-6.1.4.tgz",
-      "integrity": "sha512-3tHlGy/fxjJCHqIV8nelAzbRTNkCUY+k7lqBGKNuQz99H2OKGRt6oU+U2SZs6LYrbOe8mxMFl6kq6gzHapFRkw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/esquery": "^1.5.0",
-        "esquery": "^1.5.0"
-      },
-      "peerDependencies": {
-        "typescript": "^3 || ^4 || ^5"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/@tybys/wasm-util": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
-      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/address": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
-      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/detect-port": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz",
-      "integrity": "sha512-CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "address": "^1.0.1",
-        "debug": "4"
-      },
-      "bin": {
-        "detect": "bin/detect-port.js",
-        "detect-port": "bin/detect-port.js"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/dotenv-expand": {
-      "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
-      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dotenv": "^16.4.5"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/globals": {
-      "version": "15.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
-      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/nx": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-22.5.4.tgz",
-      "integrity": "sha512-L8wL7uCjnmpyvq4r2mN9s+oriUE4lY+mX9VgOpjj0ucRd5nzaEaBQppVs0zQGkbKC0BnHS8PGtnAglspd5Gh1Q==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "0.2.4",
-        "@yarnpkg/lockfile": "^1.1.0",
-        "@yarnpkg/parsers": "3.0.2",
-        "@zkochan/js-yaml": "0.0.7",
-        "axios": "^1.12.0",
-        "cli-cursor": "3.1.0",
-        "cli-spinners": "2.6.1",
-        "cliui": "^8.0.1",
-        "dotenv": "~16.4.5",
-        "dotenv-expand": "~11.0.6",
-        "ejs": "^3.1.7",
-        "enquirer": "~2.3.6",
-        "figures": "3.2.0",
-        "flat": "^5.0.2",
-        "front-matter": "^4.0.2",
-        "ignore": "^7.0.5",
-        "jest-diff": "^30.0.2",
-        "jsonc-parser": "3.2.0",
-        "lines-and-columns": "2.0.3",
-        "minimatch": "10.2.4",
-        "node-machine-id": "1.1.12",
-        "npm-run-path": "^4.0.1",
-        "open": "^8.4.0",
-        "ora": "5.3.0",
-        "picocolors": "^1.1.0",
-        "resolve.exports": "2.0.3",
-        "semver": "^7.6.3",
-        "string-width": "^4.2.3",
-        "tar-stream": "~2.2.0",
-        "tmp": "~0.2.1",
-        "tree-kill": "^1.2.2",
-        "tsconfig-paths": "^4.1.2",
-        "tslib": "^2.3.0",
-        "yaml": "^2.6.0",
-        "yargs": "^17.6.2",
-        "yargs-parser": "21.1.1"
-      },
-      "bin": {
-        "nx": "bin/nx.js",
-        "nx-cloud": "bin/nx-cloud.js"
-      },
-      "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "22.5.4",
-        "@nx/nx-darwin-x64": "22.5.4",
-        "@nx/nx-freebsd-x64": "22.5.4",
-        "@nx/nx-linux-arm-gnueabihf": "22.5.4",
-        "@nx/nx-linux-arm64-gnu": "22.5.4",
-        "@nx/nx-linux-arm64-musl": "22.5.4",
-        "@nx/nx-linux-x64-gnu": "22.5.4",
-        "@nx/nx-linux-x64-musl": "22.5.4",
-        "@nx/nx-win32-arm64-msvc": "22.5.4",
-        "@nx/nx-win32-x64-msvc": "22.5.4"
-      },
-      "peerDependencies": {
-        "@swc-node/register": "^1.11.1",
-        "@swc/core": "^1.15.8"
-      },
-      "peerDependenciesMeta": {
-        "@swc-node/register": {
-          "optional": true
-        },
-        "@swc/core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/nx/node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@nx/eslint-plugin/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/@nx/js": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/js/-/js-22.7.5.tgz",
-      "integrity": "sha512-2nJdlNPwYRldsdmUz+p/O8kF7eVjINaycTO4o1FXn8DL09wLvhxb1kFAaJrGA3Ig6znAnmRVGitccFt1QTPCIg==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/js/-/js-22.7.8.tgz",
+      "integrity": "sha512-OBXoHIm1mMiyXyd/3xtEnOfaDzDrGtACvAqhhKAUUi+VXGlHyvUdXBQkAamIzvjCyxo+7p2JtdYG2ca8G4pKDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4766,8 +4185,8 @@
         "@babel/preset-env": "^7.23.2",
         "@babel/preset-typescript": "^7.22.5",
         "@babel/runtime": "^7.22.6",
-        "@nx/devkit": "22.7.5",
-        "@nx/workspace": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/workspace": "22.7.8",
         "@zkochan/js-yaml": "0.0.7",
         "babel-plugin-const-enum": "^1.0.1",
         "babel-plugin-macros": "^3.1.0",
@@ -4796,18 +4215,18 @@
       }
     },
     "node_modules/@nx/module-federation": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/module-federation/-/module-federation-22.7.5.tgz",
-      "integrity": "sha512-tb2j891NYZvl2jMFWbTgF2aLGOGDjhJrMbUKIml2/xIT6DNF89+ly8+wjMS5Nh7JAK3XSQtlERlFVBCcTD+bQA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/module-federation/-/module-federation-22.7.8.tgz",
+      "integrity": "sha512-mAs4Acjjq3paxRL54UsbCLhbW0OdxSlD2QOWGCwVcZ6CASTHrykE166ByW8oDumQiYiptB3S6kUdGNsh+KsJXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@module-federation/enhanced": "^2.3.3",
         "@module-federation/node": "^2.7.21",
         "@module-federation/sdk": "^2.1.0",
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
-        "@nx/web": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
+        "@nx/web": "22.7.8",
         "@rspack/core": "1.6.8",
         "express": "^4.21.2",
         "http-proxy-middleware": "^3.0.5",
@@ -4817,9 +4236,9 @@
       }
     },
     "node_modules/@nx/nx-darwin-arm64": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-22.7.5.tgz",
-      "integrity": "sha512-eoPtwx0qZqvRUD+VVOHm150AlSYwYoPxkDHBBGqKCn5nzPspb0lLWw8q83crM/L1M928YgK0WmGf3C++7eqsTA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-22.7.8.tgz",
+      "integrity": "sha512-IM1geDyWPFsS565de9dByYNZ5I3j8FQZvNUp9LIYw1dNu70sCWbAT0glw0anholOwlAb7JWEscoUeV7ouRBW0A==",
       "cpu": [
         "arm64"
       ],
@@ -4831,9 +4250,9 @@
       ]
     },
     "node_modules/@nx/nx-darwin-x64": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-22.7.5.tgz",
-      "integrity": "sha512-VLOn/ZoEn3HfjSj+yIHLCM56/el79r+9I28CkZNHaSXJQWZ3edSkcgcfYjVxCurpN2VEwDQHLBeFCH8M+lQ7wQ==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-22.7.8.tgz",
+      "integrity": "sha512-X/AyooJCmAwHyp9f//bspkAmtaPsv2lPEKe6OiOScsyxJITP4nw+rOfIAJ4Ar64WQcMAY8WLP+ys4ah0K6DZSw==",
       "cpu": [
         "x64"
       ],
@@ -4845,9 +4264,9 @@
       ]
     },
     "node_modules/@nx/nx-freebsd-x64": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-22.7.5.tgz",
-      "integrity": "sha512-LEVer/E2xfGvK9Go+imMQoEninOoq/38Z2bhV1SD3AThXrp1xaLFVkW5jQ6juebeVkAeztEoMLFlr576egS0vw==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-22.7.8.tgz",
+      "integrity": "sha512-mgdqiFag8txon4XugDtNj+hq+X9Whn8LBMuqwJSez93L1fralzpQFSUip7XnE7ejQRr5Zewg3BFscGlsk8Cy3A==",
       "cpu": [
         "x64"
       ],
@@ -4859,9 +4278,9 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm-gnueabihf": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-22.7.5.tgz",
-      "integrity": "sha512-NP27EFGpmFJM6RL1Ey/AFJ7gA2xuqtIHaw6jjSNGvfrnZRUNaway30GrVaGGeODf0DsvAty/unqoBMPy6kDHbw==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-22.7.8.tgz",
+      "integrity": "sha512-g7ojIloHGFI7wuMnUdg7io42EL7C7ae4zAolNVj7eXZM54amn3qoNjwbyqaVbBQvUNRiAKJizGyn1IhKpzvG9A==",
       "cpu": [
         "arm"
       ],
@@ -4873,13 +4292,16 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm64-gnu": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-22.7.5.tgz",
-      "integrity": "sha512-QLnkJl3HkHsPfpLiNiAiMfpfAeFpic0U1diAxF8RqChOkCpQ7ulvyBVgE1UrQxvhd+gFQ3ed5RNDxtCRw8nTiw==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-22.7.8.tgz",
+      "integrity": "sha512-Kws8e7W4epfqpTWYaV7KLKaj33o+9JtJa2rErx/XFTtMXhfVzOs5hC4oIrZsYpgk1DuT0APp7UDvX06q2kdAVQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4887,13 +4309,16 @@
       ]
     },
     "node_modules/@nx/nx-linux-arm64-musl": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-22.7.5.tgz",
-      "integrity": "sha512-cEP6KmwBgnb38+jTTaibWCjwXcHmigqhTfy0tN1be7WZr6bHxbqNLsXqKRN70PSNA3HouZcxw1cdRL8tqbPBBA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-22.7.8.tgz",
+      "integrity": "sha512-fpnyVFL+mSqLdKBPk8+n/rHUEXiem7Xwr9cIOd2Dd5zxQ5wcwj4qSYTNRsBPI2qDFo3esHliwaoFJZULbTHldw==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4901,13 +4326,16 @@
       ]
     },
     "node_modules/@nx/nx-linux-x64-gnu": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-22.7.5.tgz",
-      "integrity": "sha512-tbaX1tZCSpGifDNBfDdEZAMxVF3Yg4bhFP/bm1needc0diqb+Zflc0u5tM5/6BWDMITQDwenJVsNiQ8ZdtJURA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-22.7.8.tgz",
+      "integrity": "sha512-KRbkSthClEwkbpt/LLJmBJhIOvOsyrp9OICisF9p3mOODjaxAuYmyOgrVreg09BT2F4hXN3JXpvt9eIZpTCRsw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4915,13 +4343,16 @@
       ]
     },
     "node_modules/@nx/nx-linux-x64-musl": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-22.7.5.tgz",
-      "integrity": "sha512-H0M7csOZIgPT822LqjxSXzf4MXRND15vIkAQe3F3Jlr3Si8LC3tzbL52aVcRfgb8MF/xOB5U47mSwxWt1M2bPQ==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-22.7.8.tgz",
+      "integrity": "sha512-pdPMWko1yZI5ZNI6/t2Y5rQPGgV/ah5DW+mlHo2aFKav4lnxvgisEh9e4HtOsYBfK/9PyYZ5u3M9hLSaMiJ75w==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4929,9 +4360,9 @@
       ]
     },
     "node_modules/@nx/nx-win32-arm64-msvc": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-22.7.5.tgz",
-      "integrity": "sha512-JTcZch9YAnDL1gbhqePz3DZ4x7iYemLn1yJzrjbbXAmXju2eiiJiZvJJHbV06+SP9HKXDT8RjTKuAWTdVxnHug==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-22.7.8.tgz",
+      "integrity": "sha512-yYDu3pj7AXu7LtN/T/bA4TMWWWbmvEE4wa8UW8ZU5JeWYblyXQA7HyYpPAb4fLzCtHb/dIrNDghVBRIeAAcnSw==",
       "cpu": [
         "arm64"
       ],
@@ -4943,9 +4374,9 @@
       ]
     },
     "node_modules/@nx/nx-win32-x64-msvc": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-22.7.5.tgz",
-      "integrity": "sha512-ngcMyHdBJ9FSz2nHdbZ7gtJlFq0O2b05sPAsVMkZ18CKzdaA1qrBDJfsMO49hPCny505eiT766+CkKdaCDl5kA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-22.7.8.tgz",
+      "integrity": "sha512-cSr0qMt/GgM2aOBFsapxllnIv55j0gAz/6eWvqEOx5sS8d3X1G0IgazZnPbjW2c8gfSYaBZ9UmYnfapWIO/jqg==",
       "cpu": [
         "x64"
       ],
@@ -4957,18 +4388,18 @@
       ]
     },
     "node_modules/@nx/react": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/react/-/react-22.7.5.tgz",
-      "integrity": "sha512-Xgrq3iEJVM+SvZYEIYgBrfSRJ2hx7Bpc/p3w7A9gJYyXeAJgAfPzK4jtESkMqLxW5mBCpQVgJEbIrR5IAcBpbA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/react/-/react-22.7.8.tgz",
+      "integrity": "sha512-7wOPZYkI8nHWSuVhirP7X8iOHuzY0zKHTQ3R543sIqqC5yIP+zXPR7F+mM/D4E6V+41BWMJd1Au/XgShFTSyyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/eslint": "22.7.5",
-        "@nx/js": "22.7.5",
-        "@nx/module-federation": "22.7.5",
-        "@nx/rollup": "22.7.5",
-        "@nx/web": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/eslint": "22.7.8",
+        "@nx/js": "22.7.8",
+        "@nx/module-federation": "22.7.8",
+        "@nx/rollup": "22.7.8",
+        "@nx/web": "22.7.8",
         "@phenomnomnominal/tsquery": "~6.2.0",
         "@svgr/webpack": "^8.0.1",
         "express": "^4.21.2",
@@ -4979,18 +4410,18 @@
         "tslib": "^2.3.0"
       },
       "optionalDependencies": {
-        "@nx/vite": "22.7.5"
+        "@nx/vite": "22.7.8"
       }
     },
     "node_modules/@nx/rollup": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/rollup/-/rollup-22.7.5.tgz",
-      "integrity": "sha512-36bLP+XZR7Qiejw1sGc+0R3r2/N4FNPgV8Q1IW8Y+6QpkTCk3jStX1HXyJBW0EwPcIkgQ/PwSkhHeg9ATZei2A==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/rollup/-/rollup-22.7.8.tgz",
+      "integrity": "sha512-X6u4d8I4BlE1Ym1eTLYS4dosD73K4Jp+SdubaUMYe7UPPU8tB+kkLEb3i7QtuEg3fxM6Vw1jrZ2aKCsC3ObaDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
         "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-commonjs": "^25.0.7",
         "@rollup/plugin-image": "^3.0.3",
@@ -5009,15 +4440,15 @@
       }
     },
     "node_modules/@nx/vite": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/vite/-/vite-22.7.5.tgz",
-      "integrity": "sha512-udKstx9fDT+Z/SacxVBJWdqDhaxee9/rA+F6nyg97PTH4JAGVuj+LZIFPakqiSg623GXMAGmK0gzAswAuWrYIQ==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/vite/-/vite-22.7.8.tgz",
+      "integrity": "sha512-I56yrtx6llZKwA+ne1lv4TMo9XlYJU/MmOsxGy8/laa8oucysf1lhz/B/uk3kPjnX2Mk34jOOmdcNh5ZuGlb0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
-        "@nx/vitest": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
+        "@nx/vitest": "22.7.8",
         "@phenomnomnominal/tsquery": "~6.2.0",
         "ajv": "^8.0.0",
         "enquirer": "~2.3.6",
@@ -5032,20 +4463,20 @@
       }
     },
     "node_modules/@nx/vitest": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/vitest/-/vitest-22.7.5.tgz",
-      "integrity": "sha512-+E/IOIpzKbIfnTugx5vk9nDRw9tJEPIdNguYusSrzyZ6UNxiLBO9ipamNKiXw/4lPCtGH2TGx6M9nBQDUg/ciQ==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/vitest/-/vitest-22.7.8.tgz",
+      "integrity": "sha512-LA9dJu9gmUZqtJPBxf96ZEwxHpOo9KIDW8sVrAHB4LC3rz/MjnTtxp7SwpIEf06cwJLsFMxWiyqVm8xB9NsL5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
         "@phenomnomnominal/tsquery": "~6.2.0",
         "semver": "^7.6.3",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@nx/eslint": "22.7.5",
+        "@nx/eslint": "22.7.8",
         "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
         "vitest": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0"
       },
@@ -5062,26 +4493,26 @@
       }
     },
     "node_modules/@nx/web": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/web/-/web-22.7.5.tgz",
-      "integrity": "sha512-mJOx3BknJhdr2T7UD4b4LuWyTa+MyXXJvYymBjHvBuCmWC5o68wuDm2y5kXrZ1WxHJYlqoLZ2281QPVyB+SZ7A==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/web/-/web-22.7.8.tgz",
+      "integrity": "sha512-j52F9u1s5nO/yCPcJX2a4bd93FUvf5blhrBdVs8nT4DpPzTMTi3lWE/0lNZdryTDa1Gll7KpFFt5Iy5dOJzSIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
-        "@nx/js": "22.7.5",
+        "@nx/devkit": "22.7.8",
+        "@nx/js": "22.7.8",
         "detect-port": "^2.1.0",
         "http-server": "^14.1.0",
         "picocolors": "^1.1.0",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@nx/cypress": "22.7.5",
-        "@nx/eslint": "22.7.5",
-        "@nx/jest": "22.7.5",
-        "@nx/playwright": "22.7.5",
-        "@nx/vite": "22.7.5",
-        "@nx/webpack": "22.7.5"
+        "@nx/cypress": "22.7.8",
+        "@nx/eslint": "22.7.8",
+        "@nx/jest": "22.7.8",
+        "@nx/playwright": "22.7.8",
+        "@nx/vite": "22.7.8",
+        "@nx/webpack": "22.7.8"
       },
       "peerDependenciesMeta": {
         "@nx/cypress": {
@@ -5105,17 +4536,17 @@
       }
     },
     "node_modules/@nx/workspace": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-22.7.5.tgz",
-      "integrity": "sha512-f3zx8EAOl0ANd2UXZIniBoHfDvNvi2Uy65R9Rp6emdcx7rxsuTU5Eaidryleo9wIQ5cZAcMx7Wvzp5Srj8diKA==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/@nx/workspace/-/workspace-22.7.8.tgz",
+      "integrity": "sha512-VTe1hq+Bilm5LpjTiJK7eSNNRIn2/spy1vKOIVDKNox6VjygMVzZDrlobykbK7clLwL/1nAURsQWI1rC/i/zJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nx/devkit": "22.7.5",
+        "@nx/devkit": "22.7.8",
         "@zkochan/js-yaml": "0.0.7",
         "chalk": "^4.1.0",
         "enquirer": "~2.3.6",
-        "nx": "22.7.5",
+        "nx": "22.7.8",
         "picomatch": "4.0.4",
         "semver": "^7.6.3",
         "tslib": "^2.3.0",
@@ -5182,32 +4613,32 @@
       }
     },
     "node_modules/@radix-ui/number": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
-      "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.3.tgz",
+      "integrity": "sha512-Road2bidD0uu/1BGDOWNdPI06g0lIRy6IF9GZcIrDK2KGItfor8IQwQa+yM2ERgHM1MmHxaxpTzk0/Jp42lNfA==",
       "license": "MIT"
     },
     "node_modules/@radix-ui/primitive": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
-      "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.7.tgz",
+      "integrity": "sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q==",
       "license": "MIT"
     },
     "node_modules/@radix-ui/react-accordion": {
-      "version": "1.2.12",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.12.tgz",
-      "integrity": "sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==",
+      "version": "1.2.20",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.20.tgz",
+      "integrity": "sha512-jDhG9FvAEnlhnjrsINbNXcUa4G+L1KqSkJSunkbKEzFRcAb52jvM0PjPxPRvhe1HNc5F5yc0yzzWeeqlH4yBIg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collapsible": "1.1.12",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collapsible": "1.1.20",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5225,17 +4656,16 @@
       }
     },
     "node_modules/@radix-ui/react-alert-dialog": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz",
-      "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.23.tgz",
+      "integrity": "sha512-VAYOiQRqj3GPpYJE0I9J+X8Ip05cyVlNdKOFeiGS2Ou1HHGfpl0BxOyZm6nmVDyU+W+NF3/XLzmjHmVGydhwgA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dialog": "1.1.15",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dialog": "1.1.23",
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5252,31 +4682,13 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-arrow": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz",
-      "integrity": "sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.15.tgz",
+      "integrity": "sha512-v4zggRcjadnI+ClKDuijlQEW4tw3NoaeHc/PwpKnLoLLKNUG4InLegkstooLcRIUWCs+8L22dGURCVuFfOKfnA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5294,54 +4706,17 @@
       }
     },
     "node_modules/@radix-ui/react-avatar": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.11.tgz",
-      "integrity": "sha512-0Qk603AHGV28BOBO34p7IgD5m+V5Sg/YovfayABkoDDBM5d3NCx0Mp4gGrjzLGes1jV5eNOE1r3itqOR33VC6Q==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.2.6.tgz",
+      "integrity": "sha512-4ULOTJ/mqy2hT9GlWa/MFHxHSvH3nJzHnZM1waNsc5Bonv7i70aNenghXmD97S6OJ81ekXONGGt4nT1r0PfEdA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-context": "1.1.3",
-        "@radix-ui/react-primitive": "2.1.4",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-is-hydrated": "0.1.0",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-avatar/node_modules/@radix-ui/react-context": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.3.tgz",
-      "integrity": "sha512-ieIFACdMpYfMEjF0rEf5KLvfVyIkOz6PDGyNnP+u+4xQ6jny3VCgA4OgXOwNx2aUkxn8zx9fiVcM8CfFYv9Lxw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-avatar/node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
-      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-slot": "1.2.4"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-is-hydrated": "0.1.3",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5359,19 +4734,18 @@
       }
     },
     "node_modules/@radix-ui/react-checkbox": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz",
-      "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==",
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.11.tgz",
+      "integrity": "sha512-Gnptr9pDDQxD3hgq2dtPbtrp/c2qH1mBwIzw3X/ivrMb2e1t0jMTi606fVEqFPaQR1ggXIVQWKj3P2WW9v7zGQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-previous": "1.1.1",
-        "@radix-ui/react-use-size": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-size": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5389,19 +4763,19 @@
       }
     },
     "node_modules/@radix-ui/react-collapsible": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz",
-      "integrity": "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==",
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.20.tgz",
+      "integrity": "sha512-mcGesGplBnzN2sbvJETzpCNfSMyPnb29q1GRLU+Ib7bJrpIG2ywmRoh2V5VbA2uNvKikKUlVbAPks7JDjz4A8Q==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5419,15 +4793,15 @@
       }
     },
     "node_modules/@radix-ui/react-collection": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz",
-      "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.15.tgz",
+      "integrity": "sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3"
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5444,28 +4818,10 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-compose-refs": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
-      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.5.tgz",
+      "integrity": "sha512-+48PbAAbq3didjJxa+OaWY2ZwgAKsNiRGyeHKszblZMQ+kcpd9pAaT11cMkGEie0vsOi3QdeTE6d5Fe3Gn61kA==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -5478,9 +4834,9 @@
       }
     },
     "node_modules/@radix-ui/react-context": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
-      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.2.tgz",
+      "integrity": "sha512-RHCUGwKHDr0hDGg4X7ma4JG4/+12qxw8rkh5QKdDldlCvtja6nUx1Ef/8HVrJze81lEsgLQlqjzjGNHantgnQA==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -5493,17 +4849,16 @@
       }
     },
     "node_modules/@radix-ui/react-context-menu": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.2.16.tgz",
-      "integrity": "sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.3.7.tgz",
+      "integrity": "sha512-CtXP35dxaB5T3zXSd+E3uHe/QpXcpYnZmxp6OaIbfthtfW4wyb77M23BG+bwIJDtsMwEP/YssdsmNyZu7jhWew==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-menu": "2.1.16",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-menu": "2.1.24",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5521,25 +4876,26 @@
       }
     },
     "node_modules/@radix-ui/react-dialog": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
-      "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.23.tgz",
+      "integrity": "sha512-Ksw4WeROkO4rC9k/onilX/Ao2Cr1ku1unMNH+XSCcP4jSXYu7HDsg9n4ojMjVb22XpYjAQ9qfrFlVbru1vXDUA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-focus-guards": "1.1.3",
-        "@radix-ui/react-focus-scope": "1.1.7",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-focus-guards": "1.1.6",
+        "@radix-ui/react-focus-scope": "1.1.16",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
         "aria-hidden": "^1.2.4",
-        "react-remove-scroll": "^2.6.3"
+        "react-remove-scroll": "^2.7.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5556,28 +4912,10 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-direction": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz",
-      "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.4.tgz",
+      "integrity": "sha512-5pzg4FGQNpExhnhT2zlrP1wZFaYCd1K0nYWoFAdcYoYK868IEigqMX3B3f8yIoRlAhAeDWciLI6ZdCKHF9P4Vg==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -5590,16 +4928,16 @@
       }
     },
     "node_modules/@radix-ui/react-dismissable-layer": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz",
-      "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.19.tgz",
+      "integrity": "sha512-8g4pfOL9HoKKLWGiypT+dphVqjFfmcXO5GBnhsG6zI+lxAx/8feQpr+1LSN8Re3hiZ+XkLNS4O9ztK11/LzQ6w==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-escape-keydown": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-effect-event": "0.0.5"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5617,18 +4955,18 @@
       }
     },
     "node_modules/@radix-ui/react-dropdown-menu": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz",
-      "integrity": "sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==",
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.24.tgz",
+      "integrity": "sha512-geq8l2rJkxvkXsT9RMgtUE3P8pITFpTsvYpbySi1IH4fZEABD/Gp85myayFgxk0ktljGMJnCbeFkyTusvSvv7g==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-menu": "2.1.16",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-menu": "2.1.24",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5646,9 +4984,9 @@
       }
     },
     "node_modules/@radix-ui/react-focus-guards": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz",
-      "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.6.tgz",
+      "integrity": "sha512-RNOJjfZMTyBM6xYmV3IVGXkPjIhcBAuv48POevAXwrGJhkWZ9p1rFoIS1JFooPuT193AZmRsCPhpoVJxx6OPoQ==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -5661,14 +4999,14 @@
       }
     },
     "node_modules/@radix-ui/react-focus-scope": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz",
-      "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==",
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.16.tgz",
+      "integrity": "sha512-wmRZ2WWLvmt6KHy2rNPOdPUjwq5xOHY02+m+udwJTn0aNIox/rkskAvJTyTLGhPK6KgrUjlJUJpgmx/+wFiFIQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1"
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5686,20 +5024,20 @@
       }
     },
     "node_modules/@radix-ui/react-hover-card": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.15.tgz",
-      "integrity": "sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.23.tgz",
+      "integrity": "sha512-H8qONfZd3ltrU3+jHCIgITbWo6e1iTKvP9DHdrvYbX48ooRM5FjEDTn16AMwdfuOGkWdZEhpl3PLL/Wk/AnHDQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-popper": "1.2.8",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5717,12 +5055,12 @@
       }
     },
     "node_modules/@radix-ui/react-id": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
-      "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.4.tgz",
+      "integrity": "sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5735,35 +5073,12 @@
       }
     },
     "node_modules/@radix-ui/react-label": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.8.tgz",
-      "integrity": "sha512-FmXs37I6hSBVDlO4y764TNz1rLgKwjJMQ0EGte6F3Cb3f4bIuHB/iLa/8I9VKkmOy+gNHq8rql3j686ACVV21A==",
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.15.tgz",
+      "integrity": "sha512-o/rdYEwZTTo5tjknnPeyQFU45kUC4i/XyeDPP+HGyi6XqpOP6Zf5Ya5vh/Yfe9Id5JiuWnnAx2XqIeD3UYZt0g==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.1.4"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
-      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-slot": "1.2.4"
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5781,29 +5096,29 @@
       }
     },
     "node_modules/@radix-ui/react-menu": {
-      "version": "2.1.16",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz",
-      "integrity": "sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==",
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.24.tgz",
+      "integrity": "sha512-uW7RVuU6Lp/ZtfeY4b3kL32zccgEWvPv1+cf17ubYzHa9cL8AHokmk36cG/XEiH/smbQvumnieXX9j/e9RqJWA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-focus-guards": "1.1.3",
-        "@radix-ui/react-focus-scope": "1.1.7",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-popper": "1.2.8",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-roving-focus": "1.1.11",
-        "@radix-ui/react-slot": "1.2.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-focus-guards": "1.1.6",
+        "@radix-ui/react-focus-scope": "1.1.16",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-roving-focus": "1.1.19",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
         "aria-hidden": "^1.2.4",
-        "react-remove-scroll": "^2.6.3"
+        "react-remove-scroll": "^2.7.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5820,44 +5135,26 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-navigation-menu": {
-      "version": "1.2.14",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz",
-      "integrity": "sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==",
+      "version": "1.2.22",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.22.tgz",
+      "integrity": "sha512-ou7iLEJ+yrhQndkkA4U21XIdS/CS45F4iXIkTZcb6/Ne9EMsOuDudVmCwmDnfFZZ+y1FZqXRNSIgBy+YMvZVZg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1",
-        "@radix-ui/react-use-previous": "1.1.1",
-        "@radix-ui/react-visually-hidden": "1.2.3"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-use-previous": "1.1.4",
+        "@radix-ui/react-visually-hidden": "1.2.11"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5875,26 +5172,26 @@
       }
     },
     "node_modules/@radix-ui/react-popover": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz",
-      "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.23.tgz",
+      "integrity": "sha512-mw58MrBlyHWFisTOYignD0vf/3gdcgAR+9of1s9G/38CbFiUwH1nCDkc0AUM9IrXFgN5Ue8n45j9WCgyM1sbiQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-focus-guards": "1.1.3",
-        "@radix-ui/react-focus-scope": "1.1.7",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-popper": "1.2.8",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-focus-guards": "1.1.6",
+        "@radix-ui/react-focus-scope": "1.1.16",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
         "aria-hidden": "^1.2.4",
-        "react-remove-scroll": "^2.6.3"
+        "react-remove-scroll": "^2.7.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5911,40 +5208,22 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-popper": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz",
-      "integrity": "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.7.tgz",
+      "integrity": "sha512-UsJrrd7w4wuKKTdvd/DNERVlwSlUcyXzjhyDwBk+3aPOsCjOY6ZSbxuw8E6lZTjjfP8Cpd0J8VVkrYUWyGYXyg==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react-dom": "^2.0.0",
-        "@radix-ui/react-arrow": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-layout-effect": "1.1.1",
-        "@radix-ui/react-use-rect": "1.1.1",
-        "@radix-ui/react-use-size": "1.1.1",
-        "@radix-ui/rect": "1.1.1"
+        "@radix-ui/react-arrow": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-use-rect": "1.1.4",
+        "@radix-ui/react-use-size": "1.1.4",
+        "@radix-ui/rect": "1.1.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5962,13 +5241,13 @@
       }
     },
     "node_modules/@radix-ui/react-portal": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz",
-      "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==",
+      "version": "1.1.17",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.17.tgz",
+      "integrity": "sha512-vKQLcWypUnwZVvfV7UkGahH2g6ySe8M8R+zYBwPrv5byZ9QAW6cQVvNKo7GgmD+p8aYb6D9JBuvy8/WhOno2wQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -5986,13 +5265,12 @@
       }
     },
     "node_modules/@radix-ui/react-presence": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz",
-      "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.10.tgz",
+      "integrity": "sha512-3wyzCQ6+ubRA+D4uv9m95JYLXxmOHp05qjrkjeA7uKHHtjpPggQzc6DAb0URl7j67oR0K2foO4ip27TiX037Bw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6010,12 +5288,12 @@
       }
     },
     "node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
-      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.10.tgz",
+      "integrity": "sha512-MucOnzh6hR5mid6VpkbglRAMYMjKLqRnGBbjXkzjK52fuQDd1qbkx78a5P40mkcnVXJdEVxm26E9OPAiUq7nBg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.2.3"
+        "@radix-ui/react-slot": "1.3.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6032,70 +5310,14 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-progress": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.8.tgz",
-      "integrity": "sha512-+gISHcSPUJ7ktBy9RnTqbdKW78bcGke3t6taawyZ71pio1JewwGSJizycs7rLhGTvMJYCQB1DBK4KQsxs7U8dA==",
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.16.tgz",
+      "integrity": "sha512-5XnomAsoZZCY+KNTxbIghpGqPruZvKFNlvcAljVAOdDRDsH4/OZQxhtwo5wdtoDM5R6MhJBb2sPnDuRFep3lzg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-context": "1.1.3",
-        "@radix-ui/react-primitive": "2.1.4"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-progress/node_modules/@radix-ui/react-context": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.3.tgz",
-      "integrity": "sha512-ieIFACdMpYfMEjF0rEf5KLvfVyIkOz6PDGyNnP+u+4xQ6jny3VCgA4OgXOwNx2aUkxn8zx9fiVcM8CfFYv9Lxw==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-progress/node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
-      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-slot": "1.2.4"
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6113,21 +5335,20 @@
       }
     },
     "node_modules/@radix-ui/react-radio-group": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.3.8.tgz",
-      "integrity": "sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.4.7.tgz",
+      "integrity": "sha512-cgYFEkntCxppHZgtSZ+7vh0wbZQ+IC7PPMw8DSnRG27B6kDd32/Zw0OJt7dGDigCoprMuWHjg2PvUn3PYvPFoQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-roving-focus": "1.1.11",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-previous": "1.1.1",
-        "@radix-ui/react-use-size": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-roving-focus": "1.1.19",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-size": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6145,20 +5366,22 @@
       }
     },
     "node_modules/@radix-ui/react-roving-focus": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz",
-      "integrity": "sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.19.tgz",
+      "integrity": "sha512-V9jI6hDjT7l3jsCQD9bLNvDLM3tH/gdbOTp7Tefp3hbbgCGQoK7tUvrWiRlcoBHIZ809ElXwNQwVo0B98LuTXQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-is-hydrated": "0.1.3",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6176,20 +5399,20 @@
       }
     },
     "node_modules/@radix-ui/react-scroll-area": {
-      "version": "1.2.10",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz",
-      "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.18.tgz",
+      "integrity": "sha512-Zn5Cd171wxsO3Dfg8HaW6RifTb9CYTKQJHs/G4+LN1GfmJpaQMZQyQxMprVPHpaz7QY4l9BxK2JwQuzHsXC8nA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/number": "1.1.1",
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/number": "1.1.3",
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6207,32 +5430,33 @@
       }
     },
     "node_modules/@radix-ui/react-select": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",
-      "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.3.7.tgz",
+      "integrity": "sha512-WFGImkmbzcfxeIwq/+4HvRN0pizBwbwQUED4I13ezQsDdfl38ZntN6TmR8XaSzPBqoCToe8rF75j6NPNDSzhbg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/number": "1.1.1",
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-focus-guards": "1.1.3",
-        "@radix-ui/react-focus-scope": "1.1.7",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-popper": "1.2.8",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1",
-        "@radix-ui/react-use-previous": "1.1.1",
-        "@radix-ui/react-visually-hidden": "1.2.3",
+        "@radix-ui/number": "1.1.3",
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-focus-guards": "1.1.6",
+        "@radix-ui/react-focus-scope": "1.1.16",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-use-previous": "1.1.4",
+        "@radix-ui/react-visually-hidden": "1.2.11",
         "aria-hidden": "^1.2.4",
-        "react-remove-scroll": "^2.6.3"
+        "react-remove-scroll": "^2.7.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6249,54 +5473,13 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-separator": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.8.tgz",
-      "integrity": "sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.15.tgz",
+      "integrity": "sha512-jOLO4lssEzWpoDu7G+Ze4VjwMRUBt291pnZD0gmalREZipnTX3wadQo7Fy48GCTfe14/YRN6rw/rOJqrE85Wxw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.1.4"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "@types/react-dom": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-separator/node_modules/@radix-ui/react-primitive": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz",
-      "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-slot": "1.2.4"
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6314,12 +5497,12 @@
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz",
-      "integrity": "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.3.tgz",
+      "integrity": "sha512-qx7oqnYbxnK9kYI9m317qmFmEgo6ywqWvbTogdj7cL9p3/yx4M48p7Rnw5z3H890cL/ow/EeWJsuTykeZVXP5Q==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
+        "@radix-ui/react-compose-refs": "1.1.5"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6332,18 +5515,17 @@
       }
     },
     "node_modules/@radix-ui/react-switch": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz",
-      "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.7.tgz",
+      "integrity": "sha512-48tB/4dn2UVLBCYhTu9AuR63IHl73l/qLbLgxd86noTUor4/K4LFDAcYjK+isP5313qxaFpjPVogE7+Y0/V3Kw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-previous": "1.1.1",
-        "@radix-ui/react-use-size": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-size": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6361,19 +5543,19 @@
       }
     },
     "node_modules/@radix-ui/react-tabs": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz",
-      "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==",
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.21.tgz",
+      "integrity": "sha512-UKxJlZid7FVtsk/WTxj4i4uSEgj2Au+KBbS7SQyTlzMhhn+86Cz3tISZdTa87bfEfcuvZezf2ZsxD4xuEKtkog==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-direction": "1.1.1",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-roving-focus": "1.1.11",
-        "@radix-ui/react-use-controllable-state": "1.2.2"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-direction": "1.1.4",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-roving-focus": "1.1.19",
+        "@radix-ui/react-use-controllable-state": "1.2.6"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6391,23 +5573,23 @@
       }
     },
     "node_modules/@radix-ui/react-toast": {
-      "version": "1.2.15",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.15.tgz",
-      "integrity": "sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==",
+      "version": "1.2.23",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.23.tgz",
+      "integrity": "sha512-ofhyAsYaocRGOs/n0XWdUOSVzEAG6BfrMVM8z0c0kLEWY38w/0WuMFPTJP/HVaZPYkMvHZoKIIhNcjbTCBILPg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-collection": "1.1.7",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-use-callback-ref": "1.1.1",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1",
-        "@radix-ui/react-visually-hidden": "1.2.3"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-collection": "1.1.15",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-use-callback-ref": "1.1.4",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-visually-hidden": "1.2.11"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6425,23 +5607,24 @@
       }
     },
     "node_modules/@radix-ui/react-tooltip": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.8.tgz",
-      "integrity": "sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==",
+      "version": "1.2.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.16.tgz",
+      "integrity": "sha512-6EamKFRRnlpdadndbZ6LMwycfwkwPte1B42hs6QA0gYhjaOKqW4PZ4pjaW9UrlDX5eVt/OjncE7BFTPL5nmZhg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.3",
-        "@radix-ui/react-compose-refs": "1.1.2",
-        "@radix-ui/react-context": "1.1.2",
-        "@radix-ui/react-dismissable-layer": "1.1.11",
-        "@radix-ui/react-id": "1.1.1",
-        "@radix-ui/react-popper": "1.2.8",
-        "@radix-ui/react-portal": "1.1.9",
-        "@radix-ui/react-presence": "1.1.5",
-        "@radix-ui/react-primitive": "2.1.3",
-        "@radix-ui/react-slot": "1.2.3",
-        "@radix-ui/react-use-controllable-state": "1.2.2",
-        "@radix-ui/react-visually-hidden": "1.2.3"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.5",
+        "@radix-ui/react-context": "1.2.2",
+        "@radix-ui/react-dismissable-layer": "1.1.19",
+        "@radix-ui/react-id": "1.1.4",
+        "@radix-ui/react-popper": "1.3.7",
+        "@radix-ui/react-portal": "1.1.17",
+        "@radix-ui/react-presence": "1.1.10",
+        "@radix-ui/react-primitive": "2.1.10",
+        "@radix-ui/react-slot": "1.3.3",
+        "@radix-ui/react-use-controllable-state": "1.2.6",
+        "@radix-ui/react-use-layout-effect": "1.1.4",
+        "@radix-ui/react-visually-hidden": "1.2.11"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6458,28 +5641,10 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-slot": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
-      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.2"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@radix-ui/react-use-callback-ref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
-      "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.4.tgz",
+      "integrity": "sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -6492,13 +5657,14 @@
       }
     },
     "node_modules/@radix-ui/react-use-controllable-state": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
-      "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.6.tgz",
+      "integrity": "sha512-uEQJGT97ZA/TgP/Hydw47lHu+/vQj6z/0jA+WeTbK1o9Rx45GImjpD0tc3W5ad3D6XTSR6e1yEO0FvGq6WQfVQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-use-effect-event": "0.0.2",
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/primitive": "1.1.7",
+        "@radix-ui/react-use-effect-event": "0.0.5",
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6511,30 +5677,12 @@
       }
     },
     "node_modules/@radix-ui/react-use-effect-event": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
-      "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.5.tgz",
+      "integrity": "sha512-7cshFL8HGS/7HEiHH+9kL9HBwp2sa9yX18Knwek6KYWmXwM7pegMgta2AXMQKI+rq3JnfSj9x8wYqFMTdG1Jgg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-use-layout-effect": "1.1.1"
-      },
-      "peerDependencies": {
-        "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@radix-ui/react-use-escape-keydown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
-      "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/react-use-callback-ref": "1.1.1"
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6547,13 +5695,10 @@
       }
     },
     "node_modules/@radix-ui/react-use-is-hydrated": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.0.tgz",
-      "integrity": "sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.3.tgz",
+      "integrity": "sha512-umO/aJ+82CpOnhDZUTbILCQf7kU/g0iv+oGs/Q8jw7IkhWBzaEP4sA268PhFAJTFetbwp3ICc6ktpI4TqtxcIw==",
       "license": "MIT",
-      "dependencies": {
-        "use-sync-external-store": "^1.5.0"
-      },
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -6565,9 +5710,9 @@
       }
     },
     "node_modules/@radix-ui/react-use-layout-effect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
-      "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+      "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -6580,9 +5725,9 @@
       }
     },
     "node_modules/@radix-ui/react-use-previous": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz",
-      "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.4.tgz",
+      "integrity": "sha512-XoSLhbRbqxFtgJoi2fNHA3C6pDlY34x508vUpUGoFZfvePfHXHbE1lC4FYFMnJWgiCRroSTw6fOsXQoVS9RwZg==",
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
@@ -6595,12 +5740,12 @@
       }
     },
     "node_modules/@radix-ui/react-use-rect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz",
-      "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.4.tgz",
+      "integrity": "sha512-cSOCh6JlkmfjLyNcLiu2nB4v+nm+dkZ+Q5KHWk/soo4U7ZLiEQFKHK9/YmtBHjfCEaU43IBKQOc4/uJmCaiCTQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/rect": "1.1.1"
+        "@radix-ui/rect": "1.1.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6613,12 +5758,12 @@
       }
     },
     "node_modules/@radix-ui/react-use-size": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz",
-      "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.4.tgz",
+      "integrity": "sha512-D3anSY15EJoxrihpsXI6SMrmmonnQtR2ni7arO+Lfdg3O95b9hNXxONk8jA5C8ANdF/h5HMAxejgs8PWJ6rlhw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-use-layout-effect": "1.1.1"
+        "@radix-ui/react-use-layout-effect": "1.1.4"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6631,12 +5776,12 @@
       }
     },
     "node_modules/@radix-ui/react-visually-hidden": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
-      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.11.tgz",
+      "integrity": "sha512-NFS86RYYZb4/exihaESBGOpMJFz8MGLAfu3mOBSGByVnVPC9JPASfYubxd/8KbkQK0sYAv8lVQDEQukDX/qXvQ==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.1.3"
+        "@radix-ui/react-primitive": "2.1.10"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -6654,9 +5799,9 @@
       }
     },
     "node_modules/@radix-ui/rect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",
-      "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.3.tgz",
+      "integrity": "sha512-JtyZR+mqgBibTo8xea3B6ZRmzZiM/YeVBtUkas6zMuXjAlfIFIW2FgqeM9eLyvEaYX66vr6DJMK+4U6LV0KhNw==",
       "license": "MIT"
     },
     "node_modules/@react-pdf-viewer/attachment": {
@@ -6990,12 +6135,6 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/@react-pdf/reconciler/node_modules/scheduler": {
-      "version": "0.25.0-rc-603e6108-20241029",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-603e6108-20241029.tgz",
-      "integrity": "sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA==",
-      "license": "MIT"
-    },
     "node_modules/@react-pdf/render": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-4.5.1.tgz",
@@ -7266,9 +6405,9 @@
       }
     },
     "node_modules/@rollup/pluginutils": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
-      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz",
+      "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7289,9 +6428,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.4.tgz",
-      "integrity": "sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.4.tgz",
+      "integrity": "sha512-RrPokAb7dmbxFoeO3TloqHyOjgye8RkBhSqmp4aJMIex4c9r46ZstPnleDQOq1t46VOVjwIuwNogIqbodV1Vvg==",
       "cpu": [
         "arm"
       ],
@@ -7302,9 +6441,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.4.tgz",
-      "integrity": "sha512-GxxTKApUpzRhof7poWvCJHRF51C67u1R7D6DiluBE8wKU1u5GWE8t+v81JvJYtbawoBFX1hLv5Ei4eVjkWokaw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.4.tgz",
+      "integrity": "sha512-JKuJc+pnpks2pjy7L/N3v/cAkZxYlnmuZoD840ldbMI5KDbC4iO9NKwPKYdjYFCMAIIlBzYSFHxIJVYzRo2/8A==",
       "cpu": [
         "arm64"
       ],
@@ -7315,9 +6454,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.4.tgz",
-      "integrity": "sha512-tua0TaJxMOB1R0V0RS1jFZ/RpURFDJIOR2A6jWwQeawuFyS4gBW+rntLRaQd0EQ4bd6Vp44Z2rXW+YYDBsj6IA==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.4.tgz",
+      "integrity": "sha512-krw5uS2STmvJ02x0uTXHbqQNuz+9eZ1iw+qXk9dmW2gvV4jV7O2hEoOnuhFrpOPiel1mBFtqbxYZZtC46hXLOw==",
       "cpu": [
         "arm64"
       ],
@@ -7328,9 +6467,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.4.tgz",
-      "integrity": "sha512-CSKq7MsP+5PFIcydhAiR1K0UhEI1A2jWXVKHPCBZ151yOutENwvnPocgVHkivu2kviURtCEB6zUQw0vs8RrhMg==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.4.tgz",
+      "integrity": "sha512-wsTxtgApb4PrOsNJIm0FZ1h3WvCC+k9uxLJ4ad75hgoS4NiRes2SoJFlDAyMwiUY8IssDqGcHbXuN0sx1tfF1A==",
       "cpu": [
         "x64"
       ],
@@ -7341,9 +6480,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.4.tgz",
-      "integrity": "sha512-+O8OkVdyvXMtJEciu2wS/pzm1IxntEEQx3z5TAVy4l32G0etZn+RsA48ARRrFm6Ri8fvqPQfgrvNxSjKAbnd3g==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.4.tgz",
+      "integrity": "sha512-GUOnQlyZe3yAXhWOtOMsn5Qkrv5E5mZXa0thbARWi5Ei2szlVXJFQhddZ4HbAzh8q92w5twp+CQvs/eFanz9YQ==",
       "cpu": [
         "arm64"
       ],
@@ -7354,9 +6493,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.4.tgz",
-      "integrity": "sha512-Iw3oMskH3AfNuhU0MSN7vNbdi4me/NiYo2azqPz/Le16zHSa+3RRmliCMWWQmh4lcndccU40xcJuTYJZxNo/lw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.4.tgz",
+      "integrity": "sha512-/Y7f3QuxjzPKsjA/rfEDa3+0vXqyjmJ50Ln8dPpCmWkKTrUoWHG1cWhTqaAMLob2m2nESWuC7yGrREz019Ztqg==",
       "cpu": [
         "x64"
       ],
@@ -7367,12 +6506,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.4.tgz",
-      "integrity": "sha512-EIPRXTVQpHyF8WOo219AD2yEltPehLTcTMz2fn6JsatLYSzQf00hj3rulF+yauOlF9/FtM2WpkT/hJh/KJFGhA==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.4.tgz",
+      "integrity": "sha512-81wiiX3v7aqy+T+bT61TJ78yJjRquqFFTTbAPt08imfQQzkPIW8t6aJbkTagtCCrXMNc9D66+geqlK7ydLPNqA==",
       "cpu": [
         "arm"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7380,12 +6522,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.4.tgz",
-      "integrity": "sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.4.tgz",
+      "integrity": "sha512-9kmDIvNZqdoHOBZgNtpTBeLWYO/LVipM3H/j62P8848/l/VPEQL6N3uxU9pvP1oZAsXyC2MEnFP3ovRjo7WYNQ==",
       "cpu": [
         "arm"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7393,12 +6538,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.4.tgz",
-      "integrity": "sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.4.tgz",
+      "integrity": "sha512-CcnXHWnXg69g+DX5VWL3FHts3qMRN2uVEHX+BZvGLdd07/gXkn3ePjYtO1LDJvxkGKVHMclKBRa1QUTH+6toYQ==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7406,12 +6554,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.4.tgz",
-      "integrity": "sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.4.tgz",
+      "integrity": "sha512-iFOibiHnTRuhrWLlRsOQFdZJJIa7S8OwkneJr4ocALP16u5yk6lWLINFwhHaEqBFMsKDUZofLkGos7+CPzGB3g==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7419,12 +6570,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.4.tgz",
-      "integrity": "sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.4.tgz",
+      "integrity": "sha512-XnWYMI7euHlb5a871xPja+Gm7DRCFU+FGRrtS2sMq9N8FvqtpagUy6gD4YOemC5MRk9xbh8+jYMEJbigFQwsgA==",
       "cpu": [
         "loong64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7432,12 +6586,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.4.tgz",
-      "integrity": "sha512-nbJnQ8a3z1mtmrwImCYhc6BGpThAyYVRQxw9uKSKG4wR6aAYno9sVjJ0zaZcW9BPJX1GbrDPf+SvdWjgTuDmnw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.4.tgz",
+      "integrity": "sha512-qGDAlO0U8xedCcsdRm9oaoQY8DAx/QT7uIxJWhCdx0ceIWX783UC9QSYkdpzAe29wNiVfp24+bZdQmn49o45SQ==",
       "cpu": [
         "loong64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7445,12 +6602,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.4.tgz",
-      "integrity": "sha512-2EU6acNrQLd8tYvo/LXW535wupT3m6fo7HKo6lr7ktQoItxTyOL1ZCR/GfGCuXl2vR+zmfI6eRXkSemafv+iVg==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.4.tgz",
+      "integrity": "sha512-ru4H6ezD7ysA5EiEK6qkkaEb4modH8CTej6kUy/gQi20u3kB3G7Zn8snXXkeJSCOFKG/rbPPtM/+9Wgas1961w==",
       "cpu": [
         "ppc64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7458,12 +6618,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.4.tgz",
-      "integrity": "sha512-WeBtoMuaMxiiIrO2IYP3xs6GMWkJP2C0EoT8beTLkUPmzV1i/UcOSVw1d5r9KBODtHKilG5yFxsGRnBbK3wJ4A==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.4.tgz",
+      "integrity": "sha512-2W4MO5WQVJnbJaZdvDb9rhBDuFU1nKIepPFpJUBsTh2k1YY2g+ODViaWuyOAjQ5cOP7NvrvLzt3wvHOoiAvc7w==",
       "cpu": [
         "ppc64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7471,12 +6634,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.4.tgz",
-      "integrity": "sha512-FJHFfqpKUI3A10WrWKiFbBZ7yVbGT4q4B5o1qKFFojqpaYoh9LrQgqWCmmcxQzVSXYtyB5bzkXrYzlHTs21MYA==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.4.tgz",
+      "integrity": "sha512-+fxjfuoAmVMCYV5QyjoIpu0cp5DOiOTeqYFk1AVaxGr+/ravWLX89XfQmptsoWcaVy/TGf2hexzbUOrCQIL1CQ==",
       "cpu": [
         "riscv64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7484,12 +6650,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.4.tgz",
-      "integrity": "sha512-mcEl6CUT5IAUmQf1m9FYSmVqCJlpQ8r8eyftFUHG8i9OhY7BkBXSUdnLH5DOf0wCOjcP9v/QO93zpmF1SptCCw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.4.tgz",
+      "integrity": "sha512-jTn8JfHGL4djjFxPuM06LmNUJDsst2jeVlsd9OmIH6zc5sC9K6rIuO4YajXatLUpBmBKl6b35ro1QZocLi+tcA==",
       "cpu": [
         "riscv64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7497,12 +6666,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.4.tgz",
-      "integrity": "sha512-ynt3JxVd2w2buzoKDWIyiV1pJW93xlQic1THVLXilz429oijRpSHivZAgp65KBu+cMcgf1eVVjdnTLvPxgCuoQ==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.4.tgz",
+      "integrity": "sha512-oCJCJL4pXsoDcP2QZ+JVlPTIRc6266zsIaeJJsWImmF7HO0W8nb6HuSgZlMWxJwaPf8ehbSw8yo0EUw925hKsA==",
       "cpu": [
         "s390x"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7510,12 +6682,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.4.tgz",
-      "integrity": "sha512-Boiz5+MsaROEWDf+GGEwF8VMHGhlUoQMtIPjOgA5fv4osupqTVnJteQNKJwUcnUog2G55jYXH7KZFFiJe0TEzQ==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.4.tgz",
+      "integrity": "sha512-W69hukhZ3KKNRCaMIEzKvcFye42hh0FE1+YoYaf5+Ikacuftoco6yO/xouz0hc5d5W/s3yBro5jRiuEE/Q5vUw==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7523,12 +6698,15 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.4.tgz",
-      "integrity": "sha512-+qfSY27qIrFfI/Hom04KYFw3GKZSGU4lXus51wsb5EuySfFlWRwjkKWoE9emgRw/ukoT4Udsj4W/+xxG8VbPKg==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.4.tgz",
+      "integrity": "sha512-qiXbGG2jkjXhzXpsFZSR2Xpb8DN/UaxYsbb/STbuR/6fpaDgRmmaq1B/LmtF2wQFOFOSsK2jdE0RZ3a0zHn4QA==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7536,9 +6714,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.4.tgz",
-      "integrity": "sha512-VpTfOPHgVXEBeeR8hZ2O0F3aSso+JDWqTWmTmzcQKted54IAdUVbxE+j/MVxUsKa8L20HJhv3vUezVPoquqWjA==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.4.tgz",
+      "integrity": "sha512-nWeM//hxv8mIo6jD7Hu4o48DVmV9pbV6gsKaWU+4NFyqHoPKwrkRiZGLKUhOBk8qNmDmpwFtPKg80Bo/Tn4xiQ==",
       "cpu": [
         "x64"
       ],
@@ -7549,9 +6727,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.4.tgz",
-      "integrity": "sha512-IPOsh5aRYuLv/nkU51X10Bf75Bsf6+gZdx1X+QP5QM6lIJFHHqbHLG0uJn/hWthzo13UAc2umiUorqZy3axoZg==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.4.tgz",
+      "integrity": "sha512-s62SQ/vgsRSvMwDkOEfTqfgASF0f26ZNaQuTA6Aok5lrikf89yI2W0gFHvZb2Jpgc6N8JnOKZgCK2iciO3CsxQ==",
       "cpu": [
         "arm64"
       ],
@@ -7562,9 +6740,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.4.tgz",
-      "integrity": "sha512-4QzE9E81OohJ/HKzHhsqU+zcYYojVOXlFMs1DdyMT6qXl/niOH7AVElmmEdUNHHS/oRkc++d5k6Vy85zFs0DEw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.4.tgz",
+      "integrity": "sha512-J6wGf8TVGbXJq+HH+ttTvrcfNKPbuZecV6KT1B8I18BC5IURUh5kl4Yl5OEP5eFIUoI5BWxCsyYMhFsDx8kekw==",
       "cpu": [
         "arm64"
       ],
@@ -7575,9 +6753,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.4.tgz",
-      "integrity": "sha512-zTPgT1YuHHcd+Tmx7h8aml0FWFVelV5N54oHow9SLj+GfoDy/huQ+UV396N/C7KpMDMiPspRktzM1/0r1usYEA==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.4.tgz",
+      "integrity": "sha512-zmfrQd/0wu6oJs8Vq8KwY/YtsKSsLtKe/HwAP4Wqy8LhWjeT55fHRAkOhYQ12wI3ayS4Tt12d5CDRD7N96SAYQ==",
       "cpu": [
         "ia32"
       ],
@@ -7588,9 +6766,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.4.tgz",
-      "integrity": "sha512-DRS4G7mi9lJxqEDezIkKCaUIKCrLUUDCUaCsTPCi/rtqaC6D/jjwslMQyiDU50Ka0JKpeXeRBFBAXwArY52vBw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.4.tgz",
+      "integrity": "sha512-qPzHqdj9rfUD+w79dtE07zi/kFwKyCJqplp5K5ygeLTp7jLpAoc16OAH39HSmRC9UpozaecsleI8uAdEj6v2yw==",
       "cpu": [
         "x64"
       ],
@@ -7601,9 +6779,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.4.tgz",
-      "integrity": "sha512-QVTUovf40zgTqlFVrKA1uXMVvU2QWEFWfAH8Wdc48IxLvrJMQVMBRjuQyUpzZCDkakImib9eVazbWlC6ksWtJw==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.4.tgz",
+      "integrity": "sha512-zD6NdeWEByGE9QF9vCrlJ5YQB4oq9q91kPZS37Jwj5hOkvR1lTBSpsKhKDw4IJtbQ35LsTS1HD9DZYGKIshU1Q==",
       "cpu": [
         "x64"
       ],
@@ -7668,6 +6846,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7682,6 +6863,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7696,6 +6880,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7710,6 +6897,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -7861,13 +7051,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.34.49",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.49.tgz",
-      "integrity": "sha512-brySQQs7Jtn0joV8Xh9ZV/hZb9Ozb0pmazDIASBkYKCjXrXU3mpcFahmK/z4YDhGkQvP9mWJbVyahdtU5wQA+A==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
@@ -8167,9 +7350,9 @@
       }
     },
     "node_modules/@tabler/icons": {
-      "version": "3.44.0",
-      "resolved": "https://registry.npmjs.org/@tabler/icons/-/icons-3.44.0.tgz",
-      "integrity": "sha512-Wn0AOZG9sg0L+bjfMqq4eNhC6pQjIrk94LvvWYNYkY8KH8wC3YILRzQlrnVJc4FUeMxH/AK97QsYCX35H3LndA==",
+      "version": "3.46.0",
+      "resolved": "https://registry.npmjs.org/@tabler/icons/-/icons-3.46.0.tgz",
+      "integrity": "sha512-f2RYFl3fzPwj5WO82x6en0dmkjefxEfOm16D1ByM6cj/McNiwOkL4VaPUoP9VVIrXAD9WnTSVFr70px703b//A==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8177,12 +7360,12 @@
       }
     },
     "node_modules/@tabler/icons-react": {
-      "version": "3.44.0",
-      "resolved": "https://registry.npmjs.org/@tabler/icons-react/-/icons-react-3.44.0.tgz",
-      "integrity": "sha512-8+rvzBbVm/1Z3sG3x7GUNAaxIKxwgz8xaMhRs23nrCnMTKRFAhEC+82zAIFeAA0seXdrAGX5HFCkaLpGK2rVHg==",
+      "version": "3.46.0",
+      "resolved": "https://registry.npmjs.org/@tabler/icons-react/-/icons-react-3.46.0.tgz",
+      "integrity": "sha512-CCm7xJWhDT2PH4ZIFkP6AgYKtVhq0gpYkjUN+GVh1AzmIQaa77OW0bQPBPQiTE0PsXMR9oSxFqA3qBglzPyrVQ==",
       "license": "MIT",
       "dependencies": {
-        "@tabler/icons": "3.44.0"
+        "@tabler/icons": "3.46.0"
       },
       "funding": {
         "type": "github",
@@ -8193,31 +7376,18 @@
       }
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.3.1.tgz",
-      "integrity": "sha512-6NDaqRoAMSXD1mr/RXu0HBvNE9a2n5tHPsxu9XHLws8o4Twes5rBM2205SUUiJ9goAtadrN6xTGX0UDEwp/N4A==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.3.3.tgz",
+      "integrity": "sha512-/T8IKEsf9VTU6tLjgC7+sv2mOPtQxzE2jMw7u4Tt40Tx+QSZxpzh95/H6cMKoja9XuW7iMdLJYBB0o9G1CaAgg==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/remapping": "^2.3.5",
-        "enhanced-resolve": "5.21.6",
+        "enhanced-resolve": "^5.24.1",
         "jiti": "^2.7.0",
         "lightningcss": "1.32.0",
         "magic-string": "^0.30.21",
         "source-map-js": "^1.2.1",
-        "tailwindcss": "4.3.1"
-      }
-    },
-    "node_modules/@tailwindcss/node/node_modules/enhanced-resolve": {
-      "version": "5.21.6",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz",
-      "integrity": "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==",
-      "license": "MIT",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "tailwindcss": "4.3.3"
       }
     },
     "node_modules/@tailwindcss/node/node_modules/jiti": {
@@ -8230,51 +7400,38 @@
       }
     },
     "node_modules/@tailwindcss/node/node_modules/tailwindcss": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.1.tgz",
-      "integrity": "sha512-hk+TB1m+K8CYNrP6rjQaq/Y+4Zylwpa87mLYBKCunwnnQ9p+fHb7kmSfGqyEJoxF/O6CDyABWVFEafNSYKll+Q==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.3.tgz",
+      "integrity": "sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==",
       "license": "MIT"
     },
-    "node_modules/@tailwindcss/node/node_modules/tapable": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
-      "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.3.1.tgz",
-      "integrity": "sha512-yVPyo8RNkabVr3O2EhHEE0Rewu7YKzc1DhIqfL46LKveFrmu9XbDazNOJY7/GRuvw1h6u3utWnR29H/p5JPlgA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.3.3.tgz",
+      "integrity": "sha512-krXjAikiaFSPaK/FkAQT5UTx3VormQaiZ5hBFlJZ9UFQGB/rwg1MZIhHAG9smMQRTdyJxP6Qt5MwMtdyU5FWrA==",
       "license": "MIT",
       "engines": {
         "node": ">= 20"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.3.1",
-        "@tailwindcss/oxide-darwin-arm64": "4.3.1",
-        "@tailwindcss/oxide-darwin-x64": "4.3.1",
-        "@tailwindcss/oxide-freebsd-x64": "4.3.1",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.1",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.3.1",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.3.1",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.3.1",
-        "@tailwindcss/oxide-linux-x64-musl": "4.3.1",
-        "@tailwindcss/oxide-wasm32-wasi": "4.3.1",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.3.1",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.3.1"
+        "@tailwindcss/oxide-android-arm64": "4.3.3",
+        "@tailwindcss/oxide-darwin-arm64": "4.3.3",
+        "@tailwindcss/oxide-darwin-x64": "4.3.3",
+        "@tailwindcss/oxide-freebsd-x64": "4.3.3",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.3",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.3.3",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.3.3",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.3.3",
+        "@tailwindcss/oxide-linux-x64-musl": "4.3.3",
+        "@tailwindcss/oxide-wasm32-wasi": "4.3.3",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.3.3",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.3.3"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.3.1.tgz",
-      "integrity": "sha512-SVlyf61g374l5cHyg8x9kf5xmLcOaxvOTsbsqDnSsDJaKOEFZ7GCvi84VAVGpxojYOs1+3K6M0UjXfqPU8vmOQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.3.3.tgz",
+      "integrity": "sha512-Y85A2gmPSkl5Ve5qR86GL4HT509cFqQh1aes9p3sSkyTPwt0Pppf3GkwGe4JPACcRYjgJIEhQgM6dBClnr0NYw==",
       "cpu": [
         "arm64"
       ],
@@ -8288,9 +7445,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.3.1.tgz",
-      "integrity": "sha512-hVnWLwv+e/l7c4WKyVtHVrIPvYdqWHjRB3MDIqARynzFtnQg85kmQEFCbV9Ja0VVx4xXTIiDWY60Y7iz/iNoDA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.3.3.tgz",
+      "integrity": "sha512-BiaWatpBcERQFDlOjRDpIVXuFK5PJez5SA4JMg6VYZdBYU+qKfV/vqjcIs+IYmtitf1xYQZTwXvU/8y4lfZUGw==",
       "cpu": [
         "arm64"
       ],
@@ -8304,9 +7461,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.3.1.tgz",
-      "integrity": "sha512-Cf7abu0WVgbhU7ANgPUnSAvm7nCvMweusHb8FnaHlLfv/Caq4GYaEZg7ZImzzmjx4lIAfuS8q+eLIS7A7IzxIg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.3.3.tgz",
+      "integrity": "sha512-fAeUqfV5ndhxRwai8cXGzdLvul9utWOmeTkv69unv4ZXixjn61Z+p9lCWdwOwA3TYboG3BwdVuN/RDjhBRl0mw==",
       "cpu": [
         "x64"
       ],
@@ -8320,9 +7477,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.3.1.tgz",
-      "integrity": "sha512-ZZqzX2Y+GXtXXfqSfpJhDm60OoZfvLHLCgm+J7NVqgHHJjG/m9ugZI77RwTsVd4fnBJuCFP6Ae6kTJb71UdS8g==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.3.3.tgz",
+      "integrity": "sha512-iyf5bV6+wnAlflVeEy7R25dupxTNECZN5QMI0qNT6eT+EgaGdZcKhGkr5SdoaWiLJ3spLqIY9VCeSGrwmtg4kw==",
       "cpu": [
         "x64"
       ],
@@ -8336,9 +7493,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.3.1.tgz",
-      "integrity": "sha512-/Ah/xik0LaMYfv9DZ0S/t4pBlBNYOcqtRwusjgovHkvT8ixueWCLyJjsaF5kQIckjb4IT8Q6K6p/iPmZMixYgg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.3.3.tgz",
+      "integrity": "sha512-aAYUprJAJQWWbRrPvtjdroZ56Md+JM8pMiopS6xGEwDfLhqj+2ver2p4nU4Mb3CRqcMmNBjo8KkUgcxhkzVQGQ==",
       "cpu": [
         "arm"
       ],
@@ -8352,12 +7509,15 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.3.1.tgz",
-      "integrity": "sha512-gqdFoVJlw444GvpnheZLHmvTzSxI/cOUUh2KSNejQjTcYkW062SVD+En0rUgD+QV91bz1XGIGtt1HJd48xUGbQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.3.3.tgz",
+      "integrity": "sha512-nDxldcEENOxZRzC2uu9jrutZdAAQtb+8WWDCSnWL1zvBk1+FN+x6MtDViPB5AJMfttVCUhehGWus3XBPgatM/w==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -8368,12 +7528,15 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.3.1.tgz",
-      "integrity": "sha512-Bwv9KwOvE0VKa86xPFif9b9c3Y1NxOV1P0gLti/IYaWEsQYZXDlxfGEtA8mdDZ7SG3wyNXAWYT5SIn3giL57oA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.3.3.tgz",
+      "integrity": "sha512-Md44bD6veX/PC5iyF8cDVnw4HBIANZepRZZ7a8DQOvkfo5WUBwcp6iAuCUz23u+4SUkhJlD3eL7hNdW8ezd/kA==",
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -8384,12 +7547,15 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.3.1.tgz",
-      "integrity": "sha512-Ymi8O8T15HYQdOUWUtTI6ldN0neHP85FC+Qz32xTcZ7iJXtem/x8ITev0o1e9e5rkqj4lONZfTRLvkmin1+tKg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.3.3.tgz",
+      "integrity": "sha512-tx7us1muwOKAKWao2v/GaafFeQboE6aj88vC6ziN2NCGcRm8gWUhwjzg+YdVB1e4boAtdtma4L43onunI6NS4w==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -8400,12 +7566,15 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.3.1.tgz",
-      "integrity": "sha512-M+P/91qJ6uILLw4k2G93GMDRAXj61SMvFQYt39AqvUqYgExXpLL5aepfns7sj4HiAQeolirQF9E0lzRvdf4zPQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.3.3.tgz",
+      "integrity": "sha512-SJxX60smvHgasZoBy11dX6YRjXJFovwWBoedhbQPOBzgFWBHGB+TVPWB9BxzR7TTxU8FQZAI2AyiNCMzFm8Img==",
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -8416,9 +7585,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-wasm32-wasi": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.3.1.tgz",
-      "integrity": "sha512-zsM8uOeqvVGHsAXsJxsT28ttosFahLJKCLOTUBqRAtKnVgGSRitds9T432QiT8b77Yga7JIBkulIRRlJPtYhRA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.3.3.tgz",
+      "integrity": "sha512-jx1+rPhY/5Ympkktd656HBWEBLxP7dH06losBLjjf5vgCODXvi9KhtftWcMIwTFIDqBr7cRnQkdLnAG+IOlGvQ==",
       "bundleDependencies": [
         "@napi-rs/wasm-runtime",
         "@emnapi/core",
@@ -8433,9 +7602,9 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.10.0",
-        "@emnapi/runtime": "^1.10.0",
-        "@emnapi/wasi-threads": "^1.2.1",
+        "@emnapi/core": "^1.11.1",
+        "@emnapi/runtime": "^1.11.1",
+        "@emnapi/wasi-threads": "^1.2.2",
         "@napi-rs/wasm-runtime": "^1.1.4",
         "@tybys/wasm-util": "^0.10.2",
         "tslib": "^2.8.1"
@@ -8445,9 +7614,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.1.tgz",
-      "integrity": "sha512-aiNvSq9BsVk8V513lDKlrCFAgf8qBMPZTpgEhInL+NwQqs97mYmupVMrPrgBBSL8Pv/0zXu9MrMF9rMun1ZeNg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.3.tgz",
+      "integrity": "sha512-3rc292Ca2ceK6Ulcc/bAVnTs/3nDtoPhyEKlgPv+yQJQi/JS/AMJlqzxvlDacL1nekbrcf6bTqp/jV4qgnPxNQ==",
       "cpu": [
         "arm64"
       ],
@@ -8461,9 +7630,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.3.1.tgz",
-      "integrity": "sha512-xDEyu1rg290472FEGaKHnzyDyh5QH+AlWvsU5hMoMtPpzmKlRI0jaYKCgSHDYtaQWZOYbMaduSyCwFwY4n1HmA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.3.3.tgz",
+      "integrity": "sha512-yJ0pwIVc/nYeGoV02WtsN8KYyLQv7kyI2wDnkezyJlGGjkd4QLwDGAwl47YpPJeuI0M0ObaXGSPjvWDPeTPggw==",
       "cpu": [
         "x64"
       ],
@@ -8477,23 +7646,23 @@
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.3.1.tgz",
-      "integrity": "sha512-hItDHuIIlEV61R+faXu66s1K36aTurO/Qw0e45Vskz57gXl9pWOT6eg3zmcEui6CZXddbN7zd41bwmvag4JGwQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.3.3.tgz",
+      "integrity": "sha512-yYU8cogLeSh/ms2jh8Fj7jaba/EWa7Ja6GoUqYZaraEuCI5YS6ms6ObZgjjedm+jm6XZjdNRWBpPP6Z86oOxcw==",
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.3.1",
-        "@tailwindcss/oxide": "4.3.1",
-        "tailwindcss": "4.3.1"
+        "@tailwindcss/node": "4.3.3",
+        "@tailwindcss/oxide": "4.3.3",
+        "tailwindcss": "4.3.3"
       },
       "peerDependencies": {
         "vite": "^5.2.0 || ^6 || ^7 || ^8"
       }
     },
     "node_modules/@tailwindcss/vite/node_modules/tailwindcss": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.1.tgz",
-      "integrity": "sha512-hk+TB1m+K8CYNrP6rjQaq/Y+4Zylwpa87mLYBKCunwnnQ9p+fHb7kmSfGqyEJoxF/O6CDyABWVFEafNSYKll+Q==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.3.tgz",
+      "integrity": "sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==",
       "license": "MIT"
     },
     "node_modules/@tanstack/match-sorter-utils": {
@@ -8513,9 +7682,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.100.14",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.100.14.tgz",
-      "integrity": "sha512-5X41dGpxgeaHISCRW2oYwcSycZeULZzAunaudXT9ov1KOTj9xwt0CH6hbwqP1/z74ZWF7rYFnDpyYH07XFcZew==",
+      "version": "5.101.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.101.4.tgz",
+      "integrity": "sha512-gNwcvOJcRbLWPOLG/2OBm+zM+Yv+MKsXKEOWC57USuZDEsI71hEErQsiEGx5wX9rzWWkfwM0fVSPoiIFSsxfiw==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8523,9 +7692,9 @@
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.100.14",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.100.14.tgz",
-      "integrity": "sha512-g96SmSSQecYTYcyuAMRXr895GplJv01UGt7qttQWPOUyZ5EGz5tbRc589bMc2m5BsPFD6O0PCEAHdbDYNP6UBw==",
+      "version": "5.101.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.101.4.tgz",
+      "integrity": "sha512-z5IPHnDX3aUWeTWlRKLyooBQekaCAw4xRpZqPQ390RiWTDBcTynjpPT221BArw0u2+pnQMdGvPQI9YNNubBcmA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -8533,12 +7702,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.100.14",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.100.14.tgz",
-      "integrity": "sha512-oOr6aRdSFEwWhzxEkD/9ZcItM3+LjBSkeVmadWKwUssAHTsqd/7bOjWrX4AbvEkoEhgAxzN0Xk6H/aYzXiYBAw==",
+      "version": "5.101.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.101.4.tgz",
+      "integrity": "sha512-yRg2pfOCxIs4ZJW3XYYHU/WgtD04FHSnfHlpRT7h7pR77hwkdRG4wxbKe4aq6P0RvXUTBSQpQeadS1SUYUe+KA==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.100.14"
+        "@tanstack/query-core": "5.101.4"
       },
       "funding": {
         "type": "github",
@@ -8549,19 +7718,19 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.100.14",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.100.14.tgz",
-      "integrity": "sha512-JkP5VDgKOw3t/QSA1OABRHEqx8BuNs5MfvZRooNqdvN57SzTuGq3fKR1a2IH5rqa5HDLUm+FOXUEnB9ueHiLzg==",
+      "version": "5.101.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.101.4.tgz",
+      "integrity": "sha512-VeK2gtmfj7kvRBjtxS7TKxt/6qKhn8VzabY4UiYMr7NV9CddjSRYRgeYyld+NpjAkgMV9dd+2Qdr8ah5I03NeA==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-devtools": "5.100.14"
+        "@tanstack/query-devtools": "5.101.4"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.100.14",
+        "@tanstack/react-query": "^5.101.4",
         "react": "^18 || ^19"
       }
     },
@@ -8859,6 +8028,138 @@
         "react": "^18.x || ^19.x"
       }
     },
+    "node_modules/@tria-plc/iamui/node_modules/@mui/x-date-pickers": {
+      "version": "6.20.2",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-6.20.2.tgz",
+      "integrity": "sha512-x1jLg8R+WhvkmUETRfX2wC+xJreMii78EXKLl6r3G+ggcAZlPyt0myID1Amf6hvJb9CtR7CgUo8BwR+1Vx9Ggw==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.23.2",
+        "@mui/base": "^5.0.0-beta.22",
+        "@mui/utils": "^5.14.16",
+        "@types/react-transition-group": "^4.4.8",
+        "clsx": "^2.0.0",
+        "prop-types": "^15.8.1",
+        "react-transition-group": "^4.4.5"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui"
+      },
+      "peerDependencies": {
+        "@emotion/react": "^11.9.0",
+        "@emotion/styled": "^11.8.1",
+        "@mui/material": "^5.8.6",
+        "@mui/system": "^5.8.0",
+        "date-fns": "^2.25.0 || ^3.2.0",
+        "date-fns-jalali": "^2.13.0-0",
+        "dayjs": "^1.10.7",
+        "luxon": "^3.0.2",
+        "moment": "^2.29.4",
+        "moment-hijri": "^2.1.2",
+        "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0 || ^0.10.0",
+        "react": "^17.0.0 || ^18.0.0",
+        "react-dom": "^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@emotion/react": {
+          "optional": true
+        },
+        "@emotion/styled": {
+          "optional": true
+        },
+        "date-fns": {
+          "optional": true
+        },
+        "date-fns-jalali": {
+          "optional": true
+        },
+        "dayjs": {
+          "optional": true
+        },
+        "luxon": {
+          "optional": true
+        },
+        "moment": {
+          "optional": true
+        },
+        "moment-hijri": {
+          "optional": true
+        },
+        "moment-jalaali": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@tria-plc/iamui/node_modules/@mui/x-date-pickers/node_modules/@mui/base": {
+      "version": "5.0.0-dev.20240529-082515-213b5e33ab",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-dev.20240529-082515-213b5e33ab.tgz",
+      "integrity": "sha512-3ic6fc6BHstgM+MGqJEVx3zt9g5THxVXm3VVFUfdeplPqAWWgW2QoKfZDLT10s+pi+MAkpgEBP0kgRidf81Rsw==",
+      "deprecated": "This package has been replaced by @base-ui/react",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.24.6",
+        "@floating-ui/react-dom": "^2.0.8",
+        "@mui/types": "^7.2.14-dev.20240529-082515-213b5e33ab",
+        "@mui/utils": "^6.0.0-dev.20240529-082515-213b5e33ab",
+        "@popperjs/core": "^2.11.8",
+        "clsx": "^2.1.1",
+        "prop-types": "^15.8.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "@types/react": "^17.0.0 || ^18.0.0",
+        "react": "^17.0.0 || ^18.0.0",
+        "react-dom": "^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@tria-plc/iamui/node_modules/@mui/x-date-pickers/node_modules/@mui/base/node_modules/@mui/utils": {
+      "version": "6.4.9",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.4.9.tgz",
+      "integrity": "sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/runtime": "^7.26.0",
+        "@mui/types": "~7.2.24",
+        "@types/prop-types": "^15.7.14",
+        "clsx": "^2.1.1",
+        "prop-types": "^15.8.1",
+        "react-is": "^19.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@tria-plc/iamui/node_modules/@tanstack/table-core": {
       "version": "8.20.5",
       "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz",
@@ -8873,9 +8174,9 @@
       }
     },
     "node_modules/@tria-plc/iamui/node_modules/@types/node": {
-      "version": "24.13.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.2.tgz",
-      "integrity": "sha512-fRa09kZTgu8o71KFcDjUFuc7F+dEbZYZmkI0mg5YBTRs0yMKjYHsq/c0urDKeDb+D5qVgXOdFcuu+DZPKOITwA==",
+      "version": "24.13.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.3.tgz",
+      "integrity": "sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.18.0"
@@ -8939,17 +8240,20 @@
         "react-dom": ">=16.8"
       }
     },
-    "node_modules/@tria-plc/iamui/node_modules/react-css-nocode-editor": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/react-css-nocode-editor/-/react-css-nocode-editor-1.0.13.tgz",
-      "integrity": "sha512-RV1ZbG8aXORiQ5mDKZbKCHStCJPamp/n5Rb34q22Ug2xzMDW4DjjqO23+Qo/Y+LAoyyrFV/+lI1qq4+/O5nf2A==",
-      "license": "GPL-3.0",
-      "dependencies": {
-        "styled-components": "^5.3.5"
-      },
+    "node_modules/@tria-plc/iamui/node_modules/mui-ethiopian-datepicker": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/mui-ethiopian-datepicker/-/mui-ethiopian-datepicker-0.3.2.tgz",
+      "integrity": "sha512-I8TZ8lvloAxhFNl8tDl7NmgT7RPJslfnArNMpT2Sd9GbpfsdRrOwH/JBMcOhLQyaNUee9due0W6J85io1WLjlg==",
+      "license": "ISC",
       "peerDependencies": {
-        "react": ">=16.8.0 <= 18.1",
-        "react-dom": ">=16.8.0 <= 18.1"
+        "@emotion/react": "^11.11.0",
+        "@emotion/styled": "^11.11.0",
+        "@mui/icons-material": "^5.11.16",
+        "@mui/material": "^5.13.3",
+        "@mui/x-date-pickers": "^6.7.0",
+        "date-fns": "^2.30.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
     "node_modules/@tria-plc/iamui/node_modules/react-day-picker": {
@@ -8967,9 +8271,9 @@
       }
     },
     "node_modules/@tria-plc/iamui/node_modules/tailwindcss": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.1.tgz",
-      "integrity": "sha512-hk+TB1m+K8CYNrP6rjQaq/Y+4Zylwpa87mLYBKCunwnnQ9p+fHb7kmSfGqyEJoxF/O6CDyABWVFEafNSYKll+Q==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.3.tgz",
+      "integrity": "sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ==",
       "license": "MIT"
     },
     "node_modules/@tria-plc/iamui/node_modules/undici-types": {
@@ -8988,9 +8292,9 @@
       }
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
-      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
+      "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -9123,6 +8427,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/diacritics": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@types/diacritics/-/diacritics-1.3.3.tgz",
+      "integrity": "sha512-wt0tBItmBsOUVZ8+MCrkBMoVfH/EUZeTXwYSekVVYilZlGDYssREUR+sX72mHvl2IrbdCKgpYARXKh3awD2how==",
+      "license": "MIT"
+    },
     "node_modules/@types/dompurify": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-3.0.5.tgz",
@@ -9146,7 +8456,6 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
       "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/hoist-non-react-statics": {
@@ -9172,13 +8481,17 @@
       }
     },
     "node_modules/@types/jquery": {
-      "version": "3.5.34",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.34.tgz",
-      "integrity": "sha512-3m3939S3erqmTLJANS/uy0B6V7BorKx7RorcGZVjZ62dF5PAGbKEDZK1CuLtKombJkFA2T1jl8LAIIs7IV6gBQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-4.0.1.tgz",
+      "integrity": "sha512-9a59A/tycXgYuPABcp6/3spSShn0NT2UOM4EfHvMumjYi4lJWTsK5SZWjhx3yRm9IHGCeWXdV2YfNsrWrft/CA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/js-cookie": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.6.tgz",
+      "integrity": "sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
@@ -9188,9 +8501,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.19.19",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.19.tgz",
-      "integrity": "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==",
+      "version": "22.20.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz",
+      "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -9224,18 +8537,18 @@
       "optional": true
     },
     "node_modules/@types/react": {
-      "version": "19.2.15",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.15.tgz",
-      "integrity": "sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q==",
+      "version": "19.2.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.18.tgz",
+      "integrity": "sha512-AnzbBERsrLKtk2XSfTbYRLjQPdy116Sty4q+T+Bp3IC4l6jNBvreVPAHmpq9qhXQM7CXZPjLVmGMw9sy+hxQ3w==",
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.2.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-Bsc+QHgp+P/F02XDzNCY9jnZNCUuLki36KT7VKrTXXLdHf+vHMNZnW1rVu5DNW/rCK+fya3DATySbLM4yhtKUw==",
       "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
@@ -9259,25 +8572,12 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/semver": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
-      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/signature_pad": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/@types/signature_pad/-/signature_pad-2.3.6.tgz",
       "integrity": "sha512-v3j92gCQJoxomHhd+yaG4Vsf8tRS/XbzWKqDv85UsqjMGy4zhokuwKe4b6vhbgncKkh+thF+gpz6+fypTtnFqQ==",
       "license": "MIT"
     },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
-      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
-      "license": "MIT"
-    },
     "node_modules/@types/tinymce": {
       "version": "4.6.9",
       "resolved": "https://registry.npmjs.org/@types/tinymce/-/tinymce-4.6.9.tgz",
@@ -9300,17 +8600,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz",
-      "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.65.0.tgz",
+      "integrity": "sha512-IEgob78X12rHpUmtcwFsXhZdVGJtwTVP8FiCLZkR6GlYVrl2PcuB+KhCE5BlVC/eQpQnu8WXRtkHZuPar+gCRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/type-utils": "8.62.0",
-        "@typescript-eslint/utils": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/scope-manager": "8.65.0",
+        "@typescript-eslint/type-utils": "8.65.0",
+        "@typescript-eslint/utils": "8.65.0",
+        "@typescript-eslint/visitor-keys": "8.65.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.5.0"
@@ -9323,22 +8623,22 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.62.0",
+        "@typescript-eslint/parser": "^8.65.0",
         "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "typescript": ">=4.8.4 <6.1.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz",
-      "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.65.0.tgz",
+      "integrity": "sha512-CZ4nMxWwgu1HEEFNkeaCptra9QCtkmKdgf3sWh1rl1trIhmxLilgTV4cwcbQ4wemnT4sWQN8CaKOmdYx+g2gMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/scope-manager": "8.65.0",
+        "@typescript-eslint/types": "8.65.0",
+        "@typescript-eslint/typescript-estree": "8.65.0",
+        "@typescript-eslint/visitor-keys": "8.65.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -9354,14 +8654,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz",
-      "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.65.0.tgz",
+      "integrity": "sha512-SxnPhbTsGahizDgbu7oqFH/xVtzIqMd/s+WtnSxNxJZJpLbdT5IPdzg8EZxO3+PoKahXmwJLeNQOpKJb3/bi7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.62.0",
-        "@typescript-eslint/types": "^8.62.0",
+        "@typescript-eslint/tsconfig-utils": "^8.65.0",
+        "@typescript-eslint/types": "^8.65.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -9376,14 +8676,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz",
-      "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.65.0.tgz",
+      "integrity": "sha512-Esbl8OSYiVxBokYgWPf7VVWg/BE798wXhimnn9ML9Pt5qoDf8bfQlgjlKXR/k98+AcNzlLKYrpCcrcuZ9DZLgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0"
+        "@typescript-eslint/types": "8.65.0",
+        "@typescript-eslint/visitor-keys": "8.65.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9394,9 +8694,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz",
-      "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.65.0.tgz",
+      "integrity": "sha512-j6GzGqCiRdA7Qhur2VVmKZAkBLfnHFQfx4TaJGL9RMveZqCo48jSHHO0DTgizEnGhtWnqmbtCUSrqSkdiY/0Hg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9411,15 +8711,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz",
-      "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.65.0.tgz",
+      "integrity": "sha512-YjaZ7PRI5qY7ax2L3PbvX0rRyGtipAReCWs0mhhDBHjH/vl0g0BonaGXrKdKpMbIIsMIwDgbk/xzkBTyAltS5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0",
-        "@typescript-eslint/utils": "8.62.0",
+        "@typescript-eslint/types": "8.65.0",
+        "@typescript-eslint/typescript-estree": "8.65.0",
+        "@typescript-eslint/utils": "8.65.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.5.0"
       },
@@ -9436,9 +8736,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
-      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.65.0.tgz",
+      "integrity": "sha512-JSSwWNy+H0E/01jJEM+hrX6N0OFDzFzeIhHFSAS01tlVaevpG8cFyYRPhS5yjGOvBUx3sqQHVMjCL1CAZZMxBg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9450,16 +8750,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz",
-      "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.65.0.tgz",
+      "integrity": "sha512-JboAE2swaYt4tb1fHhHTABE2K+OLy09XfcTbhnk4Pw96f9dd2e9iYsJ28gBggHlo5z5x1rkyWvcPoTuNTd4oGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.62.0",
-        "@typescript-eslint/tsconfig-utils": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/project-service": "8.65.0",
+        "@typescript-eslint/tsconfig-utils": "8.65.0",
+        "@typescript-eslint/types": "8.65.0",
+        "@typescript-eslint/visitor-keys": "8.65.0",
         "debug": "^4.4.3",
         "minimatch": "^10.2.2",
         "semver": "^7.7.3",
@@ -9478,16 +8778,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz",
-      "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.65.0.tgz",
+      "integrity": "sha512-gXiwIHsYreboxeJucHKPvgwl7dXt50mF8s1/c00cP/WoVTyWKFdtfhRWwZiXYFU5H2O8vVoSLNrexFZjYS/SGA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0"
+        "@typescript-eslint/scope-manager": "8.65.0",
+        "@typescript-eslint/types": "8.65.0",
+        "@typescript-eslint/typescript-estree": "8.65.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -9502,13 +8802,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz",
-      "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==",
+      "version": "8.65.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.65.0.tgz",
+      "integrity": "sha512-8C71BQkGjiMmXtop7pHVJu1l2NNShFdkCyD6a2ezzs5vU/L3LRtb69EtcteFwz0mYMPzIgOw0n6OV4VBUWZd7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/types": "8.65.0",
         "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
@@ -9554,16 +8854,16 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.7.tgz",
-      "integrity": "sha512-1R+tw0ortHEbZDGMymm+pN7/AFQ/RkFFdtd7EN+VBpynKmLbP8A3rpEXdshBJ7+8hQ9zBJh/i1s0yKNtxAnU7w==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.10.tgz",
+      "integrity": "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "4.1.7",
-        "@vitest/utils": "4.1.7",
+        "@vitest/spy": "4.1.10",
+        "@vitest/utils": "4.1.10",
         "chai": "^6.2.2",
         "tinyrainbow": "^3.1.0"
       },
@@ -9572,13 +8872,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.7.tgz",
-      "integrity": "sha512-vY7nuamKgfvpA1Koa3oYIw/k7D6kZnpGyNMZW8loow2bsBYla1TFdqTaXncWdRn4pgwNs+90RhnXhJScDwQeJA==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.10.tgz",
+      "integrity": "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "4.1.7",
+        "@vitest/spy": "4.1.10",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.21"
       },
@@ -9609,9 +8909,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.7.tgz",
-      "integrity": "sha512-umgCarTOYQWIaDMvGDRZij+6b9oVeLIyJzfN+AS88e0ZOU3QTgNNSTtjQOpcvWr3np1N0j4WgZj+sb3oYBDscw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.10.tgz",
+      "integrity": "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9622,13 +8922,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.7.tgz",
-      "integrity": "sha512-BapjmAQ2aI78WdMEfeUWivnfVzB+VPGwWRQcJE0OUq7qEeEcBsCSf+0T5iREBNE5nBb4wA5Ya0W6IA+sghdEFw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.10.tgz",
+      "integrity": "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "4.1.7",
+        "@vitest/utils": "4.1.10",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -9636,14 +8936,14 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.7.tgz",
-      "integrity": "sha512-ZacLzja+TmJeZ1h14xW2FB/WpeimUD3haBXQPyJqxvo8jQTmfeA8zv58mtjN2C7EHXZDYVcVYdYmAxjkWVvKCw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.10.tgz",
+      "integrity": "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.7",
-        "@vitest/utils": "4.1.7",
+        "@vitest/pretty-format": "4.1.10",
+        "@vitest/utils": "4.1.10",
         "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
@@ -9652,9 +8952,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.7.tgz",
-      "integrity": "sha512-kbkI5LMWakyuTIvs6fUJ5qdIVb1XVKsYJAT4OJ938cHMROYMSfmoQdZy0aaAnjbbc8F61vkoTqz/Az+/HiIu5Q==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.10.tgz",
+      "integrity": "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9662,13 +8962,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.7.tgz",
-      "integrity": "sha512-T532WBu791cBxJlCl6SO+J14l81DQx6uQHm1bQbmCDY7nqlEIgkza/UFnSBNaUtSf41unldDFjdOBYEQC4b5Hw==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.10.tgz",
+      "integrity": "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "4.1.7",
+        "@vitest/pretty-format": "4.1.10",
         "convert-source-map": "^2.0.0",
         "tinyrainbow": "^3.1.0"
       },
@@ -9865,44 +9165,6 @@
       "dev": true,
       "license": "BSD-2-Clause"
     },
-    "node_modules/@yarnpkg/parsers": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz",
-      "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "js-yaml": "^3.10.0",
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": ">=18.12.0"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/@zkochan/js-yaml": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz",
@@ -9957,9 +9219,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
-      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
+      "integrity": "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ==",
       "devOptional": true,
       "license": "MIT",
       "bin": {
@@ -9969,19 +9231,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-phases": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
-      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "peerDependencies": {
-        "acorn": "^8.14.0"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -10012,13 +9261,13 @@
       }
     },
     "node_modules/adm-zip": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
-      "integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.0.tgz",
+      "integrity": "sha512-XleryMhbuksdKtofnWZ9Sk+4CUTbms4Mb/EU32SZwToAyZ5RgVos/ki8n+yr0LWHOGKuakbXTuuYNHLQjhddgg==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6.0"
+        "node": ">=14.0"
       }
     },
     "node_modules/agent-base": {
@@ -10026,8 +9275,6 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "debug": "4"
       },
@@ -10039,7 +9286,7 @@
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz",
       "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -10056,7 +9303,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
@@ -10239,9 +9486,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz",
-      "integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==",
+      "version": "10.5.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.4.tgz",
+      "integrity": "sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==",
       "dev": true,
       "funding": [
         {
@@ -10259,8 +9506,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.28.2",
-        "caniuse-lite": "^1.0.30001787",
+        "browserslist": "^4.28.6",
+        "caniuse-lite": "^1.0.30001806",
         "fraction.js": "^5.3.4",
         "picocolors": "^1.1.1",
         "postcss-value-parser": "^4.2.0"
@@ -10276,13 +9523,14 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
-      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
+      "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.16.0",
-        "form-data": "^4.0.5",
+        "form-data": "^4.0.6",
+        "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^2.1.0"
       }
     },
@@ -10459,9 +9707,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.32",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.32.tgz",
-      "integrity": "sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==",
+      "version": "2.11.11",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.11.tgz",
+      "integrity": "sha512-/yImnXwyTvgMkhgekLHok/Rx5vO6E0BmStWlSqKWMVm2a2ITuZ1Tn+9bgLS+gZRdZmWtd8nxuhHpdmCUOWsTQQ==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.cjs"
@@ -10524,9 +9772,9 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.5",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.5.tgz",
-      "integrity": "sha512-3grm+/2tUOvu2cjJkvsIxrv/wVpfXQW4PsQHYm7yk4vfpu7Ekl6nEsYBoJUL6qDwZUx8wUhQ8tR2qz+ad9c9OA==",
+      "version": "1.20.6",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.6.tgz",
+      "integrity": "sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10585,16 +9833,16 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
+      "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^4.0.2"
       },
       "engines": {
-        "node": "18 || 20 || >=22"
+        "node": "20 || >=22"
       }
     },
     "node_modules/braces": {
@@ -10628,9 +9876,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.28.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
-      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
+      "version": "4.28.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
+      "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==",
       "funding": [
         {
           "type": "opencollective",
@@ -10647,10 +9895,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.10.12",
-        "caniuse-lite": "^1.0.30001782",
-        "electron-to-chromium": "^1.5.328",
-        "node-releases": "^2.0.36",
+        "baseline-browser-mapping": "^2.10.44",
+        "caniuse-lite": "^1.0.30001806",
+        "electron-to-chromium": "^1.5.393",
+        "node-releases": "^2.0.51",
         "update-browserslist-db": "^1.2.3"
       },
       "bin": {
@@ -10787,9 +10035,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001793",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz",
-      "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==",
+      "version": "1.0.30001806",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz",
+      "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==",
       "funding": [
         {
           "type": "opencollective",
@@ -10994,10 +10242,9 @@
       }
     },
     "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "dev": true,
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
       "license": "MIT",
       "engines": {
         "node": ">=0.8"
@@ -11070,9 +10317,9 @@
       }
     },
     "node_modules/color-string/node_modules/color-name": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
-      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.1.tgz",
+      "integrity": "sha512-p2FdgwVx1a9yWBHP2wI0VgShkDpgN4kZISkxdNipGBJWpa5G6b04OINlVWCyJj0JmfvcPrgqt95E9k8yvaOJFg==",
       "license": "MIT",
       "engines": {
         "node": ">=12.20"
@@ -11283,6 +10530,12 @@
         }
       }
     },
+    "node_modules/country-flag-icons": {
+      "version": "1.6.20",
+      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.6.20.tgz",
+      "integrity": "sha512-py8JiEKzjhYw6HPJ0L7SxLgCYim36UPRTZX43/kqGueUCZLSvnrqAiwW8HtQibur7mdkFQUkjOgdK+o/9FBtaw==",
+      "license": "MIT"
+    },
     "node_modules/crc-32": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
@@ -11295,19 +10548,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/cron-parser": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",
-      "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "luxon": "^3.2.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -11369,17 +10609,25 @@
       }
     },
     "node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dev": true,
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/css-what": {
@@ -11570,9 +10818,9 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.3.0.tgz",
-      "integrity": "sha512-OYcL+3N/jyWbYdFGqoMAhytDgxP9pbYPUUiRCOgn4Fewaadk9l/Wam4Avciiyp2BgkpfQyBV9B+ehnVJych+eQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.4.0.tgz",
+      "integrity": "sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -11680,6 +10928,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/defaults/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -11775,6 +11033,12 @@
       "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
       "license": "MIT"
     },
+    "node_modules/diacritics": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
+      "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==",
+      "license": "MIT"
+    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -11839,9 +11103,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.7.tgz",
-      "integrity": "sha512-2jBxDJY4RR06tQNy4w5FlFH7kfxsQZlufd0sbv+chfHCxeJwrFw2baUDsSwvBISD4K4RDbd0PTfy3uNXsR6siA==",
+      "version": "3.4.12",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.12.tgz",
+      "integrity": "sha512-zQvGet8Z2sWbQhCmfFz/T5QWH2oBmjnqK3qvOjaqaNLrLEF912WamU+ohnTp0TCep/MFVHpdJuCZEdFOdTnEFg==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -11936,9 +11200,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.364",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.364.tgz",
-      "integrity": "sha512-G/dYE3+AYhyHwzTwg8UbnXf7zqMERYh7l2jJ3QujhFsH8agSYwtnGAR2aZ7f0AakIKJXd5En/Hre4igIUrdlYw==",
+      "version": "1.5.399",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.399.tgz",
+      "integrity": "sha512-lEcqhErbHjXRvd41rnWLpzbyU/IXfIYo7QwaFWmxGeLiLyY2TBCdHnWY88vB+p3ubnihRypDm66panXl7TylLA==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -11968,7 +11232,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "iconv-lite": "^0.6.2"
@@ -11985,39 +11249,18 @@
       }
     },
     "node_modules/engine.io-client": {
-      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.5.tgz",
-      "integrity": "sha512-QCwxUDULPlXv8F6tqMMKx5dNkTe6OaBYRMPYeXKBlyOoKvAmE0ac6pW7fFhSscJ/5SI7666/U/B+MElbsrJlIg==",
+      "version": "6.6.6",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.6.tgz",
+      "integrity": "sha512-iY6QdftLQ9pyiPoX082bpf/u1UewnOaJrtJIF9T0++QB34lZrj0uP+Q/bj8AlUsAxqhnkTV2BS8SBZSxOmoV5Q==",
       "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.4.1",
         "engine.io-parser": "~5.2.1",
-        "ws": "~8.20.1",
+        "ws": "~8.21.0",
         "xmlhttprequest-ssl": "~2.1.1"
       }
     },
-    "node_modules/engine.io-client/node_modules/ws": {
-      "version": "8.20.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
-      "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/engine.io-parser": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
@@ -12028,10 +11271,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.22.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.22.1.tgz",
-      "integrity": "sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww==",
-      "dev": true,
+      "version": "5.24.5",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.5.tgz",
+      "integrity": "sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -12045,7 +11287,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz",
       "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -12108,16 +11349,16 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz",
+      "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz",
+      "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -12142,19 +11383,20 @@
       }
     },
     "node_modules/es-toolkit": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.47.0.tgz",
-      "integrity": "sha512-n1GuoD0WEQZMBk5tttoZSqwgyLx01oqa5XsBmCHwPyNe1S9jPBEmtR2pSgp2kJuWE3ciFZ6yRHmY4pM4C3OOkw==",
+      "version": "1.50.0",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.50.0.tgz",
+      "integrity": "sha512-OyZKhUVvEep9ITEiwHn8GKnMRQIVqoSIX7WnRbkWgJkllCujilqP2rD0u979tkl8wqyc8ICwlc1UBVv/Sl1G6w==",
       "license": "MIT",
       "workspaces": [
         "docs",
-        "benchmarks"
+        "benchmarks",
+        "tests/types"
       ]
     },
     "node_modules/esbuild": {
-      "version": "0.27.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
-      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -12164,32 +11406,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.7",
-        "@esbuild/android-arm": "0.27.7",
-        "@esbuild/android-arm64": "0.27.7",
-        "@esbuild/android-x64": "0.27.7",
-        "@esbuild/darwin-arm64": "0.27.7",
-        "@esbuild/darwin-x64": "0.27.7",
-        "@esbuild/freebsd-arm64": "0.27.7",
-        "@esbuild/freebsd-x64": "0.27.7",
-        "@esbuild/linux-arm": "0.27.7",
-        "@esbuild/linux-arm64": "0.27.7",
-        "@esbuild/linux-ia32": "0.27.7",
-        "@esbuild/linux-loong64": "0.27.7",
-        "@esbuild/linux-mips64el": "0.27.7",
-        "@esbuild/linux-ppc64": "0.27.7",
-        "@esbuild/linux-riscv64": "0.27.7",
-        "@esbuild/linux-s390x": "0.27.7",
-        "@esbuild/linux-x64": "0.27.7",
-        "@esbuild/netbsd-arm64": "0.27.7",
-        "@esbuild/netbsd-x64": "0.27.7",
-        "@esbuild/openbsd-arm64": "0.27.7",
-        "@esbuild/openbsd-x64": "0.27.7",
-        "@esbuild/openharmony-arm64": "0.27.7",
-        "@esbuild/sunos-x64": "0.27.7",
-        "@esbuild/win32-arm64": "0.27.7",
-        "@esbuild/win32-ia32": "0.27.7",
-        "@esbuild/win32-x64": "0.27.7"
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
       }
     },
     "node_modules/escalade": {
@@ -12221,9 +11463,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.39.4",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
-      "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
+      "version": "9.39.5",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz",
+      "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12232,8 +11474,8 @@
         "@eslint/config-array": "^0.21.2",
         "@eslint/config-helpers": "^0.4.2",
         "@eslint/core": "^0.17.0",
-        "@eslint/eslintrc": "^3.3.5",
-        "@eslint/js": "9.39.4",
+        "@eslint/eslintrc": "^3.3.6",
+        "@eslint/js": "9.39.5",
         "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -12311,13 +11553,13 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
-      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -12348,9 +11590,9 @@
       "license": "MIT"
     },
     "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12358,6 +11600,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint/node_modules/ignore": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -12406,18 +11661,17 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=4"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
@@ -12523,23 +11777,10 @@
         "node": ">=0.8.x"
       }
     },
-    "node_modules/expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "homedir-polyfill": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/expect-type": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
-      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
+      "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -12670,16 +11911,26 @@
       }
     },
     "node_modules/fast-png/node_modules/pako": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
-      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.2.0.tgz",
+      "integrity": "sha512-zJq6RP/5q+TO2OpFV3FHzlPnFjmkb7Nc99a5SNjJE+uu/PkpChs+NIZSSzbBoD+6kjiISXjfYdwj1ZRQ81dz/w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
       "license": "(MIT AND Zlib)"
     },
     "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
-      "dev": true,
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.5.tgz",
+      "integrity": "sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==",
+      "devOptional": true,
       "funding": [
         {
           "type": "github",
@@ -12792,46 +12043,6 @@
         "url": "https://github.com/sindresorhus/file-type?sponsor=1"
       }
     },
-    "node_modules/filelist": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz",
-      "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -12898,32 +12109,6 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/find-file-up": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-2.0.1.tgz",
-      "integrity": "sha512-qVdaUhYO39zmh28/JLQM5CoYN9byEOKEH4qfa8K1eNV17W0UUMJ9WgbR/hHFH+t5rcl+6RTb5UC7ck/I+uRkpQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "resolve-dir": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-pkg": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-2.0.0.tgz",
-      "integrity": "sha512-WgZ+nKbELDa6N3i/9nrHeNznm+lY3z4YfhDDWgW+5P0pdmMj26bxaxU11ookgY3NyP9GC7HvZ9etp0jRFqGEeQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-file-up": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
@@ -12972,9 +12157,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz",
+      "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==",
       "dev": true,
       "license": "ISC"
     },
@@ -13015,26 +12200,17 @@
         "unicode-trie": "^2.0.0"
       }
     },
-    "node_modules/fontkit/node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/form-data": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+      "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
+        "hasown": "^2.0.4",
+        "mime-types": "^2.1.35"
       },
       "engines": {
         "node": ">= 6"
@@ -13074,12 +12250,12 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.40.0",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.40.0.tgz",
-      "integrity": "sha512-uaBd3qC1v3KQqBEjwTUd183K6PbS+j0yR9w9VmEOLWA/tnUcSn8Xa3uck7t4dgpDoUss8xQTcj8W2L07lrnLFg==",
+      "version": "12.43.0",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.43.0.tgz",
+      "integrity": "sha512-1eaL3RvR/kAlbG7UYcpMptEyzPoENO0c6w7ZnB3/hh2vSAz/6uGAFn6fdoqTBguNstf3MsFhJHsD/0DHiclG+g==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.40.0",
+        "motion-dom": "^12.43.0",
         "motion-utils": "^12.39.0",
         "tslib": "^2.4.0"
       },
@@ -13110,40 +12286,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/front-matter": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz",
-      "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-yaml": "^3.13.1"
-      }
-    },
-    "node_modules/front-matter/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/front-matter/node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -13374,13 +12516,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
     "node_modules/glob/node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -13389,9 +12524,9 @@
       "license": "MIT"
     },
     "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+      "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13411,55 +12546,10 @@
         "node": ">=10"
       }
     },
-    "node_modules/global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
     "node_modules/globals": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
-      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
+      "version": "17.9.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.9.0.tgz",
+      "integrity": "sha512-m/MvAW61QVU5VDNF1Vj8axt016h8w7L5TU1e9zlab7XIttAT2YAlCwl75K1fOqvMM9apmD7lbCIRhpfkhmxhCg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13533,9 +12623,9 @@
       "peer": true
     },
     "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -13562,18 +12652,11 @@
         "react-is": "^16.7.0"
       }
     },
-    "node_modules/homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "parse-passwd": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
     },
     "node_modules/hsl-to-hex": {
       "version": "1.0.0",
@@ -13604,9 +12687,9 @@
       }
     },
     "node_modules/html-parse-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.1.0.tgz",
+      "integrity": "sha512-E0oAXcELOtsXe+BmpJ2EZyedbldPpriV5vICzEuo6xjC/D1lDukOI7KrpfQGF2Qc4wWEy0nk3bFORS2K5ZAhFQ==",
       "license": "MIT",
       "dependencies": {
         "void-elements": "3.1.0"
@@ -13662,9 +12745,9 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz",
-      "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.7.tgz",
+      "integrity": "sha512-iwbQltVlx8bCrqePUM8C+hllHvdawVhQJaLrj1X7qllkvFQdXFsr16pW/mo9+JDVjN+QO2XUx9jd8SmoFkE5qw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13676,7 +12759,7 @@
         "micromatch": "^4.0.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^14.18.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/http-server": {
@@ -13712,8 +12795,6 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -13728,6 +12809,31 @@
       "integrity": "sha512-kvL8xYl5QMTh+LwohVN72ciOxC0OEV79IPdJSTwEXok9y9QHebXGdFgrED4sWfiax/ODx++CAMk3hMy4XPJPOw==",
       "license": "ISC"
     },
+    "node_modules/i18n-iso-countries": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz",
+      "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==",
+      "license": "MIT",
+      "dependencies": {
+        "diacritics": "1.3.0"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/i18n-nationality": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/i18n-nationality/-/i18n-nationality-1.4.0.tgz",
+      "integrity": "sha512-/zZBGY8TbdL4xsIo5RMe1XTdMyHlHhLA6S2u7XsYJDh2c2ONVwxf0Pz5yKcLjKxtl8ma4jgtGnUaEgF/4ZOWbQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/diacritics": "^1.3.1",
+        "diacritics": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/i18next": {
       "version": "25.10.10",
       "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.10.10.tgz",
@@ -13772,7 +12878,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -13815,9 +12921,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ignore": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.6.tgz",
+      "integrity": "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13825,9 +12931,9 @@
       }
     },
     "node_modules/immer": {
-      "version": "11.1.8",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.8.tgz",
-      "integrity": "sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==",
+      "version": "11.1.15",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.15.tgz",
+      "integrity": "sha512-VrNANlmnWQnh5COXIIOQXM9oOJw7naGKlBT74ZOOR6lpVXc3gFEu9FJLDFcpCJ2j+NWr8TIwtWD//T6ZX6TKiQ==",
       "license": "MIT",
       "funding": {
         "type": "opencollective",
@@ -13878,13 +12984,6 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "license": "ISC"
     },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/internmap": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
@@ -13943,18 +13042,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-core-module/node_modules/hasown": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
-      "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/is-docker": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
@@ -14112,16 +13199,6 @@
       "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
       "license": "MIT"
     },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -14152,24 +13229,6 @@
         "ws": "*"
       }
     },
-    "node_modules/jake": {
-      "version": "10.9.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
-      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "async": "^3.2.6",
-        "filelist": "^1.0.4",
-        "picocolors": "^1.1.1"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jay-peg": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/jay-peg/-/jay-peg-1.1.1.tgz",
@@ -14179,32 +13238,6 @@
         "restructure": "^3.0.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "30.4.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.4.1.tgz",
-      "integrity": "sha512-CRpFK0RtLriVDGcPPAnR6HMVI8bSR2jnUIgralhauzYQZIb4RH9AtEInTuQr65LmmGggGcRT6HIASxwqsVsmlA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/diff-sequences": "30.4.0",
-        "@jest/get-type": "30.1.0",
-        "chalk": "^4.1.2",
-        "pretty-format": "30.4.1"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/@jest/diff-sequences": {
-      "version": "30.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.4.0.tgz",
-      "integrity": "sha512-zOpzlfUs45l6u7jm39qr87JCHUDsaeCtvL+kQe/Vn9jSnRB4/5IPXISm0h9I1vZW/o00Kn4UTJ2MOlhnUGwv3g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
@@ -14271,10 +13304,20 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz",
+      "integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -14312,7 +13355,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
@@ -14353,19 +13396,6 @@
         "url": "https://github.com/sponsors/ota-meshi"
       }
     },
-    "node_modules/jsonc-eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/jsonc-eslint-parser/node_modules/espree": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@@ -14590,6 +13620,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -14610,6 +13643,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -14630,6 +13666,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -14650,6 +13689,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -14744,20 +13786,6 @@
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.2.tgz",
-      "integrity": "sha512-DFEqQ3ihfS9blba08cLfYf1NRAIEm+dDjic073DRDc3/JspI/8wYmtDsHwd3+4hwvdxSK7PGaElfTmm0awWJ4w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.11.5"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/loader-utils": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
@@ -14828,13 +13856,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/long-timeout": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz",
-      "integrity": "sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -14881,16 +13902,6 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/luxon": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
-      "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -14954,10 +13965,9 @@
       }
     },
     "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true,
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "license": "CC0-1.0"
     },
     "node_modules/media-engine": {
@@ -15148,6 +14158,67 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minimizer-webpack-plugin": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz",
+      "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^4.3.0",
+        "terser": "^5.31.1"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
+      },
+      "peerDependenciesMeta": {
+        "@minify-html/node": {
+          "optional": true
+        },
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/css": {
+          "optional": true
+        },
+        "@swc/html": {
+          "optional": true
+        },
+        "clean-css": {
+          "optional": true
+        },
+        "cssnano": {
+          "optional": true
+        },
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "html-minifier-terser": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "uglify-js": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/minipass": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
@@ -15211,9 +14282,9 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.40.0",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.40.0.tgz",
-      "integrity": "sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg==",
+      "version": "12.43.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.43.0.tgz",
+      "integrity": "sha512-azKON4d9S65PEoFUiQTMTgPheEmzf2QngdRc50AKfJp9Q9mmcBVw22c8eMq9k8kxOFHdL7+WZY7N/5F/lwiDag==",
       "license": "MIT",
       "dependencies": {
         "motion-utils": "^12.39.0"
@@ -15231,22 +14302,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
-    "node_modules/mui-ethiopian-datepicker": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/mui-ethiopian-datepicker/-/mui-ethiopian-datepicker-0.3.2.tgz",
-      "integrity": "sha512-I8TZ8lvloAxhFNl8tDl7NmgT7RPJslfnArNMpT2Sd9GbpfsdRrOwH/JBMcOhLQyaNUee9due0W6J85io1WLjlg==",
-      "license": "ISC",
-      "peerDependencies": {
-        "@emotion/react": "^11.11.0",
-        "@emotion/styled": "^11.11.0",
-        "@mui/icons-material": "^5.11.16",
-        "@mui/material": "^5.13.3",
-        "@mui/x-date-pickers": "^6.7.0",
-        "date-fns": "^2.30.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      }
-    },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -15259,17 +14314,17 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz",
-      "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.28.0.tgz",
+      "integrity": "sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ==",
       "license": "MIT",
       "optional": true,
       "peer": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
-      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
+      "version": "3.3.16",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
+      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
       "funding": [
         {
           "type": "github",
@@ -15360,37 +14415,15 @@
         "he": "1.2.0"
       }
     },
-    "node_modules/node-machine-id": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-      "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/node-releases": {
-      "version": "2.0.46",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.46.tgz",
-      "integrity": "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==",
+      "version": "2.0.51",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz",
+      "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/node-schedule": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz",
-      "integrity": "sha512-OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cron-parser": "^4.2.0",
-        "long-timeout": "0.1.1",
-        "sorted-array-functions": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/nopt": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -15467,9 +14500,9 @@
       }
     },
     "node_modules/nx": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/nx/-/nx-22.7.5.tgz",
-      "integrity": "sha512-zoxsJabb33jl1QYnalDn0bicryrEBgSzdKp90d7VGGv/jDgzKrcLg/hw2ZxeYiOjWPIT/o8QNT9G9vTs4dv3AQ==",
+      "version": "22.7.8",
+      "resolved": "https://registry.npmjs.org/nx/-/nx-22.7.8.tgz",
+      "integrity": "sha512-ceEhmaGCvY7oi7L7G/Nm/UZSnbfwaJxU1XbDLro7CTmVcnrmxAnxExCp0J/Tpf1xQaMZtwxgV7QATdKA/7vLQw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -15482,16 +14515,17 @@
         "@tybys/wasm-util": "0.9.0",
         "@yarnpkg/lockfile": "1.1.0",
         "@zkochan/js-yaml": "0.0.7",
+        "agent-base": "6.0.2",
         "ansi-colors": "4.1.3",
         "ansi-regex": "5.0.1",
         "ansi-styles": "4.3.0",
         "argparse": "2.0.1",
         "asynckit": "0.4.0",
-        "axios": "1.16.0",
+        "axios": "1.18.1",
         "balanced-match": "4.0.3",
         "base64-js": "1.5.1",
         "bl": "4.1.0",
-        "brace-expansion": "5.0.6",
+        "brace-expansion": "5.0.8",
         "buffer": "5.7.1",
         "call-bind-apply-helpers": "1.0.2",
         "chalk": "4.1.2",
@@ -15502,6 +14536,7 @@
         "color-convert": "2.0.1",
         "color-name": "1.1.4",
         "combined-stream": "1.0.8",
+        "debug": "4.4.3",
         "defaults": "1.0.4",
         "define-lazy-prop": "2.0.0",
         "delayed-stream": "1.0.0",
@@ -15521,7 +14556,7 @@
         "figures": "3.2.0",
         "flat": "5.0.2",
         "follow-redirects": "1.16.0",
-        "form-data": "4.0.5",
+        "form-data": "4.0.6",
         "fs-constants": "1.0.0",
         "function-bind": "1.1.2",
         "get-caller-file": "2.0.5",
@@ -15531,7 +14566,8 @@
         "has-flag": "4.0.0",
         "has-symbols": "1.1.0",
         "has-tostringtag": "1.0.2",
-        "hasown": "2.0.2",
+        "hasown": "2.0.4",
+        "https-proxy-agent": "5.0.1",
         "ieee754": "1.2.1",
         "ignore": "7.0.5",
         "inherits": "2.0.4",
@@ -15550,6 +14586,7 @@
         "mimic-fn": "2.1.0",
         "minimatch": "10.2.5",
         "minimist": "1.2.8",
+        "ms": "2.1.3",
         "npm-run-path": "4.0.1",
         "once": "1.4.0",
         "onetime": "5.1.2",
@@ -15572,7 +14609,7 @@
         "strip-bom": "3.0.0",
         "supports-color": "7.2.0",
         "tar-stream": "2.2.0",
-        "tmp": "0.2.6",
+        "tmp": "0.2.7",
         "tree-kill": "1.2.2",
         "tsconfig-paths": "4.2.0",
         "tslib": "2.8.1",
@@ -15590,16 +14627,16 @@
         "nx-cloud": "dist/bin/nx-cloud.js"
       },
       "optionalDependencies": {
-        "@nx/nx-darwin-arm64": "22.7.5",
-        "@nx/nx-darwin-x64": "22.7.5",
-        "@nx/nx-freebsd-x64": "22.7.5",
-        "@nx/nx-linux-arm-gnueabihf": "22.7.5",
-        "@nx/nx-linux-arm64-gnu": "22.7.5",
-        "@nx/nx-linux-arm64-musl": "22.7.5",
-        "@nx/nx-linux-x64-gnu": "22.7.5",
-        "@nx/nx-linux-x64-musl": "22.7.5",
-        "@nx/nx-win32-arm64-msvc": "22.7.5",
-        "@nx/nx-win32-x64-msvc": "22.7.5"
+        "@nx/nx-darwin-arm64": "22.7.8",
+        "@nx/nx-darwin-x64": "22.7.8",
+        "@nx/nx-freebsd-x64": "22.7.8",
+        "@nx/nx-linux-arm-gnueabihf": "22.7.8",
+        "@nx/nx-linux-arm64-gnu": "22.7.8",
+        "@nx/nx-linux-arm64-musl": "22.7.8",
+        "@nx/nx-linux-x64-gnu": "22.7.8",
+        "@nx/nx-linux-x64-musl": "22.7.8",
+        "@nx/nx-win32-arm64-msvc": "22.7.8",
+        "@nx/nx-win32-x64-msvc": "22.7.8"
       },
       "peerDependencies": {
         "@swc-node/register": "^1.11.1",
@@ -15667,6 +14704,19 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/nx/node_modules/axios": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.1.tgz",
+      "integrity": "sha512-3nTvFlvpn9Zu/RkHUqtc7/+al4UpRW5az71ap5zccp6e8RAYEzhMTecX8Dz1wWDYrPpUoB1HAQEGEAEvUr7S9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.16.0",
+        "form-data": "^4.0.5",
+        "https-proxy-agent": "^5.0.1",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
     "node_modules/nx/node_modules/balanced-match": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
@@ -15677,6 +14727,42 @@
         "node": "20 || >=22"
       }
     },
+    "node_modules/nx/node_modules/brace-expansion": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.8.tgz",
+      "integrity": "sha512-JZyDyq3D4AUifKTPOB7DELf6XsB3WdPuNxCtob1vFXPsSXhdAiHBWJ/tJ8HAc9aH84BK+5JFZLNkJKx3G9kzQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/nx/node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/nx/node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/nx/node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -15687,6 +14773,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/nx/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/nx/node_modules/semver": {
       "version": "7.7.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
@@ -15731,15 +14827,18 @@
       }
     },
     "node_modules/obug": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
-      "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz",
+      "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/sxzz",
         "https://opencollective.com/debug"
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20.0"
+      }
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
@@ -15933,16 +15032,6 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "license": "MIT"
     },
-    "node_modules/parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/parse-svg-path": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz",
@@ -16267,9 +15356,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "version": "8.5.25",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.25.tgz",
+      "integrity": "sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==",
       "funding": [
         {
           "type": "opencollective",
@@ -16286,7 +15375,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.12",
+        "nanoid": "^3.3.16",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -16487,9 +15576,9 @@
       }
     },
     "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz",
+      "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -16500,9 +15589,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
-      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.4.tgz",
+      "integrity": "sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16542,9 +15631,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
-      "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
+      "version": "3.9.6",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz",
+      "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -16557,35 +15646,6 @@
         "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "30.4.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.4.1.tgz",
-      "integrity": "sha512-K6KiKMHTL4jjX4u3Kir2EW07nRfcqVTXIImx50wbjHQTcZPgg+gjVeNTIT3l3L1Rd4UefxfogquC9J37SoFyyw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "30.4.1",
-        "ansi-styles": "^5.2.0",
-        "react-is-18": "npm:react-is@^18.3.1",
-        "react-is-19": "npm:react-is@^19.2.5"
-      },
-      "engines": {
-        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
@@ -16606,6 +15666,12 @@
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -16630,22 +15696,25 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
+      "license": "MIT"
+    },
+    "node_modules/qrcode-generator": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-2.0.4.tgz",
+      "integrity": "sha512-mZSiP6RnbHl4xL2Ap5HfkjLnmxfKcPWpWe/c+5XxCuetEenqmNFf1FH/ftXPCtFG5/TDobjsjz6sSNL0Sr8Z9g==",
+      "license": "MIT"
     },
     "node_modules/qs": {
-      "version": "6.15.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz",
-      "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==",
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "es-define-property": "^1.0.1",
+        "side-channel": "^1.1.1"
       },
       "engines": {
         "node": ">=0.6"
@@ -16733,9 +15802,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
-      "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.8.tgz",
+      "integrity": "sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -16755,18 +15824,63 @@
         "react": ">= 16.3.0"
       }
     },
+    "node_modules/react-css-nocode-editor": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/react-css-nocode-editor/-/react-css-nocode-editor-1.0.13.tgz",
+      "integrity": "sha512-RV1ZbG8aXORiQ5mDKZbKCHStCJPamp/n5Rb34q22Ug2xzMDW4DjjqO23+Qo/Y+LAoyyrFV/+lI1qq4+/O5nf2A==",
+      "license": "GPL-3.0",
+      "dependencies": {
+        "styled-components": "^5.3.5"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0 <= 18.1",
+        "react-dom": ">=16.8.0 <= 18.1"
+      }
+    },
+    "node_modules/react-day-picker": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-10.0.1.tgz",
+      "integrity": "sha512-eNh6BlwcYInWaJtRv18mXQ06Ys/H6rdTZAnTaSdOYJuTpwP1JMCHNd1FDRadA+gbeinq+psdULN5Xnowy9mV8w==",
+      "license": "MIT",
+      "dependencies": {
+        "@date-fns/tz": "^1.4.1",
+        "date-fns": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/gpbl"
+      },
+      "peerDependencies": {
+        "@types/react": ">=16.8.0",
+        "react": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-dom": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.6.tgz",
-      "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==",
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.8.tgz",
+      "integrity": "sha512-rVprimfGBG3DR+Tq0IQG2DT5PxKth1WIGDmj5yPmlzr4YBe7uyE+Du4oVqTDXZSHGGGXRtTJEGSSePyQCMBglQ==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.6"
+        "react": "^19.2.8"
       }
     },
+    "node_modules/react-dom/node_modules/scheduler": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "license": "MIT"
+    },
     "node_modules/react-dropzone": {
       "version": "14.4.1",
       "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.4.1.tgz",
@@ -16785,9 +15899,9 @@
       }
     },
     "node_modules/react-hook-form": {
-      "version": "7.76.1",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.76.1.tgz",
-      "integrity": "sha512-rYM7tPiWlu3nZchkR/ex7piyzui2vFPyaLnXnI/RnblB/L4qfMmyses8llJVtF1NpE9WBBsJlGtcSZzPCXW1qQ==",
+      "version": "7.84.0",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.84.0.tgz",
+      "integrity": "sha512-+hWvQP6GLco56mDwrbU4XnHix8t1z90ltZsDIrREl+jnQFQxYLX8oAzqe/Xn8nHpmoXTY5M6oEXrAhbP1qevNQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
@@ -16827,18 +15941,18 @@
       }
     },
     "node_modules/react-icons": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.6.0.tgz",
-      "integrity": "sha512-RH93p5ki6LfOiIt0UtDyNg/cee+HLVR6cHHtW3wALfo+eOHTp8RnU2kRkI6E+H19zMIs03DyxUG/GfZMOGvmiA==",
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.7.0.tgz",
+      "integrity": "sha512-LBLy340Rzqy6+/yVhZKT3B/QpP1BZaesGqasf09HPOBzRarcDIFH0WwXlXQfE7q7ipxK4MSiC5DIBWURCny6fw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*"
       }
     },
     "node_modules/react-image-crop": {
-      "version": "11.0.10",
-      "resolved": "https://registry.npmjs.org/react-image-crop/-/react-image-crop-11.0.10.tgz",
-      "integrity": "sha512-+5FfDXUgYLLqBh1Y/uQhIycpHCbXkI50a+nbfkB1C0xXXUTwkisHDo2QCB1SQJyHCqIuia4FeyReqXuMDKWQTQ==",
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/react-image-crop/-/react-image-crop-11.1.2.tgz",
+      "integrity": "sha512-+0Pc2fxpwKL4u4oLmdKBw8XSwUceFbXbKEHvFOlsl/MGB1OVNic4uBlAPmEHGXYgoJIq+b63xHbc/aJMG0AVkA==",
       "license": "ISC",
       "peerDependencies": {
         "react": ">=16.13.1"
@@ -16860,26 +15974,11 @@
       }
     },
     "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
-    },
-    "node_modules/react-is-18": {
-      "name": "react-is",
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/react-is-19": {
-      "name": "react-is",
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.6.tgz",
-      "integrity": "sha512-XjBR15BhXuylgWGuslhDKqlSayuqvqBX91BP8pauG8kd1zY8kotkNWbXksTCNRarse4kuGbe2kIY05ARtwNIvw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "19.2.8",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.8.tgz",
+      "integrity": "sha512-s5un28nYxKJw5gvUHyW5PCC28CvBqLu9r3cWgzHT4Vo/5fqqkFcdRYsGcKf50WMPpjjFZS5d76fn3YCo2njKwQ==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/react-number-format": {
       "version": "5.4.5",
@@ -16937,34 +16036,6 @@
         "react": ">=16"
       }
     },
-    "node_modules/react-pdf-html/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "license": "MIT",
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/react-pdf-html/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "license": "CC0-1.0"
-    },
-    "node_modules/react-pdf-html/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react-pdf/node_modules/pdfjs-dist": {
       "version": "5.4.296",
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.296.tgz",
@@ -16977,6 +16048,19 @@
         "@napi-rs/canvas": "^0.1.80"
       }
     },
+    "node_modules/react-qr-code": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/react-qr-code/-/react-qr-code-2.2.0.tgz",
+      "integrity": "sha512-e5nS0UUN22K3Nf8KBRUzemfdJ6OmnN5w+kbnj1lvJaol9RyVRFeGl05bCkxSN2ZegbLxjjYjX1+mmAoX9+fAhw==",
+      "license": "MIT",
+      "dependencies": {
+        "prop-types": "^15.8.1",
+        "qrcode-generator": "^2.0.4"
+      },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
     "node_modules/react-redux": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.3.0.tgz",
@@ -17068,9 +16152,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.16.0.tgz",
-      "integrity": "sha512-wArC8lVyJb3+jM9OpDyW6hLCizACWkvQR/sSGqSs+o5uEXEtGlqdZ4v8hENR3Jad6i+LRkK93q/+bQAcvl6V1A==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.2.tgz",
+      "integrity": "sha512-aUVMjFm3GAPTTZL7oYr5E7ETiqfQCHRLH+B+5afnICvf0r7kkK4eR6SMuwbSTJw/7t+12khT/Kahij49fqOCIg==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
@@ -17090,12 +16174,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.16.0.tgz",
-      "integrity": "sha512-kMUAbimWB5FVbF4Bce4bJsiKJWLIUHq/mEG8+CFDnCSgltptBiG5nguducmsJeGKytlCvQud9Qhzpn49iduTlA==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.2.tgz",
+      "integrity": "sha512-AIKJ/jgGlFb3EbfCXk5Gzshiwt+l3mqbCrNjmEWMMjqQxNJ3svBa6bgzFyCC2Sw3RA0VWF1kg3uQf2OFhxb8hw==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.16.0"
+        "react-router": "7.18.2"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -17308,9 +16392,9 @@
       }
     },
     "node_modules/recharts": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.8.1.tgz",
-      "integrity": "sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.10.1.tgz",
+      "integrity": "sha512-QXFrvt6IVcw7eeZCoyXTwkIJAX3Dv1nyVhMicXJ47GsGDDpcN8z6o644DibE9XjpBTThtsomLKnTV6lc+cVFUA==",
       "license": "MIT",
       "workspaces": [
         "www"
@@ -17321,9 +16405,9 @@
         "decimal.js-light": "^2.5.1",
         "es-toolkit": "^1.39.3",
         "eventemitter3": "^5.0.1",
-        "immer": "^10.1.1",
+        "immer": "^11.1.8",
         "react-redux": "8.x.x || 9.x.x",
-        "reselect": "5.1.1",
+        "reselect": "5.2.0",
         "tiny-invariant": "^1.3.3",
         "use-sync-external-store": "^1.2.2",
         "victory-vendor": "^37.0.2"
@@ -17343,22 +16427,6 @@
       "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
       "license": "MIT"
     },
-    "node_modules/recharts/node_modules/immer": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
-      "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/recharts/node_modules/reselect": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
-      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
-      "license": "MIT"
-    },
     "node_modules/redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -17427,9 +16495,9 @@
       "license": "MIT"
     },
     "node_modules/regjsparser": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.1.tgz",
-      "integrity": "sha512-dLsljMd9sqwRkby8zhO1gSg3PnJIBFid8f4CQj/sXx+7cKx+E7u0PKhZ+U4wmhx7EfmtvnA318oVaIkAB1lRJw==",
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.2.tgz",
+      "integrity": "sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -17478,36 +16546,26 @@
       "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.12",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz",
+      "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==",
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "es-errors": "^1.3.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -17594,9 +16652,9 @@
       "peer": true
     },
     "node_modules/rimraf/node_modules/brace-expansion": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz",
-      "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "license": "MIT",
       "optional": true,
       "peer": true,
@@ -17643,12 +16701,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.60.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.4.tgz",
-      "integrity": "sha512-WHeFSbZYsPu3+bLoNRUuAO+wavNlocOPf3wSHTP7hcFKVnJeWsYlCDbr3mTS14FCizf9ccIxXA8sGL8zKeQN3g==",
+      "version": "4.62.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.4.tgz",
+      "integrity": "sha512-RXOqwaPsBGjMNMa4sQjDjHieHEZDFoj/Rdr46l2MU5DfEs16wHJPC2RPTPHWhNl+M3aI472LLqFkFKut4SblOg==",
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.8"
+        "@types/estree": "1.0.9"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -17658,31 +16716,32 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.60.4",
-        "@rollup/rollup-android-arm64": "4.60.4",
-        "@rollup/rollup-darwin-arm64": "4.60.4",
-        "@rollup/rollup-darwin-x64": "4.60.4",
-        "@rollup/rollup-freebsd-arm64": "4.60.4",
-        "@rollup/rollup-freebsd-x64": "4.60.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.60.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.60.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.60.4",
-        "@rollup/rollup-linux-arm64-musl": "4.60.4",
-        "@rollup/rollup-linux-loong64-gnu": "4.60.4",
-        "@rollup/rollup-linux-loong64-musl": "4.60.4",
-        "@rollup/rollup-linux-ppc64-gnu": "4.60.4",
-        "@rollup/rollup-linux-ppc64-musl": "4.60.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.60.4",
-        "@rollup/rollup-linux-riscv64-musl": "4.60.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.60.4",
-        "@rollup/rollup-linux-x64-gnu": "4.60.4",
-        "@rollup/rollup-linux-x64-musl": "4.60.4",
-        "@rollup/rollup-openbsd-x64": "4.60.4",
-        "@rollup/rollup-openharmony-arm64": "4.60.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.60.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.60.4",
-        "@rollup/rollup-win32-x64-gnu": "4.60.4",
-        "@rollup/rollup-win32-x64-msvc": "4.60.4",
+        "@napi-rs/lzma-linux-x64-gnu": "1.5.1",
+        "@rollup/rollup-android-arm-eabi": "4.62.4",
+        "@rollup/rollup-android-arm64": "4.62.4",
+        "@rollup/rollup-darwin-arm64": "4.62.4",
+        "@rollup/rollup-darwin-x64": "4.62.4",
+        "@rollup/rollup-freebsd-arm64": "4.62.4",
+        "@rollup/rollup-freebsd-x64": "4.62.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.4",
+        "@rollup/rollup-linux-arm64-musl": "4.62.4",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.4",
+        "@rollup/rollup-linux-loong64-musl": "4.62.4",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.4",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.4",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.4",
+        "@rollup/rollup-linux-x64-gnu": "4.62.4",
+        "@rollup/rollup-linux-x64-musl": "4.62.4",
+        "@rollup/rollup-openbsd-x64": "4.62.4",
+        "@rollup/rollup-openharmony-arm64": "4.62.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.4",
+        "@rollup/rollup-win32-x64-gnu": "4.62.4",
+        "@rollup/rollup-win32-x64-msvc": "4.62.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -17799,6 +16858,23 @@
         "node": ">=20"
       }
     },
+    "node_modules/rollup-plugin-visualizer/node_modules/cliui/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/rollup-plugin-visualizer/node_modules/define-lazy-prop": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -17847,17 +16923,16 @@
       }
     },
     "node_modules/rollup-plugin-visualizer/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz",
+      "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==",
       "license": "MIT",
       "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
+        "get-east-asian-width": "^1.5.0",
+        "strip-ansi": "^7.1.2"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -17895,16 +16970,33 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/rollup-plugin-visualizer/node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/rollup-plugin-visualizer/node_modules/yargs": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz",
-      "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==",
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.1.0.tgz",
+      "integrity": "sha512-2rAgRKu54VsHkqI0/tYkmluGXHD4KW7yZoycuqDQ15QOTnc2VVfy0nN/1eMhnQLO00A+dwtK20xuCnc1YGeUyg==",
       "license": "MIT",
       "dependencies": {
         "cliui": "^9.0.1",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
-        "string-width": "^7.2.0",
+        "string-width": "^8.2.1",
         "y18n": "^5.0.5",
         "yargs-parser": "^22.0.0"
       },
@@ -17921,12 +17013,6 @@
         "node": "^20.19.0 || ^22.12.0 || >=23"
       }
     },
-    "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "license": "MIT"
-    },
     "node_modules/run-applescript": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz",
@@ -17986,13 +17072,13 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/sax": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
-      "integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz",
+      "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -18000,9 +17086,9 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "version": "0.25.0-rc-603e6108-20241029",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-603e6108-20241029.tgz",
+      "integrity": "sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA==",
       "license": "MIT"
     },
     "node_modules/schema-utils": {
@@ -18033,9 +17119,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
-      "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
       "devOptional": true,
       "license": "ISC",
       "bin": {
@@ -18154,14 +17240,14 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
-      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz",
+      "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3",
-        "side-channel-list": "^1.0.0",
+        "object-inspect": "^1.13.4",
+        "side-channel-list": "^1.0.1",
         "side-channel-map": "^1.0.1",
         "side-channel-weakmap": "^1.0.2"
       },
@@ -18320,9 +17406,9 @@
       }
     },
     "node_modules/socket.io-parser": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.6.tgz",
-      "integrity": "sha512-asJqbVBDsBCJx0pTqw3WfesSY0iRX+2xzWEWzrpcH7L6fLzrhyF8WPI8UaeM4YCuDfpwA/cgsdugMsmtz8EJeg==",
+      "version": "4.2.7",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.7.tgz",
+      "integrity": "sha512-IH/iSeO9T6gz1KkFleGDWkG9N3dl4jXVYUtMhIqH10Md0ttMer8nUNWiP1DKuNrybD2xBrixLJdCC9J6ECoYkg==",
       "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
@@ -18342,13 +17428,6 @@
         "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
       }
     },
-    "node_modules/sorted-array-functions": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz",
-      "integrity": "sha512-2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -18388,13 +17467,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
     "node_modules/ssf": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
@@ -18435,9 +17507,9 @@
       }
     },
     "node_modules/std-env": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
-      "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz",
+      "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==",
       "dev": true,
       "license": "MIT"
     },
@@ -18674,9 +17746,9 @@
       }
     },
     "node_modules/svgo": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
-      "integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.4.tgz",
+      "integrity": "sha512-GsNRis4e8jxn2Y9ENz/8lbJ93CstG8svtMnuRaHbiF2LTJ5tK0/q3t/URPq9Zc7zVWBJnNnJMIp6bevK7bSmNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -18709,10 +17781,31 @@
         "node": ">= 10"
       }
     },
+    "node_modules/svgo/node_modules/css-tree": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.30",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/mdn-data": {
+      "version": "2.0.30",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
     "node_modules/tabbable": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
-      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.5.0.tgz",
+      "integrity": "sha512-wieBHXygIm7OyQOu5hQlkk62/WyCFYGlWg7L6/ZCUZwx0o398Zkn4pVmMyfYhfMG8kGrj/Krt8eIk6UKC6VzwA==",
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
@@ -18790,9 +17883,9 @@
       }
     },
     "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz",
+      "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -18862,9 +17955,9 @@
       "peer": true
     },
     "node_modules/terser": {
-      "version": "5.48.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz",
-      "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==",
+      "version": "5.49.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz",
+      "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==",
       "devOptional": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -18880,67 +17973,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.1.tgz",
-      "integrity": "sha512-201R5j+sJpK8nFWwKVyNfZot8FaJbLZDq5evriVzbV1wDtSXDjRUDRfJzHpAaxFDMEhsZL1QkeqM61wgsS3KaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@minify-html/node": {
-          "optional": true
-        },
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/css": {
-          "optional": true
-        },
-        "@swc/html": {
-          "optional": true
-        },
-        "clean-css": {
-          "optional": true
-        },
-        "cssnano": {
-          "optional": true
-        },
-        "csso": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "html-minifier-terser": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -19019,9 +18051,9 @@
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.3.tgz",
-      "integrity": "sha512-g62dB+w1/OEFnPvmX0yd/HnetYITOL+1nJW7kitOycOeAvmbWC/nu0fwmmQ/kupNojqExzyC/T++pST/jRJ2mQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz",
+      "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19029,9 +18061,9 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.16",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
-      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
@@ -19051,9 +18083,9 @@
       "license": "GPL-2.0-or-later"
     },
     "node_modules/tinyrainbow": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
-      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.1.tgz",
+      "integrity": "sha512-yau8yJdTt989Mm0Bd/236QnzEiPf2xLLTqUZRUJOo/3CB078LSwzei343DgtJVmfJKJE3TMINY1u42SQsP6mXw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19061,9 +18093,9 @@
       }
     },
     "node_modules/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-5sJPdPjfI5Kx+qbrDesxkglRBxW//g7hCsqspEjwkewGvBMGIKMOTKzLt1hFVJzyadba3lDUN20O9qhvbQUSTA==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.7.tgz",
+      "integrity": "sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19226,9 +18258,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.7.tgz",
-      "integrity": "sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz",
+      "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -19366,17 +18398,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/upath": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
-      "integrity": "sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
@@ -19417,6 +18438,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/uri-js/node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/url": {
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
@@ -19437,12 +18468,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
-      "license": "MIT"
-    },
     "node_modules/use-callback-ref": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
@@ -19626,12 +18651,12 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.3.tgz",
-      "integrity": "sha512-/4XH147Ui7OGTjg3HbdWe5arnZQSbfuRzdr9Ec7TQi5I7R+ir0Rlc9GIvD4v0XZurELqA035KVXJXpR61xhiTA==",
+      "version": "7.3.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz",
+      "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==",
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.27.0",
+        "esbuild": "^0.27.0 || ^0.28.0",
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
@@ -19714,19 +18739,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.7.tgz",
-      "integrity": "sha512-flYyaFd2CgoCoU+0UKt3pxksgC+S02iTDN0n3LtqaMeXsI9SBcdNujc2k0DeFLzUn/0k538yNjOSdwgCqcrwJA==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz",
+      "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "4.1.7",
-        "@vitest/mocker": "4.1.7",
-        "@vitest/pretty-format": "4.1.7",
-        "@vitest/runner": "4.1.7",
-        "@vitest/snapshot": "4.1.7",
-        "@vitest/spy": "4.1.7",
-        "@vitest/utils": "4.1.7",
+        "@vitest/expect": "4.1.10",
+        "@vitest/mocker": "4.1.10",
+        "@vitest/pretty-format": "4.1.10",
+        "@vitest/runner": "4.1.10",
+        "@vitest/snapshot": "4.1.10",
+        "@vitest/spy": "4.1.10",
+        "@vitest/utils": "4.1.10",
         "es-module-lexer": "^2.0.0",
         "expect-type": "^1.3.0",
         "magic-string": "^0.30.21",
@@ -19754,12 +18779,12 @@
         "@edge-runtime/vm": "*",
         "@opentelemetry/api": "^1.9.0",
         "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
-        "@vitest/browser-playwright": "4.1.7",
-        "@vitest/browser-preview": "4.1.7",
-        "@vitest/browser-webdriverio": "4.1.7",
-        "@vitest/coverage-istanbul": "4.1.7",
-        "@vitest/coverage-v8": "4.1.7",
-        "@vitest/ui": "4.1.7",
+        "@vitest/browser-playwright": "4.1.10",
+        "@vitest/browser-preview": "4.1.10",
+        "@vitest/browser-webdriverio": "4.1.10",
+        "@vitest/coverage-istanbul": "4.1.10",
+        "@vitest/coverage-v8": "4.1.10",
+        "@vitest/ui": "4.1.10",
         "happy-dom": "*",
         "jsdom": "*",
         "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -19822,13 +18847,12 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz",
-      "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz",
+      "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
       },
       "engines": {
@@ -19853,9 +18877,9 @@
       "license": "BSD-2-Clause"
     },
     "node_modules/webpack": {
-      "version": "5.107.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.107.2.tgz",
-      "integrity": "sha512-v7RhXaJbpMlV0D7hC7lb2EbnxkoeUqf9qhKr6lozx3Q48pmFrqqNRmZFUEGmi7pSwm6fCQ2H1IjvCkHqdpVdjQ==",
+      "version": "5.109.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.109.2.tgz",
+      "integrity": "sha512-U9/cvLzxObKNEZ9+TtdqrHM5/9z3lgl2c+c4BzbqGxFQvQvBAq87yql5A8pQ+rrMbS496MZJeF5enVBndIy2hw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -19865,23 +18889,20 @@
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.16.0",
-        "acorn-import-phases": "^1.0.3",
         "browserslist": "^4.28.1",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.22.0",
+        "enhanced-resolve": "^5.24.4",
         "es-module-lexer": "^2.1.0",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.2.11",
-        "loader-runner": "^4.3.2",
         "mime-db": "^1.54.0",
+        "minimizer-webpack-plugin": "^5.6.1",
         "neo-async": "^2.6.2",
         "schema-utils": "^4.3.3",
         "tapable": "^2.3.0",
-        "terser-webpack-plugin": "^5.5.0",
-        "watchpack": "^2.5.1",
-        "webpack-sources": "^3.5.0"
+        "watchpack": "^2.5.2",
+        "webpack-sources": "^3.5.1"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -19900,9 +18921,9 @@
       }
     },
     "node_modules/webpack-sources": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.0.tgz",
-      "integrity": "sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz",
+      "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -20086,10 +19107,9 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "dev": true,
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
+      "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
diff --git a/package.json b/package.json
index 9b8fd4ab5..ed486ec5f 100644
--- a/package.json
+++ b/package.json
@@ -28,13 +28,19 @@
     "@tanstack/react-query": "^5.99.0",
     "@tria-plc/iamui": "file:local-packages/tria-plc-iamui-0.1.1.tgz",
     "clsx": "^2.1.1",
+    "country-flag-icons": "^1.6.20",
     "date-fns": "^4.1.0",
     "dayjs": "^1.11.20",
+    "ethiopian-calendar-date-converter": "^2.1.6",
+    "i18n-iso-countries": "^7.14.0",
+    "i18n-nationality": "^1.4.0",
     "i18next": "^25.6.0",
+    "js-cookie": "^3.0.8",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.71.2",
     "react-i18next": "^15.7.4",
+    "react-qr-code": "^2.2.0",
     "react-redux": "^9.2.0",
     "react-router": "^7.12.0",
     "react-router-dom": "^7.13.1",
@@ -49,8 +55,9 @@
     "@nx/vite": "^22.5.4",
     "@nx/vitest": "^22.5.4",
     "@playwright/test": "^1.62.1",
+    "@types/js-cookie": "^3.0.6",
     "@types/node": "^22.0.0",
-    "@types/react": "^19.0.0",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.0.0",
     "@typescript-eslint/eslint-plugin": "^8.60.0",
     "@typescript-eslint/parser": "^8.60.0",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 96df34488..e13b65cc9 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -8,6 +8,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
+    "resolveJsonModule": true,
     "target": "ES2022",
     "module": "ESNext",
     "lib": ["ES2022", "dom"],