Merge remote-tracking branch 'origin/dev/2025b' into dev/2025b

src/views/reservation/Detail.jsx

@@ -1,13 +1,12 @@
-import { useParams } from 'react-router-dom'
+import { useParams, useNavigate } from 'react-router-dom'
 import { useEffect, useState } from 'react'
-import { Row, Col, Space, Button, Table, Input, Typography, Modal, Tag, App } from 'antd'
+import { Row, Col, Space, Button, Table, Input, Typography, Modal, Tag, App, Flex } from 'antd'
 import {
-  FileOutlined
+  FileOutlined, ArrowLeftOutlined
 } from '@ant-design/icons'
 import { usingStorage } from '@/hooks/usingStorage'
 import useReservationStore from '@/stores/Reservation'
 import { useTranslation } from 'react-i18next'
-import BackBtn from '@/components/BackBtn'
 
 const { Title, Paragraph } = Typography
 const { TextArea } = Input
@@ -71,6 +70,7 @@ function Detail() {
     );
   }
 
+  const navigate = useNavigate();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [confirmText, setConfirmText] = useState('');
@@ -161,14 +161,7 @@ function Detail() {
         />
       </Modal>
     <Space direction='vertical' className='w-full'>
-    <Row gutter={{ md: 24 }}>
-        <Col span={20}>
-      <Title level={4}>{t('group:RefNo')}: {reservationDetail.referenceNumber}; {t('group:ArrivalDate')}: {reservationDetail.arrivalDate};</Title>
-        </Col>
-        <Col span={4}>
-          <BackBtn to={'/reservation/newest?back'} />
-        </Col>
-      </Row>
+      <Flex horizontal align="flex-start" gap="middle"><Button type="text" icon={<ArrowLeftOutlined />}  onClick={() => navigate(-1)} /><Title level={4}> {t('group:RefNo')}: {reservationDetail.referenceNumber}; {t('group:ArrivalDate')}: {reservationDetail.arrivalDate};</Title></Flex>
       <Row gutter={{ md: 24 }}>
         <Col span={12} className='w-full'>
         <iframe id='msdoc-iframe-reservation' title='msdoc-iframe-reservation'