diff --git a/src/components/FormElements/DatePicker/DatePicker.tsx b/src/components/FormElements/DatePicker/DatePicker.tsx
index a03aeba..5960f04 100644
--- a/src/components/FormElements/DatePicker/DatePicker.tsx
+++ b/src/components/FormElements/DatePicker/DatePicker.tsx
@@ -74,7 +74,9 @@ const DatePicker = <T extends FieldValues>({
                     maxDate={maxDate}
                     onlyMonthPicker={onlyMonthPicker}
                     plugins={
-                      timePicker ? [<TimePicker position="bottom" />] : []
+                      timePicker
+                        ? [<TimePicker key={name} position="bottom" />]
+                        : []
                     }
                     onlyYearPicker={onlyYearPicker}
                     multiple={multiple}
diff --git a/src/components/Tables/companies/index.tsx b/src/components/Tables/companies/index.tsx
index e2261a7..4eb687d 100644
--- a/src/components/Tables/companies/index.tsx
+++ b/src/components/Tables/companies/index.tsx
@@ -1,7 +1,11 @@
 "use client";
-import { ExclamationIcon, PencilSquareIcon, TrashIcon } from "@/assets/icons";
+import {
+  ExclamationIcon,
+  EyeIcon,
+  PencilSquareIcon,
+  TrashIcon,
+} from "@/assets/icons";
 import ConfirmationModal from "@/components/ui/ConfirmationModal";
-import { _TooltipDefaultParams } from "@/constants/tooltip";
 import {
   Table,
   TableBody,
@@ -11,6 +15,7 @@ import {
   TableRow,
 } from "@/components/ui/table";
 import TableSkeleton from "@/components/ui/TableSkeleton";
+import { _TooltipDefaultParams } from "@/constants/tooltip";
 import { formatPhoneNumber } from "@/utils/shared";
 import Link from "next/link";
 import { Tooltip } from "react-tooltip";
@@ -116,6 +121,17 @@ const CompaniesTable = ({}: IProps) => {
                       <span className="sr-only">Edit Company </span>
                       <PencilSquareIcon />
                     </button>
+                    <button
+                      data-tooltip-id="details"
+                      data-tooltip-content="Details"
+                      data-tooltip-place="top"
+                      onClick={() => {
+                        router.push(`${pathName}/details/${company.id}`);
+                      }}
+                    >
+                      <Tooltip {..._TooltipDefaultParams({ id: "details" })} />
+                      <EyeIcon />
+                    </button>
                     <button
                       data-tooltip-id="feedback"
                       data-tooltip-content="Feedback"
diff --git a/src/components/Tables/customers/AssignToCompanyModalContent.tsx b/src/components/Tables/customers/AssignToCompanyModalContent.tsx
index 36701d4..ab8b9ed 100644
--- a/src/components/Tables/customers/AssignToCompanyModalContent.tsx
+++ b/src/components/Tables/customers/AssignToCompanyModalContent.tsx
@@ -38,7 +38,7 @@ const AssignToCompanyModalContent: FC<IProps> = ({
           : [],
       );
     }
-  }, [status]);
+  }, [status, isSuccess, data?.data.companies]);
 
   const assignCompany = (data: TAssignCustomerToCompanyCredentials) => {
     setCompanies(data);
diff --git a/src/components/forms/companies/useCreateCompanyPresenter.ts b/src/components/forms/companies/useCreateCompanyPresenter.ts
index 2941204..4649e22 100644
--- a/src/components/forms/companies/useCreateCompanyPresenter.ts
+++ b/src/components/forms/companies/useCreateCompanyPresenter.ts
@@ -39,7 +39,7 @@ const useCreateCompanyPresenter = ({ defaultValues, editMode, id }: IProps) => {
       );
       setValue("tags.categories", categories);
     }
-  }, [defaultValues]);
+  }, [defaultValues,setValue]);
   const router = useRouter();
   const { data: companyCategories } = useCompanyCategoriesQuery();
   const { mutate: createCompany, isPending: isCreating } = useCreateCompany();
diff --git a/src/components/forms/customers/useCreateCustomerPresenter.ts b/src/components/forms/customers/useCreateCustomerPresenter.ts
index 5060f28..e245563 100644
--- a/src/components/forms/customers/useCreateCustomerPresenter.ts
+++ b/src/components/forms/customers/useCreateCustomerPresenter.ts
@@ -44,7 +44,7 @@ const useCreateCustomerPresenter = ({
       );
       setValue("companies", companies);
     }
-  }, [defaultValues]);
+  }, [defaultValues, setValue]);
   const onSubmit: SubmitHandler<CreateCustomerCredentials> = (data) => {
     if (editMode) {
       updateCustomer({
diff --git a/src/constants/Api_Params.ts b/src/constants/Api_Params.ts
index c3f19d8..7505e1e 100644
--- a/src/constants/Api_Params.ts
+++ b/src/constants/Api_Params.ts
@@ -1,5 +1,5 @@
 export const apiDefaultParams = {
-  sort_by: "created date",
+  sort_by: "created_at",
   sort_order: "asc",
   offset: 0,
   limit: 10,
diff --git a/src/contexts/User.ctx.tsx b/src/contexts/User.ctx.tsx
index 5a33b0a..c57ff02 100644
--- a/src/contexts/User.ctx.tsx
+++ b/src/contexts/User.ctx.tsx
@@ -38,6 +38,15 @@ export const UserProvider: React.FC<UserProviderProps> = ({ children }) => {
   const [accessToken, setAccessToken] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const router = useRouter();
+
+  const logout = useCallback(() => {
+    setUser(null);
+    setAccessToken(null);
+    Cookies.remove(COOKIE_KEYS.access_token);
+    Cookies.remove(COOKIE_KEYS.refresh_token);
+    Cookies.remove(COOKIE_KEYS.user);
+    router.refresh();
+  }, [router]);
   useEffect(() => {
     try {
       const tokenFromCookie = Cookies.get(COOKIE_KEYS.access_token);
@@ -60,7 +69,7 @@ export const UserProvider: React.FC<UserProviderProps> = ({ children }) => {
     } finally {
       setIsLoading(false);
     }
-  }, []);
+  }, [logout]);
 
   const setAuthState = useCallback((data: ILoginResponse) => {
     setAccessToken(data.access_token);
@@ -71,15 +80,6 @@ export const UserProvider: React.FC<UserProviderProps> = ({ children }) => {
     Cookies.set(COOKIE_KEYS.user, JSON.stringify(data.user));
   }, []);
 
-  const logout = useCallback(() => {
-    setUser(null);
-    setAccessToken(null);
-    Cookies.remove(COOKIE_KEYS.access_token);
-    Cookies.remove(COOKIE_KEYS.refresh_token);
-    Cookies.remove(COOKIE_KEYS.user);
-    router.refresh();
-  }, []);
-
   const value = useMemo(
     () => ({
       user,
diff --git a/src/hooks/queries/useCompaniesQueries.ts b/src/hooks/queries/useCompaniesQueries.ts
index e8ab92a..79dce5c 100644
--- a/src/hooks/queries/useCompaniesQueries.ts
+++ b/src/hooks/queries/useCompaniesQueries.ts
@@ -55,7 +55,7 @@ export const useUpdateCompany = (id: string) => {
 
 export const useCompanyDetails = (id: string) => {
   const queryKey = useMemo(
-    () => [API_ENDPOINTS.COMPANIES.READ_ALL, "details"],
+    () => [API_ENDPOINTS.COMPANIES.READ_ALL, id, "details"],
     [id],
   );
   return useQuery({