diff --git a/src/components/extensive/Modal/ModalApprove.tsx b/src/components/extensive/Modal/ModalApprove.tsx
index 94c56140f..f4e66c4f9 100644
--- a/src/components/extensive/Modal/ModalApprove.tsx
+++ b/src/components/extensive/Modal/ModalApprove.tsx
@@ -4,7 +4,8 @@ import { When } from "react-if";
 
 import Button from "@/components/elements/Button/Button";
 import Checkbox from "@/components/elements/Inputs/Checkbox/Checkbox";
-// import Status from "@/components/elements/Status/Status";
+import { StatusEnum } from "@/components/elements/Status/constants/statusMap";
+import Status from "@/components/elements/Status/Status";
 import Text from "@/components/elements/Text/Text";
 
 import Icon, { IconNames } from "../Icon/Icon";
@@ -16,7 +17,7 @@ export interface ModalApproveProps extends ModalProps {
   primaryButtonText?: string;
   secondaryButtonText?: string;
   toogleButton?: boolean;
-  status?: "under-review" | "approved" | "draft" | "submitted";
+  status?: StatusEnum;
   onClose?: () => void;
 }
 
@@ -41,7 +42,7 @@ const ModalApprove: FC<ModalApproveProps> = ({
         <Icon name={IconNames.WRI_LOGO} width={108} height={30} className="min-w-[108px]" />
         <div className="flex items-center">
           <When condition={status}>
-            {/* <Status status={status ?? "draft"} className="rounded px-2 py-[2px]" textVariant="text-14-bold" /> */}
+            <Status status={status ?? StatusEnum.DRAFT} className="rounded px-2 py-[2px]" textVariant="text-14-bold" />
           </When>
           <button onClick={onClose} className="ml-2 rounded p-1 hover:bg-grey-800">
             <Icon name={IconNames.CLEAR} width={16} height={16} className="text-darkCustom-100" />
diff --git a/src/components/extensive/Modal/ModalSubmit.tsx b/src/components/extensive/Modal/ModalSubmit.tsx
index f7a3c41ad..84a21ca77 100644
--- a/src/components/extensive/Modal/ModalSubmit.tsx
+++ b/src/components/extensive/Modal/ModalSubmit.tsx
@@ -4,7 +4,8 @@ import { When } from "react-if";
 
 import Button from "@/components/elements/Button/Button";
 import Checkbox from "@/components/elements/Inputs/Checkbox/Checkbox";
-// import Status from "@/components/elements/Status/Status";
+import { StatusEnum } from "@/components/elements/Status/constants/statusMap";
+import Status from "@/components/elements/Status/Status";
 import Text from "@/components/elements/Text/Text";
 
 import Icon, { IconNames } from "../Icon/Icon";
@@ -16,7 +17,7 @@ export interface ModalSubmitProps extends ModalProps {
   primaryButtonText?: string;
   secondaryButtonText?: string;
   toogleButton?: boolean;
-  status?: "under-review" | "approved" | "draft" | "submitted";
+  status?: StatusEnum;
   onClose?: () => void;
 }
 
@@ -42,7 +43,7 @@ const ModalSubmit: FC<ModalSubmitProps> = ({
         <Icon name={IconNames.WRI_LOGO} width={108} height={30} className="min-w-[108px]" />
         <div className="flex items-center">
           <When condition={status}>
-            {/* <Status status={status ?? "draft"} className="rounded px-2 py-[2px]" textVariant="text-14-bold" /> */}
+            <Status status={status ?? StatusEnum.DRAFT} className="rounded px-2 py-[2px]" textVariant="text-14-bold" />
           </When>
           <button onClick={onClose} className="ml-2 rounded p-1 hover:bg-grey-800">
             <Icon name={IconNames.CLEAR} width={16} height={16} className="text-darkCustom-100" />
diff --git a/src/components/extensive/Modal/ModalWithLogo.tsx b/src/components/extensive/Modal/ModalWithLogo.tsx
index 0bcf64d4b..a9ebbaa0c 100644
--- a/src/components/extensive/Modal/ModalWithLogo.tsx
+++ b/src/components/extensive/Modal/ModalWithLogo.tsx
@@ -7,7 +7,8 @@ import Button from "@/components/elements/Button/Button";
 import Commentary from "@/components/elements/Commentary/Commentary";
 import CommentaryBox from "@/components/elements/CommentaryBox/CommentaryBox";
 import StepProgressbar from "@/components/elements/ProgressBar/StepProgressbar/StepProgressbar";
-// import Status from "@/components/elements/Status/Status";
+import { StatusEnum } from "@/components/elements/Status/constants/statusMap";
+import Status from "@/components/elements/Status/Status";
 import Text from "@/components/elements/Text/Text";
 
 import Icon, { IconNames } from "../Icon/Icon";
@@ -19,7 +20,7 @@ export interface ModalWithLogoProps extends ModalProps {
   primaryButtonText?: string;
   secondaryButtonText?: string;
   toogleButton?: boolean;
-  status?: "under-review" | "approved" | "draft" | "submitted";
+  status?: StatusEnum;
   onClose?: () => void;
 }
 
@@ -46,7 +47,11 @@ const ModalWithLogo: FC<ModalWithLogoProps> = ({
         <Icon name={IconNames.WRI_LOGO} width={108} height={30} className="min-w-[108px]" />
         <div className="flex items-center">
           <When condition={status}>
-            {/* <Status status={status ? status : "draft"} className="rounded px-2 py-[2px]" textVariant="text-14-bold" /> */}
+            <Status
+              status={status ? status : StatusEnum.DRAFT}
+              className="rounded px-2 py-[2px]"
+              textVariant="text-14-bold"
+            />
           </When>
           <button onClick={onClose} className="ml-2 rounded p-1 hover:bg-grey-800">
             <Icon name={IconNames.CLEAR} width={16} height={16} className="text-darkCustom-100" />
diff --git a/src/components/extensive/Modal/ModalWithMap.tsx b/src/components/extensive/Modal/ModalWithMap.tsx
index 96cf6acc5..3f902709b 100644
--- a/src/components/extensive/Modal/ModalWithMap.tsx
+++ b/src/components/extensive/Modal/ModalWithMap.tsx
@@ -9,7 +9,8 @@ import { VARIANT_FILE_INPUT_MODAL_ADD_IMAGES_WITH_MAP } from "@/components/eleme
 import TextArea from "@/components/elements/Inputs/textArea/TextArea";
 import Map from "@/components/elements/Map-mapbox/Map";
 import StepProgressbar from "@/components/elements/ProgressBar/StepProgressbar/StepProgressbar";
-// import Status from "@/components/elements/Status/Status";
+import { StatusEnum } from "@/components/elements/Status/constants/statusMap";
+import Status from "@/components/elements/Status/Status";
 import Text from "@/components/elements/Text/Text";
 import { UploadedFile } from "@/types/common";
 
@@ -21,7 +22,7 @@ import { ModalBaseWithMap } from "./ModalsBases";
 export interface ModalWithMapProps extends ModalProps {
   polygonSelected?: string;
   primaryButtonText?: string;
-  status?: "under-review" | "approved" | "draft" | "submitted";
+  status?: StatusEnum;
   onClose?: () => void;
 }
 
@@ -47,7 +48,9 @@ const ModalWithMap: FC<ModalWithMapProps> = ({
           <header className="flex w-full items-center justify-between border-b border-b-neutral-200 px-8 py-5">
             <Icon name={IconNames.WRI_LOGO} width={108} height={30} className="min-w-[108px]" />
             <div className="flex items-center">
-              <When condition={status}>{/* <Status status={status ?? "draft"} /> */}</When>
+              <When condition={status}>
+                <Status status={status ?? StatusEnum.DRAFT} />
+              </When>
             </div>
           </header>
           <div className="max-h-[100%] w-full flex-[1_1_0] overflow-auto px-8 py-8">