diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js
index 813641b..8060f93 100644
--- a/src/views/SimproV2/CreatedProyek/DialogGantt.js
+++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js
@@ -13,7 +13,7 @@ import DialogUserGantt from './DialogUserGantt';
 import { Link } from 'react-router-dom';
 
 const { Option } = Select
-const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, companyId, companyName, hierarchyId, hierarchyName, openDialogHierarchy, isLogin, token, role_id, user_id, dataViewStartDate }) => {
+const DialogGantt = ({ openDialog, closeDialog, role_name, toggleDialog, idTask, proyekName, companyId, companyName, hierarchyId, hierarchyName, openDialogHierarchy, isLogin, token, role_id, user_id, dataViewStartDate }) => {
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -134,7 +134,8 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
                 user_id,
                 company_id: companyId,
                 dataViewStartDate,
-                companyName
+                companyName,
+                role_name
               }
             }}>
               <Tooltip title="Gantt">
diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js
index 4896c72..b98e356 100644
--- a/src/views/SimproV2/CreatedProyek/index.js
+++ b/src/views/SimproV2/CreatedProyek/index.js
@@ -156,7 +156,7 @@ const CreatedProyek = ({ params, ...props }) => {
   const [openDialogDoc, setOpenDialogDoc] = useState(false);
   const [proyekName, setProyekName] = useState("");
   const [openDialogProyek, setOpenDialogProyek] = useState(false);
-  const [companyId, setCompanyId] = useState(props.role_name !== 'Super Admin' ? company_id : 0);
+  const [companyId, setCompanyId] = useState(role_name !== 'Super Admin' ? company_id : 0);
   const [companyName, setCompanyName] = useState('');
   // project charter
   const [projectCharter, setProjectCharter] = useState(null);
@@ -1703,6 +1703,7 @@ const CreatedProyek = ({ params, ...props }) => {
                     token,
                     role_id,
                     user_id,
+                    role_name,
                     company_id: text.company_id,
                     dataViewStartDate,
                     companyName: (role_name === 'Super Admin' ? text.join_third_company_name : JSON.parse(configApp).company_name)
@@ -2124,6 +2125,7 @@ const CreatedProyek = ({ params, ...props }) => {
         companyName={companyName}
         proyekName={proyekName}
         companyId={companyId}
+        role_name={role_name}
         dataViewStartDate={dataViewStartDate}
       />
     ),
diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js
index 4c672e3..7570d2a 100644
--- a/src/views/SimproV2/Gantt/index.js
+++ b/src/views/SimproV2/Gantt/index.js
@@ -3,26 +3,14 @@ import "react-calendar-timeline/lib/Timeline.css";
 import {USER_VERSION_GANTT_SEARCH} from "../../../const/ApiConst";
 import axios from "../../../const/interceptorApi";
 import "react-tiny-fab/dist/styles.css";
-import { useHistory } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import GanttFrame from "./GanttFrame";
 
 let roCount = 0;
 
 const Gantt = (props) => {
-  let role_id = 0, user_id = 0, isLogin = false, token = '', companyId = 0, all_project = null, role_name='', hierarchy=[], user_name='', companyName='';
-  if (props && props.role_id && props.user_id) {
-    role_id = props.role_id;
-    user_id = props.user_id;
-    token = props.token;
-    isLogin = props.isLogin;
-    companyId = props.company_id;
-    all_project = props.all_project;
-    role_name = props.role_name;
-    isLogin = props.isLogin;
-    hierarchy = props.hierarchy;
-    user_name = props.user_name;
-    companyName = props.companyName;
-  }
+  const location = useLocation();
+  const { isLogin, token, role_id, user_id, company_id, dataViewStartDate, companyName, role_name } = location.state || {};
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -110,7 +98,7 @@ const Gantt = (props) => {
             token={token}
             ro={ro}
             role_name={role_name}
-            companyId={companyId}
+            companyId={company_id}
             timestamp={timestamp}
             company_name={companyName}
           />