diff --git a/src/components/Expenses/Filelist.jsx b/src/components/Expenses/Filelist.jsx
index 96ae7901..81786057 100644
--- a/src/components/Expenses/Filelist.jsx
+++ b/src/components/Expenses/Filelist.jsx
@@ -55,7 +55,6 @@ const Filelist = ({ files, removeFile, expenseToEdit }) => {
 
 export default Filelist;
 export const FilelistView = ({ files, viewFile }) => {
- console.log( files)
   return (
     <div className="d-flex flex-wrap gap-2 mt-2">
       {files?.map((file, idx) => (
diff --git a/src/components/PaymentRequest/PaymentRequestList.jsx b/src/components/PaymentRequest/PaymentRequestList.jsx
index 2c69e72f..8df4c3d9 100644
--- a/src/components/PaymentRequest/PaymentRequestList.jsx
+++ b/src/components/PaymentRequest/PaymentRequestList.jsx
@@ -224,7 +224,7 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
           isOpen={IsDeleteModalOpen}
           type="delete"
           header="Delete Expense"
-          message="Are you sure you want delete?"
+          message="Under the woring?"
           onSubmit={handleDelete}
           onClose={() => setIsDeleteModalOpen(false)}
           // loading={isPending}
diff --git a/src/components/PaymentRequest/ViewPaymentRequest.jsx b/src/components/PaymentRequest/ViewPaymentRequest.jsx
index 5a3401eb..8c65c219 100644
--- a/src/components/PaymentRequest/ViewPaymentRequest.jsx
+++ b/src/components/PaymentRequest/ViewPaymentRequest.jsx
@@ -521,7 +521,7 @@ const ViewPaymentRequest = ({ requestId }) => {
                     )}
                 </div>
               </>
-            ) : !data?.isExpenseCreated ? (
+            ) : (!data?.isExpenseCreated && ! data?.isAdvancePayment) ? (
               <div className="text-end flex-wrap gap-2 my-2 mt-3">
                 <button
                   className="btn btn-sm btn-primary"
diff --git a/src/components/RecurringExpense/ManageRecurringExpense.jsx b/src/components/RecurringExpense/ManageRecurringExpense.jsx
index a5e3bdaf..01fa07eb 100644
--- a/src/components/RecurringExpense/ManageRecurringExpense.jsx
+++ b/src/components/RecurringExpense/ManageRecurringExpense.jsx
@@ -1,490 +1,484 @@
-import React, { useEffect, useState } from "react";
-import Label from "../common/Label";
-import { Controller, useForm } from "react-hook-form";
-import {
-  useExpenseCategory,
-  useRecurringStatus,
-} from "../../hooks/masterHook/useMaster";
-import DatePicker from "../common/DatePicker";
-import { zodResolver } from "@hookform/resolvers/zod";
-import {
-  defaultRecurringExpense,
-  PaymentRecurringExpense,
-} from "./RecurringExpenseSchema";
-import {
-  FREQUENCY_FOR_RECURRING,
-  INR_CURRENCY_CODE,
-} from "../../utils/constants";
-import { useCurrencies, useProjectName } from "../../hooks/useProjects";
-import {
-  useCreateRecurringExpense,
-  usePayee,
-  useRecurringExpenseDetail,
-  useUpdateRecurringExpense,
-} from "../../hooks/useExpense";
-import InputSuggestions from "../common/InputSuggestion";
-import MultiEmployeeSearchInput from "../common/MultiEmployeeSearchInput";
+import React, { useEffect, useState } from 'react'
+import Label from '../common/Label';
+import { Controller, useForm } from 'react-hook-form';
+import { useExpenseCategory, useRecurringStatus } from '../../hooks/masterHook/useMaster';
+import DatePicker from '../common/DatePicker';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { defaultRecurringExpense, PaymentRecurringExpense } from './RecurringExpenseSchema';
+import { FREQUENCY_FOR_RECURRING, INR_CURRENCY_CODE } from '../../utils/constants';
+import { useCurrencies, useProjectName } from '../../hooks/useProjects';
+import { useCreateRecurringExpense, usePayee, useRecurringExpenseDetail, useUpdateRecurringExpense } from '../../hooks/useExpense';
+import InputSuggestions from '../common/InputSuggestion';
+import MultiEmployeeSearchInput from '../common/MultiEmployeeSearchInput';
 
 function ManageRecurringExpense({ closeModal, requestToEdit = null }) {
-  const {
+    const {
     data,
     isLoading,
     isError,
     error: requestError,
   } = useRecurringExpenseDetail(requestToEdit);
+    //APIs
+    const { projectNames, loading: projectLoading, error, isError: isProjectError, } = useProjectName();
+    const { data: currencyData, isLoading: currencyLoading, isError: currencyError } = useCurrencies();
+    const { data: statusData, isLoading: statusLoading, isError: statusError } = useRecurringStatus();
+    const { data: Payees, isLoading: isPayeeLoaing, isError: isPayeeError, error: payeeError } = usePayee()
+    const { ExpenseCategories, loading: ExpenseLoading, error: ExpenseError } = useExpenseCategory();
 
-  //APIs
-  const {
-    projectNames,
-    loading: projectLoading,
-    error,
-    isError: isProjectError,
-  } = useProjectName();
-  const {
-    data: currencyData,
-    isLoading: currencyLoading,
-    isError: currencyError,
-  } = useCurrencies();
-  const {
-    data: statusData,
-    isLoading: statusLoading,
-    isError: statusError,
-  } = useRecurringStatus();
-  const {
-    data: Payees,
-    isLoading: isPayeeLoaing,
-    isError: isPayeeError,
-    error: payeeError,
-  } = usePayee();
-  const {
-    ExpenseCategories,
-    loading: ExpenseLoading,
-    error: ExpenseError,
-  } = useExpenseCategory();
-
-  const schema = PaymentRecurringExpense();
-  const {
-    register,
-    control,
-    watch,
-    handleSubmit,
-    setValue,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: zodResolver(schema),
-    defaultValues: defaultRecurringExpense,
-  });
-  const handleClose = () => {
-    reset();
-    closeModal();
-  };
-
-  const { mutate: CreateRecurringExpense, isPending: createPending } =
-    useCreateRecurringExpense(() => {
-      handleClose();
+    const schema = PaymentRecurringExpense();
+    const { register, control, watch, handleSubmit, setValue, reset, formState: { errors }, } = useForm({
+        resolver: zodResolver(schema),
+        defaultValues: defaultRecurringExpense,
     });
-  // const { mutate: PaymentRequestUpdate, isPending } = useUpdatePaymentRequest(() =>
-  //     handleClose()
-  // );
-
-  useEffect(() => {
-    if (requestToEdit && data) {
-      reset({
-        title: data.title || "",
-        description: data.description || "",
-        payee: data.payee || "",
-        notifyTo: data.notifyTo || "",
-        currencyId: data.currency.id || "",
-        amount: data.amount || "",
-        strikeDate: data.strikeDate?.slice(0, 10) || "",
-        projectId: data.project.id || "",
-        paymentBufferDays: data.paymentBufferDays || "",
-        numberOfIteration: data.numberOfIteration || "",
-        expenseCategoryId: data.expenseCategory.id || "",
-        statusId: data.statusId || "",
-        frequency: data.frequency || "",
-        isVariable: data.isVariable || false,
-      });
-    }
-  }, [data, reset]);
-
-  // console.log("Veer",data)
-
-  const onSubmit = (fromdata) => {
-    let payload = {
-      ...fromdata,
-      // strikeDate: localToUtc(fromdata.strikeDate),
-      strikeDate: fromdata.strikeDate
-        ? new Date(fromdata.strikeDate).toISOString()
-        : null,
+    const handleClose = () => {
+        reset();
+        closeModal();
     };
-    if (requestToEdit) {
-      const editPayload = { ...payload, id: data.id };
-      PaymentRequestUpdate({ id: data.id, payload: editPayload });
-    } else {
-      CreateRecurringExpense(payload);
-    }
-    console.log("Kartik", payload);
-  };
 
-  return (
-    <div className="container p-3">
-      <h5 className="m-0">
-        {requestToEdit
-          ? "Update Expense Recurring "
-          : "Create Expense Recurring"}
-      </h5>
-      <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
-        {/* Project and Category */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label className="form-label" required>
-              Select Project
-            </Label>
-            <select
-              className="form-select form-select-sm"
-              {...register("projectId")}
-            >
-              <option value="">Select Project</option>
-              {projectLoading ? (
-                <option>Loading...</option>
-              ) : (
-                projectNames?.map((project) => (
-                  <option key={project.id} value={project.id}>
-                    {project.name}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.projectId && (
-              <small className="danger-text">{errors.projectId.message}</small>
-            )}
-          </div>
+    const { mutate: CreateRecurringExpense, isPending: createPending } = useCreateRecurringExpense(
+        () => {
+            handleClose();
+        }
+    );
+    const { mutate: RecurringExpenseUpdate, isPending } = useUpdateRecurringExpense(() =>
+        handleClose()
+    );
 
-          <div className="col-md-6">
-            <Label htmlFor="expenseCategoryId" className="form-label" required>
-              Expense Category
-            </Label>
-            <select
-              className="form-select form-select-sm"
-              id="expenseCategoryId"
-              {...register("expenseCategoryId")}
-            >
-              <option value="" disabled>
-                Select Category
-              </option>
-              {ExpenseLoading ? (
-                <option disabled>Loading...</option>
-              ) : (
-                ExpenseCategories?.map((expense) => (
-                  <option key={expense.id} value={expense.id}>
-                    {expense.name}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.expenseCategoryId && (
-              <small className="danger-text">
-                {errors.expenseCategoryId.message}
-              </small>
-            )}
-          </div>
-        </div>
+    useEffect(() => {
+        if (requestToEdit && data) {
+            reset({
+                title: data.title || "",
+                description: data.description || "",
+                payee: data.payee || "",
+                notifyTo: data.notifyTo || "",
+                currencyId: data.currency.id || "",
+                amount: data.amount || "",
+                strikeDate: data.strikeDate?.slice(0, 10) || "",
+                projectId: data.project.id || "",
+                paymentBufferDays: data.paymentBufferDays || "",
+                numberOfIteration: data.numberOfIteration || "",
+                expenseCategoryId: data.expenseCategory.id || "",
+                statusId: data.statusId || "",
+                frequency: data.frequency || "",
+                isVariable: data.isVariable || false,
 
-        {/* Title and Is Variable  */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="title" className="form-label" required>
-              Title
-            </Label>
-            <input
-              type="text"
-              id="title"
-              className="form-control form-control-sm"
-              {...register("title")}
-              placeholder="Enter title"
-            />
-            {errors.title && (
-              <small className="danger-text">{errors.title.message}</small>
-            )}
-          </div>
+            });
+        }
+    }, [data, reset]);
 
-          <div className="col-md-6 mt-2">
-            <Label htmlFor="isVariable" className="form-label" required>
-              Payment Type
-            </Label>
 
-            <Controller
-              name="isVariable"
-              control={control}
-              defaultValue={defaultRecurringExpense.isVariable ?? false}
-              render={({ field }) => (
-                <div className="d-flex align-items-center gap-3">
-                  <div className="form-check">
-                    <input
-                      type="radio"
-                      id="isVariableTrue"
-                      className="form-check-input"
-                      checked={field.value === true}
-                      onChange={() => field.onChange(true)}
-                    />
-                    <Label
-                      htmlFor="isVariableTrue"
-                      className="form-check-label"
-                    >
-                      Is Variable
-                    </Label>
-                  </div>
+    useEffect(() => {
+        if (!requestToEdit && currencyData && currencyData.length > 0) {
+            const inrCurrency = currencyData.find(
+                (c) => c.id === INR_CURRENCY_CODE
+            );
+            if (inrCurrency) {
+                setValue("currencyId", INR_CURRENCY_CODE, { shouldValidate: true });
+            }
+        }
+    }, [currencyData, requestToEdit, setValue]);
 
-                  <div className="form-check">
-                    <input
-                      type="radio"
-                      id="isVariableFalse"
-                      className="form-check-input"
-                      checked={field.value === false}
-                      onChange={() => field.onChange(false)}
-                    />
-                    <Label
-                      htmlFor="isVariableFalse"
-                      className="form-check-label"
-                    >
-                      Fixed
-                    </Label>
-                  </div>
+    const onSubmit = (fromdata) => {
+        let payload = {
+            ...fromdata,
+            strikeDate: fromdata.strikeDate ? new Date(fromdata.strikeDate).toISOString() : null,
+        };
+        if (requestToEdit) {
+            const editPayload = { ...payload, id: data.id };
+            RecurringExpenseUpdate({ id: data.id, payload: editPayload });
+        } else {
+            CreateRecurringExpense(payload);
+        }
+    };
+
+    return (
+        <div className="container p-3">
+            <h5 className="m-0">
+                {requestToEdit ? "Update Expense Recurring " : "Create Expense Recurring"}
+            </h5>
+            <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
+                {/* Project and Category */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label className="form-label" required>
+                            Select Project
+                        </Label>
+                        <select
+                            className="form-select form-select-sm"
+                            {...register("projectId")}
+                        >
+                            <option value="">Select Project</option>
+                            {projectLoading ? (
+                                <option>Loading...</option>
+                            ) : (
+                                projectNames?.map((project) => (
+                                    <option key={project.id} value={project.id}>
+                                        {project.name}
+                                    </option>
+                                ))
+                            )}
+                        </select>
+                        {errors.projectId && (
+                            <small className="danger-text">{errors.projectId.message}</small>
+                        )}
+                    </div>
+
+                    <div className="col-md-6">
+                        <Label htmlFor="expenseCategoryId" className="form-label" required>
+                            Expense Category
+                        </Label>
+                        <select
+                            className="form-select form-select-sm"
+                            id="expenseCategoryId"
+                            {...register("expenseCategoryId")}
+                        >
+                            <option value="" disabled>
+                                Select Category
+                            </option>
+                            {ExpenseLoading ? (
+                                <option disabled>Loading...</option>
+                            ) : (
+                                ExpenseCategories?.map((expense) => (
+                                    <option key={expense.id} value={expense.id}>
+                                        {expense.name}
+                                    </option>
+                                ))
+                            )}
+                        </select>
+                        {errors.expenseCategoryId && (
+                            <small className="danger-text">
+                                {errors.expenseCategoryId.message}
+                            </small>
+                        )}
+                    </div>
                 </div>
-              )}
-            />
-            {errors.isVariable && (
-              <small className="danger-text">{errors.isVariable.message}</small>
-            )}
-          </div>
+
+                {/* Title and Is Variable  */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="title" className="form-label" required>
+                            Title
+                        </Label>
+                        <input
+                            type="text"
+                            id="title"
+                            className="form-control form-control-sm"
+                            {...register("title")}
+                            placeholder="Enter title"
+                        />
+                        {errors.title && (
+                            <small className="danger-text">
+                                {errors.title.message}
+                            </small>
+                        )}
+                    </div>
+
+                    {/* <div className="col-md-6">
+                        <Label htmlFor="isVariable" className="form-label" required>
+                            Is Variable
+                        </Label>
+                        <select
+                            id="isVariable"
+                            className="form-select form-select-sm"
+                            {...register("isVariable", {
+                                setValueAs: (v) => v === "true" ? true : v === "false" ? false : false,
+                            })}
+                        >
+                            <option value="false">False</option>
+                            <option value="true">True</option>
+                        </select>
+                        {errors.isVariable && (
+                            <small className="danger-text">{errors.isVariable.message}</small>
+                        )}
+                    </div>                  */}
+
+                    <div className="col-md-6 mt-2">
+                        <Label htmlFor="isVariable" className="form-label" required>
+                            Payment Type
+                        </Label>
+
+                        <Controller
+                            name="isVariable"
+                            control={control}
+                            defaultValue={defaultRecurringExpense.isVariable ?? false}
+                            render={({ field }) => (
+                                <div className="d-flex align-items-center gap-3">
+                                    <div className="form-check">
+                                        <input
+                                            type="radio"
+                                            id="isVariableTrue"
+                                            className="form-check-input"
+                                            checked={field.value === true}
+                                            onChange={() => field.onChange(true)}
+                                        />
+                                        <Label htmlFor="isVariableTrue" className="form-check-label">
+                                            Is Variable
+                                        </Label>
+                                    </div>
+
+                                    <div className="form-check">
+                                        <input
+                                            type="radio"
+                                            id="isVariableFalse"
+                                            className="form-check-input"
+                                            checked={field.value === false}
+                                            onChange={() => field.onChange(false)}
+                                        />
+                                        <Label htmlFor="isVariableFalse" className="form-check-label">
+                                            Fixed
+                                        </Label>
+                                    </div>
+                                </div>
+                            )}
+                        />
+                        {errors.isVariable && (
+                            <small className="danger-text">{errors.isVariable.message}</small>
+                        )}
+                    </div>
+                </div>
+
+                {/* Date and Amount */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="strikeDate" className="form-label" required>
+                            Strike Date
+                        </Label>
+                        <DatePicker
+                            name="strikeDate"
+                            control={control}
+                            minDate={new Date()}
+                            className='w-100'
+                        />
+                        {errors.strikeDate && (
+                            <small className="danger-text">
+                                {errors.strikeDate.message}
+                            </small>
+                        )}
+                    </div>
+
+                    <div className="col-md-6">
+                        <Label htmlFor="amount" className="form-label" required>
+                            Amount
+                        </Label>
+                        <input
+                            type="number"
+                            id="amount"
+                            className="form-control form-control-sm"
+                            min="1"
+                            step="0.01"
+                            inputMode="decimal"
+                            {...register("amount", { valueAsNumber: true })}
+                            placeholder="Enter amount"
+                        />
+                        {errors.amount && (
+                            <small className="danger-text">{errors.amount.message}</small>
+                        )}
+                    </div>
+                </div>
+
+                {/* Payee and Currency  */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="payee" className="form-label" required>
+                            Payee (Supplier Name/Transporter Name/Other)
+                        </Label>
+                        <InputSuggestions
+                            organizationList={Payees}
+                            value={watch("payee") || ""}
+                            onChange={(val) =>
+                                setValue("payee", val, { shouldValidate: true })
+                            }
+                            error={errors.payee?.message}
+                            placeholder="Select or enter payee"
+                        />
+                    </div>
+
+                    <div className="col-md-6">
+                        <Label htmlFor="currencyId" className="form-label" required>
+                            Currency
+                        </Label>
+                        <select
+                            id="currencyId"
+                            className="form-select form-select-sm"
+                            {...register("currencyId")}
+                        >
+                            <option value="">Select Currency</option>
+
+                            {currencyLoading && <option>Loading...</option>}
+
+                            {!currencyLoading &&
+                                !currencyError &&
+                                currencyData?.map((currency) => (
+                                    <option key={currency.id} value={currency.id}>
+                                        {`${currency.currencyName} (${currency.symbol})`}
+                                    </option>
+                                ))}
+                        </select>
+                        {errors.currencyId && (
+                            <small className="danger-text">{errors.currencyId.message}</small>
+                        )}
+                    </div>
+                </div>
+
+                {/* Frequency To and Status Id  */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="frequency" className="form-label" required>
+                            Frequency
+                        </Label>
+                        <select
+                            id="frequency"
+                            className="form-select form-select-sm"
+                            {...register("frequency", { valueAsNumber: true })}
+                        >
+                            <option value="">Select Frequency</option>
+                            {Object.entries(FREQUENCY_FOR_RECURRING).map(([key, label]) => (
+                                <option key={key} value={key}>
+                                    {label}
+                                </option>
+                            ))}
+                        </select>
+                        {errors.frequency && (
+                            <small className="danger-text">{errors.frequency.message}</small>
+                        )}
+                    </div>
+                    <div className="col-md-6">
+                        <Label htmlFor="statusId" className="form-label" required>
+                            Status
+                        </Label>
+                        <select
+                            id="statusId"
+                            className="form-select form-select-sm"
+                            {...register("statusId")}
+                        >
+                            <option value="">Select Status</option>
+                            {statusLoading && <option>Loading...</option>}
+                            {!statusLoading && !statusError && statusData?.map((status) => (
+                                <option key={status.id} value={status.id}>
+                                    {status.name}
+                                </option>
+                            ))}
+                        </select>
+                        {errors.statusId && (
+                            <small className="danger-text">{errors.statusId.message}</small>
+                        )}
+                    </div>
+                </div>
+
+                {/* Payment Buffer Days and Number of Iteration */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="paymentBufferDays" className="form-label" required>
+                            Payment Buffer Days
+                        </Label>
+                        <input
+                            type="number"
+                            id="paymentBufferDays"
+                            className="form-control form-control-sm"
+                            min="0"
+                            step="1"
+                            {...register("paymentBufferDays", { valueAsNumber: true })}
+                            placeholder="Enter payment buffer days"
+                        />
+                        {errors.paymentBufferDays && (
+                            <small className="danger-text">{errors.paymentBufferDays.message}</small>
+                        )}
+                    </div>
+                    <div className="col-md-6">
+                        <Label htmlFor="numberOfIteration" className="form-label" required>
+                            Number of Iteration
+                        </Label>
+                        <input
+                            type="number"
+                            id="numberOfIteration"
+                            className="form-control form-control-sm"
+                            min="1"
+                            step="1"
+                            {...register("numberOfIteration", { valueAsNumber: true })}
+                            placeholder="Enter number of iterations"
+                        />
+                        {errors.numberOfIteration && (
+                            <small className="danger-text">{errors.numberOfIteration.message}</small>
+                        )}
+                    </div>
+                </div>
+
+                {/* Notify  */}
+                {/* <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="notifyTo" className="form-label" required>
+                            Notify Employees
+                        </Label>
+                        <input
+                            type="text"
+                            id="notifyTo"
+                            className="form-control form-control-sm"
+                            {...register("notifyTo")}
+
+                        />
+                        {errors.notifyTo && (
+                            <small className="danger-text">
+                                {errors.notifyTo.message}
+                            </small>
+                        )}
+                    </div>
+                </div> */}
+
+                <div className="row my-2 text-start">
+                    <div className="col-md-6">
+                        <Label htmlFor="notifyTo" className="form-label" required>
+                            Notify Employees
+                        </Label>
+
+                        <MultiEmployeeSearchInput
+                            control={control}
+                            name="notifyTo"
+                            projectId={watch("projectId")}
+                            placeholder="Select Employees"
+                            forAll={true}
+                        />
+                    </div>
+                </div>
+
+                {/* Description  */}
+                <div className="row my-2 text-start">
+                    <div className="col-md-12">
+                        <Label htmlFor="description" className="form-label" required>
+                            Description
+                        </Label>
+                        <textarea
+                            id="description"
+                            className="form-control form-control-sm"
+                            {...register("description")}
+                            rows="2"
+                        ></textarea>
+                        {errors.description && (
+                            <small className="danger-text">
+                                {errors.description.message}
+                            </small>
+                        )}
+                    </div>
+                </div>
+
+                <div className="d-flex justify-content-end gap-3">
+                    <button
+                        type="reset"
+                        onClick={handleClose}
+                        className="btn btn-label-secondary btn-sm mt-3"
+                    >
+                        Cancel
+                    </button>
+                    <button
+                        type="submit"
+                        className="btn btn-primary btn-sm mt-3"
+                    >
+                        {createPending || isPending ? "Please wait...." : requestToEdit ? "Update":"Submit"}
+                    </button>
+                </div>
+            </form>
         </div>
-
-        {/* Date and Amount */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="strikeDate" className="form-label" required>
-              Strike Date
-            </Label>
-            <DatePicker
-              name="strikeDate"
-              control={control}
-              minDate={new Date()}
-              className="w-100"
-            />
-            {errors.strikeDate && (
-              <small className="danger-text">{errors.strikeDate.message}</small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <Label htmlFor="amount" className="form-label" required>
-              Amount
-            </Label>
-            <input
-              type="number"
-              id="amount"
-              className="form-control form-control-sm"
-              min="1"
-              step="0.01"
-              inputMode="decimal"
-              {...register("amount", { valueAsNumber: true })}
-              placeholder="Enter amount"
-            />
-            {errors.amount && (
-              <small className="danger-text">{errors.amount.message}</small>
-            )}
-          </div>
-        </div>
-
-        {/* Payee and Currency  */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="payee" className="form-label" required>
-              Payee (Supplier Name/Transporter Name/Other)
-            </Label>
-            <InputSuggestions
-              organizationList={Payees}
-              value={watch("payee") || ""}
-              onChange={(val) =>
-                setValue("payee", val, { shouldValidate: true })
-              }
-              error={errors.payee?.message}
-              placeholder="Select or enter payee"
-            />
-          </div>
-
-          <div className="col-md-6">
-            <Label htmlFor="currencyId" className="form-label" required>
-              Currency
-            </Label>
-            <select
-              id="currencyId"
-              className="form-select form-select-sm"
-              {...register("currencyId")}
-            >
-              <option value="">Select Currency</option>
-
-              {currencyLoading && <option>Loading...</option>}
-
-              {!currencyLoading &&
-                !currencyError &&
-                currencyData?.map((currency) => (
-                  <option key={currency.id} value={currency.id}>
-                    {`${currency.currencyName} (${currency.symbol})`}
-                  </option>
-                ))}
-            </select>
-            {errors.currencyId && (
-              <small className="danger-text">{errors.currencyId.message}</small>
-            )}
-          </div>
-        </div>
-
-        {/* Frequency To and Status Id  */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="frequency" className="form-label" required>
-              Frequency
-            </Label>
-            <select
-              id="frequency"
-              className="form-select form-select-sm"
-              {...register("frequency", { valueAsNumber: true })}
-            >
-              <option value="">Select Frequency</option>
-              {Object.entries(FREQUENCY_FOR_RECURRING).map(([key, label]) => (
-                <option key={key} value={key}>
-                  {label}
-                </option>
-              ))}
-            </select>
-            {errors.frequency && (
-              <small className="danger-text">{errors.frequency.message}</small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <Label htmlFor="statusId" className="form-label" required>
-              Status
-            </Label>
-            <select
-              id="statusId"
-              className="form-select form-select-sm"
-              {...register("statusId")}
-            >
-              <option value="">Select Status</option>
-
-              {statusLoading && <option>Loading...</option>}
-
-              {!currencyLoading &&
-                !currencyError &&
-                statusData?.map((status) => (
-                  <option key={status.id} value={status.id}>
-                    {`${status.name} `}
-                  </option>
-                ))}
-            </select>
-            {errors.statusId && (
-              <small className="danger-text">{errors.statusId.message}</small>
-            )}
-          </div>
-        </div>
-
-        {/* Payment Buffer Days and Number of Iteration */}
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="paymentBufferDays" className="form-label" required>
-              Payment Buffer Days
-            </Label>
-            <input
-              type="number"
-              id="paymentBufferDays"
-              className="form-control form-control-sm"
-              min="0"
-              step="1"
-              {...register("paymentBufferDays", { valueAsNumber: true })}
-              placeholder="Enter payment buffer days"
-            />
-            {errors.paymentBufferDays && (
-              <small className="danger-text">
-                {errors.paymentBufferDays.message}
-              </small>
-            )}
-          </div>
-          <div className="col-md-6">
-            <Label htmlFor="numberOfIteration" className="form-label" required>
-              Number of Iteration
-            </Label>
-            <input
-              type="number"
-              id="numberOfIteration"
-              className="form-control form-control-sm"
-              min="1"
-              step="1"
-              {...register("numberOfIteration", { valueAsNumber: true })}
-              placeholder="Enter number of iterations"
-            />
-            {errors.numberOfIteration && (
-              <small className="danger-text">
-                {errors.numberOfIteration.message}
-              </small>
-            )}
-          </div>
-        </div>
-
-        <div className="row my-2 text-start">
-          <div className="col-md-6">
-            <Label htmlFor="notifyTo" className="form-label" required>
-              Notify Employees
-            </Label>
-
-            <MultiEmployeeSearchInput
-              control={control}
-              name="notifyTo"
-              projectId={watch("projectId")}
-              placeholder="Select Employees"
-              forAll={true}
-            />
-          </div>
-        </div>
-
-        {/* Description  */}
-        <div className="row my-2 text-start">
-          <div className="col-md-12">
-            <Label htmlFor="description" className="form-label" required>
-              Description
-            </Label>
-            <textarea
-              id="description"
-              className="form-control form-control-sm"
-              {...register("description")}
-              rows="2"
-            ></textarea>
-            {errors.description && (
-              <small className="danger-text">
-                {errors.description.message}
-              </small>
-            )}
-          </div>
-        </div>
-
-        <div className="d-flex justify-content-end gap-3">
-          <button
-            type="reset"
-            onClick={handleClose}
-            className="btn btn-label-secondary btn-sm mt-3"
-          >
-            Cancel
-          </button>
-          <button type="submit" className="btn btn-primary btn-sm mt-3">
-            Submit
-          </button>
-        </div>
-      </form>
-    </div>
-  );
+    )
 }
 
-export default ManageRecurringExpense;
+export default ManageRecurringExpense
+
diff --git a/src/components/RecurringExpense/RecurringExpenseList.jsx b/src/components/RecurringExpense/RecurringExpenseList.jsx
index 1a61847f..8fb81227 100644
--- a/src/components/RecurringExpense/RecurringExpenseList.jsx
+++ b/src/components/RecurringExpense/RecurringExpenseList.jsx
@@ -148,7 +148,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
           isOpen={IsDeleteModalOpen}
           type="delete"
           header="Delete Recurring Expense"
-          message="Are you sure you want to delete?"
+          message="Under the working"
           onSubmit={handleDelete}
           onClose={() => setIsDeleteModalOpen(false)}
           paramData={deletingId}
@@ -188,7 +188,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                       </td>
                     ))}
                     <td className="sticky-action-column bg-white">
-                      <div className="d-flex justify-content-center gap-0">
+                      <div className="d-flex flex-row gap-2 gap-0">
                         <i
                           className="bx bx-show text-primary cursor-pointer"
                           // onClick={() =>
@@ -198,7 +198,6 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                           //     })
                           // }
                         ></i>
-                        {/* Uncomment for edit/delete actions */}
 
                         <div className="dropdown z-2">
                           <button
@@ -213,7 +212,7 @@ const RecurringExpenseList = ({ search, filterStatuses }) => {
                               onClick={() =>
                                 setManageRequest({
                                   IsOpen: true,
-                                  RecurringId: recurringExpense.id,
+                                  RecurringId: recurringExpense?.id,
                                 })
                               }
                             >
diff --git a/src/components/common/TimeLine.jsx b/src/components/common/TimeLine.jsx
index a43d632a..52316866 100644
--- a/src/components/common/TimeLine.jsx
+++ b/src/components/common/TimeLine.jsx
@@ -27,7 +27,7 @@ const Timeline = ({ items = [], transparent = true }) => {
           <div className="timeline-event">
             <div className="timeline-header mb-3 d-flex justify-content-between">
               <h6 className="mb-0 text-body">{item.title}</h6>
-              <small className="text-body-secondary"><Tooltip text={formatUTCToLocalTime(item.timeAgo,true)}>{moment(item.timeAgo).fromNow()}</Tooltip></small>
+              <small className="text-body-secondary"><Tooltip text={formatUTCToLocalTime(item.timeAgo,true)}>{moment.utc(item.timeAgo).local().fromNow()}</Tooltip></small>
             </div>
 
             {item.description && <p className="mb-2">{item.description}</p>}
diff --git a/src/hooks/useExpense.js b/src/hooks/useExpense.js
index 68cac17f..34b9c7ac 100644
--- a/src/hooks/useExpense.js
+++ b/src/hooks/useExpense.js
@@ -492,7 +492,6 @@ export const useRecurringExpenseList = (
   return useQuery({
     queryKey: ["recurringExpenseList",pageSize,pageNumber,filter,isActive,searchString],
     queryFn: async()=>{
-      debugger
       const resp = await ExpenseRepository.GetRecurringExpenseList(pageSize,pageNumber,filter,isActive,searchString);
       return resp.data;
     },
@@ -504,7 +503,6 @@ export const useRecurringExpenseDetail =(RequestId)=>{
   return useQuery({
     queryKey:['recurringExpense',RequestId],
     queryFn:async()=>{
-      RequestId
       const resp = await ExpenseRepository.GetRecurringExpense(RequestId);
       return resp.data;
     },
diff --git a/src/pages/RecurringExpense/RecurringExpensePage.jsx b/src/pages/RecurringExpense/RecurringExpensePage.jsx
index 0fd5ceb2..1c90dd19 100644
--- a/src/pages/RecurringExpense/RecurringExpensePage.jsx
+++ b/src/pages/RecurringExpense/RecurringExpensePage.jsx
@@ -19,7 +19,7 @@ export const useRecurringExpenseContext = () => {
 const RecurringExpensePage = () => {
     const [ManageRequest, setManageRequest] = useState({
         IsOpen: null,
-        RequestId: null,
+        RecurringId: null,
     });
     const [ViewRequest, setVieRequest] = useState({ view: false, requestId: null })
 
@@ -41,7 +41,6 @@ const RecurringExpensePage = () => {
                 : [...prev, id]
         );
     };
-
     return (
         <RecurringExpenseContext.Provider value={contextValue}>
             <div className="container-fluid">
@@ -102,7 +101,7 @@ const RecurringExpensePage = () => {
                                     onClick={() =>
                                         setManageRequest({
                                             IsOpen: true,
-                                            expenseId: null,
+                                            RecurringId: null,
                                         })
                                     }
                                 >
@@ -118,7 +117,6 @@ const RecurringExpensePage = () => {
 
                 <RecurringExpenseList filterStatuses={selectedStatuses} search={search} />
 
-                {/* Add/Edit Modal */}
                 {ManageRequest.IsOpen && (
                     <GlobalModel
                         isOpen
@@ -128,11 +126,11 @@ const RecurringExpensePage = () => {
                         }
                     >
                         <ManageRecurringExpense
-                            key={ManageRequest.RequestId ?? "new"}
-                            requestToEdit={ManageRequest.RequestId}
+                            key={ManageRequest.RecurringId ?? "new"}
                             closeModal={() =>
-                                setManageRequest({ IsOpen: null, RequestId: null })
+                                setManageRequest({ IsOpen: null, RecurringId: null })
                             }
+                            requestToEdit={ManageRequest.RecurringId}
                         />
                     </GlobalModel>
                 )}