Remove unnecessary code

hotel-management/src/pages/Room/Form.tsx

@@ -12,7 +12,7 @@ import { sendRequest } from '../../helpers/sendRequest.ts';
 import Input from '../../commons/styles/Input.ts';
 import FormRow from '../../components/LabelControl/index.tsx';
 import { INVALID_DISCOUNT, INVALID_FIELD, REQUIRED_FIELD_ERROR } from '../../constants/formValidateMessage.ts';
-import { isValidNumber, isValidString } from '../../helpers/validators.ts';
+import { isValidDiscount, isValidNumber, isValidString } from '../../helpers/validators.ts';
 import Form from '../../components/Form/index.tsx';
 import { useEffect } from 'react';
 
@@ -140,7 +140,7 @@ const RoomForm = ({
             {...register('discount', {
               required: REQUIRED_FIELD_ERROR,
               validate: {
-                checkPhoneNum: (v) => isValidNumber(v) || INVALID_DISCOUNT,
+                checkPhoneNum: (v) => isValidDiscount(v) || INVALID_DISCOUNT,
               },
               onChange: () => trigger('discount'),
             })}

hotel-management/src/pages/Room/Table.tsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 import toast from 'react-hot-toast';
 
 // Components
-import { HiSquare2Stack } from 'react-icons/hi2';
+import { RiEditBoxFill } from 'react-icons/ri';
 import { HiTrash } from 'react-icons/hi';
 import { StyledOperationTable } from './styled';
 import Menus from '../../components/Menus';
@@ -29,6 +29,7 @@ import Spinner from '../../commons/styles/Spinner';
 
 // Utils
 import { sendRequest } from '../../helpers/sendRequest';
+import { formatCurrency } from '../../helpers/utils';
 
 interface IRoomRow {
   room: TRoom;
@@ -52,10 +53,7 @@ const RoomRow = ({
 
   const handleOnDelete = async (room: TRoom) => {
     if (confirm(CONFIRM_DELETE)) {
-      const response = await sendRequest(
-        ROOM_PATH + `/${room.id}`,
-        'DELETE'
-      );
+      const response = await sendRequest(ROOM_PATH + `/${room.id}`, 'DELETE');
 
       if (response.statusCode === STATUS_CODE.OK) {
         toast.success(DELETE_SUCCESS);
@@ -66,7 +64,10 @@ const RoomRow = ({
     }
   };
 
-  const { id, name, price, status } = room;
+  const { id, name, price, discount, status } = room;
+
+  // Calculate final price
+  const finalPrice = price - (price * discount / 100);
 
   // prettier-ignore
   const statusText = status
@@ -77,7 +78,7 @@ const RoomRow = ({
     <Table.Row>
       <div>{id}</div>
       <div>{name}</div>
-      <div>{price}</div>
+      <div>{formatCurrency(finalPrice)}</div>
       <div>{statusText}</div>
 
       <Menus.Menu>
@@ -85,7 +86,7 @@ const RoomRow = ({
 
         <Menus.List id={id.toString()}>
           <Menus.Button
-            icon={<HiSquare2Stack />}
+            icon={<RiEditBoxFill />}
             onClick={() => handleOnEdit(room)}
           >
             Edit
@@ -128,7 +129,7 @@ const RoomTable = ({
     nameSearch,
     sortByValue,
     orderByValue,
-    reload,
+    reload
   );
 
   useEffect(() => {

hotel-management/src/pages/User/Form.tsx

@@ -4,7 +4,6 @@ import { FormProvider, useForm } from 'react-hook-form';
 
 // Styled
 import Input from '../../commons/styles/Input';
-import TextArea from '../../commons/styles/TextArea';
 
 // Components
 import Form from '../../components/Form';
@@ -216,20 +215,6 @@ const UserForm = ({
           />
         </FormRow>
 
-        <FormRow label="Address" error={errors.address?.message}>
-          <TextArea
-            id="address"
-            rows={3}
-            {...register('address', {
-              required: REQUIRED_FIELD_ERROR,
-              validate: {
-                checkValidString: (v) => isValidString(v) || INVALID_FIELD,
-              },
-              onChange: () => trigger('address'),
-            })}
-          />
-        </FormRow>
-
         <Form.Action>
           <FormBtn type="submit" name="submit" disabled={!isDirty || !isValid}>
             {