diff --git a/src/components/Documents/DocumentViewerModal.jsx b/src/components/Documents/DocumentViewerModal.jsx
new file mode 100644
index 00000000..c5595e84
--- /dev/null
+++ b/src/components/Documents/DocumentViewerModal.jsx
@@ -0,0 +1,27 @@
+import React, { useEffect } from "react";
+import { useDocumentVersion } from "../../hooks/useDocument";
+import { useDocumentContext } from "./Documents";
+import { error } from "pdf-lib";
+
+const DocumentViewerModal = () => {
+  const { viewDoc,setOpenDocument } = useDocumentContext();
+  const { data, isLoading, isError,error } = useDocumentVersion(viewDoc.document);
+
+  useEffect(() => {
+    if (data?.data) {
+      const fileUrl = data.data; 
+      window.open(fileUrl, "_blank");
+      setOpenDocument(false)
+    }
+  }, [data]);
+
+  if (isLoading) return <p>Loading document...</p>;
+  if (isError) return <div>
+    <p className="danger-text">{error.message}</p>
+  </div>;
+
+  // Nothing to render inside modal since we redirect
+  return null;
+};
+
+export default DocumentViewerModal;
diff --git a/src/components/Documents/Documents.jsx b/src/components/Documents/Documents.jsx
index fbb89d69..85efe79c 100644
--- a/src/components/Documents/Documents.jsx
+++ b/src/components/Documents/Documents.jsx
@@ -14,6 +14,7 @@ import {
 import { zodResolver } from "@hookform/resolvers/zod";
 import ManageDocument from "./ManageDocument";
 import ViewDocument from "./ViewDocument";
+import DocumentViewerModal from "./DocumentViewerModal";
 
 // Context
 export const DocumentContext = createContext();
@@ -50,6 +51,7 @@ const Documents = ({ Document_Entity, Entity }) => {
   const [refetchFn, setRefetchFn] = useState(null);
   const [DocumentEntity,setDocumentEntity] = useState(Document_Entity)
   const { employeeId } = useParams();
+  const [OpenDocument,setOpenDocument] = useState(false)
   const [ManageDoc, setManageDoc] = useState({
     document: null,
     isOpen: false,
@@ -91,7 +93,9 @@ const Documents = ({ Document_Entity, Entity }) => {
     ManageDoc,
     setManageDoc,
     viewDoc,
-    setViewDoc
+    setViewDoc,
+    setOpenDocument,
+    OpenDocument
   }
 
   useEffect(()=>{
@@ -189,6 +193,13 @@ const Documents = ({ Document_Entity, Entity }) => {
           <ViewDocument />
         </GlobalModel>
       )}
+
+      {OpenDocument && (
+        <GlobalModel  isOpen={OpenDocument} closeModal={()=>setOpenDocument(false)}>
+          <DocumentViewerModal/>
+        </GlobalModel>
+      )}
+
     </div>
     </DocumentContext.Provider>
    
diff --git a/src/components/Documents/DocumentsList.jsx b/src/components/Documents/DocumentsList.jsx
index 3fe39a49..7cc64e53 100644
--- a/src/components/Documents/DocumentsList.jsx
+++ b/src/components/Documents/DocumentsList.jsx
@@ -9,7 +9,6 @@ import { DocumentTableSkeleton } from "./DocumentSkeleton";
 import { getDocuementsStatus, useDocumentContext } from "./Documents";
 import Pagination from "../common/Pagination";
 
-
 const DocumentsList = ({
   Document_Entity,
   Entity,
@@ -19,7 +18,7 @@ const DocumentsList = ({
   setRefetchFn,
 }) => {
   const debouncedSearch = useDebounce(searchText, 500);
-  const [currentPage,setCurrentPage] = useState(1)
+  const [currentPage, setCurrentPage] = useState(1);
   const { data, isError, isLoading, error, refetch, isFetching } =
     useDocumentListByEntityId(
       Document_Entity,
@@ -40,19 +39,20 @@ const DocumentsList = ({
     setIsRefetching(isFetching);
   }, [isFetching, setIsRefetching]);
 
-  const {setManageDoc,setViewDoc} = useDocumentContext()
+  const { setManageDoc, setViewDoc } = useDocumentContext();
 
-  // check no data scenarios
-  const noData = !isLoading && !isError && data?.data.length === 0;
-  const isSearchEmpty = noData && !!debouncedSearch;
-  const isFilterEmpty = noData && false;
-  const isInitialEmpty = noData && !debouncedSearch;
-   const paginate = (page) => {
+  const paginate = (page) => {
     if (page >= 1 && page <= (data?.totalPages ?? 1)) {
       setCurrentPage(page);
     }
   };
-  if (isLoading || isFetching) return <DocumentTableSkeleton />
+
+  const noData = !isLoading && !isError && data?.data.length === 0;
+  const isSearchEmpty = noData && !!debouncedSearch;
+  const isFilterEmpty = noData && !!filters && Object.keys(filters).length > 0;
+  const isInitialEmpty = noData && !debouncedSearch && !isFilterEmpty;
+
+  if (isLoading || isFetching) return <DocumentTableSkeleton />;
   if (isError)
     return <div>Error: {error?.message || "Something went wrong"}</div>;
   if (isInitialEmpty) return <div>No documents found yet.</div>;
@@ -137,9 +137,19 @@ const DocumentsList = ({
               ))}
               <td className="text-center">
                 <div className="d-flex justify-content-center gap-2">
-                  <i className="bx bx-show text-primary cursor-pointer" onClick={()=>setViewDoc({document:doc?.id,isOpen:true})}></i>
+                  <i
+                    className="bx bx-show text-primary cursor-pointer"
+                    onClick={() =>
+                      setViewDoc({ document: doc?.id, isOpen: true })
+                    }
+                  ></i>
 
-                  <i className="bx bx-edit text-secondary cursor-pointer" onClick={()=>setManageDoc({document:doc?.id,isOpen:true})}></i>
+                  <i
+                    className="bx bx-edit text-secondary cursor-pointer"
+                    onClick={() =>
+                      setManageDoc({ document: doc?.id, isOpen: true })
+                    }
+                  ></i>
 
                   <i className="bx bx-trash text-danger cursor-pointer"></i>
                 </div>
@@ -149,12 +159,12 @@ const DocumentsList = ({
         </tbody>
       </table>
       {data?.data?.length > 0 && (
-          <Pagination
-            currentPage={currentPage}
-            totalPages={data?.totalPages}
-            onPageChange={paginate}
-          />
-        )}
+        <Pagination
+          currentPage={currentPage}
+          totalPages={data?.totalPages}
+          onPageChange={paginate}
+        />
+      )}
     </div>
   );
 };
diff --git a/src/components/Documents/ViewDocument.jsx b/src/components/Documents/ViewDocument.jsx
index f22e836e..95b673b8 100644
--- a/src/components/Documents/ViewDocument.jsx
+++ b/src/components/Documents/ViewDocument.jsx
@@ -12,7 +12,7 @@ import VersionListSkeleton from "./VersionListSkeleton";
 import DocumentDetailsSkeleton from "./DocumentDetailsSkeleton ";
 
 const ViewDocument = () => {
-  const { viewDoc, setViewDoc } = useDocumentContext();
+  const { viewDoc, setViewDoc,setOpenDocument } = useDocumentContext();
   const [currentPage, setCurrentPage] = useState(1);
   const { data, isLoading, isError, error } = useDocumentDetails(
     viewDoc?.document
@@ -39,8 +39,7 @@ const ViewDocument = () => {
     <div className="p-1">
       <p className="fw-bold fs-6">Document Details</p>
 
-      {/* Row 1 */}
-      {/* Row 1 */}
+  
       <div className="row mb-2">
         <div className="col-12 col-md-6">
           <div className="d-flex text-start">
@@ -184,8 +183,9 @@ const ViewDocument = () => {
                     <small>{getDocuementsStatus(document.isVerified)}</small>
                   </div>
                 </div>
-                <div className="d-flex align-items-center text-secondary">
-                  Upload By
+                <div className="d-flex align-items-center justify-content-between text-secondary">
+                 <div className="d-flex align-items-center">
+                   Upload By
                   <Avatar
                     size="xs"
                     classAvatar="m-0"
@@ -197,14 +197,18 @@ const ViewDocument = () => {
                       document.uploadedBy?.lastName ?? ""
                     }`.trim() || "N/A"}
                   </span>
+                 </div>
+                 <div className="d-flex text-primary align-items-center cursor-pointer"onClick={()=>setOpenDocument(true)} >
+                    <small >view</small> <i className='bx bx-sm bx-link-external'></i>
+                 </div>
                 </div>
-                <div className="d-flex gap-2">
+                {/* <div className="d-flex gap-2">
                   {document?.updatedAt && (
                     <span className="small text-secondary">
                       Updated At : {formatUTCToLocalTime(document.updatedAt)}
                     </span>
                   )}
-                </div>
+                </div> */}
               </a>
             ))}
         </div>)}
diff --git a/src/hooks/useDocument.js b/src/hooks/useDocument.js
index 609955c6..f6fed0a2 100644
--- a/src/hooks/useDocument.js
+++ b/src/hooks/useDocument.js
@@ -91,6 +91,14 @@ export const useDocumentVersionList = (parentAttachmentId,pageSize,pageNumber) =
   });
 };
 
+
+export const useDocumentVersion = (id)=>{
+  return useQuery({
+    queryKey:["DocumentVersion",id],
+    queryFn:async()=> await DocumentRepository.getDocumentVersion(id),
+    enabled:!!id
+  })
+} 
 //----------------------- MUTATION -------------------------
 
 export const useUploadDocument = (onSuccessCallBack) => {
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index f8f48c84..6b97ffce 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -86,12 +86,12 @@ const LoginPage = () => {
     }
   }, [IsLoginWithOTP]);
 
-  useEffect(() => {
-  const token = localStorage.getItem("jwtToken");
-  if (token) {
-    navigate("/dashboard");
-  }
-}, [navigate]);
+//   useEffect(() => {
+//   const token = localStorage.getItem("jwtToken");
+//   if (token) {
+//     navigate("/dashboard");
+//   }
+// }, [navigate]);
 
   return (
     <AuthWrapper>