Merge branch 'main' of github.com:hainatravel/GHHub

src/views/reservation/Newest.jsx

@@ -17,7 +17,10 @@ function Newest() {
       dataIndex: 'referenceNumber',
       key: 'Reference number',
       render: (text, record) => {
-        const requiredHighlight = dayjs(record.arrivalDate).add(2, 'day').isBefore(dayjs(), 'day') && isEmpty(record.guide);
+        const after3Dayjs = dayjs().add(3, 'day');
+        const lastDayjs = dayjs().subtract(1, 'day');
+        const arrivalDatejs = dayjs(record.arrivalDate);
+        const requiredHighlight = (arrivalDatejs.isAfter(lastDayjs) && arrivalDatejs.isBefore(after3Dayjs, 'day')) && isEmpty(record.guide);
         const linkClassName = requiredHighlight ? 'reservation-highlight' : '';
         return (
           <NavLink className={linkClassName} to={`/reservation/${record.reservationId}`}>{text}</NavLink>