diff --git a/src/pages/adminLogs/AdminLogsPage.tsx b/src/pages/adminLogs/AdminLogsPage.tsx
index a808e0d..f4c6f1f 100644
--- a/src/pages/adminLogs/AdminLogsPage.tsx
+++ b/src/pages/adminLogs/AdminLogsPage.tsx
@@ -24,6 +24,7 @@ import type { AdminActionLog } from '@/api/adminLogs'
import AdminLogDetailModal from './components/AdminLogDetailModal'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
+import {formatMsk} from "@/utils/date.ts";
dayjs.locale('ru')
@@ -263,7 +264,7 @@ export default function AdminLogPage() {
setSelectedLog(entry)}>
- {dayjs(entry.created_at).format('DD.MM.YYYY HH:mm')}
+ {formatMsk(entry.created_at)}
diff --git a/src/pages/admins/AdminsPage.tsx b/src/pages/admins/AdminsPage.tsx
index 037840e..98f8906 100644
--- a/src/pages/admins/AdminsPage.tsx
+++ b/src/pages/admins/AdminsPage.tsx
@@ -39,6 +39,7 @@ import EditAdminModal from './components/EditAdminModal'
import type { Admin } from '@/types/api'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
+import {formatMsk} from "@/utils/date.ts";
dayjs.locale('ru')
@@ -292,14 +293,14 @@ export default function AdminsPage() {
{admin.created_at
- ? dayjs(admin.created_at).format('DD.MM.YYYY')
+ ? formatMsk(admin.created_at)
: '—'}
{admin.last_login
- ? dayjs(admin.last_login).format('DD.MM.YYYY HH:mm')
+ ? formatMsk(admin.last_login)
: '—'}
diff --git a/src/pages/admins/components/EditAdminModal.tsx b/src/pages/admins/components/EditAdminModal.tsx
index 573c229..83d0810 100644
--- a/src/pages/admins/components/EditAdminModal.tsx
+++ b/src/pages/admins/components/EditAdminModal.tsx
@@ -40,7 +40,7 @@ export default function EditAdminModal({ admin, opened, onClose }: EditAdminModa
telegram_id: null as number | null,
},
validate: {
- telegram_id: (value, values) => {
+ telegram_id: (value: any, values: { is_observer: any; is_manager: any }) => {
// Требуем Telegram ID для наблюдателя или менеджера
if ((values.is_observer || values.is_manager) && !value) {
return 'Для этой роли обязательно выберите Telegram-аккаунт'
diff --git a/src/pages/approvalTasks/ApprovalTasksPage.tsx b/src/pages/approvalTasks/ApprovalTasksPage.tsx
index c20e48e..020189e 100644
--- a/src/pages/approvalTasks/ApprovalTasksPage.tsx
+++ b/src/pages/approvalTasks/ApprovalTasksPage.tsx
@@ -25,6 +25,7 @@ import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approval
import ApprovalTaskDetailsModal from './components/ApprovalTaskDetailsModal'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
+import {formatMsk} from "@/utils/date.ts";
dayjs.locale('ru')
@@ -211,14 +212,14 @@ export default function ApprovalTasksPage() {
{task.created_at
- ? dayjs(task.created_at).format('DD.MM.YYYY HH:mm')
+ ? formatMsk(task.created_at)
: '—'}
{task.completed_at
- ? dayjs(task.completed_at).format('DD.MM.YYYY HH:mm')
+ ? formatMsk(task.created_at)
: '—'}
diff --git a/src/pages/approvalTasks/components/ApprovalTaskDetailsModal.tsx b/src/pages/approvalTasks/components/ApprovalTaskDetailsModal.tsx
index 086fccb..f009206 100644
--- a/src/pages/approvalTasks/components/ApprovalTaskDetailsModal.tsx
+++ b/src/pages/approvalTasks/components/ApprovalTaskDetailsModal.tsx
@@ -31,6 +31,7 @@ import { TASK_STATUSES, STATUS_COLORS, STATUS_LABELS } from '@/features/approval
import FilePreviewModal from '@/pages/approvals/components/FilePreviewModal'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
+import {formatMsk} from "@/utils/date.ts";
dayjs.locale('ru')
@@ -320,7 +321,7 @@ export default function ApprovalTaskDetailsModal({
{task.created_at
- ? dayjs(task.created_at).format('DD.MM.YYYY HH:mm')
+ ? formatMsk(task.created_at)
: '—'}
@@ -329,7 +330,7 @@ export default function ApprovalTaskDetailsModal({
Обновлена:
{task.updated_at
- ? dayjs(task.updated_at).format('DD.MM.YYYY HH:mm')
+ ? formatMsk(task.created_at)
: '—'}
@@ -339,7 +340,7 @@ export default function ApprovalTaskDetailsModal({
- {dayjs(task.completed_at).format('DD.MM.YYYY HH:mm')}
+ {formatMsk(task.created_at)}
diff --git a/src/pages/approvals/ApprovalsPage.tsx b/src/pages/approvals/ApprovalsPage.tsx
index 0310423..f2d6b03 100644
--- a/src/pages/approvals/ApprovalsPage.tsx
+++ b/src/pages/approvals/ApprovalsPage.tsx
@@ -41,6 +41,7 @@ import ApprovalDetailsModal from './components/ApprovalDetailsModal'
import dayjs from 'dayjs'
import 'dayjs/locale/ru'
import { useDebouncedValue } from '@mantine/hooks'
+import {formatMsk} from "@/utils/date.ts";
dayjs.locale('ru')
@@ -575,9 +576,7 @@ export default function ApprovalsPage() {
- {approval.created_at
- ? dayjs(approval.created_at).format('DD.MM.YYYY HH:mm')
- : '—'}
+ {approval.created_at ? formatMsk(approval.created_at) : '—'}