From ec094b8f55e2a24ed514ac6c17687d9c9a3ea97b Mon Sep 17 00:00:00 2001 From: zain94rif Date: Mon, 5 Jan 2026 09:38:27 +0700 Subject: [PATCH] fix(text): change 'User History' to 'History User' --- .../component/ListNotification.jsx | 8 +-- .../component/UserHistoryModal.jsx | 30 +++++++++-- src/pages/notification/detail/UserHistory.jsx | 54 +++++++++++++++---- 3 files changed, 74 insertions(+), 18 deletions(-) diff --git a/src/pages/notification/component/ListNotification.jsx b/src/pages/notification/component/ListNotification.jsx index 9889007..ba3c8eb 100644 --- a/src/pages/notification/component/ListNotification.jsx +++ b/src/pages/notification/component/ListNotification.jsx @@ -646,7 +646,7 @@ const ListNotification = memo(function ListNotification(props) { padding: '0 16px', position: 'relative', border: '1px solid #f0f0f0', - borderRadius: '4px' + borderRadius: '4px', }} >
@@ -708,7 +708,9 @@ const ListNotification = memo(function ListNotification(props) {
- Added by: {log.addedBy.name} + + Added by: {log.addedBy.name} + ) : ( - {modalContent === 'user' && 'User History Notification'} + {modalContent === 'user' && 'History User Notification'} {modalContent === 'log' && 'Log History Notification'} )} diff --git a/src/pages/notification/component/UserHistoryModal.jsx b/src/pages/notification/component/UserHistoryModal.jsx index 9cf832e..e6c0727 100644 --- a/src/pages/notification/component/UserHistoryModal.jsx +++ b/src/pages/notification/component/UserHistoryModal.jsx @@ -1,6 +1,12 @@ import React from 'react'; import { Modal, Typography, Card, Row, Col, Avatar, Tag, Button, Space } from 'antd'; -import { UserOutlined, PhoneOutlined, CheckCircleOutlined, SyncOutlined, SendOutlined } from '@ant-design/icons'; +import { + UserOutlined, + PhoneOutlined, + CheckCircleOutlined, + SyncOutlined, + SendOutlined, +} from '@ant-design/icons'; const { Text } = Typography; @@ -41,9 +47,17 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => { const getStatusTag = (status) => { switch (status) { case 'delivered': - return } color="success">Delivered; + return ( + } color="success"> + Delivered + + ); case 'sent': - return } color="processing">Sent; + return ( + } color="processing"> + Sent + + ); case 'failed': return Failed; default: @@ -55,7 +69,7 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => { - User History Notification + History User Notification } open={visible} @@ -78,7 +92,13 @@ const UserHistoryModal = ({ visible, onCancel, notificationData }) => { } />
{user.name} -
+
{user.phone}
diff --git a/src/pages/notification/detail/UserHistory.jsx b/src/pages/notification/detail/UserHistory.jsx index 9ec87bb..8170ee5 100644 --- a/src/pages/notification/detail/UserHistory.jsx +++ b/src/pages/notification/detail/UserHistory.jsx @@ -1,14 +1,37 @@ import React from 'react'; import { Button, Row, Col, Card, Badge, Typography, Space, Divider } from 'antd'; -import { SendOutlined, MobileOutlined, CheckCircleFilled, ArrowLeftOutlined } from '@ant-design/icons'; +import { + SendOutlined, + MobileOutlined, + CheckCircleFilled, + ArrowLeftOutlined, +} from '@ant-design/icons'; const { Text } = Typography; // Dummy data for user history const userHistoryData = [ - { id: 1, name: 'John Doe', phone: '081234567890', status: 'Delivered', timestamp: '04-11-2025 11:40 WIB' }, - { id: 2, name: 'Jane Smith', phone: '087654321098', status: 'Delivered', timestamp: '04-11-2025 11:41 WIB' }, - { id: 3, name: 'Peter Jones', phone: '082345678901', status: 'Delivered', timestamp: '04-11-2025 11:42 WIB' }, + { + id: 1, + name: 'John Doe', + phone: '081234567890', + status: 'Delivered', + timestamp: '04-11-2025 11:40 WIB', + }, + { + id: 2, + name: 'Jane Smith', + phone: '087654321098', + status: 'Delivered', + timestamp: '04-11-2025 11:41 WIB', + }, + { + id: 3, + name: 'Peter Jones', + phone: '082345678901', + status: 'Delivered', + timestamp: '04-11-2025 11:42 WIB', + }, ]; const UserHistory = ({ notification, onBack }) => { @@ -18,7 +41,9 @@ const UserHistory = ({ notification, onBack }) => { +