diff --git a/src/model/automations.ts b/src/model/automations.ts
index d8c050b..0949717 100644
--- a/src/model/automations.ts
+++ b/src/model/automations.ts
@@ -30,7 +30,9 @@ export interface Automation {
   starts_at?: string | null
   ends_at?: string | null
   sms_send_hour?: number | null
+  sms_send_minute?: number | null
   in_app_send_hour?: number | null
+  in_app_send_minute?: number | null
   trigger_type: AutomationTriggerType
   trigger_config?: AutomationTriggerConfig
   audience_mode?: AutomationAudienceMode
@@ -92,7 +94,9 @@ export function emptyAutomation(): Automation {
     conditions: [],
     channels: ['sms'],
     sms_send_hour: 10,
+    sms_send_minute: 0,
     in_app_send_hour: 10,
+    in_app_send_minute: 0,
     cooldown_hours: 24,
     starts_at: null,
     ends_at: null,
diff --git a/src/pages/menuPages/automations/components/AutomationEditorFormBody.vue b/src/pages/menuPages/automations/components/AutomationEditorFormBody.vue
index 2e5816a..156df91 100644
--- a/src/pages/menuPages/automations/components/AutomationEditorFormBody.vue
+++ b/src/pages/menuPages/automations/components/AutomationEditorFormBody.vue
@@ -299,16 +299,16 @@
             </template>
             <div class="auto-editor__channel">
               <a-switch :checked="hasSms" @change="(v) => toggleChannel('sms', !!v)" />
-              <BasicSelect
+              <a-time-picker
                 v-if="hasSms && showChannelHours"
-                class="auto-editor__hour-select"
-                :value="form.sms_send_hour"
-                :items="catalog?.hours || []"
-                key-name="key"
-                value-name="name"
+                class="auto-editor__hour-picker"
+                :value="smsHourValue"
+                format="HH:mm"
+                :minute-step="1"
+                :show-second="false"
                 placeholder="ساعت"
-                :has-tooltip="false"
-                @update:value="(v) => (form.sms_send_hour = v)"
+                allow-clear
+                @update:value="setSmsTime"
               />
             </div>
           </a-form-item>
@@ -318,16 +318,16 @@
             </template>
             <div class="auto-editor__channel">
               <a-switch :checked="hasInApp" @change="(v) => toggleChannel('in_app', !!v)" />
-              <BasicSelect
+              <a-time-picker
                 v-if="hasInApp && showChannelHours"
-                class="auto-editor__hour-select"
-                :value="form.in_app_send_hour"
-                :items="catalog?.hours || []"
-                key-name="key"
-                value-name="name"
+                class="auto-editor__hour-picker"
+                :value="inAppHourValue"
+                format="HH:mm"
+                :minute-step="1"
+                :show-second="false"
                 placeholder="ساعت"
-                :has-tooltip="false"
-                @update:value="(v) => (form.in_app_send_hour = v)"
+                allow-clear
+                @update:value="setInAppTime"
               />
             </div>
           </a-form-item>
@@ -375,7 +375,11 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import type { FormInstance } from 'ant-design-vue'
+import dayjs, { type Dayjs } from 'dayjs'
+import customParseFormat from 'dayjs/plugin/customParseFormat'
 import { cloneDeep, debounce, isEmpty } from 'lodash'
+
+dayjs.extend(customParseFormat)
 import { inputRules } from '@/utils/inputRules'
 import { getAutomationCatalog, previewAutomationAudience } from '@/api/automations'
 import BaseDatePicker from '@core/components/BaseDatePicker'
@@ -499,6 +503,37 @@ const previewText = computed(() => {
 const hasSms = computed(() => (props.form.channels || []).includes('sms'))
 const hasInApp = computed(() => (props.form.channels || []).includes('in_app'))
 
+function timeToPicker(hour?: number | null, minute?: number | null): Dayjs | undefined {
+  if (hour == null || Number.isNaN(Number(hour))) return undefined
+  return dayjs()
+    .hour(Number(hour))
+    .minute(Number(minute ?? 0))
+    .second(0)
+    .millisecond(0)
+}
+
+function pickerToTime(val: Dayjs | string | null | undefined): { hour: number | null; minute: number | null } {
+  if (val == null || val === '') return { hour: null, minute: null }
+  const parsed = dayjs.isDayjs(val) ? val : dayjs(String(val), 'HH:mm', true)
+  if (!parsed.isValid()) return { hour: null, minute: null }
+  return { hour: parsed.hour(), minute: parsed.minute() }
+}
+
+const smsHourValue = computed(() => timeToPicker(props.form.sms_send_hour, props.form.sms_send_minute))
+const inAppHourValue = computed(() => timeToPicker(props.form.in_app_send_hour, props.form.in_app_send_minute))
+
+function setSmsTime(val: Dayjs | string | null) {
+  const time = pickerToTime(val)
+  props.form.sms_send_hour = time.hour
+  props.form.sms_send_minute = time.hour == null ? null : time.minute
+}
+
+function setInAppTime(val: Dayjs | string | null) {
+  const time = pickerToTime(val)
+  props.form.in_app_send_hour = time.hour
+  props.form.in_app_send_minute = time.hour == null ? null : time.minute
+}
+
 function ensureTriggerConfig() {
   if (!props.form.trigger_config) {
     props.form.trigger_config = {
@@ -702,31 +737,14 @@ defineExpose({
   @apply flex items-center gap-3;
 }
 
-.auto-editor__hour-select {
+.auto-editor__hour-picker {
   min-width: 7rem;
   flex: 1;
 }
 
-.auto-editor__hour-select :deep(.ant-select-selector) {
-  display: flex !important;
-  align-items: center !important;
-  height: 32px !important;
-}
-
-.auto-editor__hour-select :deep(.ant-select-selection-search),
-.auto-editor__hour-select :deep(.ant-select-selection-item),
-.auto-editor__hour-select :deep(.ant-select-selection-placeholder) {
-  display: flex !important;
-  align-items: center !important;
-  line-height: 30px !important;
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-}
-
-.auto-editor__hour-select :deep(.ant-select-selection-item > div) {
-  line-height: 30px;
-  white-space: nowrap;
-  padding: 0;
+.auto-editor__hour-picker :deep(.ant-picker) {
+  width: 100%;
+  border-radius: 10px;
 }
 
 .auto-editor__hint {
diff --git a/src/pages/menuPages/automations/hooks/automationsColumns.tsx b/src/pages/menuPages/automations/hooks/automationsColumns.tsx
index e890eaf..580f371 100644
--- a/src/pages/menuPages/automations/hooks/automationsColumns.tsx
+++ b/src/pages/menuPages/automations/hooks/automationsColumns.tsx
@@ -1,4 +1,5 @@
 import type { BaseTableColumn } from '@core/type/baseTable'
+import { toJalali } from '@core/utils/useDataTime'
 
 const triggerLabel: Record<string, string> = {
   schedule: 'زمان‌دار',
@@ -14,6 +15,13 @@ function channelText(record: any): string {
   return parts.join(' / ') || '—'
 }
 
+function formatSendTime(hour?: number | null, minute?: number | null): string {
+  if (hour == null) return '—'
+  const h = String(hour).padStart(2, '0')
+  const m = String(minute ?? 0).padStart(2, '0')
+  return `${h}:${m}`
+}
+
 function previewBody(text: unknown): string {
   const s = String(text || '').replace(/\s+/g, ' ').trim()
   if (!s) return '—'
@@ -66,14 +74,13 @@ export const cols: BaseTableColumn[] = [
     title: 'ساعت پیامک',
     dataIndex: 'sms_send_hour',
     key: 'sms_send_hour',
-    customRender: ({ record }) =>
-      record.sms_send_hour == null ? '—' : `${String(record.sms_send_hour).padStart(2, '0')}:۰۰`,
+    customRender: ({ record }) => formatSendTime(record.sms_send_hour, record.sms_send_minute),
   },
   {
     title: 'آخرین اجرا',
     dataIndex: 'last_sms_run_at',
     key: 'last_sms_run_at',
-    customRender: ({ record }) => record.last_sms_run_at || '—',
+    customRender: ({ record }) => (record.last_sms_run_at ? toJalali(record.last_sms_run_at) : '—'),
   },
   {
     title: 'فعال',
diff --git a/src/pages/menuPages/automations/index.vue b/src/pages/menuPages/automations/index.vue
index 051177e..9b106e2 100644
--- a/src/pages/menuPages/automations/index.vue
+++ b/src/pages/menuPages/automations/index.vue
@@ -52,7 +52,7 @@
                 {{ row.status === 'sent' ? 'موفق' : 'ناموفق' }}
               </span>
             </div>
-            <div class="text-xs text-gray-500">{{ row.created_at }}</div>
+            <div class="text-xs text-gray-500">{{ formatSendDate(row.created_at) }}</div>
             <div v-if="row.error" class="mt-1 text-xs text-red-600">{{ row.error }}</div>
           </div>
         </div>
@@ -79,6 +79,7 @@ import {
 } from '@/api/automations'
 import { confirmDeleteItem } from '@/utils/confirmModal'
 import { isMobile } from '@core/utils/is'
+import { toJalali } from '@core/utils/useDataTime'
 
 const tableRef = ref<null | { fetch: () => void }>(null)
 const editorRef = ref<{
@@ -97,6 +98,11 @@ const sendsRows = ref<Array<Record<string, unknown>>>([])
 
 const sheetTitle = computed(() => (editId.value ? 'ویرایش اتوماسیون' : 'افزودن اتوماسیون'))
 
+function formatSendDate(value: unknown) {
+  if (!value) return '—'
+  return toJalali(String(value))
+}
+
 function refreshTable() {
   tableRef.value?.fetch()
 }
@@ -168,11 +174,18 @@ function deleteItem(id: number) {
   confirmDeleteItem('اتوماسیون', id, deleteAutomation, refreshTable)
 }
 
+function formatAutomationTime(record: Automation) {
+  if (record.sms_send_hour == null) return '—'
+  const h = String(record.sms_send_hour).padStart(2, '0')
+  const m = String(record.sms_send_minute ?? 0).padStart(2, '0')
+  return `${h}:${m}`
+}
+
 function runNow(record: Automation) {
   if (!record.id) return
   Modal.confirm({
     title: 'اجرای آزمایشی',
-    content: `پیام «${record.name}» همین الان برای مخاطبان واجد شرط ارسال شود؟ (بدون انتظار ساعت ${record.sms_send_hour ?? '—'})`,
+    content: `پیام «${record.name}» همین الان برای مخاطبان واجد شرط ارسال شود؟ (بدون انتظار ${formatAutomationTime(record)})`,
     okText: 'ارسال',
     cancelText: 'انصراف',
     async onOk() {